spree_frontend 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29db93da707c1bbb9a6ef087863995df92f50c94
-  data.tar.gz: aba8daaa326750b739f5166436c7dc176612b931
+  metadata.gz: 324c220d9617fdc461f82e3cede3bac0b15752e2
+  data.tar.gz: bfb16a3f7d738f19c479c7cc5b8ff2e9736a467c
 SHA512:
-  metadata.gz: b58abca47b3506fe2dfee3c2d96e79c3adb1fd2e5d5b3d5dc3cfc974a0170f1ff6c5e0afaa5cea35175dd174adea1036f1ae5fb26a22e7993953a7d717d97fe8
-  data.tar.gz: 447914326a17b8c14bfa48a7a6f276913e240f0c21516e4ff3d1fc37920c4bc60a87b9263c2f0eb9cdc221f6c6cbb3f51d99694b3a81e2da0efae6ea239c1ab4
+  metadata.gz: 830944c66cfb9b62eb549dd867672554c661249ec9f7397fdcf196e00fedde7a99ac5827f84834d762f79f163434ef2b72f054c3e8b2399628af713353e8e178
+  data.tar.gz: 6681b60cd36573cac6937b77fc0702c36a3b6dbee767993a65028d3b68b96c35e0c67f093323de73cb1ce59517a98998ec878a56d335a150a1725d8f368dbfd6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

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

@@ -1,6 +1,21 @@
 Spree.onPayment = () ->
   if ($ '#checkout_form_payment').is('*')
 
+    if ($ '#existing_cards').is('*')
+      ($ '#payment-method-fields').hide()
+      ($ '#payment-methods').hide()
+
+      ($ '#use_existing_card_yes').click ->
+        ($ '#payment-method-fields').hide()
+        ($ '#payment-methods').hide()
+        ($ '.existing-cc-radio').prop("disabled", false)
+
+      ($ '#use_existing_card_no').click ->
+        ($ '#payment-method-fields').show()
+        ($ '#payment-methods').show()
+        ($ '.existing-cc-radio').prop("disabled", true)
+
+
     $(".cardNumber").payment('formatCardNumber')
     $(".cardExpiry").payment('formatCardExpiry')
     $(".cardCode").payment('formatCardCVC')

data/app/controllers/spree/checkout_controller.rb

@@ -131,6 +131,10 @@ module Spree
             @order.contents.remove(variant, quantity)
           end
         end
+
+        if try_spree_current_user && try_spree_current_user.respond_to?(:payment_sources)
+          @payment_sources = try_spree_current_user.payment_sources
+        end
       end
 
       def rescue_from_spree_gateway_error(exception)

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

@@ -23,10 +23,11 @@
 
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag Spree.t(:save_and_continue), :class => 'continue button primary' %>
-
-  <span data-hook="save_user_address">
-    &nbsp; &nbsp;
-    <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>
-    <%= label_tag :save_user_address, Spree.t(:save_my_address) %>
-  </span>
+  <% if try_spree_current_user %>
+    <span data-hook="save_user_address">
+      &nbsp; &nbsp;
+      <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>
+      <%= label_tag :save_user_address, Spree.t(:save_my_address) %>
+    </span>
+  <% end %>
 </div>

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

@@ -37,7 +37,7 @@
 
           <h5 class="stock-shipping-method-title"><%= Spree.t(:shipping_method) %></h5>
           <ul class="field radios shipping-methods">
-            <% ship_form.object.shipping_rates.with_shipping_method.each do |rate| %>
+            <% ship_form.object.shipping_rates.each do |rate| %>
               <li class="shipping-method">
                 <label>
                   <%= ship_form.radio_button :selected_shipping_rate_id, rate.id %>

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

@@ -1,6 +1,37 @@
 <fieldset id="payment" data-hook>
   <legend align="center"><%= Spree.t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
+
+    <% if @payment_sources.present? %>
+      <div class="card_options">
+        <%= radio_button_tag 'use_existing_card', 'yes', true %>
+        <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">Use a new card / payment method</label>
+      </div>
+
+      <div id="existing_cards">
+        <p class="field" data-hook="existing_cards">
+          <table class="existing-credit-card-list">
+            <tbody>
+              <% @payment_sources.each do |card| %>
+                <tr id="<%= dom_id(card,'spree')%>" class="<%= cycle('even', 'odd') %>">
+                  <td><%= card.name %></td>
+                  <td><%= card.display_number %></td>
+                  <td><%= card.month %></td>
+                  <td><%= card.year %></td>
+                  <td>
+                    <%= radio_button_tag "existing_card", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </p>
+      </div>
+    <% end %>
+
     <div id="payment-method-fields" data-hook>
       <% @order.available_payment_methods.each do |method| %>
       <p>

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

