spree_frontend 2.3.13 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc0cbc2c03abb3090e920d9064ecd09781ec820
-  data.tar.gz: 46379b04a392d4baf4663aa8819ee20754d4ed9a
+  metadata.gz: 53f0a52d23729286b63ed9aa23ee0408deca5e4b
+  data.tar.gz: 400969b439b7cc6c0d2cd4f3feb88e614d718210
 SHA512:
-  metadata.gz: 395fac58eaefa84570857ab8a7236ecd3f0f0d26b204d68cc82778cdbb6d630649d66fa1d76e1244dd9e358eeb5a7abd10561b2100f87fa47e0a4b286adb5fff
-  data.tar.gz: de97c07d6b299accc7826a8e7be20e8287483f6e43fc1b12c3b48165ae88d755ef209a3833ca048fbab1167cc950c4bb76454cda13add5ede7a3cc0885f1354d
+  metadata.gz: 791f30fc1fc4ee2a7705f72b7b6ba7335e4ea818f52cad459eb9ad9108319fa10c3952940b3322d94a9d0e98ba49c0e4bd6a4ae5e58d79e10305c2f122c9d5b1
+  data.tar.gz: 84409a111108028c3d9f0a95ace54ffc323ce3f6616302efceeef192789d37a78c30493f49761e13ee881c2e24db8f15fea8ab310f1b1e0889b0f282bbd2772d

data/app/assets/javascripts/spree/frontend/checkout/address.js.coffee

@@ -25,7 +25,7 @@ Spree.ready ($) ->
         statePara = ($ '#' + region + 'state')
         stateSelect = statePara.find('select')
         stateInput = statePara.find('input')
-        stateSpanRequired = statePara.find('state-required')
+        stateSpanRequired = statePara.find('[id$="state-required"]')
         if states.length > 0
           selected = parseInt stateSelect.val()
           stateSelect.html ''

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

@@ -6,9 +6,8 @@ $ ->
     thumbnails.find('a').on 'click', (event) ->
       ($ '#main-image').data 'selectedThumb', ($ event.currentTarget).attr('href')
       ($ '#main-image').data 'selectedThumbId', ($ event.currentTarget).parent().attr('id')
-      ($ this).mouseout ->
-        thumbnails.find('li').removeClass 'selected'
-        ($ event.currentTarget).parent('li').addClass 'selected'
+      thumbnails.find('li').removeClass 'selected'
+      ($ event.currentTarget).parent('li').addClass 'selected'
       false
 
     thumbnails.find('li').on 'mouseenter', (event) ->

data/app/controllers/spree/checkout_controller.rb

@@ -7,19 +7,17 @@ module Spree
     ssl_required
 
     before_action :load_order_with_lock
-    before_action :ensure_valid_state_lock_version, only: [:update]
-    before_action :set_state_if_present
 
-    before_filter :ensure_order_not_completed
-    before_filter :ensure_checkout_allowed
-    before_filter :ensure_sufficient_stock_lines
-    before_filter :ensure_valid_state
+    before_action :ensure_order_not_completed
+    before_action :ensure_checkout_allowed
+    before_action :ensure_sufficient_stock_lines
+    before_action :ensure_valid_state
 
-    before_filter :associate_user
-    before_filter :check_authorization
-    before_filter :apply_coupon_code
+    before_action :associate_user
+    before_action :check_authorization
+    before_action :apply_coupon_code
 
-    before_filter :setup_for_current_state
+    before_action :setup_for_current_state
 
     helper 'spree/orders'
 
@@ -74,21 +72,7 @@ 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/controllers/spree/content_controller.rb

@@ -2,7 +2,7 @@ module Spree
   class ContentController < Spree::StoreController
     # Don't serve local files or static assets
     before_filter { render_404 if params[:path] =~ /(\.|\\)/ }
-    after_filter :fire_visited_path, :only => :show
+    after_action :fire_visited_path, only: :show
 
     rescue_from ActionView::MissingTemplate, :with => :render_404
 

data/app/controllers/spree/orders_controller.rb

@@ -2,7 +2,7 @@ module Spree
   class OrdersController < Spree::StoreController
     ssl_required :show
 
-    before_filter :check_authorization
+    before_action :check_authorization
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/products', 'spree/orders'
 
@@ -10,7 +10,7 @@ module Spree
 
     before_action :assign_order_with_lock, only: :update
     before_action :apply_coupon_code, only: :update
