workarea-storefront 3.4.45 → 3.5.0.beta.1

data/app/views/layouts/workarea/storefront/empty.html.haml

@@ -4,6 +4,7 @@
 - if @content.present?
   - add_css(@content.css)
   - add_javascript(@content.javascript)
+  - add_head_content(@content.head_content)
 
 !!!
 /

data/app/views/layouts/workarea/storefront/navigation.html.haml

@@ -32,7 +32,7 @@
     = append_partials('storefront.document_head')
     = javascript_include_tag Workarea.config.asset_manifests.storefront_javascript_head
 
-  %body{ itemscope: true, itemtype: 'http://schema.org/WebPage' }
+  %body
 
     %ul.accessibility-nav.visually-hidden
       %li= link_to t('workarea.storefront.layouts.accessibility_info'), accessibility_path

data/app/views/workarea/storefront/account_mailer/creation.html.haml

@@ -1,5 +1,7 @@
 = append_partials('storefront.account_creation_mailer.top')
 
+= render_schema_org(email_action_schema(users_account_url, t('workarea.storefront.email.account_created.email_action.name')))
+
 - content_for :preheader_text do
   = @content
 

data/app/views/workarea/storefront/account_mailer/password_reset.html.haml

@@ -1,5 +1,7 @@
 = append_partials('storefront.password_reset_mailer.top')
 
+= render_schema_org(email_action_schema(reset_password_url(@reset.token), t('workarea.storefront.email.password_reset.email_action.name')))
+
 - content_for :preheader_text do
   = @content
 

data/app/views/workarea/storefront/cart_items/create.html.haml

@@ -67,5 +67,5 @@
           .grid
             - @cart.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/carts/show.html.haml

@@ -174,7 +174,7 @@
           .grid
             - @cart.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
 
   %div{ data: { recommendations_placeholder: recent_views_path } }

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

@@ -3,10 +3,10 @@
 
 - add_css(@category.css)
 - add_javascript(@category.javascript)
+- add_head_content(@category.head_content)
 
 - content_for :head do
   - cache "#{@category.cache_key}/head", expires_in: Workarea.config.cache_expirations.categories_fragment_cache do
-    %meta{ property: 'recent-view', content: recent_view_content(category_id: @category.id) }
     %meta{ property: 'global-id', content: @category.to_global_id.to_param }
 
     - if @category.first_page? && !@category.has_filters?
@@ -89,10 +89,11 @@
       .pagination{ data: { analytics: product_list_analytics_data(@category.name).to_json, pagination: pagination_data(@category.products), back_to_top_button: '' } }
         .grid
           - @category.products.each_with_index do |product, position|
+            = render_schema_org(product_schema(product))
             = append_partials('storefront.category_browse_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' }
+              .product-summary
                 = render 'workarea/storefront/products/summary', product: product
         - if show_pagination?(@category.products)
           .pagination__button

data/app/views/workarea/storefront/checkouts/confirmation.html.haml

@@ -34,5 +34,5 @@
           %span.button-property__text= t('workarea.storefront.users.sign_up_for_email')
       %p= button_tag t('workarea.storefront.users.create_account'), value: 'sign_up', class: 'button', data: { disable_with: loading_indicator(t('workarea.storefront.users.create_account_disabled_text')) }
 
-  = render 'workarea/storefront/orders/summary', order: @order, recommendations: @order.recommendations, show_fulfillment: false
+  = render 'workarea/storefront/orders/summary', order: @order, recommendations: @order.recommendations
   = append_partials('storefront.checkout_confirmation')

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

@@ -5,10 +5,12 @@
   %meta{ name: :description, content: @inquiry.meta_description }
 
 - content_for :breadcrumbs do
+  = render_schema_org(breadcrumb_list_schema([[t('workarea.storefront.layouts.home'), root_url], [@inquiry.title, page_url('inquiry')]]))
+
   %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= @inquiry.title
 
 .view

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

@@ -1,6 +1,7 @@
 - @title = @content.browser_title
 - add_css(@content.css)
 - add_javascript(@content.javascript)
+- add_head_content(@content.head_content)
 
 .view
   = render_content_blocks(@content.content_blocks_for(@area_id))

data/app/views/workarea/storefront/content_blocks/_category_summary.html.haml

@@ -10,6 +10,7 @@
     - else
       .grid
         - 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
-            %div.product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+            %div.product-summary.product-summary--small
               = render 'workarea/storefront/products/summary', product: product

data/app/views/workarea/storefront/content_blocks/_product_insights.html.haml

@@ -5,6 +5,7 @@
   - if view_model.products.present?
     .grid
       - view_model.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

data/app/views/workarea/storefront/content_blocks/_product_list.html.haml

@@ -5,6 +5,7 @@
   - if products.present?
     .grid{ data: { analytics: product_list_analytics_data("Custom product list").to_json } }
       - 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
