From 635db2e0110ecfc539777a30057290552cc8d363 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 13:59:50 +0630 Subject: [PATCH 1/8] update rake receipt file --- db/migrate/20180306044939_create_receipts.rb | 2 +- lib/tasks/clear_data.rake | 20 ++--------- lib/tasks/receipt.rake | 38 +++++++++++--------- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb index 22f3b0fa..7e1df523 100644 --- a/db/migrate/20180306044939_create_receipts.rb +++ b/db/migrate/20180306044939_create_receipts.rb @@ -5,7 +5,7 @@ class CreateReceipts < ActiveRecord::Migration[5.1] t.string :client_name, :null => false t.string :shop_code, :limit => 16, :null => false t.string :shop_name, :null => false - t.integer :receipt_no, :limit => 8, :null => false + t.integer :receipt_no, :null => false t.datetime :transaction_time, :null => false t.datetime :receipt_open_time, :null => false t.datetime :receipt_close_time, :null => false diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index 247992be..508fcd8c 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -1,23 +1,9 @@ namespace :clear do desc "Clear Data" task :data => :environment do - BookingOrder.delete_all - Booking.delete_all - OrderItem.delete_all - AssignedOrderItem.delete_all - Order.delete_all - SaleOrder.delete_all - SaleItem.delete_all - Sale.delete_all - SaleTax.delete_all - SaleAudit.delete_all - SalePayment.delete_all - ShiftSale.delete_all - PaymentJournal.delete_all - Survey.delete_all - DiningFacility.update_all(status:'available') - CashierTerminal.update_all(is_currently_login: 0) - SeedGenerator.where("id > 1").update(:current => 0, :next => 0) + + Receipt.delete_all + ReceiptDetail.delete_all puts "Clear Data Done." end diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake index fa24f481..23f57896 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -3,18 +3,22 @@ namespace :consolidate do task :receipt => :environment do Receipt.delete_all sales = Sale.all_receipts - + shop = Shop.find(1) sales.each do |sale| + shift = ShiftSale.find(sale.shift_sale_id) receipt = Receipt.new - receipt.client_code = shop.id - receipt.client_name = shop.id - receipt.shop_code = shop.id - receipt.shop_name = shop.id + receipt.client_code = shop.client_code + receipt.client_name = shop.client_name + receipt.shop_code = shop.shop_code + receipt.shop_name = shop.name receipt.receipt_no = sale.receipt_no receipt.transaction_time = sale.requested_at #requet-at receipt.receipt_open_time = sale.requested_at #before disco/after tax /after/ser_char receipt.receipt_close_time = sale.receipt_close_time + receipt.shift_id = sale.shift_sale_id + receipt.shift_open_time = shift.shift_started_at + receipt.shift_close_time = shift.shift_closed_at receipt.gross_sales = sale.total_amount + sale.total_tax #before disco/after tax /after/ser_char receipt.discount_amount = sale.total_discount + sale.item_discount receipt.sales = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn @@ -96,10 +100,10 @@ namespace :consolidate do if sale_id != sale.sale_id && count !=0 receipt = ReceiptDetail.new - receipt.client_code = shop.id - receipt.client_name = shop.id - receipt.shop_code = shop.id - receipt.shop_name = shop.id + receipt.client_code = shop.client_code + receipt.client_name = shop.client_name + receipt.shop_code = shop.shop_code + receipt.shop_name = shop.name receipt.receipt_no = @receipt_no receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char @@ -145,10 +149,10 @@ namespace :consolidate do discount_amount = (sale.status=="Discount") ? sale.price : 0 receipt = ReceiptDetail.new - receipt.client_code = shop.id - receipt.client_name = shop.id - receipt.shop_code = shop.id - receipt.shop_name = shop.id + receipt.client_code = shop.client_code + receipt.client_name = shop.client_name + receipt.shop_code = shop.shop_code + receipt.shop_name = shop.name receipt.receipt_no = sale.receipt_no receipt.receipt_date = sale.requested_at #requet-at receipt.transaction_date = sale.requested_at #before disco/after tax /after/ser_char @@ -195,10 +199,10 @@ namespace :consolidate do if count == sale_count receipt = ReceiptDetail.new - receipt.client_code = shop.id - receipt.client_name = shop.id - receipt.shop_code = shop.id - receipt.shop_name = shop.id + receipt.client_code = shop.client_code + receipt.client_name = shop.client_name + receipt.shop_code = shop.shop_code + receipt.shop_name = shop.name receipt.receipt_no = @receipt_no receipt.receipt_date = @requested_at #requet-at receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char From 652251f2439b78c5584019b377b1099589c3b020 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 15:00:48 +0630 Subject: [PATCH 2/8] update rake file --- lib/tasks/clear_data.rake | 18 +++++++++++++++++- lib/tasks/receipt.rake | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index 508fcd8c..cd4fec49 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -1,7 +1,23 @@ namespace :clear do desc "Clear Data" task :data => :environment do - + BookingOrder.delete_all + Booking.delete_all + OrderItem.delete_all + AssignedOrderItem.delete_all + Order.delete_all + SaleOrder.delete_all + SaleItem.delete_all + Sale.delete_all + SaleTax.delete_all + SaleAudit.delete_all + SalePayment.delete_all + ShiftSale.delete_all + PaymentJournal.delete_all + Survey.delete_all + DiningFacility.update_all(status:'available') + CashierTerminal.update_all(is_currently_login: 0) + SeedGenerator.where("id > 1").update(:current => 0, :next => 0) Receipt.delete_all ReceiptDetail.delete_all puts "Clear Data Done." diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake index 23f57896..d23efea6 100644 --- a/lib/tasks/receipt.rake +++ b/lib/tasks/receipt.rake @@ -6,6 +6,7 @@ namespace :consolidate do shop = Shop.find(1) sales.each do |sale| + puts sale.to_json shift = ShiftSale.find(sale.shift_sale_id) receipt = Receipt.new receipt.client_code = shop.client_code From c957ef7423f8e390c7340a7f6a3b2fe8b2f88681 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 18:38:08 +0630 Subject: [PATCH 3/8] update order for cloud process order --- app/models/order.rb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index fcc8b6c2..7cfd09a2 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -285,6 +285,7 @@ class Order < ApplicationRecord #Process order items and send to order queue def process_order_queue + if ENV["SERVER_MODE"] != 'cloud' #Send to background job for processing order = Order.find(self.id) cup_status = `#{"sudo service cups status"}` @@ -299,8 +300,8 @@ class Order < ApplicationRecord oqs = OrderQueueStation.new oqs.process_order(order, self.table_id, self.source) end - assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else cup_start = `#{"sudo service cups start"}` @@ -315,8 +316,8 @@ class Order < ApplicationRecord oqs = OrderQueueStation.new oqs.process_order(order, self.table_id, self.source) end - assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else msg = ' Print Error ! Please contact to service' @@ -328,12 +329,14 @@ class Order < ApplicationRecord oqs = OrderQueueStation.new oqs.process_order(order, self.table_id, self.source) end - assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end end end - + end + assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end #Process order items and send to order queue From e75a276326f72587b017670d27e9bbe41eab3bf9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 18:57:03 +0630 Subject: [PATCH 4/8] udpate order --- app/models/order.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 7cfd09a2..3f3414e1 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -334,10 +334,11 @@ class Order < ApplicationRecord end end end - end assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end + + end #Process order items and send to order queue def self.pay_process_order_queue(id,table_id) From 830dc1b4d2a92580b60f987c6ca54d8ea5f006e6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 19:02:21 +0630 Subject: [PATCH 5/8] udpate order --- .../origami/addorders_controller.rb | 6 ++- .../origami/second_display_controller.rb | 3 +- app/models/order.rb | 54 +++++++++---------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 0f16b981..e3122ded 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -184,7 +184,11 @@ puts items_arr.to_json @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) # for second display - ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale" + if ENV["SERVER_MODE"] != 'cloud' + + ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale" + + end result = {:status=> @status, :data => @sale } render :json => result.to_json end diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index a2bf34fd..87368470 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -13,8 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController else tax_profiles = nil end - + if ENV["SERVER_MODE"] != 'cloud' ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] + end end #Shop Name in Navbor helper_method :shop_detail diff --git a/app/models/order.rb b/app/models/order.rb index 3f3414e1..ef8127f5 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -285,29 +285,13 @@ class Order < ApplicationRecord #Process order items and send to order queue def process_order_queue - if ENV["SERVER_MODE"] != 'cloud' - #Send to background job for processing - order = Order.find(self.id) - cup_status = `#{"sudo service cups status"}` - print_status = check_cup_status(cup_status) - sidekiq = Lookup.find_by_lookup_type("sidekiq") - - if print_status - if !sidekiq.nil? - OrderQueueProcessorJob.perform_later(self.id, self.table_id) - else - if order - oqs = OrderQueueStation.new - oqs.process_order(order, self.table_id, self.source) - end - # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order - end - else - cup_start = `#{"sudo service cups start"}` + if ENV["SERVER_MODE"] != 'cloud' + #Send to background job for processing + order = Order.find(self.id) cup_status = `#{"sudo service cups status"}` print_status = check_cup_status(cup_status) - + sidekiq = Lookup.find_by_lookup_type("sidekiq") + if print_status if !sidekiq.nil? OrderQueueProcessorJob.perform_later(self.id, self.table_id) @@ -320,10 +304,13 @@ class Order < ApplicationRecord # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else - msg = ' Print Error ! Please contact to service' - ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' + cup_start = `#{"sudo service cups start"}` + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + + if print_status if !sidekiq.nil? - OrderQueueProcessorJob.perform_later(self.id, self.table_id) + OrderQueueProcessorJob.perform_later(self.id, self.table_id) else if order oqs = OrderQueueStation.new @@ -332,11 +319,24 @@ class Order < ApplicationRecord # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end + else + msg = ' Print Error ! Please contact to service' + ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(self.id, self.table_id) + else + if order + oqs = OrderQueueStation.new + oqs.process_order(order, self.table_id, self.source) + end + # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order + end + end end + assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) + ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end - assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order - end end From f8687b501001500540e24e5df816e47934d3f8b4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Apr 2018 09:23:11 +0630 Subject: [PATCH 6/8] update cloud mode off for order and queue --- .../origami/second_display_controller.rb | 4 ++-- app/models/order.rb | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index 87368470..4f2c06f8 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -14,8 +14,8 @@ class Origami::SecondDisplayController < BaseOrigamiController tax_profiles = nil end if ENV["SERVER_MODE"] != 'cloud' - ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] - end + ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] + end end #Shop Name in Navbor helper_method :shop_detail diff --git a/app/models/order.rb b/app/models/order.rb index ef8127f5..e4ab883b 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -342,17 +342,19 @@ class Order < ApplicationRecord #Process order items and send to order queue def self.pay_process_order_queue(id,table_id) - sidekiq = Lookup.find_by_lookup_type("sidekiq") - if !sidekiq.nil? - OrderQueueProcessorJob.perform_later(id, table_id) - else - order = Order.find(id) - if order - oqs = OrderQueueStation.new - oqs.process_order(order, table_id) + if ENV["SERVER_MODE"] != 'cloud' + sidekiq = Lookup.find_by_lookup_type("sidekiq") + if !sidekiq.nil? + OrderQueueProcessorJob.perform_later(id, table_id) + else + order = Order.find(id) + if order + oqs = OrderQueueStation.new + oqs.process_order(order, table_id) + end + assign_order = AssignedOrderItem.assigned_order_item_by_job(id) + ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end - assign_order = AssignedOrderItem.assigned_order_item_by_job(id) - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end end From 6a63390da655420a0e2c2940092d200cabcdb369 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Apr 2018 09:29:39 +0630 Subject: [PATCH 7/8] update receipt migrate --- db/migrate/20180306044939_create_receipts.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/db/migrate/20180306044939_create_receipts.rb b/db/migrate/20180306044939_create_receipts.rb index 22f3b0fa..13c7ccfe 100644 --- a/db/migrate/20180306044939_create_receipts.rb +++ b/db/migrate/20180306044939_create_receipts.rb @@ -5,10 +5,13 @@ class CreateReceipts < ActiveRecord::Migration[5.1] t.string :client_name, :null => false t.string :shop_code, :limit => 16, :null => false t.string :shop_name, :null => false - t.integer :receipt_no, :limit => 8, :null => false + t.string :receipt_no, :null => false t.datetime :transaction_time, :null => false t.datetime :receipt_open_time, :null => false t.datetime :receipt_close_time, :null => false + t.string :shift_id, :null => false + t.datetime :shift_open_time, :null => false + t.datetime :shift_close_time, :null => false t.decimal :gross_sales, :null => false, :default => 0 t.decimal :discount_amount, :null => false, :default => 0 t.decimal :sales, :null => false, :default => 0 From 8720ffd1951c8b94059cc06c493a8c7670ae15ed Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Apr 2018 10:36:34 +0630 Subject: [PATCH 8/8] update discuount view --- app/views/origami/home/show.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 7c736299..9e6cb2f9 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -786,7 +786,6 @@ $(".choose_payment").on('click', function () { $( "#loading_wrapper").show(); - alert(parseInt(jQuery.inArray("PAYMAL", type))); var sale_id = $('#sale_id').val(); // type = $('.payment_method').val();