app_manager 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f97b31c44449e934975e233f07a745d883e58abd3a29ccd30537ec0e1ba6bca2
-  data.tar.gz: 863e6b243cd1c16839c4d5c9d7f3a3a0b1b47909ce613c9ff075e21d996ce314
+  metadata.gz: fb1084d39db6c9e21c292a640e1a9d646787250891f7296d238b6d833a844883
+  data.tar.gz: 529a1d620ba1540bba2ab8696ba75112abd92dae02e7ff74514f4bc4316e67f6
 SHA512:
-  metadata.gz: 31f071cf42a3cfec28b0fae59cedfc72c2b24b80a85c237932acf0d118807977a961aa199ebd5435f5ddcb4f9310a27ac47589b35db953f39e61fbdd7e6d25d6
-  data.tar.gz: 67769978a3d30041d329e02a22432dad4d936a5254ac711e118a03be50101e11260aa22929a2c210ddbec027c44b60fa807f0c51dc494e6aac92a16033b8b83d
+  metadata.gz: 5b1be10cc3bc40500409ac5a32a7b5d261fb8a5023d87d39ade414377fd19410177ac39f2dbdfdabfdff7e016f853883aecd54bd6ce6fdc631bc6bb1af58001f
+  data.tar.gz: fab06e313b8694aa7478956184647a3f695c31ed20e47e240f8260a9e0a0f9b9ab053c6718a5b334e2409a56b238ab6924c9091b6e2b6aa7eaa3407e849e3715

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.2.0)
+    app_manager (2.2.3)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -97,6 +97,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    csv (3.3.0)
     date (3.3.4)
     diff-lcs (1.5.0)
     dotenv (2.1.2)
@@ -105,7 +106,8 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashdiff (1.0.1)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.14.4)
@@ -201,7 +203,7 @@ GEM
     rake (13.0.6)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    reline (0.5.1)
+    reline (0.5.4)
       io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)

data/README.md

@@ -198,7 +198,9 @@ and then you can use follwing methods with your shop objects.
 
 @shop.get_active_charge_app_manager # return active charge hash from app manager otherwise nil
 
-@shop.update_app_manager_charge # return true if shop has shopify recurring charge but app manager doesn't then it update to app manager and return true otherwise nil
+@shop.update_app_manager_charge # return true if shop has shopify recurring charge but app manager doesn't then it update to app manager and return true otherwise nil. This method also accepts current shopify charge id, so you can pass it if you already. This will reduce the extra call like this @shop.update_app_manager_charge("xx23432434")
+
+@shop.update_app_manager_charge_with_plan_id # same as update_app_manager_charge method, the only difference is that, it will not check the plan_id in the shop table is valid from app manager. This method also accepts two parameters, first is current shopify charge id and second is plan_id .It shop table doesn't have plan_id saved then you can pass in second parameter. @shop.update_app_manager_charge_with_plan_id("xx23432434",23)
 
 @shop.get_current_shopify_charge # return active charge hash from shopify https://shopify.dev/docs/api/admin-graphql/2022-10/queries/currentAppInstallation otherwise nil
 
@@ -217,19 +219,20 @@ and then you can use follwing methods with your shop objects.
 * Update app manager gem in your project's Gemfile
 
 ```ruby
-gem 'app_manager', '2.0.0'
+gem 'app_manager', '2.2.3'
 ```
 * In Rails project, in application.rb, add following line after require "rails/all" line 
 
 ```ruby
-require 'app_manager/set_cookie'
+require 'app_manager/set_local_storage'
 ```
 
 * In route.rb file, add following route with constraints
 ```ruby
 condition = ->(request) { request.path_info.include?('/discount/') }
+plan_url = "https://admin.shopify.com/admin/apps/#{ENV['SHOPIFY_APP_SLUG']}/home/plan"
 constraints(condition) do
-get '/discount/*any', to: AppManager::SetCookie.new(Rails.application, condition)
+get '/discount/*any', to: AppManager::SetLocalStorage.new(Rails.application, condition, plan_url)
 end
 ```
 * If updating gem from 1.6.1, then run these commands on rails root.

data/app/controllers/app_manager/charges_controller.rb

@@ -31,7 +31,7 @@ module AppManager
                     end
                   end
                 rescue Exception => e
-                  Rollbar.error("APP MANAGER Process Plan Failed #{e}")
+                  Rollbar.error("APP MANAGER Process Plan Failed #{e.inspect}-#{e.backtrace}")
                 end
                 @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
                 update_info = {@plan_field => params[:plan_id], @trial_activated_field => nil,grandfathered_field => 0}
@@ -49,7 +49,7 @@ module AppManager
                         "shopify_domain" => params[:shop]
                     })
                   rescue Exception => e
-                    Rollbar.error("APP MANAGER Error in Process Plan #{e}")
+                    Rollbar.error("APP MANAGER Error in Process Plan #{e.inspect}-#{e.backtrace}")
                   end
                   AppManager.clear_cache
                   # render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
@@ -135,7 +135,7 @@ module AppManager
                       "shopify_domain" => params[:shop]
                   })
                 rescue Exception => e
-                  Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}")
+                  Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}-#{e.backtrace}")
                 end
 
                 begin
@@ -146,8 +146,8 @@ module AppManager
                       plan_obj.discount_used(@shop[shopify_domain], params[:discount])
                     end
                   end
-                rescue
-                  Rollbar.error("Error in APP MANAGER Discount used API call >>>> #{e.inspect}")
+                rescue Exception => e
+                  Rollbar.error("Error in APP MANAGER Discount used API call >>>> #{e.inspect}-#{e.backtrace}")
                 end
               end
             end

data/lib/app_manager/model.rb

@@ -148,7 +148,7 @@ module AppManager
           plan_obj.cancel_charge(shop_domain, shop_plan_id)
         end
       rescue Exception => e
-        return "#{e.inspect}"
+        return "#{e.inspect}-#{e.backtrace}"
       end
     end
 
@@ -170,7 +170,7 @@ module AppManager
           end
         end
       rescue Exception => e
-        return "#{e.inspect}"
+        return "#{e.inspect}-#{e.backtrace}"
       end
     end
 
@@ -182,7 +182,7 @@ module AppManager
           return data["data"]["currentAppInstallation"]["activeSubscriptions"].first
         end
       rescue Exception => e
-        Rollbar.error("Warning in APP MANAGER, trying to get_current_shopify_charge >>>> #{e.inspect}")
+        Rollbar.error("Warning in APP MANAGER, trying to get_current_shopify_charge >>>> #{e.inspect}-#{e.backtrace}")
         return nil
       end
     end
@@ -217,7 +217,28 @@ module AppManager
         end
         return charge_updated
       rescue Exception => e
-        Rollbar.error("Warning in APP MANAGER, trying to get update_app_manager_charge >>>> #{e.inspect}")
+        Rollbar.error("Warning in APP MANAGER, trying to get update_app_manager_charge >>>> #{e.inspect}-#{e.backtrace}")
+        return nil
+      end
+    end
+
+    def update_app_manager_charge_with_plan_id(current_shopify_charge_id=nil,shop_custom_plan_id=nil)
+      charge_updated = nil
+      begin
+        shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        current_charge_id = current_shopify_charge_id.present? ? current_shopify_charge_id : active_shopify_charge_id
+        plan_id = shop_custom_plan_id.present? ? shop_custom_plan_id : shop_plan_id
+        if current_charge_id.present?
+            if plan_id.present?
+              if charge_update_call(self,plan_id,current_charge_id)
+                charge_updated = true
+              end
+            end
+        end
+        return charge_updated
+      rescue Exception => e
+        Rollbar.error("Warning in APP MANAGER, trying to get update_app_manager_charge_with_plan_id >>>> #{e.inspect}-#{e.backtrace}")
         return nil
       end
     end
@@ -236,7 +257,7 @@ module AppManager
             return nil
           end
       rescue Exception => e
-        Rollbar.error("Warning in APP MANAGER, trying to get active shopify charge id >>>> #{e.inspect}")
+        Rollbar.error("Warning in APP MANAGER, trying to get active shopify charge id >>>> #{e.inspect}-#{e.backtrace}")
         return nil
       end
     end
@@ -300,15 +321,16 @@ module AppManager
                       "shopify_domain" => shop_domain
                   })
                 rescue Exception => e
-                  Rollbar.error("Warning in APP MANAGER model Charge Created Callback Event Fire>>>> #{e.inspect}")
+                  Rollbar.error("Warning in APP MANAGER model Charge Created Callback Event Fire>>>> #{e.inspect}-#{e.backtrace}")
                 end
+                Thread.exit # Terminate the thread once processing is done
               end
             end
           end
         end
         return charge_callback_done
       # rescue Exception => e
-      #   Rollbar.error("Warning in APP MANAGER model charge_callback, trying to update active shopify charge in app manager>>>> #{e.inspect}")
+      #   Rollbar.error("Warning in APP MANAGER model charge_callback, trying to update active shopify charge in app manager>>>> #{e.inspect}-#{e.backtrace}")
       #   return nil
       # end
     end
@@ -351,7 +373,7 @@ module AppManager
           self.save
         end
       rescue Exception => e
-        return "#{e.inspect}"
+        return "#{e.inspect}-#{e.backtrace}"
       end
     end
 
@@ -365,10 +387,10 @@ module AppManager
         plans = plan_obj.get_plans(shop_domain)
         plans = plans.select { |x| x['interval'] == 'EVERY_30_DAYS' && x['public'] == true }
         plans.each do |plan|
-          next if (params && !params.nil? && params == "exclude_current_plan" && !shop_plan_id.nil? && plan["id"] == shop_plan_id)
+          next if (params && !params.nil? && params == "exclude_current_plan" && !shop_plan_id.nil? && !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)
+            if plan_feature_slugs && (feature_slugs & plan_feature_slugs).any? && ((feature_slugs & plan_feature_slugs).sort == feature_slugs.sort)
               plan_data.push(plan)
             end
           end

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty