spree_frontend 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c66b8f123b638f80a3b8010842e2b8cb8e7900
-  data.tar.gz: 1d210189e5ae391e3c294b5c2b3263d9059bea03
+  metadata.gz: e32795d3a2b34db3163a797a18be3b55bb84a69e
+  data.tar.gz: 752e5bf3c288a771ab4f4f51726ab0a3cee09f76
 SHA512:
-  metadata.gz: d75af6c2e2b24deaf7a6287c63b44c77e8358f9d9b61a903ae09177e808893bd2edc02979f4f3e741643d9de40e4ba2570b345a8393783791ff166446b4648dd
-  data.tar.gz: 962d840e05c49ddc0e8f266329641bdfd466e012d6696a78fb1d05699e13d92cda6974a21d2ad72a44ae6c9079298f1d28b943cf232edea91faa0604e1dd1114
+  metadata.gz: a6fc8d4b1a9a497006e47453d161cf8d944bae539a3682f43e212f757b12307b93e14c9b5af2ebf530133142f05d58712d85d22b05cc72d193ed50324d4faaaf
+  data.tar.gz: a2509f7541321f0a35a4ed46c2f7cabd68426fca8b4c88293f3cfd9f463998b2e8484434f318567acd80bcecc1242cb67a21c5635ddf4f6bc6dd7fdb195d782b

data/app/controllers/spree/checkout_controller.rb

@@ -6,7 +6,9 @@ module Spree
   class CheckoutController < Spree::StoreController
     ssl_required
 
-    before_filter :load_order_with_lock
+    before_action :load_order_with_lock
+    before_filter :ensure_valid_state_lock_version, only: [:update]
+    before_filter :set_state_if_present
 
     before_filter :ensure_order_not_completed
     before_filter :ensure_checkout_allowed
@@ -72,7 +74,21 @@ module Spree
       def load_order_with_lock
         @order = current_order(lock: true) 
         redirect_to spree.cart_path and return unless @order
+      end
+
+      def ensure_valid_state_lock_version
+        if params[:order] && params[:order][:state_lock_version]
+          @order.with_lock do
+            unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
+              flash[:error] = Spree.t(:order_already_updated)
+              redirect_to checkout_state_path(@order.state) and return
+            end
+            @order.increment!(:state_lock_version)
+          end
+        end
+      end
 
+      def set_state_if_present
         if params[:state]
           redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
           @order.state = params[:state]

data/app/views/spree/checkout/_summary.html.erb

@@ -29,7 +29,7 @@
 
     <% if order.checkout_steps.include?("delivery") && order.shipments.any? %>
       <tr data-hook="shipping_total">
-        <td><%= Spree.t(:shipping_total) %></td>
+        <td><%= Spree.t(:shipping_total) %>:</td>
         <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
       </tr>
 
@@ -37,7 +37,7 @@
         <tbody data-hook="order_details_shipment_promotion_adjustments">
           <% order.shipment_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
             <tr class="total">
-              <td><%= label %></td>
+              <td><%= label %>:</td>
               <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
             </tr>
           <% end %>
@@ -50,7 +50,7 @@
         <% order.adjustments.eligible.each do |adjustment| %>
         <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr class="total">
-            <td><%= adjustment.label %>: </td>
+            <td><%= adjustment.label %>:</td>
             <td><%= adjustment.display_amount.to_html %></td>
           </tr>
         <% end %>

data/app/views/spree/checkout/edit.html.erb

@@ -1,11 +1,11 @@
-<div id="checkout" data-hook>  
+<div id="checkout" data-hook>
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-  
+
   <div class="row" data-hook="checkout_header">
     <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
     <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
   </div>
-  
+
   <div class="row" data-hook="checkout_content">
     <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
@@ -15,9 +15,10 @@
             <%= form.text_field :email %>
           </p>
         <% end %>
+        <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, :form => form %>
       <% end %>
-    </div>    
+    </div>
     <% if @order.state != 'confirm' %>
       <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
         <%= render :partial => 'summary', :locals => { :order => @order } %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement