app_manager 1.3.6 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0726560dff151c7c6b5e6fde4f510a43a28c0d3e299c2382ffeb43aea7f26b8
-  data.tar.gz: d02c49d7627c01fc7cc8096af135f36e39b0e1da002019034943abdb886d0a5b
+  metadata.gz: 8dfdd07111c73c3c82b14f21099777f2b8f173e5ee38a8a8bd2eb1413993690f
+  data.tar.gz: 23e680f4470a0ac86745fc51379f60770e75d9391f02758a9152930afe42c463
 SHA512:
-  metadata.gz: 99ea34310c0c74e41115169a1a59b146ca75e06573383e2195aec671cc9938e8fb812a93783bf804dffc5eeeadd868b588d6c382fa231eeffd6118588d633f2a
-  data.tar.gz: 0c91a1c992a85cff1f4834985b65726bb3230d91948fd43109ec199ee25810514dc58242f7a2d30e7ce94db6c29056f9148093c2b3f1113ac95ab52cb72c87f8
+  metadata.gz: 64f68a22812c58a5cb3c2156b8dc1a5d8c0d95a216b61d5bc145494ca53157e3faa424be03cee86bf93a4b5d5466b1e2e2076960e5ef8fd770be91980e38d909
+  data.tar.gz: a014b7af9a38fecdd17cebb6d978984cfa95fae711931fca5968a7c1d4160d758acb264e677e9be36a584ca4ee1ca7194739a6dff16784e8b7998c54081f102c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.6)
+    app_manager (1.3.9)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -88,7 +88,7 @@ GEM
     diff-lcs (1.5.0)
     digest (3.1.0)
     dotenv (2.1.2)
-    erubi (1.10.0)
+    erubi (1.11.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
@@ -121,7 +121,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_xml (0.6.0)
     net-imap (0.2.3)
       digest
@@ -138,7 +138,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pry (0.14.1)
@@ -192,10 +192,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    strscan (3.0.3)
+    strscan (3.0.4)
     thor (1.2.1)
     timeout (0.3.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)

data/app/controllers/app_manager/charges_controller.rb

@@ -10,6 +10,7 @@ module AppManager
     def process_plan
       if params[:shop].present? && params[:plan_id].present?
         @shop = shop_data
+        grandfathered_field = @field_names['grandfathered']
         if !@shop.nil?
           plan_obj = AppManager::Client.new
           plan_data = plan_obj.get_plan(params[:plan_id], params[:shop])
@@ -29,8 +30,13 @@ module AppManager
                 rescue Exception => e
                   Rollbar.error("APP MANAGER Process Plan Failed #{e}")
                 end
-
-                if @shop.update(@plan_field => params[:plan_id])
+                @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
+                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
                     AppManager::EventHandler.new('charge_created', {
                         "plan" => plan_data,
@@ -42,8 +48,8 @@ module AppManager
                     Rollbar.error("APP MANAGER Error in Process Plan #{e}")
                   end
                   AppManager.clear_cache
-                  render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
-                  # render json: {'status' => true,'plan_type' =>'free_plan'} and return true
+                  # render json: {'redirect_url' => "#{app_url}?shop=#{params[:shop]}"} and return true
+                  render json: {'status' => true,'plan_type' => 'free_plan'} and return true
                 else
                   raise Error, "Invalid charge"
                 end
@@ -106,7 +112,14 @@ module AppManager
 
             if response['message'] == "success"
               AppManager.clear_cache
-              @shop.update(@plan_field => params[:plan],grandfathered_field => nil)
+
+              update_info = {@plan_field => params[:plan],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
+
+              @shop.update(update_info)
               Thread.new do
                 charge_data = plan_obj.get_charge(@shop[shopify_domain])
                 begin
@@ -121,7 +134,9 @@ module AppManager
                 end
               end
             end
-            redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+            embed_host = Base64.encode64(params[:shop] + "/admin")
+            # redirect_to "/login?host=#{embed_host}&shop=#{shop}" and return
+            redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
           else
             raise Error, "Invalid shopify charge #{charges.insect}"
           end
@@ -130,10 +145,10 @@ module AppManager
         end
       else
         if params[:shop].present?
-          redirect_to "#{app_url}?shop=#{params[:shop]}", :status => 301 and return
+          embed_host = Base64.encode64(params[:shop] + "/admin")
+          redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
         else
           raise Error, "Invalid params, must have charge_id,shop && plan in charge controller"
-
         end
       end
     end
@@ -170,6 +185,15 @@ module AppManager
       AppManager.configuration.app_url
     end
 
+    def config_trial_days
+      @field_names = AppManager.configuration.field_names
+      if !@field_names.nil? && @field_names.has_key?('total_trial_days') && !@field_names['total_trial_days'].nil? && !@field_names['total_trial_days'].blank?
+        return @field_names['total_trial_days']
+      else
+        return nil
+      end
+    end
+
 
   end
 end

data/app/controllers/app_manager/plans_controller.rb

@@ -1,5 +1,5 @@
 require_dependency "app_manager/application_controller"
-
+require 'kaminari'
 module AppManager
   class PlansController < ApplicationController
     cache_response_for :plans
@@ -86,17 +86,17 @@ module AppManager
         plans = plans.values if !plans.nil?
         shopify_plans = params[:shopify_plans] || nil
         shopify_plans = shopify_plans.values if !shopify_plans.nil?
-        items_per_page = params[:itemsPerPage] || 25
+        items_per_page = 25
         @shopify_email = AppManager.configuration.field_names['shopify_email']
         @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
-        data = model
         if params[:search]
           data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         else
-          data = model.where(@plan_field => plans) if !plans.nil?
+          data = model
+          data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         end
@@ -126,11 +126,16 @@ 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']
-        if @shop.update(@plan_field => params[:plan_id], @trial_activated_field => DateTime.now)
+        plan_obj = AppManager::Client.new
+        plan_data = plan_obj.get_plan(params[:plan_id], params[:shop_domain]) rescue nil
+        update_info = {@plan_field => params[:plan_id], @trial_activated_field => DateTime.now}
+        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
             AppManager.clear_cache
-            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,
@@ -210,5 +215,14 @@ module AppManager
       AppManager.configuration.app_url
     end
 
+    def config_trial_days
+      @field_names = AppManager.configuration.field_names
+      if !@field_names.nil? && @field_names.has_key?('total_trial_days') && !@field_names['total_trial_days'].nil? && !@field_names['total_trial_days'].blank?
+        return @field_names['total_trial_days']
+      else
+        return nil
+      end
+    end
+
   end
 end

data/lib/app_manager/client/connection.rb

@@ -28,7 +28,8 @@ module AppManager
           response = response_from_cache_for_api(http_method, path, options)
           failsafe_or_caching_done = true
           else
-          response = self.class.send(http_method, path, { body: options, timeout: 30 })
+          time_out = Rails.env.development? ?  120 : 30
+          response = self.class.send(http_method, path, { body: options, timeout: time_out })
           end
           if path.include? "/get-status"
             data = response
@@ -60,13 +61,15 @@ module AppManager
         end
         begin
         response = self.class.send(http_method, path, { body: options, timeout: 15 })
-        if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
-           Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
-        else
-          response = response_from_failsafe(path,options)
-        end
+          if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
+             Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
+          else
+            response = response_from_failsafe(path,options)
+          end
         rescue Net::ReadTimeout => error
           response = response_from_failsafe(path,options)
+        rescue Exception => e
+          response = response_from_failsafe(path,options)
         end
         return response
       end

data/lib/app_manager/fail_safe.rb

@@ -63,7 +63,12 @@ module AppManager
     end
 
     def save_api_plans(plans)
-      AppManager::Plan.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE plans RESTART IDENTITY")
+        AppManager::Plan.connection.truncate(AppManager::Plan.table_name)
+      rescue
+        AppManager::Plan.delete_all
+      end
       if plans.any?
         plan_data = []
         plans.each do |plan|
@@ -87,7 +92,12 @@ module AppManager
 
 
     def save_api_charges(charges)
-      AppManager::Charge.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE charges RESTART IDENTITY")
+        AppManager::Charge.connection.truncate(AppManager::Charge.table_name)
+      rescue
+        AppManager::Charge.delete_all
+      end
       if charges.any?
         charge_data = []
         charges.each do |charge|
@@ -100,7 +110,12 @@ module AppManager
 
 
     def save_api_apps(apps)
-      AppManager::App.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE apps RESTART IDENTITY")
+        AppManager::App.connection.truncate(AppManager::App.table_name)
+      rescue
+        AppManager::App.delete_all
+      end
       if apps.any?
         apps_data = []
         apps.each do |app|
@@ -112,12 +127,22 @@ module AppManager
 
     #Complete
     def save_api_app_structures(app_structures)
-      AppManager::AppStructure.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE app_structures RESTART IDENTITY")
+        AppManager::AppStructure.connection.truncate(AppManager::AppStructure.table_name)
+      rescue
+        AppManager::AppStructure.delete_all
+      end
       AppManager::AppStructure.create(banners: app_structures.to_h)
     end
 
     def save_api_discount_plans(discount_plans)
-      AppManager::DiscountPlan.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE discount_plans RESTART IDENTITY")
+        AppManager::DiscountPlan.connection.truncate(AppManager::DiscountPlan.table_name)
+      rescue
+        AppManager::DiscountPlan.delete_all
+      end
       if discount_plans.any?
         discount_plans_data = []
         discount_plans.each do |discount_plan|
@@ -128,7 +153,12 @@ module AppManager
     end
 
     def save_api_extend_trials(extend_trials)
-      AppManager::ExtendTrial.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE extend_trials RESTART IDENTITY")
+        AppManager::ExtendTrial.connection.truncate(AppManager::ExtendTrial.table_name)
+      rescue
+        AppManager::ExtendTrial.delete_all
+      end
       if extend_trials.any?
         extend_trials_data = []
         extend_trials.each do |extend_trial|
@@ -139,7 +169,12 @@ module AppManager
     end
 
     def save_api_plan_users(plan_users)
-      AppManager::PlanUser.delete_all
+      begin
+        # ActiveRecord::Base.establish_connection(:app_manager).connection.execute("TRUNCATE plan_users RESTART IDENTITY")
+        AppManager::PlanUser.connection.truncate(AppManager::PlanUser.table_name)
+      rescue
+        AppManager::PlanUser.delete_all
+      end
       if plan_users.any?
         extend_plan_users = []
         plan_users.each do |plan_user|
@@ -376,6 +411,11 @@ module AppManager
           if charge['trial_ends_on'] && DateTime.now < charge['trial_ends_on']
             @remaining_days = (charge['trial_ends_on'].to_datetime - DateTime.now.to_datetime).to_i
           end
+
+          # ADD EXTRA DAY
+          if charge['created_at'] && ((charge['created_at'].to_datetime - DateTime.now.to_datetime).to_i == 0)
+            @remaining_days = @remaining_days + 1
+          end
           # TODO: Uncomment this code when we implement Shopify trial extension apis
           # trial_extension_data = AppManager::ExtendTrial.where(shop_domain: @shop_domain, plan_id: @plan_id).order(extend_trial_start_at: :desc)
           # if trial_extension_data.any?

data/lib/app_manager/graphql_helper.rb

@@ -59,15 +59,27 @@ module AppManager
       plan_test = true
       end
       trial_days = plan['trial_days'] || 0
-
       if shop && shop.shopify_domain && trial_days
         trial_activated_at = shop[AppManager.configuration.field_names['trial_activated_at']] rescue nil
         plan_id_field = shop[AppManager.configuration.plan_id_or_name_field] rescue nil
         remaining_obj = AppManager::Client.new
         remaining = remaining_obj.get_remaining_days(shop.shopify_domain,trial_activated_at,plan_id_field)
-        trial_days = !remaining.nil? ? remaining : trial_days
+        # trial_days = !remaining.nil? ? remaining : trial_days
+        if !remaining.nil?
+          if !plan_id_field.nil?
+            plan_obj = AppManager::Client.new
+            current_plan = plan_obj.get_plan(plan_id_field) rescue nil
+            used_days = (current_plan['trial_days'].to_i - remaining.to_i) if current_plan rescue 0
+            if used_days > 0
+              days = trial_days - used_days
+              trial_days = days > 0 ? days : 0
+            end
+          else
+            trial_days = remaining
+          end
+        end
       end
-      
+
       discount_type = plan['discount_type'] || "percentage"
       discount_val = discount_type == "percentage" ? (plan['discount'].to_f/ 100) : "#{plan['discount']}"
       plan_discount =  plan['discount'] ? { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i || 0), "value" => {"#{discount_type}" => discount_val} }  } : {}

data/lib/app_manager/version.rb

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

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

@@ -15,7 +15,8 @@ AppManager.configure do |config|
         'plan_id' => 'plan_id', # 1. t
         'created_at' => 'created_at', # 2022-04-15 10:43:05
         'trial_activated_at' => 'trial_activated_at', # field name that stores trial start/activated date
-        'grandfathered' => 'grandfathered' 
+        'grandfathered' => 'grandfathered',
+        'total_trial_days' => '' #optional, put a trial days field from your shops table otherwise leave it blank
     }
   config.plan_features =  [
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.9
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty