disco_app 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2373fa9e2e7941ce1844f9a39013d2b8d776d14286e72bed6df579f106f6e9a
-  data.tar.gz: 6c81ea01b83d76672f51351ac3ce48b306544b4009105fa00ab9221725c1146e
+  metadata.gz: b5066f1c6e2468ac501dbbba2a8d316bcf8004d6bd8ab91f9f7228e886018cd7
+  data.tar.gz: 63c6c47b149ecfc2070c0a61582e94ff95509c9caa0280e84174b6b5521211f2
 SHA512:
-  metadata.gz: 1372f63725960c73e1b04f175a391c3c231c2fbb51ccdf2d8ad378bf95f3e276d7ad6b5395d2e2ae48a4c84bddf6bb0acfbe8ffb28fe4fe46e203554e172ca65
-  data.tar.gz: d3903b077abe35f53643bfde624d7448d64775b1e84bb4ec80f7f940b5aaba093670f0104b4623091a3a3b5a9654d648da42053dd59ccec5f9ea5a609b6edc46
+  metadata.gz: c65fee2547a99e539d9b74c9e096893c619503a7ef1a74c7b5f5360fab9fa053925590156213c1579775fd2412d2b76e5ff714d13e299223a7e86df340800524
+  data.tar.gz: 053345110dbf0953f3b59d4b4840bd95c315fd120238b0315aee05a1343adfac10c9897eb8e40397916b9b48b5e87265e5ae1a42e895052c9bb282d2ea6b24af

data/app/controllers/disco_app/concerns/authenticated_controller.rb

@@ -42,7 +42,7 @@ module DiscoApp::Concerns::AuthenticatedController
     end
 
     def check_active_charge
-      if @shop.current_subscription? and @shop.current_subscription.requires_active_charge? and not @shop.current_subscription.active_charge?
+      if @shop.current_subscription? and @shop.current_subscription.requires_active_charge? and not @shop.development? and not @shop.current_subscription.active_charge?
         redirect_if_not_current_path disco_app.new_subscription_charge_path(@shop.current_subscription)
       end
     end

data/app/models/disco_app/concerns/shop.rb

@@ -23,6 +23,11 @@ module DiscoApp::Concerns::Shop
     # Alias 'with_shopify_session' as 'temp', as per our existing conventions.
     alias_method :temp, :with_shopify_session
 
+    # Return true if the shop is considered as in development mode.
+    def development?
+      ['staff', 'custom'].include?(plan_name)
+    end
+
     # Convenience method to check if this shop has a current subscription.
     def current_subscription?
       current_subscription.present?

data/app/views/disco_app/charges/new.html.erb

@@ -3,10 +3,21 @@
 <p>
   Thanks for installing <%= DiscoApp.configuration.app_name %>!
 </p>
-<p>
-  Before we start setting things up, we need you to authorize a charge for the application.
-</p>
+<p id="account-warning"></p>
 
-<%= form_tag disco_app.subscription_charges_path(@subscription), method: 'POST', target: '_parent' do %>
+<%= form_tag disco_app.subscription_charges_path(@subscription), id: 'install-ok', method: 'POST', target: '_parent' do %>
   <%= submit_tag 'Okay', class: 'form-input' %>
 <% end %>
+
+<script>
+  ShopifyApp.ready(function(){
+    var container = document.getElementById('account-warning');
+    if (ShopifyApp.User.current.accountAccess === "Account owner") {
+      container.innerHTML = "Before we start setting things up, we need you to authorize a charge for the application."
+    } else {
+      container.innerHTML = "Since you're not the account owner, you won't be able to setup a charge. Ask the account owner to install the app."
+      var okButton = document.getElementById('install-ok');
+      okButton.parentElement.removeChild(okButton);
+    }
+  });
+</script>

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -39,7 +39,7 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'classnames-rails', '~> 2.1.5'
     gem 'active_link_to', '~> 1.0.2'
     gem 'premailer-rails', '~> 1.8.2'
-    gem 'nokogiri', '~> 1.6.7.2'
+    gem 'nokogiri', '~> 1.6.8'
     gem 'render_anywhere', '~> 0.0.12', require: false
 
     # Add gems for development and testing only.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Gavin Ballard