spree_frontend 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 324c220d9617fdc461f82e3cede3bac0b15752e2
-  data.tar.gz: bfb16a3f7d738f19c479c7cc5b8ff2e9736a467c
+  metadata.gz: 895597d448eeccc9c9933889d9a6f4beaae9ff44
+  data.tar.gz: 4a898e6a87968ed4cdf3a0cbcd323c08c7cabbcf
 SHA512:
-  metadata.gz: 830944c66cfb9b62eb549dd867672554c661249ec9f7397fdcf196e00fedde7a99ac5827f84834d762f79f163434ef2b72f054c3e8b2399628af713353e8e178
-  data.tar.gz: 6681b60cd36573cac6937b77fc0702c36a3b6dbee767993a65028d3b68b96c35e0c67f093323de73cb1ce59517a98998ec878a56d335a150a1725d8f368dbfd6
+  metadata.gz: 348f93aa386b4135d33bcd530578d587e97d4617d7afc21a4c75eecffa2ea5a011648ca4ec43819165b2c29b7732747e87ee878273654c81297a0aab49af949c
+  data.tar.gz: 15f9c9b63e059e88ea43ef5b4e7cdd459be53a7b6cc4d7d97229ddd3bdcb0e56c09e0f87d475365fb11a42710e5c37b0e23f3948b2d0aa91fda9ec547b12041a

data/app/controllers/spree/products_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   class ProductsController < Spree::StoreController
     before_filter :load_product, :only => :show
+    before_filter :load_taxon, :only => :index
+
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
 
@@ -33,5 +35,9 @@ module Spree
         end
         @product = @products.friendly.find(params[:id])
       end
+
+      def load_taxon
+        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+      end
   end
 end

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

@@ -59,12 +59,12 @@
   <% end %>
 
   <p class="field" id=<%="#{address_id}zipcode" %>>
-    <%= form.label :zipcode, Spree.t(:zip) %><span class="required">*</span><br />
-    <%= form.text_field :zipcode, :class => 'required' %>
+    <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><br /><% end %>
+    <%= form.text_field :zipcode, :class => "#{'required' if address.require_zipcode?}" %>
   </p>
   <p class="field" id=<%="#{address_id}phone" %>>
-    <%= form.label :phone, Spree.t(:phone) %><span class="required">*</span><br />
-    <%= form.phone_field :phone, :class => 'required' %>
+    <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><br /><% end %>
+    <%= form.phone_field :phone, :class => "#{'required' if address.require_phone?}" %>
   </p>
   <% if Spree::Config[:alternative_shipping_phone] %>
     <p class="field" id=<%="#{address_id}altphone" %>>

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

@@ -11,7 +11,7 @@
     <td class="cart-item-description" data-hook="cart_item_description">
       <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
       <%= variant.options_text %>
-      <% if @order.insufficient_stock_lines.include? line_item %>
+      <% if line_item.insufficient_stock? %>
         <span class="out-of-stock">
           <%= Spree.t(:out_of_stock) %>&nbsp;&nbsp;<br />
         </span>

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

@@ -10,36 +10,38 @@
     </div>
 
   <% else %>
+
     <div data-hook="outside_cart_form">
-    <%= form_for @order, :url => update_cart_path, :html => {:id => 'update-cart'} do |order_form| %>
-      <div data-hook="inside_cart_form">
+      <%= form_for @order, :url => update_cart_path, :html => {:id => 'update-cart'} do |order_form| %>
+        <div data-hook="inside_cart_form">
+
+          <div data-hook="cart_items">
+            <%= render :partial => 'form', :locals => { :order_form => order_form } %>
+          </div>
 
-      <div data-hook="cart_items">
-        <%= render :partial => 'form', :locals => { :order_form => order_form } %>
-      </div>
+          <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
+            <%= order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code) %>
+            <%= button_tag :class => 'primary', :id => 'update-button' do %>
+              <%= Spree.t(:update) %>
+            <% end %>
+            <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
+              <%= Spree.t(:checkout) %>
+            <% end %>
+          </div>
 
