app_manager 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9661cef74e8d94fb367e3a6886459bfde70c41d37d5c520892cbb4c7c39f86d5
-  data.tar.gz: 3b3dce409ba57c93e93373eded966f1b576e29918dd25bf3f74117e14debf156
+  metadata.gz: b07aa041091f2f5c6acc9fc85b9ffbf6c73d7d97f0694981fb3ee261fd4d167c
+  data.tar.gz: 3ef460faa396f6dbb9df6cb66010045975cd76b28a29e97d00b4542bb846a0c2
 SHA512:
-  metadata.gz: 5c4169d529a20d888ea6c308a380dd9a9d91e8f654145338f5ca76ad42d3ac26ec2e4ce486dab845f2ee854129b282fa6fcdce471ca3e8e2e30ebfc6e07c9096
-  data.tar.gz: a2cd325a7d10096a812644a47a0fdeed0bd51117ed13e35ee0cdd7b5950aa83553db2ed10a939a8ec388a4a5a33172ee8b43ec64bf946c9dd9c43f0547911ccd
+  metadata.gz: 22f3bb93b50b5064d8db803023882e48539e9c212703b922379378e3cff63d017020b96c7cf3d2bdf3402768e4011f1ffbbd7ba823d513c3d81c9881a6f91a69
+  data.tar.gz: 423fbd2cea4724aaeeacfc86fc6f90d15df211fc8a74a23c8e6ac2c93ff3744d27c502873d55b3beb03d3783db3492d74b26c63f2d0d940209668715bccbc8d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (2.5.0)
+    app_manager (2.7.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -92,27 +92,27 @@ GEM
     bigdecimal (4.0.1)
     builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
     crack (1.0.1)
       bigdecimal
       rexml
-    crass (1.0.6)
+    crass (1.0.7)
     csv (3.3.5)
     date (3.5.1)
     diff-lcs (1.6.2)
     dotenv (2.1.2)
     drb (2.2.3)
-    erb (6.0.4)
+    erb (6.0.6)
     erubi (1.13.1)
-    globalid (1.3.0)
+    globalid (1.4.0)
       activesupport (>= 6.1)
     hashdiff (1.2.1)
     httparty (0.24.2)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
     irb (1.18.0)
@@ -120,7 +120,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.7)
+    json (2.21.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -134,10 +134,10 @@ GEM
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.9.0)
+    mail (2.9.1)
       logger
       mini_mime (>= 0.1.1)
       net-imap
@@ -152,7 +152,7 @@ GEM
       prism (~> 1.5)
     multi_xml (0.9.1)
       bigdecimal (>= 3.1, < 5)
-    net-imap (0.6.4)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -162,12 +162,12 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.3)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
@@ -175,9 +175,6 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       reline (>= 0.6.0)
-    psych (5.3.1)
-      date
-      stringio
     public_suffix (7.0.2)
     racc (1.8.1)
     rack (3.2.6)
@@ -206,8 +203,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (8.1.3)
       actionpack (= 8.1.3)
@@ -219,9 +216,14 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rake (13.3.1)
-    rdoc (7.2.0)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
     reline (0.6.3)
       io-console (~> 0.5)
@@ -242,7 +244,6 @@ GEM
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
     securerandom (0.4.1)
-    stringio (3.2.0)
     thor (1.5.0)
     timeout (0.6.1)
     tsort (0.2.0)
@@ -254,7 +255,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

data/app/controllers/app_manager/charges_controller.rb

@@ -34,7 +34,7 @@ module AppManager
                   Rollbar.error("APP MANAGER Process Plan Failed #{e.inspect}-#{e.backtrace}")
                 end
                 @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
