app_manager 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d071e3e478e20f2fb063d5a821be4d772edb68de15c862c50f0a01c69727d8
-  data.tar.gz: 1e171148960d955ca01c76a7bf715630508e2766e4a46790a85e86ffba4ea7a1
+  metadata.gz: ac02414e46b02e9c7e33c7a5625dce22ba413e4a1081dc4f99596c659b1d08da
+  data.tar.gz: d61fdc1266e5c9946ae2a4e32c79db8d6179f155a7b9f3827079046624820563
 SHA512:
-  metadata.gz: 205c194f35ab5df4a9fab9fe374a1e83c89ff5ca2ceaa8327ae6ca92589343522ba8c35bdac61d63c92932d9dd7b5769410d4975c8b7fc191e9fcbcf6df4ba61
-  data.tar.gz: b8f6a607d5f1a71e5d0b2537909a87a771718b5f31bbe2d39d3ae291521e40eac5b807c2749806f6c20f1bc19453c6e04ebf52533e69c490441f6d9b33ca8b3d
+  metadata.gz: 218eacfcbc353cdbdacc77d72ff557c28c8b354ad4f0c4d07d781d6f6b556cf067e955dc77f29c8fa5bd81b2acba7883dd507ddeeb6853024c406e73e03ccfb2
+  data.tar.gz: e71153006dfeb712762d4da2064534e6b1801ccd4a9010ee2b0f61aae29fe1eda1bfa6c5d8867b61931dca7cf8adddb7493f08faf2f0d0a981ba6859e4fd0a30

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.1.1)
+    app_manager (1.1.2)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -119,7 +119,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.0)
+    minitest (5.16.1)
     multi_xml (0.6.0)
     net-imap (0.2.3)
       digest
@@ -147,8 +147,8 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.0.0)
+      rack (>= 1.3)
     rails (7.0.3)
       actioncable (= 7.0.3)
       actionmailbox (= 7.0.3)

data/app/controllers/app_manager/charges_controller.rb

@@ -14,6 +14,23 @@ module AppManager
 	    		 plan_obj = AppManager::Client.new
 	    		 plan_data = plan_obj.get_plan(params[:plan_id],params[:shop])
 	    		 if plan_data.present? && plan_data.is_a?(Hash) 
+            		if plan_data['price'] == 0
+            			if @shop.update(@plan_field => params[:plan_id])
+            				begin
+            					AppManager::EventHandler.new('charge_created',{
+								"plan" => plan_data,
+								"charge" => nil,
+								"previous_charge" => nil 	
+								})
+            				rescue Exception => e
+            					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+            				end
+            				AppManager.clear_cache
+            				render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"}  and return true
+            			else
+            				raise Error, "Invalid charge"
+            			end
+            		end
 	    		 	request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
 	    		    return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
 	    		    gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain,@shop.shopify_token)
@@ -61,7 +78,7 @@ module AppManager
 							begin
 								plan_obj.cancel_charge(@shop[shopify_domain],@shop[@plan_field])
 							rescue Exception => e
-								
+								Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
 							end
 						end
 
@@ -70,13 +87,17 @@ module AppManager
 
 						if response['message'] == "success"
 							AppManager.clear_cache
-							model.update(@plan_field => params[:plan])
+							@shop.update(@plan_field => params[:plan])
 							charge_data = plan_obj.get_charge(@shop[shopify_domain]) 
