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

check OQS edit process

Browse Source
This commit is contained in:
phyusin
2017-12-01 16:23:50 +06:30
parent 24284b4361
commit 6bbac9d14c
4 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/printer/order_queue_printer.rb
View File

@@ -1,6 +1,6 @@
class Printer::OrderQueuePrinter < Printer::PrinterWorker
def print_order_item(print_settings,oqs,order_id, instance_code, print_status, options="")
def print_order_item(print_settings,oqs, order_items_id, order_id, instance_code, print_status, options="")
#Use CUPS service
#Generate PDF
#Print
@@ -10,7 +10,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
print_settings.save!
end
order_item = print_query('order_item', instance_code) #OrderItem.find_by_item_code(item_code)
order_item = print_query('order_item', order_items_id) #OrderItem.find_by_item_code(item_code)
filename = "tmp/order_item.pdf"
@@ -147,7 +147,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id
left join menu_items as item ON item.item_code = order_items.item_code")
.where("order_items.item_instance_code = '#{ id }'")
.where("order_items.order_items_id = '#{ id }'")
.group("order_items.item_code")
elsif type == "order_summary"
OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")