-    skip_before_action :verify_authenticity_token, only: [:populate]
+    skip_before_action :verify_authenticity_token
 
     def show
       @order = Order.find_by_number!(params[:id])
@@ -35,15 +35,14 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.incomplete.find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+      @order = current_order || Order.new
       associate_user
     end
 
     # Adds a new item to the order (creating a new order if none already exists)
     def populate
       populator = Spree::OrderPopulator.new(current_order(create_order_if_necessary: true), current_currency)
-
-      if populator.populate(params[:variant_id], params[:quantity])
+      if populator.populate(params[:variant_id], params[:quantity], params[:options])
         respond_with(@order) do |format|
           format.html { redirect_to cart_path }
         end

data/app/controllers/spree/products_controller.rb

@@ -1,7 +1,7 @@
 module Spree
   class ProductsController < Spree::StoreController
-    before_filter :load_product, :only => :show
-    before_filter :load_taxon, :only => :index
+    before_action :load_product, only: :show
+    before_action :load_taxon, only: :index
 
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
@@ -22,7 +22,7 @@ module Spree
 
     private
       def accurate_title
-        @product ? @product.name : super
+        @product ? @product.meta_title || @product.name : super
       end
 
       def load_product

data/app/controllers/spree/store_controller.rb

@@ -2,8 +2,6 @@ module Spree
   class StoreController < Spree::BaseController
     include Spree::Core::ControllerHelpers::Order
 
-    skip_before_action :set_current_order, only: :cart_link
-
     def unauthorized
       render 'spree/shared/unauthorized', :layout => Spree::Config[:layout], :status => 401
     end

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

@@ -5,14 +5,10 @@
     <% if @payment_sources.present? %>
       <div class="card_options">
         <%= radio_button_tag 'use_existing_card', 'yes', true %>
-        <label for="use_existing_card_yes">
-          <%= Spree.t(:use_existing_cc) %>
-        </label>
+        <label for="use_existing_card_yes">Use an existing card on file</label>
         <br/>
         <%= radio_button_tag 'use_existing_card', 'no' %>
-        <label for="use_existing_card_no">
-          <%= Spree.t(:use_new_cc_or_payment_method) %>
-        </label>
+        <label for="use_existing_card_no">Use a new card / payment method</label>
       </div>
 
       <div id="existing_cards">
@@ -26,7 +22,7 @@
                   <td><%= card.month %></td>
                   <td><%= card.year %></td>
                   <td>
-                    <%= radio_button_tag "existing_card", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
+                    <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
                   </td>
                 </tr>
               <% end %>

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

@@ -7,9 +7,9 @@
       <td><strong><%= order.display_item_total.to_html %></strong></td>
     </tr>
 
-    <% if order.line_item_adjustments.exists? %>
+    <% if order.line_item_adjustments.nonzero.exists? %>
       <tbody data-hook="order_details_promotion_adjustments">
-        <% order.line_item_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+        <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
           <tr class="total">
             <td><%= label %></td>
             <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
@@ -19,7 +19,7 @@
     <% end %>
 
     <tbody data-hook="order_details_tax_adjustments">
-      <% order.all_adjustments.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+      <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
         <tr class="total">
           <td><%= label %></td>
           <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
@@ -27,15 +27,15 @@
       <% end %>
     </tbody>
 
-    <% if order.checkout_steps.include?("delivery") && order.shipments.any? %>
+    <% if order.passed_checkout_step?("delivery") && order.shipments.any? %>
       <tr data-hook="shipping_total">
         <td><%= Spree.t(:shipping_total) %>:</td>
         <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
       </tr>
 
-      <% if order.shipment_adjustments.exists? %>
+      <% if order.shipment_adjustments.nonzero.exists? %>
         <tbody data-hook="order_details_shipment_promotion_adjustments">
-          <% order.shipment_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
             <tr class="total">
               <td><%= label %>:</td>
               <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
@@ -45,9 +45,9 @@
       <% end %>
     <% end %>
 
-    <% if order.adjustments.eligible.exists? %>
+    <% if order.adjustments.nonzero.eligible.exists? %>
       <tbody id="summary-order-charges" data-hook>
-        <% order.adjustments.eligible.each do |adjustment| %>
+        <% order.adjustments.nonzero.eligible.each do |adjustment| %>
         <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
           <tr class="total">
             <td><%= adjustment.label %>:</td>

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

