spree_frontend 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e329bd5468c79c26df7443dcb6832d4b1427aad
-  data.tar.gz: 58c60c6e1f5ba57f4c4d1d75fc0b0a1507494e52
+  metadata.gz: a4de87e043800f121326d03ee2f4505f2cac7cba
+  data.tar.gz: 0033ae9ddaf67d6e00101df373814f8836439217
 SHA512:
-  metadata.gz: 9078a1b7758639ff967d86dbfad29615003f6fafcf9d46060179d994870e6798c1157dba2f13adcd7ccd01b80ce233c4b134fdea0bf3bd95734766d68d7b5fc7
-  data.tar.gz: 0e86c6caa2fcf1646570ee62295a54d197f15d7c7361dd42449a97ab7455f1211b1ba7db674eb9d805409842d6f6a7e5e99a865d5e354a272a20765d62ff561e
+  metadata.gz: ac65662b06b0698ce296c01c5fca6e18fe9b64c58be38e4b3d5eb6d054f42db07042dddc99b1949391246af4d61174db5ee71e8179b39ea0d6da7523bddb3285
+  data.tar.gz: 2dfc4519d9269b627809631f312538a146dae97575ec6b93978573cd8d4cd8a2752040d0b01a577c464be22ac248aa30388f522858279306f096fd73d6184637

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

@@ -8,9 +8,9 @@ Spree.ready ($) ->
     ($ '#checkout_form_address').validate()
 
     getCountryId = (region) ->
-      $('p#' + region + 'country select').val()
+      $('#' + region + 'country select').val()
 
-    updateState = (region) ->
+    Spree.updateState = (region) ->
       countryId = getCountryId(region)
       if countryId?
         unless Spree.Checkout[countryId]?
@@ -18,15 +18,15 @@ Spree.ready ($) ->
             Spree.Checkout[countryId] =
               states: data.states
               states_required: data.states_required
-            fillStates(Spree.Checkout[countryId], region)
+            Spree.fillStates(Spree.Checkout[countryId], region)
         else
-          fillStates(Spree.Checkout[countryId], region)
+          Spree.fillStates(Spree.Checkout[countryId], region)
 
-    fillStates = (data, region) ->
+    Spree.fillStates = (data, region) ->
       statesRequired = data.states_required
       states = data.states
 
-      statePara = ($ 'p#' + region + 'state')
+      statePara = ($ '#' + region + 'state')
       stateSelect = statePara.find('select')
       stateInput = statePara.find('input')
       stateSpanRequired = statePara.find('state-required')
@@ -60,13 +60,13 @@ Spree.ready ($) ->
         stateInput.removeClass('hidden')
         stateSelect.removeClass('required')
 
-    ($ 'p#bcountry select').change ->
-      updateState 'b'
+    ($ '#bcountry select').change ->
+      Spree.updateState 'b'
 
-    ($ 'p#scountry select').change ->
-      updateState 's'
+    ($ '#scountry select').change ->
+      Spree.updateState 's'
 
-    updateState 'b'
+    Spree.updateState 'b'
 
     order_use_billing = ($ 'input#order_use_billing')
     order_use_billing.change ->
@@ -79,7 +79,7 @@ Spree.ready ($) ->
       else
         ($ '#shipping .inner').show()
         ($ '#shipping .inner input, #shipping .inner select').prop 'disabled', false
-        updateState('s')
+        Spree.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 = ($ ($ 'ul.thumbnails li:visible.vtmb').eq(0))
-      thumb = ($ ($ 'ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
+      thumb = ($ ($ '#product-images ul.thumbnails li:visible.vtmb').eq(0))
+      thumb = ($ ($ '#product-images ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
       newImg = thumb.find('a').attr('href')
-      ($ 'ul.thumbnails li').removeClass 'selected'
+      ($ '#product-images 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

@@ -113,10 +113,14 @@ 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 10px;
+  padding: 5px;
   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;
     outline: none;
@@ -146,6 +150,11 @@ 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"],
@@ -727,6 +736,14 @@ 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

@@ -99,7 +99,7 @@ module Spree
       # attributes for a single payment and its source, discarding attributes
       # for payment methods other than the one selected
       def object_params
-        # respond_to check is necessary due to issue described in #2910
+        # has_checkout_step? 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]

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

@@ -2,6 +2,13 @@
   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) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,6 @@ 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

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

@@ -1,20 +0,0 @@
-<%= 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>