spree_frontend 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed5bab32b5df9e5a3ec48e16a99c614d7c971c0
-  data.tar.gz: c21d03116b27055df1799f54c214a675c67a0194
+  metadata.gz: 4648f59f227cbb4cdc23403055f4910dcc48dc61
+  data.tar.gz: 536af35efd794e1431a1e57255fa705e1b653719
 SHA512:
-  metadata.gz: 3ad0f5b3b87813581495f08fa0dfdd846b4f9ca3089a021bb82cb768a42de2fe71e8c1972cedeb751c41a353ff17988972718f54a7d1d0cd33d63c15518d88da
-  data.tar.gz: e4d13771819dcc9edb06b714abc81225071a04191b27ecbf83531e19fe65f85a2967336de82722230c697dcb22ad67628f7a6aa494deab7c5abb9fe14c769f0f
+  metadata.gz: 4af58cfefc3867d11eee4258766426906e37d49e5c01998835af6d01d5773c47a95903801faaa2ada1b219b252140070a21e797620e795402b767357002e7fcb
+  data.tar.gz: ae39a90aad057acc766b596e27001b197201248df68db24dcdd8f03632621877172c83011035a54ce9df6087f17dcca6e858d917b5e270a2fcfd98e454bdbb53

data/app/controllers/spree/checkout_controller.rb

@@ -17,6 +17,8 @@ module Spree
     before_filter :check_authorization
     before_filter :apply_coupon_code
 
+    before_filter :setup_for_current_state
+
     helper 'spree/orders'
 
     rescue_from Spree::Core::GatewayError, :with => :rescue_from_spree_gateway_error
@@ -27,7 +29,7 @@ module Spree
         fire_event('spree.checkout.update')
 
         unless @order.next
-          flash[:error] = @order.errors[:base].join("\n")
+          flash[:error] = @order.errors.full_messages.join("\n")
           redirect_to checkout_state_path(@order.state) and return
         end
 
@@ -69,7 +71,6 @@ module Spree
           redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
           @order.state = params[:state]
         end
-        setup_for_current_state
       end
 
       def ensure_checkout_allowed
@@ -120,9 +121,14 @@ module Spree
         send(method_name) if respond_to?(method_name, true)
       end
 
+      # Skip setting ship address if order doesn't have a delivery checkout step
+      # to avoid triggering validations on shipping address
       def before_address
         @order.bill_address ||= Address.default
-        @order.ship_address ||= Address.default
+
+        if @order.checkout_steps.include? "delivery"
+          @order.ship_address ||= Address.default
+        end
       end
 
       def before_delivery

data/app/controllers/spree/orders_controller.rb

@@ -21,7 +21,7 @@ module Spree
 
       if @order.update_attributes(params[:order])
         @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
-        @order.create_proposed_shipments if @order.shipments.any?
+        @order.ensure_updated_shipments
         return if after_update_attributes
 
         fire_event('spree.order.contents_changed')
@@ -51,7 +51,7 @@ module Spree
     def populate
       populator = Spree::OrderPopulator.new(current_order(true), current_currency)
       if populator.populate(params.slice(:products, :variants, :quantity))
-        current_order.create_proposed_shipments if current_order.shipments.any?
+        current_order.ensure_updated_shipments
 
         fire_event('spree.cart.add')
         fire_event('spree.order.contents_changed')

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

@@ -18,10 +18,10 @@
               <col style="width: 20%;" />
             </colgroup>
             <thead>
-              <th>image</th>
-              <th>name</th>
-              <th>quantity</th>
-              <th>price</th>
+              <th></th>
+              <th align='left'><%= Spree.t(:item) %></th>
+              <th><%= Spree.t(:qty) %></th>
+              <th><%= Spree.t(:price) %></th>
             </thead>
             <tbody>
               <% ship_form.object.manifest.each do |item| %>
@@ -64,10 +64,10 @@
               <col style="width: 20%;" />
             </colgroup>
             <thead>
-              <th>image</th>
-              <th>name</th>
-              <th>quantity</th>
-              <th>price</th>
+              <th></th>
+              <th align='left'><%= Spree.t(:item) %></th>
+              <th><%= Spree.t(:qty) %></th>
+              <th><%= Spree.t(:price) %></th>
             </thead>
             <tbody>
               <% @differentiator.missing.each do |variant, quantity| %>

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

@@ -19,9 +19,9 @@
       <td><strong><%= Spree.t(:order_total) %>:</strong></td>
       <td><strong><span id='summary-order-total'><%= @order.display_total.to_html %></span></strong></td>
     </tr>
