shopify-gold 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3de898120461b0d5ea6dc6fa8147159567c2ed350aebfc59b2eeea30a0a83b
-  data.tar.gz: b9c36b007cad3d7f25470b150c3daab8b1f041fd5e1177f23cdb02c798e1d1c9
+  metadata.gz: ad7514ffdfb66670043eac39bffbd3f1db861f45c6befd38bb92e570bcd4fd95
+  data.tar.gz: f03dc8cad6c26749cd70d8357e2019695102d944ddfb4300ce33e55937c5d224
 SHA512:
-  metadata.gz: 94e3a447a5693bce00e7848a6968ae7799af0a40d15cfd639cdce123c25b8731a53a7cdabdd0e45d9039464feaf8817c76d6960cd60445550bed5419a27debce
-  data.tar.gz: f9114585d4d95d47fec91637a3223d3a81cec05e7dd72e92549b34c897e07dec6eccf6afad5ddb78ba3746bd25977add8bb5d3c104ebcb1a520774adb9d2067e
+  metadata.gz: bddd6866e01bc82889115697f3cd3eb5cedf472942640e7c13ed3cc9678feac878179fbd20f027854de47d471dfa65bd548fd8fbb9d489cbede3bb63c81b77f4
+  data.tar.gz: 3db49c76d9554f994852112ce046040b8a7c2ee09b43c5588d75209b5361ac029e7372cb8db431c59f6fab4e5b9dde49d4449fb51dd0798c7fcecf2297361b3b

data/README.md

@@ -183,6 +183,11 @@ To add tiers to your app, add a `config/tiers.yml` file. Here's an example file:
     max_customers: 1000
 ```
 
+Any tier that is visible will appear in the list of choices. If it is hidden, you
+can link to it either directly (/tier?id=basic) or indirectly (/start?tier=basic).
+The later will route to the app listing page before selecting this option on the
+tier page.
+
 ##  Controller and views
 Ok, so it's time to get paid. Let's add our module to show merchants tier choices.
 
@@ -262,11 +267,4 @@ which you can do on Mac via Homebrew with `brew install graphviz`
 
 ## Release
 To release gem, run `gem release`, which depends on having `gem-release` installed
-on your system.
-
-## Changelog
-Version 4.0.0
-- Added referral affiliates
-
-Version 3.2.0
-- Removed `force_embedded_redirect` config option
+on your system.

data/app/controllers/gold/billing_controller.rb

@@ -44,16 +44,19 @@ module Gold
 
       apply_referral_cookie unless billing.tier
 
+      params[:id] = cookies[:gold_tier_id] if cookies[:gold_tier_id].present?
+
       @tiers = Tier.visible
     end
 
     # Process a tier selection.
     def select_tier
       @tiers = Tier.visible
-      @tier = Tier.find(params[:tier])
+      @tier =  Tier.find(params[:tier])
       outcome = SelectTierOp.new(billing, @tier).call
       case outcome
       when SameTier, TierApplied
+        cookies.delete(:gold_tier_id)
         redirect_to main_app.root_url
       when CannotSelectTier
         flash.now[:error] = "Your shop is not eligible for this plan"

data/app/controllers/gold/referrals_controller.rb

@@ -6,7 +6,7 @@ module Gold
 
       cookies[:gold_referral_id] = { value: referral.id, expires: 30.days } if referral
 
-      redirect_to Gold.configuration.referral_redirect_url
+      redirect_to Gold.configuration.app_listing_url
     end
   end
 end

data/app/controllers/gold/setup_controller.rb

@@ -0,0 +1,9 @@
+module Gold
+  class SetupController < ApplicationController
+    def new
+      tier = Tier.find(params[:tier])
+      cookies[:gold_tier_id] = { value: tier.id, expires: 7.days } if tier
+      redirect_to Gold.configuration.app_listing_url
+    end
+  end
+end

data/config/routes.rb

@@ -1,4 +1,6 @@
 Gold::Engine.routes.draw do
+  get "/start", to: "setup#new"
+
   get "/terms", to: "billing#terms", as: "terms"
   put "/terms", to: "billing#process_terms"
 

data/lib/gold/configuration.rb

@@ -13,7 +13,7 @@ module Gold
                   :days_until_cleanup,
                   :shop_domain_attribute,
                   :force_embedded_redirect,
-                  :referral_redirect_url
+                  :app_listing_url
 
     # Callbacks
     attr_accessor :on_terms,
@@ -71,7 +71,7 @@ module Gold
 
       # The URL to follow after a referral code is tracked
       # (e.g. https://apps.shopify.com/customr)
-      @referral_redirect_url = "/"
+      @app_listing_url = "https://apps.shopify.com/"
     end
 
     def shop_class

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "4.1.1".freeze
+  VERSION = "4.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,6 +219,7 @@ files:
 - app/controllers/gold/billing_controller.rb
 - app/controllers/gold/concerns/merchant_facing.rb
 - app/controllers/gold/referrals_controller.rb
+- app/controllers/gold/setup_controller.rb
 - app/jobs/gold/after_authenticate_job.rb
 - app/jobs/gold/app_uninstalled_job.rb
 - app/jobs/gold/application_job.rb