-      <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
-        <%= order_form.text_field :coupon_code, :size => 10, :placeholder => Spree.t(:coupon_code) %>
-        <%= button_tag :class => 'primary', :id => 'update-button' do %>
-          <%= Spree.t(:update) %>
+        </div>
       <% end %>
-        <%= button_tag :class => 'button checkout primary', :id => 'checkout-link', :name => 'checkout' do %>
-          <%= Spree.t(:checkout) %>
+    </div>
+
+    <div id="empty-cart" data-hook>
+      <%= form_tag empty_cart_path, :method => :put do %>
+        <p id="clear_cart_link" data-hook>
+        <%= submit_tag Spree.t(:empty_cart), :class => 'button gray' %>
+        <%= Spree.t(:or) %>
+        <%= link_to Spree.t(:continue_shopping), products_path, :class => 'continue button gray' %>
+        </p>
       <% end %>
-      </div>
     </div>
-  <% end %>
-  </div>
-
-  <div id="empty-cart" data-hook>
-    <%= form_tag empty_cart_path, :method => :put do %>
-      <p id="clear_cart_link" data-hook>
-    <%= submit_tag Spree.t(:empty_cart), :class => 'button gray' %>
-    <%= Spree.t(:or) %>
-    <%= link_to Spree.t(:continue_shopping), products_path, :class => 'continue button gray' %>
-    </p>
-  <% end %>
-  </div>
 
   <% end %>
 </div>

data/app/views/spree/products/_cart_form.html.erb

@@ -8,7 +8,7 @@
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
               <%= radio_button_tag "variant_id", variant.id, index == 0, 'data-price' => Spree::Money.new(variant.price, with_currency: true).to_s  %>
-              <%= label_tag "variant_id" do %>
+              <%= label_tag "variant_id_#{ variant.id }" do %>
                 <span class="variant-description">
                   <%= variant_options variant %>
                 </span>
@@ -42,7 +42,7 @@
 
           <% if @product.master.can_supply? %>
             <link itemprop="availability" href="http://schema.org/InStock" />
-          <% else %>
+          <% elsif @product.variants.empty? %>
             <br />
             <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
           <% end %> 

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

@@ -20,8 +20,8 @@
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
             <div>
-              <i class='icon-truck'></i>
-              <%= Spree.t(:shipment_details, :stock_location => shipment.stock_location.name, :shipping_method => shipment.shipping_method.name) %>
+              <i class='fa fa-truck'></i>
+              <%= Spree.t(:shipment_details, :stock_location => shipment.stock_location.name, :shipping_method => shipment.selected_shipping_rate.name) %>
             </div>
           <% end %>
         </div>
@@ -107,6 +107,15 @@
     <% end %>
   <% end %>
 
+  <tfoot id='shipment-total'>
+    <% order.shipments.group_by { |s| s.selected_shipping_rate.name }.each do |name, shipments| %>
+      <tr class="total" data-hook='shipment-row'>
+        <td colspan="4"><%= Spree.t(:shipping) %>: <strong><%= name %></strong></td>
+        <td class="total"><span><%= Spree::Money.new(shipments.sum(&:discounted_cost)).to_html %></span></td>
+      </tr>
+    <% end %>
+  </tfoot>
+
   <% if order.all_adjustments.tax.exists? %>
     <tfoot id="tax-adjustments" data-hook="order_details_tax_adjustments">
       <% order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
@@ -117,14 +126,6 @@
       <% end %>
     </tfoot>
   <% end %>
-  <tfoot id='shipment-total'>
-    <% order.shipments.group_by { |s| s.shipping_method.name }.each do |name, shipments| %>
-      <tr class="total" data-hook='shipment-row'>
-        <td colspan="4"><%= Spree.t(:shipping) %>: <strong><%= name %></strong></td>
-        <td class="total"><span><%= Spree::Money.new(shipments.sum(&:discounted_cost)).to_html %></span></td>
-      </tr>
-    <% end %>
-  </tfoot>
 
   <tfoot id="order-charges" data-hook="order_details_adjustments">
     <% @order.adjustments.eligible.each do |adjustment| %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 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.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.