spree_frontend 2.1.12 → 2.2.0

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

@@ -22,6 +22,8 @@
 <% else %>
 
   <div data-hook="homepage_products">
-    <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+    <% cache(cache_key_for_products) do %>
+      <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+    <% end %>
   </div>
 <% end %>

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

@@ -1,49 +1,51 @@
-<div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
-  <% @body_id = 'product-details' %>
-
-  <div class="columns six alpha" data-hook="product_left_part">
-    <div class="row" data-hook="product_left_part_wrap">
+<% cache [current_currency, @product] do %>
+  <div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
+    <% @body_id = 'product-details' %>
+
+    <div class="columns six alpha" data-hook="product_left_part">
+      <div class="row" data-hook="product_left_part_wrap">
+
+        <div id="product-images" data-hook="product_images">
+          <div id="main-image" data-hook>
+            <%= render :partial => 'image' %>
+          </div>
+          <div id="thumbnails" data-hook>
+            <%= render :partial => 'thumbnails' %>
+          </div>
+        </div>
 
-      <div id="product-images" data-hook="product_images">
-        <div id="main-image" data-hook>
-          <%= render :partial => 'image' %>
+        <div data-hook="product_properties">
+          <%= render :partial => 'properties' %>
         </div>
-        <div id="thumbnails" data-hook>
-          <%= render :partial => 'thumbnails' %>
+
+        <div data-hook="promotions">
+          <%= render :partial => 'promotions' %>
         </div>
-      </div>
 
-      <div data-hook="product_properties">
-        <%= render :partial => 'properties' %>
       </div>
+    </div>
 
-      <div data-hook="promotions">
-        <%= render :partial => 'promotions' %>
-      </div>
+    <div class="columns ten omega" data-hook="product_right_part">
+      <div class="row" data-hook="product_right_part_wrap">
 
-    </div>
-  </div>
+        <div id="product-description" data-hook="product_description">
 
-  <div class="columns ten omega" data-hook="product_right_part">
-    <div class="row" data-hook="product_right_part_wrap">
+          <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
 
-      <div id="product-description" data-hook="product_description">
+          <div itemprop="description" data-hook="description">
+            <%= product_description(@product) rescue Spree.t(:product_has_no_description) %>
+          </div>
 
-        <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
+          <div id="cart-form" data-hook="cart_form">
+            <%= render :partial => 'cart_form' %>
+          </div>
 
-        <div itemprop="description" data-hook="description">
-          <%= product_description(@product) rescue Spree.t(:product_has_no_description) %>
         </div>
 
-        <div id="cart-form" data-hook="cart_form">
-          <%= render :partial => 'cart_form' %>
-        </div>
+        <%= render :partial => 'taxons' %>
 
       </div>
-
-      <%= render :partial => 'taxons' %>
-
     </div>
-  </div>
 
-</div>
+  </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<script>
+Spree.routes.cart_link = "<%= spree.cart_link_url %>"
+</script>

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

@@ -5,19 +5,19 @@
     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 %>','<%= Spree::Config[:site_url].sub!(/^www./,'') %>');
+    ga('create', '<%= tracker.analytics_id %>');
     ga('send', 'pageview');
 
     <% if flash[:commerce_tracking] && @order.present? %>
       <%# 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.
-        'currency': '<%= current_currency %>'                        // local currency code.
+        'id': '<%= j @order.number %>',                                     // Transaction ID. Required.
+        'affiliation': '<%= Spree::Config[:site_name] %>',                 // Affiliation or store name.
+        'revenue': '<%= @order.total %>',                                 // Grand Total.
+        'shipping': '<%= @order.shipments.sum("cost + promo_total") %>', // Shipping.
+        'tax': '<%= @order.all_adjustments.tax.sum(:amount) %>',        // Tax.
+        'currencyCode': '<%= current_currency %>'                      // local currency code.
       });
       <% @order.line_items.each do |line_item| %>
         ga('ecommerce:addItem', {

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

@@ -5,11 +5,12 @@
 <%== meta_data_tags %>
 <%= canonical_tag %>
 <%= favicon_link_tag image_path('favicon.ico') %>
-<%= stylesheet_link_tag 'store/all', :media => 'screen' %>
+<%= stylesheet_link_tag 'spree/frontend/all', :media => 'screen' %>
 <%= csrf_meta_tags %>
-<%= javascript_include_tag 'store/all' %>
+<%= javascript_include_tag 'spree/frontend/all' %>
 <!--[if lt IE 9]>
   <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6/html5shiv.min.js"></script>
 <![endif]-->
 <%= render "spree/shared/routes" %>
+<%= render "spree/shared/frontend_routes" %>
 <%= yield :head %>

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

@@ -0,0 +1 @@
+<%= link_to_cart %>

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

@@ -1,6 +1,12 @@
 <nav class="columns sixteen">
   <ul id="main-nav-bar" class="inline" data-hook>
     <li id="home-link" data-hook><%= link_to Spree.t(:home), spree.root_path %></li>
-    <li id="link-to-cart" data-hook><%= link_to_cart %></li>
+    <li id="link-to-cart" data-hook>
+      <noscript>
+        <%= link_to Spree.t(:cart), '/cart' %>
+      </noscript>
+      &nbsp;
+    </li>
+    <script>Spree.fetch_cart()</script>
   </ul>
 </nav>

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

@@ -19,9 +19,10 @@
         <h6><%= Spree.t(:shipments) %> <%= link_to "(#{Spree.t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
         <div class="delivery">
           <% order.shipments.each do |shipment| %>
-            <%= shipment.stock_location.name %>
-            <%= shipment.shipping_method.name %>
-            <br/>
+            <div>
+              <i class='icon-truck'></i>
+              <%= Spree.t(:shipment_details, :stock_location => shipment.stock_location.name, :shipping_method => shipment.shipping_method.name) %>
+            </div>
           <% end %>
         </div>
         <%= render(:partial => 'spree/shared/shipment_tracking', :locals => {:order => @order}) if @order.shipped? %>
@@ -85,29 +86,54 @@
       <td class="total"><span id="order_total"><%= @order.display_total.to_html %></span></td>
     </tr>
   </tfoot>
-  <% if order.line_item_adjustment_totals.present? %>
-    <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
-      <% @order.line_item_adjustment_totals.each do |key, total| %>
-        <tr class="total">
-          <td colspan="4"><strong><%= key %></strong></td>
-          <td class="total"><span><%= total %></span></td>
-        </tr>
-      <% end %>
-    </tfoot>
-  <% end %>
+
   <tfoot id="subtotal" data-hook="order_details_subtotal">
     <tr class="total" id="subtotal-row">
       <td colspan="4"><b><%= Spree.t(:subtotal) %>:</b></td>
       <td class="total"><span><%= @order.display_item_total.to_html %></span></td>
     </tr>
   </tfoot>
+
+  <% if @order.line_item_adjustments.exists? %>
+    <% if order.all_adjustments.promotion.eligible.exists? %>
+      <tfoot id="price-adjustments" data-hook="order_details_price_adjustments">
+        <% order.all_adjustments.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <tr class="total">
+            <td colspan="4"><%= Spree.t(:promotion) %>: <strong><%= label %></strong></td>
+            <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount)) %></span></td>
+          </tr>
+        <% end %>
+      </tfoot>
+    <% end %>
+  <% end %>
+
+  <% if order.all_adjustments.tax.exists? %>
+    <tfoot id="tax-adjustments" data-hook="order_details_tax_adjustments">
+      <% order.all_adjustments.tax.group_by(&:label).each do |label, adjustments| %>
+        <tr class="total">
+          <td colspan="4"><%= Spree.t(:tax) %>: <strong><%= label %></strong></td>
+          <td class="total"><span><%= Spree::Money.new(adjustments.sum(&:amount)) %></span></td>
+        </tr>
+      <% end %>
+    </tfoot>
+  <% end %>
+  <tfoot id='shipment-total'>
+    <% order.shipments.group_by { |s| s.shipping_method.name }.each do |name, shipments| %>
+      <tr class="total" data-hook='shipment-row'>
+        <td colspan="4"><%= Spree.t(:shipping) %>: <strong><%= name %></strong></td>
+        <td class="total"><span><%= Spree::Money.new(shipments.sum(&:discounted_cost)).to_html %></span></td>
+      </tr>
+    <% end %>
+  </tfoot>
+
   <tfoot id="order-charges" data-hook="order_details_adjustments">
     <% @order.adjustments.eligible.each do |adjustment| %>
