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

fixed loading of user sotred orderes

Browse Source
This commit is contained in:
arzynik 2012-07-18 18:10:32 -07:00
parent 78775ff844
commit 10fbfb73d5
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,14 @@ class Crunchbutton_Order extends Cana_Table {
$this->notify();
$defaultOrder = new Restaurant_DefaultOrder;
$defaultOrder->id_user = $this->id_user;
$defaultOrder->id_restaurant = $this->id_restaurant;
$defaultOrder->config = json_encode($params['cart']);
$defaultOrder->save();
$def = json_encode($params['cart']);
if ($def != $this->restaurant()->defaultOrder()->config) {
$defaultOrder = new Restaurant_DefaultOrder;
$defaultOrder->id_user = $this->id_user;
$defaultOrder->id_restaurant = $this->id_restaurant;
$defaultOrder->config = $def;
$defaultOrder->save();
}
return true;
}

5
include/library/Crunchbutton/User.php
View File

@ -37,7 +37,10 @@ class Crunchbutton_User extends Cana_Table {
public function exports() {
$out = $this->properties();
$out['defaults'] = $this->defaults();
foreach ($this->defaults() as $default) {
$out['defaults'][$default->id_restaurant] = $default->exports();
}
return $out;
}

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

@ -245,6 +245,8 @@ App.page.restaurant = function(id) {
if (App.cart.hasItems()) {
App.cart.reloadOrder();
} else if (App.config.user.defaults[App.restaurant.id_restaurant]) {
App.cart.loadOrder(App.config.user.defaults[App.restaurant.id_restaurant]);
} else {
App.cart.loadOrder(App.restaurant.defaultOrder());
}