@@ -1,24 +1,23 @@
-<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| %>
-        <% unless @order.email? %>
+        <% if @order.state == 'address' || !@order.email? %>
           <p class="field" style='clear: both'>
             <%= form.label :email %><br />
             <%= 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 } %>
@@ -33,5 +32,5 @@ Spree.current_order_token = "<%= @order.guest_token %>"
 </script>
 
 <% if I18n.locale != :en %>
-  <%= javascript_include_tag 'jquery.validate/localization/messages_' + I18n.locale.to_s.downcase.gsub('-', '') %>
+  <script src="<%= assets_prefix %>/jquery.validate/localization/messages_<%= I18n.locale.to_s.downcase.gsub("-", "") %>.js"></script>
 <% end %>

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

@@ -1,6 +1,8 @@
-<tr class="adjustment">
-  <td colspan="4" align='right'><h5><%= type %>: <%= label %></h5></td>
-  <td colspan='2'>
-    <h5><%= Spree::Money.new(adjustments.sum(&:amount), :currency => @order.currency) %></h5>
-  </td>
-</tr>
+<% if adjustments.sum(&:amount) != 0 %>
+  <tr class="adjustment">
+    <td colspan="4" align='right'><h5><%= type %>: <%= label %></h5></td>
+    <td colspan='2'>
+      <h5><%= Spree::Money.new(adjustments.sum(&:amount), :currency => @order.currency) %></h5>
+    </td>
+  </tr>
+<% end %>

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

@@ -10,9 +10,9 @@
     </tr>
   </thead>
   <tbody id="line_items" data-hook>
-    <%= render partial: 'line_item', collection: order_form.object.line_items, locals: {order_form: order_form} %>
+    <%= render partial: 'spree/orders/line_item', collection: order_form.object.line_items, locals: {order_form: order_form} %>
   </tbody>
-  <% if @order.adjustments.exists? || @order.line_item_adjustments.exists? || @order.shipment_adjustments.exists? %>
+  <% if @order.adjustments.nonzero.exists? || @order.line_item_adjustments.nonzero.exists? || @order.shipment_adjustments.nonzero.exists? || @order.shipments.any? %>
     <tr class="cart-subtotal">
       <td colspan="4" align='right'><h5><%= Spree.t(:cart_subtotal, :count => @order.line_items.sum(:quantity)) %></h5></th>
       <td colspan><h5><%= order_form.object.display_item_total %></h5></td>

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

@@ -5,11 +5,7 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    <% if user_analytics_id = try_spree_current_user.try(:analytics_id) %>
-      ga('create', { 'trackingId': '<%= tracker.analytics_id %>', 'cookieDomain': 'auto', 'userId': '<%= user_analytics_id %>' });
-    <% else %>
-      ga('create', '<%= tracker.analytics_id %>', 'auto');
-    <% end %>
+    ga('create', '<%= tracker.analytics_id %>','<%= current_store.url.sub(/(^www.)?/,'') %>');
     ga('require', 'displayfeatures');
     ga('send', 'pageview');
 
@@ -28,7 +24,7 @@
         ga('ecommerce:addItem', {
           'id': '<%= j @order.number %>',                        // Transaction ID. Required.
           'name': '<%= j line_item.variant.product.name %>',    // Product name. Required.
-          'sku': '<%= j (line_item.variant.sku || line_item.variant_id) %>', // SKU/code.
+          'sku': '<%= j line_item.variant.sku %>',             // SKU/code.
           'category': '',                                     // Category or variation.
           'price': '<%= line_item.price %>',                 // Unit price.
           'quantity': '<%= line_item.quantity %>'           // Quantity.

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

@@ -24,14 +24,16 @@
 <% if products.any? %>
 <ul id="products" class="inline product-listing" data-hook>
   <% products.each do |product| %>
-    <% url = product_url(product, :taxon_id => @taxon.try(:id)) %>
+    <% url = product_path(product, :taxon_id => @taxon.try(:id)) %>
     <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
       <% cache(@taxon.present? ? [I18n.locale, current_currency, @taxon, product] : [I18n.locale, current_currency, product]) do %>
         <div class="product-image">
           <%= link_to small_image(product, :itemprop => "image"), url, :itemprop => 'url' %>
         </div>
         <%= link_to truncate(product.name, :length => 50), url, :class => 'info', :itemprop => "name", :title => product.name %>
-        <span class="price selling" itemprop="price"><%= display_price(product) %></span>
+        <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+          <span class="price selling" itemprop="price"><%= display_price(product) %>
+        </span>
       <% end %>
     </li>
   <% end %>

data/lib/spree/frontend/engine.rb

@@ -7,7 +7,6 @@ module Spree
       initializer "spree.assets.precompile", :group => :all do |app|
         app.config.assets.precompile += %w[
           spree/frontend/all*
-          jquery.validate/localization/messages_*
         ]
       end
 

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

@@ -0,0 +1,23 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: CN
+ */
+jQuery.extend(jQuery.validator.messages, {
+  required: "必选字段",
+  remote: "请修正该字段",
+  email: "请输入正确格式的电子邮件",
+  url: "请输入合法的网址",
+  date: "请输入合法的日期",
+  dateISO: "请输入合法的日期 (ISO).",
+  number: "请输入合法的数字",
+  digits: "只能输入整数",
+  creditcard: "请输入合法的信用卡号",
+  equalTo: "请再次输入相同的值",
+  accept: "请输入拥有合法后缀名的字符串",
+  maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"),
+  minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"),
+  rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"),
+  range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"),
+  max: jQuery.validator.format("请输入一个最大为 {0} 的值"),
+  min: jQuery.validator.format("请输入一个最小为 {0} 的值")
+});

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

@@ -1,24 +1,30 @@
-/*
+/**
  * Translated default messages for the jQuery validation plugin.
- * Locale: PT (Portuguese; português)
- * Region: BR (Brazil)
+ * Language: PT_BR
+ * Translator: Francisco Ernesto Teixeira <fco_ernesto@yahoo.com.br>
  */
-(function ($) {$.extend($.validator.messages, {
+jQuery.extend(jQuery.validator.messages, {
   required: "Este campo &eacute; requerido.",
   remote: "Por favor, corrija este campo.",
   email: "Por favor, forne&ccedil;a um endere&ccedil;o eletr&ocirc;nico v&aacute;lido.",
   url: "Por favor, forne&ccedil;a uma URL v&aacute;lida.",
   date: "Por favor, forne&ccedil;a uma data v&aacute;lida.",
   dateISO: "Por favor, forne&ccedil;a uma data v&aacute;lida (ISO).",
-  number: "Por favor, forne&ccedil;a um n&uacute;mero v&aacute;lido.",
+  dateDE: "Bitte geben Sie ein gültiges Datum ein.",
+  number: "Por favor, forne&ccedil;a um n&uacute;mero v&aacute;lida.",
+  numberDE: "Bitte geben Sie eine Nummer ein.",
   digits: "Por favor, forne&ccedil;a somente d&iacute;gitos.",
   creditcard: "Por favor, forne&ccedil;a um cart&atilde;o de cr&eacute;dito v&aacute;lido.",
   equalTo: "Por favor, forne&ccedil;a o mesmo valor novamente.",
   accept: "Por favor, forne&ccedil;a um valor com uma extens&atilde;o v&aacute;lida.",
-  maxlength: $.validator.format("Por favor, forne&ccedil;a n&atilde;o mais que {0} caracteres."),
-  minlength: $.validator.format("Por favor, forne&ccedil;a ao menos {0} caracteres."),
-  rangelength: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1} caracteres de comprimento."),
-  range: $.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1}."),
-  max: $.validator.format("Por favor, forne&ccedil;a um valor menor ou igual a {0}."),
-  min: $.validator.format("Por favor, forne&ccedil;a um valor maior ou igual a {0}.")
-});}(jQuery));
+  maxlength: jQuery.validator.format("Por favor, forne&ccedil;a n&atilde;o mais que {0} caracteres."),
+  minlength: jQuery.validator.format("Por favor, forne&ccedil;a ao menos {0} caracteres."),
+  rangelength: jQuery.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1} caracteres de comprimento."),
+  range: jQuery.validator.format("Por favor, forne&ccedil;a um valor entre {0} e {1}."),
+  max: jQuery.validator.format("Por favor, forne&ccedil;a um valor menor ou igual a {0}."),
+  min: jQuery.validator.format("Por favor, forne&ccedil;a um valor maior ou igual a {0}.")
+});
+
+jQuery.validator.addMethod("datePTBR", function(value) { 
+  return this.optional(element) || /^\d\d?\/\d\d?\/\d\d\d?\d?$/.test(value); 
+}, "Por favor, forne&ccedil;a uma data v&aacute;lida.");

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

