conflic data

2018-02-09 10:17:56 +06:30
parent 625ee9bd34
commit 860e8db202
29 changed files with 622 additions and 296 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)