fixed pdf

2019-06-04 16:34:51 +06:30
parent ae4af75f52
commit 8a0950f9db
5 changed files with 30 additions and 29 deletions
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -11,7 +11,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
    options = order_item[0].options
    # filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf"

-    pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
+    # pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
    print_setting = PrintSetting.all

    # check for item not to show
--- a/app/pdf/move_table_pdf.rb
+++ b/app/pdf/move_table_pdf.rb
@@ -1,21 +1,22 @@
 class MoveTablePdf < Prawn::Document
    include ActionView::Helpers::NumberHelper
-    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
+    attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :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,moved_by,order_items)
    self.page_width = printer_settings.page_width
    self.page_height = printer_settings.page_height
    self.header_font_size = printer_settings.header_font_size.to_i
    self.item_font_size = printer_settings.item_font_size.to_i
    self.margin = 0
+    self.margin_top = 7
    self.price_width = 40 # No Need for item
    self.qty_width = 40
    self.total_width = 40  # No Need for item
    self.item_width = self.page_width - (self.qty_width - self.margin)
-    self.item_height = 15   
+    self.item_height = 15
    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
-    self.label_width=90  
+    self.label_width=90

-    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])

    # db font setup
    if printer_settings.font != ""
@@ -85,7 +86,7 @@ class MoveTablePdf < Prawn::Document
        move_down 5

        order_items.each do|odi|
-          # check for item not to show 
+          # check for item not to show
          # if odi.price != 0
            y_position = cursor

@@ -103,15 +104,15 @@ class MoveTablePdf < Prawn::Document
            bounding_box([0,y_position], :width => self.item_width) do
              text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
            end
-            
+
            if !(odi.alt_name).empty?
                move_down 4
                # font("public/fonts/NotoSansCJKtc-Regular.ttf") do
                  text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
                # end
            end
-                 
-        end        
+
+        end
    end

 end
--- a/app/pdf/move_table_star_pdf.rb
+++ b/app/pdf/move_table_star_pdf.rb
@@ -1,13 +1,12 @@
 class MoveTableStarPdf < Prawn::Document
    include ActionView::Helpers::NumberHelper
-    attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+    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,moved_by,order_items)
    self.page_width = printer_settings.page_width
    self.page_height = printer_settings.page_height
    self.header_font_size = printer_settings.header_font_size.to_i
    self.item_font_size = printer_settings.item_font_size.to_i
    self.margin = 0
-    self.margin_top = 10
    self.price_width = 40 # No Need for item
    self.qty_width = 40
    self.total_width = 40  # No Need for item
@@ -16,7 +15,7 @@ class MoveTableStarPdf < Prawn::Document
    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
    self.label_width=90

-    super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])

    # db font setup
    if printer_settings.font != ""
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,22 +1,23 @@
 class OrderItemPdf < Prawn::Document
  include ActionView::Helpers::NumberHelper
-  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
-  
+  attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
+
  def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty)
    self.page_width = print_settings.page_width
    self.page_height = print_settings.page_height
    self.header_font_size = print_settings.header_font_size.to_i
    self.item_font_size = print_settings.item_font_size.to_i
    self.margin = 0
+    self.margin_top = 7
    self.price_width = 40 # No Need for item
    self.qty_width = 40
    self.total_width = 40  # No Need for item
    self.item_width = self.page_width - (self.qty_width - self.margin)
-    self.item_height = 15   
+    self.item_height = 15
    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
-    self.label_width=90   
+    self.label_width=90

-    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
    # super(:margin => [10, 5, 30, 5], :page_size => [200,400])

    # db font setup
@@ -29,17 +30,17 @@ class OrderItemPdf < Prawn::Document
        })

        font "#{print_settings.font}"
-        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]      
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
    end
     # font "public/fonts/Zawgyi-One.ttf"
-     # font "public/fonts/padauk.ttf"  
-     #font "public/fonts/Chinese.ttf"     
+     # font "public/fonts/padauk.ttf"
+     #font "public/fonts/Chinese.ttf"
    if !order_item.dining.nil?
      text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
    else
      text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
    end
-    
+
    stroke_horizontal_rule
    move_down 3

@@ -51,31 +52,31 @@ class OrderItemPdf < Prawn::Document
  end

  # Write Order Information to PDF
-  def order_info(order_no, order_by, order_at) 
+  def order_info(order_no, order_by, order_at)
    #booking ID
    booking_id = get_booking_id(order_no)

    y_position = cursor
    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left    
+        text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left
    end

    move_down 2
    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
    y_position = cursor
    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left
    end

    move_down 2
    y_position = cursor
    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left
    end

    stroke_horizontal_rule
@@ -87,7 +88,7 @@ class OrderItemPdf < Prawn::Document
  def order_items(order_item, options, alt_name, precision, before_updated_qty)
    y_position = cursor

-    #Add Order Item    
+    #Add Order Item
    add_order_items(order_item, options, alt_name, precision)

    dash(1, :space => 1, :phase => 1)
@@ -155,7 +156,7 @@ class OrderItemPdf < Prawn::Document
    booking = Order.joins(" JOIN booking_orders bo ON bo.order_id = orders.order_id")
            .joins(" JOIN bookings b ON b.booking_id=bo.booking_id")
            .where("orders.order_id='#{order_no}'")
-            .first() 
+            .first()

    return booking.booking_id
  end
--- a/app/pdf/order_item_star_pdf.rb
+++ b/app/pdf/order_item_star_pdf.rb
@@ -8,7 +8,7 @@ class OrderItemStarPdf < Prawn::Document
    self.header_font_size = print_settings.header_font_size.to_i
    self.item_font_size = print_settings.item_font_size.to_i
    self.margin = 0
-    self.margin_top = 10
+    self.margin_top = 7
    self.price_width = 40 # No Need for item
    self.qty_width = 38
    self.total_width = 40  # No Need for item