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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-21 11:33:43 +06:30
parent 9c6edffd59 6a1af54cf9
commit 00ff9432fa
2 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/pdf/receipt_bill_pdf.rb
View File

@@ -209,18 +209,18 @@ class ReceiptBillPdf < Prawn::Document
product_name = item.product_name
if item.status = 'promotion' && (item.remark =='promotion nett price' || item.remark == 'promotion discount')
sub_total += -item.price #(item.qty*item.unit_price) - comment for room charges
qty = -item.qty
total_price = -item.price #item.qty*item.unit_price - comment for room charges
price = -item.unit_price
else
# if item.status = 'promotion' && (item.remark =='promotion nett price' || item.remark == 'promotion discount')
# sub_total += -item.price #(item.qty*item.unit_price) - comment for room charges
# qty = -item.qty
# total_price = -item.price #item.qty*item.unit_price - comment for room charges
# price = -item.unit_price
# else
sub_total += item.price #(item.qty*item.unit_price) - comment for room charges
qty = item.qty
total_price = item.price #item.qty*item.unit_price - comment for room charges
price = item.unit_price
end
# end
if !show_price.nil? && show_price.value.to_i>0