-							AppManager::EventHandler.new('charge_created',{
+							begin
+								AppManager::EventHandler.new('charge_created',{
 								"plan" => plan_data,
 								"charge" => charge,
 								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil 	
 								})
+							rescue Exception => e
+								Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"
+							end
 						end     					
 						redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
 	    			else

data/app/controllers/app_manager/plans_controller.rb

@@ -14,6 +14,7 @@ module AppManager
 	    def plans
 	    	active_plan_id_or_name = shopify_plan = plan = nil
 			default_plan_id = nil
+			choose_later = false
 			plan_obj = AppManager::Client.new
 			plans = []
 			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
@@ -25,6 +26,14 @@ module AppManager
 					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
+				    
+				    @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 
+					choose_later = true
+					end
+
 				    end
 				else
 					Rails.logger.info "APP MANGAGER >>>>  Either model is defined wrong or config.plan_id_or_name_field is nil in initializer ==="	
@@ -34,33 +43,27 @@ module AppManager
 			end
 
 
-			default_plan_id = 0;
-			default_plan_data = plans.select{|x| x['interval'] == 'EVERY_30_DAYS' }.sort_by { |k| -k["price"] }
-			store_base_plan = default_plan_data.map{|e| e['store_base_plan']}.first rescue false 
-
-			if store_base_plan
-				begin
-					shopify_plans = default_plan_data.map { |e| e.map { |key, value| [e['shopify_plans'], e['id']] }.to_h }
+			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
+					shopify_plans = plans.select{|x| x['interval'] == 'EVERY_30_DAYS' }
 					shopify_plans.each do |shp|
-						if shp.keys && shp.keys.first && shp.keys.first.class == Array
-							if shp.keys.first.include?(shopify_plan) && shp.values && shp.values.first && shp.values.first.to_i > 0
-								default_plan_id = shp.values.first.to_i
-								break
-							end
+						if shp && shp["shopify_plans"].include?(shopify_plan) 
+							default_plan_id = shp["id"]
+							break
 						end
 					end
-				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> ERROR #{e.inspect}"				
+				else
+					default_plan_id = default_plan_data.map{|e| e['id']}.first if default_plan_data.any? rescue nil
 				end
-			else
-				default_plan_id = default_plan_data.map{|e| e['id']}.first if default_plan_data.any? rescue nil
 			end
 
 			response = {
 				'plans' => plans,
 				'shopify_plan' => shopify_plan,
 				'plan' => plan,
-				'default_plan_id' => default_plan_id
+				'default_plan_id' => default_plan_id,
+                'choose_later' => choose_later
 			}
 			render json: response
 	    end
@@ -98,8 +101,9 @@ module AppManager
 
 		def active_without_plan
 			if params[:shop_domain].present? && params[:plan_id].present? && model
+				@shop = shop_data
 				@trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
-				model.update(@plan_field => params[:plan_id],@trial_activated_field => DateTime.now)
+				@shop.update(@plan_field => params[:plan_id],@trial_activated_field => DateTime.now)
 				render json: {'status' => true}
 			else
 				render json: {'status' => false,'error' => 'Shop not found or missing shop'}, status: 422

data/lib/app_manager/fail_safe.rb

@@ -50,7 +50,7 @@ module AppManager
 
 		def save_api_plans(plans)
 		   	@apm_db.execute("DROP TABLE IF EXISTS plans;")
-				@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  discount_type varchar(255),  affiliate text,  features text, deleted_at datetime)"
+				@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255), description varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  choose_later_plan boolean,  discount_type varchar(255),  affiliate text,  features text, deleted_at datetime)"
 		
 		   if plans.any?
 				plans.each do |plan|
@@ -66,7 +66,8 @@ module AppManager
 					is_custom = plan['is_custom'] ? 1 : 0
 					public_val = plan['public'] ? 1 : 0
 					store_base_plan = plan['store_base_plan'] ? 1 : 0
-					@apm_db.execute("INSERT INTO plans (  id ,  type ,  name ,  price ,  offer_text ,  interval ,  shopify_plans ,  trial_days ,  test ,  on_install ,  is_custom ,  app_id ,  base_plan ,  created_at,  updated_at ,  public ,  discount ,  cycle_count ,  store_base_plan ,  discount_type,  affiliate,  features, deleted_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",plan["id"], plan["type"], plan["name"], plan["price"], plan["offer_text"], "#{interval}", "#{shopify_plans}", plan["trial_days"], plan_test, plan["on_install"], is_custom, plan["app_id"], plan["base_plan"], plan["created_at"], plan["updated_at"],public_val, plan["discount"], plan["cycle_count"], store_base_plan, plan["discount_type"], "#{affiliate}", "#{features}",plan["deleted_at"])
+					choose_later_plan = plan['choose_later_plan'] ? 1 : 0
+					@apm_db.execute("INSERT INTO plans (  id ,  type ,  name ,  price ,  offer_text, description ,  interval ,  shopify_plans ,  trial_days ,  test ,  on_install ,  is_custom ,  app_id ,  base_plan ,  created_at,  updated_at ,  public ,  discount ,  cycle_count ,  store_base_plan, choose_later_plan ,  discount_type,  affiliate,  features, deleted_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",plan["id"], plan["type"], plan["name"], plan["price"], plan["offer_text"], plan["description"], "#{interval}", "#{shopify_plans}", plan["trial_days"], plan_test, plan["on_install"], is_custom, plan["app_id"], plan["base_plan"], plan["created_at"], plan["updated_at"],public_val, plan["discount"], plan["cycle_count"], store_base_plan, choose_later_plan, plan["discount_type"], "#{affiliate}", "#{features}",plan["deleted_at"])
 				end
 		    end
 		end