-                update_info = {@plan_field => params[:plan_id], @trial_activated_field => nil,grandfathered_field => 0}
+                update_info = {@plan_field => params[: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
@@ -58,7 +58,8 @@ module AppManager
                   raise Error, "Invalid charge"
                 end
               end
-            request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
+            charge_timestamp = Time.now.to_i
+            request_data = {'shop' => @shop.shopify_domain, 'timestamp' => charge_timestamp, 'plan' => params[:plan_id]}
             request_data.merge!('host' => params['host']) if params['host'].present?
             request_data.merge!('old_plan' => params['old_plan']) if params['old_plan'].present?
 
@@ -66,6 +67,14 @@ module AppManager
             gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
             discount_local_storage = params[:discount_code].present? && !params[:discount_code].nil? ? params[:discount_code] : nil
             data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop,discount_local_storage)
+            # Stash the discount snapshot so the callback can persist it on the charge row.
+            if gq_obj.discount_snapshot.present?
+              begin
+                Rails.cache.write(AppManager.charge_snapshot_cache_key(@shop.shopify_domain, charge_timestamp), gq_obj.discount_snapshot, expires_in: 1.hour)
+              rescue Exception => e
+                Rollbar.error("APP MANAGER Failed to cache discount snapshot #{e.inspect}")
+              end
+            end
             if data.present? && !data["errors"].present? && (data["data"].present? && data["data"]["appSubscriptionCreate"].present? && (!data["data"]["appSubscriptionCreate"]["userErrors"].any? && data["data"]["appSubscriptionCreate"]["confirmationUrl"]))
               redirect_charge = data["data"]["appSubscriptionCreate"]["confirmationUrl"]
               render json: {'redirect_url' => redirect_charge}
@@ -111,6 +120,14 @@ module AppManager
 
             ['api_client_id', 'return_url', 'decorated_return_url','id','id','currency'].each { |k| charge.delete k }
 
+            # Merge the discount snapshot captured at charge creation onto the charge row.
+            snapshot_key = AppManager.charge_snapshot_cache_key(params[:shop], params[:timestamp])
+            discount_snapshot = Rails.cache.read(snapshot_key) rescue nil
+            if discount_snapshot.is_a?(Hash)
+              discount_snapshot.each { |field, value| charge[field] = value unless value.nil? || value == '' }
+              Rails.cache.delete(snapshot_key) rescue nil
+            end
+
             charge_ob = AppManager::Client.new(nil, json_req = true)
             response = charge_ob.store_charge(charge.to_json)
 
@@ -209,11 +226,10 @@ module AppManager
       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}
