app_manager 2.2.4 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79e8f73435de3ded9d7a71d76c5658884d624c96944ae4a1fa6aa9d96504fcc
-  data.tar.gz: cca64ffae23b40444c8abc95ea1d9474b201c74569661e958d145744eff2195e
+  metadata.gz: b31e9471677527b7f6face01beac639469cab8dc2ff202978da8817466cad8cb
+  data.tar.gz: '08708078a2e0fc375969590f7542946102754c8d01c9e321a84f8bb172c9e956'
 SHA512:
-  metadata.gz: ce51ba456521c7877e92602bcea65a7238eaf2f57b275d2746d8931e75f6074be343386ff96c3d51d5b674800bf56c2e4423c65e80addaaae7777f281d6dd455
-  data.tar.gz: 42d2907e6918b99dd9bceb0f1cf720c08a17bb71de1f4f520b2d17ad741a800ba617c4955c6de68ea894efd667915487dbad522f68646738d34943e907a4bcf0
+  metadata.gz: 803859a49d8698a6f6f1e706ce54c7505f992c8fde1974e505f37fa5113ffdcd553d1efb52c42774ae50a33d0b8808015171b739fe1442a4001c89d913b4e022
+  data.tar.gz: bb3e910739a76c982f5510cb1bdd4610a20854f55f969fde0916550005da5da525c7f83e7ca0331e8090d2a35d591dce40b6f3233d55870a93fbe7ca50fec239

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.2.4)
+    app_manager (2.3.1)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,35 +10,35 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actioncable (7.1.4)
+      actionpack (= 7.1.4)
+      activesupport (= 7.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailbox (7.1.4)
+      actionpack (= 7.1.4)
+      activejob (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailer (7.1.4)
+      actionpack (= 7.1.4)
+      actionview (= 7.1.4)
+      activejob (= 7.1.4)
+      activesupport (= 7.1.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.1.4)
+      actionview (= 7.1.4)
+      activesupport (= 7.1.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,37 +46,37 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actiontext (7.1.4)
+      actionpack (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.4)
+      activesupport (= 7.1.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.1.4)
+      activesupport (= 7.1.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.1.4)
+      activesupport (= 7.1.4)
+    activerecord (7.1.4)
+      activemodel (= 7.1.4)
+      activesupport (= 7.1.4)
       timeout (>= 0.4.0)
-    activerecord-import (1.6.0)
+    activerecord-import (1.7.0)
       activerecord (>= 4.2)
-    activestorage (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activestorage (7.1.4)
+      actionpack (= 7.1.4)
+      activejob (= 7.1.4)
+      activerecord (= 7.1.4)
+      activesupport (= 7.1.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -89,10 +89,10 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
-    builder (3.2.4)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (0.4.5)
       rexml
@@ -102,7 +102,7 @@ GEM
     diff-lcs (1.5.0)
     dotenv (2.1.2)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashdiff (1.0.1)
@@ -110,11 +110,11 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.14.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -139,8 +139,8 @@ GEM
     marcel (1.0.4)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     multi_xml (0.6.0)
     mutex_m (0.2.0)
     net-imap (0.3.7)
@@ -152,7 +152,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
     nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -162,8 +162,8 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (4.0.6)
-    racc (1.7.3)
-    rack (3.0.10)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -171,20 +171,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.2)
-      actioncable (= 7.1.3.2)
-      actionmailbox (= 7.1.3.2)
-      actionmailer (= 7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actiontext (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    rails (7.1.4)
+      actioncable (= 7.1.4)
+      actionmailbox (= 7.1.4)
+      actionmailer (= 7.1.4)
+      actionpack (= 7.1.4)
+      actiontext (= 7.1.4)
+      actionview (= 7.1.4)
+      activejob (= 7.1.4)
+      activemodel (= 7.1.4)
+      activerecord (= 7.1.4)
+      activestorage (= 7.1.4)
+      activesupport (= 7.1.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.4)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -192,18 +192,18 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    railties (7.1.4)
+      actionpack (= 7.1.4)
+      activesupport (= 7.1.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rake (13.0.6)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    reline (0.5.4)
+    reline (0.5.9)
       io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)
@@ -221,7 +221,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
@@ -234,7 +234,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby

data/app/controllers/app_manager/charges_controller.rb

@@ -2,7 +2,7 @@ require_dependency "app_manager/application_controller"
 module AppManager
   class ChargesController < ApplicationController
     include HTTParty
-    skip_before_action :verify_authenticity_token, :only => [:process_plan]
+    skip_before_action :verify_authenticity_token, :only => [:process_plan,:activate_global,:cancel_charge,:cancel_global]
     before_action :params_permit
     require 'time'
     require 'rack'
@@ -140,7 +140,7 @@ module AppManager
 
                 begin
                   plan_obj = AppManager::Client.new
-                  if params[:discount].present? && !params[:discount].nil? && params[:discount] != '0'
+                  if params[:discount].present? && !params[:discount].nil? && params[:discount] != '0' && !plan_data['is_global']
                     discounted_plans = plan_obj.get_related_discounted_plans(params[:discount])
                     if discounted_plans.empty? || discounted_plans.include?(params[:plan].to_i)
                       plan_obj.discount_used(@shop[shopify_domain], params[:discount])
@@ -191,6 +191,71 @@ module AppManager
       end
     end
 
+    def cancel_charge
+      if params[:charge_id].present? && params[:shop].present?
+        @shop = shop_data
+        shopify_token = @field_names['shopify_token']
+        begin
+          gq_obj = AppManager::GraphqlHelper.new(@shop[@shopify_domain], @shop[shopify_token])
+          rec_cancel_data = gq_obj.recurring_charge_cancel_api_call(params[:charge_id], @shop)
+        rescue Exception => e
+          Rollbar.error("APP MANAGER Cancel Plan Failed #{e.inspect}-#{e.backtrace}")
+        end
+      end
+      head :ok
+    end
+
+    def activate_global
+      if params[:shop].present? && params[:plan_id].present?
+      @shop = shop_data
+      grandfathered_field = @field_names['grandfathered']
+      trial_activated_field = @field_names['trial_activated_at']
+      if !@shop.nil?
+        plan_obj = AppManager::Client.new
+        plan_data = plan_obj.get_plan(params[:plan_id], params[:shop])
+        update_info = {@plan_field => params[:plan_id], trial_activated_field => nil,grandfathered_field => 0}
+        if !config_trial_days.nil? && !plan_data.nil?
+          trial_days = plan_data['trial_days'] || 0
+          update_info[config_trial_days] = trial_days
+        end
+        if @shop.update(update_info)
+          begin
+            plan_data['shop_domain'] = params[:shop];
+            plan_data['old_plan'] = params[:old_plan] || nil;
+            AppManager::EventHandler.new('charge_created', {
+                "plan" => plan_data,
+                "charge" => nil,
+                "previous_charge" => nil,
+                "shopify_domain" => params[:shop]
+            })
+          rescue Exception => e
+            Rollbar.error("APP MANAGER Error in Activate Global plan  #{e.inspect}-#{e.backtrace}")
+          end
+          AppManager.clear_cache
+        end
+      end
+      render json: {'status' => true,'plan_type' => 'global_plan'} and return true
+      end
+    end
+
+    def cancel_global
+      if params[:shop].present?
+        @shop = shop_data
+        grandfathered_field = @field_names['grandfathered']
+        trial_activated_field = @field_names['trial_activated_at']
+        if !@shop.nil?
+          update_info = {@plan_field => nil, trial_activated_field => nil,grandfathered_field => 0}
+          if !config_trial_days.nil?
+            update_info[config_trial_days] = 0
+          end
+          @shop.update(update_info)
+          AppManager.clear_cache
+        end
+        render json: {'status' => true,'plan_type' => 'cancel_plan'} and return true
+      end
+    end
+
+
     private
 
     def params_permit

data/app/controllers/app_manager/plans_controller.rb

@@ -20,6 +20,7 @@ module AppManager
       default_plan_id = nil
       choose_later = false
       trial_activated_at = nil
+      global_plan = nil
       plan_obj = AppManager::Client.new
       plans = []
       if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
@@ -32,7 +33,7 @@ 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 }
             @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])
@@ -72,11 +73,17 @@ module AppManager
         promotional_discount = plan_obj.get_promotional_discount(params[:shop_domain],discount_local_storage)
         promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
       end
+
+      bundle_obj = AppManager::Client.new
+      app_bundle_data = bundle_obj.get_app_bundle_data
+
       response = {
           'plans' => plans,
           'promotional_discount' => promotional_discount,
           'shopify_plan' => shopify_plan,
           'plan' => plan,
+          'bundle_plan' => global_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) 

data/config/routes.rb

@@ -11,6 +11,11 @@ AppManager::Engine.routes.draw do
      get 'plan/process/:plan_id' => 'charges#process_plan'
      get 'plan/callback' => 'charges#callback', as: :plan_callback
 
+     post 'cancel-charge' => 'charges#cancel_charge'
+		 post 'plan/activate-global' => 'charges#activate_global'
+		 post 'plan/cancel-global' => 'charges#cancel_global'
+
+
 		scope 'app-manager-api' do
 			post 'store-charge' => 'plans#store_charge'
 		end

data/lib/app_manager/api_cache_handler.rb

@@ -37,7 +37,7 @@ module AppManager
       end
 
       def cache_path
-        @cache_path = "app-manager-cache"
+        @cache_path = "app-manager-cache/#{ENV['SHOPIFY_APP_SLUG']}"
         if @options[:cache_path].present?
           @cache_path = "#{@cache_path}#{@options[:cache_path]}"
         elsif AppManager.configuration.refresh_by_request_params?

data/lib/app_manager/client/connection.rb

@@ -24,7 +24,7 @@ module AppManager
 
       def request(http_method, path, options)
           failsafe_or_caching_done = false
-          if http_method.to_s == 'get' && !path.include?("/get-status") && !path.include?("/sync-charge")
+          if http_method.to_s == 'get' && !path.include?("/get-status") && !path.include?("/sync-charge") && AppManager.configuration.enable_caching
           response = response_from_cache_for_api(http_method, path, options)
           failsafe_or_caching_done = true
           else
@@ -69,7 +69,8 @@ module AppManager
        end
 
       def response_from_cache_for_api(http_method, path, options)
-        cache_key = "app-manager-cache/#{path}"
+        Rails.logger.info "Caching data enabled >>>>>>>>>>>>>>>>>>>>>>>>"
+        cache_key = "app-manager-cache/#{ENV['SHOPIFY_APP_SLUG']}/#{path}"
         if fetch_static_cached_response(cache_key).present?
           return fetch_static_cached_response(cache_key)
         end
@@ -133,6 +134,10 @@ module AppManager
           return @fs.store_discount_used(params,options)
         when 'get-related-discounted-plans'
           return @fs.get_local_related_discounted_plans(params,options)
+        when 'app-bundle-data'
+          return []
+        when 'activate-global-plan'
+          return nil
         else
          return nil
         end

data/lib/app_manager/client/plans.rb

@@ -43,6 +43,14 @@ module AppManager
         get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
       end
 
+      def get_app_bundle_data
+        get("/app-bundle-data")
+      end
+
+      def check_and_activate_global_plan(shop_domain)
+        get("/activate-global-plan?shop_domain=#{shop_domain}")
+      end
+
       def get_promotional_discount(shop_domain = nil,code)
         get("/discount?shop_domain=#{shop_domain}&code=#{code}")
       end

data/lib/app_manager/graphql_helper.rb

@@ -94,7 +94,7 @@ module AppManager
         discount_type = plan['discount_type'] || "percentage"
         discount_val = discount_type == "percentage" ? (plan['discount'].to_f/ 100) : "#{plan['discount']}"
         if !@api_version.nil? && @api_version.to_s.include?('2024')
-          plan_discount = if plan['discount'] && plan['cycle_count']
+          plan_discount = if plan['discount'] && plan['cycle_count'] && plan['cycle_count'].to_i != 0
                             {
                                 "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i),
                                                 "value" => {"#{discount_type}" => discount_val}
@@ -115,7 +115,7 @@ module AppManager
 
         if promotional_discount.any?
 
-          if promotional_discount['plan_relation'].any? && !promotional_discount['plan_relation'].include?(plan['id'])
+          if promotional_discount['plan_relation'].any? && !promotional_discount['plan_relation'].include?(plan['id']) && plan['is_global']
             plan_discount = {}
           else
 

data/lib/app_manager/model.rb

@@ -403,7 +403,7 @@ module AppManager
 
 
     def fetch_static_remaining_days
-      @remaining_cache_key = "app-manager-cache/#{self.shopify_domain}-remaining_days"
+      @remaining_cache_key = "app-manager-cache/#{ENV['SHOPIFY_APP_SLUG']}/#{self.shopify_domain}-remaining_days"
       if fetch_cached_static_remaining_days(@remaining_cache_key).present?
         return fetch_cached_static_remaining_days(@remaining_cache_key)
       end
@@ -420,7 +420,7 @@ module AppManager
 
 
     def fetch_static_get_charge
-      @get_charge_key = "app-manager-cache/#{self.shopify_domain}-get_charge"
+      @get_charge_key = "app-manager-cache/#{ENV['SHOPIFY_APP_SLUG']}/#{self.shopify_domain}-get_charge"
       if fetch_cached_static_get_charge(@get_charge_key).present?
         return fetch_cached_static_get_charge(@get_charge_key)
       end

data/lib/app_manager/version.rb

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

data/lib/app_manager.rb

@@ -28,7 +28,8 @@ module AppManager
 
   def self.clear_cache
   	begin
-  		Rails.cache.delete_matched('app-manager-cache/*')
+      Rails.cache.delete_matched("app-manager-cache/*")
+  		Rails.cache.delete_matched("app-manager-cache/#{ENV['SHOPIFY_APP_SLUG']}/*")
     rescue Exception => e
       Rollbar.error("APP MANAGER Error in Clear Cache #{e}")
   	end

data/lib/generators/app_manager/install/install_generator.rb

@@ -47,6 +47,14 @@ module AppManager
         end
       end
 
+      def create_global_field_to_plans_migration
+        if self.class.migration_exists?("db/app_manager", "add_is_global_to_plans")
+          say_status("skipped", "Migration add_is_global_to_plans.rb already exists")
+        else
+          migration_template("add_is_global_to_plans.erb", "db/app_manager/add_is_global_to_plans.rb")
+        end
+      end
+
 
       private
 

data/lib/generators/app_manager/install/templates/add_is_global_to_plans.erb

@@ -0,0 +1,7 @@
+class AddIsGlobalToPlans < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    unless column_exists?(:plans, :is_global)
+    add_column :plans, :is_global, :boolean, default: false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.1
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -125,6 +125,7 @@ files:
 - lib/generators/app_manager/install/install_generator.rb
 - lib/generators/app_manager/install/templates/add_discount_tables.erb
 - lib/generators/app_manager/install/templates/add_external_charge_field.erb
+- lib/generators/app_manager/install/templates/add_is_global_to_plans.erb
 - lib/generators/app_manager/install/templates/add_plan_trial_grandfathered_to_shops.erb
 - lib/generators/app_manager/install/templates/app_manager.rb.tt
 - lib/generators/app_manager/install/templates/failsafe_tables.erb