-    <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+    <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
       <tr class="total">
         <td colspan="4"><strong><%= adjustment.label %></strong></td>
         <td class="total"><span><%= adjustment.display_amount.to_html %></span></td>
       </tr>
     <% end %>
   </tfoot>
+
 </table>

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

@@ -18,12 +18,15 @@
 <% 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)) %>
     <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">
-      <div class="product-image">
-        <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
-      </div>
-      <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
-      <span class="price selling" itemprop="price"><%= display_price(product) %></span>
+      <% cache(@taxon.present? ? [current_currency, @taxon, product] : [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>
+      <% end %>
     </li>
   <% end %>
   <% reset_cycle("classes") %>

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

@@ -1,9 +1,11 @@
 <% @taxons = @taxon && @taxon.parent ? @taxon.parent.children : Spree::Taxon.roots %>
 <%= form_tag spree.products_path, :method => :get do %>
-  <%= 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' %>
+  <% cache(cache_key_for_taxons) do %>
+    <%= 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' %>
+  <% end %>
   <%= search_field_tag :keywords, params[:keywords], :placeholder => Spree.t(:search) %>
   <%= submit_tag Spree.t(:search), :name => nil %>
 <% end %>

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

@@ -1,6 +1,8 @@
 <nav id="taxonomies" class="sidebar-item" data-hook>
-  <% get_taxonomies.each do |taxonomy| %>
-    <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) %>
+  <% @taxonomies.each do |taxonomy| %>
+    <% cache taxonomy 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) %>
+    <% end %>
   <% end %>
 </nav>

data/app/views/spree/store/cart_link.html.erb

@@ -0,0 +1 @@
+<%= link_to_cart %>

data/app/views/spree/taxons/show.html.erb

@@ -11,9 +11,10 @@
   <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
 </div>
 
-<% unless params[:keywords].present? %>
-  <div data-hook="taxon_children">
-    <%= render :partial => 'taxon', :collection => @taxon.children %>
-  </div>
+  <% unless params[:keywords].present? %>
+    <div data-hook="taxon_children">
+    <% cache @taxon do %>
+      <%= render :partial => 'taxon', :collection => @taxon.children %>
+    <% end %>
+    </div>
 <% end %>
-

data/config/routes.rb

@@ -33,4 +33,5 @@ Spree::Core::Engine.add_routes do
   get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
   get '/content/cvv', :to => 'content#cvv', :as => :cvv
   get '/content/*path', :to => 'content#show', :as => :content
+  get '/cart_link', :to => 'store#cart_link', :as => :cart_link
 end

data/lib/spree/frontend.rb

@@ -13,10 +13,3 @@ require 'spree/responder'
 require 'spree/frontend/middleware/seo_assist'
 
 require 'spree/frontend/engine'
-
-if defined?(ActionView)
-  require 'awesome_nested_set/helper'
-  ActionView::Base.class_eval do
-    include CollectiveIdea::Acts::NestedSet::Helper
-  end
-end

data/lib/spree/frontend/engine.rb

