spree_frontend 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a039b779e5f75ac81e16d595e114544a5d986c
-  data.tar.gz: cdacb062f594ba18396893401285135ba01fc5b7
+  metadata.gz: 8f2bda97082288faab57d08de2ab077233dd47c6
+  data.tar.gz: 923864456f4fb1cb0d7ccd8ed2bb7c78b478c5a7
 SHA512:
-  metadata.gz: 154a854bd5aad0edb7ffa53eecd2e6fa0b6d29aff58c678eb2469e474c47346b1243691b832d173dcd3ac55163aecee7e12b1f0f2e762d2a2ffe9d2daaf00073
-  data.tar.gz: da796d1b439a75b46c9a22dea36956300bfbe12c4df8d15b49913ff5371753ac4efca6b4bced5e7d7e52c6b8a982222933c7134fc800779ab99caa9bed6b41ab
+  metadata.gz: 39c227a8f797b5ec0e403fbede9cd317f5dad891def3ad480cca6dc49744cacb128c36cb8282c02aa4313163e042d0e7fafe45f24ef543648f65fb860e13cb18
+  data.tar.gz: a8cc031d6638a823550a7e573136643c8881542ac913c6fd61a6c160bf12e1064cc8d9e517ae9e580ecfc1f2c1337432a73d25c319feb40fdf57bcf1c87d62df

data/app/assets/javascripts/store/checkout.js.coffee

@@ -1,16 +1,25 @@
+//= require jquery.payment
+
 Spree.disableSaveOnClick = ->
   ($ 'form.edit_order').submit ->
     ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
 
 Spree.ready ($) ->
   Spree.Checkout = {}
+  $("#card_number").payment('formatCardNumber')
+  $("#card_expiry").payment('formatCardExpiry')
+  $("#card_code").payment('formatCardCVC')
+
+  $("#card_number").change ->
+    $("#cc_type").val($.payment.cardType(@value))
+
   if ($ '#checkout_form_address').is('*')
     ($ '#checkout_form_address').validate()
 
     getCountryId = (region) ->
-      $('#' + region + 'country select').val()
+      $('p#' + region + 'country select').val()
 
-    Spree.updateState = (region) ->
+    updateState = (region) ->
       countryId = getCountryId(region)
       if countryId?
         unless Spree.Checkout[countryId]?
@@ -18,15 +27,15 @@ Spree.ready ($) ->
             Spree.Checkout[countryId] =
               states: data.states
               states_required: data.states_required
-            Spree.fillStates(Spree.Checkout[countryId], region)
+            fillStates(Spree.Checkout[countryId], region)
         else
-          Spree.fillStates(Spree.Checkout[countryId], region)
+          fillStates(Spree.Checkout[countryId], region)
 
-    Spree.fillStates = (data, region) ->
+    fillStates = (data, region) ->
       statesRequired = data.states_required
       states = data.states
 
-      statePara = ($ '#' + region + 'state')
+      statePara = ($ 'p#' + region + 'state')
       stateSelect = statePara.find('select')
       stateInput = statePara.find('input')
       stateSpanRequired = statePara.find('state-required')
@@ -44,6 +53,7 @@ Spree.ready ($) ->
         statePara.show()
         stateSpanRequired.show()
         stateSelect.addClass('required') if statesRequired
+        stateSelect.removeClass('hidden')
         stateInput.removeClass('required')
       else
         stateSelect.hide().prop 'disabled', true
@@ -60,13 +70,13 @@ Spree.ready ($) ->
         stateInput.removeClass('hidden')
         stateSelect.removeClass('required')
 
-    ($ '#bcountry select').change ->
-      Spree.updateState 'b'
+    ($ 'p#bcountry select').change ->
+      updateState 'b'
 
-    ($ '#scountry select').change ->
-      Spree.updateState 's'
+    ($ 'p#scountry select').change ->
+      updateState 's'
 
-    Spree.updateState 'b'
+    updateState 'b'
 
     order_use_billing = ($ 'input#order_use_billing')
     order_use_billing.change ->
@@ -79,7 +89,7 @@ Spree.ready ($) ->
       else
         ($ '#shipping .inner').show()
         ($ '#shipping .inner input, #shipping .inner select').prop 'disabled', false
-        Spree.updateState('s')
+        updateState('s')
     
     update_shipping_form_state order_use_billing
 

data/app/assets/javascripts/store/product.js.coffee

@@ -22,10 +22,10 @@ $ ->
     ($ 'li.tmb-' + variantId).show()
     currentThumb = ($ '#' + ($ '#main-image').data('selectedThumbId'))
     if not currentThumb.hasClass('vtmb-' + variantId)
-      thumb = ($ ($ '#product-images ul.thumbnails li:visible.vtmb').eq(0))
-      thumb = ($ ($ '#product-images ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
+      thumb = ($ ($ 'ul.thumbnails li:visible.vtmb').eq(0))
+      thumb = ($ ($ 'ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
       newImg = thumb.find('a').attr('href')
-      ($ '#product-images ul.thumbnails li').removeClass 'selected'
+      ($ 'ul.thumbnails li').removeClass 'selected'
       thumb.addClass 'selected'
       ($ '#main-image img').attr 'src', newImg
       ($ '#main-image').data 'selectedThumb', newImg

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,4 +1,4 @@
-@import 'store/variables';
+@import 'variables';
 
 /*--------------------------------------*/
 /* Basic styles
@@ -113,16 +113,12 @@ input[type="password"], input[type="search"], input[type="tel"],
 input[type="text"], input[type="time"], input[type="url"],
 input[type="week"] {
   border: $default_border;
-  padding: 5px;
+  padding: 5px 10px;
   font-family: $ff_base;
   font-size: $input_box_font_size;
 
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-
   &:active, &:focus {
-    border-color: $link_text_color;
+    border-color: $link_text_color;;
     outline: none;
     -webkit-box-shadow: none;
     -moz-box-shadow: none;
@@ -150,11 +146,6 @@ span.required {
 
 fieldset {
   margin: 0;
-  min-width: 100%;
-
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
 }
 
 input[type="submit"], input[type="button"],
@@ -309,7 +300,7 @@ nav #main-nav-bar {
     &#link-to-cart {
       float: right;
       padding-left: 24px;
-      background: asset-url("store/cart.png", image) no-repeat left center;
+      background: url("cart.png") no-repeat left center;
 
       &:hover {
         border-color: $link_text_color;
@@ -736,14 +727,6 @@ ul#products {
   }
 }
 
-#billing {
-  input[type="text"], input[type="email"],
-  input[type="tel"], input[type="number"],
-  select, textarea {
-    width: 100%;
-  }
-}
-
 #order_details, #order_summary {
   padding: 0;
 

data/app/controllers/spree/checkout_controller.rb

@@ -6,7 +6,7 @@ module Spree
   class CheckoutController < Spree::StoreController
     ssl_required
 
-    before_filter :load_order_with_lock
+    before_filter :load_order
 
     before_filter :ensure_order_not_completed
     before_filter :ensure_checkout_allowed
@@ -26,8 +26,6 @@ module Spree
     # Updates the order and advances to the next state (when possible.)
     def update
       if @order.update_attributes(object_params)
-        fire_event('spree.checkout.update')
-
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
           redirect_to checkout_state_path(@order.state) and return
@@ -55,13 +53,6 @@ module Spree
             redirect_to checkout_state_path(@order.checkout_steps.first)
           end
         end
-
-        # Fix for #4117
-        # If confirmation of payment fails, redirect back to payment screen
-        if params[:state] == "confirm" && @order.payments.valid.empty?
-          flash.keep
-          redirect_to checkout_state_path("payment")
-        end
       end
 
       # Should be overriden if you have areas of your checkout that don't match
@@ -70,8 +61,8 @@ module Spree
         false
       end
 
-      def load_order_with_lock
-        @order = current_order(lock: true)
+      def load_order
+        @order = current_order
         redirect_to spree.cart_path and return unless @order
 
         if params[:state]
@@ -106,7 +97,7 @@ module Spree
       # attributes for a single payment and its source, discarding attributes
       # for payment methods other than the one selected
       def object_params
-        # has_checkout_step? check is necessary due to issue described in #2910
+        # respond_to check is necessary due to issue described in #2910
         if @order.has_checkout_step?("payment") && @order.payment?
           if params[:payment_source].present?
             source_params = params.delete(:payment_source)[params[:order][:payments_attributes].first[:payment_method_id].underscore]
@@ -120,7 +111,12 @@ module Spree
             params[:order][:payments_attributes].first[:amount] = @order.total
           end
         end
-        params[:order]
+
+        if params[:order]
+          params[:order].permit(permitted_checkout_attributes)
+        else
+          {}
+        end
       end
 
       def setup_for_current_state
@@ -155,9 +151,8 @@ module Spree
         end
       end
 
-      def rescue_from_spree_gateway_error(exception)
-        flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
-        @order.errors.add(:base, exception.message)
+      def rescue_from_spree_gateway_error
+        flash[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
         render :edit
       end
 
@@ -167,13 +162,13 @@ module Spree
 
       def apply_coupon_code
         if params[:order] && params[:order][:coupon_code]
-          @order.coupon_code = params[:order][:coupon_code] 
+          @order.coupon_code = params[:order][:coupon_code]
 
           coupon_result = Spree::Promo::CouponApplicator.new(@order).apply
           if coupon_result[:coupon_applied?]
             flash[:success] = coupon_result[:success] if coupon_result[:success].present?
           else
-            flash.now[:error] = coupon_result[:error]
+            flash[:error] = coupon_result[:error]
             respond_with(@order) { |format| format.html { render :edit } } and return
           end
         end

data/app/controllers/spree/content_controller.rb

@@ -6,7 +6,6 @@ module Spree
     after_filter :fire_visited_action, :except => :show
 
     rescue_from ActionView::MissingTemplate, :with => :render_404
-    caches_page :show, :index, :if => Proc.new { Spree::Config[:cache_static_content] }
 
     respond_to :html
 

data/app/controllers/spree/orders_controller.rb

@@ -13,13 +13,13 @@ module Spree
     end
 
     def update
-      @order = current_order(lock: true)
+      @order = current_order
       unless @order
         flash[:error] = Spree.t(:order_not_found)
         redirect_to root_path and return
       end
 
-      if @order.update_attributes(params[:order])
+      if @order.update_attributes(order_params)
         @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
         @order.ensure_updated_shipments
         return if after_update_attributes
@@ -29,7 +29,7 @@ module Spree
         respond_with(@order) do |format|
           format.html do
             if params.has_key?(:checkout)
-              @order.next if @order.cart?
+              @order.next_transition.run_callbacks if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
               redirect_to cart_path
@@ -43,13 +43,13 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order(create_order_if_necessary: true)
+      @order = current_order(true)
       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)
+      populator = Spree::OrderPopulator.new(current_order(true), current_currency)
       if populator.populate(params.slice(:products, :variants, :quantity))
         current_order.ensure_updated_shipments
 
@@ -89,16 +89,24 @@ module Spree
 
     private
 
-    def after_update_attributes
-      coupon_result = Spree::Promo::CouponApplicator.new(@order).apply
-      if coupon_result[:coupon_applied?]
-        flash[:success] = coupon_result[:success] if coupon_result[:success].present?
-        return false
-      else
-        flash.now[:error] = coupon_result[:error]
-        respond_with(@order) { |format| format.html { render :edit } }
-        return true
+      def order_params
+        if params[:order]
+          params[:order].permit(*permitted_order_attributes)
+        else
+          {}
+        end
+      end
+
+      def after_update_attributes
+        coupon_result = Spree::Promo::CouponApplicator.new(@order).apply
+        if coupon_result[:coupon_applied?]
+          flash[:success] = coupon_result[:success] if coupon_result[:success].present?
+          return false
+        else
+          flash[:error] = coupon_result[:error]
+          respond_with(@order) { |format| format.html { render :edit } }
+          return true
+        end
       end
-    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -1,8 +1,6 @@
 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'
 
@@ -28,7 +26,7 @@ module Spree
           # Do nothing
         else
           if referer_path && referer_path.match(/\/t\/(.*)/)
-            @taxon = Spree::Taxon.find_by_permalink($1)
+            @taxon = Taxon.find_by_permalink($1)
           end
         end
       end
@@ -46,9 +44,5 @@ module Spree
           @product = Product.active(current_currency).find_by_permalink!(params[:id])
         end
       end
-
-      def load_taxon
-        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
-      end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -7,10 +7,9 @@ module Spree
     end
 
     protected
-    
-    def config_locale
-      Spree::Frontend::Config[:locale]
-    end
+      def config_locale
+        Spree::Frontend::Config[:locale]
+      end
   end
 end
 

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

@@ -1,6 +1,6 @@
 <fieldset id="order_details" data-hook>
   <div class="clear"></div>
-  <legend align="center"><%= Spree.t(:confirm) %></legend>
+  <legend align="center"><%= Spree.t(@order.state, :scope => :order_state).titleize %></legend>
   <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
 </fieldset>
 

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

@@ -17,11 +17,11 @@
     </tbody>
     <tr data-hook="order_total">
       <td><strong><%= Spree.t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= order.display_total.to_html %></span></strong></td>
+      <td><strong><span id='summary-order-total'><%= @order.display_total.to_html %></span></strong></td>
     </tr>
     <% if order.line_item_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
-        <% order.line_item_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/checkout/edit.html.erb

@@ -26,7 +26,3 @@
   </div>
 
 </div>
-
-<% if I18n.locale != :en %>
-  <script src='/assets/jquery.validate/localization/messages_<%= I18n.locale %>.js'></script>
-<% end %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -14,13 +14,15 @@
 </p>
 <p class="field" data-hook="card_expiration">
   <%= label_tag "card_month", Spree.t(:expiration) %><span class="required">*</span><br />
-  <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required', :id => "card_month") %>
-  <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required', :id => "card_year") %>
+  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required", :placeholder => "MM / YY" %>
 </p>
 <p class="field" data-hook="card_code">
   <%= label_tag "card_code", Spree.t(:card_code) %><span class="required">*</span><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
   <%= link_to "(#{Spree.t(:what_is_this)})", spree.content_path('cvv'), :target => '_blank', "data-hook" => "cvv_link", :id => "cvv_link" %>
 </p>
+
+<%= hidden_field_tag "#{param_prefix}[cc_type]", '', :id => "cc_type" %>
+
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
 <%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

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

@@ -0,0 +1,20 @@
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<h1><%= Spree.t(:registration) %></h1>
+<div id="registration" data-hook>
+  <div id="account" class="columns alpha eight">
+    <!-- TODO: add partial with registration form -->
+  </div>
+  <% if Spree::Config[:allow_guest_checkout] %>
+    <div id="guest_checkout" data-hook class="columns omega eight">
+      <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
+      <h6><%= Spree.t(:guest_user_account) %></h6>
+      <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
+        <p>
+          <%= f.label :email, Spree.t(:email) %><br />
+          <%= f.email_field :email, :class => 'title' %>
+        </p>
+        <p><%= f.submit Spree.t(:continue), :class => 'button primary' %></p>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/layouts/spree_application.html.erb

@@ -19,11 +19,13 @@
 
         <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
 
-        <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve omega" %>" data-hook>
+        <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve" %>" data-hook>
           <%= flash_messages %>
           <%= yield %>
         </div>
 
+        <%= yield :templates %>
+
       </div>
 
       <%= render :partial => 'spree/shared/footer' %>

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

@@ -9,15 +9,15 @@
       <% end %>
     </td>
     <td class="cart-item-description" data-hook="cart_item_description">
-      <h4><%= link_to line_item.name, product_path(variant.product) %></h4>
+      <h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
       <%= variant.options_text %>
-      <% if line_item.insufficient_stock? %>
+      <% 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_text(line_item.description) %>
+        <%= line_item_description(variant) %>
       </span>
     </td>
     <td class="cart-item-price" data-hook="cart_item_price">

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

@@ -0,0 +1,9 @@
+<% @body_id = 'cart' %>
+
+<h1><%= Spree.t(:shopping_cart) %></h1>
+
+<%= form_for @order, :url =>'#', :method => :put do |order_form| %>
+  <%= render :partial => 'form', :locals => { :order_form => order_form } %>
+<% end %>
+
+<p><%= link_to Spree.t(:continue_shopping), products_path %></p>

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

@@ -7,7 +7,7 @@
         <ul>
           <% @product.variants_and_option_values(current_currency).each_with_index do |variant, index| %>
             <li>
-              <%= radio_button_tag "products[#{@product.id}]", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).money %>
+              <%= radio_button_tag "products[#{@product.id}]", variant.id, index == 0, 'data-price' => variant.price_in(current_currency).display_price %>
               <label for="<%= ['products', @product.id, variant.id].join('_') %>">
                 <span class="variant-description">
                   <%= variant_options variant %>
@@ -24,7 +24,7 @@
 
     <% if @product.price_in(current_currency) and !@product.price.nil? %>
       <div data-hook="product_price" class="columns five <% if !@product.has_variants? %> alpha <% else %> omega <% end %>">
-
+        
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
@@ -33,6 +33,10 @@
             </span>
             <span itemprop="priceCurrency" content="<%= @product.currency %>"></span>
           </div>
+
+          <% if @product.master.in_stock? %>
+            <link itemprop="availability" href="http://schema.org/InStock" />
+          <% end %> 
         </div>
 
         <div class="add-to-cart">
@@ -48,6 +52,6 @@
           <br>
           <div><span class="price selling" itemprop="price"><%= Spree.t('product_not_available_in_this_currency') %></span></div>
         </div>
-    <% end %>
+    <% end %>    
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
-<% if image %> 
+<% if defined?(image) && image %>
   <%= image_tag image.attachment.url(:product), :itemprop => "image" %>
 <% else %>
   <%= product_image(@product, :itemprop => "image") %>
-<% end %>
+<% end %>

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

@@ -1,39 +1,35 @@
 <% if tracker = Spree::Tracker.current %>
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    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');
 
-  <%= javascript_tag do %>
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
-    _gaq.push(['_trackPageview']);
+    ga('create', '<%= tracker.analytics_id %>');
+    ga('send', 'pageview');
 
     <% if flash[:commerce_tracking] && @order.present? %>
-      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
-      _gaq.push(['_addTrans',
-        "<%= j @order.number %>",
-        "",
-        "<%= @order.total %>",
-        "<%= @order.adjustments.tax.sum(:amount) %>",
-        "<%= @order.adjustments.shipping.sum(:amount) %>",
-        "<%= j @order.bill_address.city %>",
-        "<%= j @order.bill_address.state_text %>",
-        "<%= j @order.bill_address.country.name %>"
-      ]);
+      <%# more info: https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce %>
+      ga('require', 'ecommerce', 'ecommerce.js');
+      ga('ecommerce:addTransaction', {
+        'id': '<%= j @order.number %>',                                    // Transaction ID. Required.
+        'affiliation': '<%= Spree::Config[:site_name] %>',                // Affiliation or store name.
+        'revenue': '<%= @order.total %>',                                // Grand Total.
+        'shipping': '<%= @order.adjustments.shipping.sum(:amount) %>',  // Shipping.
+        'tax': '<%= @order.adjustments.tax.sum(:amount) %>',           // Tax.
+        'currencyCode': '<%= current_currency %>'                     // local currency code.
+      });
       <% @order.line_items.each do |line_item| %>
-        _gaq.push(['_addItem',
-          "<%= j @order.number %>",
-          "<%= j line_item.variant.sku %>",
-          "<%= j line_item.variant.product.name %>",
-          "",
-          "<%= line_item.price %>",
-          "<%= line_item.quantity %>"
-        ]);
+        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 %>',             // SKU/code.
+          'category': '',                                     // Category or variation.
+          'price': '<%= line_item.price %>',                 // Unit price.
+          'quantity': '<%= line_item.quantity %>'           // Quantity.
+        });
       <% end %>
-      _gaq.push(['_trackTrans']);
+      ga('ecommerce:send');
     <% end %>
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-  <% end %>
+  </script>
 <% end %>

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

@@ -2,13 +2,6 @@
   paginated_products = @searcher.retrieve_products if params.key?(:keywords)
   paginated_products ||= products
 %>
-
-<% content_for :head do %>
-  <% if paginated_products.respond_to?(:num_pages) %>
-    <%= rel_next_prev_link_tags paginated_products %>
-  <% end %>
-<% end %>
-
 <% if products.empty? %>
   <%= Spree.t(:no_products_found) %>
 <% elsif params.key?(:keywords) %>

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

@@ -3,7 +3,7 @@
   <%= select_tag :taxon,
         options_for_select([[Spree.t(:all_departments), '']] +
                               @taxons.map {|t| [t.name, t.id]},
-                              @taxon ? @taxon.id : params[:taxon]), 'aria-label' => 'Taxon' %>
+                            @taxon ? @taxon.id : params[:taxon]) %>
   <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search) %>
   <%= submit_tag Spree.t(:search), :name => nil %>
 <% end %>

data/config/routes.rb

@@ -4,13 +4,10 @@ Spree::Core::Engine.routes.draw do
 
   resources :products
 
-  match '/locale/set', :to => 'locale#set'
-
-  resources :states, :only => :index
-  resources :countries, :only => :index
+  get '/locale/set', :to => 'locale#set'
 
   # non-restful checkout stuff
-  put '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
+  patch '/checkout/update/:state', :to => 'checkout#update', :as => :update_checkout
   get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
   get '/checkout', :to => 'checkout#edit' , :as => :checkout
 
@@ -20,20 +17,20 @@ Spree::Core::Engine.routes.draw do
   end
 
   get '/orders/populate', :via => :get, :to => populate_redirect
-  match '/orders/:id/token/:token' => 'orders#show', :via => :get, :as => :token_order
+  get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
-  resources :orders, :except => [:new, :create] do
+  resources :orders do
     post :populate, :on => :collection
   end
 
   get '/cart', :to => 'orders#edit', :as => :cart
-  put '/cart', :to => 'orders#update', :as => :update_cart
+  patch '/cart', :to => 'orders#update', :as => :update_cart
   put '/cart/empty', :to => 'orders#empty', :as => :empty_cart
 
   # route globbing for pretty nested taxon and product paths
-  match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
+  get '/t/*id', :to => 'taxons#show', :as => :nested_taxons
 
-  match '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
-  match '/content/cvv', :to => 'content#cvv', :as => :cvv
-  match '/content/*path', :to => 'content#show', :via => :get, :as => :content
+  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
+  get '/content/cvv', :to => 'content#cvv', :as => :cvv
+  get '/content/*path', :to => 'content#show', :as => :content
 end

data/lib/spree/frontend/preference_rescue.rb

@@ -0,0 +1,25 @@
+module Spree
+  class OldPrefs < ActiveRecord::Base
+    self.table_name = "spree_preferences"
+    belongs_to  :owner, :polymorphic => true
+    attr_accessor :owner_klass
+  end
+
+  class PreferenceRescue
+    def self.try
+      OldPrefs.where(:key => nil).each do |old_pref|
+        next unless owner = (old_pref.owner rescue nil)
+        unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
+          begin
+            old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
+            old_pref.value_type = owner.preference_type(old_pref.name)
+            puts "Migrating Preference: #{old_pref.key}"
+            old_pref.save
+          rescue NoMethodError => ex
+            puts ex.message
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,141 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
+  name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: spree_api
+  name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deface
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -144,7 +102,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- app/assets/images/admin/bg/spree_50.png
 - app/assets/images/credit_cards/amex_cid.gif
 - app/assets/images/credit_cards/credit_card.gif
 - app/assets/images/credit_cards/discover_cid.gif
@@ -200,6 +157,7 @@ files:
 - app/views/spree/checkout/edit.html.erb
 - app/views/spree/checkout/payment/_check.html.erb
 - app/views/spree/checkout/payment/_gateway.html.erb
+- app/views/spree/checkout/registration.html.erb
 - app/views/spree/content/cvv.html.erb
 - app/views/spree/home/index.html.erb
 - app/views/spree/layouts/spree_application.html.erb
@@ -207,6 +165,7 @@ files:
 - app/views/spree/orders/_form.html.erb
 - app/views/spree/orders/_line_item.html.erb
 - app/views/spree/orders/edit.html.erb
+- app/views/spree/orders/new.html.erb
 - app/views/spree/orders/show.html.erb
 - app/views/spree/products/_cart_form.html.erb
 - app/views/spree/products/_image.html.erb
@@ -238,9 +197,10 @@ files:
 - config/initializers/rails_5868.rb
 - config/initializers/spree.rb
 - config/routes.rb
-- lib/spree/frontend.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
+- lib/spree/frontend/preference_rescue.rb
+- lib/spree/frontend.rb
 - lib/spree/scopes/dynamic.rb
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
@@ -547,18 +507,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.2.2
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.