-    <% if order.price_adjustment_totals.present? %>
+    <% if order.line_item_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% @order.price_adjustment_totals.each do |label, total| %>
+        <% @order.line_item_adjustment_totals.each do |label, total| %>
           <tr class="total">
             <td><strong><%= label %></strong></td>
             <td><strong><span><%= total.to_html %></span></strong></td>

data/app/views/spree/orders/_form.html.erb

@@ -10,9 +10,7 @@
     </tr>
   </thead>
   <tbody id="line_items" data-hook>
-    <%= order_form.fields_for :line_items do |item_form| %>
-      <%= render :partial => 'line_item', :locals => { :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form } %>
-    <% end %>
+    <%= render partial: 'line_item', collection: order_form.object.line_items, locals: {order_form: order_form} %>
   </tbody>
   <%= render "spree/orders/adjustments" unless @order.adjustments.eligible.blank? %>
 </table>

data/app/views/spree/orders/_line_item.html.erb

@@ -1,31 +1,36 @@
-<tr class="<%= cycle('', 'alt') %> line-item">
-  <td class="cart-item-image" data-hook="cart_item_image">
-    <% if variant.images.length == 0 %>
-      <%= link_to small_image(variant.product), variant.product %>
-    <% else %>
-      <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
-    <% end %>
-  </td>
-  <td class="cart-item-description" data-hook="cart_item_description">
-    <h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
-    <%= variant.options_text %>
-    <% if @order.insufficient_stock_lines.include? line_item %>
-      <span class="out-of-stock">
-        <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
+<% variant = line_item.variant -%>
+<%= order_form.fields_for :line_items, line_item do |item_form| -%>
+  <tr class="<%= cycle('', 'alt') %> line-item">
+    <td class="cart-item-image" data-hook="cart_item_image">
+      <% if variant.images.length == 0 %>
+        <%= link_to small_image(variant.product), variant.product %>
+      <% else %>
+        <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
+      <% end %>
+    </td>
+    <td class="cart-item-description" data-hook="cart_item_description">
+      <h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
+      <%= variant.options_text %>
+      <% if @order.insufficient_stock_lines.include? line_item %>
+        <span class="out-of-stock">
+          <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
+        </span>
+      <% end %>
+      <span class="line-item-description" data-hook="line_item_description">
+        <%= line_item_description(variant) %>
       </span>
-    <% end %>
-    <%= line_item_description(variant) %>
-  </td>
-  <td class="cart-item-price" data-hook="cart_item_price">
-    <%= line_item.single_money.to_html %>
-  </td>
-  <td class="cart-item-quantity" data-hook="cart_item_quantity">
-    <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
-  </td>
-  <td class="cart-item-total" data-hook="cart_item_total">
-    <%= line_item.display_amount.to_html unless line_item.quantity.nil? %>
-  </td>
-  <td class="cart-item-delete" data-hook="cart_item_delete">
-    <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>
-  </td>
-</tr>
+    </td>
+    <td class="cart-item-price" data-hook="cart_item_price">
+      <%= line_item.single_money.to_html %>
+    </td>
+    <td class="cart-item-quantity" data-hook="cart_item_quantity">
+      <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+    </td>
+    <td class="cart-item-total" data-hook="cart_item_total">
+      <%= line_item.display_amount.to_html unless line_item.quantity.nil? %>
+    </td>
+    <td class="cart-item-delete" data-hook="cart_item_delete">
+      <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>
+    </td>
+  </tr>
+<% end -%>

data/app/views/spree/shared/_order_details.html.erb

@@ -1,10 +1,13 @@
 <div class="row steps-data">
 
   <% if order.has_step?("address") %>
-    <div class="columns alpha four" data-hook="order-ship-address">
-      <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-      <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
-    </div>
+
+    <% if order.has_step?("delivery") %>
+      <div class="columns alpha four" data-hook="order-ship-address">
+        <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+        <%= render :partial => 'spree/shared/address', :locals => { :address => order.ship_address } %>
+      </div>
+    <% end %>
 
     <div class="columns alpha four" data-hook="order-bill-address">
       <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
@@ -82,9 +85,9 @@
       <td class="total"><span id="order_total"><%= @order.display_total.to_html %></span></td>
     </tr>
   </tfoot>
-  <% if order.price_adjustment_totals.present? %>
+  <% if order.line_item_adjustment_totals.present? %>
     <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.price_adjustment_totals.each do |key, total| %>
+      <% @order.line_item_adjustment_totals.each do |key, total| %>
         <tr class="total">
           <td colspan="4"><strong><%= key %></strong></td>
           <td class="total"><span><%= total %></span></td>

data/config/initializers/spree.rb

@@ -2,5 +2,3 @@ require 'mail'
 
 # Spree Configuration
 SESSION_KEY = '_spree_session_id'
-
-LIKE = ActiveRecord::Base.connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -547,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.0.0
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.