diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index dd8bed28..80a09b47 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -33,6 +33,9 @@ $(document).ready(function(){ $('#order-items').text(orderItem); $('#order-qty').text(orderQty); + + $('.queue_station').removeClass('selected-item'); + $(this).addClass('selected-item'); }); // complete for queue item @@ -67,4 +70,14 @@ $(document).ready(function(){ } }); }); + + $('#print_order_item').on('click',function(){ + var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); + var params = { 'id':assigned_item_id }; + $.ajax({ + type: 'GET', + url: '/oqs/print/print/'+assigned_item_id, + success: function(data){ } + }); + }); }); diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 23a49d41..07c98b85 100644 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -14,3 +14,7 @@ .order-void { background-color: #FFCCDD; } + +.selected-item { + background-color: blue; +} diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 2b60fc3c..d22a464a 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -1,5 +1,8 @@ class Oqs::PrintController < ApplicationController def print - + assigned_item_id=params[:id] + assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('id='+assigned_item_id) + order_queue_printer= OrderQueuePrinter.new + order_queue_printer.print_order_item(assigned_order_item[0].order_id, assigned_order_item[0].item_code ) end end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 4e520ed9..869e12c4 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,11 +1,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker - def print_order_item(order_queue_id) + def print_order_item(order_id, item_code) #Use CUPS service #Generate PDF #Print pdf = OrderItemPdf.new - pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf" + pdf.render_file "tmp/order_item_queue_#{order_id}_#{item_code}" + ".pdf" self.print("tmp/receipt.pdf") end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 5527f530..af0f0642 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -69,6 +69,7 @@

+ + diff --git a/config/routes.rb b/config/routes.rb index df6e2466..30c0d827 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -100,7 +100,7 @@ Rails.application.routes.draw do post 'update_delivery', to: "home#update_delivery_status" - get 'print/print' + get 'print/print/:id', to: "print#print" #dashboard # end