spree_frontend 3.3.6 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adfe0910925e6f90458d70170cdac1637195a5eb
-  data.tar.gz: 733f669f3b978aa5a55cd232eaf66733a6d86594
+  metadata.gz: ab29ea9deeee80fabe11534e664e3422afcafea8
+  data.tar.gz: c157fa82937e2c02b6b6a542cbcba97f1c549611
 SHA512:
-  metadata.gz: e0be5b2a96f519d31100baa94a0a14e909b39266dac3ccbbb1bace60a797ac1cdd8d7ac84abf8a37cb35a7866f4ba8228c2b6b4f28a448af86dd7e27170fd630
-  data.tar.gz: 5531731aadc44cc695c04358d608a12396a18b4dc4bca49ac036fa7f790ce4a0da9bf97055e1e848acb7f6907ebaa5348312d0f8afd48335ace09608081358fe
+  metadata.gz: 14c954c0a0dc1f93ed05668354d02702806ffebc56d23ccdb49e4a91bc700f0108e54a41eac47d4063eee50314b81b91b00b64a1f756ca41d6ed06963a054982
+  data.tar.gz: 9b61f5cb3c19c4b03abdd4e057f1fca5c32bf6814ef07df777343d00df84e3fe2e67293acf422e9791f8ae29f7779bb2d74e793a93450ad30a273ad58d773f07

data/app/assets/stylesheets/spree/frontend/frontend_bootstrap.css.scss

