git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yan
2018-04-20 13:53:56 +06:30
parent 223404a3b0 8720ffd195
commit 0aa080573c
7 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/origami/addorders_controller.rb
View File

@@ -184,7 +184,11 @@ puts items_arr.to_json
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee) @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
# for second display # 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 } result = {:status=> @status, :data => @sale }
render :json => result.to_json render :json => result.to_json
end end

5
app/controllers/origami/second_display_controller.rb
View File

@@ -13,8 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
else else
tax_profiles = nil tax_profiles = nil
end end
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
end
end end
#Shop Name in Navbor #Shop Name in Navbor
helper_method :shop_detail helper_method :shop_detail

82
app/models/order.rb
View File

@@ -285,28 +285,13 @@ class Order < ApplicationRecord
#Process order items and send to order queue #Process order items and send to order queue
def process_order_queue def process_order_queue
#Send to background job for processing if ENV["SERVER_MODE"] != 'cloud'
order = Order.find(self.id) #Send to background job for processing
cup_status = `#{"sudo service cups status"}` order = Order.find(self.id)
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"}`
cup_status = `#{"sudo service cups status"}` cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status) print_status = check_cup_status(cup_status)
sidekiq = Lookup.find_by_lookup_type("sidekiq")
if print_status if print_status
if !sidekiq.nil? if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(self.id, self.table_id) OrderQueueProcessorJob.perform_later(self.id, self.table_id)
@@ -315,40 +300,61 @@ class Order < ApplicationRecord
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
else else
msg = ' Print Error ! Please contact to service' cup_start = `#{"sudo service cups start"}`
ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' cup_status = `#{"sudo service cups status"}`
print_status = check_cup_status(cup_status)
if print_status
if !sidekiq.nil? if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(self.id, self.table_id) OrderQueueProcessorJob.perform_later(self.id, self.table_id)
else else
if order if order
oqs = OrderQueueStation.new oqs = OrderQueueStation.new
oqs.process_order(order, self.table_id, self.source) oqs.process_order(order, self.table_id, self.source)
end end
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id) # assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end 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 end
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
end end
#Process order items and send to order queue #Process order items and send to order queue
def self.pay_process_order_queue(id,table_id) def self.pay_process_order_queue(id,table_id)
sidekiq = Lookup.find_by_lookup_type("sidekiq") if ENV["SERVER_MODE"] != 'cloud'
if !sidekiq.nil? sidekiq = Lookup.find_by_lookup_type("sidekiq")
OrderQueueProcessorJob.perform_later(id, table_id) if !sidekiq.nil?
else OrderQueueProcessorJob.perform_later(id, table_id)
order = Order.find(id) else
if order order = Order.find(id)
oqs = OrderQueueStation.new if order
oqs.process_order(order, table_id) 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 end
assign_order = AssignedOrderItem.assigned_order_item_by_job(id)
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
end end
end end

1
app/views/origami/home/show.html.erb
View File

@@ -786,7 +786,6 @@
$(".choose_payment").on('click', function () { $(".choose_payment").on('click', function () {
$( "#loading_wrapper").show(); $( "#loading_wrapper").show();
alert(parseInt(jQuery.inArray("PAYMAL", type)));
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
// type = $('.payment_method').val(); // type = $('.payment_method').val();

5
db/migrate/20180306044939_create_receipts.rb
View File

@@ -5,10 +5,13 @@ class CreateReceipts < ActiveRecord::Migration[5.1]
t.string :client_name, :null => false t.string :client_name, :null => false
t.string :shop_code, :limit => 16, :null => false t.string :shop_code, :limit => 16, :null => false
t.string :shop_name, :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 :transaction_time, :null => false
t.datetime :receipt_open_time, :null => false t.datetime :receipt_open_time, :null => false
t.datetime :receipt_close_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 :gross_sales, :null => false, :default => 0
t.decimal :discount_amount, :null => false, :default => 0 t.decimal :discount_amount, :null => false, :default => 0
t.decimal :sales, :null => false, :default => 0 t.decimal :sales, :null => false, :default => 0

2
lib/tasks/clear_data.rake
View File

@@ -18,6 +18,8 @@ namespace :clear do
DiningFacility.update_all(status:'available') DiningFacility.update_all(status:'available')
CashierTerminal.update_all(is_currently_login: 0) CashierTerminal.update_all(is_currently_login: 0)
SeedGenerator.where("id > 1").update(:current => 0, :next => 0) SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
Receipt.delete_all
ReceiptDetail.delete_all
puts "Clear Data Done." puts "Clear Data Done."
end end

39
lib/tasks/receipt.rake
View File

@@ -3,18 +3,23 @@ namespace :consolidate do
task :receipt => :environment do task :receipt => :environment do
Receipt.delete_all Receipt.delete_all
sales = Sale.all_receipts sales = Sale.all_receipts
shop = Shop.find(1) shop = Shop.find(1)
sales.each do |sale| sales.each do |sale|
puts sale.to_json
shift = ShiftSale.find(sale.shift_sale_id)
receipt = Receipt.new receipt = Receipt.new
receipt.client_code = shop.id receipt.client_code = shop.client_code
receipt.client_name = shop.id receipt.client_name = shop.client_name
receipt.shop_code = shop.id receipt.shop_code = shop.shop_code
receipt.shop_name = shop.id receipt.shop_name = shop.name
receipt.receipt_no = sale.receipt_no receipt.receipt_no = sale.receipt_no
receipt.transaction_time = sale.requested_at #requet-at receipt.transaction_time = sale.requested_at #requet-at
receipt.receipt_open_time = sale.requested_at #before disco/after tax /after/ser_char receipt.receipt_open_time = sale.requested_at #before disco/after tax /after/ser_char
receipt.receipt_close_time = sale.receipt_close_time 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.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.discount_amount = sale.total_discount + sale.item_discount
receipt.sales = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn receipt.sales = sale.grand_total #after disco/after tax /after/ser_char /no roundingadn
@@ -96,10 +101,10 @@ namespace :consolidate do
if sale_id != sale.sale_id && count !=0 if sale_id != sale.sale_id && count !=0
receipt = ReceiptDetail.new receipt = ReceiptDetail.new
receipt.client_code = shop.id receipt.client_code = shop.client_code
receipt.client_name = shop.id receipt.client_name = shop.client_name
receipt.shop_code = shop.id receipt.shop_code = shop.shop_code
receipt.shop_name = shop.id receipt.shop_name = shop.name
receipt.receipt_no = @receipt_no receipt.receipt_no = @receipt_no
receipt.receipt_date = @requested_at #requet-at receipt.receipt_date = @requested_at #requet-at
receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char
@@ -145,10 +150,10 @@ namespace :consolidate do
discount_amount = (sale.status=="Discount") ? sale.price : 0 discount_amount = (sale.status=="Discount") ? sale.price : 0
receipt = ReceiptDetail.new receipt = ReceiptDetail.new
receipt.client_code = shop.id receipt.client_code = shop.client_code
receipt.client_name = shop.id receipt.client_name = shop.client_name
receipt.shop_code = shop.id receipt.shop_code = shop.shop_code
receipt.shop_name = shop.id receipt.shop_name = shop.name
receipt.receipt_no = sale.receipt_no receipt.receipt_no = sale.receipt_no
receipt.receipt_date = sale.requested_at #requet-at receipt.receipt_date = sale.requested_at #requet-at
receipt.transaction_date = sale.requested_at #before disco/after tax /after/ser_char receipt.transaction_date = sale.requested_at #before disco/after tax /after/ser_char
@@ -195,10 +200,10 @@ namespace :consolidate do
if count == sale_count if count == sale_count
receipt = ReceiptDetail.new receipt = ReceiptDetail.new
receipt.client_code = shop.id receipt.client_code = shop.client_code
receipt.client_name = shop.id receipt.client_name = shop.client_name
receipt.shop_code = shop.id receipt.shop_code = shop.shop_code
receipt.shop_name = shop.id receipt.shop_name = shop.name
receipt.receipt_no = @receipt_no receipt.receipt_no = @receipt_no
receipt.receipt_date = @requested_at #requet-at receipt.receipt_date = @requested_at #requet-at
receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char receipt.transaction_date = @requested_at #before disco/after tax /after/ser_char