From 93d09c708db2c727b8090f61f91a872453d9b51d Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Mon, 4 Mar 2013 16:16:15 -0300 Subject: [PATCH] fixed #810 --- .../default/crunchbutton/api/restaurant/index.php | 9 --------- .../views/default/crunchbutton/frontend/restaurant.phtml | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/include/controllers/default/crunchbutton/api/restaurant/index.php b/include/controllers/default/crunchbutton/api/restaurant/index.php index de7571e1b..fd9f47e0b 100644 --- a/include/controllers/default/crunchbutton/api/restaurant/index.php +++ b/include/controllers/default/crunchbutton/api/restaurant/index.php @@ -109,16 +109,7 @@ class Controller_api_restaurant extends Crunchbutton_Controller_Rest { if (!$restaurant->id_restaurant) { $restaurant = Crunchbutton_Restaurant::o(c::getPagePiece(2)); } -/* -DEBUG #809 -$dishes = json_decode( '{"dishes":[{"name":"teste","description":"","price":"1.00","id_category":"350","active":"true","sort":"0","id_dish":"1451","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]},{"name":"dish 1-1","description":"","price":"1.00","id_category":"358","active":"true","sort":"1","id_dish":"1468","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"},{"name":"option 1-1-2-1","default":"false","type":"select","price":"false","options":[{"name":"option 1-1-2-1-1","price":"1.00","default":"false","sort":"0","id_option":"7165"},{"name":"option 1-1-2-1-2","price":"1.00","default":"false","sort":"0","id_option":"7166"},{"name":"option 1-1-2-1-3","price":"1.00","default":"false","sort":"0","id_option":"7167"},{"name":"option 1-1-2-1-4","price":"1.00","default":"false","sort":"0","id_option":"7168"},{"name":"option 1-1-2-1-5","price":"5.00","default":"false","sort":"0","id_option":"7169"}],"id_option":"7164"}]},{"name":"dish 1-2","description":"","price":"0.00","id_category":"358","active":"true","sort":"2","id_dish":"1469","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"},{"name":"option 1-1-1","default":"false","type":"select","price":"false","options":[{"name":"option 1-1-1-1","price":"1.00","default":"false","sort":"0","id_option":"7140"},{"name":"option 1-1-1-2","price":"2.00","default":"false","sort":"0","id_option":"7141"},{"name":"option 1-1-1-3","price":"3.00","default":"false","sort":"0","id_option":"7142"},{"name":"option 1-1-1-4","price":"4.00","default":"false","sort":"0","id_option":"7143"},{"name":"option 1-1-1-5","price":"5.00","default":"false","sort":"0","id_option":"7144"},{"name":"option 1-1-1-6","price":"6.00","default":"false","sort":"0","id_option":"7145"}],"id_option":"7139"},{"name":"option 1-1-2","default":"false","type":"select","price":"false","options":[{"name":"option 1-1-2-1","price":"1.00","default":"false","sort":"0","id_option":"7154"},{"name":"option 1-1-2-2","price":"2.00","default":"false","sort":"0","id_option":"7155"},{"name":"option 1-1-2-3","price":"3.00","default":"false","sort":"0","id_option":"7156"},{"name":"option 1-1-2-4","price":"4.00","default":"false","sort":"0","id_option":"7157"},{"name":"option 1-1-2-5","price":"5.00","default":"false","sort":"0","id_option":"7158"},{"name":"option 1-1-2-6","price":"6.00","default":"false","sort":"0","id_option":"7159"}],"id_option":"7153"}]},{"name":"dish 1-3","description":"","price":"0.00","id_category":"358","active":"true","sort":"3","id_dish":"1470","optionGroups":[{"name":"Basic options","default":"false","price":"false","options":[{"name":"option 1-3-1","price":"1.00","default":"false","sort":"0","id_option":"7170"},{"name":"option 1-3-2","price":"2.00","default":"false","sort":"0","id_option":"7171"},{"name":"option 1-3-3","price":"3.00","default":"false","sort":"0","id_option":"7172"},{"name":"option 1-3-4","price":"4.00","default":"false","sort":"0","id_option":"7173"},{"name":"option 1-3-5","price":"5.00","default":"false","sort":"0","id_option":"7174"},{"name":"option 1-3-6","price":"6.00","default":"false","sort":"0","id_option":"7175"}],"id_option":"BASIC"}]},{"name":"dish 2-1","description":"","price":"0.00","id_category":"359","active":"true","sort":"0","id_dish":"1471","optionGroups":[{"name":"Basic options","default":"false","price":"false","options":[{"name":"option 2-1-1","price":"1","default":"false","sort":"0"},{"name":"option 2-1-2","price":"2","default":"false","sort":"0"},{"name":"option 2-1-3","price":"3","default":"false","sort":"0"},{"name":"option 2-1-4","price":"4","default":"false","sort":"0"},{"name":"option 2-1-5","price":"5","default":"false","sort":"0"},{"name":"option 2-1-6","price":"6","default":"false","sort":"0"}],"id_option":"BASIC"},{"name":"option 2-2","default":"false","type":"check","price":"false","options":[{"name":"option 2-2-1","price":"1","default":"false","sort":"0"},{"name":"option 2-2-2","price":"2","default":"false","sort":"0"},{"name":"option 2-2-3","price":"3","default":"false","sort":"0"},{"name":"option 2-2-4","price":"4","default":"false","sort":"0"},{"name":"option 2-2-5","price":"5","default":"false","sort":"0"},{"name":"option 2-2-6","price":"6","default":"false","sort":"0"}]}]},{"name":"dish 2-2","description":"","price":"0.00","id_category":"359","active":"true","sort":"0","id_dish":"1472","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]},{"name":"dish 2-3","description":"","price":"0.00","id_category":"359","active":"true","sort":"0","id_dish":"1473","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]},{"name":"dish 3-1","description":"","price":"0.00","id_category":"360","active":"true","sort":"0","id_dish":"1474","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]},{"name":"dish 3-2","description":"","price":"0.00","id_category":"360","active":"true","sort":"0","id_dish":"1475","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]},{"name":"dish 3-3","description":"","price":"0.00","id_category":"360","active":"false","sort":"0","id_dish":"1476","optionGroups":[{"name":"Basic options","default":"false","price":"false","id_option":"BASIC"}]}],"type":"dishes"}' ); -$restaurant->saveDishes( $dishes->dishes ); -//echo json_encode($this->request()['dishes']); - - -exit; -*/ if ($restaurant->id_restaurant) { $where = []; if (preg_match('/admin/i',$_SERVER['HTTP_REFERER'])) { // if API is being called by the admin diff --git a/include/views/default/crunchbutton/frontend/restaurant.phtml b/include/views/default/crunchbutton/frontend/restaurant.phtml index 61ae540ab..b6f61d9a2 100644 --- a/include/views/default/crunchbutton/frontend/restaurant.phtml +++ b/include/views/default/crunchbutton/frontend/restaurant.phtml @@ -153,7 +153,7 @@
You're paying:  -   +    for a total of  
@@ -171,10 +171,10 @@ <%= (user.phone ? App.phone.format(user.phone) : 'no phone # provided') %>
- + - for a total of $0.00 - +  for a total of $0.00 +  
<% if (App.config.user.delivery_type == 'delivery' && App.restaurant.delivery == '1') { %>