@@ -27,16 +27,22 @@
       <% end %>
     </tbody>
 
-    <% if order.checkout_steps.include?("delivery") %>
+    <% if order.checkout_steps.include?("delivery") && order.shipments.any? %>
       <tr data-hook="shipping_total">
-      <% if order.shipment_total > 0 %>
         <td><%= Spree.t(:shipping_total) %></td>
-        <td><%= Spree::Money.new(order.shipment_total).to_html %></td>
-      <% else %>
-        <td><strong><%= Spree.t(:free_shipping) %></strong></td>
-        <td><%= Spree.t(:free_shipping_amount) %></td>
-      <% end %>
+        <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost)).to_html %></td>
       </tr>
+
+      <% if order.shipment_adjustments.exists? %>
+        <tbody data-hook="order_details_shipment_promotion_adjustments">
+          <% order.shipment_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+            <tr class="total">
+              <td><%= label %></td>
+              <td><%= Spree::Money.new(adjustments.sum(&:amount)).to_html %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      <% end %>
     <% end %>
 
     <% if order.adjustments.eligible.exists? %>

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

@@ -15,6 +15,10 @@
                 <% if variant_price variant %>
                   <span class="price diff"><%= variant_price variant %></span>
                 <% end %>
+
+                <% unless variant.can_supply? %>
+                  <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
+                <% end %>
               <% end %>
             </li>
           <% end%>
@@ -38,6 +42,9 @@
 
           <% if @product.master.can_supply? %>
             <link itemprop="availability" href="http://schema.org/InStock" />
+          <% else %>
+            <br />
+            <span class="out-of-stock"><%= Spree.t(:out_of_stock) %></span>
           <% end %> 
         </div>
 

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

@@ -5,7 +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');
 
-    ga('create', '<%= tracker.analytics_id %>');
+    ga('create', '<%= tracker.analytics_id %>','<%= Spree::Config[:site_url].sub!(/^www./,'') %>');
     ga('send', 'pageview');
 
     <% if flash[:commerce_tracking] && @order.present? %>

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

@@ -3,7 +3,7 @@
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1" name="viewport">
 <%== meta_data_tags %>
-<%= canonical_tag %>
+<%= canonical_tag(Spree::Config.site_url) %>
 <%= favicon_link_tag image_path('favicon.ico') %>
 <%= stylesheet_link_tag 'spree/frontend/all', :media => 'screen' %>
 <%= csrf_meta_tags %>

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

@@ -2,6 +2,11 @@
 
   <% if order.has_step?("address") %>
 
+    <div class="columns alpha four" data-hook="order-bill-address">
+      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+      <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
+    </div>
+
     <% if order.has_step?("delivery") %>
       <div class="columns alpha four" data-hook="order-ship-address">
         <h6><%= Spree.t(:shipping_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
@@ -9,11 +14,6 @@
       </div>
     <% end %>
 
-    <div class="columns alpha four" data-hook="order-bill-address">
-      <h6><%= Spree.t(:billing_address) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-      <%= render :partial => 'spree/shared/address', :locals => { :address => order.bill_address } %>
-    </div>
-
     <% if @order.has_step?("delivery") %>
       <div class="columns alpha four">
         <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>

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

@@ -1,8 +1,9 @@
+<% max_level = Spree::Config[:max_level_in_taxons_menu] || 1 %>
 <nav id="taxonomies" class="sidebar-item" data-hook>
   <% @taxonomies.each do |taxonomy| %>
-    <% cache taxonomy do %>
+    <% cache [taxonomy, max_level] do %>
       <h6 class='taxonomy-root'><%= Spree.t(:shop_by_taxonomy, :taxonomy => taxonomy.name) %></h6>
-      <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
+      <%= taxons_tree(taxonomy.root, @taxon, max_level) %>
     <% end %>
   <% end %>
 </nav>

data/config/initializers/canonical_rails.rb

@@ -1,20 +1,15 @@
 CanonicalRails.setup do |config|
-  
-  # This is the main host, not just the TLD, omit slashes and protocol. If you have more than one, pick the one you want to rank in search results.
-  
-  config.host = Spree::Config[:site_url]
-  
   # http://en.wikipedia.org/wiki/URL_normalization
   # Trailing slash represents semantics of a directory, ie a collection view - implying an :index get route;
   # otherwise we have to assume semantics of an instance of a resource type, a member view - implying a :show get route
   #
   # Acts as a whitelist for routes to have trailing slashes
-  
+
   config.collection_actions# = [:index]
 
   # Parameter spamming can cause index dilution by creating seemingly different URLs with identical or near-identical content.
   # Unless whitelisted, these parameters will be omitted
-  
-  config.whitelisted_parameters# = []
-  
+
+  config.whitelisted_parameters = [:keywords, :page, :search, :taxon]
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.