shopify-gold 2.0.2.pre → 2.0.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a207a2139e8e1ab1be012353b58500a6ab9f0c6799f6158cd131bfe63a0fc7e0
-  data.tar.gz: 16a1d206a15a09286a79ded2239807dcc9c16767fb57ba1f75481515ccac9226
+  metadata.gz: fd027c06fce384ce66029afeb9aa3f965156802712554d3d48aacc4ee95aaea6
+  data.tar.gz: 3ec0621d1c642434307f4a5f0edd31c9285252f8a530e61ce71979087c889180
 SHA512:
-  metadata.gz: 8027b833952d50b72ed0a38d24a8c32307b00e911a67fc2edd24657a64532a50eafa343fa92d8ab7b6d2d9ade2abf5d2f6a4786a810e770afa0caad07a45adb5
-  data.tar.gz: b2dc4970350aa2c6466f9256bcd98b66916c7d0d1664998ca83d6aeb57e3dee10565cff178413b88d170e6f398d720f8728243dc151f97e3a81d6b750315b814
+  metadata.gz: 343b67bf6bbc10831595f812cabd99da17c5cdfeed77cf4da7b53618d27c6624737b43f9c645dbba434a687f63ee0c35126fc27196b60b8a44e0b98fa8eacaca
+  data.tar.gz: 883b92d46a77ade35dd7722c3c1234056b0d5108d91de232ba4b30d840d9600419b6525ebd066bbdda99765b4f148cd0679e76628a03648ebd8fe7cd0d2e5083

data/app/assets/stylesheets/gold/billing.sass

@@ -11,6 +11,7 @@ body
     background-color: white
     position: relative
     overflow: auto
+    flex: 1
 
     &:before
       content: asset-url('gold/app-logo.svg')
@@ -32,6 +33,13 @@ body
     background-position: 0 40%
     background-size: 700px
 
+    @media (max-width: 1200px)
+      width: 25%
+      background-position: 25% 40%
+
+    @media (max-width: 900px)
+      display: none
+
 .tiers
   .tier
     border-top: 1px solid #DFE3E8
@@ -59,6 +67,12 @@ body
       align-items: center
       justify-content: space-between
       width: 100%
+      flex-wrap: wrap
 
     .tier-description
-      max-width: 320px
+      max-width: 250px
+
+      @media (max-width: 800px)
+        width: 100%
+        max-width: none
+        margin-top: 10px

data/app/controllers/gold/admin/billing_controller.rb

@@ -102,7 +102,11 @@ module Gold
       # Unsuspend a shop
       def unsuspend
         UnsuspendOp.new(billing).call
-        flash[:success] = "Account unsuspended"
+        outcome = CheckChargeOp.new(billing).call
+
+        Gold::ChargeOp.new(billing, process_charge_url).call unless outcome.ok?
+
+        flash[:success] = "Account unsuspended, charge is '#{outcome}'"
         go_back
       end
 

data/app/operations/gold/apply_tier_op.rb

@@ -18,7 +18,7 @@ module Gold
       unless %i[apply_tier apply_free_tier].include?(@billing.current_state)
         if tier.free?
           @billing.transition_to!(:apply_free_tier, tier_id: tier.id)
-        else
+        elsif @billing.shopify_plan.paying?
           @billing.transition_to!(:apply_tier, tier_id: tier.id)
         end
       end
@@ -43,9 +43,21 @@ module Gold
         end
       end
 
-      @billing.transition_to!(:billing)
+      @billing.transition_to!(billing_state)
       Gold.configuration.on_apply_tier&.call(@billing, tier.id)
       TierApplied.new
     end
+
+    private
+
+    def billing_state
+      if @billing.shopify_plan.affiliate?
+        :affiliate
+      elsif @billing.shopify_plan.staff?
+        :staff
+      else
+        :billing
+      end
+    end
   end
 end

data/app/operations/gold/select_tier_op.rb

@@ -36,17 +36,11 @@ module Gold
         @billing.update(trial_starts_at: Time.current) unless @billing.trial_starts_at
 
         # Process the tier selection, creating charges if necessary
-        if @billing.shopify_plan.affiliate?
-          @billing.tier = @tier
-          @billing.save!
-          @billing.transition_to!(:affiliate)
-          return TierApplied.new
-        elsif @billing.shopify_plan.staff?
-          @billing.tier = @tier
-          @billing.save!
-          @billing.transition_to!(:staff)
-          return TierApplied.new
-        elsif @tier.free?
+        if @billing.shopify_plan.affiliate? ||
+           @billing.shopify_plan.staff? ||
+           @tier.free?
+
+          # If the shop doesn't need a charge, apply the tier
           return ApplyTierOp.new(@billing).call
         else
           # A valid charge is necessary before applying the new tier

data/app/views/gold/admin/billing/_status.erb

@@ -6,7 +6,7 @@
     <% if billing.current_state.to_s.include?("suspended") %>
       <p>This account is currently <strong>suspended</strong></p>
       <%= form_tag(gold_admin_engine.unsuspend_path(id: billing.id), method: :put) do %>
-        <%= submit_tag 'Unsuspend', data: {confirm: "Are you really sure you want to UNSUSPEND this account?"} %>
+        <%= submit_tag 'Unsuspend', class: "btn btn-secondary", data: {confirm: "Are you really sure you want to UNSUSPEND this account?"} %>
       <% end %>
     <% else %>
       <p>This account is currently <strong>allowed</strong></p>

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "2.0.2.pre".freeze
+  VERSION = "2.0.3.pre".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre
+  version: 2.0.3.pre
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails