app_manager 1.6.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c143606bbac6f53820f8522a8a735c33a1d241bc6c2bc919d75bb8319d44aebf
-  data.tar.gz: 770f14a16a4c912389bfd71106a517af68e724645cc68bd6c9153d61b0d34dee
+  metadata.gz: 1093f4ae3ee06a00f81bf11ad98bb1669f6b9f931bed69a430525733058143a0
+  data.tar.gz: 9a3a425bdf82d12982f33ace1e86a1e5b47bbc7b3430ccd96b0469967cbf2f65
 SHA512:
-  metadata.gz: 40a9cdb0477e5c3b3aa51cc8d5f03be15deab919199f101b237cb0063db42e2d160e72a52aa111b56f5736c1fcadc4a16cd557a45bed0c2fbf914e285eb1763d
-  data.tar.gz: efdc457510fb1372aa92915d8109f0fd0963dc49d7b18564a725527b932efa3e295d47249b2d75340d00ee517cd47cfbfa30c32b1a7177c5de12130d2396b10e
+  metadata.gz: 9306209e778f2593afc88cdaf1f468f8c0ccefddd197e3ecfcb516301581577131975ed73dde14decae361454d32955f25c80220edab9cc755955f986d37a747
+  data.tar.gz: b0f6d9c366e807ebaa5d5fd5de056ecd3f7e93addfbdc944cda14ec915dc86a5e20d4b248426dfe04bc7c5962887d858fd01eed6de2bc4ae7c5976540e9c8c6a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.6.3)
+    app_manager (2.0.0)
       activerecord-import (~> 1.4)
       httparty
       kaminari (>= 0.16.3)
@@ -10,93 +10,110 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.5)
-      actionpack (= 7.0.5)
-      actionview (= 7.0.5)
-      activejob (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.5)
-      actionview (= 7.0.5)
-      activesupport (= 7.0.5)
-      rack (~> 2.0, >= 2.2.4)
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.5)
-      actionpack (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.5)
-      activesupport (= 7.0.5)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.5)
-      activesupport (= 7.0.5)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      timeout (>= 0.4.0)
+    activerecord-import (1.5.1)
       activerecord (>= 4.2)
-    activestorage (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activesupport (= 7.0.5)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.5)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     diff-lcs (1.5.0)
     dotenv (2.1.2)
+    drb (2.2.1)
     erubi (1.12.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     hashdiff (1.0.1)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -109,7 +126,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -117,61 +134,75 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.22.2)
     multi_xml (0.6.0)
-    net-imap (0.3.4)
+    mutex_m (0.2.0)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.2)
+    nio4r (2.7.0)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.1.2)
+      stringio
     public_suffix (4.0.6)
-    racc (1.7.0)
-    rack (2.2.7)
+    racc (1.7.3)
+    rack (3.0.9.1)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.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)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.0.5)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      railties (= 7.1.3.2)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     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
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      irb
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rake (13.0.6)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    reline (0.4.3)
+      io-console (~> 0.5)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -188,18 +219,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    thor (1.2.2)
-    timeout (0.3.2)
+    stringio (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.5)
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

data/README.md

@@ -209,8 +209,43 @@ and then you can use follwing methods with your shop objects.
 @shop.active_shopfiy_charge_full #It will give shopify recurring charge graphql object with discounted price details
 ```
 
-
 <a name="step4"></a>
+### Discount Link Integration
+
+* Update app manager vue package in Rails+Vue apps & for for non-vue apps, update css or js from npm package, minimum version should be 2.4.4
+
+* Update app manager gem in your project's Gemfile
+
+```ruby
+gem 'app_manager', '2.0.0'
+```
+* In Rails project, in application.rb, add following line after require "rails/all" line 
+
+```ruby
+require 'app_manager/set_cookie'
+```
+
+* In route.rb file, add following route with constraints
+```ruby
+condition = ->(request) { request.path_info.include?('/discount/') }
+constraints(condition) do
+get '/discount/*any', to: AppManager::SetCookie.new(Rails.application, condition)
+end
+```
+* If updating gem from 1.6.1, then run these commands on rails root.
+
+Note: In this command, Please do not overwrite app_manager.rb file so press n
+```ruby
+rails g app_manager:install
+```
+This will add a new migration file in your db/app_manager directory
+
+```ruby
+rails db:migrate
+```
+
+
+<a name="step5"></a>
 ### Extras
 
 * To view the app_manager ruby gem is working in your rails app you can use rails console and initialize app_manager instance like with App Manager Portal access:

data/app/controllers/app_manager/charges_controller.rb

@@ -58,17 +58,20 @@ module AppManager
                 end
               end
             request_data = {'shop' => @shop.shopify_domain, 'timestamp' => Time.now.to_i, 'plan' => params[:plan_id]}
+            request_data.merge!('host' => params['host']) if params['host'].present?
+
             return_url = "#{app_url}#{plan_callback_path}?#{Rack::Utils.build_query(request_data)}"
+            discount_cookie = AppManager.resolve_from_cookies(self.request)
             gq_obj = AppManager::GraphqlHelper.new(@shop.shopify_domain, @shop.shopify_token)
-            data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop)
-            if !data["errors"].present? && (data["data"].present? && data["data"]["appSubscriptionCreate"].present? && (!data["data"]["appSubscriptionCreate"]["userErrors"].any? && data["data"]["appSubscriptionCreate"]["confirmationUrl"]))
+            data = gq_obj.recurring_charge_api_call(plan_data, return_url, @shop,discount_cookie)
+            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}
             else
               raise Error, "#{data.inspect}"
             end
           else
-            raise Error, "#{data.inspect}"
+            raise Error, "Plan not found"
           end
         else
           raise ModelNotFound, "Shop not found"
@@ -85,6 +88,8 @@ module AppManager
         shopify_token = @field_names['shopify_token']
         shopify_domain = @field_names['name']
         grandfathered_field = @field_names['grandfathered']
+        discounted_plans = JSON.parse(params[:discounted_plans]) rescue []
+        discounted_plans = discounted_plans.map!(&:to_s) if discounted_plans.any?
         if !@shop.nil?
           old_plan_id = @shop[@plan_field]
           old_plan_data = nil
@@ -131,8 +136,23 @@ module AppManager
                 rescue Exception => e
                   Rollbar.error("Error in APP MANAGER Charge Created Callback >>>> #{e.inspect}")
                 end
+
+                begin
+                  plan_obj = AppManager::Client.new
+                  discounted_plans_present =  discounted_plans.present? && discounted_plans.any?
+                  if params[:promo_discount].present? && discounted_plans_present && discounted_plans.include?(params[:plan])
+                    plan_obj.discount_used(@shop[shopify_domain], params[:promo_discount])
+                  elsif params[:promo_discount].present? && discounted_plans.blank?
+                    plan_obj.discount_used(@shop[shopify_domain], params[:promo_discount])
+                  end
+                rescue
+                  Rollbar.error("Error in APP MANAGER Discount used API call >>>> #{e.inspect}")
+                end
               end
             end
+
+
+
             embed_host = Base64.encode64(params[:shop] + "/admin")
 
             if !old_plan_id.nil?

data/app/controllers/app_manager/plans_controller.rb

@@ -65,8 +65,19 @@ module AppManager
         end
       end
 
+      promotional_discount = []
+      discount_cookie = AppManager.resolve_from_cookies(self.request)
+      if discount_cookie && @shop
+        created_at = @shop[AppManager.configuration.field_names['created_at']]
+        reinstall = AppManager.check_if_reinstall(created_at)
+        plan_obj = AppManager::Client.new
+        promotional_discount = plan_obj.get_promotional_discount(params[:shop_domain], discount_cookie['codeType'], discount_cookie['code'], reinstall)
+        promotional_discount = [] if promotional_discount.class.to_s == "Hash" && promotional_discount.has_key?('status') && promotional_discount['status'] == 404
+      end
+
       response = {
           'plans' => plans,
+          'promotional_discount' => promotional_discount,
           'shopify_plan' => shopify_plan,
           'plan' => plan,
           'default_plan_id' => default_plan_id,
@@ -90,12 +101,12 @@ module AppManager
         @shopify_email = AppManager.configuration.field_names['shopify_email']
         @shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
         if params[:search]
-          data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
+          data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%").order(sort + " " + order)
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)
         else
-          data = model
+          data = model.order(sort + " " + order)
           data = data.where(@plan_field => plans) if !plans.nil?
           data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
           data = data.page(params[:page]).per(items_per_page)

data/app/model/app_manager/discount.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class Discount < AppManagerRecord
+    self.table_name = "discounts"
+  end
+end

data/app/model/app_manager/discount_link_plan.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class DiscountLinkPlan < AppManagerRecord
+    self.table_name = "discount_link_plans"
+  end
+end

data/app/model/app_manager/discount_shop.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class DiscountShop < AppManagerRecord
+    self.table_name = "discount_shops"
+  end
+end

data/app/model/app_manager/discount_usage_log.rb

@@ -0,0 +1,5 @@
+module AppManager
+  class DiscountUsageLog < AppManagerRecord
+    self.table_name = "discounts_usage_log"
+  end
+end

data/lib/app_manager/client/connection.rb

@@ -28,8 +28,19 @@ module AppManager
           response = response_from_cache_for_api(http_method, path, options)
           failsafe_or_caching_done = true
           else
-          time_out = Rails.env.development? ?  120 : 30
-          response = self.class.send(http_method, path, { body: options, timeout: time_out })
+          time_out = Rails.env.development? ?  120 : 120
+          begin
+            response = self.class.send(http_method, path, { body: options, timeout: time_out })
+          rescue Net::ReadTimeout => error
+            # Handle timeout error here
+            Rails.logger.info "Net::ReadTimeout: Request timed out. Please try again."
+            response = response_from_failsafe(path, options)
+          rescue StandardError => e
+            # Handle other errors
+            Rails.logger.info "Error: #{e.message}"
+            response = response_from_failsafe(path, options)
+          end
+
           end
           if path.include? "/get-status"
             data = response
@@ -42,7 +53,10 @@ module AppManager
               data = parse_data(response.parsed_response)
               # data = response_from_failsafe(path,options) #uncomment to test failsafe
               return data
-            else
+            elsif ((response.class == Hash) && response.has_key?("message"))
+             data = parse_data(response)
+             return data
+           else
               if failsafe_or_caching_done == true
                 data = response
                 return data
@@ -60,7 +74,7 @@ module AppManager
           return fetch_static_cached_response(cache_key)
         end
         begin
-        response = self.class.send(http_method, path, { body: options, timeout: 15 })
+        response = self.class.send(http_method, path, { body: options, timeout: 1 })
           if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
              Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
           else
@@ -68,6 +82,8 @@ module AppManager
           end
         rescue Net::ReadTimeout => error
           response = response_from_failsafe(path,options)
+        rescue StandardError => error
+          response = response_from_failsafe(path, options)
         rescue Exception => e
           response = response_from_failsafe(path,options)
         end
@@ -111,6 +127,10 @@ module AppManager
           return @fs.get_local_charge(params,options)
         when 'has-plan'
           return @fs.get_local_has_plan(params, options)
+        when 'discount'
+          return @fs.get_local_discount(params, options)
+        when 'use-discount'
+          return @fs.store_discount_used(params,options)
         else
          return nil
         end

data/lib/app_manager/client/plans.rb

@@ -26,6 +26,7 @@ module AppManager
         post("/sync-charge", options)
       end
 
+
       def get_remaining_days(shop_domain, trial_activated_at = nil, plan_id = nil)
         get("/get-remaining-days?shop_domain=#{shop_domain}&trial_activated_at=#{trial_activated_at}&plan_id=#{plan_id}")
       end
@@ -42,6 +43,17 @@ module AppManager
         get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
       end
 
+      def get_promotional_discount(shop_domain = nil, code_type, code, reinstall)
+        get("/discount?shop_domain=#{shop_domain}&reinstall=#{reinstall}&code_type=#{code_type}&code=#{code}")
+      end
+
+      def discount_used(shop_domain, discount_id)
+        post('/use-discount', {shop_domain: shop_domain, discount_id: discount_id.to_i})
+      end
+
+      def sync_discount_usage_log(options = {})
+        post("/use-discount-sync", options)
+      end
 
     end
   end

data/lib/app_manager/fail_safe.rb

@@ -52,7 +52,7 @@ module AppManager
       begin
         save_api_extend_trials(params["extend_trials"])
       rescue Exception => e
-        Rollbar.error("[Extens Trials] APP MANAGER >>>> #{e.inspect}")
+        Rollbar.error("[Extend Trials] APP MANAGER >>>> #{e.inspect}")
       end
 
       begin
@@ -60,6 +60,31 @@ module AppManager
       rescue Exception => e
         Rollbar.error("[Plan User] APP MANAGER >>>> #{e.inspect}")
       end
+
+      begin
+        save_api_promotional_discounts(params["promotional_discounts"])
+      rescue Exception => e
+        Rollbar.error("[Promotional discounts] APP MANAGER >>>> #{e.inspect}")
+      end
+
+      begin
+        save_api_promotional_discounts_shops(params["promotional_discounts_shops"])
+      rescue Exception => e
+        Rollbar.error("[Promotional discounts shops] APP MANAGER >>>> #{e.inspect}")
+      end
+
+      begin
+      save_api_promotional_discounts_link_plans(params["promotional_discounts_plans"])
+      rescue Exception => e
+        Rollbar.error("[Promotional discounts plans] APP MANAGER >>>> #{e.inspect}")
+      end
+
+      begin
+        save_api_promotional_discounts_usage_log(params["promotional_discounts_usage_log"])
+      rescue Exception => e
+        Rollbar.error("[Promotional discounts usage log] APP MANAGER >>>> #{e.inspect}")
+      end
+
     end
 
     def save_api_plans(plans)
@@ -185,7 +210,113 @@ module AppManager
           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
+        AppManager::PlanUser.bulk_import extend_plan_users
+      end
+    end
+
+    def save_api_promotional_discounts(promotional_discounts)
+      begin
+        AppManager::Discount.connection.truncate(AppManager::Discount.table_name)
+      rescue
+        AppManager::Discount.delete_all
+      end
+      if promotional_discounts.any?
+        promotional_discounts_data = []
+        promotional_discounts.each do |promotional_discount|
+
+          Rails.logger.info "                                                   "
+          Rails.logger.info "=== promotional_discount===========#{promotional_discount.inspect}"
+          Rails.logger.info "                                                   "
+
+           promotional_discounts_data << AppManager::Discount.new(
+              discount_id: promotional_discount['id'],
+              name: promotional_discount['name'],
+              code: promotional_discount['code'],
+              discount_type: promotional_discount['type'] || 'amount',
+              value: promotional_discount['value'] || 0,
+              duration_intervals: promotional_discount['duration_intervals'],
+              max_usage: promotional_discount['max_usage'],
+              enabled: promotional_discount['enabled'],
+              valid_from: promotional_discount['valid_from'],
+              valid_to: promotional_discount['valid_to'],
+              priority: promotional_discount['priority'] || 0,
+              multiple_uses: promotional_discount['multiple_uses'],
+              multiple_apps: promotional_discount['multiple_apps'],
+              app_id: promotional_discount['app_id'] || 0,
+              created_at: promotional_discount['created_at'],
+              updated_at: promotional_discount['updated_at'],
+              deleted_at: promotional_discount['deleted_at']
+           )
+        end
+
+        Rails.logger.info "                                                   "
+        Rails.logger.info "=== promotional_discounts_data===========#{promotional_discounts_data.inspect}"
+        Rails.logger.info "                                                   "
+        AppManager::Discount.bulk_import promotional_discounts_data
+      end
+    end
+
+    def save_api_promotional_discounts_shops(promotional_discounts_shops)
+
+      begin
+        AppManager::DiscountShop.connection.truncate(AppManager::DiscountShop.table_name)
+      rescue
+        AppManager::DiscountShop.delete_all
+      end
+
+      if promotional_discounts_shops.any?
+        promotional_discounts_shop_data = []
+        promotional_discounts_shops.each do |promotional_discounts_shop|
+          promotional_discounts_shop_data << AppManager::DiscountShop.new(
+              discount_id: promotional_discounts_shop['discount_id'],
+              domain: promotional_discounts_shop['domain']
+          )
+        end
+        AppManager::DiscountShop.bulk_import promotional_discounts_shop_data
+      end
+    end
+
+    def save_api_promotional_discounts_link_plans(promotional_discounts_plans)
+
+      begin
+        AppManager::DiscountLinkPlan.connection.truncate(AppManager::DiscountLinkPlan.table_name)
+      rescue
+        AppManager::DiscountLinkPlan.delete_all
+      end
+
+      if promotional_discounts_plans.any?
+        discount_link_plans_data = []
+        promotional_discounts_plans.each do |link_plan|
+          discount_link_plans_data << AppManager::DiscountLinkPlan.new(
+              discount_id: link_plan['discount_id'],
+              plan_id: link_plan['plan_id']
+          )
+        end
+        AppManager::DiscountLinkPlan.bulk_import discount_link_plans_data
+      end
+    end
+
+    def save_api_promotional_discounts_usage_log(promotional_discounts_usage_log)
+      begin
+        AppManager::DiscountUsageLog.connection.truncate(AppManager::DiscountUsageLog.table_name)
+      rescue
+        AppManager::DiscountUsageLog.delete_all
+      end
+
+      if promotional_discounts_usage_log.any?
+        promotional_discounts_usage_log_data = []
+         promotional_discounts_usage_log.each do |log|
+           promotional_discounts_usage_log_data << AppManager::DiscountUsageLog.new(
+              discount_id: log['discount_id'],
+              app_id: log['app_id'],
+              domain: log['domain'],
+              sync: log['sync'],
+              process_type: log['process_type'],
+              created_at: log['created_at'],
+              updated_at: log['updated_at']
+           )
+        end
+        AppManager::DiscountUsageLog.bulk_import promotional_discounts_usage_log_data
       end
     end
 
@@ -262,6 +393,9 @@ module AppManager
               value = eval(value)
               value = value.each { |e| e.delete("id") }.each { |e| e.delete("created_at") }.each { |e| e.delete("updated_at") }
               new_plan[key] = value
+            elsif ['plan_id'].include?(key)
+              # puts value.inspect
+              new_plan["id"] = value if value rescue {}
             else
               new_plan[key] = value unless key.class == Integer
             end
@@ -350,6 +484,8 @@ module AppManager
                 new_plan[key] = (value == 0 || value == false ? false : true)
               elsif ['test'].include?(key)
                 new_plan[key] = (value == 0 || value == false ? nil : true)
+              elsif ['plan_id'].include?(key)
+                new_plan["id"] = value if value rescue nil
               else
                 new_plan[key] = value unless key.class == Integer
               end
@@ -476,6 +612,68 @@ module AppManager
 
     end
 
+    def get_local_discount(params, options)
+      code = [params['code']].pack('H*')
+      code_type = params['code_type']
+      reinstall = params['reinstall']
+      shop_domain = params['shop_domain']
+      now = Time.now
+
+      discount_data = AppManager::Discount.where(enabled: true)
+                          .where('valid_from <= ?', now)
+                          .where('valid_to >= ?', now)
+                          .where(code: code)
+                          .first
+      return [] if discount_data.nil?
+
+      discount_shop = AppManager::DiscountShop.where(discount_id: discount_data.discount_id).count
+
+      discount_plan = AppManager::DiscountLinkPlan.where(discount_id: discount_data.discount_id).pluck('plan_id')
+
+      discount_usage = AppManager::DiscountUsageLog.where(discount_id: discount_data.discount_id).count
+
+      discount_usage_by_domain = AppManager::DiscountUsageLog.where(discount_id: discount_data.discount_id)
+                                     .where(domain: shop_domain)
+                                     .count
+      if discount_shop > 0
+        discount_shop_specific = AppManager::DiscountShop.where(discount_id: discount_data.discount_id)
+                                     .where(domain: shop_domain)
+                                     .first
+        return [] if discount_shop_specific.nil?
+      end
+
+      if discount_data.max_usage.present? && discount_data.max_usage != 0
+        return [] if discount_usage >= discount_data.max_usage
+      end
+
+      if discount_data.multiple_uses == false && discount_usage_by_domain >= 1
+        return []
+      end
+
+      if discount_data.multiple_apps == false
+        discount_usage_by_app = AppManager::DiscountUsageLog
+                                    .where(discount_id: discount_data.discount_id, domain: shop_domain)
+                                    .where.not(app_id: discount_data.app_id)
+                                    .first
+        return [] if discount_usage_by_app.present?
+      end
+
+
+      discount_data = discount_data.attributes.symbolize_keys
+      discount_data[:plan_relation] = discount_plan
+      final_mapped_data = {
+          "id" => discount_data[:discount_id],
+          "name" => discount_data[:name],
+          "type" => discount_data[:discount_type],
+          "value" => discount_data[:value].to_f,
+          "duration_intervals" => discount_data[:duration_intervals],
+          "plan_relation" => discount_data[:plan_relation]
+      } rescue {}
+
+      return JSON.parse(final_mapped_data.to_json)
+
+    end
+
     def store_local_charge(params, options)
       message = {"message" => 'fail'}
       if options
@@ -486,7 +684,7 @@ 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)
+            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')
             message = {"message" => 'success'}
           rescue Exception => e
             Rollbar.error("Charge not saved on local DB due to #{e.inspect}")
@@ -506,12 +704,32 @@ module AppManager
       return message
     end
 
+    def store_discount_used(params,options)
+      if options && options[:shop_domain].present? && options[:discount_id].present?
+        app_id = AppManager::Discount.where(discount_id: options[:discount_id])
+                     .pluck(:app_id)
+                     .first rescue nil
+        data = {
+            'discount_id' => options[:discount_id],
+            'domain' => options[:shop_domain],
+            'sync' => false,
+            'process_type' => 'use-discount',
+            'app_id' => app_id
+        }
+        discount_usage_log = AppManager::DiscountUsageLog.create(data)
+        return { 'message' => discount_usage_log ? 'success' : 'fail' }
+      else
+        return {"message" => 'fail'}
+      end
+    end
+
 
     def sync_app_manager
       plan_obj = AppManager::Client.new
       response = plan_obj.get_status
       if response && response.code == 200
         charges = AppManager::Charge.where(sync: false)
+        discounts_usage_logs = AppManager::DiscountUsageLog.where(sync: false, process_type: 'use-discount')
         charges.each do |charge|
           if charge
             if !charge["cancelled_on"].nil?
@@ -524,6 +742,17 @@ module AppManager
             end
           end
         end
+
+        if discounts_usage_logs.any?
+          discounts_usage_logs.each do |discount_usage_log|
+            discount_obj = AppManager::Client.new
+            discount_response = discount_obj.sync_discount_usage_log(shop_domain: discount_usage_log['domain'], discount_id: discount_usage_log['discount_id'].to_i)
+            if discount_response && discount_response["data"] == "Saved"
+              AppManager::DiscountUsageLog.find_by(discount_id: discount_usage_log['discount_id'],sync: false).update(sync: true, process_type: nil)
+            end
+          end
+        end
+
       end
     end
 

data/lib/app_manager/graphql_helper.rb

@@ -33,7 +33,7 @@ module AppManager
             response = ActiveSupport::JSON.decode(response.read_body) rescue nil
             return response
         else
-          Rollbar.error("=== params missing from any of these api_key, api_version, shopify_domain, shopify_token ===")
+          Rollbar.error("=== params missing from any of these api_key=#{@api_key}, api_version=#{@api_version}, shopify_domain=#{@shopify_domain}, shopify_token ===#{@shopify_token}")
             return []  
         end
     end
@@ -54,7 +54,7 @@ module AppManager
     end
 
 
-   def recurring_charge_api_call(plan,return_url,shop)
+   def recurring_charge_api_call(plan,return_url,shop,discount_cookie)
       plan_test = nil
       shop_plan_field = AppManager.configuration.field_names['shopify_plan'] rescue nil
       if !plan['affiliate'].nil? && plan['affiliate'].any? && !shop_plan_field.nil? && plan['affiliate'].map{|e| e['value']}.include?(shop[shop_plan_field])
@@ -67,6 +67,7 @@ module AppManager
         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
@@ -82,15 +83,73 @@ module AppManager
         end
       end
 
-      discount_type = plan['discount_type'] || "percentage"
-      discount_val = discount_type == "percentage" ? (plan['discount'].to_f/ 100) : "#{plan['discount']}"
-      plan_discount =  plan['discount'] ? { "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i || 0), "value" => {"#{discount_type}" => discount_val} }  } : {}
+      promotional_discount = []
+      if discount_cookie && shop
+        created_at = shop[AppManager.configuration.field_names['created_at']]
+        reinstall = AppManager.check_if_reinstall(created_at)
+        plan_obj = AppManager::Client.new
+        promotional_discount = plan_obj.get_promotional_discount(shop.shopify_domain, discount_cookie['codeType'], discount_cookie['code'], reinstall)
+        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
+        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.include?('2024')
+          plan_discount = if plan['discount'] && plan['cycle_count']
+                            {
+                                "discount" => { "durationLimitInIntervals" => (plan['cycle_count'].to_i),
+                                                "value" => {"#{discount_type}" => discount_val}
+                                }
+                            }
+                          elsif plan['discount']
+                            {
+                                "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_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
+
+        end
+
+      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
+
+      plans_relation = promotional_discount.present? && promotional_discount['plan_relation'].any? ? promotional_discount['plan_relation'] : []
+      # Append additional data to the existing return_url
+      return_url += "&promo_discount=#{promotional_discount_id}&discounted_plans=#{Rack::Utils.escape(plans_relation.to_json)}"
 
       price_details = {
                        "price": { "amount": plan['price'], "currencyCode": 'USD' },
                        "interval": plan['interval']['value']
                        }
-      price_details.merge! plan_discount if plan_discount.any?
+      price_details.merge! plan_discount if plan_discount && plan_discount.any?
 
       plan_var = {
           "appRecurringPricingDetails":  price_details,

data/lib/app_manager/set_cookie.rb

@@ -0,0 +1,41 @@
+# app/middleware/set_cookie_middleware.rb
+require 'action_dispatch/middleware/cookies'
+require 'uri'
+
+# app/middleware/set_cookie.rb
+module AppManager
+  class SetCookie
+  def initialize(app, condition)
+    @app = app
+    @condition = condition
+  end
+
+  def call(env)
+    request = Rack::Request.new(env)
+
+    if @condition.call(request)
+      url = URI.parse(request.url)
+      host = url.host
+      discount_code = request.path.split('/')[2]
+
+      # Set a cookie named 'ShopCircleDiscount' with the extracted values
+      lifetime = Time.now + 60 * 60 * 24 * 365
+      cookie_value = discount_code
+
+      AppManager.clear_cache #clearing cache
+      # Set a 302 response with an external URL and a cookie
+      return [
+          302,
+          {
+              'Location' => 'https://admin.shopify.com/admin/apps/'+ENV['SHOPIFY_APP_SLUG']+'/home/plan' ,
+              'Set-Cookie' => "ShopCircleDiscount=#{cookie_value}; expires=#{lifetime.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')}; path=/; domain=#{host}; secure; HttpOnly; SameSite=None",
+              'Content-Type' => 'text/plain'
+          },
+          ['Redirecting to external URL with cookie']
+      ]
+    end
+
+    @app.call(env)
+  end
+end
+end

data/lib/app_manager/version.rb

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

data/lib/app_manager.rb

@@ -16,8 +16,25 @@ require "app_manager/model"
 require "app_manager/fail_safe"
 require 'app_manager/railtie' if defined?(Rails)
 require 'app_manager/exceptions'
+require 'action_dispatch/middleware/cookies' if defined?(Rails)
+require "action_controller"
 
 module AppManager
+  module CookiesHandler
+    include ActionController::Cookies
+
+    def self.resolve_from_cookies(request)
+      if request.cookies['ShopCircleDiscount'].present?
+        {
+            'codeType' => 'normal',
+            'code' => request.cookies['ShopCircleDiscount']
+        }
+      else
+        nil
+      end
+    end
+  end
+
   def self.configure
     yield configuration  
   end
@@ -34,4 +51,14 @@ module AppManager
   	end
   end
 
+  def self.resolve_from_cookies(request)
+    CookiesHandler.resolve_from_cookies(request)
+  end
+
+  def self.check_if_reinstall(created_at)
+    created_at < (Time.now - 5.minutes) ? 1 : 0
+  end
+
+
+
 end

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

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

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

@@ -0,0 +1,48 @@
+class AddDiscountTables < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    create_table :discounts do |t|
+      t.bigint :discount_id
+      t.string :name
+      t.string :code
+      t.string :discount_type, default: 'amount'
+      t.decimal :value, default: 0
+      t.integer :duration_intervals
+      t.integer :max_usage
+      t.boolean :enabled, default: true
+      t.datetime :valid_from
+      t.datetime :valid_to
+      t.integer :priority, default: 0
+      t.boolean :multiple_uses, default: true
+      t.boolean :multiple_apps, default: true
+      t.integer :app_id, default: 0
+      t.timestamps
+      t.datetime :deleted_at
+    end
+
+    create_table :discount_shops do |t|
+      t.bigint :discount_id, index: true, foreign_key: true
+      t.string :domain
+    end
+
+    create_table :discounts_usage_log do |t|
+      t.bigint :discount_id, index: true, foreign_key: true
+      t.bigint :app_id, index: true, foreign_key: true
+      t.string :domain
+      t.boolean :sync, default: true
+      t.string :process_type
+      t.timestamps
+    end
+
+    create_table :discount_link_plans do |t|
+      t.bigint :discount_id, index: true, foreign_key: true
+      t.bigint :plan_id, index: true, foreign_key: true
+    end
+  end
+
+  def down
+    drop_table :discounts
+    drop_table :discount_shops
+    drop_table :discounts_usage_log
+    drop_table :discount_link_plans
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Rahul Tiwari @ Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -89,7 +89,11 @@ files:
 - app/model/app_manager/app_manager_record.rb
 - app/model/app_manager/app_structure.rb
 - app/model/app_manager/charge.rb
+- app/model/app_manager/discount.rb
+- app/model/app_manager/discount_link_plan.rb
 - app/model/app_manager/discount_plan.rb
+- app/model/app_manager/discount_shop.rb
+- app/model/app_manager/discount_usage_log.rb
 - app/model/app_manager/extend_trial.rb
 - app/model/app_manager/plan.rb
 - app/model/app_manager/plan_user.rb
@@ -115,9 +119,11 @@ files:
 - lib/app_manager/protection.rb
 - lib/app_manager/railtie.rb
 - lib/app_manager/response_cache.rb
+- lib/app_manager/set_cookie.rb
 - 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_discount_tables.erb
 - 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