@@ -77,7 +78,8 @@ module AppManager
 			@apm_db.execute "CREATE TABLE IF NOT EXISTS charges(id INTEGER PRIMARY KEY,charge_id varchar(255),test boolean, status varchar(255),name varchar(255), type varchar(255), price float,interval varchar(255),trial_days integer,billing_on datetime,activated_on datetime,trial_ends_on datetime,cancelled_on datetime, expires_on datetime,plan_id integer,description text,shop_domain varchar(255),created_at datetime, updated_at datetime, app_id integer,  sync boolean DEFAULT 0,process_type varchar(255))"
 			if charges.any?
 					charges.each do |charge|
-					@apm_db.execute("INSERT INTO charges (id ,charge_id ,test , status ,name , type , price ,interval ,trial_days ,billing_on ,activated_on ,trial_ends_on ,cancelled_on , expires_on ,plan_id ,description ,shop_domain ,created_at , updated_at, app_id, sync ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", nil,charge["charge_id"],charge["test"],charge["status"],charge["name"],charge["type"],charge["price"],charge["interval"],charge["trial_days"],charge["billing_on"],charge["activated_on"],charge["trial_ends_on"],charge["cancelled_on"],charge["expires_on"],charge["plan_id"],charge["description"],charge["shop_domain"],charge["created_at"],charge["updated_at"],charge["app_id"],1)
+					charge_test = charge['test'] ? 1 : 0
+					@apm_db.execute("INSERT INTO charges (id ,charge_id ,test , status ,name , type , price ,interval ,trial_days ,billing_on ,activated_on ,trial_ends_on ,cancelled_on , expires_on ,plan_id ,description ,shop_domain ,created_at , updated_at, app_id, sync ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", nil,charge["charge_id"],charge_test,charge["status"],charge["name"],charge["type"],charge["price"],charge["interval"],charge["trial_days"],charge["billing_on"],charge["activated_on"],charge["trial_ends_on"],charge["cancelled_on"],charge["expires_on"],charge["plan_id"],charge["description"],charge["shop_domain"],charge["created_at"],charge["updated_at"],charge["app_id"],1)
 					end
 			end
 		end

data/lib/app_manager/model.rb

@@ -23,7 +23,7 @@ module AppManager
         shopify_fields = @field_names = AppManager.configuration.field_names
         plan_obj = AppManager::Client.new
         active_charge = plan_obj.get_charge(shopify_fields['name']) rescue nil
-        return active_charge ? true : false
+        return activeCharge['active_charge'].present? && !activeCharge['active_charge'].nil? ? true : false
     end
 
 
@@ -86,14 +86,58 @@ module AppManager
         begin
             shop_domain = self[AppManager.configuration.shopify_domain_field]
             plan_obj = AppManager::Client.new
-          return  plan_obj.get_charge(self[AppManager.configuration.shopify_domain_field]) 
+          return  plan_obj.get_charge(shop_domain) 
         rescue Exception => e
           return "#{e.inspect}" 
         end
     end
 
+    def set_default_plan(plan_id=nil)
+        begin
+            if plan_id.nil?
+                shop_domain = self[AppManager.configuration.shopify_domain_field]
+                plan_obj = AppManager::Client.new
+                plans = plan_obj.get_plans(shop_domain)
+                free_plans = plans.select{|x| x['price'] == 0 && x['public'] == true}
+                if free_plans.any?
+                    self.plan_id = free_plans.first["id"]
+                    self.save
+                else
+                    raise Error, "Free Plan is not available"
+                end
+            else
+                self.plan_id = plan_id
+                self.save
+            end
+        rescue Exception => e
+            return "#{e.inspect}" 
+        end
+    end
+
+
 
 
+    def get_plans_by_features(feature_slugs)
+        if feature_slugs.any?
+            plan_data = []
+            shop_domain = self[AppManager.configuration.shopify_domain_field]
+            plan_obj = AppManager::Client.new
+            plans = plan_obj.get_plans(shop_domain)
+            plans = plans.select{|x| x['interval'] == 'EVERY_30_DAYS'  && x['public'] == true}
+            plans.each do |plan|
+                if plan['features'].any? && plan['features'].values.any? && plan['features'].values.collect{|c| c['slug']}.any?
+                 plan_feature_slugs = plan['features'].values.collect{|c| c['slug']}.sort
+                 if (feature_slugs & plan_feature_slugs).any? && ((feature_slugs & plan_feature_slugs).sort == feature_slugs.sort)
+                        plan_data.push(plan)      
+                 end
+                end
+            end
+            return plan_data
+        else
+            return 'feature_slugs is required'
+        end
+    end
+
     private
     
     def casted_value(value,value_type)

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty