.

2020-01-14 15:14:20 +06:30
parent 48e6afa505
commit dda9f9d04c
1 changed files with 0 additions and 4 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -192,11 +192,7 @@ class Origami::PaymentsController < BaseOrigamiController
        end

        #card_balance amount for Paymal payment
-<<<<<<< HEAD
        card_balance_amount,transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
-=======
-        card_balance_amount, transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
->>>>>>> 60af9124bb181c662358624e1e6fbee1be36a2bb

        # get printer info
        print_settings = PrintSetting.find_by_unique_code(unique_code)