sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #427. fixes #354.

Browse Source
This commit is contained in:
arzynik 2012-10-10 21:22:57 -04:00
parent e924fe0392
commit cef4db4e04
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/library/Crunchbutton/Order.php
View File

@ -132,6 +132,8 @@ class Crunchbutton_Order extends Cana_Table {
if ($this->pay_type == 'card' && $params['card']['number']) {
$user->card = str_repeat('*',strlen($params['card']['number'])-4).substr($params['card']['number'],-4);
$user->card_exp_year = $params['card']['year'];
$user->card_exp_month = $params['card']['month'];
}
$user->pay_type = $this->pay_type;

1
include/library/Crunchbutton/Preset.php
View File

@ -20,6 +20,7 @@ class Crunchbutton_Preset extends Cana_Table {
$preset = new Preset;
$preset->id_restaurant = $order->id_restaurant;
$preset->id_user = $order->user()->id_user;
$preset->notes = $order->notes;
$preset->save();
foreach ($order->dishes() as $d) {

2
include/views/default/crunchbutton/layout/html.top.phtml
View File

@ -11,7 +11,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="apple-touch-icon-precomposed" href="/assets/images/appicon.png">
<? if(c::config()->bundle) : ?>
<? if (c::config()->bundle) : ?>
<link rel="stylesheet" type="text/css" href="/assets/css/bundle.css?v=<?=Cana_Util::gitVersion()?>">
<? else : ?>
<link rel="stylesheet" type="text/css" href="/assets/css/style.css?v=<?=Cana_Util::gitVersion()?>">

27
www/assets/js/app.js
View File

@ -429,12 +429,26 @@ App.drawPay = function(restaurant) {
$('[name="pay-tip"]').val(App.order.tip);
$('[name="pay-name"]').val(App.config.user.name);
$('[name="pay-phone"]').val(App.phone.format(App.config.user.phone));
$('[name="pay-address"]').val(App.loc.enteredLoc || App.config.user.address);
$('[name="pay-address"]').val(App.config.user.address || App.loc.enteredLoc);
$('[name="pay-card-number"]').val(App.config.user.card);
$('[name="pay-card-month"]').val(App.config.user.card_exp_month);
$('[name="pay-card-year"]').val(App.config.user.card_exp_year);
if (App.config.user && App.config.user.presets && App.config.user.presets[App.restaurant.id_restaurant]) {
try {
console.log(App.config.user.presets[App.restaurant.id_restaurant]);
$('[name="notes"]').val(App.config.user.presets[App.restaurant.id_restaurant].notes);
} catch (e) {}
}
if (!restaurant.delivery) {
$('.delivery-only-text').hide();
}
if (!App.config.user.id_user) {
App.config.user.address = App.loc.enteredLoc;
App.loc.enteredLoc = '';
}
};
@ -1789,6 +1803,17 @@ $(function() {
App.loadHome();
$('input').blur();
});
$('[name="pay-address"], [name="pay-name"], [name="pay-phone"], [name="pay-card-number"], [name="notes"]').live('change', function() {
App.config.user.name = $('[name="pay-name"]').val();
App.config.user.phone = App.phone.format($('[name="pay-phone"]').val());
App.config.user.address = $('[name="pay-address"]').val();
App.config.user.card = $('[name="pay-card-number"]').val();
App.config.user.notes = $('[name="notes"]').val();
App.config.user.card_exp_month = $('[name="pay-card-month"]').val();
App.config.user.card_exp_year = $('[name="pay-card-year"]').val();
});
});
google.load('maps', '3', {callback: App.loc.preProcess, other_params: 'sensor=false'});