workarea-storefront 3.4.45 → 3.5.0.beta.1

data/app/views/workarea/storefront/recent_views/aside.html.haml

@@ -1,11 +1,12 @@
-- if @recent_views.products.any? || @recent_views.categories.any? || @recent_views.searches.any?
+- if @recent_views.products.any? || @recent_views.categories.any?
   .recent-views.recent-views--aside
 
     - if @recent_views.products.any?
       .recent-views__section.recent-views__section--products
         %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_products')
         - @recent_views.products.each do |product|
-          .product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+          = render_schema_org(product_schema(product))
+          .product-summary.product-summary--small
             = render 'workarea/storefront/products/summary', product: product
 
     - if @recent_views.categories.any?
@@ -15,11 +16,3 @@
           - @recent_views.categories.each do |category|
             %li.recent-views__item
               = link_to category.name, category_path(category), class: 'recent-views__link'
-
-    - if @recent_views.searches.any?
-      .recent-views__section.recent-views__section--searches
-        %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_searches')
-        %ul.recent-views__list
-          - @recent_views.searches.each do |search|
-            %li.recent-views__item
-              = link_to search, search_path(q: search), class: 'recent-views__link'

data/app/views/workarea/storefront/recent_views/narrow.html.haml

@@ -1,11 +1,12 @@
-- if @recent_views.products.any? || @recent_views.categories.any? || @recent_views.searches.any?
+- if @recent_views.products.any? || @recent_views.categories.any?
   .recent-views
 
     - if @recent_views.products.any?
       .recent-views__section.recent-views__section--products
         %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_products')
         - @recent_views.products.each do |product|
-          .product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+          = render_schema_org(product_schema(product))
+          .product-summary.product-summary--small
             = render 'workarea/storefront/products/summary', product: product
 
     - if @recent_views.categories.any?
@@ -15,11 +16,3 @@
           - @recent_views.categories.each do |category|
             %li.recent-views__item
               = link_to category.name, category_path(category), class: 'recent-views__link'
-
-    - if @recent_views.searches.any?
-      .recent-views__section.recent-views__section--searches
-        %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_searches')
-        %ul.recent-views__list
-          - @recent_views.searches.each do |search|
-            %li.recent-views__item
-              = link_to search, search_path(q: search), class: 'recent-views__link'

data/app/views/workarea/storefront/recent_views/show.html.haml

@@ -1,4 +1,4 @@
-- if @recent_views.products.any? || @recent_views.categories.any? || @recent_views.searches.any?
+- if @recent_views.products.any? || @recent_views.categories.any?
   .recent-views
 
     - if @recent_views.products.any?
@@ -6,8 +6,9 @@
         %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_products')
         .grid
           - @recent_views.products.each do |product|
+            = render_schema_org(product_schema(product))
             .grid__cell.grid__cell--50.grid__cell--33-at-medium.grid__cell--16-at-wide
-              .product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+              .product-summary.product-summary--small
                 = render 'workarea/storefront/products/summary', product: product
 
     - if @recent_views.categories.any?
@@ -17,11 +18,3 @@
           - @recent_views.categories.each do |category|
             %li.recent-views__item
               = link_to category.name, category_path(category), class: 'recent-views__link'
-
-    - if @recent_views.searches.any?
-      .recent-views__section.recent-views__section--searches
-        %h2.recent-views__heading= t('workarea.storefront.recommendations.recent_searches')
-        %ul.recent-views__list
-          - @recent_views.searches.each do |search|
-            %li.recent-views__item
-              = link_to search, search_path(q: search), class: 'recent-views__link'

data/app/views/workarea/storefront/recommendations/show.html.haml

@@ -8,5 +8,5 @@
     .grid
       - @recommendations.each do |product|
         .grid__cell.grid__cell--50.grid__cell--33-at-medium.grid__cell--16-at-wide
-          .product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+          .product-summary.product-summary--small
             = render 'workarea/storefront/products/summary', product: product

data/app/views/workarea/storefront/searches/show.html.haml

