diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index ae8b727c..f81daaa3 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -42,6 +42,15 @@ $(document).ready(function() { railBorderRadius: '0', touchScrollStep : 50 }); + $('#menu1-slimscroll').slimScroll({ + height: height-$('#menu1-slimscroll').attr('data-height'), + size: '5px', + color: 'rgba(0,0,0,0.5)', + alwaysVisible: false, + borderRadius: '0', + railBorderRadius: '0', + touchScrollStep : 50 + }); $('#modal-slimscroll').slimScroll({ height: height-$('#modal-slimscroll').attr('data-height'), diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 7df42118..cba2bd18 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -335,10 +335,13 @@ class Origami::PaymentsController < BaseOrigamiController end @sale_data.sale_payments.each do |spay| - if spay.payment_method == "cash" + if spay.payment_method == "cash" @cash = spay.payment_amount end - @other_payment += spay.payment_amount + if spay.payment_method !="creditnote" + @other_payment += spay.payment_amount + end + if spay.payment_method == "mpu" @other += spay.payment_amount elsif spay.payment_method == "paypar" diff --git a/app/models/order.rb b/app/models/order.rb index 01a7b583..66ac883f 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -285,13 +285,18 @@ class Order < ApplicationRecord #Process order items and send to order queue def process_order_queue - if ENV["SERVER_MODE"] != 'cloud' + print_status = nil + cup_status = nil + #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 ENV["SERVER_MODE"] != 'cloud' + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + end + if print_status if !sidekiq.nil? OrderQueueProcessorJob.perform_later(self.id, self.table_id) @@ -304,9 +309,11 @@ class Order < ApplicationRecord # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else - cup_start = `#{"sudo service cups start"}` - cup_status = `#{"sudo service cups status"}` - print_status = check_cup_status(cup_status) + if ENV["SERVER_MODE"] != 'cloud' + cup_start = `#{"sudo service cups start"}` + cup_status = `#{"sudo service cups status"}` + print_status = check_cup_status(cup_status) + end if print_status if !sidekiq.nil? @@ -320,33 +327,28 @@ class Order < ApplicationRecord # ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end else - msg = ' Print Error ! Please contact to service' - #if ENV["SERVER_MODE"] != 'cloud' + if ENV["SERVER_MODE"] != 'cloud' + + msg = ' Print Error ! Please contact to service' ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' - #end - if !sidekiq.nil? + end + 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 + 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) - #if ENV["SERVER_MODE"] != 'cloud' - ActionCable.server.broadcast "order_queue_station_channel",order: assign_order - #end - end - end #Process order items and send to order queue def self.pay_process_order_queue(id,table_id) - if ENV["SERVER_MODE"] != 'cloud' + # if ENV["SERVER_MODE"] != 'cloud' sidekiq = Lookup.find_by_lookup_type("sidekiq") if !sidekiq.nil? OrderQueueProcessorJob.perform_later(id, table_id) @@ -359,7 +361,7 @@ class Order < ApplicationRecord assign_order = AssignedOrderItem.assigned_order_item_by_job(id) ActionCable.server.broadcast "order_queue_station_channel",order: assign_order end - end + # end end def check_cup_status(status) diff --git a/app/models/sale.rb b/app/models/sale.rb index 9e621737..d365771e 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2692,6 +2692,7 @@ end query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") .joins("join orders as orders on orders.order_id = sale_orders.order_id") query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service") + query = query.where("DATE_FORMAT(sales.created_at,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d')) .group("sales.sale_id") end diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 65ea665b..38d30fa8 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -29,7 +29,7 @@ <%end%> -