workarea-storefront 3.4.45 → 3.5.0.beta.1

data/app/mailers/workarea/storefront/application_mailer.rb

@@ -7,6 +7,7 @@ module Workarea
 
       add_template_helper ActionView::Helpers::AssetUrlHelper
       add_template_helper Workarea::DetailsHelper
+      add_template_helper Workarea::Storefront::SchemaOrgHelper
 
       def path_to_url(path)
         protocol = Rails.application.config.force_ssl ? 'https' : 'http'

data/app/view_models/workarea/storefront/category_view_model.rb

@@ -27,9 +27,9 @@ module Workarea
 
       def search_query
         @search_query ||= Search::CategoryBrowse.new(
-          options.except(:per_page).merge(
+          options.merge(
             category_ids: [model.id],
-            rules: model.product_rules,
+            rules: model.product_rules.usable,
             terms_facets: terms_facets - %w(category),
             range_facets: range_facets,
             sort: current_sorts

data/app/view_models/workarea/storefront/content_block_view_model.rb

@@ -13,19 +13,50 @@ module Workarea
       end
 
       def locals
-        @locals ||= model.data.merge(
-          hidden_breakpoints: model.hidden_breakpoints,
-          view_model: self
-        )
+        @locals ||= model
+          .data
+          .merge(hidden_breakpoints: model.hidden_breakpoints, view_model: self)
+          .merge(asset_alt_text) do |_, block_alt, asset_alt|
+            block_alt.presence || asset_alt
+          end
       end
 
-      # This ensures memoization happens
       def find_asset(id)
-        @assets ||= {}
-        return @assets[id.to_s] if @assets[id.to_s].present?
+        return Content::Asset.image_placeholder if id.blank?
+        return assets[id.to_s] if assets[id.to_s].present?
+
+        assets[id.to_s] = Content::Asset.find(id)
+      rescue Mongoid::Errors::DocumentNotFound
+        assets[id.to_s] = Content::Asset.image_placeholder
+      end
+
+      def assets
+        @assets ||= begin
+          asset_ids = model
+            .type
+            .fields
+            .select { |field, _memo| field.type == :asset }
+            .map { |field| model.data[field.slug] }
+            .reject(&:blank?)
+            .map(&:to_s)
+
+          assets = Content::Asset.in(id: asset_ids)
 
-        @assets[id.to_s] = Content::Asset.find(id) rescue
-                           Content::Asset.image_placeholder
+          asset_ids.each_with_object({}) do |id, memo|
+            memo[id] = assets.detect { |a| a.id.to_s == id } ||
+                       Content::Asset.image_placeholder
+          end
+        end
+      end
+
+      def asset_alt_text
+        @asset_alt_texts ||= model.type
+          .fields
+          .select { |f| f.options[:alt_field].present? }
+          .each_with_object({}) do |field, memo|
+            key = field.options[:alt_field].systemize.to_sym
+            memo[key] = find_asset(model.data[field.slug])&.alt_text
+          end
       end
 
       def series
@@ -40,7 +71,7 @@ module Workarea
           data = model.data.slice(*fields)
 
           if data.present? && data.values.any?(&:present?)
-            duplicate = Content::Block.new(model.attributes)
+            duplicate = Content::Block.instantiate(model.as_document)
             duplicate.data = data
                               .map { |k, v| [k.gsub(/_\d+/, ''), v] }
                               .to_h

data/app/view_models/workarea/storefront/content_blocks/product_insights_view_model.rb

@@ -34,7 +34,7 @@ module Workarea
         end
 
         def newest_products
-          @newest_products ||= Catalog::Product.active.recent(results_count)
+          @newest_products ||= Catalog::Product.recent(results_count * 2).select(&:active?)
         end
 
         def results_count

data/app/view_models/workarea/storefront/display_content.rb

@@ -1,7 +1,7 @@
 module Workarea
   module Storefront
     module DisplayContent
-      delegate :css, :javascript,
+      delegate :css, :javascript, :head_content,
         to: :content, allow_nil: true
 
       def browser_title
@@ -25,6 +25,8 @@ module Workarea
         @open_graph_asset ||=
           if content.open_graph_asset_id.present?
             Content::Asset.find(content.open_graph_asset_id)
+          elsif (og_default = Content::Asset.open_graph_default).present?
+            og_default
           else
             Content::Asset.open_graph_placeholder
           end

data/app/view_models/workarea/storefront/inquiry_view_model.rb

@@ -9,13 +9,7 @@ module Workarea
       end
 
       def subjects
-        Workarea.config.inquiry_subjects.map do |key, default_value|
-          [
-            I18n.t('workarea.inquiry.subjects')[key.optionize.to_sym].presence ||
-            default_value,
-            key
-          ]
-        end
+        Workarea.config.inquiry_subjects.map { |k, v| [v, k] }
       end
 
       private

data/app/view_models/workarea/storefront/inventory_status_view_model.rb

@@ -3,25 +3,29 @@ module Workarea
     class InventoryStatusViewModel < ApplicationViewModel
       def message
         return '' if model.nil?
-        if purchasable?(Workarea.config.low_inventory_threshold) &&
-          !backordered?
+
+        if inventory.available?
           ::I18n.t('workarea.storefront.products.in_stock')
-        elsif purchasable? && !backordered?
+        elsif inventory.low_inventory?
           ::I18n.t(
             'workarea.storefront.products.few_left',
             quantity: available_to_sell
           )
-        elsif backordered? && backordered_until.present?
+        elsif inventory.backordered? && backordered_until.present?
           ::I18n.t(
             'workarea.storefront.products.ships_on',
             date: backordered_until.to_date.to_s(:short)
           )
-        elsif backordered?
+        elsif inventory.backordered?
           ::I18n.t('workarea.storefront.products.backordered')
-        else
+        elsif inventory.out_of_stock?
           ::I18n.t('workarea.storefront.products.out_of_stock')
         end
       end
+
+      def inventory
+        @inventory ||= Inventory::Collection.new(model.id, [model])
+      end
     end
   end
 end

data/app/view_models/workarea/storefront/order_item_view_model.rb

@@ -68,6 +68,20 @@ module Workarea
         @total_adjustments ||= price_adjustments.reduce_by_description('item')
       end
 
+      #
+      # Fulfillment
+      #
+      #
+      def fulfillment_sku
+        @fulfillment_sku ||=
+          Fulfillment::Sku.find_or_initialize_by(id: model.sku)
+      end
+
+      def token
+        return unless fulfillment_sku.download?
+        @token ||= Fulfillment::Token.for_order_item(model.order.id, model.id)
+      end
+
       def default_category_name
         @default_category_name =
           Categorization.new(catalog_product).default_model.try(:name)

data/app/view_models/workarea/storefront/product_view_model.rb

@@ -10,8 +10,6 @@ module Workarea
         else
           new(model, options)
         end
-      rescue NameError
-        new(model, options)
       end
 
       def breadcrumbs
@@ -19,12 +17,12 @@ module Workarea
           if options[:via].present?
             Navigation::Breadcrumbs.from_global_id(
               options[:via],
-              last: model.name
+              last: model
             )
           else
             Navigation::Breadcrumbs.new(
               default_category,
-              last: model.name
+              last: model
             )
           end
       end
@@ -179,6 +177,26 @@ module Workarea
           model.description
         end
       end
+
+      #
+      # Fulfillment
+      #
+      #
+
+      def fulfillment_skus
+        @fulfillment_skus ||=
+          Fulfillment::Sku.find_or_initialize_all(variants.map(&:sku))
+      end
+
+      def requires_shipping?
+        if current_variant.present?
+          fulfillment_skus
+            .detect { |sku| sku.id == current_variant.sku }
+            .requires_shipping?
+        else
+          fulfillment_skus.any?(&:requires_shipping?)
+        end
+      end
     end
   end
 end

data/app/view_models/workarea/storefront/recommendations_view_model.rb

@@ -7,12 +7,10 @@ module Workarea
       def products
         @products ||=
           begin
-            results = Catalog::Product.active.purchasable.find_ordered(product_ids)
+            results = find_displayable_products(product_ids)
 
             if results.size < result_count
-              results.push(
-                *Catalog::Product.active.purchasable.find_ordered(popular_product_ids)
-              )
+              results.push(*find_displayable_products(popular_product_ids))
             end
 
             ProductViewModel.wrap(results.uniq).take(result_count)
@@ -34,6 +32,12 @@ module Workarea
       def result_count
         raise NotImplementedError
       end
+
+      private
+
+      def find_displayable_products(ids)
+        Catalog::Product.find_ordered(ids).select(&:active?).select(&:purchasable?)
+      end
     end
   end
 end

data/app/view_models/workarea/storefront/search_view_model.rb

@@ -34,7 +34,7 @@ module Workarea
             all = Recommendation::Searches.find(options[:q]) +
               model.query_suggestions
 
-            all.uniq.take(3)
+            all.take(3)
           end
       end
 

data/app/view_models/workarea/storefront/user_activity_view_model.rb

@@ -4,33 +4,22 @@ module Workarea
       def products
         @products ||=
           begin
-            product_ids = model.product_ids.uniq.first(display_count)
-            models = Catalog::Product.any_in(_id: product_ids).to_a
-            models = models.select(&:active?)
+            product_ids = model.viewed.recent_product_ids(max: display_count, unique: true)
 
-            product_ids.map do |id|
-              product = models.detect { |p| p.id == id }
-              ProductViewModel.wrap(product) if product
-            end.compact
+            Catalog::Product.find_ordered(product_ids).select(&:active?).map do |product|
+              ProductViewModel.wrap(product, options)
+            end
           end
       end
 
       def categories
         @categories ||=
           begin
-            category_ids = model.category_ids.uniq.first(display_count)
-            models = Catalog::Category.any_in(_id: category_ids).to_a
-
-            category_ids.map do |id|
-              models.detect { |c| c.id.to_s == id.to_s }
-            end.compact
+            category_ids = model.viewed.recent_category_ids(max: display_count, unique: true)
+            Catalog::Category.find_ordered(category_ids).select(&:active?)
           end
       end
 
-      def searches
-        model.searches.uniq.first(display_count)
-      end
-
       private
 
       def display_count

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

@@ -1,5 +1,6 @@
 - add_css(layout_content.css)
 - add_javascript(layout_content.javascript)
+- add_head_content(layout_content.head_content)
 
 !!!
 /
@@ -31,21 +32,13 @@
     = append_partials('storefront.document_head')
     = javascript_include_tag Workarea.config.asset_manifests.storefront_javascript_head
 
-    %script{ type: 'application/ld+json' }
-      :plain
-        {
-          "@context": "http://schema.org",
-          "@type": "WebSite",
-          "url": "#{root_url}",
-          "potentialAction": {
-            "@type": "SearchAction",
-            "target": "#{search_url}?q={search_term_string}",
-            "query-input": "required name=search_term_string"
-          }
-        }
-
-
-  %body{ itemscope: true, itemtype: 'http://schema.org/WebPage' }
+    = render_schema_org(web_site_schema)
+    = render_schema_org(web_page_schema)
+
+    = yield :head_content
+    = yield :javascript_head
+
+  %body
     = append_partials('storefront.body_top')
 
     %nav.accessibility-nav.visually-hidden
@@ -90,7 +83,8 @@
               .page-header__search
                 = form_tag search_path, method: 'get', class: 'page-header__search-form', role: 'search' do
                   .page-header__search-value
-                    .value= search_field_tag :q, params[:q], id: 'storefront_search', class: 'text-box', title: t('workarea.storefront.searches.search'), aria: { label: t('workarea.storefront.searches.search') }, placeholder: t('workarea.storefront.searches.search'), data: { search_field: '' }
+                    .value= search_field_tag :q, params[:q], id: 'storefront_search', class: 'text-box', title: t('workarea.storefront.searches.search'), aria: { label: t('workarea.storefront.searches.search') }, placeholder: t('workarea.storefront.searches.search')
+                    = append_partials('storefront.page_header_search_value')
                   .page-header__search-button= button_tag t('workarea.storefront.forms.go'), value: 'search', class: 'button'
 
           %nav#navigation.primary-nav
@@ -112,10 +106,12 @@
             .breadcrumbs{ role: 'navigation' }
               = yield :breadcrumbs
           - elsif @breadcrumbs.present?
+            = render_schema_org(breadcrumb_list_schema(@breadcrumbs.map { |t| [t.name, storefront_url_for(t)] }))
+
             .breadcrumbs{ role: 'navigation' }
               %p.breadcrumbs__node-group
                 - @breadcrumbs.each do |taxon|
-                  %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+                  %span.breadcrumbs__node
                     - if taxon.navigable.present?
                       - if @breadcrumbs.last == taxon
                         %span.breadcrumbs__text= taxon.name

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

@@ -27,7 +27,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
     = append_partials('storefront.body_top')
 
     %nav.accessibility-nav.visually-hidden

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

@@ -5,6 +5,7 @@
 
 - add_css(@content.css)
 - add_javascript(@content.javascript)
+- add_head_content(@content.head_content)
 
 !!!
 /

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

@@ -14,7 +14,6 @@
     -# The title tag shows in email notifications, like Android 4.4.
     %title= t('workarea.storefront.email.title', host: Workarea.config.host)
 
-
     -# BEGIN: web font / @font-face
     -# You're able to load the webfont from your build here, if you so desire.
     -# This is commented out, by default, since it's something you'll have to
@@ -73,7 +72,7 @@
             mso-table-rspace: 0pt !important;
         }
 
-        /* Fixes webkit padding issue. Fix for Yahoo mail table alignment bug. Applies table-layout to the first 2 tables then removes for anything nested deeper. */
+        /* Fixes webkit padding issue. */
         table {
             border-spacing: 0 !important;
             border-collapse: collapse !important;
@@ -82,19 +81,20 @@
             margin-right: auto !important;
             margin-left: auto !important;
         }
-        table table table {
-            table-layout: auto;
-        }
 
         /* Uses a better rendering method when resizing images in IE. */
         img {
             -ms-interpolation-mode:bicubic;
         }
 
+        /* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
+        a {
+            text-decoration: none;
+        }
+
         /* A work-around for email clients meddling in triggered links. */
-        *[x-apple-data-detectors],  /* iOS */
-        .x-gmail-data-detectors,    /* Gmail */
-        .x-gmail-data-detectors *,
+        a[x-apple-data-detectors],  /* iOS */
+        .unstyle-auto-detected-links a,
         .aBn {
             border-bottom: 0 !important;
             cursor: default !important;
@@ -106,7 +106,12 @@
             line-height: inherit !important;
         }
 
-        /* Prevents Gmail from displaying an download button on large, non-linked images. */
+        /* What it does: Prevents Gmail from changing the text color in conversation threads. */
+        .im {
+            color: inherit !important;
+        }
+
+        /* Prevents Gmail from displaying a download button on large, non-linked images. */
         .a6S {
             display: none !important;
             opacity: 0.01 !important;
@@ -116,37 +121,27 @@
             display: none !important;
         }
 
-        /* Prevents underlining the button text in Windows 10 */
-        .button-link {
-            text-decoration: none !important;
-        }
-
         /* Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89  */
         /* Create one of these media queries for each additional viewport size you'd like to fix */
 
         /* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
         @media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
-            .email-container {
+            u ~ div .email-container {
                 min-width: 320px !important;
             }
         }
         /* iPhone 6, 6S, 7, 8, and X */
         @media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
-            .email-container {
+            u ~ div .email-container {
                 min-width: 375px !important;
             }
         }
         /* iPhone 6+, 7+, and 8+ */
         @media only screen and (min-device-width: 414px) {
-            .email-container {
+            u ~ div .email-container {
                 min-width: 414px !important;
             }
         }
-    -# END: CSS Reset
-
-    -# The rest of the styles are loaded from the email manifest and will be
-    -# applied to each element via premailer.
-    = stylesheet_link_tag Workarea.config.asset_manifests.storefront_email_stylesheet
 
     -# Makes background images in 72ppi Outlook render at correct size.
     /[if gte mso 9]
@@ -158,10 +153,16 @@
         </o:OfficeDocumentSettings>
         </xml>
 
+    -# END: CSS Reset
+
+    -# The rest of the styles are loaded from the email manifest and will be
+    -# applied to each element via premailer.
+    = stylesheet_link_tag Workarea.config.asset_manifests.storefront_email_stylesheet
+
   %body{ style: 'mso-line-height-rule: exactly;', width: '100%' }
     %center
       /[if mso | IE]
-        <table role="presentation" width="100%"><tr><td>
+        <table class='mso-wrapper' role="presentation" width="100%" align="center"><tr><td>
 
       -# Preheader Text
       -# A preheader (otherwise known as a ‘Johnson Box’) is the short summary
@@ -169,16 +170,22 @@
       - if content_for?(:preheader_text)
         .preheader-text= yield :preheader_text
 
-      %table.email-container{ role: 'presentation', width: 600 }
+      -# Preview Text Spacing Hack
+      -# Create white space after the desired preview text so email clients
+      -# don’t pull other distracting text into the inbox preview. Extend as
+      -# necessary.
+      .hidden!= '&zwnj;&nbsp;' * 18
+
+      %table.email-container{ role: 'presentation', width: Workarea.config.storefront_email_width }
         %tr
           %td.email-header
             = link_to "http://#{Workarea.config.host}/", class: 'logo' do
               = image_tag url_to_image('workarea/storefront/email/banner.png'), alt: t('workarea.storefront.layouts.logo'), class: 'logo__image', border: 0, size: '200x50'
 
-      %table.email-container.email-container--main{ role: 'presentation', width: 600 }
+      %table.email-container.email-container--main{ role: 'presentation', width: Workarea.config.storefront_email_width }
         = yield
 
-      %table.email-container{ role: 'presentation', width: 600 }
+      %table.email-container{ role: 'presentation', width: Workarea.config.storefront_email_width }
         %tr
           %td.email-footer
             = Workarea.config.site_name