shopify-gold 3.1.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adc0c1d861847ba415b25018a12a0ea9707e5786015e88f92948a95c19ab03c
-  data.tar.gz: d6dcd501764c4d1838de734179e13d1d67cf4c1c9e0e23fc77d7765a70d3347c
+  metadata.gz: b25280b1c511ebf2f9e0764bffdf3583af068260d3a9e08a46d4327c5dca52f1
+  data.tar.gz: 97dd3fc9a7854145683a0b3e85a2ff935e1be8b5d495d193c8ad8d163701359d
 SHA512:
-  metadata.gz: 4b641e7b4e8b9ce1b391f7b82051b227e6d61dd4af40920a0540f8fe59edc065d427bf4cdd5c92939c958b7f52ca1cdac6942fa6c6ca62c37e93b91c579d0ea2
-  data.tar.gz: 9712751b0835d99bd4b47c260213463256e03b224b338446e16ccb2fcc354bfb06deba75f32808b4b0cc94031e17a58fb60eccabbad237f97347d09fb27604c6
+  metadata.gz: ab1f2a8fff58ee961ccb0f573ab69ca53dd5638bd8065d3e8fe4e125b76c445221356152c58426bd5b557a5df3100bf581809eca8c8deabd2b162a2bed794467
+  data.tar.gz: ab03be2a520dc46553f27727e33aa46bf8e8b6fe6be7b5ac3992e4ade0841da107e978671c8570bf14c2c4a9eadbc92878faa78245e98719e92a215c9587e2df

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

@@ -103,8 +103,7 @@ module Gold
 
       # Unsuspend a shop
       def unsuspend
-        UnsuspendOp.new(billing).call
-        outcome = CheckChargeOp.new(billing).call
+        outcome = UnsuspendOp.new(billing).call
 
         Gold::ChargeOp.new(billing, process_charge_url).call unless outcome.ok?
 

data/app/models/gold/machine.rb

@@ -122,13 +122,19 @@ module Gold
     # Ensure that a shop has a certain type of plan before allowing a transition.
     def self.ensure_plan_is(query_method)
       test = proc { |billing| billing.shopify_plan.send(query_method) }
-      test.define_singleton_method(:to_s) { "Billing is #{query_method}" }
+      test.define_singleton_method(:to_s) { "Billing is #{query_method}?" }
       test
     end
 
     def self.ensure_tier_is_not_free
       test = proc { |billing| !billing.tier&.free? }
-      test.define_singleton_method(:to_s) { "Tier is not free" }
+      test.define_singleton_method(:to_s) { "Tier is not free?" }
+      test
+    end
+
+    def self.ensure_tier_is_free
+      test = proc { |billing| billing.tier&.free? }
+      test.define_singleton_method(:to_s) { "Tier is free?" }
       test
     end
 
@@ -196,7 +202,7 @@ module Gold
                                       issue_credit
                                       marked_as_suspended
                                       marked_as_uninstalled]
-
+    guard_transition to: :check_charge, &ensure_tier_is_not_free
     transition from: :check_charge, to: %i[check_charge
                                            billing
                                            charge_missing
@@ -276,7 +282,9 @@ module Gold
     transition from: :marked_as_suspended, to: :suspended
     transition from: :suspended, to: %i[affiliate
                                         check_charge
+                                        billing
                                         cleanup]
+    guard_transition from: :suspended, to: :billing, &ensure_tier_is_free
 
     transition from: :marked_as_uninstalled, to: %i[uninstalled]
     transition from: :uninstalled, to: %i[cleanup reinstalled]

data/app/operations/gold/unsuspend_op.rb

@@ -8,13 +8,15 @@ module Gold
     end
 
     def call
-      if @billing.can_transition_to?(:affiliate)
-        @billing.transition_to!(:affiliate)
+      # Transition to appropriate location
+      if @billing.transition_to(:affiliate)
+        Success.new
+      elsif @billing.transition_to(:check_charge)
+        CheckChargeOp.new(@billing).call
       else
-        @billing.transition_to!(:check_charge)
+        @billing.transition_to!(:billing)
+        Success.new
       end
-
-      Success.new
     end
   end
 end

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "3.1.5".freeze
+  VERSION = "3.1.6".freeze
 end

data/lib/tasks/gold_tasks.rake

@@ -54,7 +54,9 @@ namespace :gold do
       billing.shop.with_shopify_session do
         outcome = Gold::CheckChargeOp.new(billing).call
 
-        unless outcome.ok?
+        if outcome.ok?
+          print "✅"
+        else
           puts "Check charge for shop '#{billing.shop.shopify_domain}': #{outcome}"
           Gold::ChargeOp.new(billing,
                              Gold::Engine.routes.url_helpers.process_charge_url).call

metadata

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