shopify-gold 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1a04a46085510f9e78a365b0febc70394fae810d130d6ed4fcbc33add97ae7a
-  data.tar.gz: f3e0329c1a333700ab7bd44fa85dc34323ff446947d6a73928fbaa0519868afa
+  metadata.gz: e78293868f6e71725d206a8702fa7a21b464a4e064b92e66b071438b167bea14
+  data.tar.gz: 11b2059ff87e7cb99ad4773f72b1558da33f90e2208272c11ab53fe0219fc894
 SHA512:
-  metadata.gz: e93d381fb0fcfc778334acf3ebbfe6c39a7106510e558afc6ad929ec6c731e5c5cd861cad1cf52acab2460539424b1ef4b2600f7e36fbc1183dbaed940dd12cb
-  data.tar.gz: 580b47448d8e229aa0bd63a15f2522771cb5b82a7438aa3630316a9416abdfefc3407ff59962c5306dc74c616eebb3b6b3980ea4fb29148c93a0b5f795ea5adb
+  metadata.gz: d6c36f6b7843d26a206f3136b3fc15cd0e858fa4eccd8c60ca6b8c360da3796dcee0491098a91824704d7e1eff426267e341cf071ae25b92189ccf3d9bf985b3
+  data.tar.gz: 3e792f82164acc2c22926eab91a8b59d924edb1b69944fc70ad07dbaeaad03cb80015408cab17b98e6482220a1d2e3d884533d9feb0b523827ef85994034eab8

data/app/operations/gold/apply_tier_op.rb

@@ -15,35 +15,38 @@ module Gold
         return TierNotFound.new(e.message)
       end
 
-      unless %i[apply_tier apply_free_tier].include?(@billing.current_state)
-        if tier.free?
-          @billing.transition_to!(:apply_free_tier, tier_id: tier.id)
-        elsif @billing.shopify_plan.paying?
-          @billing.transition_to!(:apply_tier, tier_id: tier.id)
+      @billing.transaction do
+        unless %i[apply_tier apply_free_tier].include?(@billing.current_state)
+          if tier.free?
+            @billing.transition_to!(:apply_free_tier, tier_id: tier.id)
+          elsif @billing.shopify_plan.paying?
+            @billing.transition_to!(:apply_tier, tier_id: tier.id)
+          end
         end
-      end
 
-      @billing.tier = tier
-      @billing.save!
-
-      if tier.free?
-        if Gold.configuration.allow_automated_charge_cancellation
-          # Remove any outstanding active charges
-          if (charge = ShopifyAPI::RecurringApplicationCharge.current)
-            request_with_retries do
-              Gold.logger.info("[#{@billing.id}] Free tier applied, canceling " \
-                               "charge '#{charge.price}' for " \
-                               "'#{@billing.shop.shopify_domain}'")
-              charge.cancel
+        @billing.tier = tier
+        @billing.save!
+
+        if tier.free?
+          if Gold.configuration.allow_automated_charge_cancellation
+            # Remove any outstanding active charges
+            if (charge = ShopifyAPI::RecurringApplicationCharge.current)
+              request_with_retries do
+                Gold.logger.info("[#{@billing.id}] Free tier applied, canceling " \
+                                "charge '#{charge.price}' for " \
+                                "'#{@billing.shop.shopify_domain}'")
+                charge.cancel
+              end
             end
+          else
+            Gold.logger.info("[#{@billing.id}] Would have cancelled charge for " \
+                            "'#{@billing.shop.shopify_domain}', but prevented by setting")
           end
-        else
-          Gold.logger.info("[#{@billing.id}] Would have cancelled charge for " \
-                          "'#{@billing.shop.shopify_domain}', but prevented by setting")
         end
+
+        @billing.transition_to!(billing_state)
       end
 
-      @billing.transition_to!(billing_state)
       Gold.configuration.on_apply_tier&.call(@billing, tier.id)
       TierApplied.new
     end

data/app/operations/gold/select_tier_op.rb

@@ -34,18 +34,18 @@ module Gold
 
         # Mark the beginning of the trial if it hasn't been set already
         @billing.update(trial_starts_at: Time.current) unless @billing.trial_starts_at
+      end
 
-        # Process the tier selection, creating charges if necessary
-        if @billing.shopify_plan.affiliate? ||
-           @billing.shopify_plan.staff? ||
-           @tier.free?
+      # Process the tier selection, creating charges if necessary
+      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
-          return ChargeNeeded.new
-        end
+        # 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
+        return ChargeNeeded.new
       end
     end
   end

data/lib/gold/version.rb

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

metadata

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