workarea-storefront 3.4.45 → 3.5.0.beta.1

data/app/controllers/workarea/storefront/content_areas_controller.rb

@@ -3,6 +3,7 @@ module Workarea
     class ContentAreasController < Storefront::ApplicationController
       layout 'workarea/storefront/empty'
 
+      skip_around_action :apply_segments
       before_action :require_login
       before_action :require_admin
 

data/app/controllers/workarea/storefront/content_blocks_controller.rb

@@ -2,6 +2,7 @@ module Workarea
   class Storefront::ContentBlocksController < Storefront::ApplicationController
     layout 'workarea/storefront/empty'
 
+    skip_around_action :apply_segments
     before_action :require_login
     before_action :require_admin
     before_action :disable_xss_protection

data/app/controllers/workarea/storefront/current_checkout.rb

@@ -5,7 +5,7 @@ module Workarea
 
       included do
         helper_method :current_order
-        after_action :set_session_order_id
+        after_action :set_order_id_cookie
       end
 
       # The current order for the current session.
@@ -14,8 +14,11 @@ module Workarea
       #
       def current_order
         @current_order ||= Order.find_current(
-          id: session[:order_id],
-          user_id: cookies.signed[:user_id]
+          # TODO session[:order_id] is deprecated in v3.5, remove in v3.6
+          # TODO cookies.signed[:user_id] is deprecated in v3.5, remove in v3.6
+
+          id: cookies.signed[:order_id].presence || session[:order_id],
+          user_id: session[:user_id].presence || cookies.signed[:user_id]
         )
       end
 
@@ -23,13 +26,16 @@ module Workarea
       #
       def current_order=(order)
         @current_order = order
-        session[:order_id] = order.try(:id)
+        cookies.permanent.signed[:order_id] = order&.id
       end
 
       # Removes the current order from the session.
       #
       def clear_current_order
+        # TODO session[:order_id] is deprecated in v3.5, remove in v3.6
         session.delete(:order_id)
+
+        cookies.delete(:order_id)
         @current_order = nil
       end
 
@@ -38,11 +44,7 @@ module Workarea
       # page.
       #
       def completed_order=(order)
-        cookies.signed[:completed_order] = {
-          value: order.id,
-          expires: Workarea.config.completed_order_timeout.from_now
-        }
-
+        session[:completed_order_id] = order&.id
         @completed_order = order
       end
 
@@ -52,9 +54,8 @@ module Workarea
       # @return [Order]
       #
       def completed_order
-        if cookies.signed[:completed_order].present?
-          @completed_order ||= Order.find(cookies.signed[:completed_order])
-        end
+        return @completed_order if defined?(@completed_order)
+        @completed_order = Order.find(session[:completed_order_id]) rescue nil
       end
 
       # Get the current checkout for the session.
@@ -81,11 +82,16 @@ module Workarea
         current_checkout.shippings
       end
 
+      def logout
+        super
+        clear_current_order
+      end
+
       private
 
-      def set_session_order_id
+      def set_order_id_cookie
         if @current_order.present? && @current_order.persisted?
-          session[:order_id] = @current_order.id
+          cookies.permanent.signed[:order_id] = @current_order.id
         end
       end
 

data/app/controllers/workarea/storefront/downloads_controller.rb

@@ -0,0 +1,18 @@
+module Workarea
+  module Storefront
+    class DownloadsController < Storefront::ApplicationController
+      def show
+        token = Fulfillment::Token.find(params[:id])
+        sku = Fulfillment::Sku.find(token.sku) rescue nil
+
+        if token&.enabled? && sku&.downloadable?
+          token.inc(downloads: 1)
+          send_file sku.file.file, filename: sku.file_name
+        else
+          flash[:info] = t('workarea.storefront.flash_messages.download_unavailable')
+          redirect_to root_path
+        end
+      end
+    end
+  end
+end

data/app/controllers/workarea/storefront/email_signups_controller.rb

@@ -8,6 +8,7 @@ module Workarea
       signup = Email.signup(params[:email])
 
       if signup.try(:valid?)
+        update_tracking!(email: signup.email)
         flash[:success] = t('workarea.storefront.flash_messages.email_signed_up')
       else
         flash[:error] = t('workarea.storefront.flash_messages.email_signup_error')

data/app/controllers/workarea/storefront/errors_controller.rb

@@ -1,6 +1,8 @@
 module Workarea
   module Storefront
     class ErrorsController < Storefront::ApplicationController
+      after_action :skip_session
+
       def not_found
         redirect_url = Navigation::Redirect.find_destination(
           request.env['action_dispatch.original_path']
@@ -53,6 +55,10 @@ module Workarea
           end
         end
       end
+
+      def skip_session
+        request.session_options[:skip] = true
+      end
     end
   end
 end

data/app/controllers/workarea/storefront/recent_views_controller.rb

@@ -1,51 +1,18 @@
 module Workarea
   class Storefront::RecentViewsController < Storefront::ApplicationController
     skip_before_action :verify_authenticity_token
-    before_action :block_robots
 
     def show
-      if stale?(etag: user_activity, last_modified: user_activity.updated_at)
-        @recent_views = Storefront::UserActivityViewModel.new(user_activity)
+      if stale?(etag: current_metrics, last_modified: current_metrics.updated_at)
+        @recent_views = Storefront::UserActivityViewModel.new(current_metrics, view_model_options)
         render params[:view].in?(allowed_alt_views) ? params[:view] : :show
       end
     end
 
-    def update
-      if params[:product_id].present?
-        Recommendation::UserActivity.save_product(
-          current_user_activity_id,
-          params[:product_id]
-        )
-      end
-
-      if params[:category_id].present?
-        Recommendation::UserActivity.save_category(
-          current_user_activity_id,
-          params[:category_id]
-        )
-      end
-
-      if params[:search].present?
-        Recommendation::UserActivity.save_search(
-          current_user_activity_id,
-          params[:search]
-        )
-      end
-
-      head :ok
-    end
-
     private
 
     def allowed_alt_views
       ['aside', 'narrow']
     end
-
-    def block_robots
-      if Robots.is_robot?(request.user_agent)
-        head :forbidden
-        return false
-      end
-    end
   end
 end

data/app/controllers/workarea/storefront/recommendations_controller.rb

@@ -1,9 +1,9 @@
 module Workarea
   class Storefront::RecommendationsController < Storefront::ApplicationController
     def show
-      fresh_when(etag: user_activity, last_modified: user_activity.updated_at)
+      fresh_when(etag: current_metrics, last_modified: current_metrics.updated_at)
       @recommendations = Storefront::PersonalizedRecommendationsViewModel.new(
-        user_activity,
+        current_metrics,
         view_model_options
       )
     end

data/app/controllers/workarea/storefront/searches_controller.rb

@@ -3,17 +3,6 @@ module Workarea
     class SearchesController < Storefront::ApplicationController
       before_action :cache_page
 
-      def index
-        render nothing: true and return if search_query.blank?
-        autocomplete_params = params.permit(:q)
-
-        search = Search::SearchSuggestions.new(autocomplete_params)
-
-        @results = search.results.map do |result|
-          SearchSuggestionViewModel.new(result).to_h
-        end
-      end
-
       def show
         if search_query.blank?
           flash[:error] = t('workarea.storefront.flash_messages.no_search_query')

data/app/controllers/workarea/storefront/users/accounts_controller.rb

@@ -60,7 +60,7 @@ module Workarea
 
     def find_recommendations
       @recommendations = Storefront::PersonalizedRecommendationsViewModel.new(
-        user_activity,
+        current_metrics,
         view_model_options
       )
     end
@@ -74,18 +74,13 @@ module Workarea
       )
     end
 
-    def completed_order
-      return unless cookies.signed[:completed_order].present?
-      Order.find(cookies.signed[:completed_order])
-    end
-
     def save_completed_order_details(user)
       if user.email == completed_order.email
         completed_order.update_attributes!(user_id: user.id)
         SaveUserOrderDetails.new.perform(completed_order.id)
       end
 
-      cookies.delete(:completed_order)
+      self.completed_order = nil
     end
   end
 end

data/app/controllers/workarea/storefront/users/credit_cards_controller.rb

@@ -61,8 +61,11 @@ module Workarea
                     params[:credit_card].permit(
                       :first_name,
                       :last_name,
-                      :default,
-                      *Workarea.config.credit_card_attributes
+                      :number,
+                      :month,
+                      :year,
+                      :cvv,
+                      :default
                     )
                   end
 

data/app/controllers/workarea/storefront/users/passwords_controller.rb

@@ -8,11 +8,7 @@ module Workarea
 
     def edit
       reset = User::PasswordReset.find_by(token: params[:token]) rescue nil
-
-      unless reset
-        flash[:error] = t('workarea.storefront.flash_messages.password_reset_expired')
-        redirect_to forgot_password_path
-      end
+      redirect_to forgot_password_path unless reset
     end
 
     def create

data/app/helpers/workarea/storefront/application_helper.rb

@@ -2,9 +2,17 @@ module Workarea
   module Storefront
     module ApplicationHelper
       def page_title(title_content = @title)
-        title = [title_content, Workarea.config.site_name]
-                  .reject(&:blank?)
-                  .join(' - ')
+        if title_content.present?
+          title = t(
+            'workarea.storefront.layouts.page_title_with_content',
+            title_content: title_content,
+            site_name: Workarea.config.site_name
+          )
+        else
+          title = t('workarea.storefront.layouts.page_title',
+            site_name: Workarea.config.site_name
+          )
+        end
 
         unless Rails.env.in?(%w(test development production))
           title = "[#{Rails.env.upcase}] #{title}"
@@ -29,6 +37,14 @@ module Workarea
         end
       end
 
+      def add_head_content(content)
+        return unless content.present?
+
+        content_for(:head_content) do
+          content.html_safe
+        end
+      end
+
       def flash_messages
         flash.keys.inject('') do |memo, name|
           msg = flash[name]

data/app/helpers/workarea/storefront/content_helper.rb

@@ -21,7 +21,7 @@ module Workarea
           render_content_blocks_without_cache(blocks)
         else
           Rails.cache.fetch(
-            blocks.map(&:cache_key).join('/'),
+            blocks.map(&:cache_key).push(cache_varies).join('/'),
             expires_in: Workarea.config.cache_expirations.render_content_blocks
           ) { render_content_blocks_without_cache(blocks) }
         end

data/app/helpers/workarea/storefront/favicons_helper.rb

@@ -1,13 +1,12 @@
 module Workarea
   module Storefront
     module FaviconsHelper
-      def favicon_tags
-        warn <<~eos
-          DEPRECATION WARNING: favicons_helper is deprecated, use
-          `render 'workarea/storefront/favicons/tags'` directly in the layout
-          instead
-        eos
-      end
+      # TODO remove in v3.6
+      def favicon_tags; end
+      Workarea.deprecation.deprecate_methods(
+        FaviconsHelper,
+        favicon_tags: "Use `render 'workarea/storefront/favicons/tags'`"
+      )
 
       def favicons_present?
         Content::Asset.favicons.count.positive?

data/app/helpers/workarea/storefront/navigation_helper.rb

@@ -77,6 +77,16 @@ module Workarea
         end
       end
 
+      def storefront_url_for(taxon)
+        path = storefront_path_for(taxon)
+
+        return if path.blank?
+
+        protocol = Rails.application.config.force_ssl ? 'https' : 'http'
+        "#{protocol}://#{Workarea.config.host}/#{path.sub(/^\//, '')}"
+      end
+
+
       # Generate a cache key for a taxon's left navigation. Uses the
       # `:selected` taxon in the cache key if a given node is selected,
       # otherwise just appends the `section` argument onto the `taxon`'s

data/app/helpers/workarea/storefront/schema_org_helper.rb

@@ -0,0 +1,156 @@
+module Workarea
+  module Storefront
+    module SchemaOrgHelper
+      def web_site_schema
+        {
+          '@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'
+          }
+        }
+      end
+
+      def web_page_schema(type = 'WebPage')
+        {
+          '@context': 'http://schema.org',
+          '@type': type
+        }
+      end
+
+      def breadcrumb_list_schema(breadcrumbs)
+        {
+          "@context": "http://schema.org",
+          "@type": "BreadcrumbList",
+          "itemListElement": breadcrumbs.each_with_index.map do |(name, url), index|
+            {
+              "@type": "ListItem",
+              "position": index + 1,
+              "item": {
+                "@id": url,
+                "name": name
+              }
+            }
+          end
+        }
+      end
+
+      def product_schema(product, related_products: nil)
+        schema = {
+          "@context": "http://schema.org",
+          "@type": "Product",
+          "description": product.description,
+          "name": product.name,
+          "image": product_image_url(product.primary_image, :large_thumb),
+          "url": product_url(product),
+          "productID": product.id
+        }
+
+        if product.pricing.sell_min_price.present?
+          schema['offers'] = {
+            "@type": "Offer",
+            "availability": "http://schema.org/InStock",
+            "price": product.pricing.sell_min_price.to_s,
+            "priceCurrency": product.pricing.sell_min_price.currency.to_s,
+            "url": product_url(product)
+          }
+        end
+
+        if related_products.present?
+          schema['isRelatedTo'] = related_products.map do |related_product|
+            product_schema(related_product)
+          end
+        end
+
+        schema
+      end
+
+      def order_email_schema(order)
+        {
+          '@context': 'http://schema.org',
+          '@type': 'Order',
+          'merchant': {
+            '@type': 'Organization',
+            'name': Workarea.config.site_name
+          },
+          'orderNumber': order.id,
+          'orderStatus': 'http://schema.org/OrderProcessing',
+          'acceptedOffer': order.items.map do |item|
+            {
+              '@type': 'Offer',
+              'itemOffered': {
+                '@type': 'Product',
+                'name': item.product.name,
+                'sku': item.sku,
+                'url': product_url(item.product, sku: item.sku),
+                'image': path_to_url(product_image_url(item.product.primary_image, :small_thumb)),
+              },
+              'price': item.total_price.to_s,
+              'priceCurrency': item.total_price.currency.to_s,
+              'eligibleQuantity': {
+                '@type': 'QuantitativeValue',
+                'value': item.quantity
+              }
+            }
+          end,
+          'url': order_url(order),
+          'potentialAction': {
+            '@type': 'ViewAction',
+            'url': order_url(order)
+          }
+        }
+      end
+
+      def fulfillment_email_schema(order, package)
+        {
+          '@context': 'http://schema.org',
+          '@type': 'ParcelDelivery',
+          'deliveryAddress': {
+            '@type': 'PostalAddress',
+            'name': 'Ship To',
+            'streetAddress': [
+              order.shipping_address.street,
+              order.shipping_address.street_2
+            ].join(' / '),
+            'addressLocality': order.shipping_address.city,
+            'addressRegion': order.shipping_address.region,
+            'addressCountry': order.shipping_address.country,
+            'postalCode': order.shipping_address.postal_code
+          },
+          'carrier': {
+            '@type': 'Organization',
+            'name': package.carrier
+          },
+          'itemShipped': order.items.map do |item|
+            {
+              '@type': 'Product',
+              'name': item.product.name,
+              'sku': item.sku,
+              'url': product_url(item.product, sku: item.sku),
+              'image': path_to_url(product_image_url(item.product.primary_image, :small_thumb)),
+            }
+          end,
+          'partOfOrder': {
+            '@type': 'Order',
+            'orderNumber': order.id,
+            'merchant': {
+              '@type': 'Organization',
+              'name': Workarea.config.site_name
+            },
+            'orderStatus': 'http://schema.org/OrderInTransit'
+          },
+          'expectedArrivalUntil': Workarea.config.order_expected_arrival.call(order, package),
+          'trackingNumber': package.tracking_number,
+          'trackingUrl': package.tracking_link,
+          'potentialAction': {
+            '@type': 'TrackAction',
+            'target': package.tracking_link
+          }
+        }
+      end
+    end
+  end
+end