app_manager 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08247cd6b523b162de81de3d88cef576612ff41a2b2438b1182613c78e8d8afd'
-  data.tar.gz: 427cdb3d5feb431764fc99b85d64d208762f5994db53791e82a74cc3c1e248f5
+  metadata.gz: 2fd3e056fce2196e44c5eb349cd910cf80a7d94bac2530a957c88bb3c5799685
+  data.tar.gz: 80ae23cafeb5680a542e3abe6050b9663e3407c395a0f293aea0b4815575ef17
 SHA512:
-  metadata.gz: d09675e9f069c260e67a0e40c14c786e07e662e4e9901dc8c0a3eb8f21709e3213ae5bf9943e71c3484b59a3dc69448bec6b390960f36da237f85aac31f9dc1f
-  data.tar.gz: '09e251efca96dbea992ab7e5b29eb2fff5c6f353b305699935f5445ee6301784324fa2dbec57777c1212dd0d6b813e639a3ec5bfd11bacbbea99849c56c26173'
+  metadata.gz: a3fc7ee4d7b213c658229d352234a4d43732fd8adc25685e58f3e16bceec6384b8c7dab4b51974c89cf59eba4ce6781aad7afa1638a41f20207957a08b937cd8
+  data.tar.gz: f1a631d14d3ef1633a773bff3a5bbda2b93f612703086caec1fddf36a2cf2901154422ccbd7ff17badc38de59e9f5ece5ce883b90b9b8b20b20988655265807a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.5.0)
+    app_manager (1.6.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,69 +10,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.2)
+      actionview (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.2)
+      activesupport (= 7.0.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.2)
+      activesupport (= 7.0.4.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activestorage (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -81,7 +81,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -89,7 +89,7 @@ GEM
     diff-lcs (1.5.0)
     dotenv (2.1.2)
     erubi (1.12.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
     httparty (0.21.0)
@@ -112,7 +112,7 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -120,6 +120,7 @@ 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)
@@ -132,38 +133,39 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.1)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
     racc (1.6.2)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.4.2)
+      actioncable (= 7.0.4.2)
+      actionmailbox (= 7.0.4.2)
+      actionmailer (= 7.0.4.2)
+      actionpack (= 7.0.4.2)
+      actiontext (= 7.0.4.2)
+      actionview (= 7.0.4.2)
+      activejob (= 7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activerecord (= 7.0.4.2)
+      activestorage (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.4.2)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    railties (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -187,7 +189,7 @@ GEM
     rspec-support (3.11.0)
     thor (1.2.1)
     timeout (0.3.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)

data/README.md

@@ -55,6 +55,7 @@ AppManager.configure do |config|
   config.shopify_table_name = 'shops'  #  Table name which is generated by shopify mostly it is 'shops'
   config.shopify_domain_field = 'shopify_domain' #shopify domain field
   config.plan_id_or_name_field = 'plan_id'
+  config.shopify_app_slug = '' #Add your app slug here
   config.field_names = {
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com
@@ -63,7 +64,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 =  [
     {
@@ -119,7 +121,7 @@ AppManager.configure do |config|
 		"group_order" => "1",
 		"group" => "Group Name",
 	}
-]    
+]  
 end
 #Required, Values type : integer, boolean, string, array #
 #Format: percentage, count, string
@@ -191,6 +193,12 @@ and then you can use follwing methods with your shop objects.
 
 @shop.get_all_plans # return all app plans array
 
+@shop.active_shopify_charge_id # return active shopify charge id if shop has any current reccurring charge otherwise nil
+
+@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
+
 ```
 
 

data/app_manager.gemspec

@@ -5,7 +5,7 @@ require_relative "lib/app_manager/version"
 Gem::Specification.new do |spec|
   spec.name          = "app_manager"
   spec.version       = AppManager::VERSION
-  spec.authors       = "Hulkapps"
+  spec.authors       = "Rahul Tiwari @ Hulkapps"
   spec.email         = "rahul.t@hulkapps.com"
 
   spec.summary       = "An API wrapper of Hulkapps AppManager portal"

data/lib/app_manager/graphql_helper.rb

@@ -42,6 +42,8 @@ module AppManager
         query = query.dup.force_encoding("UTF-8")
         if variables.present?
           query = {"query": "#{query}","variables": variables }
+        else
+          query = {"query": "#{query}","variables": {} }
         end
         if is_json
           response = api_call(query.to_json,true)
@@ -176,6 +178,20 @@ module AppManager
           return data
    end
 
+  def recurring_charge_current_api_call(shop)
+    query =   'query {
+      currentAppInstallation {
+        activeSubscriptions {
+          id
+          name
+          test
+        }
+      }
+    }'
+    data = run_graph_api(query,{})
+    return data
+  end
+
   end
 end
 

data/lib/app_manager/model.rb

@@ -152,6 +152,142 @@ module AppManager
       end
     end
 
+    def get_active_charge_app_manager
+        active_charge = self.get_charge rescue nil
+        return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? active_charge['active_charge'] : nil
+    end
+
+    def has_valid_app_manager_plan_id
+      shop_plan_id = self[AppManager.configuration.plan_id_or_name_field]
+      shop_domain = self[AppManager.configuration.shopify_domain_field]
+      plan_obj = AppManager::Client.new
+      plans = plan_obj.get_plans(shop_domain) rescue nil
+      return shop_plan_id && (plans && plans.any? && plans.collect{|e| e['id']}.include?(shop_plan_id)) ? true : false
+    end
+
+    def update_app_manager_charge(current_shopify_charge_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]
+        if get_active_charge_app_manager.nil?
+          current_charge_id = current_shopify_charge_id.present? ? current_shopify_charge_id : active_shopify_charge_id
+          if current_charge_id.present?
+            if has_valid_app_manager_plan_id
+              if charge_update_call(self,shop_plan_id,current_charge_id)
+                charge_updated = true
+              end
+            end
+          end
+        end
+        return charge_updated
+      rescue Exception => e
+        Rollbar.error("Warning in APP MANAGER, trying to get active shopify charge id >>>> #{e.inspect}")
+        return nil
+      end
+    end
+
+    def active_shopify_charge_id
+      begin
+          gq_obj = AppManager::GraphqlHelper.new(self.shopify_domain, self.shopify_token)
+          data = gq_obj.recurring_charge_current_api_call(self)
+          if !data["errors"].present? && (data["data"].present? && data["data"]["currentAppInstallation"].present? && data["data"]["currentAppInstallation"]["activeSubscriptions"].present?)
+            current_shopify_charge_id = data["data"]["currentAppInstallation"]["activeSubscriptions"].first["id"]
+            if current_shopify_charge_id
+              return current_shopify_charge_id.split('/')[-1] rescue nil
+            else
+              return nil
+            end
+          else
+            return nil
+          end
+      rescue Exception => e
+        Rollbar.error("Warning in APP MANAGER, trying to get active shopify charge id >>>> #{e.inspect}")
+        return nil
+      end
+    end
+
+    def app_manager_charge_update(shop,shopify_current_charge_obj)
+      if shop.present? && shop.plan_id.present? && shopify_current_charge_obj.present?
+        charge_update_call(shop,shop.plan_id,shopify_current_charge_obj['id'],shopify_current_charge_obj)
+      end
+    end
+
+    def charge_update_call(shop,shop_plan_id,current_charge_id,charge_obj={})
+      charge_callback_done = nil
+      # begin
+        @shop = shop
+        @field_names = AppManager.configuration.field_names
+        shopify_token = @field_names['shopify_token']
+        shopify_domain = @field_names['name']
+        grandfathered_field = @field_names['grandfathered']
+        shop_domain = @shop[AppManager.configuration.shopify_domain_field]
+        if !@shop.nil?
+          if charge_obj.present? && !charge_obj.nil?
+            shopify_charge_obj = charge_obj
+          else
+            headers = {"X-Shopify-Access-Token" => @shop[shopify_token]}
+            charges = HTTParty.get('https://' + shop_domain + '/admin/api/' + AppManager.configuration.shopify_api_version + '/recurring_application_charges/' + current_charge_id + '.json', :headers => headers)
+            shopify_charge_obj = charges.parsed_response && charges.parsed_response.is_a?(Hash) && charges.parsed_response.has_key?('recurring_application_charge') ? charges.parsed_response['recurring_application_charge'] : {}
+          end
+
+          if shopify_charge_obj.present?
+            plan_obj = AppManager::Client.new
+            plan_data = plan_obj.get_plan(shop_plan_id, shop_domain)
+            charge = shopify_charge_obj
+            charge['charge_id'] = charge['id']
+            charge['type'] = 'recurring'
+            charge['plan_id'] = shop_plan_id
+            charge['shop_domain'] = shop_domain
+            charge['interval'] = plan_data['interval']['value']
+            ['api_client_id', 'return_url', 'decorated_return_url','id','id','currency'].each { |k| charge.delete k }
+            charge_ob = AppManager::Client.new(nil, json_req = true)
+            response = charge_ob.store_charge(charge.to_json)
+
+            if response['message'] == "success"
+              AppManager.clear_cache
+
+              update_info = {AppManager.configuration.plan_id_or_name_field => shop_plan_id,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)
+                charge_callback_done = true
+              end
+              Thread.new do
+                charge_data = plan_obj.get_charge(@shop[shopify_domain])
+                begin
+                  AppManager::EventHandler.new('charge_created', {
+                      "plan" => plan_data,
+                      "charge" => charge,
+                      "previous_charge" => charge_data ? (charge_data['cancelled_charge'] || nil) : nil,
+                      "shopify_domain" => shop_domain
+                  })
+                rescue Exception => e
+                  Rollbar.error("Warning in APP MANAGER model Charge Created Callback Event Fire>>>> #{e.inspect}")
+                end
+              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}")
+      #   return nil
+      # end
+    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
+
     def set_default_plan(plan_id = nil)
       begin
         if plan_id.nil?

data/lib/app_manager/version.rb

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

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

@@ -1,4 +1,4 @@
-class AddExternalChargeFields < ActiveRecord::Migration[<%= rails_migration_version %>]
+class AddExternalChargeField < 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

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

@@ -7,6 +7,7 @@ AppManager.configure do |config|
   config.shopify_table_name = 'shops'  #  Table name which is generated by shopify mostly it is 'shops'
   config.shopify_domain_field = 'shopify_domain' #shopify domain field
   config.plan_id_or_name_field = 'plan_id'
+  config.shopify_app_slug = '' #Add your app slug here
   config.field_names = {
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
-- Hulkapps
+- Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty