diff --git a/include/library/Crunchbutton/Restaurant.php b/include/library/Crunchbutton/Restaurant.php index 2a4fec666..4724f9df4 100644 --- a/include/library/Crunchbutton/Restaurant.php +++ b/include/library/Crunchbutton/Restaurant.php @@ -98,8 +98,8 @@ class Crunchbutton_Restaurant extends Cana_Table { foreach ($newDishes as $dish) { $dishO = new Dish($dish['id_dish']); - $dishO->active = 1; $dishO->id_restaurant = $this->id_restaurant; + $dishO->active = isset($dish['active']) ? $dish['active'] : 1; $dishO->name = $dish['name']; $dishO->description = $dish['description']; $dishO->price = $dish['price']; diff --git a/include/views/default/crunchbutton/admin/restaurants/restaurant.phtml b/include/views/default/crunchbutton/admin/restaurants/restaurant.phtml index b9528eec0..da950f0ee 100644 --- a/include/views/default/crunchbutton/admin/restaurants/restaurant.phtml +++ b/include/views/default/crunchbutton/admin/restaurants/restaurant.phtml @@ -49,7 +49,7 @@ input.notification {width: 400px;} /* space between the category switcher and the dish name input */ .admin-food-item-content-padding > label { float: left; - margin: 10px 0; + clear: both; } /* space between label and select */ diff --git a/www/assets/css/admin.css b/www/assets/css/admin.css index d83261733..b87143805 100644 --- a/www/assets/css/admin.css +++ b/www/assets/css/admin.css @@ -510,13 +510,15 @@ th { } .dish-price { - width: 85px; + width: 70px; float: right; } .dish-price input { - width: 65px; + width: 50px; margin-left: .5em; + text-align: right; + } .dish-name { diff --git a/www/assets/js/admin.js b/www/assets/js/admin.js index eb7851d81..3dde4fd11 100644 --- a/www/assets/js/admin.js +++ b/www/assets/js/admin.js @@ -286,6 +286,7 @@ function saveDishes (complete) { description: values['dish-description'], price: values['dish-price'], id_category: values['dish-id_category'], + active: values['dish-active'], }; if (id) { @@ -574,10 +575,13 @@ App.showDish = function(dishItem) { categoryOptions += ''; } + var active = (parseInt(dishItem.active)) ? 'checked="checked"' : ''; + padding .append('') .append('