@@ -100,3 +100,7 @@ table {
 .existing-credit-card-list td {
   padding: 5px;
 }
+
+.save-user-address-wrapper {
+  display: inline-block;
+}

data/app/controllers/spree/checkout_controller.rb

@@ -4,7 +4,6 @@ module Spree
   # checkout which has nothing to do with updating an order that this approach
   # is waranted.
   class CheckoutController < Spree::StoreController
-    before_action :expires_now, only: [:edit]
     before_action :load_order_with_lock
     before_action :ensure_valid_state_lock_version, only: [:update]
     before_action :set_state_if_present
@@ -54,7 +53,7 @@ module Spree
     end
 
     def insufficient_payment?
-      params[:state] == "confirm" &&
+      params[:state] == 'confirm' &&
         @order.payment_required? &&
         @order.payments.valid.sum(:amount) != @order.total
     end
@@ -90,13 +89,15 @@ module Spree
 
     def ensure_valid_state_lock_version
       if params[:order] && params[:order][:state_lock_version]
-        @order.with_lock do
+        changes = @order.changes if @order.changed?
+        @order.reload.with_lock do
           unless @order.state_lock_version == params[:order].delete(:state_lock_version).to_i
             flash[:error] = Spree.t(:order_already_updated)
             redirect_to(checkout_state_path(@order.state)) && return
           end
           @order.increment!(:state_lock_version)
         end
+        @order.assign_attributes(changes) if changes
       end
     end
 
@@ -110,9 +111,7 @@ module Spree
     end
 
     def ensure_checkout_allowed
-      unless @order.checkout_allowed?
-        redirect_to spree.cart_path
-      end
+      redirect_to spree.cart_path unless @order.checkout_allowed?
     end
 
     def ensure_order_not_completed
@@ -151,7 +150,7 @@ module Spree
     end
 
     def before_payment
-      if @order.checkout_steps.include? "delivery"
+      if @order.checkout_steps.include? 'delivery'
         packages = @order.shipments.map(&:to_package)
         @differentiator = Spree::Stock::Differentiator.new(@order, packages)
         @differentiator.missing.each do |variant, quantity|
@@ -165,7 +164,7 @@ module Spree
     end
 
     def add_store_credit_payments
-      if params.has_key?(:apply_store_credit)
+      if params.key?(:apply_store_credit)
         @order.add_store_credit_payments
 
         # Remove other payment method parameters.

data/app/controllers/spree/orders_controller.rb

@@ -14,10 +14,11 @@ module Spree
     end
 
     def update
+      @variant = Spree::Variant.find(params[:variant_id]) if params[:variant_id]
       if @order.contents.update_cart(order_params)
         respond_with(@order) do |format|
           format.html do
-            if params.has_key?(:checkout)
+            if params.key?(:checkout)
               @order.next if @order.cart?
               redirect_to checkout_state_path(@order.checkout_steps.first)
             else
@@ -33,8 +34,8 @@ module Spree
     # Shows the current incomplete order from the session
     def edit
       @order = current_order || Order.incomplete.
-                                  includes(line_items: [variant: [:images, :option_values, :product]]).
-                                  find_or_initialize_by(guest_token: cookies.signed[:guest_token])
+               includes(line_items: [variant: [:images, :option_values, :product]]).
+               find_or_initialize_by(guest_token: cookies.signed[:guest_token])
       associate_user
     end
 
@@ -53,7 +54,7 @@ module Spree
           order.create_tax_charge!
           order.update_with_updater!
         rescue ActiveRecord::RecordInvalid => e
-          error = e.record.errors.full_messages.join(", ")
+          error = e.record.errors.full_messages.join(', ')
         end
       else
         error = Spree.t(:please_enter_reasonable_quantity)
@@ -64,7 +65,7 @@ module Spree
         redirect_back_or_default(spree.root_path)
       else
         respond_with(order) do |format|
-          format.html { redirect_to cart_path }
+          format.html { redirect_to(cart_path(variant_id: variant.id)) }
         end
       end
     end
@@ -75,9 +76,7 @@ module Spree
     end
 
     def empty
-      if @order = current_order
-        @order.empty!
-      end
+      @order.empty! if @order = current_order
 
       redirect_to spree.cart_path
     end

data/app/controllers/spree/products_controller.rb

@@ -17,9 +17,9 @@ module Spree
 
     def show
       @variants = @product.variants_including_master.
-                           spree_base_scopes.
-                           active(current_currency).
-                           includes([:option_values, :images])
+                  spree_base_scopes.
+                  active(current_currency).
+                  includes([:option_values, :images])
       @product_properties = @product.product_properties.includes(:property)
       @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
       redirect_if_legacy_path
@@ -27,37 +27,37 @@ module Spree
 
     private
 
-      def accurate_title
-        if @product
-          @product.meta_title.blank? ? @product.name : @product.meta_title
-        else
-          super
-        end
+    def accurate_title
+      if @product
+        @product.meta_title.blank? ? @product.name : @product.meta_title
+      else
+        super
       end
+    end
 
-      def load_product
-        if try_spree_current_user.try(:has_spree_role?, "admin")
-          @products = Product.with_deleted
-        else
-          @products = Product.active(current_currency)
-        end
+    def load_product
+      @products = if try_spree_current_user.try(:has_spree_role?, 'admin')
+                    Product.with_deleted
+                  else
+                    Product.active(current_currency)
+                  end
 
-        @product = @products.includes(:variants_including_master, variant_images: :viewable).
-                             friendly.distinct(false).find(params[:id])
-      end
+      @product = @products.includes(:variants_including_master, variant_images: :viewable).
+                 friendly.distinct(false).find(params[:id])
+    end
 
-      def load_taxon
-        @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
-      end
+    def load_taxon
+      @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+    end
 
-      def redirect_if_legacy_path
-        # If an old id or a numeric id was used to find the record,
-        # we should do a 301 redirect that uses the current friendly id.
-        if params[:id] != @product.friendly_id
-          params[:id] = @product.friendly_id
-          params.permit!
-          return redirect_to url_for(params), status: :moved_permanently
-        end
+    def redirect_if_legacy_path
+      # If an old id or a numeric id was used to find the record,
+      # we should do a 301 redirect that uses the current friendly id.
+      if params[:id] != @product.friendly_id
+        params[:id] = @product.friendly_id
+        params.permit!
+        redirect_to url_for(params), status: :moved_permanently
       end
+    end
   end
 end

data/app/helpers/spree/frontend_helper.rb

@@ -5,18 +5,18 @@ module Spree
       @body_class
     end
 
-    def breadcrumbs(taxon, separator=" ")
-      return "" if current_page?("/") || taxon.nil?
+    def breadcrumbs(taxon, separator = ' ')
+      return '' if current_page?('/') || taxon.nil?
       separator = raw(separator)
-      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: "name"), spree.root_path, itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")]
+      crumbs = [content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:home), itemprop: 'name'), spree.root_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')]
       if taxon
