spree_frontend 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9b6327402091bb3688d19da620ddcc191701d1
-  data.tar.gz: 86b3df2c63d2e053918b68e8467a596c37f886b2
+  metadata.gz: 28b43e53de5b7242b077f72115ae7c95c169a01b
+  data.tar.gz: 956b54568f09eb563564df2e77f1db0ef00b763d
 SHA512:
-  metadata.gz: 184f59436e49e56ec59460f7272e3525f750026981c3a2cb51eec21c28601c559d3d8301a8defb488b69e83e959366467f39e13ef5b638fa94add16f189a703d
-  data.tar.gz: 1d9c81925b2c1bb40df094e2536f4df849b89402bb473a43d8ff386c3f939a24fc40b8004a582830790f75465e84b8ec411e3351c47ae48c442abf44c8d82da1
+  metadata.gz: 5a39e7d2b31e5c664e70ea8d06839d851238ab9bfddb3f40ec9adcb7529f595e701b76e2a487223e591aaeda443feef72b4156acf9b05987b3c2ecd79db71cb2
+  data.tar.gz: 094be18bbca59c0ef858ea25af82722a26f61ca2699af172c4298b0f404eb9a05137822e1822d14d9dca0da5716316fa9eb78d914c4b055b4deec66bddf11a45

data/app/assets/javascripts/spree/frontend/product.js.coffee

@@ -1,4 +1,4 @@
-$ ->
+Spree.ready ($) ->
   Spree.addImageHandlers = ->
     thumbnails = ($ '#product-images ul.thumbnails')
     ($ '#main-image').data 'selectedThumb', ($ '#main-image img').attr('src')

data/app/controllers/spree/orders_controller.rb

@@ -41,7 +41,7 @@ module Spree
       order    = current_order(create_order_if_necessary: true)
       variant  = Spree::Variant.find(params[:variant_id])
       quantity = params[:quantity].to_i
-      options  = (params[:options] || {}).merge(currency: current_currency)
+      options  = params[:options] || {}
 
       # 2,147,483,647 is crazy. See issue #2695.
       if quantity.between?(1, 2_147_483_647)

data/app/helpers/spree/frontend_helper.rb

@@ -4,19 +4,19 @@ module Spree
       @body_class ||= content_for?(:sidebar) ? 'two-col' : 'one-col'
       @body_class
     end
-    
+
     def breadcrumbs(taxon, separator=" ")
       return "" if current_page?("/") || taxon.nil?
       separator = raw(separator)
-      crumbs = [content_tag(:li, content_tag(:span, link_to(Spree.t(:home), spree.root_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")]
+      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: "name"), spree.root_path, itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")]
       if taxon
-        crumbs << content_tag(:li, content_tag(:span, link_to(Spree.t(:products), spree.products_path, itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
-        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(ancestor.name , seo_url(ancestor), itemprop: "url") + separator, itemprop: "title"), itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb") } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, link_to(taxon.name , seo_url(taxon), itemprop: "url"), itemprop: "title"), class: 'active', itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:products), itemprop: "name"), spree.products_path, itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
+        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: "name"), seo_url(ancestor), itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement") } unless taxon.ancestors.empty?
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: "name") , seo_url(taxon), itemprop: "url"), itemprop: "item"), class: 'active', itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
       else
-        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: "title"), class: 'active', itemscope: "itemscope", itemtype: "http://data-vocabulary.org/Breadcrumb")
+        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: "item"), class: 'active', itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
       end
-      crumb_list = content_tag(:ol, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'breadcrumb')
+      crumb_list = content_tag(:ol, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'breadcrumb', itemscope: "itemscope", itemtype: "https://schema.org/BreadcrumbList")
       content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
     end
 
@@ -81,7 +81,7 @@ module Spree
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
-      return '' if max_level < 1 || root_taxon.children.empty?
+      return '' if max_level < 1 || root_taxon.leaf?
       content_tag :div, class: 'list-group' do
         root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'list-group-item active' : 'list-group-item'

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

@@ -18,12 +18,13 @@
 
           <div class="links col-md-6 navbar-form pull-right text-right" data-hook="cart_buttons">
             <div class="form-group">
-            <%= button_tag class: 'btn btn-primary', id: 'update-button' do %>
-              <%= Spree.t(:update) %>
-            <% end %>
-            <%= button_tag class: 'btn btn-lg btn-success', id: 'checkout-link', name: 'checkout' do %>
-              <%= Spree.t(:checkout) %>
-            <% end %>
+              <%= button_tag class: 'btn btn-primary', id: 'update-button' do %>
+                <%= Spree.t(:update) %>
+              <% end %>
+              <%= button_tag class: 'btn btn-lg btn-success', id: 'checkout-link', name: 'checkout' do %>
+                <%= Spree.t(:checkout) %>
+              <% end %>
+            </div>
           </div>
         </div>
       <% end %>

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

@@ -1,5 +1,5 @@
 <%= form_for :order, :url => populate_orders_path do |f| %>
-  <div class="row" id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+  <div class="row" id="inside-product-cart-form" data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="https://schema.org/Offer">
     <% if @product.variants_and_option_values(current_currency).any? %>
       <div id="product-variants" class="col-md-6">
         <h3 class="product-section-title"><%= Spree.t(:variants) %></h3>
@@ -38,7 +38,7 @@
           </div>
 
           <% if @product.master.can_supply? %>
-            <link itemprop="availability" href="http://schema.org/InStock" />
+            <link itemprop="availability" href="https://schema.org/InStock" />
           <% elsif @product.variants.empty? %>
             <br />
             <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>

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

@@ -1,7 +1,7 @@
 <% @body_id = 'product-details' %>
 
 <% cache [I18n.locale, current_currency, @product] do %>
-  <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
+  <div data-hook="product_show" itemscope itemtype="https://schema.org/Product">
     <div class="col-md-4" data-hook="product_left_part">
       <div data-hook="product_left_part_wrap">
         <div id="product-images" data-hook="product_images">

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

@@ -2,13 +2,13 @@
   <% if order.has_step?("address") %>
     <div class="col-md-3" data-hook="order-bill-address">
       <h4><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h4>
-      <%= render partial: 'spree/shared/address', locals: { address: order.bill_address } %>
+      <%= render 'spree/shared/address', address: order.bill_address %>
     </div>
 
     <% if order.has_step?("delivery") %>
       <div class="col-md-3" data-hook="order-ship-address">
         <h4><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless order.completed? %></h4>
-        <%= render partial: 'spree/shared/address', locals: { address: order.ship_address } %>
+        <%= render 'spree/shared/address', address: order.ship_address %>
       </div>
 
       <div class=" col-md-3" data-hook="order-shipment">
@@ -21,19 +21,21 @@
             </div>
           <% end %>
         </div>
-        <%= render(partial: 'spree/shared/shipment_tracking', locals: { order: order } ) if order.shipped? %>
+        <%= render 'spree/shared/shipment_tracking', order: order if order.shipped? %>
       </div>
     <% end %>
   <% end %>
-
-  <div class="col-md-3">
-    <h4><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless order.completed? %></h4>
-    <div class="payment-info">
-      <% order.payments.valid.each do |payment| %>
-        <%= render payment%><br/>
-      <% end %>
+  
+  <% if @order.has_step?("payment") %>
+    <div class="col-md-3">
+      <h4><%= Spree.t(:payment_information) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:payment) unless order.completed? %></h4>
+      <div class="payment-info">
+        <% order.payments.valid.each do |payment| %>
+          <%= render payment %><br/>
+        <% end %>
+      </div>
     </div>
-  </div>
+  <% end %>
 </div>
 
 <hr />

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

@@ -25,7 +25,7 @@
   <div id="products" class="row" data-hook>
     <% products.each do |product| %>
       <% url = spree.product_url(product, taxon_id: @taxon.try(:id)) %>
-      <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
+      <div id="product_<%= product.id %>" class="col-md-3 col-sm-6 product-list-item" data-hook="products_list_item" itemscope itemtype="https://schema.org/Product">
         <div class="panel panel-default">
           <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
             <div class="panel-body text-center product-body">
@@ -33,7 +33,7 @@
               <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
             </div>
             <div class="panel-footer text-center">
-              <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+              <span itemprop="offers" itemscope itemtype="https://schema.org/Offer">
                 <span class="price selling lead" itemprop="price"><%= display_price(product) %></span>
               </span>
             </div>

data/app/views/spree/taxons/show.html.erb

@@ -3,7 +3,7 @@
 <% content_for :sidebar do %>
   <div data-hook="taxon_sidebar_navigation">
     <%= render partial: 'spree/shared/taxonomies' %>
-    <%= render partial: 'spree/shared/filters' if @taxon.children.empty? %>
+    <%= render partial: 'spree/shared/filters' if @taxon.leaf? %>
   </div>
 <% end %>
 

data/spec/spec_helper.rb

@@ -97,7 +97,6 @@ RSpec.configure do |config|
   config.after(:each, :type => :feature) do |example|
     missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)
     if missing_translations.any?
-      #binding.pry
       puts "Found missing translations: #{missing_translations.inspect}"
       puts "In spec: #{example.location}"
     end

data/vendor/assets/javascripts/jquery.validate/localization/messages_ca.js

@@ -13,7 +13,7 @@
 		number: "Si us plau, escriu un número enter vàlid.",
 		digits: "Si us plau, escriu només dígits.",
 		creditcard: "Si us plau, escriu un número de tarjeta vàlid.",
-		equalTo: "Si us plau, escriu el maateix valor de nou.",
+		equalTo: "Si us plau, escriu el mateix valor de nou.",
 		accept: "Si us plau, escriu un valor amb una extensió acceptada.",
 		maxlength: $.validator.format("Si us plau, no escriguis més de {0} caracters."),
 		minlength: $.validator.format("Si us plau, no escriguis menys de {0} caracters."),
@@ -22,4 +22,4 @@
 		max: $.validator.format("Si us plau, escriu un valor menor o igual a {0}."),
 		min: $.validator.format("Si us plau, escriu un valor major o igual a {0}.")
 	});
-}(jQuery));
+}(jQuery));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -451,7 +451,6 @@ files:
 - app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_error_messages.html.erb
 - app/views/spree/shared/_filters.html.erb
-- app/views/spree/shared/_footer.html.erb
 - app/views/spree/shared/_google_add_items.js.erb
 - app/views/spree/shared/_google_analytics.js.erb
 - app/views/spree/shared/_google_checkout.js.erb

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

@@ -1,10 +0,0 @@
-<div id="spree-footer">
-	<div class="container">
-		<footer id="footer" class="row" data-hook>
-		  <div id="footer-left" class="col-md-6" data-hook>
-		    <p><%= Spree.t :powered_by  %>&nbsp;<%= link_to 'Spree', 'http://spreecommerce.com/' %></p>
-		  </div>
-		  <div id="footer-right" class="col-md-6" data-hook></div>
-		</footer>
-	</div>
-</div>