Pull from master

2018-07-12 15:09:37 +06:30
parent 052d5e8c9c
commit 042aec0121
21 changed files with 67 additions and 30 deletions
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -64,7 +64,7 @@ class Origami::MasterController < BaseOrigamiController

      # saleObj = Sale.find(sale_id)
      sale_payment = SalePayment.new
-      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master",ref_no)
+      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
    end
  end