-          %div.product-summary.product-summary--small{ itemscope: true, itemtype: 'http://schema.org/Product' }
+          %div.product-summary.product-summary--small
             = render 'workarea/storefront/products/summary', product: product

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

@@ -2,6 +2,7 @@
 
 - add_css(@content.css)
 - add_javascript(@content.javascript)
+- add_head_content(@content.head_content)
 
 - content_for :head do
   %meta{ property: 'global-id', content: @content.to_global_id.to_param }

data/app/views/workarea/storefront/fulfillment_mailer/shipped.html.haml

@@ -1,7 +1,9 @@
 = append_partials('storefront.fulfillment_shipped_mailer.top')
 
+= render_schema_org(fulfillment_email_schema(@order, @package))
+
 - content_for :preheader_text do
-  = t('workarea.storefront.email.order_shipped.heading', order_id: @order.id)
+  = t('workarea.storefront.email.order_cancellation.heading', order_id: @order.id)
 
 %tr
   %td

data/app/views/workarea/storefront/order_mailer/_summary.html.haml

@@ -160,6 +160,12 @@
                           %strong= t('workarea.storefront.orders.quantity')
                         %td.align-right= item.quantity
 
+                      - if item.token.present?
+                        %tr
+                          %td= link_to t('workarea.storefront.orders.download'), download_url(item.token)
+
+                      = append_partials('storefront.order_summary_item_details', item: item)
+
                       = append_partials('storefront.order_mailer_summary_order_details', item: item)
 
                     - if item.total_adjustments.many?

data/app/views/workarea/storefront/order_mailer/confirmation.html.haml

@@ -1,5 +1,8 @@
 = append_partials('storefront.order_confirmation_mailer.top')
 
+= render_schema_org(email_action_schema(order_url(@order), t('workarea.storefront.email.order_confirmation.email_action.name')))
+= render_schema_org(order_email_schema(@order))
+
 - content_for :preheader_text do
   = @content
 

data/app/views/workarea/storefront/order_mailer/reminder.html.haml

@@ -1,5 +1,8 @@
 = append_partials('storefront.order_reminder_mailer.top')
 
+= render_schema_org(email_action_schema(resume_cart_url(@order.token), t('workarea.storefront.email.order_reminder.email_action.name'), t('workarea.storefront.email.order_reminder.email_action.description')))
+= render_schema_org(order_email_schema(@order))
+
 - content_for :preheader_text do
   = @content
 

data/app/views/workarea/storefront/orders/_summary.html.haml

@@ -63,6 +63,8 @@
                   - item.customizations.each do |name, value|
                     #{name.titleize}: #{value}
                     %br
+                  - if item.token&.enabled?
+                    = link_to t('workarea.storefront.orders.download'), download_path(item.token)
                   = append_partials('storefront.order_summary_item_details', item: item)
 
         .grid__cell.grid__cell--25-at-medium
@@ -260,7 +262,7 @@
           .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
 
   %ul.order-help-menu

data/app/views/workarea/storefront/orders/show.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.orders.order_status'), check_orders_path, class: 'breadcrumbs__link'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       %span.breadcrumbs__text #{t('workarea.storefront.orders.order')} #{@order.id}
 
 .view

data/app/views/workarea/storefront/pages/home_page.html.haml

@@ -2,6 +2,10 @@
 
 - add_css(@page.css)
 - add_javascript(@page.javascript)
+- add_head_content(@page.head_content)
+
+- content_for :breadcrumbs do
+  = render_schema_org(breadcrumb_list_schema([[t('workarea.storefront.layouts.home'), root_url]]))
 
 - content_for :head do
   %meta{ property: 'global-id', content: @page.to_global_id.to_param }

data/app/views/workarea/storefront/pages/robots.text.erb

@@ -11,7 +11,6 @@ Disallow: /login
 Disallow: /logout
 Disallow: /forgot_password
 Disallow: /users
