From 767386e750a0db86740612a458bb5a1d4c81d56c Mon Sep 17 00:00:00 2001 From: EikhantMon Date: Fri, 1 Jun 2018 17:13:40 +0630 Subject: [PATCH] change item_width in customise pdf --- app/models/printer/order_queue_printer.rb | 8 ++++---- app/pdf/order_item_customise_pdf.rb | 2 +- app/pdf/order_item_pdf.rb | 2 +- app/pdf/order_item_slim_customise_pdf.rb | 2 +- app/pdf/order_set_item_customise_pdf.rb | 2 +- app/pdf/order_summary_customise_pdf.rb | 2 +- app/pdf/order_summary_set_customise_pdf.rb | 2 +- app/pdf/order_summary_slim_customise_pdf.rb | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 234140a5..e4eebc69 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -19,7 +19,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # check for item not to show - if order_item[0].price != 0 + # if order_item[0].price != 0 if !print_setting.empty? print_setting.each do |print_settings| if print_settings.unique_code == 'OrderItemPdf' @@ -30,16 +30,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemCustomisePdf' pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - elsif print_settings.unique_code == 'OrderSetItemCustomisePdf' + elsif print_settings.unique_code == 'OrderSetItemCustomisePdf' pdf = OrderSetItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf' pdf = OrderItemSlimCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) end end end - end + # end - pdf.render_file filename + pdf.render_file filename if oqs.print_copy #no print in cloud server diff --git a/app/pdf/order_item_customise_pdf.rb b/app/pdf/order_item_customise_pdf.rb index 4124a075..9fd2d3e7 100644 --- a/app/pdf/order_item_customise_pdf.rb +++ b/app/pdf/order_item_customise_pdf.rb @@ -97,7 +97,7 @@ class OrderItemCustomisePdf < Prawn::Document text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 10,y_position], :width => self.qty_width) do text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 9f7ce125..c3bf566f 100755 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -53,7 +53,7 @@ class OrderItemPdf < Prawn::Document def order_info(order_no, order_by, order_at) y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left + text "OrderNo: #{order_no}", :size => self.item_font_size,:align => :left end move_down 2 diff --git a/app/pdf/order_item_slim_customise_pdf.rb b/app/pdf/order_item_slim_customise_pdf.rb index df0cef46..8c03adf5 100644 --- a/app/pdf/order_item_slim_customise_pdf.rb +++ b/app/pdf/order_item_slim_customise_pdf.rb @@ -98,7 +98,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document text "#{order_item_slim.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do text "[#{number_with_precision(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_set_item_customise_pdf.rb b/app/pdf/order_set_item_customise_pdf.rb index 4a1890eb..a6859189 100644 --- a/app/pdf/order_set_item_customise_pdf.rb +++ b/app/pdf/order_set_item_customise_pdf.rb @@ -96,7 +96,7 @@ class OrderSetItemCustomisePdf < Prawn::Document text "#{order_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do text "[#{number_with_precision(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_summary_customise_pdf.rb b/app/pdf/order_summary_customise_pdf.rb index 666d6755..30a32117 100644 --- a/app/pdf/order_summary_customise_pdf.rb +++ b/app/pdf/order_summary_customise_pdf.rb @@ -103,7 +103,7 @@ class OrderSummaryCustomisePdf < Prawn::Document end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 10,y_position], :width => self.qty_width) do text " [#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_summary_set_customise_pdf.rb b/app/pdf/order_summary_set_customise_pdf.rb index 823664eb..5f12fc4c 100644 --- a/app/pdf/order_summary_set_customise_pdf.rb +++ b/app/pdf/order_summary_set_customise_pdf.rb @@ -102,7 +102,7 @@ class OrderSummarySetCustomisePdf < Prawn::Document end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do text "[#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end diff --git a/app/pdf/order_summary_slim_customise_pdf.rb b/app/pdf/order_summary_slim_customise_pdf.rb index 4e4df0f9..2b7402af 100644 --- a/app/pdf/order_summary_slim_customise_pdf.rb +++ b/app/pdf/order_summary_slim_customise_pdf.rb @@ -105,7 +105,7 @@ class OrderSummarySlimCustomisePdf < Prawn::Document end - bounding_box([self.item_width,y_position], :width => self.qty_width) do + bounding_box([self.item_width - 5,y_position], :width => self.qty_width) do text "[#{number_with_precision(odi.qty, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left end