@@ -6,14 +6,13 @@ module Spree
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
       initializer "spree.assets.precompile", :group => :all do |app|
         app.config.assets.precompile += %w[
-          store/all.*
+          spree/frontend/all*
         ]
       end
 
       initializer "spree.frontend.environment", :before => :load_config_initializers do |app|
         Spree::Frontend::Config = Spree::FrontendConfiguration.new
       end
-
     end
   end
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-02-26 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.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -144,15 +144,17 @@ files:
 - app/assets/images/icons/delete.png
 - app/assets/images/icons/update.png
 - app/assets/images/spinner.gif
-- app/assets/images/store/cart.png
-- app/assets/images/store/select_arrow.gif
-- app/assets/javascripts/store/cart.js.coffee
-- app/assets/javascripts/store/checkout.js.coffee
-- app/assets/javascripts/store/product.js.coffee
-- app/assets/javascripts/store/spree_frontend.js
-- app/assets/stylesheets/store/_variables.scss
-- app/assets/stylesheets/store/screen.css.scss
-- app/assets/stylesheets/store/spree_frontend.css
+- app/assets/images/spree/frontend/cart.png
+- app/assets/images/spree/frontend/select_arrow.gif
+- app/assets/javascripts/spree/frontend.js
+- app/assets/javascripts/spree/frontend/cart.js.coffee
+- app/assets/javascripts/spree/frontend/checkout.js.coffee
+- app/assets/javascripts/spree/frontend/checkout/address.js.coffee
+- app/assets/javascripts/spree/frontend/checkout/payment.js.coffee
+- app/assets/javascripts/spree/frontend/product.js.coffee
+- app/assets/stylesheets/spree/frontend.css
+- app/assets/stylesheets/spree/frontend/_variables.scss
+- app/assets/stylesheets/spree/frontend/screen.css.scss
 - app/controllers/spree/checkout_controller.rb
 - app/controllers/spree/content_controller.rb
 - app/controllers/spree/home_controller.rb
@@ -172,13 +174,16 @@ files:
 - app/views/spree/checkout/payment/_check.html.erb
 - app/views/spree/checkout/payment/_gateway.html.erb
 - app/views/spree/content/cvv.html.erb
+- app/views/spree/content/test.html.erb
 - app/views/spree/home/index.html.erb
 - app/views/spree/layouts/spree_application.html.erb
+- app/views/spree/orders/_adjustment_row.html.erb
 - app/views/spree/orders/_adjustments.html.erb
 - 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/show.html.erb
+- app/views/spree/payments/_payment.html.erb
 - app/views/spree/products/_cart_form.html.erb
 - app/views/spree/products/_image.html.erb
 - app/views/spree/products/_promotions.html.erb
@@ -190,9 +195,11 @@ files:
 - app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_filters.html.erb
 - app/views/spree/shared/_footer.html.erb
+- app/views/spree/shared/_frontend_routes.html.erb
 - app/views/spree/shared/_google_analytics.html.erb
 - app/views/spree/shared/_head.html.erb
 - app/views/spree/shared/_header.html.erb
+- app/views/spree/shared/_link_to_cart.html.erb
 - app/views/spree/shared/_main_nav_bar.html.erb
 - app/views/spree/shared/_nav_bar.html.erb
 - app/views/spree/shared/_order_details.html.erb
@@ -202,6 +209,7 @@ files:
 - app/views/spree/shared/_sidebar.html.erb
 - app/views/spree/shared/_taxonomies.html.erb
 - app/views/spree/shared/unauthorized.html.erb
+- app/views/spree/store/cart_link.html.erb
 - app/views/spree/taxons/_taxon.html.erb
 - app/views/spree/taxons/show.html.erb
 - config/initializers/canonical_rails.rb
@@ -213,6 +221,7 @@ files:
 - 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/tasks/rake_util.rb
 - lib/tasks/taxon.rake
@@ -529,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_frontend
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.