Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/controllers/origami/paymal_controller.rb
+++ b/app/controllers/origami/paymal_controller.rb
@@ -88,11 +88,11 @@ def create

 	      # saleObj = Sale.find(sale_id)
 	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
-        if status == true
+	      status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
+        if status == true && @membership_data["status"] == true
          @out = true, "Success!"
        else
-          @out =false, "Please try again payment!"
+          @out =false, @membership_data["message"]
        end
      end
    end