app_manager 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49b23403c65f2eb57f2d3a3a54d1c966e3810773aea9822c8625f3026fec93b9
-  data.tar.gz: 3625d02deadd46fbc14f27227cc49d0ffb774fa285d971df90a4d91dcef06255
+  metadata.gz: 3ef86306a34e83be7d439ecda3ca318a33146373c0a5f8cd910d5da1cf06d587
+  data.tar.gz: 1239cc87364f045b966f9f2ccc24ca770c7fdd07dda704b25d7b37bf2a49dc05
 SHA512:
-  metadata.gz: 2e755621b1a8dea6d0f24a8135bd562cad9451ca1917a5c011be9e30654529f3dd55f8b9dc60908d7460b2ab8f6ca90823ec779726b277f1e35e45eec711621c
-  data.tar.gz: 45f80655e7125a4b00740be0b286867edc755101bdb2d3c6fe5a52ed70ae7f798f56a87b371783be6b3b4cda678917165cf49ffe16fe2aa0ed6cc437b22ff7fb
+  metadata.gz: db78e088159f14d5bad35456c2a3b41e87e5e813bcd92a12c32562d8882ba698e6eae97f6a7807e8b94ccf6673234f6cd58ef3c8846c40e6df3a97dbe6e8f266
+  data.tar.gz: d9d6dcb07015cde6b085473762cdffa39f12bf03ed7d2af0c9c79fe6849b29338b839f0f31712fd362fa7b037318bf9fa72754e0847ca09fe3a5f86a4f974a75

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.1.8)
+    app_manager (1.2.0)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -146,7 +146,7 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.0)
-    rack (2.2.3.1)
+    rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.3)

data/README.md

@@ -171,7 +171,26 @@ and then you can use follwing methods with your shop objects.
 
 @shop.get_plan # return current plan hash
 