-        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:products), itemprop: "name"), spree.products_path, itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
-        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: "name"), seo_url(ancestor), itemprop: "url") + separator, itemprop: "item"), itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement") } unless taxon.ancestors.empty?
-        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: "name") , seo_url(taxon), itemprop: "url"), itemprop: "item"), class: 'active', itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, Spree.t(:products), itemprop: 'name'), spree.products_path, itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
+        crumbs << taxon.ancestors.collect { |ancestor| content_tag(:li, content_tag(:span, link_to(content_tag(:span, ancestor.name, itemprop: 'name'), seo_url(ancestor), itemprop: 'url') + separator, itemprop: 'item'), itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement') } unless taxon.ancestors.empty?
+        crumbs << content_tag(:li, content_tag(:span, link_to(content_tag(:span, taxon.name, itemprop: 'name'), seo_url(taxon), itemprop: 'url'), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
       else
-        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: "item"), class: 'active', itemscope: "itemscope", itemtype: "https://schema.org/ListItem", itemprop: "itemListElement")
+        crumbs << content_tag(:li, content_tag(:span, Spree.t(:products), itemprop: 'item'), class: 'active', itemscope: 'itemscope', itemtype: 'https://schema.org/ListItem', itemprop: 'itemListElement')
       end
-      crumb_list = content_tag(:ol, raw(crumbs.flatten.map{|li| li.mb_chars}.join), class: 'breadcrumb', itemscope: "itemscope", itemtype: "https://schema.org/BreadcrumbList")
+      crumb_list = content_tag(:ol, raw(crumbs.flatten.map(&:mb_chars).join), class: 'breadcrumb', itemscope: 'itemscope', itemtype: 'https://schema.org/BreadcrumbList')
       content_tag(:nav, crumb_list, id: 'breadcrumbs', class: 'col-md-12')
     end
 
@@ -51,11 +51,11 @@ module Spree
     end
 
     def flash_messages(opts = {})
-      ignore_types = ["order_completed"].concat(Array(opts[:ignore_types]).map(&:to_s) || [])
+      ignore_types = ['order_completed'].concat(Array(opts[:ignore_types]).map(&:to_s) || [])
 
       flash.each do |msg_type, text|
         unless ignore_types.include?(msg_type)
-          concat(content_tag :div, text, class: "alert alert-#{msg_type}")
+          concat(content_tag(:div, text, class: "alert alert-#{msg_type}"))
         end
       end
       nil
@@ -65,7 +65,7 @@ module Spree
       text = text ? h(text) : Spree.t('cart')
       css_class = nil
 
-      if simple_current_order.nil? or simple_current_order.item_count.zero?
+      if simple_current_order.nil? || simple_current_order.item_count.zero?
         text = "<span class='glyphicon glyphicon-shopping-cart'></span> #{text}: (#{Spree.t('empty')})"
         css_class = 'empty'
       else
@@ -80,7 +80,7 @@ module Spree
       return '' if max_level < 1 || root_taxon.leaf?
       content_tag :div, class: 'list-group' do
         taxons = root_taxon.children.map do |taxon|
-          css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'list-group-item active' : 'list-group-item'
+          css_class = current_taxon && current_taxon.self_and_ancestors.include?(taxon) ? 'list-group-item active' : 'list-group-item'
           link_to(taxon.name, seo_url(taxon), class: css_class) + taxons_tree(taxon, current_taxon, max_level - 1)
         end
         safe_join(taxons, "\n")

data/app/helpers/spree/taxons_helper.rb

@@ -3,13 +3,13 @@ module Spree
     # Retrieves the collection of products to display when "previewing" a taxon.  This is abstracted into a helper so
     # that we can use configurations as well as make it easier for end users to override this determination.  One idea is
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
-    def taxon_preview(taxon, max=4)
-      products = taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").limit(max)
-      if (products.size < max)
+    def taxon_preview(taxon, max = 4)
+      products = taxon.active_products.select('DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position').limit(max)
+      if products.size < max
         products_arel = Spree::Product.arel_table
         taxon.descendants.each do |taxon|
           to_get = max - products.length
-          products += taxon.active_products.select("DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position").where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
+          products += taxon.active_products.select('DISTINCT (spree_products.id), spree_products.*, spree_products_taxons.position').where(products_arel[:id].not_in(products.map(&:id))).limit(to_get)
           break if products.size >= max
         end
       end

data/app/helpers/spree/trackers_helper.rb

@@ -0,0 +1,18 @@
+module Spree
+  module TrackersHelper
+    def product_for_segment(product, optional = {})
+      {
+        product_id: product.id,
+        sku: product.sku,
+        category: product.category.try(:name),
+        name: product.name,
+        brand: product.brand.try(:name),
+        price: product.price,
+        currency: product.currency,
+        url: product_url(product),
+      }.tap do |hash|
+        hash[:image_url] = asset_url(optional.delete(:image).attachment) if optional[:image]
+      end.merge(optional).to_json.html_safe
+    end
+  end
+end

data/app/models/spree/frontend_configuration.rb

@@ -1,5 +1,6 @@
 module Spree
   class FrontendConfiguration < Preferences::Configuration
+    preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
   end
 end

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

@@ -35,7 +35,7 @@
 <div class="well text-right form-buttons" data-hook="buttons">
   <%= submit_tag Spree.t(:save_and_continue), class: 'btn btn-lg btn-success' %>
   <% if try_spree_current_user %>
-    <span data-hook="save_user_address">
+    <span data-hook="save_user_address" class='save-user-address-wrapper'>
       &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) %>

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

@@ -58,10 +58,13 @@
       <% end %>
     </ul>
 
-    <p class='field' data-hook='coupon_code'>
-      <%= form.label :coupon_code %>
-      <%= form.text_field :coupon_code, class: 'form-control' %>
-    </p>
+
+    <% if Spree::Frontend::Config[:coupon_codes_enabled] %>
+      <p class='field' data-hook='coupon_code'>
+        <%= form.label :coupon_code %>
+        <%= form.text_field :coupon_code, class: 'form-control' %>
+      </p>
+    <% end %>
   </div>
 </div>
 

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

@@ -3,6 +3,10 @@
   <%= render partial: 'spree/shared/google_checkout.js', locals: { order: @order, step_number: (@order.checkout_steps.index(@order.state) + 1) } %>
 <% end %>
 
+<%= render partial: 'spree/shared/trackers/segment/checkout_step_viewed.js',
+            formats: :js,
+            locals: { order: @order } %>
+
 <div id="checkout" data-hook>
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 

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

@@ -1,4 +1,13 @@
 <% @body_id = 'cart' %>
+
+<% if @variant %>
+  <%= render partial: 'spree/shared/trackers/segment/product_added.js',
+              formats: :js,
+              locals: { product: @variant.product, order: @order } %>
+<% end %>
+<%= render partial: 'spree/shared/trackers/segment/cart_viewed.js',
+            formats: :js,
+            locals: { order: @order } %>
 <div data-hook="cart_container">
   <h1><%= Spree.t(:shopping_cart) %></h1>
 
@@ -27,13 +36,15 @@
             </div>
           </div>
 
-          <div class='col-md-6 form-inline pull-right' data-hook='coupon_code'>
-            <label>
-              <%= order_form.label :coupon_code %>
-              <%= order_form.text_field :coupon_code, size: '30', class: 'form-control' %>
-              <%= button_tag Spree.t(:coupon_code_apply), class: 'btn btn-default' %>
-            </label>
-          </div>
+          <% if Spree::Frontend::Config[:coupon_codes_enabled] %>
+            <div class='col-md-6 form-inline pull-right' data-hook='coupon_code'>
+              <label>
+                <%= order_form.label :coupon_code %>
+                <%= order_form.text_field :coupon_code, size: '30', class: 'form-control' %>
+                <%= button_tag Spree.t(:coupon_code_apply), class: 'btn btn-default' %>
+              </label>
+            </div>
+          <% end %>
         </div>
       <% end %>
     </div>

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

@@ -8,7 +8,6 @@
 <% end %>
 
 <fieldset id="order_summary" data-hook>
-  <legend><%= Spree.t(:order_number, number: @order.number) %></legend>
   <h1><%= accurate_title %></h1>
   <% if order_just_completed?(@order) %>
     <strong><%= Spree.t(:thank_you_for_your_order) %></strong>

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

@@ -1,5 +1,9 @@
 <% @body_id = 'product-details' %>
 
+<%= render partial: 'spree/shared/trackers/segment/product_viewed.js',
+            formats: :js,
+            locals: { product: @product } %>
+
 <% cache cache_key_for_product do %>
   <div data-hook="product_show" class="row" itemscope itemtype="https://schema.org/Product">
     <div class="col-md-4 col-sm-5" data-hook="product_left_part">

data/app/views/spree/shared/_google_add_items.js.erb

@@ -1,6 +1,6 @@
 <% order.line_items.each do |line_item| %>
 ga('ec:addProduct', {               // Provide product details in a productFieldObject.
-  'id': '<%= j (line_item.sku || line_item.variant_id) %>',  // Product ID (string).
+  'id': '<%= j (line_item.sku.present? ? line_item.sku : line_item.variant_id.to_s) %>',  // Product ID (string).
   'name': '<%= j line_item.name %>', // Product name (string).
   'category': '<%= j line_item.category.try(:name) %>',            // Product category (string).
   'brand': '<%= j line_item.brand.try(:name) %>',                // Product brand (string).

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

@@ -10,12 +10,18 @@
       <%= Spree.t(:no_products_found) %>
     </div>
   <% elsif params.key?(:keywords) %>
+    <%= render partial: 'spree/shared/trackers/segment/products_searched.js',
+                formats: :js,
+                locals: { query: params[:keywords] } %>
     <div data-hook="products_search_results_heading_results_found">
       <h6 class="search-results-title"><%= Spree.t(:search_results, keywords: h(params[:keywords])) %></h6>
     </div>
   <% end %>
 </div>
 
+<%= render partial: 'spree/shared/trackers/segment/product_list_viewed.js',
+            formats: :js,
+            locals: { taxon: @taxon, products: products } %>
 <% if products.any? %>
   <div id="products" class="row" data-hook>
     <%= render partial: 'spree/products/product', collection: products, locals: { taxon: @taxon } %>

data/app/views/spree/shared/trackers/segment/_cart_viewed.js.erb

@@ -0,0 +1,12 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Cart Viewed', {
+      cart_id: '<%= order.number %>',
+      products: [
+      <% order.line_items.each_with_index do |line_item, index| %>
+        <%= product_for_segment(line_item, position: index+1, quantity: line_item.quantity) %>,
+      <% end %>
+      ]
+    });
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_checkout_step_viewed.js.erb

@@ -0,0 +1,8 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Checkout Step Viewed', {
+      checkout_id: '<%= order.number %>',
+      step: '<%= (order.checkout_steps.index(order.state) + 1) %>'
+    });
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_order_complete.js.erb

@@ -1,7 +1,7 @@
 <script>
   if (typeof analytics !== 'undefined') {
     analytics.track('Order Completed', {
-      order_id: '<%= order.id %>',
+      order_id: '<%= order.number %>',
       total: '<%= order.total %>',
       shipping: '<%= order.shipment_total %>',
       tax: '<%= order.additional_tax_total %>',

data/app/views/spree/shared/trackers/segment/_product_added.js.erb

@@ -0,0 +1,5 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Product Added', product_for_segment(variant.product, cart_id: order.number);
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_product_list_filtered.js.erb

@@ -0,0 +1,16 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Product List Filtered', {
+      filters: [
+        <% search.to_unsafe_h.each do |type, value| %>
+          <%= { type: type, value: value } .to_json.html_safe %>,
+        <% end %>
+      ],
+      products: [
+      <% products.each_with_index do |product, index| %>
+        <%= product_for_segment(product, position: index+1, image: product.images.first) %>,
+      <% end %>
+      ]
+    });
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_product_list_viewed.js.erb

@@ -0,0 +1,12 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Product List Viewed', {
+      category: '<%= taxon.try(:name) %>',
+      products: [
+      <% products.each_with_index do |product, index| %>
+        <%= product_for_segment(product, position: index+1, image: product.images.first) %>,
+      <% end %>
+      ]
+    });
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_product_viewed.js.erb

@@ -0,0 +1,5 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Product Viewed', <%= product_for_segment(product, image: product.images.first) %>);
+  }
+</script>

data/app/views/spree/shared/trackers/segment/_products_searched.js.erb

@@ -0,0 +1,7 @@
+<script>
+  if (typeof analytics !== 'undefined') {
+    analytics.track('Products Searched', {
+      query: '<%= query %>',
+    });
+  }
+</script>

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

@@ -1,5 +1,10 @@
 <h1 class="taxon-title"><%= @taxon.name %></h1>
 
+<% if params[:search].present? %>
+  <%= render partial: 'spree/shared/trackers/segment/product_list_filtered.js',
+              formats: :js,
+              locals: { search: params[:search], products: @products } %>
+<% end %>
 <% content_for :sidebar do %>
   <div data-hook="taxon_sidebar_navigation">
     <%= render partial: 'spree/shared/taxonomies' %>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( favicon.ico credit_cards/* spree/frontend/checkout/shipment )
+Rails.application.config.assets.precompile += %w(favicon.ico credit_cards/* spree/frontend/checkout/shipment)

data/config/initializers/canonical_rails.rb

@@ -5,11 +5,10 @@ CanonicalRails.setup do |config|
   #
   # Acts as a whitelist for routes to have trailing slashes
 
-  config.collection_actions# = [:index]
+  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 = [:keywords, :page, :search, :taxon]
-
 end

data/config/routes.rb

@@ -1,5 +1,4 @@
 Spree::Core::Engine.add_routes do
-
   root to: 'home#index'
 
   resources :products, only: [:index, :show]

data/lib/generators/spree/frontend/copy_views/copy_views_generator.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Frontend
+    class CopyViewsGenerator < Rails::Generators::Base
+      desc 'Copies views from spree frontend to your application'
+
+      def self.source_paths
+        [File.expand_path('../../../../../../app/', __FILE__)]
+      end
+
+      def copy_views
+        directory 'views', './app/views'
+      end
+    end
+  end
+end

data/lib/spree/frontend/engine.rb

@@ -1,16 +1,16 @@
 module Spree
   module Frontend
     class Engine < ::Rails::Engine
-      config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
+      config.middleware.use 'Spree::Frontend::Middleware::SeoAssist'
 
       # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
-      initializer "spree.assets.precompile", group: :all do |app|
+      initializer 'spree.assets.precompile', group: :all do |app|
         app.config.assets.precompile += %w[
           spree/frontend/all*
         ]
       end
 
-      initializer "spree.frontend.environment", before: :load_config_initializers do |app|
+      initializer 'spree.frontend.environment', before: :load_config_initializers do |_app|
         Spree::Frontend::Config = Spree::FrontendConfiguration.new
       end
     end

data/lib/spree/frontend/middleware/seo_assist.rb

@@ -13,15 +13,15 @@ module Spree
 
           taxon_id = params['taxon']
 
-          #redirect requests using taxon id's to their permalinks
+          # redirect requests using taxon id's to their permalinks
           if !taxon_id.blank? && !taxon_id.is_a?(Hash) && taxon = Taxon.find(taxon_id)
             params.delete('taxon')
 
-            return build_response(params, "#{request.script_name}t/#{taxon.permalink}" )
-          elsif env["PATH_INFO"] =~ /^\/(t|products)(\/\S+)?\/$/
-            #ensures no trailing / for taxon and product urls
+            return build_response(params, "#{request.script_name}t/#{taxon.permalink}")
+          elsif env['PATH_INFO'] =~ /^\/(t|products)(\/\S+)?\/$/
+            # ensures no trailing / for taxon and product urls
 
-            return build_response(params, env["PATH_INFO"][0...-1])
+            return build_response(params, env['PATH_INFO'][0...-1])
           end
 
           @app.call(env)
@@ -32,19 +32,18 @@ module Spree
         def build_response(params, location)
           query = build_query(params)
           location += '?' + query unless query.blank?
-          [301, { 'Location'=> location }, []]
+          [301, { 'Location' => location }, []]
         end
 
         def build_query(params)
-          params.map { |k, v|
+          params.map do |k, v|
             if v.class == Array
               build_query(v.map { |x| ["#{k}[]", x] })
             else
-              k + "=" + Rack::Utils.escape(v)
+              k + '=' + Rack::Utils.escape(v)
             end
-          }.join("&")
+          end.join('&')
         end
-
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.4.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -155,8 +155,8 @@ files:
 - app/controllers/spree/taxons_controller.rb
 - app/helpers/spree/frontend_helper.rb
 - app/helpers/spree/orders_helper.rb
-- app/helpers/spree/store_helper.rb
 - app/helpers/spree/taxons_helper.rb
+- app/helpers/spree/trackers_helper.rb
 - app/models/spree/frontend_configuration.rb
 - app/views/kaminari/twitter-bootstrap-3/_first_page.html.erb
 - app/views/kaminari/twitter-bootstrap-3/_gap.html.erb
@@ -216,14 +216,22 @@ files:
 - app/views/spree/shared/_taxonomies.html.erb
 - app/views/spree/shared/_translations.html.erb
 - app/views/spree/shared/forbidden.html.erb
+- app/views/spree/shared/trackers/segment/_cart_viewed.js.erb
+- app/views/spree/shared/trackers/segment/_checkout_step_viewed.js.erb
 - app/views/spree/shared/trackers/segment/_initializer.js.erb
 - app/views/spree/shared/trackers/segment/_order_complete.js.erb
+- app/views/spree/shared/trackers/segment/_product_added.js.erb
+- app/views/spree/shared/trackers/segment/_product_list_filtered.js.erb
+- app/views/spree/shared/trackers/segment/_product_list_viewed.js.erb
+- app/views/spree/shared/trackers/segment/_product_viewed.js.erb
+- app/views/spree/shared/trackers/segment/_products_searched.js.erb
 - app/views/spree/shared/unauthorized.html.erb
 - app/views/spree/taxons/_taxon.html.erb
 - app/views/spree/taxons/show.html.erb
 - config/initializers/assets.rb
 - config/initializers/canonical_rails.rb
 - config/routes.rb
+- lib/generators/spree/frontend/copy_views/copy_views_generator.rb
 - lib/spree/frontend.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
@@ -247,13 +255,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.

data/app/helpers/spree/store_helper.rb

@@ -1,15 +0,0 @@
-# Methods added to this helper will be available to all templates in the frontend.
-module Spree
-  module StoreHelper
-    def cache_key_for_taxons
-      ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        cache_key_for_taxons is deprecated. Rails >= 5 has built-in support for collection cache keys.
-        Instead in your view use:
-        cache [I18n.locale, @taxons] do
-      EOS
-      max_updated_at = @taxons.maximum(:updated_at).to_i
-      parts = [@taxon.try(:id), max_updated_at].compact.join("-")
-      "#{I18n.locale}/taxons/#{parts}"
-    end
-  end
-end