-Disallow: /wish_lists
 Disallow: /products/*/details
 <% end %>
 <%= append_partials('storefront.robots_txt') %>

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

@@ -3,6 +3,7 @@
 
 - add_css(@page.css)
 - add_javascript(@page.javascript)
+- add_head_content(@page.head_content)
 
 - content_for :head do
   - cache "#{@page.cache_key}/head", expires_in: Workarea.config.cache_expirations.pages_fragment_cache do

data/app/views/workarea/storefront/products/_price.html.haml

@@ -1,4 +1,3 @@
+-# TODO v3.5 Remove
 - if price.present?
-  %meta{ itemprop: 'priceCurrency', content: price.currency }
-  %meta{ itemprop: 'price', content: price.to_f }
   = number_to_currency price

data/app/views/workarea/storefront/products/_pricing.html.haml

@@ -3,27 +3,33 @@
   - if product.one_price?
     %p.product-prices__price
       - if product.show_sell_range?
-        %span.product-prices__sell-price.product-prices__sell-price--min= render 'workarea/storefront/products/price', price: product.sell_min_price
+        %span.product-prices__sell-price.product-prices__sell-price--min
+          = number_to_currency(product.sell_min_price)
         %span.product-prices__sell-price.product-prices__sell-price--max – #{number_to_currency product.sell_max_price}
       - else
-        %span.product-prices__sell-price= render 'workarea/storefront/products/price', price: product.sell_min_price
+        %span.product-prices__sell-price
+          = number_to_currency(product.sell_min_price)
 
   - else
     - if product.on_sale?
       %p.product-prices__price.product-prices__price--on-sale
         - if product.show_sell_range?
-          %strong.product-prices__sell-price.product-prices__sell-price--min= render 'workarea/storefront/products/price', price: product.sell_min_price
+          %strong.product-prices__sell-price.product-prices__sell-price--min
+            = number_to_currency(product.sell_min_price)
           %strong.product-prices__sell-price.product-prices__sell-price--max – #{number_to_currency product.sell_max_price}
         - else
-          %strong.product-prices__sell-price= render 'workarea/storefront/products/price', price: product.sell_min_price
+          %strong.product-prices__sell-price
+            = number_to_currency(product.sell_min_price)
 
     - else
       %p.product-prices__price
         - if product.show_sell_range?
-          %span.product-prices__sell-price.product-prices__sell-price--min= render 'workarea/storefront/products/price', price: product.sell_min_price
+          %span.product-prices__sell-price.product-prices__sell-price--min
+            = number_to_currency(product.sell_min_price)
           %span.product-prices__sell-price.product-prices__sell-price--max – #{number_to_currency product.sell_max_price}
         - else
-          %span.product-prices__sell-price= render 'workarea/storefront/products/price', price: product.sell_min_price
+          %span.product-prices__sell-price
+            = number_to_currency(product.sell_min_price)
 
     %p.product-prices__price.product-prices__price--original
       - if product.show_original_range?

data/app/views/workarea/storefront/products/_summary.html.haml

@@ -1,12 +1,12 @@
 - cache "#{product.cache_key}/summary", expires_in: Workarea.config.cache_expirations.product_summary_fragment_cache do
   %p.product-summary__media
     = link_to product_path(product, product.browse_link_options), class: 'product-summary__media-link', style: intrinsic_ratio_product_image_styles(product.primary_image), data: { analytics_product_impression: product_impression_data(product), analytics: product_click_analytics_data(product).to_json } do
-      = image_tag(product_image_url(product.primary_image, :large_thumb), alt: product.name, itemprop: 'image', class: 'product-summary__media-image')
+      = image_tag(product_image_url(product.primary_image, :large_thumb), alt: product.name, class: 'product-summary__media-image')
 
   .product-summary__info
-    %p.product-summary__name{ itemprop: 'name' }= link_to product.name, product_path(product, product.browse_link_options), itemprop: 'url', data: { analytics: product_click_analytics_data(product).to_json }
+    %p.product-summary__name= link_to product.name, product_path(product, product.browse_link_options), data: { analytics: product_click_analytics_data(product).to_json }
 
-    .product-prices.product-prices--summary{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
+    .product-prices.product-prices--summary
       = render 'workarea/storefront/products/pricing', product: product
 
     = append_partials('storefront.product_summary', product: product)

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

@@ -3,7 +3,6 @@
 
 - content_for :head do
   - cache "#{@product.cache_key}/head", expires_in: Workarea.config.cache_expirations.product_show_fragment_cache do
-    %meta{ property: 'recent-view', content: recent_view_content(product_id: @product.id) }
     %meta{ property: 'global-id', content: @product.to_global_id.to_param }
     = append_partials('storefront.product_head', product: @product)
 
@@ -20,8 +19,11 @@
     %meta{ property: 'og:description', content: strip_tags(@product.meta_description) }
 
 - cache "#{@product.cache_key}/show", expires_in: Workarea.config.cache_expirations.product_show_fragment_cache do
+
+  = render_schema_org(product_schema(@product, related_products: @product.recommendations))
+
   .view
-    .product-detail-container{ itemscope: true, itemtype: 'http://schema.org/Product', data: { analytics: product_view_analytics_data(@product).to_json } }
+    .product-detail-container{ data: { analytics: product_view_analytics_data(@product).to_json } }
 
       .product-details{ class: "product-details--#{@product.template}" }
         = render "workarea/storefront/products/templates/#{@product.template}", product: @product
@@ -29,7 +31,7 @@
       - if @product.description.present?
         .product-detail-container__description#description
           %h2.product-detail-container__description-heading= t('workarea.storefront.products.description')
-          .product-detail-container__description-body{ itemprop: 'description' }!= @product.description
+          .product-detail-container__description-body!= @product.description
 
       = append_partials('storefront.product_description', product: @product)
 
@@ -40,7 +42,7 @@
             .grid{ data: { analytics: product_list_analytics_data('Product Recommendations').to_json } }
               - @product.recommendations.each do |product|
                 .grid__cell.grid__cell--50.grid__cell--33-at-medium.grid__cell--16-at-wide
-                  .product-summary.product-summary--small{ itemprop: 'isRelatedTo', itemscope: true, itemtype: 'http://schema.org/Product' }
+                  .product-summary.product-summary--small
                     = render 'workarea/storefront/products/summary', product: product
 
       %div{ data: { recommendations_placeholder: recent_views_path } }

data/app/views/workarea/storefront/products/templates/_generic.html.haml

@@ -2,12 +2,12 @@
   .grid__cell.grid__cell--60-at-medium
 
     .product-details__name
-      %h1.product-details__heading{ itemprop: 'name' }= product.name
+      %h1.product-details__heading= product.name
 
       %p.product-details__id
-        %span{ itemprop: 'productID' }= product.id
+        %span= product.id
 
-    .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
+    .product-prices.product-prices--details
       = render 'workarea/storefront/products/pricing', product: product
 
     = append_partials('storefront.product_pricing_details', product: product)
@@ -49,13 +49,13 @@
 
     = append_partials('storefront.product_details', product: product)
 
-    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button', itemprop: 'url'
+    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button'
 
   .grid__cell.grid__cell--40-at-medium
 
     .product-details__primary-image
       = link_to(product_image_url(product.primary_image, :zoom), target: '_blank', rel: 'noopener', class: 'product-details__primary-image-link', style: intrinsic_ratio_product_image_styles(product.primary_image), data: { dialog_button: '' }) do
-        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), itemprop: 'image', class: 'product-details__primary-image-link-image'
+        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), class: 'product-details__primary-image-link-image'
 
     - if product.images.length > 1
       .product-details__alt-images

data/app/views/workarea/storefront/products/templates/_option_selects.html.haml

@@ -2,16 +2,14 @@
   .grid__cell.grid__cell--60-at-medium
 
     .product-details__name
-      %h1.product-details__heading{ itemprop: 'name' }= product.name
+      %h1.product-details__heading= product.name
 
       %p.product-details__id
-        %span{ itemprop: 'productID' }= product.id
+        %span= product.id
 
-    .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
+    .product-prices.product-prices--details
       = render 'workarea/storefront/products/pricing', product: product
 
-    = append_partials('storefront.product_pricing_details', product: product)
-
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))
@@ -52,13 +50,13 @@
 
     = append_partials('storefront.product_details', product: product)
 
-    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button', itemprop: 'url'
+    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button'
 
   .grid__cell.grid__cell--40-at-medium
 
     .product-details__primary-image
       = link_to(product_image_url(product.primary_image, :zoom), target: '_blank', rel: 'noopener', class: 'product-details__primary-image-link', style: intrinsic_ratio_product_image_styles(product.primary_image), data: { dialog_button: '' }) do
-        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), itemprop: 'image', class: 'product-details__primary-image-link-image'
+        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), class: 'product-details__primary-image-link-image'
 
     - if product.images.length > 1
       .product-details__alt-images

data/app/views/workarea/storefront/products/templates/_option_thumbnails.html.haml

@@ -2,16 +2,14 @@
   .grid__cell.grid__cell--60-at-medium
 
     .product-details__name
-      %h1.product-details__heading{ itemprop: 'name' }= product.name
+      %h1.product-details__heading= product.name
 
       %p.product-details__id
-        %span{ itemprop: 'productID' }= product.id
+        %span= product.id
 
-    .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
+    .product-prices.product-prices--details
       = render 'workarea/storefront/products/pricing', product: product
 
-    = append_partials('storefront.product_pricing_details', product: product)
-
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))
@@ -58,13 +56,13 @@
 
     = append_partials('storefront.product_details', product: product)
 
-    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button', itemprop: 'url'
+    %p.product-details__full-details=link_to t('workarea.storefront.products.view_full_details'), product_path(product, color: params[:color]), class: 'text-button'
 
   .grid__cell.grid__cell--40-at-medium
 
     .product-details__primary-image
       = link_to(product_image_url(product.primary_image, :zoom), target: '_blank', rel: 'noopener', class: 'product-details__primary-image-link', style: intrinsic_ratio_product_image_styles(product.primary_image), data: { dialog_button: '' }) do
-        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), itemprop: 'image', class: 'product-details__primary-image-link-image'
+        = image_tag product_image_url(product.primary_image, :detail), alt: t('workarea.storefront.products.image_alt_attribute', name: product.name), class: 'product-details__primary-image-link-image'
 
     - if product.images.length > 1
       .product-details__alt-images