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

app/controllers/inventory/inventory_controller.rb

@@ -12,13 +12,34 @@ class Inventory::InventoryController < BaseInventoryController
     @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
    							(CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
    							(CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
-   							(#{least_stock}) as balance")
-   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")
-   							.group("inventory_definitions.item_code")
-                .order("balance ASC")
+   							(#{least_stock}) as balance,"+
+                "acc.title as account_name,mi.name as item_name,
+                 mii.item_instance_name as instance_name," +
+                "mc.name as menu_category_name,mc.id as menu_category_id "
+                )
+   							.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")                
+                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
+   							.group("mi.menu_category_id,inventory_definitions.item_code")
+                .order("acc.title desc,mi.menu_category_id desc,balance ASC")
 
   end
 
+#   def self.get_item_query(type)
+ 
+#   query = Sale.select("acc.title as account_name,mi.name as item_name,mii.item_instance_name as instance_name" +
+#                      "mc.name as menu_category_name,mc.id as menu_category_id ")
+
+#   query = query.joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
+#                      " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
+#                      " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
+#   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
+#   query = query.group("acc.title,mi.account_id,mi.menu_category_id")
+#                .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc")
+# end
+
   def show
     inventory_definition_id = params[:inventory_definition_id]
     inventory = InventoryDefinition.find(inventory_definition_id)

app/controllers/inventory/inventory_definitions_controller.rb

@@ -14,6 +14,8 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
 
   # GET /inventory_definitions/new
   def new
+    @menus    = Menu.all   
+    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @inventory_definition = InventoryDefinition.new
   end
 
@@ -42,6 +44,8 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
         format.json { render json: @inventory_definition.errors, status: :unprocessable_entity }
       end
     end
+
+
   end
 
   # PATCH/PUT /inventory_definitions/1

app/controllers/inventory/stock_checks_controller.rb

@@ -12,7 +12,10 @@ class Inventory::StockChecksController < BaseInventoryController
   end
 
   def show
-    @check = StockCheck.find(params[:id])
+     @check = StockCheck.find(params[:id])
+
+    @stock_check_items = StockCheckItem.get_items_with_category(params[:id])
+
   end
 
   def save_to_journal