git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SaleItemPdf update

Browse Source
This commit is contained in:
Zoey
2019-06-03 16:50:54 +06:30
parent 4b73920e18 2e342d7859
commit b42e43417e
7 changed files with 191 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -82,9 +82,12 @@ For ReceiptBillA5Pdf
For ReceiptBillAltName options For ReceiptBillAltName options
1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 } 1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 }
For CloseCashierPrint with Star Printer For Using Star Printer
1) settings/print_settings *** Need to change these print settings
a) Unique Code => CloseCashierStarPdf 1) settings/print_settings => OrderItemStarPdf
2) settings/print_settings => ReceiptBillStarPdf
3) settings/print_settings => SaleItemsStarPdf
*** Other print settings aren't need to change.
For Sale Items Summary Include at CloseCashierPrint For Sale Items Summary Include at CloseCashierPrint
1) settings/print_settings 1) settings/print_settings

4
app/controllers/oqs/print_controller.rb
View File

@@ -5,12 +5,14 @@ class Oqs::PrintController < ApplicationController
# if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
printer = PrintSetting.all printer = PrintSetting.all
unique_code="OrderItemPdf" unique_code="OrderItemStarPdf"
if !order_slim_pdf.empty? if !order_slim_pdf.empty?
if !printer.empty? if !printer.empty?
printer.each do |printer_setting| printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderItemPdf' if printer_setting.unique_code == 'OrderItemPdf'
unique_code="OrderItemPdf" unique_code="OrderItemPdf"
elsif printer_setting.unique_code == 'OrderItemStarPdf'
unique_code="OrderItemStarPdf"
elsif printer_setting.unique_code == 'OrderItemSlimPdf' elsif printer_setting.unique_code == 'OrderItemSlimPdf'
unique_code="OrderItemSlimPdf" unique_code="OrderItemSlimPdf"
elsif printer_setting.unique_code == 'OrderSetItemPdf' elsif printer_setting.unique_code == 'OrderSetItemPdf'

4
app/controllers/reports/saleitem_controller.rb
View File

@@ -127,8 +127,8 @@ class Reports::SaleitemController < BaseReportController
end end
# get printer info # get printer info
print_settings = PrintSetting.find_by_unique_code('CloseCashierPdf') # SaleItemsPdf print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf
print_settings_star = PrintSetting.find_by_unique_code('CloseCashierStarPdf') print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf')
if print_settings.nil? if print_settings.nil?
if !print_settings_star.nil? if !print_settings_star.nil?

4
app/models/printer/order_queue_printer.rb
View File

@@ -103,7 +103,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
if print_settings.unique_code == 'OrderItemPdf' if print_settings.unique_code == 'OrderItemPdf'
pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
elsif print_settings.unique_code == 'OrderItemStarPdf' elsif print_settings.unique_code == 'OrderItemStarPdf'
pdf = OrderItemStarPdfnew(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) pdf = OrderItemStarPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
elsif print_settings.unique_code == 'OrderItemSlimPdf' elsif print_settings.unique_code == 'OrderItemSlimPdf'
pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty)
elsif print_settings.unique_code == 'OrderSetItemPdf' elsif print_settings.unique_code == 'OrderSetItemPdf'
@@ -182,6 +182,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
# Print for orders in booking # Print for orders in booking
def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="") def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="")
puts 'PrintSetting!!!'
puts print_setting.print_copies
# Must be one print # Must be one print
if print_settings.print_copies == 0 if print_settings.print_copies == 0
print_settings.print_copies = 1 print_settings.print_copies = 1

10
app/pdf/receipt_bill_star_pdf.rb
View File

@@ -9,12 +9,12 @@ class ReceiptBillStarPdf < Prawn::Document
self.header_font_size = printer_settings.header_font_size.to_i self.header_font_size = printer_settings.header_font_size.to_i
self.item_font_size = printer_settings.item_font_size.to_i self.item_font_size = printer_settings.item_font_size.to_i
self.margin = 0 self.margin = 0
self.price_width = 50 self.price_width = 60
self.qty_width = 23 self.qty_width = 20
self.total_width = 50 self.total_width = 40
self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width)) self.item_width = 73
self.item_height = 15 self.item_height = 15
self.item_description_width = (self.page_width-20) / 2 self.item_description_width = (self.page_width-30) / 2
self.label_width = 90 self.label_width = 90
self.description_width = 140 self.description_width = 140

BIN
dump.rdb
View File

Binary file not shown.