remove conflict data

2018-07-12 15:54:30 +06:30
parent 03abeabb4e eef4af4cc6
commit dd4db6d2e7
20 changed files with 67 additions and 29 deletions
--- a/app/controllers/origami/alipay_controller.rb
+++ b/app/controllers/origami/alipay_controller.rb
@@ -81,7 +81,7 @@ class Origami::AlipayController < BaseOrigamiController
      end

      sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no,payment_for)
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "alipay",ref_no,payment_for)
    end
  end