remove conflict

2018-07-13 14:49:56 +06:30
parent 72a5289072 043a1efb2a
commit 0096c1479d
5 changed files with 36 additions and 122 deletions
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -79,7 +79,11 @@ class Origami::MasterController < BaseOrigamiController
        payment_for = true
      end
      sale_payment = SalePayment.new
+<<<<<<< HEAD
      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
+=======
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
+>>>>>>> 043a1efb2a59c3793b56184a342ba6d132cf57f9
    end
  end

--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -78,7 +78,6 @@ class Origami::VisaController < BaseOrigamiController
        payment_for = true
      end
      sale_payment = SalePayment.new
-
      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no,payment_for)
    end
  end