update no table oqs print
This commit is contained in:
@@ -164,7 +164,7 @@ class Origami::PaymentsController < BaseOrigamiController
|
||||
end
|
||||
|
||||
booking.booking_orders.each do |order|
|
||||
Order.pay_process_order_queue(order.order_id,table_id,sale_id)
|
||||
Order.pay_process_order_queue(order.order_id,table_id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class OrderQueueProcessorJob < ApplicationJob
|
||||
queue_as :default
|
||||
|
||||
def perform(order_id, table_id,sale_id=nil)
|
||||
def perform(order_id, table_id)
|
||||
# Do something later
|
||||
#Order ID
|
||||
order = Order.find(order_id)
|
||||
@@ -9,7 +9,7 @@ class OrderQueueProcessorJob < ApplicationJob
|
||||
#Execute orders and send to order stations
|
||||
if order
|
||||
oqs = OrderQueueStation.new
|
||||
oqs.process_order(order, table_id,sale_id)
|
||||
oqs.process_order(order, table_id)
|
||||
end
|
||||
|
||||
assign_order = AssignedOrderItem.assigned_order_item_by_job(order_id)
|
||||
|
||||
@@ -309,9 +309,9 @@ class Order < ApplicationRecord
|
||||
end
|
||||
|
||||
#Process order items and send to order queue
|
||||
def self.pay_process_order_queue(id,table_id,sale_id=nil)
|
||||
def self.pay_process_order_queue(id,table_id)
|
||||
#Send to background job for processing
|
||||
OrderQueueProcessorJob.perform_later(id, table_id,sale_id)
|
||||
OrderQueueProcessorJob.perform_later(id, table_id)
|
||||
end
|
||||
|
||||
def check_cup_status(status)
|
||||
|
||||
@@ -13,14 +13,14 @@ class OrderQueueStation < ApplicationRecord
|
||||
# validations
|
||||
validates_presence_of :station_name, :printer_name
|
||||
|
||||
def process_order (order, table_id,sale_id=nil)
|
||||
def process_order (order, table_id)
|
||||
|
||||
oqs_stations = OrderQueueStation.active
|
||||
|
||||
|
||||
order_items = order.order_items
|
||||
|
||||
if table_id > 0
|
||||
if table_id.to_i > 0
|
||||
# get dining
|
||||
dining = DiningFacility.find(table_id)
|
||||
oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
|
||||
@@ -64,14 +64,7 @@ class OrderQueueStation < ApplicationRecord
|
||||
end
|
||||
end
|
||||
else
|
||||
# get dining
|
||||
sale = Sale.find(sale_id).shift_sale_id
|
||||
terminal_by_zones = CashierTerminalByZones.where("cashier_terminal_id=#{shift.cashier_terminal_id}")
|
||||
|
||||
# ToDo per item per printer
|
||||
terminal_by_zones.each do |tbz|
|
||||
OrderQueueProcessByZone.where("zone_id=#{tbz.zone_id}").find_each do |oqpbz|
|
||||
oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
|
||||
oqs_stations.each do |oqs|
|
||||
is_auto_printed = false
|
||||
oqs_order_items = []
|
||||
|
||||
@@ -105,7 +98,6 @@ class OrderQueueStation < ApplicationRecord
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end #end else
|
||||
end
|
||||
|
||||
|
||||
@@ -37,8 +37,12 @@ class OrderItemPdf < Prawn::Document
|
||||
# font "public/fonts/Zawgyi-One.ttf"
|
||||
# font "public/fonts/padauk.ttf"
|
||||
#font "public/fonts/Chinese.ttf"
|
||||
|
||||
if order_item.dining.to_i > 0
|
||||
text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||
else
|
||||
text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||
end
|
||||
|
||||
stroke_horizontal_rule
|
||||
move_down 3
|
||||
|
||||
|
||||
@@ -36,8 +36,12 @@ class OrderSummaryPdf < Prawn::Document
|
||||
|
||||
# font "public/fonts/Zawgyi-One.ttf"
|
||||
# font "public/fonts/padauk.ttf"
|
||||
|
||||
if order[0].dining.to_i > 0
|
||||
text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||
else
|
||||
text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
|
||||
end
|
||||
|
||||
stroke_horizontal_rule
|
||||
move_down 5
|
||||
|
||||
|
||||
Reference in New Issue
Block a user