Fixed conflict

2020-01-14 14:25:55 +06:30
parent 4c69c1d5d2 60af9124bb
commit 48e6afa505
17 changed files with 589 additions and 161 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -192,7 +192,11 @@ 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)