fixed conflict

2017-06-11 18:09:00 +06:30
parent d65882ac5b 6d4ef8e2ad
commit eb001275c7
42 changed files with 610 additions and 431 deletions
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -15,9 +15,10 @@ class Customer < ApplicationRecord
  def self.get_member_group

    membership  = MembershipSetting.find_by_membership_type("paypar_url")
+    memberaction = MembershipAction.find_by_membership_type("get_all_member_group")
    app_token   = membership.auth_token.to_s

-    url         = membership.gateway_url.to_s + "/api/get_all_member_group".to_s
+    url         = membership.gateway_url.to_s + memberaction.gateway_url.to_s
    response    = HTTParty.get(url,
                    :body => { app_token: app_token}.to_json,
                    :headers => {