update addorder and wrong tax

This commit is contained in:
Aung Myo
2017-11-23 17:34:31 +06:30
parent 8f0b44ca7b
commit d78ba65675
4 changed files with 35 additions and 28 deletions

View File

@@ -41,9 +41,9 @@ class Transactions::ShiftSalesController < ApplicationController
@other_payment = ShiftSale.get_by_shift_other_payment(@shift)
# Calculate price_by_accounts
@total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
@total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
@total_member_discount = ShiftSale.get_total_member_discount(@shift)
@total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
@total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
@total_member_discount = ShiftSale.get_total_member_discount(@shift)