fixed conflict

2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -14,7 +14,7 @@ class Customer < ApplicationRecord

  def self.get_member_group

-    membership  = MembershipSetting.find_by_membership_type("smartpay_url")
+    membership  = MembershipSetting.find_by_membership_type("paypar_url")
    app_token   = membership.auth_token.to_s

    url         = membership.gateway_url.to_s + "/api/get_all_member_group".to_s