shopify-gold 2.1.0.pre → 2.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60caa1e9a44c3ef0460d4c3e8d9f33f4457b9a550d874fc9196c1c6b79f5d9c
-  data.tar.gz: 747ad055581e3256e19a511e18f798bd891f3cb1886f42a4593871816f5c8972
+  metadata.gz: be0da51bb5675160c788669b7ff9b25a27725b473eae16b12c2bd0329328d3cf
+  data.tar.gz: 2a93b3f89cdd593eca1f198fc630607c5531d86460f04e1fa04c986ef45f5351
 SHA512:
-  metadata.gz: dda0880c7d55806e387a5dd701b024836abecc64dcf235590e6c902894de2d590ec58de342277eb33dda68aceddf02238a1ecb8b77316e58e3808481cbea1f8b
-  data.tar.gz: 686cfa5a32d461053b21050e9b194c3bf0dd53c1398cd1d338d76e132182eae7342c1453c678b5101ae9c23a02003460bb3cb09439b6c8e6febed5be3704db87
+  metadata.gz: 7113dfe26ca0db2d14b83924c80fc0d33762fa18af524a374d81ff66aec80b6e7fe13c7c19f115c7af1d433499c300e911e56cb37dc12af005ceadf58273cd91
+  data.tar.gz: 85fbd823becc14c31308c38a5ff272f3a8fbe5f6db99fb57aeaf1fbb23dd9cd8210fd9be5617cf3bd965de66ab4c5d4fa86b8482f65929c4ee29bb628e964a8c

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

@@ -32,7 +32,9 @@ module Gold
 
         outcome = SelectTierOp.new(billing, tier).call
 
-        if outcome.ok?
+        if outcome.is_a?(Outcomes::TierApplied)
+          flash[:success] = "Changed billing to '#{tier.name}'"
+        elsif outcome.ok?
           charge_outcome = ChargeOp.new(billing, process_charge_url).call
 
           if charge_outcome.is_a?(Outcomes::ActiveCharge)
@@ -115,8 +117,10 @@ module Gold
                                       params[:percentage].to_i,
                                       process_charge_url).call
 
-        if outcome.ok?
+        if outcome.is_a?(Outcomes::PendingCharge)
           flash[:warning] = "Discount applied, merchant must reauthorize the charge"
+        elsif outcome.ok?
+          flash[:success] = "Discount updated, will be used for future charges"
         else
           flash[:danger] = "Failed to apply discount because '#{outcome.message}'"
         end

data/app/models/gold/machine.rb

@@ -239,7 +239,8 @@ module Gold
     transition from: :delayed_charge_accepted, to: %i[charge_activated
                                                       marked_as_uninstalled]
 
-    transition from: :delayed_charge_expired, to: :delayed_charge
+    transition from: :delayed_charge_expired, to: %i[delayed_charge
+                                                     marked_as_delinquent]
     transition from: :delayed_charge_declined, to: %i[marked_as_delinquent
                                                       delayed_charge]
 

data/app/operations/gold/apply_discount_op.rb

@@ -23,10 +23,17 @@ module Gold
 
       return SameDiscount.new if @percentage == @billing.discount_percentage
 
-      @billing.transition_to!(:apply_discount, percentage: @percentage)
       @billing.update(discount_percentage: @percentage)
 
-      ChargeOp.new(@billing, @return_url, @test).call
+      # If we can transition to apply discount, let's do that. This means we're
+      # in a billing state and a new charge will be created. Otherwise, it's
+      # OK to just set the `discount_percentage` field for future charges
+      if @billing.can_transition_to?(:apply_discount)
+        @billing.transition_to!(:apply_discount, percentage: @percentage)
+        ChargeOp.new(@billing, @return_url, @test).call
+      else
+        Success.new
+      end
     end
   end
 end

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

@@ -1,12 +1,11 @@
 <% billing.shop.with_shopify_session do %>
-  <% credits = ShopifyAPI::ApplicationCredit.all %>
   <div class="card mb-3">
     <div class="card-header">
       <strong>Credit</strong>
     </div>
     <div class="card-body">
       <h6>Credits</h6>
-      <% if credits.any? %>
+      <% if @credits.any? %>
         <table class="table celled">
           <thead>
             <tr>
@@ -15,7 +14,7 @@
             </tr>
           </thead>
           <tbody>
-            <% credits.each do |credit| %>
+            <% @credits.each do |credit| %>
               <tr>
                 <td>
                   <%= credit.description %>

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

@@ -12,11 +12,7 @@
         value="<%= billing.discount_percentage %>">%
       <div>
         <hr>
-        <% if billing.can_transition_to?(:apply_discount) %>      
-          <%= submit_tag 'Apply discount', class: "btn btn-primary", data: {confirm: "Are you really sure you want to apply this discount?"} %>
-        <% else %>
-          <p>Discount cannot be applied in the current state</p>
-        <% end %>
+        <%= submit_tag 'Apply discount', class: "btn btn-primary", data: {confirm: "Are you really sure you want to apply this discount?"} %>
       </div>
     <% end %>
   </div>

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "2.1.0.pre".freeze
+  VERSION = "2.1.1.pre".freeze
 end

metadata

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