Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-08-26 11:03:03 +06:30
41 changed files with 1592 additions and 1153 deletions

View File

@@ -482,7 +482,8 @@ class CloseCashierPdf < Prawn::Document
def other_charges_detail(total_other_charges)
total_charges = 0
total_charges_items = 0
p "total other charges<========================="
p total_other_charges
unless total_other_charges.nil?
y_position = cursor
bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do
@@ -496,6 +497,7 @@ class CloseCashierPdf < Prawn::Document
total_other_charges.each do |charges|
move_down 3
p charges['product_name']
add_item_line(charges['product_name'], charges['unit_price'].to_i, charges['total_item'].to_i, charges['grand_total'].to_i)
total_charges_items += charges['total_item'].to_i