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

Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-22 14:58:17 +06:30
parent b13b0afa6c f8cab803f8
commit f44abd5192
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/controllers/origami/redeem_payments_controller.rb
View File

@@ -6,8 +6,24 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
sale_data = Sale.find_by_sale_id(@sale_id) sale_data = Sale.find_by_sale_id(@sale_id)
# limit redeem_amount # limit redeem_amount
rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items) # rebate_prices = SaleItem.calculate_food_beverage(sale_data.sale_items)
nonrebate_prices = sale_data.total_amount - rebate_prices # nonrebate_prices = sale_data.total_amount - rebate_prices
# @payparcount = 0
# others = 0
# sale_data.sale_payments.each do |sale_payment|
# if sale_payment.payment_method == "paypar"
# @payparcount = @payparcount + sale_payment.payment_amount
# else
# others = others + sale_payment.payment_amount
# end
# end
# non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax)
# if non_rebate_exceed < 0
# @redeem_prices = rebate_prices - @payparcount
# else
# @redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
# end
@payparcount = 0 @payparcount = 0
others = 0 others = 0
sale_data.sale_payments.each do |sale_payment| sale_data.sale_payments.each do |sale_payment|
@@ -17,12 +33,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
others = others + sale_payment.payment_amount others = others + sale_payment.payment_amount
end end
end end
non_rebate_exceed = others - (nonrebate_prices + sale_data.total_tax) @redeem_prices = sale_data.grand_total - @payparcount -others
if non_rebate_exceed < 0
@redeem_prices = rebate_prices - @payparcount
else
@redeem_prices = rebate_prices - @payparcount -non_rebate_exceed
end
if sale_data if sale_data
if sale_data.customer_id if sale_data.customer_id