From b557e17558433c7e0e8a8b6dfac152067300e201 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 26 Dec 2018 10:37:17 +0630
Subject: [PATCH] menu item checked

---
 app/assets/javascripts/addorder.js            |  7 +--
 app/models/sale.rb                            | 10 ++--
 .../api/restaurant/menu/_menu.json.jbuilder   |  4 +-
 .../origami/dashboard/_menu.json.jbuilder     | 53 ++++++++++---------
 .../20170403161857_create_sale_items.rb       |  2 +
 5 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 1c6acf1b..cdb36ac6 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -207,8 +207,6 @@ $(function() {
                 for(var v in result) {
 
                  if (value[i]["id"] == result[v]["id"]) {
-    
-                   console.log("ssssssss")
 
                    row = '<div class="col-md-4 " >'
                           +"<div class='card custom-card instance_box' data-name='"+result[v]["name"]
@@ -245,15 +243,12 @@ $(function() {
          modify_order = window.location.href.indexOf("modify_order");
           if (type != -1 && modify_order != -1) {
             url = '../../../addorders/get_item_instance/'+value[i]["id"];
-            console.log("ssssssss")
           }
           if(modify_order == -1 && type != -1){
-            url = 'addorders/get_item_instance/'+value[i]["id"] ;  
-            console.log("aaaaaa")       
+            url = 'addorders/get_item_instance/'+value[i]["id"] ;
           }
           if (type ==-1 && modify_order == -1){
             url   = '../addorders/get_item_instance/'+value[i]["id"];
-            console.log("cccccccccc")
           }
           $.ajax({
             type: "GET",
diff --git a/app/models/sale.rb b/app/models/sale.rb
index c084f877..d4b9985e 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -252,8 +252,12 @@ class Sale < ApplicationRecord
 
     #save sale_audit
     sale_item = SaleItem.new
-
+    menu_category = MenuCategory.joins(" JOIN menu_items mi ON mi.menu_category_id = menu_categories.id")
+                    .where("mi.item_code = '#{item.item_code}'")
+                    .first()
     #pull
+    sale_item.menu_category_code = menu_category.code
+    sale_item.menu_category_name = menu_category.name
     sale_item.product_code = item.item_code
     sale_item.item_instance_code = item.item_instance_code
     sale_item.product_name = item.item_name
@@ -1006,8 +1010,8 @@ def self.get_item_query(type)
                      # "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("#{sale_type}")
-  query = query.group("acc.title,mi.account_id,mi.menu_category_id,i.product_name,i.unit_price")
-               .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc, i.unit_price asc")
+  query = query.group("acc.title,i.account_id,i.menu_category_code,i.product_name,i.unit_price")
+               .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc")
 end
 
 def self.get_other_charges()
diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder
index d16a433c..714f2127 100755
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -7,7 +7,7 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 
 if (menu.menu_categories)
   json.categories  menu.menu_categories do |category|
-    # if category.is_available
+    if category.is_available
       json.id category.id
       json.code category.code
       json.order_by category.order_by
@@ -22,6 +22,6 @@ if (menu.menu_categories)
           json.partial! 'api/restaurant/menu/menu_item', item: item, request_url: request_url
         end
       end
-    # end
+    end
   end
 end
diff --git a/app/views/origami/dashboard/_menu.json.jbuilder b/app/views/origami/dashboard/_menu.json.jbuilder
index 0acfda86..d558c4ea 100644
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -14,35 +14,36 @@ if (menu.menu_categories)
   # end
    categories = menu.menu_categories
   json.categories  categories do |category|
+    if category.is_available
+      menu_category = MenuCategory.find_by_menu_category_id(category.id)
+      if !menu_category.nil?
+        json.sub_category "true"
+      else
+        json.sub_category "false"
+      end
+      valid_time = category.valid_time
+      json.valid_time valid_time
 
-    menu_category = MenuCategory.find_by_menu_category_id(category.id)
-    if !menu_category.nil?
-      json.sub_category "true"
-    else
-      json.sub_category "false"
-    end
-    valid_time = category.valid_time
-    json.valid_time valid_time
+      json.id category.id
+      json.code category.code
+      json.order_by category.order_by
+      json.name category.name
+      json.alt_name category.alt_name
+      json.order_by category.order_by
+      json.parent_id category.menu_category_id
+      json.is_available category.is_available
 
-    json.id category.id
-    json.code category.code
-    json.order_by category.order_by
-    json.name category.name
-    json.alt_name category.alt_name
-    json.order_by category.order_by
-    json.parent_id category.menu_category_id
-    json.is_available category.is_available
+      if !order_by.nil? && order_by.value == "name"
+        menu_items = MenuItem.unscoped.where("menu_category_id = ?",category.id).order("name asc")
+      else
+        menu_items = category.menu_items
+      end
 
-    if !order_by.nil? && order_by.value == "name"
-      menu_items = MenuItem.unscoped.where("menu_category_id = ?",category.id).order("name asc")
-    else
-      menu_items = category.menu_items
-    end
-
-    if category.menu_items
-      json.items menu_items do |item|
-        if item.is_available
-          json.partial! 'origami/addorders/menu_item', item: item
+      if category.menu_items
+        json.items menu_items do |item|
+          if item.is_available
+            json.partial! 'origami/addorders/menu_item', item: item
+          end
         end
       end
     end
diff --git a/db/migrate/20170403161857_create_sale_items.rb b/db/migrate/20170403161857_create_sale_items.rb
index 66a32f14..fe6932a7 100755
--- a/db/migrate/20170403161857_create_sale_items.rb
+++ b/db/migrate/20170403161857_create_sale_items.rb
@@ -3,6 +3,8 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
     create_table :sale_items, :id => false do |t|
       t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing
       t.string :sale_id, foreign_key: true, :limit => 16, :index => true
+      t.string :menu_category_code, :null => false, :limit => 100
+      t.string :menu_category_name, :limit => 100, :index => true
       t.string :product_code, :null => false
       t.string :item_instance_code
       t.string :product_name, :null => false