From 09db9656c58d912a881bd4f3307313b4ee66fe7f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 3 Jan 2018 12:22:09 +0630 Subject: [PATCH 1/5] update sale item desc --- app/models/sale.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 507fd2da..7adb1324 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -665,7 +665,7 @@ 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("i.product_name").order("mi.account_id desc") + query = query.group("i.product_name").order("acc.title desc") end def self.get_other_charges() From ae6caefaa06c3daa504754e9d45a7f209b302923 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 5 Jan 2018 13:33:23 +0630 Subject: [PATCH 2/5] change query in sale item report --- app/controllers/reports/saleitem_controller.rb | 5 ++++- app/models/sale.rb | 2 +- app/views/reports/saleitem/index.html.erb | 9 ++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index 7e7469f9..4a6a4440 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -25,7 +25,7 @@ class Reports::SaleitemController < BaseReportController @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} - @sale_data.each {|cate| @menu_cate_count[cate.menu_category_id] += 1} + @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1} @totalByAccount = Hash.new {|hash, key| hash[key] = 0} @@ -64,6 +64,9 @@ class Reports::SaleitemController < BaseReportController date_arr.push(str) end + @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + out = {:status => 'ok', :message => date_arr} respond_to do |format| diff --git a/app/models/sale.rb b/app/models/sale.rb index 7adb1324..69aa930a 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -665,7 +665,7 @@ 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("i.product_name").order("acc.title desc") + query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc") end def self.get_other_charges() diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index d0def563..f780acdb 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -110,9 +110,8 @@ - <% @menu_cate_count.each do |key,value| %> - <% if sale.menu_category_id == key %> - + <% @menu_cate_count.each do |key,value| %> + <% if sale.account_id == key %> <% count = count + 1 %> <% sub_total += sale.grand_total %> <% sub_qty += sale.total_item %> @@ -128,10 +127,10 @@ <% sub_qty = 0 %> <% count = 0%> <% end %> - <% end %> <% end %> - <% end %> + + <% end %> <% if @other_charges.present? %> From b6134e22cabeafc5e8db001a5d5fcdccff5b5d01 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 5 Jan 2018 14:14:15 +0630 Subject: [PATCH 3/5] add slim OrderItemPdf and OrderSummaryPdf , how to? --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 0032cc78..af0a9252 100755 --- a/README.md +++ b/README.md @@ -40,6 +40,15 @@ Extra Time instance_code = Extim30, Extim60 //for morning menu instance_code = Extie30, Extie60 //for evening menu +Order Item & Order Summary Slim + *** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf + 1) settings/print_settings + 2) app/controllers/oqs/edit_controller.rb + 3) app/controllers/oqs/print_controller.rb + 4) app/models/order_queue_station.rb + 5) app/models/printer/order_queue_printer.rb + 6) app/models/printer/receipt_printer.rb + * ToDo list 1. Cloud Sync From 854d3785756d271c712cee1e22f8d6b45fd93312 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 5 Jan 2018 16:32:34 +0630 Subject: [PATCH 4/5] check extra cat: ; is it checked in or not? --- README.md | 4 ++-- app/views/origami/addorders/detail.html.erb | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index af0a9252..46af5ba1 100755 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002 Extra Time - category_code = Ext001 - category_code = Ext002 + category_code = ExtC001 //for morning menu cat: + category_code = ExtC002 //for evening menu cat: instance_code = Extim30, Extim60 //for morning menu instance_code = Extie30, Extie60 //for evening menu diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 1d29c3c8..2e160a7f 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -8,7 +8,9 @@
    <% @menu.each do |menu| %> - <% if menu.menu_category_id.nil?%> + <% if menu.menu_category_id.nil? %> + <% if @table.get_current_checkout_booking.nil? %> + <% if menu.code != 'ExtC001' && menu.code != 'ExtC002' %>
  • <%= menu.name%> @@ -16,7 +18,17 @@
+ <% end%> + <% else %> +
  • + + <%= menu.name%> + + +
    • <% end%> + <% end%> <%end %>