diff --git a/app/assets/javascripts/user/quser.js.coffee b/app/assets/javascripts/user/quser.js.coffee index 7e3f88fe..86e3518d 100644 --- a/app/assets/javascripts/user/quser.js.coffee +++ b/app/assets/javascripts/user/quser.js.coffee @@ -283,7 +283,7 @@ class Quser @populate_products_table('/user/list_products_for_table.json?'+authentication_string+'&table_id='+table_id) populate_products_table: (src)-> $.getJSON(data_host + src, (res) => - include_order_buttons = res.my_list + include_order_buttons = res.my_list || !res.table_occupied $('.table-number').text(res.table_number) if res.table_number $('.supplier-name').text(res.supplier_name) if res.supplier_name diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass index 47eb087d..ea90bc1e 100644 --- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass +++ b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass @@ -1,6 +1,6 @@ @import "bootstrap" body - padding-top: 60px !important + padding-top: 60px @import "bootstrap-responsive" // Set the correct sprite paths diff --git a/app/models/product_category.rb b/app/models/product_category.rb index 1b83cdb5..c1c6b411 100644 --- a/app/models/product_category.rb +++ b/app/models/product_category.rb @@ -29,7 +29,7 @@ class ProductCategory other = product_categories.find(&:other?) || (product_categories << self.other).last # Container for non categorized products # Initialize base return object - h = {table_number: table.number, supplier_name: table.supplier.name, my_list: list.try(:user_ids).to_a.include?(user.id)} + h = {table_number: table.number, table_occupied: table.occupied?, supplier_name: table.supplier.name, my_list: list.try(:user_ids).to_a.include?(user.id)} (products - product_categories.map(&:products).flatten).each{ |p| other.add_product(p) }