-@shop.get_charge # return current charge hash
+	if you pass @shop.get_plan(plan_id) it will return that particular plan hash like @shop.get_plan(311)
+
+@shop.get_charge # return current charge hash, it will return nil if current plan is free
+
+@shop.set_default_plan(plan_id=nil)  #if plan id is passed nil, then it will set the free(public and $0 price) to active and if passed it will set that plan to active plan
+
+@shop.get_plans_by_features(feature_slugs)  # pass feature_slugs as an array even if one slug and it will return plans array which have that slug found. Example: 
+	
+	@shop.get_plans_by_features(['quantity-based-discount'])
+	@shop.get_plans_by_features(['quantity-based-discount','multiple-discount-types'])
+
+
+	you can pass string argument 'exclude_current_plan' which will return all plans that matching features except current plan
+
+	@shop.get_plans_by_features(['quantity-based-discount'],'exclude_current_plan')
+	@shop.get_plans_by_features(['quantity-based-discount','multiple-discount-types'],'exclude_current_plan')
+
+
+@shop.get_all_plans # return all app plans array
+
 ```
 
 

data/app/controllers/app_manager/charges_controller.rb

@@ -13,8 +13,22 @@ module AppManager
 	    		if !@shop.nil?
 	    		 plan_obj = AppManager::Client.new
 	    		 plan_data = plan_obj.get_plan(params[:plan_id],params[:shop])
+	    		 # render json: plan_data and return #use this to test plan failsafe api
 	    		 if plan_data.present? && plan_data.is_a?(Hash) 
             		if plan_data['price'] == 0
+            			active_charge_data = plan_obj.get_charge(params[:shop])
+            			begin
+            				if active_charge_data && active_charge_data.any? && !active_charge_data['active_charge']['charge_id'].nil?
+	        					gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain,@shop.shopify_token)
+	        					rec_cancel_data = gq_obj.recurring_charge_cancel_api_call(active_charge_data['active_charge']['charge_id'],@shop)
+								if !rec_cancel_data["errors"].present? && (rec_cancel_data["data"].present? && rec_cancel_data["data"]["appSubscriptionCancel"].present? && !rec_cancel_data["data"]["appSubscriptionCreate"]["userErrors"].any? && (rec_cancel_data["data"]["appSubscriptionCancel"]["appSubscription"]["status"] == 'CANCELLED'))
+									plan_obj.cancel_charge(params[:shop],active_charge_data['active_charge']['plan_id'])
+								end
+        					end
+            			rescue Exception => e
+            				Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+            			end
+        				
             			if @shop.update(@plan_field => params[:plan_id])
             				begin
             					AppManager::EventHandler.new('charge_created',{
@@ -23,7 +37,7 @@ module AppManager
 								"previous_charge" => nil 	
 								})
             				rescue Exception => e
-            					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+            					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
             				end
             				AppManager.clear_cache
             				render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"}  and return true
@@ -78,7 +92,7 @@ module AppManager
 							begin
 								plan_obj.cancel_charge(@shop[shopify_domain],@shop[@plan_field])
 							rescue Exception => e
-								Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+								Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 							end
 						end
 
@@ -96,7 +110,7 @@ module AppManager
 								"previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil 	
 								})
 							rescue Exception => e
-								Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"
+								Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
 							end
 						end     					
 						redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return

data/app/controllers/app_manager/plans_controller.rb

@@ -36,10 +36,10 @@ module AppManager
 
 				    end
 				else
-					Rails.logger.info "APP MANGAGER >>>>  Either model is defined wrong or config.plan_id_or_name_field is nil in initializer ==="	
+					Rails.logger.info "APP MANAGER >>>>  Either model is defined wrong or config.plan_id_or_name_field is nil in initializer ==="	
 				end	
 			else
-    			 Rails.logger.info "APP MANGAGER >>>>  Either params missing store_domain or config.plan_features is nil in initializer ==="	
+    			 Rails.logger.info "APP MANAGER >>>>  Either params missing store_domain or config.plan_features is nil in initializer ==="	
 			end
 
 
@@ -119,8 +119,23 @@ module AppManager
 			if params[:shop_domain].present? && params[:plan_id].present? && model
 				@shop = shop_data
 				@trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
-				@shop.update(@plan_field => params[:plan_id],@trial_activated_field => DateTime.now)
+				if @shop.update(@plan_field => params[:plan_id],@trial_activated_field => DateTime.now)
+				begin
+							 plan_obj = AppManager::Client.new
+	    		 			 plan_data = plan_obj.get_plan(params[:plan_id],params[:shop_domain]) rescue nil
+            					AppManager::EventHandler.new('charge_created',{
+								"plan" => plan_data,
+								"charge" => nil,
+								"previous_charge" => nil,
+								"choose_later" => true 	
+								})
+            				rescue Exception => e
+            					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
+            				end
 				render json: {'status' => true}
+				else
+					render json: {'status' => false,'error' => "#{@shop.errors.full_messages.to_sentence}"}, status: 422
+				end
 			else
 				render json: {'status' => false,'error' => 'Shop not found or missing shop'}, status: 422
 			end
@@ -140,13 +155,13 @@ module AppManager
 		    	begin
 		    		@fs.sync_app_manager	
 		    	rescue Exception => e
-		    		Rails.logger.info "APP MANGAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
+		    		Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
 		    	end
 
 		    	begin
 		    	@fs.save_api_data(params)
 		    	rescue Exception => e
-		    	Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+		    	Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 		    	end
 		    	AppManager.clear_cache
 		    end

data/lib/app_manager/client/plans.rb

@@ -18,6 +18,10 @@ module AppManager
 			  	  post("/cancel-charge", {shop_domain: shop_domain,plan_id: plan_id})
 			  end
 
+    		  def update_charge(shop_domain,plan_id)
+    		  	  post("/update-charge", {shop_domain: shop_domain,plan_id: plan_id})
+    		  end
+
 			  def sync_charge(options = {})
 			  	  post("/sync-charge", options)
 			  end

data/lib/app_manager/fail_safe.rb

@@ -28,37 +28,37 @@ module AppManager
 				begin
 					save_api_plans(params["plans"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_charges(params["charges"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_apps(params["apps"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_app_structures(params["app_structures"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_discount_plans(params["discount_plans"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_extend_trials(params["extend_trials"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 				begin
 					save_api_plan_users(params["plan_users"])
 				rescue Exception => e
-					Rails.logger.info "APP MANGAGER >>>> #{e.inspect}"	
+					Rails.logger.info "APP MANAGER >>>> #{e.inspect}"	
 				end
 		end
 
@@ -194,11 +194,22 @@ module AppManager
 
 
 		def get_local_plans(params)
+
 		    plans_data = []
 
             active_plan_id = nil
+            active_charge_price = nil
+
             charges = @apm_db.execute( "SELECT * FROM charges WHERE shop_domain = ? ",params['shop_domain'])
-            active_plan_id = charges.first['plan_id'] if charges.any?
+            
+			if charges.any?
+				active_plan_id = charges.first['plan_id'] 
+				active_charge_price = charges.first['price'] 
+			elsif params['active_plan_id'].present? && !params['active_plan_id'].nil?
+				active_plan_id = params['active_plan_id']
+				plan_data = @apm_db.execute( "SELECT * FROM plans WHERE id = ?", active_plan_id)
+				active_charge_price = plan_data.first['price'] if plan_data.any?
+			end
 
             custom_plan_ids = []
             plan_users = @apm_db.execute( "SELECT * FROM plan_users WHERE shop_domain = ? ",params['shop_domain'])
@@ -232,7 +243,7 @@ module AppManager
 							new_plan[key] = val.collect{|e|e['value']}
 						elsif ['affiliate'].include?(key)
 							new_plan[key] = eval(value)
-						elsif ['is_custom','public','store_base_plan'].include?(key)
+						elsif ['is_custom','public','store_base_plan','choose_later_plan'].include?(key)
 							new_plan[key] = (value == 0 ? false : true)
 						elsif ['test'].include?(key)
 							new_plan[key] = (value == 0 ? nil : true)
@@ -255,12 +266,41 @@ module AppManager
 					features_by_plan.each do |fp|
 					fp['name'] = features.find{|e| e['uuid'] == fp['feature_id']}['name'] rescue nil
 					fp['format'] = features.find{|e| e['uuid'] == fp['feature_id']}['format'] rescue nil
+					fp['slug'] = features.find{|e| e['uuid'] == fp['feature_id']}['slug'] rescue nil
 					features_by_plans_data.push(fp)
 					end
 				end
 			end
 
+
+			custom_discounts_data = []
+			if params["shop_domain"].present? && plan_data
+						custom_discounts = @apm_db.execute( "SELECT * FROM discount_plans WHERE shop_domain = ? ORDER BY created_at DESC", params["shop_domain"]) 
+						if custom_discounts.any?
+							custom_discounts.each do |custom_discount|
+								new_custom_discount = {}
+								custom_discount.each_with_index do |(key, value), index|
+									new_custom_discount[key] = value unless key.class == Integer
+								end
+								custom_discounts_data.push(new_custom_discount)
+							end
+						end
+			end
+
 				plans_data.each do |plan|
+					if (!active_plan_id.nil? && plan['id'] == active_plan_id) 
+					plan['price'] = active_charge_price
+					end
+
+					if custom_discounts_data.any? && custom_discounts_data.select{|e| e['plan_id'] == plan['id']}.size > 0 
+						cd_hash = {}
+						custom_discounts_data.select{|e| e['plan_id'] == plan['id']}.each do |cd|
+					 		plan['discount'] = cd['discount']  
+							plan['discount_type'] = cd['discount_type']  
+							plan['cycle_count'] = cd['cycle_count']  
+					 	end
+					end
+
 					if features_by_plans_data.select{|e| e['plan_id'] == plan['id']}.size > 0 
 					 feature_hash = {}
 					 features_by_plans_data.select{|e| e['plan_id'] == plan['id']}.each do |fp|
@@ -271,11 +311,14 @@ module AppManager
 					 features = nil
 					end
 					plan['features'] = features
+					plan['old_plan_id'] = nil
+
 				end
 
 				plans = plans_data
 			end
 			
+
 			return plans
 		end
 
@@ -291,7 +334,7 @@ module AppManager
 						 new_plan[key] = val
 						elsif ['shopify_plans','affiliate','features'].include?(key)
 						 new_plan[key] = eval(value)
-						elsif ['is_custom','public','store_base_plan'].include?(key)
+						elsif ['is_custom','public','store_base_plan','choose_later_plan'].include?(key)
 						 new_plan[key] = (value == 0 ? false : true)
 						elsif ['test'].include?(key)
 						 new_plan[key] = (value == 0 ? nil : true)
@@ -308,7 +351,7 @@ module AppManager
 						end
 						plan_data['app'] = app_data
 					end
-
+					plan_data['old_plan_id'] = nil # Temporary for migration puspose only
 					if params["shop_domain"].present? && plan_data
 						@apm_db.execute( "SELECT * FROM discount_plans WHERE plan_id = ? AND shop_domain = ? ", params["plan_id"],params["shop_domain"]) do |cd|
 							plan_data['discount'] = cd['discount'] if cd rescue plan_data['discount']
@@ -322,6 +365,7 @@ module AppManager
 			end
 
 			end
+
 			return plan_data
 		end
 

data/lib/app_manager/graphql_helper.rb

@@ -122,6 +122,32 @@ module AppManager
         return data
    end
 
+
+   def recurring_charge_cancel_api_call(charge_id,shop)
+      query = 'mutation(
+        $id: ID!
+        ){
+          appSubscriptionCancel(
+          id: $id
+          ) {
+          userErrors {
+            field
+            message
+          }
+          appSubscription {
+            id
+            status
+          }
+        }
+      }
+      '
+          variables = {
+              "id":  "gid://shopify/AppSubscription/#{charge_id}" 
+          }
+          data = run_graph_api(query,variables)
+          return data
+   end
+
   end
 end
 

data/lib/app_manager/model.rb

@@ -31,7 +31,8 @@ module AppManager
     def plan_features
     	plan_id = self[AppManager.configuration.plan_id_or_name_field]
     	if !plan_id
-    		raise Error, "Plan id not found"
+            Rails.logger.info "Plan id found nil or not set in DB"
+    		return []
     	end
 		plan_obj = AppManager::Client.new
 		plans = plan_obj.get_plan(plan_id)
@@ -64,34 +65,86 @@ module AppManager
     end
 
     def get_remaining_days
-        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
-        shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
+        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
+            shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
+        rescue Exception => e
+            return "#{e.inspect}" 
+        end
     end
 
 
-    def get_plan
-        if !self[AppManager.configuration.plan_id_or_name_field]
-            raise Error, "Invalid params, must have charge_id,shop && plan"
+    def get_plan(plan_id=nil)
+        req_plan_id = nil
+        if !plan_id.nil? 
+            req_plan_id = plan_id
+        else
+            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+            if shop_plan_id && !shop_plan_id.nil?
+              req_plan_id = shop_plan_id
+            else
+              Rails.logger.info "Invalid params, must have charge_id,shop && plan"
+              return {}
+            end
         end
-        plan_obj = AppManager::Client.new
-        return plan_obj.get_plan(self[AppManager.configuration.plan_id_or_name_field])
+        plan_obj = AppManager::Client.new if req_plan_id
+        return req_plan_id ? plan_obj.get_plan(req_plan_id) : {}
     end
 
     def get_charge
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        found_free_plan = false
+        if shop_plan_id && !shop_plan_id.nil?
+            plan_obj = AppManager::Client.new 
+            plan = plan_obj.get_plan(shop_plan_id) rescue nil
+            if plan && plan['price'] == 0 && plan['public'] == true
+                found_free_plan = true
+                return nil
+            end
+        end
+        if !found_free_plan
+            begin
+                shop_domain = self[AppManager.configuration.shopify_domain_field]
+                plan_obj = AppManager::Client.new
+              return  plan_obj.get_charge(shop_domain) 
+            rescue Exception => e
+              Rails.logger.info "#{e.inspect}" 
+              return nil
+            end
+        end
+    end
+
+    def get_all_plans
         begin
             shop_domain = self[AppManager.configuration.shopify_domain_field]
+            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+            active_plan_id = shop_plan_id && shop_plan_id.nil? ? nil : shop_plan_id
             plan_obj = AppManager::Client.new
-          return  plan_obj.get_charge(shop_domain) 
+            return plan_obj.get_plans(shop_domain,active_plan_id)
         rescue Exception => e
-          return "#{e.inspect}" 
+            Rails.logger.info "#{e.inspect}" 
+            return []
         end
     end
 
+    def cancel_charge
+        begin
+            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+            shop_domain = self[AppManager.configuration.shopify_domain_field]
+            if shop_plan_id && shop_domain
+                plan_obj = AppManager::Client.new
+                plan_obj.cancel_charge(shop_domain,shop_plan_id)
+            end
+        rescue Exception => e
+            return "#{e.inspect}" 
+        end     
+    end
+
     def set_default_plan(plan_id=nil)
         begin
             if plan_id.nil?
@@ -117,15 +170,17 @@ module AppManager
 
 
 
-    def get_plans_by_features(feature_slugs)
+    def get_plans_by_features(feature_slugs,params="false")
         if feature_slugs.any?
+            shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
             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?
+                next if (params && !params.nil? && params == "exclude_current_plan" && !shop_plan_id.nil? && plan["id"] == shop_plan_id)
+                if plan && (plan['features'] && plan['features'].any?) && (plan['features'].values && plan['features'].values.any?) && (plan['features'].values.collect{|c| c['slug']} && 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)      
@@ -138,6 +193,8 @@ module AppManager
         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.8"
+  VERSION = "1.2.0"
 end

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

@@ -84,5 +84,6 @@ end
 ActiveSupport::Notifications.subscribe "charge_created"  do |name, start, finish, id, payload|
    Rails.logger.debug "========APP MANAGER========="
    Rails.logger.debug "DATA : #{payload}"
+   #payload hash contains 3 keys, "plan", "charge", "previous_charge" and an extra key "choose_later" => "true" renders when clicked on choose later  
    Rails.logger.debug "========APP MANAGER========="
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty