app_manager 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f885e36cfc5b5d0884b2728fb4d3bb6eb413a3f8fc582f3c9d14987da29710
-  data.tar.gz: bc2e8f8640351cb0e77627a62973157f4881c5f9f95037f77097c16b48da1e25
+  metadata.gz: '08247cd6b523b162de81de3d88cef576612ff41a2b2438b1182613c78e8d8afd'
+  data.tar.gz: 427cdb3d5feb431764fc99b85d64d208762f5994db53791e82a74cc3c1e248f5
 SHA512:
-  metadata.gz: 3598cd82cace65cb43350d12342cd1f5803febf7448ebacd5baf4ac9ad53eccf15b2efcf1a5b5f6b39c1ccfa181dd7d84bc5e434f8b9efa350262202871779ce
-  data.tar.gz: 75c8b0cbd26af4c9978c19914bc40bb30bb7427da667dc64cd1fc4d0b9e786472457892b96ed4bb75f887fcff2dbbe724d5e92d069620dcbe17e5dff94eb9cd9
+  metadata.gz: d09675e9f069c260e67a0e40c14c786e07e662e4e9901dc8c0a3eb8f21709e3213ae5bf9943e71c3484b59a3dc69448bec6b390960f36da237f85aac31f9dc1f
+  data.tar.gz: '09e251efca96dbea992ab7e5b29eb2fff5c6f353b305699935f5445ee6301784324fa2dbec57777c1212dd0d6b813e639a3ec5bfd11bacbbea99849c56c26173'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.4.4)
+    app_manager (1.5.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -120,7 +120,6 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
     minitest (5.17.0)
     multi_xml (0.6.0)
     net-imap (0.3.4)
@@ -133,8 +132,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)

data/app/controllers/app_manager/charges_controller.rb

@@ -98,6 +98,7 @@ module AppManager
             charge['shop_domain'] = params[:shop]
             charge['interval'] = plan_data['interval']['value']
 
+            ['api_client_id', 'return_url', 'decorated_return_url','id','id','currency'].each { |k| charge.delete k }
             # new_plan_obj = AppManager::Client.new
             # if !@plan_field.nil?
             #   begin

data/lib/app_manager/fail_safe.rb

@@ -84,7 +84,8 @@ module AppManager
           public_val = plan['public'] ? 1 : 0
           store_base_plan = plan['store_base_plan'] ? 1 : 0
           choose_later_plan = plan['choose_later_plan'] ? 1 : 0
-          plan_data << AppManager::Plan.new(id: plan["id"], type: plan["type"], name: plan["name"], price: plan["price"], offer_text: plan["offer_text"], description: plan["description"], interval: interval, shopify_plans: shopify_plans, trial_days: plan["trial_days"], test: plan_test, on_install: plan["on_install"], is_custom: is_custom, app_id: plan["app_id"], base_plan: plan["base_plan"], created_at: plan["created_at"], updated_at: plan["updated_at"], public: public_val, discount: plan["discount"], cycle_count: plan["cycle_count"], store_base_plan: store_base_plan, choose_later_plan: choose_later_plan, discount_type: plan["discount_type"], affiliate: affiliate, features: features, deleted_at: plan["deleted_at"])
+          is_external_charge = plan['is_external_charge'] ? 1 : 0
+          plan_data << AppManager::Plan.new(plan_id: plan["id"], type: plan["type"], name: plan["name"], price: plan["price"], offer_text: plan["offer_text"], description: plan["description"], interval: interval, shopify_plans: shopify_plans, trial_days: plan["trial_days"], test: plan_test, on_install: plan["on_install"], is_custom: is_custom, app_id: plan["app_id"], base_plan: plan["base_plan"], created_at: plan["created_at"], updated_at: plan["updated_at"], public: public_val, discount: plan["discount"], cycle_count: plan["cycle_count"], store_base_plan: store_base_plan, choose_later_plan: choose_later_plan, discount_type: plan["discount_type"], affiliate: affiliate, features: features, deleted_at: plan["deleted_at"],is_external_charge: plan["is_external_charge"],external_charge_limit: plan["external_charge_limit"],terms: plan["terms"])
         end
         AppManager::Plan.bulk_import plan_data
       end
@@ -102,7 +103,7 @@ module AppManager
         charge_data = []
         charges.each do |charge|
           charge_test = charge['test'] ? true : false
-          charge_data << AppManager::Charge.new(charge_id: charge["charge_id"], test: charge_test, status: charge["status"], name: charge["name"], type: charge["type"], price: charge["price"], interval: charge["interval"], trial_days: charge["trial_days"], billing_on: charge["billing_on"], activated_on: charge["activated_on"], trial_ends_on: charge["trial_ends_on"], cancelled_on: charge["cancelled_on"], expires_on: charge["expires_on"], plan_id: charge["plan_id"], description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], app_id: charge["app_id"], sync: true)
+          charge_data << AppManager::Charge.new(c_id: charge["id"],charge_id: charge["charge_id"], test: charge_test, status: charge["status"], name: charge["name"], type: charge["type"], price: charge["price"], interval: charge["interval"], trial_days: charge["trial_days"], billing_on: charge["billing_on"], activated_on: charge["activated_on"], trial_ends_on: charge["trial_ends_on"], cancelled_on: charge["cancelled_on"], expires_on: charge["expires_on"], plan_id: charge["plan_id"], description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], app_id: charge["app_id"], sync: true)
         end
         AppManager::Charge.bulk_import charge_data
       end
@@ -120,7 +121,7 @@ module AppManager
         apps_data = []
         apps.each do |app|
           # apps_data << AppManager::App.new(id: app['id'], name: app['name'], slug: app['slug'], url: app['url'], image: app['image'], api_token: app['api_token'], slack: app['slack'], created_at: app['created_at'], updated_at: app['updated_at'])
-          apps_data << AppManager::App.new(name: app['name'], slug: app['slug'], url: app['url'], image: app['image'], api_token: app['api_token'], slack: app['slack'], created_at: app['created_at'], updated_at: app['updated_at'])
+          apps_data << AppManager::App.new(app_id: app['id'],name: app['name'], slug: app['slug'], url: app['url'], image: app['image'], api_token: app['api_token'], slack: app['slack'], created_at: app['created_at'], updated_at: app['updated_at'])
         end
         AppManager::Charge.bulk_import apps_data
       end
@@ -147,7 +148,7 @@ module AppManager
       if discount_plans.any?
         discount_plans_data = []
         discount_plans.each do |discount_plan|
-          discount_plans_data << AppManager::DiscountPlan.new(discount: discount_plan['discount'], shop_domain: discount_plan['shop_domain'], cycle_count: discount_plan['cycle_count'], plan_id: discount_plan['plan_id'], created_by: discount_plan['created_by'], created_at: discount_plan['created_at'], updated_at: discount_plan['updated_at'], app_id: discount_plan['app_id'], discount_type: discount_plan['discount_type'])
+          discount_plans_data << AppManager::DiscountPlan.new(discount_plan_id: discount_plan['id'],discount: discount_plan['discount'], shop_domain: discount_plan['shop_domain'], cycle_count: discount_plan['cycle_count'], plan_id: discount_plan['plan_id'], created_by: discount_plan['created_by'], created_at: discount_plan['created_at'], updated_at: discount_plan['updated_at'], app_id: discount_plan['app_id'], discount_type: discount_plan['discount_type'])
           # discount_plans_data << AppManager::DiscountPlan.new(id: discount_plan['id'], discount: discount_plan['discount'], shop_domain: discount_plan['shop_domain'], cycle_count: discount_plan['cycle_count'], plan_id: discount_plan['plan_id'], created_by: discount_plan['created_by'], created_at: discount_plan['created_at'], updated_at: discount_plan['updated_at'], app_id: discount_plan['app_id'], discount_type: discount_plan['discount_type'])
         end
         AppManager::DiscountPlan.bulk_import discount_plans_data
@@ -164,7 +165,7 @@ module AppManager
       if extend_trials.any?
         extend_trials_data = []
         extend_trials.each do |extend_trial|
-          extend_trials_data << AppManager::ExtendTrial.new(shop_domain: extend_trial['shop_domain'], plan_id: extend_trial['plan_id'], app_id: extend_trial['app_id'], days: extend_trial['days'], created_by: extend_trial['created_by'], created_at: extend_trial['created_at'], updated_at: extend_trial['updated_at'], extend_trial_start_at: extend_trial['extend_trial_start_at'])
+          extend_trials_data << AppManager::ExtendTrial.new(extend_trial_id: extend_trial['id'],shop_domain: extend_trial['shop_domain'], plan_id: extend_trial['plan_id'], app_id: extend_trial['app_id'], days: extend_trial['days'], created_by: extend_trial['created_by'], created_at: extend_trial['created_at'], updated_at: extend_trial['updated_at'], extend_trial_start_at: extend_trial['extend_trial_start_at'])
           # extend_trials_data << AppManager::ExtendTrial.new(id: extend_trial['id'], shop_domain: extend_trial['shop_domain'], plan_id: extend_trial['plan_id'], app_id: extend_trial['app_id'], days: extend_trial['days'], created_by: extend_trial['created_by'], created_at: extend_trial['created_at'], updated_at: extend_trial['updated_at'], extend_trial_start_at: extend_trial['extend_trial_start_at'])
         end
         AppManager::ExtendTrial.bulk_import extend_trials_data
@@ -181,7 +182,7 @@ module AppManager
       if plan_users.any?
         extend_plan_users = []
         plan_users.each do |plan_user|
-          extend_plan_users << AppManager::PlanUser.new(shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
+          extend_plan_users << AppManager::PlanUser.new(plan_user_id: plan_user['id'],shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
           # extend_plan_users << AppManager::PlanUser.new(id: plan_user['id'], shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
         end
         AppManager::ExtendTrial.bulk_import extend_plan_users
@@ -210,7 +211,7 @@ module AppManager
         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 = AppManager::Plan.where(id: active_plan_id)
+        plan_data = AppManager::Plan.where(plan_id: active_plan_id)
         active_charge_price = plan_data.first['price'] if plan_data.present?
       end
 
@@ -219,7 +220,7 @@ module AppManager
       custom_plan_ids = plan_users.pluck(:plan_id) if plan_users.present?
 
       custom_plan_base_ids = []
-      plan_data = AppManager::Plan.where(id: custom_plan_ids).where.not(base_plan: nil)
+      plan_data = AppManager::Plan.where(plan_id: custom_plan_ids).where.not(base_plan: nil)
       custom_plan_base_ids = plan_data.pluck(:base_plan) if plan_data.present?
 
       if active_plan_id && custom_plan_base_ids.include?(active_plan_id)
@@ -228,13 +229,13 @@ module AppManager
 
       if custom_plan_base_ids.any?
         if custom_plan_ids.present?
-          plans = AppManager::Plan.where("public = ? OR id IN (?)",true,custom_plan_ids).where.not(id: custom_plan_base_ids)
+          plans = AppManager::Plan.where("public = ? OR plan_id IN (?)",true,custom_plan_ids).where.not(plan_id: custom_plan_base_ids)
         else
-          plans = AppManager::Plan.where(public: true).where.not(id: custom_plan_base_ids)
+          plans = AppManager::Plan.where(public: true).where.not(plan_id: custom_plan_base_ids)
         end
       else
         if custom_plan_ids.present?
-          plans = AppManager::Plan.where("public = ? OR id IN (?)",true,custom_plan_ids)
+          plans = AppManager::Plan.where("public = ? OR plan_id IN (?)",true,custom_plan_ids)
         else
           plans = AppManager::Plan.where(public: true)
         end
@@ -336,7 +337,7 @@ module AppManager
       plan_data = {}
       if params.any?
         if params["plan_id"].present? && !params["plan_id"].nil?
-          plans = AppManager::Plan.where(id: params["plan_id"])
+          plans = AppManager::Plan.where(plan_id: params["plan_id"])
           plans.each do |plan|
             new_plan = {}
             plan.as_json.each_with_index do |(key, value), index|
@@ -388,7 +389,7 @@ module AppManager
       if params && params['trial_activated_at'].present? && !params['trial_activated_at'].nil? && params['shop_domain'].present? && params['plan_id'].present? && !params['plan_id'].nil?
         @trial_activated_at = params['trial_activated_at']
         @plan_id = params['plan_id']
-        plan_data = AppManager::Plan.where(id: @plan_id)
+        plan_data = AppManager::Plan.where(plan_id: @plan_id)
         if plan_data.any?
           trial_days = plan_data.first['trial_days']
           trial_start_date = Date.parse(@trial_activated_at)

data/lib/app_manager/graphql_helper.rb

@@ -90,6 +90,28 @@ module AppManager
                        }
       price_details.merge! plan_discount if plan_discount.any?
 
+      plan_var = {
+          "appRecurringPricingDetails":  price_details,
+      }
+
+      line_items_data = [{
+                             "plan": plan_var
+                         }]
+
+      if plan['interval']['value'] == 'EVERY_30_DAYS' && plan['is_external_charge'].present? && plan['is_external_charge'] == true && plan['external_charge_limit'] != ''
+        plan_var_usage = {
+            "plan": {
+                "appUsagePricingDetails":  {
+                    "cappedAmount": {
+                        "amount": plan['external_charge_limit'],
+                        "currencyCode": "USD"
+                    },
+                    "terms": plan['terms']
+                }
+            }
+        }
+        line_items_data.push(plan_var_usage)
+      end
 
       query = 'mutation(
             $name: String!,
@@ -121,14 +143,10 @@ module AppManager
               "returnUrl": return_url,
               "trialDays": trial_days,
               "test": plan_test,
-              "lineItems": [{
-                                "plan": {
-                                    "appRecurringPricingDetails":  price_details
-                                }
-                            }]
+              "lineItems": line_items_data
           }
 
-        data = run_graph_api(query,variables)
+      data = run_graph_api(query,variables)
         return data
    end
 

data/lib/app_manager/version.rb

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

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

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

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

@@ -0,0 +1,15 @@
+class AddExternalChargeFields < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    add_column :plans, :is_external_charge, :boolean unless column_exists? :plans, :is_external_charge, default: false
+    add_column :plans, :external_charge_limit, :bigint unless column_exists? :plans, :external_charge_limit
+    add_column :plans, :terms, :string unless column_exists? :plans, :terms
+
+    add_column :plans, :plan_id, :bigint unless column_exists? :plans, :plan_id
+    add_column :charges, :c_id, :bigint unless column_exists? :charges, :c_id
+    add_column :apps, :app_id, :bigint unless column_exists? :apps, :app_id
+    add_column :discount_plans, :discount_plan_id, :bigint unless column_exists? :discount_plans, :discount_plan_id
+    add_column :extend_trials, :extend_trial_id, :bigint unless column_exists? :extend_trials, :extend_trial_id
+    add_column :plan_users, :plan_user_id, :bigint unless column_exists? :plan_users, :plan_user_id
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -118,6 +118,7 @@ files:
 - lib/app_manager/tasks/sync/local_app_manager.rake
 - lib/app_manager/version.rb
 - lib/generators/app_manager/install/install_generator.rb
+- lib/generators/app_manager/install/templates/add_external_charge_field.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