@@ -1,9 +1,8 @@
-/*
+/**
  * Translated default messages for the jQuery validation plugin.
- * Locale: PT (Portuguese; português)
- * Region: PT (Portugal)
+ * Locale: PT_PT
  */
-(function ($) {$.extend($.validator.messages, {
+jQuery.extend(jQuery.validator.messages, {
   required: "Campo de preenchimento obrigatório.",
   remote: "Por favor, corrija este campo.",
   email: "Por favor, introduza um endereço eletrónico válido.",
@@ -15,10 +14,10 @@
   creditcard: "Por favor, introduza um número de cartão de crédito válido.",
   equalTo: "Por favor, introduza de novo o mesmo valor.",
   accept: "Por favor, introduza um ficheiro com uma extensão válida.",
-  maxlength: $.validator.format("Por favor, não introduza mais do que {0} caracteres."),
-  minlength: $.validator.format("Por favor, introduza pelo menos {0} caracteres."),
-  rangelength: $.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
-  range: $.validator.format("Por favor, introduza um valor entre {0} e {1}."),
-  max: $.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
-  min: $.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
-});}(jQuery));
+  maxlength: jQuery.validator.format("Por favor, não introduza mais do que {0} caracteres."),
+  minlength: jQuery.validator.format("Por favor, introduza pelo menos {0} caracteres."),
+  rangelength: jQuery.validator.format("Por favor, introduza entre {0} e {1} caracteres."),
+  range: jQuery.validator.format("Por favor, introduza um valor entre {0} e {1}."),
+  max: jQuery.validator.format("Por favor, introduza um valor menor ou igual a {0}."),
+  min: jQuery.validator.format("Por favor, introduza um valor maior ou igual a {0}.")
+});

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

