From 6f8f6940e4774ccb5a8840814452c965154cd156 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 1 Dec 2017 17:37:41 +0630 Subject: [PATCH] remove edit controller for oqs print --- app/controllers/oqs/edit_controller.rb | 2 +- app/models/printer/order_queue_printer.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index bd7f94c8..e9c57284 100755 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -25,6 +25,6 @@ class Oqs::EditController < BaseOqsController print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings, oqs, order_item.order_items_id,order_item.order_id, order_item.item_instance_code, print_status=" (Cancel)" ) + order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_item.item_instance_code, print_status=" (Cancel)" ) end end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 541f1e9d..f6a2ab49 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,6 +1,6 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker - def print_order_item(print_settings,oqs, order_items_id, order_id, instance_code, print_status, options="") + def print_order_item(print_settings,oqs, 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', order_items_id) #OrderItem.find_by_item_code(item_code) + order_item = print_query('order_item', instance_code) #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.order_items_id = '#{ id }'") + .where("order_items.item_code = '#{ 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")