@@ -1,7 +1,6 @@
 - @title = t('workarea.storefront.searches.title')
 
 - content_for :head do
-  %meta{ property: 'recent-view', content: recent_view_content(search: @search.query_string) }
   %meta{ name: 'robots', content: 'noindex' }
   = append_partials('storefront.search_head', search: @search)
 
@@ -13,11 +12,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.searches.title')
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= @search.query_string
 
 - content_for :page_aside do
@@ -92,7 +91,7 @@
           = append_partials('storefront.search_grid_item', product: product, position: position)
 
           .grid__cell.grid__cell--50.grid__cell--25-at-medium.grid__cell--20-at-wide{ data: { pagination_item: '' } }
-            .product-summary{ itemscope: true, itemtype: 'http://schema.org/Product', data: { search_results_product_grid_summary: { id: product.catalog_id, position: position }.to_json } }
+            .product-summary{ data: { search_results_product_grid_summary: { id: product.catalog_id, position: position }.to_json } }
               = render 'workarea/storefront/products/summary', product: product
       - if show_pagination?(@search.products)
         .pagination__button

data/app/views/workarea/storefront/users/accounts/edit.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.edit_title')
 
 .view

data/app/views/workarea/storefront/users/accounts/show.html.haml

@@ -2,9 +2,9 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.account')
 
 .view
@@ -114,5 +114,5 @@
         .grid
           - @recommendations.each do |product|
             .grid__cell.grid__cell--50.grid__cell--33-at-medium.grid__cell--16-at-wide
-              .product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+              .product-summary.product-summary--small
                 = render 'workarea/storefront/products/summary', product: product

data/app/views/workarea/storefront/users/addresses/edit.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.edit_address')
 
 .view

data/app/views/workarea/storefront/users/addresses/new.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.add_address')
 
 .view

data/app/views/workarea/storefront/users/credit_cards/edit.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.edit_credit_card')
 
 .view

data/app/views/workarea/storefront/users/credit_cards/new.html.haml

@@ -3,11 +3,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.add_credit_card')
 
 .view

data/app/views/workarea/storefront/users/orders/index.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.order_history')
 
 .view

data/app/views/workarea/storefront/users/orders/show.html.haml

@@ -2,13 +2,13 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.account'), users_account_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.order_history'), users_orders_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.order_details')
 
 .view

data/app/views/workarea/storefront/users/passwords/new.html.haml

@@ -2,11 +2,11 @@
 
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home', class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.users.login'), login_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text= t('workarea.storefront.users.forgot_password')
 
 .view

data/config/locales/en.yml

@@ -127,10 +127,14 @@ en:
           info_text: You can update your information at any time by visiting
           closing_html: Have a great day!
           closing_text: Have a great day!
+          email_action:
+            name: View Account
         password_reset:
           subject: Reset Your Password
           info_html: Click this link to reset your password
           info_text: Click this link to reset your password
+          email_action:
+            name: Reset Password
         inquiry:
           heading: Customer Service Inquiry on %{subject}
           name: Name
@@ -149,6 +153,8 @@ en:
         order_confirmation:
           subject: Order %{order_id} Confirmation
           heading: Order %{order_id} Confirmation
+          email_action:
+            name: View Order
         order_refund:
           subject: Order %{order_id} Refund
           heading: Order %{order_id} Refund
@@ -159,6 +165,9 @@ en:
           info_html: We noticed that you didn't complete checkout, and we wanted to help. To complete your order, %{link}. Please let us know if there is any other way we can help.
           info_text: We noticed that you didn't complete checkout, and we wanted to help. To complete your order, visit the link below. Please let us know if there is any other way we can help.
           resume_link: resume your checkout
+          email_action:
+            name: Resume Order
+            description: Continue checkout to complete your order
         recommendations: You may also like…
 
       flash_messages:
@@ -201,14 +210,14 @@ en:
         credit_card_update_error: There were errors updating your credit card.
         credit_card_removed: Your credit card has been removed.
         password_reset_expired: This password reset is expired.
-        password_reset_email_sent: If a valid email address was entered, instructions to reset your password have been sent to "%{email}"
+        password_reset_email_sent: If a valid e-mail address was entered, instructions to reset your password have been sent to "%{email}"
         password_reset: Your password has been reset.
         old_password_invalid: Your old password is not valid.
         password_required: Password is required.
         items_required: You must add an item to your cart to checkout
         order_custom_pricing: Your cart has custom pricing, you cannot edit the contents of your cart.
-        no_available_shipping_options: There are no available shipping options for your shipping address.
         download_unavailable: This download is no longer available. Contact customer support for more information.
+        no_available_shipping_options: There are no available shipping options for your shipping adddress.
 
       forms:
         required: '*'
@@ -222,7 +231,8 @@ en:
         go: Go
         email_placeholder: name@example.com
         confirmation_alert: Are you sure you want to delete this?
-
+      fraud:
+        default_message: Workarea default fraud check. Automatic no decision.
       layouts:
         accessibility_info: Accessibility Information
         main_content: Skip to Main Content
@@ -238,6 +248,8 @@ en:
         locale: Select locale
         mobile_navigation: Mobile Navigation
         default_meta_description: Shop online for %{site_name} products
+        page_title: '%{site_name}'
+        page_title_with_content: '%{title_content} - %{site_name}'
 
       messages:
         info: Info
@@ -298,6 +310,7 @@ en:
         sku: SKU
         each: each
         view_order: View Order
+        download: Download
 
       pagination:
         loading_more: Loading More...

data/config/routes.rb

@@ -28,7 +28,6 @@ Workarea::Storefront::Engine.routes.draw do
     end
 
     resource :email_signup, only: [:show, :create]
-    resources :searches, only: :index
     resource :search, only: :show
 
     get '/current_user', to: 'application#current_user_info', as: :current_user
@@ -67,7 +66,9 @@ Workarea::Storefront::Engine.routes.draw do
       get   'confirmation', to: 'place_order#confirmation'
     end
 
-    resource :recent_views, only: [:show, :update]
+    resources :downloads, only: :show
+
+    resource :recent_views, only: :show
     resource :recommendations, only: :show
 
     resource :sitemap, only: :show
@@ -94,6 +95,7 @@ Workarea::Storefront::Engine.routes.draw do
     get 'style_guides/:category', to: 'style_guides#category', as: :style_guides_category
     get 'style_guides/:category/:id', to: 'style_guides#show', as: :style_guide
 
+    post 'analytics/new_session', to: 'analytics#new_session', as: :analytics_new_session
     post 'analytics/product_view/:product_id', to: 'analytics#product_view', as: :analytics_product_view
     post 'analytics/category_view/:category_id', to: 'analytics#category_view', as: :analytics_category_view
     post 'analytics/search', to: 'analytics#search', as: :analytics_search

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: '_dummy_session'
+Rails.application.config.session_store :cookie_store, key: '_dummy_session', expire_after: 30.minutes

data/test/helpers/workarea/storefront/content_helper_test.rb

@@ -11,6 +11,7 @@ module Workarea
         blocks = ContentBlockViewModel.wrap(content.blocks)
 
         self.expects(:current_user).returns(nil)
+        self.expects(:request).returns(OpenStruct.new(env: {}))
         Rails.cache.expects(:fetch).once
         render_content_blocks(blocks)
 

data/test/helpers/workarea/storefront/navigation_helper_test.rb

@@ -15,6 +15,10 @@ module Workarea
 
         taxon = Navigation::SearchResults.new(q: 'foo').taxon
         assert_equal(search_path(q: 'foo'), storefront_path_for(taxon))
+
+        product = create_product
+        taxon = create_taxon(navigable: product)
+        assert_equal(storefront.product_path(product.slug), storefront_path_for(taxon))
       end
 
       def test_mobile_nav_return_path

data/test/helpers/workarea/storefront/schema_org_helper_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+module Workarea
+  module Storefront
+    class SchemaOrgHelperTest < ViewTest
+      include NavigationHelper
+      include Engine.routes.url_helpers
+
+      def test_breadcrumb_list_schema
+        product = create_product
+        category = create_category(product_ids: [product.id]) # so the product will have a parent
+        create_taxon(navigable: category)
+
+        view_model = ProductViewModel.wrap(product)
+        breadcrumbs = view_model.breadcrumbs.map { |t| [t.name, storefront_url_for(t)] }
+        schema = breadcrumb_list_schema(breadcrumbs)
+        urls = schema[:itemListElement].map { |e| e[:item][:@id] }
+        product_url = storefront.product_url(product, host: Workarea.config.host)
+
+        assert_equal('http://schema.org', schema[:@context])
+        assert_equal('BreadcrumbList', schema[:@type])
+        assert_equal(product_url, urls.last)
+        assert_includes(urls, product_url)
+      end
+    end
+  end
+end

data/test/integration/workarea/storefront/analytics_integration_test.rb

@@ -4,21 +4,42 @@ module Workarea
   module Storefront
     class AnalyticsIntegrationTest < Workarea::IntegrationTest
       def test_saving_product_view
+        post storefront.analytics_product_view_path(product_id: ' ')
+        assert_equal(0, Metrics::ProductByDay.count)
+
         post storefront.analytics_product_view_path(product_id: 'foo')
+
         assert_equal(1, Metrics::ProductByDay.first.views)
+        user = Metrics::User.first
+        assert_equal(session.id, user.id)
+        assert_equal(['foo'], user.viewed.product_ids)
       end
 
       def test_saving_search
-        post storefront.analytics_search_path(q: 'foo', total_results: '5')
+        post storefront.analytics_search_path(q: ' ', total_results: '5')
+        assert_equal(0, Metrics::SearchByDay.count)
+
+        post storefront.analytics_search_path(q: 'foods', total_results: '5')
 
-        insights = Metrics::SearchByDay.first
-        assert_equal(1, insights.searches)
-        assert_equal(5, insights.total_results)
+        metrics = Metrics::SearchByDay.first
+        assert_equal(1, metrics.searches)
+        assert_equal(5, metrics.total_results)
+
+        user = Metrics::User.first
+        assert_equal(session.id, user.id)
+        assert_equal(['food'], user.viewed.search_ids)
       end
 
       def test_saving_category_view
+        post storefront.analytics_category_view_path(category_id: ' ')
+        assert_equal(0, Metrics::CategoryByDay.count)
+
         post storefront.analytics_category_view_path(category_id: 'foo')
+
         assert_equal(1, Metrics::CategoryByDay.first.views)
+        user = Metrics::User.first
+        assert_equal(session.id, user.id)
+        assert_equal(['foo'], user.viewed.category_ids)
       end
 
       def test_blocking_bots
@@ -26,6 +47,25 @@ module Workarea
           headers: { 'HTTP_USER_AGENT' => 'Googlebot' }
 
         assert(Metrics::ProductByDay.count.zero?)
+        assert(Metrics::User.count.zero?)
+      end
+
+      def test_merging_metrics_on_login
+        create_user(email: 'bcrouse@workarea.com', password: 'W3bl1nc!')
+        Metrics::User.save_order(email: 'bcrouse@workarea.com', revenue: 10)
+        Metrics::User.save_affinity(id: 'bcrouse@workarea.com', action: :viewed, product_ids: ['bar'])
+        login_metrics = Metrics::User.find('bcrouse@workarea.com')
+
+        post storefront.analytics_product_view_path(product_id: 'foo')
+        session_metrics = Metrics::User.find(session.id)
+        assert_equal(['foo'], session_metrics.viewed.product_ids)
+
+        post storefront.login_path,
+          params: { email: 'bcrouse@workarea.com', password: 'W3bl1nc!' }
+
+        login_metrics.reload
+        assert_equal(1, login_metrics.orders)
+        assert_equal(%w(bar foo), login_metrics.viewed.product_ids)
       end
     end
   end