Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/ability.rb

@@ -183,7 +183,9 @@ class Ability
 
         can :index, :home
         can :show, :home
-
+     elsif user.role == "waiter"
+        can :index, :home
+        can :show, :home  
     end
   end
 end

app/models/order.rb

@@ -145,6 +145,9 @@ class Order < ApplicationRecord
                 set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
               end
             end
+            set_order_items = set_order_items.to_json
+          else
+            set_order_items = nil
           end
 
           # not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
           # end
 
           OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
-                          item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
+                          item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
                           self.employee_name, menu_item[:taxable])
 
         #end

app/models/sale.rb

@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
 
         order.order_items.each do |item|
           add_item(item)
-          if item.set_menu_items != "[]"
+          if !item.set_menu_items.nil?
             add_sub_item(item.set_menu_items)
           end
         end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
 
     items.each do |item|
       add_item(item)
-      if item.set_menu_items != "[]"
+      if !item.set_menu_items.nil?
         add_sub_item(item.set_menu_items)
       end
       
@@ -700,8 +700,8 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,i.product_name")
-               .order("acc.title desc, mi.account_id desc, i.unit_price asc")
+  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name")
+               .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()