+        update_info = {@plan_field => params[: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
@@ -242,9 +258,8 @@ module AppManager
       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}
+          update_info = {@plan_field => nil, grandfathered_field => 0}
           if !config_trial_days.nil?
             update_info[config_trial_days] = 0
           end

data/app/controllers/app_manager/plans_controller.rb

@@ -98,6 +98,30 @@ module AppManager
       app_faqs_obj = AppManager::Client.new
       app_faqs = app_faqs_obj.get_app_faqs || []
 
+      # Embed the active charge's effective pricing onto the matching plan(s), so it
+      # travels with the plan payload the frontend already consumes.
+      active_charge_pricing = nil
+      if active_charge.is_a?(Hash) && active_charge['active_charge'].is_a?(Hash) && active_charge['active_charge']['effective_price']
+        ac = active_charge['active_charge']
+        active_charge_pricing = {
+            'plan_id' => ac['plan_id'],
+            'interval' => ac['interval'],
+            'effective_price' => ac['effective_price'],
+            'strike_price' => ac['strike_price'],
+            'is_discount_active' => ac['is_discount_active'] || false,
+            'discount_ends_on' => ac['discount_ends_on'],
+            'remaining_intervals' => ac['remaining_intervals'],
+            'discount_value' => ac['discount_value'],
+            'discount_type' => ac['discount_type'],
+            'discount_duration_intervals' => ac['discount_duration_intervals']
+        }
+      end
+
+      if active_charge_pricing.present?
+        plans = plans.map { |p| with_active_charge_pricing(p, active_charge_pricing) } if plans.is_a?(Array)
+        plan = with_active_charge_pricing(plan, active_charge_pricing)
+      end
+
       response = {
           'plans' => plans,
           'promotional_discount' => promotional_discount,
@@ -108,13 +132,24 @@ module AppManager
           'default_plan_id' => default_plan_id,
           'most_popular_plan_ids' => most_popular_plan_ids,
           'choose_later' => choose_later,
-          'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false),
+          'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) || (plan.present? && plan['price'].to_f == 0) || !trial_activated_at) ? true : false),
           'global_plan_charge' => plan.present? && plan['is_global'] && active_charge.present? && active_charge.any? && !active_charge['active_charge'].nil? && !active_charge['bundle_charge'].nil?,
           'app_faqs' => app_faqs
       }
       render json: response
     end
 
+    # Attaches active_charge_pricing to a plan only when it is the plan the active
+    # charge belongs to (same id and, when known, same interval).
+    def with_active_charge_pricing(plan, pricing)
+      return plan unless plan.is_a?(Hash) && plan.present?
+      matches_plan = plan['id'].to_s == pricing['plan_id'].to_s
+      plan_interval = plan['interval'].is_a?(Hash) ? plan['interval']['value'] : plan['interval']
+      matches_interval = pricing['interval'].blank? || plan_interval == pricing['interval']
+      plan = plan.merge('active_charge_pricing' => pricing) if matches_plan && matches_interval
+      plan
+    end
+
     def users
       if model
 
@@ -170,7 +205,11 @@ module AppManager
         @trial_activated_field = AppManager.configuration.field_names['trial_activated_at']
         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}
+        # Only stamp the trial start the first time; re-assigning a no-charge plan must
+        # not restart the trial clock (that would hand back trial days already consumed).
+        existing_trial_activated_at = @shop[@trial_activated_field] rescue nil
+        update_info = {@plan_field => params[:plan_id]}
+        update_info[@trial_activated_field] = DateTime.now if existing_trial_activated_at.blank?
         if !config_trial_days.nil? && !plan_data.nil?
           trial_days = plan_data['trial_days'] || 0
           update_info[config_trial_days] = trial_days

data/lib/app_manager/fail_safe.rb

@@ -159,13 +159,26 @@ module AppManager
         charges.each do |charge|
           charge_test = charge['test'] ? true : false
           if !charge["id"].nil?
-          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)
+            attrs = { 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 }
+            add_charge_discount_snapshot(attrs, charge)
+            charge_data << AppManager::Charge.new(attrs)
           end
         end
         AppManager::Charge.bulk_import charge_data
       end
     end
 
+    # Copies the discount snapshot fields (value/type/duration/source/promo id) from a
+    # charge payload onto the failsafe attrs, but only for columns that actually exist
+    # so older (un-migrated) installs keep working.
+    def add_charge_discount_snapshot(attrs, charge)
+      columns = AppManager::Charge.column_names
+      %w[discount_value discount_type discount_duration_intervals discount_source promotional_discount_id].each do |field|
+        attrs[field.to_sym] = charge[field] if columns.include?(field) && !charge[field].nil?
+      end
+      attrs
+    end
+
 
     def save_api_apps(apps)
       begin
@@ -204,8 +217,11 @@ module AppManager
       end
       if discount_plans.any?
         discount_plans_data = []
+        has_used_column = AppManager::DiscountPlan.column_names.include?('used')
         discount_plans.each do |discount_plan|
