app_manager 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10891e9099aebe402bf46438060e6cd405731e44e9fb2e11e36a4e5626ff13a2
-  data.tar.gz: d9c572b10a0159c865e75c876501e534df067bd99662a2e9394cebc80498091f
+  metadata.gz: b0be1075e7e608c2737aca9bb4818e480c6208cbb97abc6b0b429a032dfa1b91
+  data.tar.gz: 61387d3e6ccd7374638f09f607eee94040f3e32b866e4e8178472e567a62f8f0
 SHA512:
-  metadata.gz: 2feefe3f19e0a1ae5316bb9853afa2a5cc077fe7546dc82597b1394399a364ec4ea844c022aa46d05a80d8a1d6b0656bdd998668d7ddbc011b0c249fbae9d39c
-  data.tar.gz: 70fa400868631cf7c331fdfea46f8c6f2f3956bfdd2c796166027b52fccc54ab0cb1926552ee5fe6587d3a337c860a172ed7c72315dad05951c659a9fef080d7
+  metadata.gz: 5a5a849caca69d4f99379828fb433e0b597eb59ae185b4df7915f74080dcffaed725e25b21e3b006f37d44fe9607e92063b66a6079677f954c5f083812737289
+  data.tar.gz: 975b470af5da3742bd93f6bf374d39c23405a63c0f10917bdd2a624656400aeb0f1960ca6877ef532d3a44e21db6380ec60f18b6723ff7656423400b2716a5a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.3.3)
+    app_manager (2.3.4)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,29 +10,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    actioncable (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailbox (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      activejob (= 7.2.1.1)
+      activerecord (= 7.2.1.1)
+      activestorage (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.1)
-      actionpack (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionmailer (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      actionview (= 7.2.1.1)
+      activejob (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1)
-      actionview (= 7.2.1)
-      activesupport (= 7.2.1)
+    actionpack (7.2.1.1)
+      actionview (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -41,37 +41,37 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.1)
-      actionpack (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    actiontext (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      activerecord (= 7.2.1.1)
+      activestorage (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1)
-      activesupport (= 7.2.1)
+    actionview (7.2.1.1)
+      activesupport (= 7.2.1.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.1)
-      activesupport (= 7.2.1)
+    activejob (7.2.1.1)
+      activesupport (= 7.2.1.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.1)
-      activesupport (= 7.2.1)
-    activerecord (7.2.1)
-      activemodel (= 7.2.1)
-      activesupport (= 7.2.1)
+    activemodel (7.2.1.1)
+      activesupport (= 7.2.1.1)
+    activerecord (7.2.1.1)
+      activemodel (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       timeout (>= 0.4.0)
     activerecord-import (1.8.1)
       activerecord (>= 4.2)
-    activestorage (7.2.1)
-      actionpack (= 7.2.1)
-      activejob (= 7.2.1)
-      activerecord (= 7.2.1)
-      activesupport (= 7.2.1)
+    activestorage (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      activejob (= 7.2.1.1)
+      activerecord (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       marcel (~> 1.0)
-    activesupport (7.2.1)
+    activesupport (7.2.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -109,7 +109,7 @@ GEM
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     kaminari (1.2.2)
@@ -140,7 +140,7 @@ GEM
     minitest (5.25.1)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    net-imap (0.4.16)
+    net-imap (0.5.0)
       date
       net-protocol
     net-pop (0.1.2)
@@ -162,7 +162,7 @@ GEM
       stringio
     public_suffix (4.0.6)
     racc (1.8.1)
-    rack (3.1.7)
+    rack (3.1.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -170,20 +170,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.2.1)
-      actioncable (= 7.2.1)
-      actionmailbox (= 7.2.1)
-      actionmailer (= 7.2.1)
-      actionpack (= 7.2.1)
-      actiontext (= 7.2.1)
-      actionview (= 7.2.1)
-      activejob (= 7.2.1)
-      activemodel (= 7.2.1)
-      activerecord (= 7.2.1)
-      activestorage (= 7.2.1)
-      activesupport (= 7.2.1)
+    rails (7.2.1.1)
+      actioncable (= 7.2.1.1)
+      actionmailbox (= 7.2.1.1)
+      actionmailer (= 7.2.1.1)
+      actionpack (= 7.2.1.1)
+      actiontext (= 7.2.1.1)
+      actionview (= 7.2.1.1)
+      activejob (= 7.2.1.1)
+      activemodel (= 7.2.1.1)
+      activerecord (= 7.2.1.1)
+      activestorage (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.1)
+      railties (= 7.2.1.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -191,9 +191,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.1)
-      actionpack (= 7.2.1)
-      activesupport (= 7.2.1)
+    railties (7.2.1.1)
+      actionpack (= 7.2.1.1)
+      activesupport (= 7.2.1.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -235,7 +235,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.0)
 
 PLATFORMS
   ruby

data/app/controllers/app_manager/plans_controller.rb

@@ -20,7 +20,7 @@ module AppManager
       default_plan_id = nil
       choose_later = false
       trial_activated_at = nil
-      global_plan = nil
+      bundle_plan = nil
       plan_obj = AppManager::Client.new
       plans = []
       if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
@@ -33,10 +33,14 @@ module AppManager
             shopify_plan_field = AppManager.configuration.field_names['shopify_plan']
             shopify_plan = @shop[shopify_plan_field] rescue 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
-            global_plan = plans&.find { |x| x["is_global"] == 1 or x["is_global"] == true }
+            # global_plan = plans&.find { |x| x["is_global"] == 1 or x["is_global"] == true }
             @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 (plan.nil? || plan.empty?) && (active_charge.present? && active_charge.any? && !active_charge['bundle_charge'].nil?)
+              global_plan_obj = AppManager::Client.new
+              plan = global_plan_obj.get_bundle_plan(active_plan_id_or_name)
+            end
             if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at && !plan
               choose_later = true
             end
@@ -74,6 +78,13 @@ module AppManager
         promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
       end
 
+      if plan.present? && (plan["is_global"] == 1 or plan["is_global"] == true)
+       bundle_plan = plan
+      else
+        global_plan_obj = AppManager::Client.new
+        bundle_plan = global_plan_obj.get_bundle_plan
+      end
+
       bundle_obj = AppManager::Client.new
       app_bundle_data = bundle_obj.get_app_bundle_data
 
@@ -82,11 +93,12 @@ module AppManager
           'promotional_discount' => promotional_discount,
           'shopify_plan' => shopify_plan,
           'plan' => plan,
-          'bundle_plan' => global_plan,
+          'bundle_plan' => bundle_plan,
           'bundle_details' => app_bundle_data,
           'default_plan_id' => default_plan_id,
           'choose_later' => choose_later,
-          'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false) 
+          'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false),
+          'global_plan_charge' => plan.present? && plan['is_global'] && active_charge.present? && active_charge.any? && !active_charge['active_charge'].nil? && !active_charge['bundle_charge'].nil?
       }
       render json: response
     end

data/lib/app_manager/client/connection.rb

@@ -138,6 +138,8 @@ module AppManager
           return []
         when 'activate-global-plan'
           return nil
+        when 'get-bundle-plan'
+          return []
         else
          return nil
         end

data/lib/app_manager/client/plans.rb

@@ -43,6 +43,10 @@ module AppManager
         get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
       end
 
+      def get_bundle_plan(active_plan_id = nil)
+        get("/get-bundle-plan", {active_plan_id: active_plan_id})
+      end
+
       def get_app_bundle_data
         get("/app-bundle-data")
       end

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty