Merge branch 'r-1902001-01-dev' of https://gitlab.com/code2lab/SXRestaurant into r-1902001-01-dev

2019-06-24 10:10:25 +06:30
parent ae373fe365 deee65f938
commit 259ef75295
13 changed files with 415 additions and 350 deletions
--- a/app/controllers/api/payments_controller.rb
+++ b/app/controllers/api/payments_controller.rb
@@ -31,7 +31,7 @@ class Api::PaymentsController < Api::ApiController
            if @status
              sale_payment = SalePayment.new
              status, @sale, @membership_data = sale_payment.process_payment(sale, current_login_employee, sale.grand_total, "paymal",params[:card_no])
-              
+
              if status == true && @membership_data["status"] == true
                sale_payment = SalePayment.new
                status = sale_payment.process_payment(sale, current_login_employee, 0, "cash")
@@ -95,7 +95,7 @@ class Api::PaymentsController < Api::ApiController
        @message  = membership_data["message"]
      end
    else
-      @status   = false 
+      @status   = false
      @message  = "No gateway url!"
    end