spree_frontend 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cc8304b9d613d8ac92155be33ef9f3656443781
-  data.tar.gz: 542d5ea4ecbf53168bc734acf2319d4ac5ed989f
+  metadata.gz: d8785a3b87576e5eebb362cc98645fe59ff04f75
+  data.tar.gz: 902320408c1675e84484a8e877a7054835dda0d6
 SHA512:
-  metadata.gz: aab462d12ddf9698f2ba2ff389f0a6c3adf7db7b6d6e763b102beb10fd39d2c94bd33a615f95ec4c4dfb70f636b5af70aea84f6df5f190b6a1cc913027fe335e
-  data.tar.gz: bbdc254c624afeced6c80ff56e92b9936d1b3c3ac0625918722af4374008f218a49f47da8e547e88c74e5dc810e528387f4428996d6d8ecc4b5f40751571bddf
+  metadata.gz: 8430cf436239009f9b98b3869164e384c23eacb730d205f5f212e3d790a97c1266a713282d67bbf3eb9536e7dbf8555941a296b8d25af92f238aa4dcd4a8d81b
+  data.tar.gz: bd0ad3e7f55e94dfdaa6e9b48130708c693be975db8a9a10d1b3c403e60be4fb653e09d85b51e166adc760d04a6b56a53672eb0e3f90ebb567993de7b21fe8bf

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

@@ -6,18 +6,18 @@ Spree.disableSaveOnClick = ->
 
 Spree.ready ($) ->
   Spree.Checkout = {}
-  $("#card_number").payment('formatCardNumber')
-  $("#card_expiry").payment('formatCardExpiry')
-  $("#card_code").payment('formatCardCVC')
+  $(".cardNumber").payment('formatCardNumber')
+  $(".cardExpiry").payment('formatCardExpiry')
+  $(".cardCode").payment('formatCardCVC')
 
-  $("#card_number").change ->
-    $("#cc_type").val($.payment.cardType(@value))
+  $(".cardNumber").change ->
+    $(this).parent().siblings(".ccType").val($.payment.cardType(@value))
 
   if ($ '#checkout_form_address').is('*')
     ($ '#checkout_form_address').validate()
 
     getCountryId = (region) ->
-      $('p#' + region + 'country select').val()
+      $('#' + region + 'country select').val()
 
     updateState = (region) ->
       countryId = getCountryId(region)
@@ -35,7 +35,7 @@ Spree.ready ($) ->
       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')
@@ -70,10 +70,10 @@ Spree.ready ($) ->
         stateInput.removeClass('hidden')
         stateSelect.removeClass('required')
 
-    ($ 'p#bcountry select').change ->
+    ($ '#bcountry select').change ->
       updateState 'b'
 
-    ($ 'p#scountry select').change ->
+    ($ '#scountry select').change ->
       updateState 's'
 
     updateState 'b'

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"],
@@ -327,6 +336,12 @@ nav #main-nav-bar {
   }
 }
 
+figure#logo {
+  img {
+    padding-top:25px;
+  }
+}
+
 nav#taxonomies {
   .taxonomy-root {
     text-transform: uppercase;
@@ -727,6 +742,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;
 
@@ -1224,7 +1247,6 @@ table.order-summary {
     td { display: block; min-height: 1.25em; }
   }
 
-
   figure#logo {
     text-align: center;
   }

data/app/controllers/spree/checkout_controller.rb

@@ -97,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
-        # 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/checkout/payment/_gateway.html.erb

@@ -4,7 +4,7 @@
 <p class="field" data-hook="card_number">
   <%= label_tag "card_number", Spree.t(:card_number) %><span class="required">*</span><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
-  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19, :autocomplete => "off") %>
+  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required cardNumber', :size => 19, :maxlength => 19, :autocomplete => "off") %>
   &nbsp;
   <span id="card_type" style="display:none;">
     ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -13,16 +13,16 @@
   </span>
 </p>
 <p class="field" data-hook="card_expiration">
-  <%= label_tag "card_month", Spree.t(:expiration) %><span class="required">*</span><br />
-  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required", :placeholder => "MM / YY" %>
+  <%= label_tag "card_expiry", Spree.t(:expiration) %><span class="required">*</span><br />
+  <%= text_field_tag "#{param_prefix}[expiry]", '', :id => 'card_expiry', :class => "required cardExpiry", :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) %>
+  <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required cardCode', :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_tag "#{param_prefix}[cc_type]", '', :id => "cc_type", :class => 'ccType' %>
 
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
 <%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

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) %>

data/config/routes.rb

@@ -2,7 +2,7 @@ Spree::Core::Engine.add_routes do
 
   root :to => 'home#index'
 
-  resources :products
+  resources :products, :only => [:index, :show]
 
   get '/locale/set', :to => 'locale#set'
 
@@ -19,7 +19,7 @@ Spree::Core::Engine.add_routes do
   get '/orders/populate', :to => populate_redirect
   get '/orders/:id/token/:token' => 'orders#show', :as => :token_order
 
-  resources :orders, :except => [:new, :create] do
+  resources :orders, :except => [:new, :create, :destroy] do
     post :populate, :on => :collection
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-20 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.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,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>