stall 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0524d2c5e775b699249a9e311d7eb05f2a28329a
-  data.tar.gz: f13ac7bc4efa4013a6cabf3d92214669832b2610
+  metadata.gz: 93101cd6c71bd164e54d7f7a96009894eaee815d
+  data.tar.gz: e9e552e25b8fa6a49ac0423cacac158b267585ab
 SHA512:
-  metadata.gz: d25def30d139c976bbcc3c25635bcc4321dc152b008c62ea4b9d64798b6402b0d1715625e14763588ee3b0d23bef7d88c9591bbc230d9b31ad486d3c8d147544
-  data.tar.gz: c4a3e2c50f5770ad510c1cf8dce6329526e8dc3b5c16172960150976d0ea6ad75b3c87cf4f6735f1c345680a685ba6b6caf02c18352fe17610a0439d624fc337
+  metadata.gz: ad0c5c29e895dcadf8aff1631374685f209ce73db2e6c28ff313648e33c67093dbb0fbef762d34abcaaf9b3eb4f015a6a151285b47f8327fb194c3e162f0dfa1
+  data.tar.gz: ad331dadf79752be6c13933ef96060aa07c4b7ae5ebbea33f42757d2160bfb10825d30c2f6dbe0092d91edb1df82abbb419bc8e55f3b5583274bd889a1b3e7ad

data/app/controllers/stall/checkout/steps_controller.rb

@@ -4,8 +4,8 @@ module Stall
       include Stall::CheckoutHelper
 
       before_action :load_cart
-      before_action :ensure_cart_checkoutable
       before_action :load_step
+      before_action :ensure_cart_checkoutable
 
       def show
         @step.prepare
@@ -41,7 +41,16 @@ module Stall
         @cart = current_cart
       end
 
+      def find_cart(identifier, ensure_active_cart = true)
+        super(identifier, false)
+      end
+
       def ensure_cart_checkoutable
+        unless @cart.active? || @step.allow_inactive_carts?
+          remove_cart_from_cookies(@cart.identifier)
+          @cart = @cart.class.new
+        end
+
         unless @cart.checkoutable?
           flash[:error] = t('stall.checkout.shared.not_checkoutable')
           redirect_to request.referrer || root_path

data/app/helpers/stall/checkout_helper.rb

@@ -1,7 +1,7 @@
 module Stall
   module CheckoutHelper
     def step_path(*args)
-      checkout_step_path(*([current_cart_key] + args))
+      checkout_step_path(*([current_cart.identifier] + args))
     end
 
     def available_shipping_methods_for(cart)

data/app/models/stall/models/product_list.rb

@@ -42,7 +42,8 @@ module Stall
       end
 
       def reset_state!
-        update_column(:state, wizard.steps.first)
+        self.state = wizard.steps.first
+        save(validate: false) if persisted?
       end
 
       def to_param

data/app/views/stall/carts/show.html.haml

@@ -59,5 +59,5 @@
       %button.btn.btn-default{ type: 'submit', data: { :'cart-update-button' => true } }
         = t('stall.carts.recap.update')
 
-      = link_to checkout_path(current_cart_key), class: 'btn btn-primary' do
+      = link_to checkout_path(current_cart.identifier), class: 'btn btn-primary' do
         = t('stall.carts.recap.validate')

data/lib/stall/cart_helper.rb

@@ -46,9 +46,11 @@ module Stall
       end
     end
 
-    def find_cart(identifier)
+    def find_cart(identifier, ensure_active_cart = true)
       if (cart_token = cookies.encrypted[cart_key(identifier)])
-        if (current_cart = ProductList.find_by_token(cart_token)) && current_cart.active?
+        if (current_cart = ProductList.find_by_token(cart_token)) &&
+           (!ensure_active_cart || current_cart.active?)
+        then
           return current_cart
         else
           # Remove any cart that can't be fetched, either because it's already

data/lib/stall/checkout/payment_checkout_step.rb

@@ -4,6 +4,13 @@ module Stall
       def process
         return true if params[:succeeded]
       end
+
+      # When we access this step after a payment to validate the step, the cart
+      # is "inactive", so we force processing the cart.
+      #
+      def allow_inactive_carts?
+        !!params[:succeeded]
+      end
     end
   end
 end

data/lib/stall/checkout/payment_return_checkout_step.rb

@@ -6,6 +6,13 @@ module Stall
       def prepare
         remove_cart_from_cookies(cart.identifier)
       end
+
+      # When we access this step, the cart is "inactive", since it is paid, so
+      # we force processing the cart.
+      #
+      def allow_inactive_carts?
+        true
+      end
     end
   end
 end

data/lib/stall/checkout/step.rb

@@ -50,6 +50,18 @@ module Stall
         end
       end
 
+      # Allows subclasses to override this value with `true` to allow paid carts
+      # to be processed by that step too.
+      #
+      # Returning false redirects the user telling him that his cart is empty
+      #
+      # By default, the `PaymentReturn` checkout step returns true, since it's
+      # always called after the cart is paid
+      #
+      def allow_inactive_carts?
+        false
+      end
+
       # Abstracts the simple case of assigning the submitted parameters to the
       # cart object, running the step validations and saving the cart
       def save

data/lib/stall/version.rb

@@ -1,3 +1,3 @@
 module Stall
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stall
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails