shopify-gold 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c030cdd2491bfaaa608daf0872d00a666c02de89075ebdfc02e2db16c9b4fc1a
-  data.tar.gz: f09f58ef6ed29763f352985b06a4b69d4c178aa98a344be6c3b7d4d18692de88
+  metadata.gz: a1a04a46085510f9e78a365b0febc70394fae810d130d6ed4fcbc33add97ae7a
+  data.tar.gz: f3e0329c1a333700ab7bd44fa85dc34323ff446947d6a73928fbaa0519868afa
 SHA512:
-  metadata.gz: 0b4ec8a6c8c13d9dc81de919fe16d9da5ec952ed1573f8f437a853499013a1511aa3862e0474f4137f7cd1313cd9a15369a5def927f59e50b3c2fcf8d1b6c70d
-  data.tar.gz: 2790090bddf8bf32067ddc50fbfeecea31b90b8c0aa017111a696153e1825400d50f0e1d00ac2cadc45f2988b34b29b019a74d5d4fe9ff1d20a57b34af9e9365
+  metadata.gz: e93d381fb0fcfc778334acf3ebbfe6c39a7106510e558afc6ad929ec6c731e5c5cd861cad1cf52acab2460539424b1ef4b2600f7e36fbc1183dbaed940dd12cb
+  data.tar.gz: 580b47448d8e229aa0bd63a15f2522771cb5b82a7438aa3630316a9416abdfefc3407ff59962c5306dc74c616eebb3b6b3980ea4fb29148c93a0b5f795ea5adb

data/README.md

@@ -196,7 +196,7 @@ before_action :confront_mandatory_billing_action
 ```
 
 You can override any view file by matching Gold's path pattern under `views`. The
-most notable are likely 
+most notable are likely `views/gold/billing/terms.html` and `views/gold/billing/tier.html`
 
 ## Admin interface
 Gold can manage billing for each shop through an admin interface. First, you'll

data/app/controllers/gold/billing_controller.rb

@@ -71,6 +71,7 @@ module Gold
       when PendingCharge
         Gold.logger.info("[#{billing.id}] Charge is pending")
         @confirmation_url = outcome.confirmation_url
+        # Will render view with confirmation URL
       when AcceptedCharge
         Gold.logger.info("[#{billing.id}] Charge is accepted")
         redirect_to outcome.return_url
@@ -105,7 +106,7 @@ module Gold
       case outcome
       when ActiveCharge
         ApplyTierOp.new(billing).call
-        redirect_to main_app.root_url
+        outer_redirect_to_main
       when DeclinedCharge
         redirect_to declined_charge_url
       when ExpiredCharge
@@ -156,6 +157,19 @@ module Gold
 
     private
 
+    # If embedded app, redirect directly through the Shopify admin. This can provide
+    # a better experience than the page rendering and JS kicking off a redirect
+    def outer_redirect_to_main
+      if ShopifyApp.configuration.embedded_app
+        shopify_domain = billing.shop.shopify_domain
+        api_key = ShopifyApp.configuration.api_key
+        fullpath = "/admin/apps/#{api_key}#{main_app.root_path}"
+        redirect_to URI::HTTPS.build(host: shopify_domain, path: fullpath).to_s
+      else
+        redirect_to main_app.root_url
+      end
+    end
+
     # Redirect to the appropriate location based on the return value from
     # ChargeOp.
     def handle_charge_outcome(outcome)
@@ -173,7 +187,7 @@ module Gold
         redirect_to outcome.return_url
       when PendingCharge
         Gold.logger.info("[#{billing.id}] Charge is pending")
-        redirect_to outcome.confirmation_url
+        fullpage_redirect_to outcome.confirmation_url
       end
     end
 

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "3.0.1".freeze
+  VERSION = "3.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails