app_manager 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf415f568160cb4d0f964d01a39022df2906cd0cce3f5511f1a3f2fc19fe1155
-  data.tar.gz: fe3d01cf07acc3346a00f43723a016d86884a1fc01820b882de0462a6d92ecec
+  metadata.gz: ea6c61b1ae005d14902a296e6c1a43e28679313985905b295fb24f4f361434cd
+  data.tar.gz: f586f0d88bbb8ccda1fcd4a1c67aea648755909219c8c26671b744eb4c132ee2
 SHA512:
-  metadata.gz: 1d2884af860d6872fa7e434574743219b8f8ca6cba0fa186c7ce05f5383c68cb4323ceff6d5c0bf984fbdc6231939a81005fdad0f500efeb56c8888ecfc86e67
-  data.tar.gz: 00ade8b2e4e6a9160a8c8e445d8693b39b79ffe649dedde189fa83856e9876d06d8bdfa7963a87010da4f268c0ccfdbf34fc096f665929db79db2ecb38e80d14
+  metadata.gz: 27fd9ec25e4c6e1aa49b06dd2668abdc8f3f51efe6becf6fee47bbecc187e9c5bc51485a0ff40a46d4427d08b675738c7af35fc6815958577e33d30fb295de63
+  data.tar.gz: 1f817a3e9193b58e3b792ab36ea567174058f0e39e265c75f6cac5b463a26387007aa6226807b9bd9626171e90ab396b1cbf496c466fae66106ec73eeca2b743

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.6.1)
+    app_manager (1.6.2)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,69 +10,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4.3)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -95,7 +95,7 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -109,9 +109,9 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -120,7 +120,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     multi_xml (0.6.0)
     net-imap (0.3.4)
@@ -132,40 +132,41 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       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.6.4)
+    rack (2.2.7)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
+      railties (= 7.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -187,7 +188,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    thor (1.2.1)
+    thor (1.2.2)
     timeout (0.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -198,7 +199,7 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby

data/README.md

@@ -56,6 +56,7 @@ AppManager.configure do |config|
   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.plan_page_route = '' #Add your app's plan page route here without first slash. Ex. "payment" 
   config.field_names = {
         'name' => 'shopify_domain', # demo-rahul-tiwari.myshopify.com
         'shopify_email' => 'email', # rahul.t@hulkapps.com
@@ -205,6 +206,7 @@ and then you can use follwing methods with your shop objects.
 
 @shop.cancel_current_shopify_charge # It will cancel charge in shopify if there is any, if success then it will cancel charge in app manager as well using (@shop.cancel_charge ) and will make plan_id and grandfathered field to false. It will clear cache as well.
 
+@shop.active_shopfiy_charge_full #It will give shopify recurring charge graphql object with discounted price details
 ```
 
 

data/app/controllers/app_manager/charges_controller.rb

@@ -86,6 +86,8 @@ module AppManager
         shopify_domain = @field_names['name']
         grandfathered_field = @field_names['grandfathered']
         if !@shop.nil?
+          old_plan_id = @shop[@plan_field]
+          old_plan_data = nil
           headers = {"X-Shopify-Access-Token" => @shop[shopify_token]}
           charges = HTTParty.get('https://' + @shop[shopify_domain] + '/admin/api/' + @api_version + '/recurring_application_charges/' + params[:charge_id] + '.json', :headers => headers)
 
@@ -102,14 +104,6 @@ module AppManager
             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
-            #     new_plan_obj.cancel_charge(@shop[shopify_domain], @shop[@plan_field])
-            #   rescue Exception => e
-            #     Rollbar.error("APP MANAGER Error in Cancel charge >>>> #{e.inspect}")
-            #   end
-            # end
 
             charge_ob = AppManager::Client.new(nil, json_req = true)
             response = charge_ob.store_charge(charge.to_json)
@@ -124,6 +118,7 @@ module AppManager
               end
 
               @shop.update(update_info)
+
               Thread.new do
                 charge_data = plan_obj.get_charge(@shop[shopify_domain])
                 begin
@@ -139,8 +134,18 @@ module AppManager
               end
             end
             embed_host = Base64.encode64(params[:shop] + "/admin")
-            # redirect_to "/login?host=#{embed_host}&shop=#{shop}" and return
-            if app_slug.present?
+
+            if !old_plan_id.nil?
+              plan_obj = AppManager::Client.new
+              old_plan_data = plan_obj.get_plan(old_plan_id, params[:shop])
+            end
+
+            current_plan_string = !plan_data.nil? ? "#{plan_data['name'].gsub(" ", "-")}-#{plan_data['interval']['label']}" : "" rescue ""
+            old_plan_string = !old_plan_data.nil? ? "#{old_plan_data['name'].gsub(" ", "-")}-#{old_plan_data['interval']['label']}" : "" rescue ""
+            plan_query_string = "new_plan=#{current_plan_string}&old_plan=#{old_plan_string}"
+            if app_slug.present? && plan_page_route_value.present?
+              redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}/#{plan_page_route_value}?#{plan_query_string}"
+            elsif app_slug.present? && !plan_page_route_value.present?
               redirect_to "https://#{params[:shop]}/admin/apps/#{app_slug}"
             else
               redirect_to "#{app_url}?host=#{embed_host}&shop=#{params[:shop]}", :status => 301 and return
@@ -201,6 +206,10 @@ module AppManager
       AppManager.configuration.shopify_app_slug
     end
 
+    def plan_page_route_value
+      AppManager.configuration.plan_page_route
+    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?

data/lib/app_manager/config.rb

@@ -14,6 +14,7 @@ module AppManager
     attr_accessor :field_names
     attr_accessor :refresh_by_request_params
     attr_accessor :shopify_app_slug
+    attr_accessor :plan_page_route
 
     def initialize
       @refresh_by_request_params = true
@@ -26,6 +27,7 @@ module AppManager
       @shopify_domain_field = 'shopify_domain'
       @plan_id_or_name_field = nil
       @shopify_app_slug = nil
+      @plan_page_route = nil
       @field_names = {
         'name' => 'shopify_domain', # sample example: demo-chirag-parmar.myshopify.com
         'shopify_email' => 'email', # chirag.p@hulkapps.com
@@ -88,5 +90,9 @@ module AppManager
       @shopify_app_slug
     end
 
+    def plan_page_route
+      @plan_page_route
+    end
+
   end
 end

data/lib/app_manager/graphql_helper.rb

@@ -192,6 +192,56 @@ module AppManager
     return data
   end
 
+  def current_rc_charge_gql(shopify_charge_id)
+    query = 'query {
+  node(id: "gid://shopify/AppSubscription/'+shopify_charge_id+'") {
+    ...on AppSubscription {
+      createdAt
+      currentPeriodEnd
+      id
+      name
+      status
+      test
+      lineItems {
+        plan {
+          pricingDetails {
+            ...on AppRecurringPricing {
+              interval
+              price {
+                amount
+                currencyCode
+              }
+              discount {
+                priceAfterDiscount {
+                  amount
+                }
+              }
+            }
+            ...on AppUsagePricing {
+              terms
+              cappedAmount {
+                amount
+                currencyCode
+
+              }
+              balanceUsed {
+                amount
+                currencyCode
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}'
+
+
+    data = run_graph_api(query,'')
+    return data
+
+  end
+
   end
 end
 

data/lib/app_manager/model.rb

@@ -313,6 +313,17 @@ module AppManager
       # end
     end
 
+    def active_shopfiy_charge_full
+      active_charge_id = self.active_shopify_charge_id
+      if active_charge_id.present?
+      gq_obj = AppManager::GraphqlHelper.new(self.shopify_domain, self.shopify_token)
+      rac_data = gq_obj.current_rc_charge_gql(active_charge_id)
+      return rac_data
+      else
+        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?

data/lib/app_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty