diff --git a/README.md b/README.md index fd8ad10d..538c08c4 100755 --- a/README.md +++ b/README.md @@ -58,7 +58,11 @@ For Order Printing 4)) ********* Order Customise PDF ********* 1) settings/print_settings (a) Unique Code => OrderItemCustomisePdf & OrderSummaryCustomisePdf - (b) Can change Header font size and Item Font Size as you like + (b) Can change Header font size and Item Font Size as you like + 5)) ********* Order Set Pdf ********* + 1) settings/print_settings + (a) Unique Code => OrderSetItemCustomisePdf & OrderSummarySetCustomisePdf + (b) Can change Header font size and Item Font Size as you like For ReceiptBillA5Pdf *** change ReceiptBillPdf to ReceiptBillA5Pdf diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 0c3703fe..d9982522 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -244,6 +244,8 @@ class Api::OrdersController < Api::ApiController unique_code="OrderSetItemPdf" elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" + elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' + unique_code="OrderSetItemCustomisePdf" end end end diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index f86db74b..292b16fd 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -61,6 +61,8 @@ class Oqs::EditController < BaseOqsController unique_code="OrderSetItemPdf" elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" + elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' + unique_code="OrderSetItemCustomisePdf" end end end diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 170add96..86422ea0 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -17,6 +17,8 @@ class Oqs::PrintController < ApplicationController unique_code="OrderSetItemPdf" elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" + elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' + unique_code="OrderSetItemCustomisePdf" end end end @@ -64,6 +66,8 @@ class Oqs::PrintController < ApplicationController unique_code="OrderSummarySetPdf" elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' unique_code="OrderSummaryCustomisePdf" + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + unique_code="OrderSummarySetCustomisePdf" end end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 0f67349f..3728f466 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -219,6 +219,8 @@ class OrderQueueStation < ApplicationRecord unique_code="OrderSummarySetPdf" elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' unique_code="OrderSummaryCustomisePdf" + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + unique_code="OrderSummarySetCustomisePdf" end end end @@ -249,6 +251,8 @@ class OrderQueueStation < ApplicationRecord unique_code="OrderSetItemPdf" elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" + elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' + unique_code="OrderSetItemCustomisePdf" end end end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index e4e493b7..488e74fc 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -29,6 +29,8 @@ 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' + pdf = OrderSetItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) end end end @@ -89,6 +91,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderItemCustomisePdf' 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) end end end @@ -125,6 +129,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderSummaryCustomisePdf' 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) end end end @@ -180,6 +186,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderItemCustomisePdf' 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) end end end @@ -217,6 +225,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderSummaryCustomisePdf' 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) end end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 24ac1259..b1506aa5 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -16,6 +16,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSetItemPdf.new elsif printer_setting.unique_code == 'OrderItemCustomisePdf' pdf = OrderItemCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' + pdf = OrderSetItemCustomisePdf.new end end end @@ -43,6 +45,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + pdf = OrderSummarySetCustomisePdf.new end end end @@ -70,6 +74,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + pdf = OrderSummarySetCustomisePdf.new end end end @@ -97,6 +103,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + pdf = OrderSummarySetCustomisePdf.new end end end @@ -124,6 +132,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + pdf = OrderSummarySetCustomisePdf.new end end end @@ -151,6 +161,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummarySetPdf.new elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new + elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' + pdf = OrderSummarySetCustomisePdf.new end end end diff --git a/app/pdf/order_item_customise_pdf.rb b/app/pdf/order_item_customise_pdf.rb index 4124a075..4ba590ef 100644 --- a/app/pdf/order_item_customise_pdf.rb +++ b/app/pdf/order_item_customise_pdf.rb @@ -9,7 +9,7 @@ class OrderItemCustomisePdf < Prawn::Document self.order_no_font_size = 8 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 40 + 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 diff --git a/app/pdf/order_set_item_customise_pdf.rb b/app/pdf/order_set_item_customise_pdf.rb new file mode 100644 index 00000000..48dcaf7f --- /dev/null +++ b/app/pdf/order_set_item_customise_pdf.rb @@ -0,0 +1,160 @@ +class OrderSetItemCustomisePdf < 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,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(print_settings,order_set_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.order_no_font_size = 8 + 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 + + 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_set_item.dining.nil? + text "#{ order_set_item.type + '-' + order_set_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 + + #order_info + order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at) + + # order items + order_set_items(order_set_item, 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.order_no_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.order_no_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.order_no_font_size,:align => :left + end + + stroke_horizontal_rule + + move_down 10 + end + + # Write Order items to PDF + def order_set_items(order_set_item, options, alt_name, precision, before_updated_qty) + y_position = cursor + + #Add Order Item + add_order_set_items(order_set_item, 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_set_item.qty, precision) + move_down 5 + end + + # Add order items under order info + def add_order_set_items(order_set_item, options, alt_name, precision) + y_position = cursor + + move_down 5 + + bounding_box([0,y_position], :width => self.item_width) do + 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 + text "[#{number_with_precision(order_set_item.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_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left + + end + + if alt_name + if order_set_item.alt_name + move_down 4 + font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{order_set_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + end + end + end + + #add set menu items + if !order_set_item.set_menu_items.nil? + set_menu_items = JSON.parse(order_set_item.set_menu_items) + if !set_menu_items.empty? + # json_item_instance_code = nil + set_menu_items.each do |set_item| + # if set_item["item_instance_code"] != json_item_instance_code + item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name + move_down 2 + text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true + # end + # json_item_instance_code = set_item["item_instance_code"] + end + end + end + + if !options.empty? + move_down 5 + + # 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 5 + + 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 5 + + # 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 diff --git a/app/pdf/order_summary_customise_pdf.rb b/app/pdf/order_summary_customise_pdf.rb index 666d6755..dd3bdbf0 100644 --- a/app/pdf/order_summary_customise_pdf.rb +++ b/app/pdf/order_summary_customise_pdf.rb @@ -9,7 +9,7 @@ class OrderSummaryCustomisePdf < Prawn::Document self.order_no_font_size = 8 self.margin = 0 self.price_width = 40 # No Need for item - self.qty_width = 40 + 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 diff --git a/app/pdf/order_summary_set_customise_pdf.rb b/app/pdf/order_summary_set_customise_pdf.rb new file mode 100644 index 00000000..037192c1 --- /dev/null +++ b/app/pdf/order_summary_set_customise_pdf.rb @@ -0,0 +1,162 @@ +class OrderSummarySetCustomisePdf < 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,:order_no_font_size,:item_height,:qty_width,:total_width,:item_description_width + 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.order_no_font_size = 8 + 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 + + 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 5 + + #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.order_no_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.order_no_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.order_no_font_size,:align => :left + end + + stroke_horizontal_rule + + move_down 10 + end + + # Write Order items to PDF + def order_items(order_item, alt_name, precision) + y_position = cursor + + #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 5 + + 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_code} - #{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_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + + end + + if alt_name + 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 + + #add set menu items + if !odi.set_menu_items.nil? + set_menu_items = JSON.parse(odi.set_menu_items) + if !set_menu_items.empty? + # json_item_instance_code = nil + set_menu_items.each do |set_item| + # if set_item["item_instance_code"] != json_item_instance_code + item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name + move_down 2 + text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true + # end + # json_item_instance_code = set_item["item_instance_code"] + end + end + end + + # add option + options = odi.options == "[]"? "" : odi.options + + if options != "" + move_down 5 + + 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 5 + end + + move_down 5 + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, (self.page_width - self.margin) + move_down 5 + # end + end + end +end