app_manager 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b130ade59cce66eefb10134bca05802a6f7911e59123a1f8885789547a6c5f
-  data.tar.gz: d3fb70f8010e1d70dc1042c28322d5eeb7696cdecef9bd29fdd09e80a9a02e9d
+  metadata.gz: cba2a8e2159e68da401fd6ac3e3442b4b9e45e417544f69f0db476c86afcdb40
+  data.tar.gz: 16e80be01398355ff3c8d844a52ba9f95581ae9d2f5de9f0ad10a194771d630d
 SHA512:
-  metadata.gz: 3fbef0b8ce7194394d942bbf2fd93d1aa52c7b9035be8a98a09ab080c33d047c8e8fe213f66d5cc1396aa326f7d4881d0db47077ffae42a01b1558f8a8c3febc
-  data.tar.gz: e2138c8801189e683ae7db8703dbe2703eedfdedca2a87c0a6f00528bb49bcd28436e457aeb77dca3113993599459b25632e190ee85e95521332d43fe018a4a1
+  metadata.gz: 0c926ddee98d8311397d52d9a27d263c33da079c9971aacd6dbd29020022b38042b772d3195ff60e83e22ecb0b2f6af14e21023ffd4b9541c2315dd9be9a585b
+  data.tar.gz: b723e7e8d3d8ba97780220140508188c14547037e88e6f5d77110c2cea5dc57c202d3ac9ca64015ebf4df73e1afa74fa856e2f87f88073ddf207cc02525a715b

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.5)
+    app_manager (1.2.6)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
-      sqlite3 (~> 1.3.0)
+      sqlite3 (~> 1.4.4)
 
 GEM
   remote: https://rubygems.org/
@@ -192,7 +192,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.4)
     strscan (3.0.3)
     thor (1.2.1)
     timeout (0.3.0)

data/app/controllers/app_manager/plans_controller.rb

@@ -16,6 +16,7 @@ module AppManager
 	    	active_charge = nil
 			default_plan_id = nil
 			choose_later = false
+			trial_activated_at = nil
 			plan_obj = AppManager::Client.new
 			plans = []
 			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
@@ -66,7 +67,7 @@ module AppManager
 				'plan' => plan,
 				'default_plan_id' => default_plan_id,
                 'choose_later' => choose_later,
-                'has_active_charge' => (!active_charge['active_charge'].nil? ? true : false) 
+                'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false) 
 			}
 			render json: response
 	    end

data/app_manager.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "rails",   '>= 5.2.0'
   spec.add_dependency "kaminari",   '>= 0.16.3'
-  spec.add_dependency "sqlite3", '~> 1.3.0'
+  spec.add_dependency "sqlite3", '~> 1.4.4'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

data/lib/app_manager/client/plans.rb

@@ -38,6 +38,10 @@ module AppManager
 				  get("/get-status", options)
 			  end
 
+			  def has_plan(shop_domain,plan_id,trial_activated_at,grandfathered)
+			  	  get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
+			  end
+
 
 			end
 	end

data/lib/app_manager/graphql_helper.rb

@@ -61,10 +61,8 @@ module AppManager
       trial_days = plan['trial_days'] || 0
 
       if shop && shop.shopify_domain && trial_days
-        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at'] rescue nil
-        trial_activated_at = shop[trial_activated_at] rescue nil
-        plan_field = AppManager.configuration.plan_id_or_name_field rescue nil
-        plan_id_field = shop[@plan_field] rescue nil
+        trial_activated_at = shop[AppManager.configuration.field_names['trial_activated_at']] rescue nil
+        plan_id_field = shop[AppManager.configuration.plan_id_or_name_field] rescue nil
         remaining_obj = AppManager::Client.new
         remaining = remaining_obj.get_remaining_days(shop.shopify_domain,trial_activated_at,plan_id_field)
         trial_days = !remaining.nil? ? remaining : trial_days

data/lib/app_manager/model.rb

@@ -5,7 +5,7 @@ module AppManager
      @@remaining_cache_key = "get_remaining_days_key"
      @@get_charge_key = "get_charge_key"
 
-    def has_plan
+    def has_plan_old
         if !self[AppManager.configuration.plan_id_or_name_field]
             return false;
         end 
@@ -28,6 +28,20 @@ module AppManager
         return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
     end
 
+    def has_plan
+        plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        if !plan_id
+            return false;
+        end
+        grandfathered = self[AppManager.configuration.field_names['grandfathered']] 
+        grandfathered = grandfathered ? 1 : 0
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
+        trial_activated_at_val = self[trial_activated_at_field]
+        plan_obj = AppManager::Client.new
+        response = plan_obj.has_plan(shop_domain,plan_id,trial_activated_at_val,grandfathered)
+        return (response && response['has_plan']) || false
+    end
 
 
     def plan_features
@@ -51,7 +65,7 @@ module AppManager
 
 
     def has_feature(slug)
-    	self.plan_features.select{|x| x['slug'].to_s == slug }.size > 0
+    	self.plan_features.any? && self.plan_features.select{|x| x['slug'].to_s == slug }.size > 0 ? true : false
     end
 
 
@@ -67,17 +81,14 @@ module AppManager
     end
 
     def get_remaining_days
-        begin
             shop_domain = self[AppManager.configuration.shopify_domain_field]
             trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
             trial_activated_at_val = self[trial_activated_at_field]
             plan_field = AppManager.configuration.field_names['plan_id']
             plan_id = self[plan_field]
             plan_obj = AppManager::Client.new
-            return shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
-        rescue Exception => e
-            return "#{e.inspect}" 
-        end
+            res = plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id)
+            return (res && !res.nil?) ? res : 0
     end
 
 

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.4
 description: Provides helper function to access AppManager API
 email: rahul.t@hulkapps.com
 executables: []