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

order reservation data

Browse Source
This commit is contained in:
phyusin
2018-06-25 17:18:15 +06:30
parent 9a86ff976a
commit bc3e5ca869
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/reports/order_reservation/index.html.erb
View File

@@ -95,6 +95,7 @@
discount_amount = order_reservation.discount_amount discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0 delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge convenience_charge = order_reservation.convenience_charge
if !JSON.parse(order_reservation.taxes).empty?
JSON.parse(order_reservation.taxes).each do |tax_data| JSON.parse(order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax" if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1] delivery_tax = tax_data[1]
@@ -104,6 +105,7 @@
commercial_tax = tax_data[1] commercial_tax = tax_data[1]
end end
end end
end
total_discount_amount += discount_amount.to_f total_discount_amount += discount_amount.to_f
total_delivery_fee += delivery_fee.to_f total_delivery_fee += delivery_fee.to_f
total_convenience_charge += convenience_charge.to_f total_convenience_charge += convenience_charge.to_f

3
app/views/reports/order_reservation/index.xls.erb
View File

@@ -68,7 +68,7 @@
discount_amount = order_reservation.discount_amount discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0 delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge convenience_charge = order_reservation.convenience_charge
if !JSON.parse(order_reservation.taxes).empty?
JSON.parse(order_reservation.taxes).each do |tax_data| JSON.parse(order_reservation.taxes).each do |tax_data|
if tax_data[0] == "delivery_tax" if tax_data[0] == "delivery_tax"
delivery_tax = tax_data[1] delivery_tax = tax_data[1]
@@ -78,6 +78,7 @@
commercial_tax = tax_data[1] commercial_tax = tax_data[1]
end end
end end
end
total_discount_amount += discount_amount.to_f total_discount_amount += discount_amount.to_f
total_delivery_fee += delivery_fee.to_f total_delivery_fee += delivery_fee.to_f