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

2018-02-06 16:17:27 +06:30
parent f093f1f0a7 76b1cda530
commit 9387703862
8 changed files with 71 additions and 25 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,8 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
      rebate = MembershipSetting.find_by_rebate(1)
      if customer.membership_id != nil && rebate
        member_info = Customer.get_member_account(customer)
-        # current_balance = SaleAudit.paymal_search(sale_id)
-        current_balance = 0
+        current_balance = SaleAudit.paymal_search(sale_id)
+        # current_balance = 0
      end
      # get printer info
      print_settings=PrintSetting.find_by_unique_code(unique_code)