From bc922a68c813fa7ff6154a1f4b4fe362daf0899d Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 28 Mar 2018 16:17:41 +0630 Subject: [PATCH] Add Moved By in MoveTablePdf --- app/controllers/origami/movetable_controller.rb | 7 ++++--- app/models/printer/receipt_printer.rb | 4 ++-- app/pdf/move_table_pdf.rb | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 61af7458..09d9669e 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -71,15 +71,16 @@ class Origami::MovetableController < BaseOrigamiController @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) # get printer info - @from = (DiningFacility.find(change_from)).name - @to = (DiningFacility.find(change_to)).name + @from = (DiningFacility.find(change_from)).name + @to = (DiningFacility.find(change_to)).name @type = (DiningFacility.find(change_to)).type + @moved_by = @current_user.name @date = DateTime.now @shop = Shop::ShopDetail unique_code = "MoveTablePdf" print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type) + printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by) end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index a55b737d..abc4c49c 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -239,11 +239,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Move Table Print - def print_move_table(printer_settings,to,from,shop_detail,date,type) + def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by) #Use CUPS service #Generate PDF #Print - pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type) + pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by) pdf.render_file "tmp/print_move_table.pdf" self.print("tmp/print_move_table.pdf") end diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb index 4d4463bc..7b4ad8e4 100644 --- a/app/pdf/move_table_pdf.rb +++ b/app/pdf/move_table_pdf.rb @@ -1,6 +1,6 @@ class MoveTablePdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(printer_settings,to,from,shop_detail,date,type) + def initialize(printer_settings,to,from,shop_detail,date,type,moved_by) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.margin = 5 @@ -32,7 +32,7 @@ class MoveTablePdf < Prawn::Document header(printer_settings.name,type) - call_move_table(to,from,date,type) + call_move_table(to,from,date,type,moved_by) move_down 5 stroke_horizontal_rule @@ -41,17 +41,18 @@ class MoveTablePdf < Prawn::Document end def header (name,type) - text "Move #{type}", :left_margin => -10, :size => self.header_font_size,:align => :center + text "Move #{type}", :left_margin => -10, :size => self.header_font_size.to_i + 3,:align => :center # move_down self.item_height move_down 5 stroke_horizontal_rule move_down 5 end - def call_move_table (to,from,date,type) + def call_move_table (to,from,date,type,moved_by) move_down 3 text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size text "Change [#{from}] To [#{to}]", :left_margin => -10, :size => self.header_font_size + text "Moved By : #{moved_by}", :left_margin => -10, :size => self.header_font_size end