update osaka demo bugs

2017-07-14 17:23:40 +06:30
parent ef7cc1f6f0
commit 0b7b5cae30
22 changed files with 76 additions and 53 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -91,9 +91,9 @@ class Origami::PaymentsController < BaseOrigamiController

      #get customer amount
      @customer = Customer.find(@sale_data.customer_id)
-
+      rebate = MembershipSetting.find_by_rebate(1)
      # get member information
-      if @customer.membership_id != nil
+      if @customer.membership_id != nil && rebate
        response = Customer.get_member_account(@customer)
        if response["status"]==true
         response["data"].each do |res|