@@ -0,0 +1,24 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Language: UA (Ukrainian)
+ * Author: maserg <maserg at gmail dot com>
+ */
+jQuery.extend(jQuery.validator.messages, {
+  required: "Це поле необхідно заповнити.",
+  remote: "Будь ласка, введіть правильне значення.",
+  email: "Будь ласка, введіть коректну адресу електронної пошти.",
+  url: "Будь ласка, введіть коректний URL.",
+  date: "Будь ласка, введіть коректну дату.",
+  dateISO: "Будь ласка, введіть коректну дату у форматі ISO.",
+  number: "Будь ласка, введіть число.",
+  digits: "Вводите потрібно лише цифри.",
+  creditcard: "Будь ласка, введіть правильний номер кредитної карти.",
+  equalTo: "Будь ласка, введіть таке ж значення ще раз.",
+  accept: "Будь ласка, виберіть файл з правильним розширенням.",
+  maxlength: jQuery.validator.format("Будь ласка, введіть не більше {0} символів."),
+  minlength: jQuery.validator.format("Будь ласка, введіть не менше {0} символів."),
+  rangelength: jQuery.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."),
+  range: jQuery.validator.format("Будь ласка, введіть число від {0} до {1}."),
+  max: jQuery.validator.format("Будь ласка, введіть число, менше або рівно {0}."),
+  min: jQuery.validator.format("Будь ласка, введіть число, більше або рівно {0}.")
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2014-10-09 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.3.13
+        version: 2.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: email_spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: capybara-accessible
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +197,6 @@ files:
 - app/views/spree/store/cart_link.html.erb
 - app/views/spree/taxons/_taxon.html.erb
 - app/views/spree/taxons/show.html.erb
-- config/initializers/assets.rb
 - config/initializers/canonical_rails.rb
 - config/initializers/check_for_orphaned_preferences.rb
 - config/initializers/deprecation_checker.rb
@@ -481,28 +466,24 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_ar.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_bg.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ca.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_cn.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_cs.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_da.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_de.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_el.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_es.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_et.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_eu.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_fa.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_fi.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_fr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ge.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_he.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_hr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_hu.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_it.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ja.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ka.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_kk.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ko.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lt.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_lv.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_ms.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_no.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_pl.js
@@ -513,16 +494,12 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_se.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_si.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_sk.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sl.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_sr.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_sv.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_th.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_tr.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_tw.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_uk.js
+- vendor/assets/javascripts/jquery.validate/localization/messages_ua.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_vi.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
-- vendor/assets/javascripts/jquery.validate/localization/messages_zhtw.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_de.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
@@ -541,13 +518,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.

data/config/initializers/assets.rb

@@ -1 +0,0 @@
-Rails.application.config.assets.precompile += %w( favicon.ico spree/frontend/cart.png )

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

@@ -1,23 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: ET (Estonian; eesti, eesti keel)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "See väli peab olema täidetud.",
-		maxlength: $.validator.format("Palun sisestage vähem kui {0} tähemärki."),
-		minlength: $.validator.format("Palun sisestage vähemalt {0} tähemärki."),
-		rangelength: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1} tähemärki."),
-		email: "Palun sisestage korrektne e-maili aadress.",
-		url: "Palun sisestage korrektne URL.",
-		date: "Palun sisestage korrektne kuupäev.",
-		dateISO: "Palun sisestage korrektne kuupäev (YYYY-MM-DD).",
-		number: "Palun sisestage korrektne number.",
-		digits: "Palun sisestage ainult numbreid.",
-		equalTo: "Palun sisestage sama väärtus uuesti.",
-		range: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1}."),
-		max: $.validator.format("Palun sisestage väärtus, mis on väiksem või võrdne arvuga {0}."),
-		min: $.validator.format("Palun sisestage väärtus, mis on suurem või võrdne arvuga {0}."),
-		creditcard: "Palun sisestage korrektne krediitkaardi number."
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: EU (Basque; euskara, euskera)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Eremu hau beharrezkoa da.",
-		remote: "Mesedez, bete eremu hau.",
-		email: "Mesedez, idatzi baliozko posta helbide bat.",
-		url: "Mesedez, idatzi baliozko URL bat.",
-		date: "Mesedez, idatzi baliozko data bat.",
-		dateISO: "Mesedez, idatzi baliozko (ISO) data bat.",
-		number: "Mesedez, idatzi baliozko zenbaki oso bat.",
-		digits: "Mesedez, idatzi digituak soilik.",
-		creditcard: "Mesedez, idatzi baliozko txartel zenbaki bat.",
-		equalTo: "Mesedez, idatzi berdina berriro ere.",
-		accept: "Mesedez, idatzi onartutako luzapena duen balio bat.",
-		maxlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gehiago."),
-		minlength: $.validator.format("Mesedez, ez idatzi {0} karaktere baino gutxiago."),
-		rangelength: $.validator.format("Mesedez, idatzi {0} eta {1} karaktere arteko balio bat."),
-		range: $.validator.format("Mesedez, idatzi {0} eta {1} arteko balio bat."),
-		max: $.validator.format("Mesedez, idatzi {0} edo txikiagoa den balio bat."),
-		min: $.validator.format("Mesedez, idatzi {0} edo handiagoa den balio bat.")
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: HR (Croatia; hrvatski jezik)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Ovo polje je obavezno.",
-		remote: "Ovo polje treba popraviti.",
-		email: "Unesite ispravnu e-mail adresu.",
-		url: "Unesite ispravan URL.",
-		date: "Unesite ispravan datum.",
-		dateISO: "Unesite ispravan datum (ISO).",
-		number: "Unesite ispravan broj.",
-		digits: "Unesite samo brojeve.",
-		creditcard: "Unesite ispravan broj kreditne kartice.",
-		equalTo: "Unesite ponovo istu vrijednost.",
-		accept: "Unesite vrijednost sa ispravnom ekstenzijom.",
-		maxlength: $.validator.format("Maksimalni broj znakova je {0} ."),
-		minlength: $.validator.format("Minimalni broj znakova je {0} ."),
-		rangelength: $.validator.format("Unesite vrijednost između {0} i {1} znakova."),
-		range: $.validator.format("Unesite vrijednost između {0} i {1}."),
-		max: $.validator.format("Unesite vrijednost manju ili jednaku {0}."),
-		min: $.validator.format("Unesite vrijednost veću ili jednaku {0}.")
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: KA (Georgian; ქართული)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "ამ ველის შევსება აუცილებელია.",
-		remote: "გთხოვთ მიუთითოთ სწორი მნიშვნელობა.",
-		email: "გთხოვთ მიუთითოთ ელ-ფოსტის კორექტული მისამართი.",
-		url: "გთხოვთ მიუთითოთ კორექტული URL.",
-		date: "გთხოვთ მიუთითოთ კორექტული თარიღი.",
-		dateISO: "გთხოვთ მიუთითოთ კორექტული თარიღი ISO ფორმატში.",
-		number: "გთხოვთ მიუთითოთ ციფრი.",
-		digits: "გთხოვთ მიუთითოთ მხოლოდ ციფრები.",
-		creditcard: "გთხოვთ მიუთითოთ საკრედიტო ბარათის კორექტული ნომერი.",
-		equalTo: "გთხოვთ მიუთითოთ ასეთივე მნიშვნელობა კიდევ ერთხელ.",
-		accept: "გთხოვთ აირჩიოთ ფაილი კორექტული გაფართოებით.",
-		maxlength: $.validator.format("დასაშვებია არაუმეტეს {0} სიმბოლო."),
-		minlength: $.validator.format("აუცილებელია შეიყვანოთ მინიმუმ {0} სიმბოლო."),
-		rangelength: $.validator.format("ტექსტში სიმბოლოების რაოდენობა უნდა იყოს {0}-დან {1}-მდე."),
-		range: $.validator.format("გთხოვთ შეიყვანოთ ციფრი {0}-დან {1}-მდე."),
-		max: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც ნაკლებია ან უდრის {0}-ს."),
-		min: $.validator.format("გთხოვთ შეიყვანოთ ციფრი რომელიც მეტია ან უდრის {0}-ს.")
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: MS (Malay; Melayu)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Medan ini diperlukan.",
-		remote: "Sila betulkan medan ini.",
-		email: "Sila masukkan alamat emel yang betul.",
-		url: "Sila masukkan URL yang betul.",
-		date: "Sila masukkan tarikh yang betul.",
-		dateISO: "Sila masukkan tarikh(ISO) yang betul.",
-		number: "Sila masukkan nombor yang betul.",
-		digits: "Sila masukkan nilai digit sahaja.",
-		creditcard: "Sila masukkan nombor kredit kad yang betul.",
-		equalTo: "Sila masukkan nilai yang sama semula.",
-		accept: "Sila masukkan nilai yang telah diterima.",
-		maxlength: $.validator.format("Sila masukkan nilai tidak lebih dari {0} aksara."),
-		minlength: $.validator.format("Sila masukkan nilai sekurang-kurangnya {0} aksara."),
-		rangelength: $.validator.format("Sila masukkan panjang nilai antara {0} dan {1} aksara."),
-		range: $.validator.format("Sila masukkan nilai antara {0} dan {1} aksara."),
-		max: $.validator.format("Sila masukkan nilai yang kurang atau sama dengan {0}."),
-		min: $.validator.format("Sila masukkan nilai yang lebih atau sama dengan {0}.")
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Language: SL (Slovenian; slovenski jezik)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "To polje je obvezno.",
-		remote: "Prosimo popravite to polje.",
-		email: "Prosimo vnesite veljaven email naslov.",
-		url: "Prosimo vnesite veljaven URL naslov.",
-		date: "Prosimo vnesite veljaven datum.",
-		dateISO: "Prosimo vnesite veljaven ISO datum.",
-		number: "Prosimo vnesite veljavno število.",
-		digits: "Prosimo vnesite samo števila.",
-		creditcard: "Prosimo vnesite veljavno številko kreditne kartice.",
-		equalTo: "Prosimo ponovno vnesite vrednost.",
-		accept: "Prosimo vnesite vrednost z veljavno končnico.",
-		maxlength: $.validator.format("Prosimo vnesite največ {0} znakov."),
-		minlength: $.validator.format("Prosimo vnesite najmanj {0} znakov."),
-		rangelength: $.validator.format("Prosimo vnesite najmanj {0} in največ {1} znakov."),
-		range: $.validator.format("Prosimo vnesite vrednost med {0} in {1}."),
-		max: $.validator.format("Prosimo vnesite vrednost manjše ali enako {0}."),
-		min: $.validator.format("Prosimo vnesite vrednost večje ali enako {0}.")
-	});
-}(jQuery));

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

@@ -1,23 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: SV (Swedish; Svenska)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Detta fält är obligatoriskt.",
-		maxlength: $.validator.format("Du får ange högst {0} tecken."),
-		minlength: $.validator.format("Du måste ange minst {0} tecken."),
-		rangelength: $.validator.format("Ange minst {0} och max {1} tecken."),
-		email: "Ange en korrekt e-postadress.",
-		url: "Ange en korrekt URL.",
-		date: "Ange ett korrekt datum.",
-		dateISO: "Ange ett korrekt datum (ÅÅÅÅ-MM-DD).",
-		number: "Ange ett korrekt nummer.",
-		digits: "Ange endast siffror.",
-		equalTo: "Ange samma värde igen.",
-		range: $.validator.format("Ange ett värde mellan {0} och {1}."),
-		max: $.validator.format("Ange ett värde som är mindre eller lika med {0}."),
-		min: $.validator.format("Ange ett värde som är större eller lika med {0}."),
-		creditcard: "Ange ett korrekt kreditkortsnummer."
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: UK (Ukrainian; українська мова)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "Це поле необхідно заповнити.",
-		remote: "Будь ласка, введіть правильне значення.",
-		email: "Будь ласка, введіть коректну адресу електронної пошти.",
-		url: "Будь ласка, введіть коректний URL.",
-		date: "Будь ласка, введіть коректну дату.",
-		dateISO: "Будь ласка, введіть коректну дату у форматі ISO.",
-		number: "Будь ласка, введіть число.",
-		digits: "Вводите потрібно лише цифри.",
-		creditcard: "Будь ласка, введіть правильний номер кредитної карти.",
-		equalTo: "Будь ласка, введіть таке ж значення ще раз.",
-		accept: "Будь ласка, виберіть файл з правильним розширенням.",
-		maxlength: $.validator.format("Будь ласка, введіть не більше {0} символів."),
-		minlength: $.validator.format("Будь ласка, введіть не менше {0} символів."),
-		rangelength: $.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."),
-		range: $.validator.format("Будь ласка, введіть число від {0} до {1}."),
-		max: $.validator.format("Будь ласка, введіть число, менше або рівно {0}."),
-		min: $.validator.format("Будь ласка, введіть число, більше або рівно {0}.")
-	});
-}(jQuery));

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

@@ -1,25 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: ZH (Chinese, 中文 (Zhōngwén), 汉语, 漢語)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "必选字段",
-		remote: "请修正该字段",
-		email: "请输入正确格式的电子邮件",
-		url: "请输入合法的网址",
-		date: "请输入合法的日期",
-		dateISO: "请输入合法的日期 (ISO).",
-		number: "请输入合法的数字",
-		digits: "只能输入整数",
-		creditcard: "请输入合法的信用卡号",
-		equalTo: "请再次输入相同的值",
-		accept: "请输入拥有合法后缀名的字符串",
-		maxlength: $.validator.format("请输入一个长度最多是 {0} 的字符串"),
-		minlength: $.validator.format("请输入一个长度最少是 {0} 的字符串"),
-		rangelength: $.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"),
-		range: $.validator.format("请输入一个介于 {0} 和 {1} 之间的值"),
-		max: $.validator.format("请输入一个最大为 {0} 的值"),
-		min: $.validator.format("请输入一个最小为 {0} 的值")
-	});
-}(jQuery));

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

@@ -1,26 +0,0 @@
-/*
- * Translated default messages for the jQuery validation plugin.
- * Locale: ZH (Chinese; 中文 (Zhōngwén), 汉语, 漢語)
- * Region: TW (Taiwan)
- */
-(function ($) {
-	$.extend($.validator.messages, {
-		required: "必填",
-		remote: "請修正此欄位",
-		email: "請輸入正確的電子信箱",
-		url: "請輸入合法的URL",
-		date: "請輸入合法的日期",
-		dateISO: "請輸入合法的日期 (ISO).",
-		number: "請輸入數字",
-		digits: "請輸入整數",
-		creditcard: "請輸入合法的信用卡號碼",
-		equalTo: "請重複輸入一次",
-		accept: "請輸入有效的後缀字串",
-		maxlength: $.validator.format("請輸入長度不大於{0} 的字串"),
-		minlength: $.validator.format("請輸入長度不小於 {0} 的字串"),
-		rangelength: $.validator.format("請輸入長度介於 {0} 和 {1} 之間的字串"),
-		range: $.validator.format("請輸入介於 {0} 和 {1} 之間的數值"),
-		max: $.validator.format("請輸入不大於 {0} 的數值"),
-		min: $.validator.format("請輸入不小於 {0} 的數值")
-	});
-}(jQuery));