diff --git a/README.md b/README.md index 0032cc78..46af5ba1 100755 --- a/README.md +++ b/README.md @@ -35,11 +35,20 @@ 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 +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 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 507fd2da..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("mi.account_id 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/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 1d29c3c8..bebf18cc 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -8,7 +8,9 @@