conflict data

app/controllers/api/orders_controller.rb

@@ -242,6 +242,8 @@ class Api::OrdersController <  Api::ApiController
                     unique_code="OrderItemSlimPdf"
                   elsif printer_setting.unique_code == 'OrderSetItemPdf'
                     unique_code="OrderSetItemPdf"
+                  elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+                    unique_code="OrderItemSlimCustomisePdf"
                   elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
                     unique_code="OrderItemCustomisePdf"
                   elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'

app/controllers/oqs/edit_controller.rb

@@ -63,6 +63,8 @@ class Oqs::EditController < BaseOqsController
                   unique_code="OrderItemCustomisePdf"
                 elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
                   unique_code="OrderSetItemCustomisePdf"  
+                elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+                  unique_code="OrderItemSlimCustomisePdf"
                 end  
               end
             end   

app/controllers/oqs/print_controller.rb

@@ -19,6 +19,8 @@ class Oqs::PrintController < ApplicationController
               unique_code="OrderItemCustomisePdf"
             elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
               unique_code="OrderSetItemCustomisePdf"  
+            elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+              unique_code="OrderItemSlimCustomisePdf"
             end  
           end
         end
@@ -68,6 +70,8 @@ class Oqs::PrintController < ApplicationController
               unique_code="OrderSummaryCustomisePdf"
             elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
               unique_code="OrderSummarySetCustomisePdf" 
+            elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+              unique_code="OrderSummarySlimCustomisePdf"
             end  
           end
         end

app/models/order_queue_station.rb

@@ -209,6 +209,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip(oqs, order, order_items)
     printer = PrintSetting.all
     unique_code="OrderSummaryPdf"
+
     if !printer.empty?
       printer.each do |printer_setting|
         if printer_setting.unique_code == 'OrderSummaryPdf' 
@@ -219,8 +220,13 @@ class OrderQueueStation < ApplicationRecord
           unique_code="OrderSummarySetPdf"
         elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
           unique_code="OrderSummaryCustomisePdf"
+<<<<<<< HEAD
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           unique_code="OrderSummarySetCustomisePdf"  
+=======
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          unique_code="OrderSummarySlimCustomisePdf"
+>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
         end  
       end
     end 
@@ -241,6 +247,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip_item(oqs, order, assigned_items)
     printer = PrintSetting.all
     unique_code="OrderItemPdf"
+
     if !printer.empty?
       printer.each do |printer_setting|
         if printer_setting.unique_code == 'OrderItemPdf' 
@@ -251,8 +258,13 @@ class OrderQueueStation < ApplicationRecord
           unique_code="OrderSetItemPdf"
         elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
           unique_code="OrderItemCustomisePdf"
+<<<<<<< HEAD
         elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
           unique_code="OrderSetItemCustomisePdf"  
+=======
+        elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+          unique_code="OrderItemSlimCustomisePdf"
+>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
         end  
       end
     end

app/models/printer/order_queue_printer.rb

@@ -6,8 +6,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     #Print
     # Must be one print  
     if print_settings.print_copies == 0
-      print_settings.print_copies = 1
+       print_settings.print_copies = 1
-      print_settings.save!
+       print_settings.save!
     end
 
     order_item =  print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code)  
@@ -18,6 +18,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     print_setting = PrintSetting.all
 
     # check for item not to show 
+
     if order_item[0].price != 0 
       if !print_setting.empty?
         print_setting.each do |print_settings|
@@ -31,6 +32,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
           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
@@ -93,6 +96,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 pdf = OrderItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
               elsif print_settings.unique_code == 'OrderSetItemCustomisePdf'
                 pdf = OrderSetItemCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
+              elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
+                pdf = OrderItemSlimCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
               end
             end
           end 
@@ -131,6 +136,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
           elsif print_settings.unique_code == 'OrderSummarySetCustomisePdf'
             pdf = OrderSummarySetCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
+          elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
+            pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
           end
         end
       end 
@@ -188,6 +195,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 pdf = OrderItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
               elsif print_settings.unique_code == 'OrderSetItemCustomisePdf'
                 pdf = OrderSetItemCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
+              elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf'
+                pdf = OrderItemSlimCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty)
               end
             end
           end        
@@ -215,6 +224,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
       pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
+
       if !print_setting.empty?
         print_setting.each do |print_settings|
           if print_settings.unique_code == 'OrderSummaryPdf'
@@ -227,6 +237,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             pdf = OrderSummaryCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
           elsif print_settings.unique_code == 'OrderSummarySetCustomisePdf'
             pdf = OrderSummarySetCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
+          elsif print_settings.unique_code == 'OrderSummarySlimCustomisePdf'
+            pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
           end
         end
       end   

app/models/printer/receipt_printer.rb

@@ -6,6 +6,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     printer = PrintSetting.all
     pdf = OrderItemPdf.new
+
     if !printer.empty?
       printer.each do |printer_setting|
         if printer_setting.unique_code == 'OrderItemPdf' 
@@ -18,6 +19,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderItemCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
           pdf = OrderSetItemCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+          pdf = OrderItemSlimCustomisePdf.new
         end  
       end
     end    
@@ -35,6 +38,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     printer = PrintSetting.all
     pdf = OrderSummaryPdf.new
+
     if !printer.empty?
       printer.each do |printer_setting|
         if printer_setting.unique_code == 'OrderSummaryPdf' 
@@ -47,6 +51,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderSummaryCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           pdf = OrderSummarySetCustomisePdf.new  
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
         end  
       end
     end    
@@ -76,6 +82,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderSummaryCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
         end  
       end
     end        
@@ -105,6 +113,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderSummaryCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           pdf = OrderSummarySetCustomisePdf.new  
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
         end  
       end
     end  
@@ -134,6 +144,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderSummaryCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
         end  
       end
     end  
@@ -163,6 +175,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           pdf = OrderSummaryCustomisePdf.new
         elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
           pdf = OrderSummarySetCustomisePdf.new 
+        elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
+          pdf = OrderSummarySlimCustomisePdf.new
         end  
       end
     end  

app/pdf/order_item_slim_customise_pdf.rb

@@ -0,0 +1,145 @@
+class OrderItemSlimCustomisePdf < 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, :item_slim_font_size
+  def initialize(print_settings,order_item_slim, 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.price_width = 40 # No Need for item
+    self.qty_width = 25
+    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_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90 
+    self.item_slim_font_size=8
+
+    super(:margin => [print_settings.heading_space, 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
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]       
+    end
+     # font "public/fonts/Zawgyi-One.ttf"
+     # font "public/fonts/padauk.ttf"  
+     #font "public/fonts/Chinese.ttf"     
+    if !order_item_slim.dining.nil?
+      text "#{ order_item_slim.type + '-' + order_item_slim.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 1
+
+    #order_info
+    order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
+
+    # order items slim
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision, before_updated_qty)
+  end
+
+  # Write Order Information to PDF
+  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_slim_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_slim_font_size,:align => :left    
+    end
+
+    move_down 1
+    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_slim_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 3
+  end
+
+  # Write Order items to PDF
+
+  def order_items_slim(order_item_slim, options, alt_name, precision, before_updated_qty)
+    y_position = cursor
+
+    #Add Order Item    
+    add_order_items_slim(order_item_slim, options, alt_name, precision)
+
+    dash(1, :space => 1, :phase => 1)
+    stroke_horizontal_line 0, (self.page_width - self.margin)
+    add_updated_qty_text(before_updated_qty, order_item_slim.qty, precision)
+    move_down 1
+  end
+
+  # Add order items slim under order info
+  def add_order_items_slim(order_item_slim, options, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        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
+        text "[#{number_with_precision(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([0,y_position], :width => self.item_width) do
+      text "#{order_item_slim.item_name}", :size => self.item_font_size,:align => :left
+
+    end
+
+    # if alt_name
+    #     if order_item_slim.alt_name
+    #         move_down 1
+    #         font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+    #             text "(#{order_item_slim.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+    #         end
+    #     end
+    # end
+
+    if !options.empty?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+    end
+    move_down 1
+
+  end
+
+  #add updated qty text
+  def add_updated_qty_text(before_updated_qty, updated_qty, precision)
+    if before_updated_qty.to_i > 0 && !before_updated_qty.nil?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+        end
+    end
+  end
+
+end

app/pdf/order_summary_slim_customise_pdf.rb

@@ -0,0 +1,148 @@
+class OrderSummarySlimCustomisePdf < 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,:item_slim_font_size
+  def initialize(print_settings,order, print_status, order_items = nil,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.price_width = 40 # No Need for item
+    self.qty_width = 25
+    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_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90  
+    self.item_slim_font_size=8   
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    end
+
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+    if !order[0].dining.nil?
+      text "#{ order[0].type + '-' + order[0].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 1
+
+    #order_info
+    order_info(order[0].order_id, order[0].order_by,order[0].order_at)
+
+    # order items
+    if order_items == nil
+      order_items(order, alt_name, print_settings.precision)
+    else
+      order_items(order_items, alt_name, print_settings.precision)
+    end
+  end
+
+  # Write Order Information to PDF
+  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_slim_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_slim_font_size,:align => :left    
+    end
+
+    move_down 1
+    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_slim_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 1
+  end
+
+  # Write Order items to PDF
+  def order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+
+    move_down 1
+
+    #Add Order Item
+    add_order_items(order_item, alt_name, precision)
+    
+  end
+
+  # Add order items under order info
+  def add_order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    order_item.each do|odi|
+      # check for item not to show 
+      # if odi.price != 0
+        y_position = cursor
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+
+        bounding_box([self.item_width,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
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+        
+        if alt_name
+          if !(odi.alt_name).empty?
+            move_down 1
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+          end
+        end
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          move_down 1
+
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 1
+        end
+
+        move_down 1
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 1
+      # end
+    end        
+  end
+end