app_manager 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3feb475e1932e9ddce85101ac275262e5bd4f2ab9f8abd6f1201cc1d67a929
-  data.tar.gz: b17c9dc2f616130e5a0f9e3a9c962fd55a6006342fe04caf78fb4c2a850f955d
+  metadata.gz: 49b23403c65f2eb57f2d3a3a54d1c966e3810773aea9822c8625f3026fec93b9
+  data.tar.gz: 3625d02deadd46fbc14f27227cc49d0ffb774fa285d971df90a4d91dcef06255
 SHA512:
-  metadata.gz: e1f07eb0df1fc3d082abbe4a58ed404cac3a2e5d5fd3a19ca21a32183d5d67076409487612be1989016f00a637d305a643ab0739ce957d7f2cb5d94ecd9027b1
-  data.tar.gz: 18aa4fa121cb88dac088661fb1fb06467ea890af098ac6315401e2d481b42d0b282ad2670334064e3ee95ab3e69b8e730dd4c7be2b02c7741ec7f1f53c627d05
+  metadata.gz: 2e755621b1a8dea6d0f24a8135bd562cad9451ca1917a5c011be9e30654529f3dd55f8b9dc60908d7460b2ab8f6ca90823ec779726b277f1e35e45eec711621c
+  data.tar.gz: 45f80655e7125a4b00740be0b286867edc755101bdb2d3c6fe5a52ed70ae7f798f56a87b371783be6b3b4cda678917165cf49ffe16fe2aa0ed6cc437b22ff7fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.1.7)
+    app_manager (1.1.8)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)

data/README.md

@@ -109,8 +109,9 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "array",
 		"values" => [
-			"val 1",
-			"val 2"
+			"val-1" => "val 1",
+			"val-2" => "val 2",
+			"val-3" => "val 3",
 		],
 	  	"format" => "string",
 	  	"display_order" => 4,
@@ -118,7 +119,7 @@ AppManager.configure do |config|
 		"group_order" => "1",
 		"group" => "Group Name",
 	}
-]  
+]    
 end
 #Required, Values type : integer, boolean, string, array #
 #Format: percentage, count, string

data/app/controllers/app_manager/plans_controller.rb

@@ -18,19 +18,19 @@ module AppManager
 			plan_obj = AppManager::Client.new
 			plans = []
 			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
-				plans = plan_obj.get_plans(params[:shop_domain])
 				@shop = shop_data
 				if !@shop.nil?
-					active_plan_id_or_name = @shop[@plan_field] 
+					active_plan_id_or_name = @shop[@plan_field] rescue nil
+					plans = plan_obj.get_plans(params[:shop_domain],active_plan_id_or_name)
 					if !@field_names.nil? && @field_names.has_key?('shopify_plan') && !@field_names.nil?
 					shopify_plan_field = AppManager.configuration.field_names['shopify_plan']
 					shopify_plan = @shop[shopify_plan_field] rescue nil
-					plan = plans.any? && !active_plan_id_or_name.nil? ? (plans.find{|x| x["id"] == active_plan_id_or_name}.present? ? plans.find{|x| x["id"] == active_plan_id_or_name} : nil ) : nil
+					plan = plans && plans.any? && !active_plan_id_or_name.nil? ? (plans.find{|x| x["id"] == active_plan_id_or_name}.present? ? plans.find{|x| x["id"] == active_plan_id_or_name} : nil ) : nil
 				    
 				    @trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
 					trial_activated_at = @shop[@trial_activated_field] rescue nil
 					active_charge = plan_obj.get_charge(params[:shop_domain])
-					if active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && trial_activated_at 
+					if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && trial_activated_at 
 					choose_later = true
 					end
 
@@ -43,6 +43,7 @@ module AppManager
 			end
 
 
+			plans = plan_obj.get_plans(params[:shop_domain]) if plans && plans.blank?
 			default_plan_data = plans.select{|x| x['choose_later_plan'] == true }
 			if default_plan_data.any?
 				if default_plan_data.select{|x| x['store_base_plan'] == true }.size > 0

data/lib/app_manager/client/plans.rb

@@ -2,8 +2,8 @@ module AppManager
 	class Client
 			module Plans
 
-			  def get_plans(shop_domain)
-				  get("/plans?shop_domain=#{shop_domain}")
+			  def get_plans(shop_domain,active_plan_id=nil)
+				  get("/plans?shop_domain=#{shop_domain}&active_plan_id=#{active_plan_id}")
 			  end
 
 			  def get_plan(plan_id,shop_domain=nil)

data/lib/app_manager/version.rb

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

data/lib/generators/app_manager/install/templates/app_manager.rb.tt

@@ -61,8 +61,9 @@ AppManager.configure do |config|
 		"description" => "Feature Description",
 		"value_type" => "array",
 		"values" => [
-			"val 1",
-			"val 2"
+			"val-1" => "val 1",
+			"val-2" => "val 2",
+			"val-3" => "val 3",
 		],
 	  	"format" => "string",
 	  	"display_order" => 4,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Hulkapps