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

improve receipt/details reports and implement number formatting

Browse Source 
1) eager load reports for receipt/details
2) introduce number_format lookups to replace print_settings for number formatting
3) implement NumberFormattable concern, reference number_format lookups or print_settings if not exist, to get number format settings and number formatting
4) replace rails NumberHelper.number_with_precision with NumberFormattable.number_format hopefully to reduce overhead, formatting numbers for huge lists of data
This commit is contained in:
Thein Lin Kyaw
2019-11-25 23:17:53 +06:30
parent a36e170d94
commit 3c1cc737b5
71 changed files with 1338 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
app/pdf/receipt_bill_order_pdf.rb
View File

@@ -1,5 +1,5 @@
class ReceiptBillOrderPdf < Prawn::Document
include ActionView::Helpers::NumberHelper
include NumberFormattable
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, :description_width, :price_num_width, :line_move
@@ -27,11 +27,6 @@ class ReceiptBillOrderPdf < Prawn::Document
#setting page margin and width
super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
#precision checked
if printer_settings.precision.to_i > 2
printer_settings.precision = 2
end
# db font setup
if printer_settings.font != ""
font_families.update("#{printer_settings.font}" => {
@@ -47,19 +42,13 @@ class ReceiptBillOrderPdf < Prawn::Document
# font "public/fonts/Zawgyi-One.ttf"
# font "public/fonts/padauk.ttf"
if printer_settings.delimiter
delimiter = ","
else
delimiter = ""
end
header(shop_details)
stroke_horizontal_rule
cashier_info(sale_data, customer_name, latest_order_no,order_reservation)
line_items(sale_items,printer_settings.precision,delimiter,order_reservation)
all_total(sale_data,printer_settings.precision,delimiter,order_reservation)
line_items(sale_items,precision,delimiter,order_reservation)
all_total(sale_data,precision,delimiter,order_reservation)
footer(printed_status)
end
@@ -78,13 +67,13 @@ class ReceiptBillOrderPdf < Prawn::Document
def cashier_info(sale_data, customer_name, latest_order_no,order_reservation)
move_down line_move
# move_down 2
y_position = cursor
bounding_box([0, y_position], :width =>self.label_width , :height => self.item_height) do
text "Order Date " , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{order_reservation.created_at.strftime('%d-%m-%Y %H:%M %p')}", :size => self.item_font_size,:align => :right
end
@@ -92,7 +81,7 @@ class ReceiptBillOrderPdf < Prawn::Document
y_position = cursor
bounding_box([0, y_position], :width =>self.label_width , :height => self.item_height) do
text "Requested Date Time " , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{order_reservation.requested_time.strftime('%d-%m-%Y %H:%M %p')}", :size => self.item_font_size,:align => :right
end
@@ -100,7 +89,7 @@ class ReceiptBillOrderPdf < Prawn::Document
y_position = cursor
bounding_box([0, y_position], :width =>self.label_width , :height => self.item_height) do
text "Payment Type" , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{order_reservation.payment_type}", :size => self.item_font_size,:align => :right
end
@@ -108,7 +97,7 @@ class ReceiptBillOrderPdf < Prawn::Document
y_position = cursor
bounding_box([0, y_position], :width =>self.label_width , :height => self.item_height) do
text "#{customer_name} " , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do
text "Online Order", :size => self.item_font_size,:align => :right
end
@@ -167,14 +156,14 @@ class ReceiptBillOrderPdf < Prawn::Document
total_qty = 0.0
show_price = Lookup.find_by_lookup_type("show_price")
sale_items.each do |item|
# check for item not to show
# check for item not to show
if item.status != 'Discount' && item.qty > 0
if !show_price.nil? && show_price.value.to_i > 0 && item.price == 0
total_qty += item.qty
total_qty += item.qty
else
if item.price != 0
total_qty += item.qty
total_qty += item.qty
end
end
end
@@ -191,7 +180,7 @@ class ReceiptBillOrderPdf < Prawn::Document
qty = item.qty
total_price = item.price #item.qty*item.unit_price - comment for room charges
price = item.unit_price
# end
if !show_price.nil? && show_price.value.to_i>0
item_row(item,precision,delimiter,product_name,price,qty ,total_price)
@@ -209,8 +198,8 @@ class ReceiptBillOrderPdf < Prawn::Document
bounding_box([0,y_position], :width =>self.item_width + self.price_width, :height => self.item_height) do
text "Sub Total", :size => self.item_font_size,:align => :left
end
text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
text_box "#{number_with_precision(order_reservation.total_amount, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
text_box "#{number_format(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
text_box "#{number_format(order_reservation.total_amount, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
if !order_reservation.delivery_type.nil? && order_reservation.delivery_fee.to_f > 0
y_position = cursor
@@ -219,27 +208,27 @@ class ReceiptBillOrderPdf < Prawn::Document
end
bounding_box([self.description_width - 48,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{number_with_precision(order_reservation.delivery_fee, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
text "#{number_format(order_reservation.delivery_fee, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
end
if order_reservation.total_tax > 0
y_position = cursor
bounding_box([0, y_position], :width =>self.item_description_width , :height => self.item_height) do
text "Tax " , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{number_with_precision(order_reservation.total_tax, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
end
text "#{number_format(order_reservation.total_tax, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
end
y_position = cursor
bounding_box([0, y_position], :width =>self.item_description_width , :height => self.item_height) do
text "Convenience Charges " , :size => self.item_font_size, :align => :left
end
end
bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{number_with_precision(order_reservation.convenience_charge, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
text "#{number_format(order_reservation.convenience_charge, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
if order_reservation.discount_amount > 0
@@ -249,9 +238,9 @@ class ReceiptBillOrderPdf < Prawn::Document
end
bounding_box([self.item_description_width,y_position], :width =>self.label_width, :height => self.item_height) do
text "#{number_with_precision(order_reservation.discount_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
end
text "#{number_format(order_reservation.discount_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
end
end
end
#Change items rows
@@ -277,10 +266,10 @@ class ReceiptBillOrderPdf < Prawn::Document
bounding_box([0,y_position], :width =>self.item_width) do
text "#{product_name}", :size => self.item_font_size,:align => :left
end
# text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
# text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size
text_box "#{number_format(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
text_box "#{number_format(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
text_box "#{number_format(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
if show_alt_name
if !(item.product_alt_name).empty?
@@ -309,11 +298,11 @@ class ReceiptBillOrderPdf < Prawn::Document
end
bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
text "#{number_with_precision(order_reservation.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
end
text "#{number_format(order_reservation.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
end
move_down line_move
# sale_payment(sale_data,precision,delimiter)
# sale_payment(sale_data,precision,delimiter)
end
#Change Footer
@@ -326,10 +315,10 @@ class ReceiptBillOrderPdf < Prawn::Document
y_position = cursor
bounding_box([0, y_position], :width =>self.label_width) do
text "#{printed_status}",:style => :bold, :size => header_font_size - 1,:align => :left
end
end
bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size - 1,:align => :left
end
end
move_down line_move
end
@@ -351,4 +340,4 @@ class ReceiptBillOrderPdf < Prawn::Document
end
return status
end
end
end