-          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'])
+          attrs = { 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'] }
+          attrs[:used] = discount_plan['used'] ? true : false if has_used_column
+          discount_plans_data << AppManager::DiscountPlan.new(attrs)
           # 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
@@ -238,8 +254,11 @@ module AppManager
       end
       if plan_users.any?
         extend_plan_users = []
+        has_used_column = AppManager::PlanUser.column_names.include?('used')
         plan_users.each do |plan_user|
-          extend_plan_users << AppManager::PlanUser.new(plan_user_id: plan_user['id'],shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], app_id: plan_user['app_id'],created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'])
+          attrs = { plan_user_id: plan_user['id'], shop_domain: plan_user['shop_domain'], plan_id: plan_user['plan_id'], app_id: plan_user['app_id'], created_by: plan_user['created_by'], created_at: plan_user['created_at'], updated_at: plan_user['updated_at'] }
+          attrs[:used] = plan_user['used'] ? true : false if has_used_column
+          extend_plan_users << AppManager::PlanUser.new(attrs)
           # 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::PlanUser.bulk_import extend_plan_users
@@ -396,6 +415,7 @@ module AppManager
 
       custom_plan_ids = []
       plan_users = AppManager::PlanUser.where(shop_domain: params['shop_domain'])
+      plan_users = plan_users.where(used: false) if AppManager::PlanUser.column_names.include?('used')
       custom_plan_ids = plan_users.pluck(:plan_id) if plan_users.present?
 
       custom_plan_base_ids = []
@@ -474,6 +494,7 @@ module AppManager
         custom_discounts_data = []
         if params["shop_domain"].present? && plan_data
           custom_discounts = AppManager::DiscountPlan.where(shop_domain: params['shop_domain']).order(created_at: :desc)
+          custom_discounts = custom_discounts.where(used: false) if AppManager::DiscountPlan.column_names.include?('used')
           if custom_discounts.present?
             custom_discounts.each do |custom_discount|
               new_custom_discount = {}
@@ -496,6 +517,7 @@ module AppManager
               plan['discount'] = cd['discount']
               plan['discount_type'] = cd['discount_type']
               plan['cycle_count'] = cd['cycle_count']
+              plan['discount_is_custom'] = true
             end
           end
 
@@ -556,10 +578,12 @@ module AppManager
             plan_data['old_plan_id'] = nil # Temporary for migration puspose only
             if params["shop_domain"].present? && plan_data
               discount_plans = AppManager::DiscountPlan.where(plan_id: params["plan_id"], shop_domain: params["shop_domain"])
+              discount_plans = discount_plans.where(used: false) if AppManager::DiscountPlan.column_names.include?('used')
               discount_plans.each do |cd|
                 plan_data['discount'] = cd['discount'] if cd rescue plan_data['discount']
                 plan_data['discount_type'] = cd['discount_type'] if cd rescue plan_data['discount_type']
                 plan_data['cycle_count'] = cd['cycle_count'] if cd rescue plan_data['cycle_count']
+                plan_data['discount_is_custom'] = true if cd
               end
             end
 
@@ -572,54 +596,82 @@ module AppManager
     end
 
     def get_local_remaining_days(params, options)
-      @remaining_days = 0
-      @shop_domain = params['shop_domain']
-      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(plan_id: @plan_id)
-        if plan_data.any?
-          trial_days = plan_data.first['trial_days']
-          trial_start_date = Date.parse(@trial_activated_at)
-          trial_end_date = trial_start_date + trial_days.days
-          if trial_end_date > DateTime.now
-            @remaining_days = (trial_end_date - DateTime.now).to_i
-          end
-          # return @remaining_days.inspect
-          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?
-            trial_extension_data = trial_extension_data.first
-            extend_trial_date = trial_extension_data['created_at'].to_datetime + trial_extension_data['days'].to_i.days
-            remaining_extended_days = DateTime.now < extend_trial_date ? (extend_trial_date - DateTime.now).to_i : 0
-            @remaining_days = @remaining_days + remaining_extended_days
-          end
+      shop_domain = params['shop_domain']
+      plan_id = params['plan_id']
+      trial_activated_at = params['trial_activated_at']
+
+      return nil if plan_id.blank?
+
+      plan_trial_days = (AppManager::Plan.where(plan_id: plan_id).limit(1).pluck(:trial_days).first || 0).to_i
+
+      # Extension stack - sum every record for this plan.
+      extension_days = AppManager::ExtendTrial.where(shop_domain: shop_domain, plan_id: plan_id).sum(:days).to_i
+
+      consumed = prepare_consumed_trial_days(shop_domain, trial_activated_at)
+
+      [0, (plan_trial_days + extension_days) - consumed].max
+    end
+
+    # Offline mirror of the portal's consumed-trial-days calculation. Total trial days
+    # already consumed, excluding time spent on a free plan (paused via
+    # charge.cancelled_on). Derived from existing failsafe tables only.
+    def prepare_consumed_trial_days(shop_domain, trial_activated_at = nil)
+      windows = []
+      earliest_charge_start = nil
+
+      charges = AppManager::Charge.where(shop_domain: shop_domain)
+                    .where('trial_days > 0')
+                    .where.not(trial_ends_on: nil)
+
+      charges.each do |charge|
+        trial_end = to_datetime_safe(charge['trial_ends_on'])
+        next if trial_end.nil?
+        start = trial_end - charge['trial_days'].to_i.days
+
+        earliest_charge_start = start if earliest_charge_start.nil? || start < earliest_charge_start
+
+        finish = DateTime.now
+        if charge['cancelled_on'].present?
+          cancelled_on = to_datetime_safe(charge['cancelled_on'])
+          finish = cancelled_on if cancelled_on && cancelled_on < finish
         end
-        return @remaining_days
+        finish = trial_end if trial_end < finish
+        windows << [start, finish] if finish > start
       end
-      @charges = AppManager::Charge.where(shop_domain: @shop_domain).order(created_at: :desc)
-      if @charges.any?
-        charge = @charges.first
 
-        if charge['trial_days']
-          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
+      if trial_activated_at.present?
+        choose_later_plan = AppManager::Plan.where(choose_later_plan: true).order(id: :desc).first
+        if choose_later_plan && choose_later_plan['trial_days'].to_i > 0
+          cl_extension = AppManager::ExtendTrial.where(shop_domain: shop_domain, plan_id: choose_later_plan['plan_id']).sum(:days).to_i
+          length = choose_later_plan['trial_days'].to_i + cl_extension
+          start = to_datetime_safe(trial_activated_at)
+          unless start.nil?
+            natural_end = start + length.days
+            finish = DateTime.now < natural_end ? DateTime.now : natural_end
+            # No-charge trial ends when the first charge starts.
+            finish = earliest_charge_start if earliest_charge_start && earliest_charge_start < finish
+            windows << [start, finish] if finish > start
           end
+        end
+      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?
-          #   trial_extension_data = trial_extension_data.first
-          #   extend_trial_date = trial_extension_data['created_at'] + trial_extension_data['days'].to_i.days
-          #   remaining_extended_days = DateTime.now < extend_trial_date ? (extend_trial_date - DateTime.now).to_i : 0
-          #   @remaining_days = @remaining_days + remaining_extended_days
-          # end
+      return 0 if windows.empty?
+
+      windows.sort_by! { |w| w[0] }
+
+      total = 0
+      cur_start, cur_end = windows[0]
+      windows[1..-1].each do |start, finish|
+        if start <= cur_end
+          cur_end = finish if finish > cur_end
+        else
+          total += (cur_end - cur_start).to_i
+          cur_start, cur_end = start, finish
         end
-        return @remaining_days
       end
+      total += (cur_end - cur_start).to_i
+
+      total
     end
 
 
@@ -633,6 +685,7 @@ module AppManager
         charges = AppManager::Charge.where(status: 'active', shop_domain: params["shop_domain"])
         if charges.any?
           active_charge = charges.first.attributes
+          active_charge = active_charge.merge(effective_charge_pricing(active_charge))
         end
         cancelled_charges = AppManager::Charge.where(status: 'cancelled', shop_domain: params["shop_domain"]).order(created_at: :desc)
         if cancelled_charges.any?
@@ -643,6 +696,78 @@ module AppManager
       return charge_hash
     end
 
+    # Offline mirror of the portal's effective-pricing calculation. Derives the true
+    # price the shop pays right now from the discount snapshot stored on the charge
+    # plus elapsed time, instead of recomputing from current discount config.
+    def effective_charge_pricing(charge)
+      base = (charge['price'] || 0).to_f.round(2)
+      no_discount = {
+          'effective_price' => base,
+          'strike_price' => nil,
+          'is_discount_active' => false,
+          'remaining_intervals' => nil,
+          'discount_ends_on' => nil
+      }
+
+      begin
+        now = DateTime.now
+
+        value = charge['discount_value']
+        return no_discount if value.nil? || value.to_f <= 0
+
+        type = charge['discount_type'] || 'percentage'
+        discounted = type == 'percentage' ? base - (base * value.to_f / 100) : base - value.to_f
+        discounted = [discounted, 0].max.round(2)
+
+        duration = (charge['discount_duration_intervals'] || 0).to_i
+        if duration <= 0
+          return {
+              'effective_price' => discounted,
+              'strike_price' => base,
+              'is_discount_active' => true,
+              'remaining_intervals' => nil,
+              'discount_ends_on' => nil
+          }
+        end
+
+        anchor = to_datetime_safe(charge['trial_ends_on'] || charge['activated_on'] || charge['created_at']) || now
+
+        interval_days = charge['interval'] == 'ANNUAL' ? 365 : 30
+        days_since_anchor = [(now - anchor).to_f, 0].max
+        elapsed = (days_since_anchor / interval_days).floor
+        ends_on = (anchor + (duration * interval_days)).to_date.to_s
+
+        if elapsed >= duration
+          return {
+              'effective_price' => base,
+              'strike_price' => nil,
+              'is_discount_active' => false,
+              'remaining_intervals' => 0,
+              'discount_ends_on' => ends_on
+          }
+        end
+
+        {
+            'effective_price' => discounted,
+            'strike_price' => base,
+            'is_discount_active' => true,
+            'remaining_intervals' => duration - elapsed,
+            'discount_ends_on' => ends_on
+        }
+      rescue Exception => e
+        Rollbar.error("APP MANAGER effective_charge_pricing failed #{e.inspect}") rescue nil
+        no_discount
+      end
+    end
+
+    def to_datetime_safe(value)
+      return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+      return value.to_datetime if value.respond_to?(:to_datetime)
+      DateTime.parse(value.to_s)
+    rescue Exception
+      nil
+    end
+
     def get_local_has_plan(params, options)
       if params["grandfathered"].present? && params["grandfathered"] == 1
         return {"has_plan" => true}
@@ -739,7 +864,9 @@ module AppManager
           test_value = charge["test"]
           plan_id = charge["plan_id"].to_i
           begin
-            AppManager::Charge.create(charge_id: charge["charge_id"], test: test_value, 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: plan_id, description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], sync: 0, process_type: 'store-charge')
+            attrs = { charge_id: charge["charge_id"], test: test_value, 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: plan_id, description: charge["description"], shop_domain: charge["shop_domain"], created_at: charge["created_at"], updated_at: charge["updated_at"], sync: 0, process_type: 'store-charge' }
+            add_charge_discount_snapshot(attrs, charge)
+            AppManager::Charge.create(attrs)
             message = {"message" => 'success'}
           rescue Exception => e
             Rollbar.error("Charge not saved on local DB due to #{e.inspect}")

data/lib/app_manager/graphql_helper.rb

@@ -1,6 +1,10 @@
 module AppManager
   class GraphqlHelper
-    
+
+    # Discount snapshot captured while building the last recurring charge, so the
+    # charge callback can persist it (value/type/duration/source) on the charge row.
+    attr_reader :discount_snapshot
+
     def initialize(shopify_domain,shopify_token)
         @api_key = AppManager.configuration.shopify_api_key || nil
         @api_version = AppManager.configuration.shopify_api_version || nil
@@ -61,26 +65,13 @@ module AppManager
       if !plan['affiliate'].nil? && plan['affiliate'].any? && !shop_plan_field.nil? && (plan['affiliate'].map{|e| e['value']}.include?(shop[shop_plan_field]) || shop[partner_development_field])
         plan_test = true
       end
-      trial_days = plan['trial_days'] || 0
-      if shop && shop.shopify_domain && trial_days
+      trial_days = (plan['trial_days'] || 0).to_i
+      if shop && shop.shopify_domain
         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
-
-        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
+        remaining = remaining_obj.get_remaining_days(shop.shopify_domain, trial_activated_at, plan['id'])
+        if remaining.is_a?(Numeric) || (remaining.is_a?(String) && remaining.match?(/\A-?\d+\z/))
+          trial_days = [0, remaining.to_i].max
         end
       end
 
@@ -91,54 +82,61 @@ module AppManager
         promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
       end
 
-      if !plan['discount'].nil? && plan['discount'] != 0
+      # A promotional discount now takes priority over the plan's own discount when it
+      # applies to this (non-global) plan; otherwise fall back to the plan discount.
+      promo_applies = promotional_discount.present? && promotional_discount.respond_to?(:any?) && promotional_discount.any? &&
+                      promotional_discount['value'].to_f > 0 &&
+                      !(plan['is_global'] == 1 || plan['is_global'] == true) &&
+                      (promotional_discount['plan_relation'].blank? || promotional_discount['plan_relation'].include?(plan['id']))
+
+      plan_discount = {}
+      @discount_snapshot = nil
+
+      if promo_applies
+        discount_type = promotional_discount['type'] || 'percentage'
+        discount_value = {
+            discount_type => discount_type == 'percentage' ? promotional_discount['value'].to_f / 100 : [promotional_discount['value'].to_f, plan['price']].min
+        }
+        discount = { 'value' => discount_value }
+        discount['durationLimitInIntervals'] = promotional_discount['duration_intervals'].to_i if promotional_discount['duration_intervals'].to_i.positive?
+        plan_discount = { "discount" => discount }
+
+        @discount_snapshot = {
+            'discount_value' => promotional_discount['value'].to_f,
+            'discount_type' => promotional_discount['type'] || 'percentage',
+            'discount_duration_intervals' => promotional_discount['duration_intervals'].to_i,
+            'discount_source' => 'promotional',
+            'promotional_discount_id' => (promotional_discount['id'] || 0).to_i
+        }
+      elsif !plan['discount'].nil? && plan['discount'] != 0
         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[/^\d{4}/].to_i >= 2024
-          plan_discount = if plan['discount'] && plan['cycle_count'] && plan['cycle_count'].to_i != 0
+          plan_discount = if plan['cycle_count'] && plan['cycle_count'].to_i != 0
                             {
                                 "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i),
                                                 "value" => {"#{discount_type}" => discount_val}
                                 }
                             }
-                          elsif plan['discount']
+                          else
                             {
                                 "discount" => { "value" => {"#{discount_type}" => discount_val}
                                 }
                             }
-                          else
-                            {}
                           end
         else
-          plan_discount =  plan['discount'] ? { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i), "value" => {"#{discount_type}" => discount_val} }  } : {}
-        end
-      else
-
-        if promotional_discount.any?
-
-          if promotional_discount['plan_relation'].any? && !promotional_discount['plan_relation'].include?(plan['id']) && plan['is_global']
-            plan_discount = {}
-          else
-
-            discount_type = promotional_discount['type'] || 'percentage'
-            discount_value = {
-                discount_type => discount_type == 'percentage' ? promotional_discount['value'].to_f / 100 : [promotional_discount['value'].to_f, plan['price']].min
-            }
-
-            discount = { 'value' => discount_value }
-
-            discount['durationLimitInIntervals'] = promotional_discount['duration_intervals'].to_i if promotional_discount['duration_intervals'].to_i.positive?
-            plan_discount = { "discount" => discount}
-
-          end
-
+          plan_discount = { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i), "value" => {"#{discount_type}" => discount_val} }  }
         end
 
+        @discount_snapshot = {
+            'discount_value' => plan['discount'].to_f,
+            'discount_type' => plan['discount_type'] || 'percentage',
+            'discount_duration_intervals' => plan['cycle_count'].to_i,
+            'discount_source' => plan['discount_is_custom'] ? 'custom' : 'plan'
+        }
       end
 
-      discount_exists = !plan['discount'].nil? && plan['discount'] != 0
-      promotional_discount_applies = promotional_discount.present? && promotional_discount.any?
-      promotional_discount_id = discount_exists && promotional_discount_applies ? 0 : promotional_discount_applies ? promotional_discount['id'] : 0
+      promotional_discount_id = promo_applies ? (promotional_discount['id'] || 0) : 0
 
       return_url += "&discount=#{promotional_discount_id}"
 

data/lib/app_manager/version.rb

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

data/lib/app_manager.rb

@@ -26,6 +26,12 @@ module AppManager
     @configuration ||= AppManager::Config.new
   end
 
+  # Cache key for the discount snapshot captured while a charge is being created.
+  # Kept under a separate prefix from "app-manager-cache/*" so clear_cache does not wipe it.
+  def self.charge_snapshot_cache_key(shop, timestamp)
+    "app-manager:charge-snapshot:#{shop}:#{timestamp}"
+  end
+
   def self.clear_cache
   	begin
       Rails.cache.delete_matched("app-manager-cache/*")

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

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

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

@@ -0,0 +1,12 @@
+class AddChargeDiscountSnapshotAndUsed < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    add_column :charges, :discount_value, :decimal, precision: 8, scale: 2 unless column_exists?(:charges, :discount_value)
+    add_column :charges, :discount_type, :string unless column_exists?(:charges, :discount_type)
+    add_column :charges, :discount_duration_intervals, :integer unless column_exists?(:charges, :discount_duration_intervals)
+    add_column :charges, :discount_source, :string unless column_exists?(:charges, :discount_source)
+    add_column :charges, :promotional_discount_id, :bigint unless column_exists?(:charges, :promotional_discount_id)
+
+    add_column :discount_plans, :used, :boolean, default: false unless column_exists?(:discount_plans, :used)
+    add_column :plan_users, :used, :boolean, default: false unless column_exists?(:plan_users, :used)
+  end
+end

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

@@ -29,6 +29,11 @@ class AddFailSafe < ActiveRecord::Migration[<%= rails_migration_version %>]
 			t.string :charge_id
 			t.boolean :test
 			t.float :price
+			t.decimal :discount_value, precision: 8, scale: 2
+			t.string :discount_type
+			t.integer :discount_duration_intervals
+			t.string :discount_source
+			t.bigint :promotional_discount_id
 			t.string :interval
 			t.integer :trial_days
 			t.datetime :billing_on
@@ -68,6 +73,7 @@ class AddFailSafe < ActiveRecord::Migration[<%= rails_migration_version %>]
 			t.integer :created_by
 			t.integer :app_id
 			t.string :discount_type
+			t.boolean :used, default: false
 			t.timestamps
 		end
 		create_table :extend_trials do |t|
@@ -84,6 +90,7 @@ class AddFailSafe < ActiveRecord::Migration[<%= rails_migration_version %>]
 			t.integer :plan_id
 			t.integer :app_id
 			t.integer :created_by
+			t.boolean :used, default: false
 			t.timestamps
 		end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -125,6 +125,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_charge_discount_snapshot_and_used.erb
 - 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