shopify-gold 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78293868f6e71725d206a8702fa7a21b464a4e064b92e66b071438b167bea14
-  data.tar.gz: 11b2059ff87e7cb99ad4773f72b1558da33f90e2208272c11ab53fe0219fc894
+  metadata.gz: 2e991f369eefa6ba3d1d16b0e813c66198a3f0e5917ffb12e0b67b579a2f83fd
+  data.tar.gz: 4ef62f22ca0ba627622e19fd28877efac6313d3d6ba2efff315b1186c0cba9b0
 SHA512:
-  metadata.gz: d6c36f6b7843d26a206f3136b3fc15cd0e858fa4eccd8c60ca6b8c360da3796dcee0491098a91824704d7e1eff426267e341cf071ae25b92189ccf3d9bf985b3
-  data.tar.gz: 3e792f82164acc2c22926eab91a8b59d924edb1b69944fc70ad07dbaeaad03cb80015408cab17b98e6482220a1d2e3d884533d9feb0b523827ef85994034eab8
+  metadata.gz: 2dcd354fbd85a74c4173421a6ce853e6e990a79b7d8a7311b0548a8f02533cf21e6180e71bb5a70af266a49f03c3fdf89bfc06514f5f2219ded53409c6720fc1
+  data.tar.gz: 1fd08c18c9f15b3eb210b831a66bce5a797475c78edea25795da4a79d42a90807f4b67251954c93ffd2f9b6ad071ef12ea8d99ef48dd5c952d14fa1659be26be

data/README.md

@@ -124,6 +124,9 @@ Gold.configure do |config|
   # If Gold is allowed to cancel charges (paid -> free) automatically
   config.allow_automated_charge_cancellation = true
 
+  # Force Gold billing view's to redirect to iframe
+  config.force_embedded_redirect = false
+
   config.admin_credentials = {
     user: "admin",
     password: "password123"

data/app/assets/javascripts/gold/billing.js

@@ -27,4 +27,18 @@ function tierStep($form) {
 
 if ($tierForm) {
   tierStep($tierForm);
+}
+
+// When embedded
+if (window.self !== window.top) {
+  var $confirmation = document.getElementById('confirmation-button');
+
+  if ($confirmation) {
+    $confirmation.addEventListener('click', function(e) {
+      e.preventDefault();
+      app.dispatch(actions.Redirect.toRemote({
+        url: $confirmation.getAttribute('href')
+      }));
+    });
+  }
 }

data/app/controllers/gold/application_controller.rb

@@ -6,6 +6,8 @@ module Gold
 
     layout "application"
 
+    helper_method :billing
+
     private
 
     # Allows an action to stop processing (like `return`, but works even in

data/app/views/gold/billing/outstanding_charge.html.erb

@@ -9,4 +9,6 @@
 
 <div style="height: 25px;"></div>
 
-<a class="Polaris-Button Polaris-Button--primary" href="<%= @confirmation_url %>">View charges</a>
+<a class="Polaris-Button Polaris-Button--primary"
+   id="confirmation-button"
+   href="<%= @confirmation_url %>">View charges</a>

data/app/views/layouts/gold/billing.html.erb

@@ -4,6 +4,26 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><%= Gold.configuration.app_name %></title>
 
+    <% if ShopifyApp.configuration.embedded_app && Gold.configuration.force_embedded_redirect %>
+      <script>
+        if (window.self === window.top) {
+          location.href = "https://<%= billing.shop.shopify_domain %>/admin/apps/<%= ShopifyApp.configuration.api_key %>" + location.pathname;
+        }
+      </script>
+    <% end %>
+
+    <script src="https://unpkg.com/@shopify/app-bridge@1.6.6/umd/index.js"></script>
+
+    <script>
+      var AppBridge = window['app-bridge'];
+      var createApp = AppBridge.default;
+      var app = createApp({
+        apiKey: '<%= ShopifyApp.configuration.api_key %>',
+        shopOrigin: '<%= billing.shop.shopify_domain %>',
+      });
+      var actions = window['app-bridge'].actions;
+    </script>
+
     <%= stylesheet_link_tag "shopify/polaris" %>
     <%= stylesheet_link_tag "gold/billing" %>
 

data/db/migrate/01_create_gold_billing.rb

@@ -6,6 +6,7 @@ class CreateGoldBilling < ActiveRecord::Migration[5.2]
       t.string :tier_id
       t.string :shopify_plan_override
       t.integer :discount_percentage, null: false, default: 0
+      t.timestamps null: false
     end
   end
 end

data/lib/gold/configuration.rb

@@ -11,7 +11,8 @@ module Gold
                   :allow_automated_charge_cancellation,
                   :days_until_delinquent,
                   :days_until_cleanup,
-                  :shop_domain_attribute
+                  :shop_domain_attribute,
+                  :force_embedded_redirect
 
     # Callbacks
     attr_accessor :on_terms,
@@ -52,6 +53,9 @@ module Gold
       # The URL to a plan comparison page for the app
       @plan_comparison_url = nil
 
+      # Force Gold billing view's to redirect to iframe
+      @force_embedded_redirect = false
+
       # Login credential's to Gold's backend
       @admin_credentials = {
         user: "admin",

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "3.1.1".freeze
+  VERSION = "3.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Andrew Smith