From e607fea8a3a1d037c3c5aa731a788d0453179625 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 5 Apr 2018 13:30:29 +0630 Subject: [PATCH] Modified in all pdf can access Header & Item Font Size from Database --- README.md | 7 ++++++- app/pdf/call_waiter_pdf.rb | 7 +++---- app/pdf/close_cashier_customise_pdf.rb | 4 ++-- app/pdf/close_cashier_pdf.rb | 4 ++-- app/pdf/crm_order_pdf.rb | 5 ++--- app/pdf/move_table_pdf.rb | 7 +++---- app/pdf/order_item_pdf.rb | 10 +++------- app/pdf/order_item_slim_pdf.rb | 10 +++------- app/pdf/order_set_item_pdf.rb | 10 +++------- app/pdf/order_summary_pdf.rb | 10 +++------- app/pdf/order_summary_set_pdf.rb | 8 ++------ app/pdf/order_summary_slim_pdf.rb | 8 ++------ app/pdf/queue_no_pdf.rb | 5 ++--- app/pdf/receipt_bill_a5_pdf.rb | 4 ++-- app/pdf/receipt_bill_pdf.rb | 4 ++-- app/pdf/stock_result_pdf.rb | 6 +++--- 16 files changed, 43 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index e19f7a51..ce5402ac 100755 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ For Extra Time For Order Item & Order Summary Slim *** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf 1) settings/print_settings + (a) Font is present => {Header font size:11, Item Font Size:9} + (b) Font is blank => {Header font size:12, Item Font Size:10} 2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 } * no need to change these files { app/controllers/oqs/edit_controller.rb @@ -53,7 +55,7 @@ For Order Item & Order Summary Slim For ReceiptBillA5Pdf *** change ReceiptBillPdf to ReceiptBillA5Pdf - 1) settings/print_settings , width:680, height:1450 + 1) settings/print_settings , width:680, height:1450, Header font Size:16, Item font size:14 2) settings/lookups => { type:print_settings, name:ReceiptBillA5Pdf, value:1 } For ReceiptBillAltName options @@ -62,6 +64,9 @@ For ReceiptBillAltName options For OrderSetPdf options *** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf 1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 } + 2) settings/print_settings + (a) Font is present => {Header font size:11, Item Font Size:9} + (b) Font is blank => {Header font size:12, Item Font Size:10} For Bank Integration setting 1) rake db:migrate for card_sale_trans, card_settle_trans diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb index a1ea756b..314d0c33 100644 --- a/app/pdf/call_waiter_pdf.rb +++ b/app/pdf/call_waiter_pdf.rb @@ -3,6 +3,8 @@ class CallWaiterPdf < Prawn::Document def initialize(printer_settings, table,time,shop_detail) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 35 self.qty_width = 20 @@ -27,9 +29,6 @@ class CallWaiterPdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header( shop_detail.name, printer_settings.name) call_waiter(table) @@ -68,4 +67,4 @@ class CallWaiterPdf < Prawn::Document # end -end +end \ No newline at end of file diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb index bcc27724..0080373c 100644 --- a/app/pdf/close_cashier_customise_pdf.rb +++ b/app/pdf/close_cashier_customise_pdf.rb @@ -5,6 +5,8 @@ class CloseCashierCustomisePdf < Prawn::Document def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 60 self.qty_width = 20 @@ -36,8 +38,6 @@ class CloseCashierCustomisePdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 #precision checked if printer_settings.precision.to_i > 2 diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 7ac7a130..04bbdcf8 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -5,6 +5,8 @@ class CloseCashierPdf < Prawn::Document def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 60 self.qty_width = 20 @@ -36,8 +38,6 @@ class CloseCashierPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 #precision checked if printer_settings.precision.to_i > 2 diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index a33b5fce..070f5654 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -3,6 +3,8 @@ class CrmOrderPdf < Prawn::Document def initialize(booking,order_items,printer_settings) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 10 # self.price_width = self.p_width / 2 self.price_width=80 @@ -31,9 +33,6 @@ class CrmOrderPdf < Prawn::Document font "#{printer_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - - self.header_font_size = 10 - self.item_font_size = 9 header( printer_settings.printer_name, printer_settings.name) stroke_horizontal_rule diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb index 7b4ad8e4..954f88e9 100644 --- a/app/pdf/move_table_pdf.rb +++ b/app/pdf/move_table_pdf.rb @@ -3,6 +3,8 @@ class MoveTablePdf < Prawn::Document 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.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 35 self.qty_width = 20 @@ -27,9 +29,6 @@ class MoveTablePdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header(printer_settings.name,type) call_move_table(to,from,date,type,moved_by) @@ -56,4 +55,4 @@ class MoveTablePdf < Prawn::Document end -end \ No newline at end of file +end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 58682d8a..89ddcdb6 100755 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -4,6 +4,8 @@ class OrderItemPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderItemPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb index 05add2c9..607adf14 100755 --- a/app/pdf/order_item_slim_pdf.rb +++ b/app/pdf/order_item_slim_pdf.rb @@ -4,6 +4,8 @@ class OrderItemSlimPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderItemSlimPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb index ce06081f..9668a0f5 100755 --- a/app/pdf/order_set_item_pdf.rb +++ b/app/pdf/order_set_item_pdf.rb @@ -4,6 +4,8 @@ class OrderSetItemPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderSetItemPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 17cf905c..5d5b9da8 100755 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -4,6 +4,8 @@ class OrderSummaryPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -25,13 +27,7 @@ class OrderSummaryPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb index 14b2f796..a16265d2 100755 --- a/app/pdf/order_summary_set_pdf.rb +++ b/app/pdf/order_summary_set_pdf.rb @@ -4,6 +4,8 @@ class OrderSummarySetPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,12 +28,6 @@ class OrderSummarySetPdf < Prawn::Document font "#{print_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb index c88061ea..e082203f 100755 --- a/app/pdf/order_summary_slim_pdf.rb +++ b/app/pdf/order_summary_slim_pdf.rb @@ -4,6 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document 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 = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,12 +28,6 @@ class OrderSummarySlimPdf < Prawn::Document font "#{print_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb index cce7eb94..adf824eb 100755 --- a/app/pdf/queue_no_pdf.rb +++ b/app/pdf/queue_no_pdf.rb @@ -3,6 +3,8 @@ class QueueNoPdf < Prawn::Document def initialize(printer_settings, queue) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 35 self.qty_width = 20 @@ -27,9 +29,6 @@ class QueueNoPdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header( "Beauty In the Pot", printer_settings.name) queue_no(queue) diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 604d99dd..a7cf21e2 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -5,6 +5,8 @@ class ReceiptBillA5Pdf < Prawn::Document def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 15 self.price_width = 120 self.qty_width = 50 @@ -43,8 +45,6 @@ class ReceiptBillA5Pdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 16 - self.item_font_size = 14 if printer_settings.delimiter delimiter = "," diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index c0299033..8bae5f60 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -6,6 +6,8 @@ class ReceiptBillPdf < Prawn::Document def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 0 self.price_width = 60 self.qty_width = 25 @@ -44,8 +46,6 @@ class ReceiptBillPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 if printer_settings.delimiter delimiter = "," diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb index 510ab317..dec667f7 100755 --- a/app/pdf/stock_result_pdf.rb +++ b/app/pdf/stock_result_pdf.rb @@ -4,6 +4,8 @@ class StockResultPdf < Prawn::Document def initialize(printer_settings, stockcheck, stockcheck_items, checker_name, shop_details) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size + self.item_font_size = printer_settings.item_font_size self.margin = 5 self.price_width = 40 self.qty_width = 20 @@ -35,9 +37,7 @@ class StockResultPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 +# font "public/fonts/padauk.ttf" header(shop_details)