workarea-storefront 3.4.45 → 3.5.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79997ad2dc6268254d6b3c331346ccd0fba6d88563720f34d3d511f203d0a644
-  data.tar.gz: 68811cc13b62ec692c4e0128333477fb1c125b24b449beacad48fd2ab99b634c
+  metadata.gz: 0fc7579774a32bc9746b0213537251f654ade0cb5cfa5764b7a80e211cc457d2
+  data.tar.gz: 640c178f253dc782cf057823ed1ca695b8fc80d17d1fb2fca58f512c6381b4dd
 SHA512:
-  metadata.gz: 52904468d65dd0c581c2c9a1e7304434c4312969564981c4830a24feac3a4ec075f65de7742653d118bb2d3c48f62806463c1cd22d97444abb3d7680819aa032
-  data.tar.gz: b1a4d9f022455601c3b91b0de6a786f9cea15ba7f9e9210a0c1343827a4e0b693ab8b63c1e34b27138c4e787c187cac21462a5adf3e5a4f90b2235bfd893a12c
+  metadata.gz: 6682f2b247acfc7eab72935986f0e58f634f1e2ee903203cda187aca005bcdfc209b624b64da25550f07eb46320df539ebe3a7b6662ccf0718a23a01220d59e2
+  data.tar.gz: b29492053eaeb0185cdb11f61b2efc777df1da1e0f855c5ed4b155d914b51480a8b1755108b63bb69c7feea8605cb51a40674dd97fe0e78f1bf1a18450302853

data/LICENSE.txt

@@ -0,0 +1,52 @@
+WebLinc
+Business Source License
+
+Licensor: WebLinc Corporation, 22 S. 3rd Street, 2nd Floor, Philadelphia PA 19106
+
+Licensed Work: Workarea Commerce Platform
+               The Licensed Work is (c) 2019 WebLinc Corporation
+
+Additional Use Grant:
+                      You may make production use of the Licensed Work without an additional license agreement with WebLinc so long as you do not use the Licensed Work for a Commerce Service.
+
+                      A "Commerce Service" is a commercial offering that allows third parties (other than your employees and contractors) to access the functionality of the Licensed Work by creating or managing commerce functionality, the products, taxonomy, assets and/or content of which are controlled by such third parties. 
+
+                      For information about obtaining an additional license agreement with WebLinc, contact licensing@workarea.com.
+
+Change Date: 2019-08-20
+
+Change License: Version 2.0 or later of the GNU General Public License as published by the Free Software Foundation
+
+Terms
+
+The Licensor hereby grants you the right to copy, modify, create derivative works, redistribute, and make non-production use of the Licensed Work. The Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+Effective on the Change Date, or the fourth anniversary of the first publicly available distribution of a specific version of the Licensed Work under this License, whichever comes first, the Licensor hereby grants you rights under the terms of the Change License, and the rights granted in the paragraph above terminate.
+
+If your use of the Licensed Work does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or authorized resellers, or you must refrain from using the Licensed Work.
+
+All copies of the original and modified Licensed Work, and derivative works of the Licensed Work, are subject to this License. This License applies separately for each version of the Licensed Work and the Change Date may vary for each version of the Licensed Work released by Licensor.
+
+You must conspicuously display this License on each original or modified copy of the Licensed Work. If you receive the Licensed Work in original or modified form from a third party, the terms and conditions set forth in this License apply to your use of that work.
+
+Any use of the Licensed Work in violation of this License will automatically terminate your rights under this License for the current and all other versions of the Licensed Work.
+
+This License does not grant you any right in any trademark or logo of Licensor or its affiliates (provided that you may use a trademark or logo of Licensor as expressly required by this License). TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE. MariaDB hereby grants you permission to use this License’s text to license your works and to refer to it using the trademark "Business Source License" as long as you comply with the Covenants of Licensor below.
+
+Covenants of Licensor
+In consideration of the right to use this License’s text and the "Business Source License" name and trademark, Licensor covenants to MariaDB, and to all other recipients of the licensed work to be provided by Licensor:
+
+To specify as the Change License the GPL Version 2.0 or any later version, or a license that is compatible with GPL Version 2.0 or a later version, where "compatible" means that software provided under the Change License can be included in a program with software provided under GPL Version 2.0 or a later version. Licensor may specify additional Change Licenses without limitation.
+
+To either: (a) specify an additional grant of rights to use that does not impose any additional restriction on the right granted in this License, as the Additional Use Grant; or (b) insert the text "None."
+
+To specify a Change Date.
+
+Not to modify this License in any other way.
+
+Notice
+The Business Source License (this document, or the "License") is not an Open Source license. However, the Licensed Work will eventually be made available under an Open Source License, as stated in this License.
+
+For more information on the use of the Business Source License generally, please visit the Adopting and Developing Business Source License FAQ.
+
+License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. "Business Source License" is a trademark of MariaDB Corporation Ab.

data/app/assets/javascripts/workarea/storefront/application.js.erb

@@ -23,7 +23,6 @@
     jquery-ui/widgets/mouse
     jquery-ui/widgets/draggable
     jquery-ui/widgets/resizable
-    jquery-ui/widgets/autocomplete
     jquery-ui/widgets/button
     jquery-ui/widgets/dialog
     jquery-ui/widgets/menu
@@ -44,8 +43,6 @@
   %w(
     workarea/core/templates/lorem_ipsum_view
     workarea/core/templates/reveal_password_button
-    workarea/storefront/templates/ui_menu_heading
-    workarea/storefront/templates/ui_menu_item
     workarea/storefront/templates/loading
     workarea/storefront/templates/message
     workarea/storefront/templates/message_dismiss_action
@@ -66,12 +63,8 @@
   # Plugin JST Templates
   append_javascripts('storefront.templates')
 
-  # Library Extensions
-  %w(
-    jquery_ui/storefront/categorized_autocomplete
-  ).each do |asset|
-    require_asset asset
-  end
+  # Plugin Library Extensions
+  append_javascripts('storefront.extensions')
 
   # Workarea Module Controller
   require_asset 'workarea/core/workarea'
@@ -107,7 +100,6 @@
     workarea/core/modules/form_submitting_controls
     workarea/core/modules/jquery
     workarea/core/modules/style_guide_empty_links
-    workarea/core/modules/style_guide_autocomplete_fields
     workarea/core/modules/reveal_password
     workarea/core/modules/local_time
     workarea/storefront/modules/forms
@@ -124,7 +116,6 @@
     workarea/storefront/modules/primary_nav_content
     workarea/storefront/modules/product_details_sku_selects
     workarea/storefront/modules/popup_buttons
-    workarea/storefront/modules/search_fields
     workarea/storefront/modules/alternate_image_buttons
     workarea/storefront/modules/scroll_to_buttons
     workarea/storefront/modules/address_region_fields
@@ -137,7 +128,6 @@
     workarea/storefront/modules/analytics
     workarea/storefront/modules/cart_count
     workarea/storefront/modules/recommendations_placeholders
-    workarea/storefront/modules/recent_views
     workarea/storefront/modules/workarea_analytics
     workarea/storefront/modules/mobile_nav_button
     workarea/storefront/modules/back_to_top_button

data/app/assets/javascripts/workarea/storefront/config.js.erb

@@ -10,7 +10,6 @@
      * @property {object} breakPoints
      * @property {object} dialog
      * @property {object} loading
-     * @property {object} searchFieldsAutocomplete
      * @property {object} popupButtons
      * @property {object} deletionForms
      * @property {object} creditCardNumberWhiteList
@@ -82,10 +81,6 @@
         }
     };
 
-    WORKAREA.config.searchFieldsAutocomplete = {
-        minLength: 2
-    };
-
     WORKAREA.config.popupButtons = {
         width: 768,
         height: 480

data/app/assets/javascripts/workarea/storefront/modules/{analytics.js → analytics.js.erb}

@@ -251,6 +251,22 @@ WORKAREA.registerModule('analytics', (function () {
             }
         }),
 
+        checkForNewSession = _.once(function () {
+            var currentSessions;
+
+            if (!WORKAREA.cookie.read('analytics_session')) {
+                currentSessions = WORKAREA.cookie.read('sessions') || 0;
+                WORKAREA.cookie.create('sessions', parseInt(currentSessions) + 1);
+
+                WORKAREA.cookie.create(
+                    'analytics_session',
+                    'true',
+                    <%= Workarea::Configuration::Session.ttl.to_f / 1.day %>
+                );
+                WORKAREA.analytics.fireCallback('newSession');
+            }
+        }),
+
         firePageView = _.once(function () {
             WORKAREA.analytics.fireCallback('pageView');
         }),
@@ -269,6 +285,7 @@ WORKAREA.registerModule('analytics', (function () {
             setupProductLists($scope);
 
             setupGenericCallbacks($scope);
+            checkForNewSession();
             firePageView();
         };
 

data/app/assets/javascripts/workarea/storefront/modules/dialog_buttons.js

@@ -5,7 +5,7 @@ WORKAREA.registerModule('dialogButtons', (function () {
     'use strict';
 
     var isSrc = function (fileName) {
-            var extension = WORKAREA.url.parse(fileName).path.split('.').pop();
+            var extension = fileName.split('.')[1];
 
             return _.includes(WORKAREA.config.imageFileExtensions, extension);
         },

data/app/assets/javascripts/workarea/storefront/modules/workarea_analytics.js

@@ -23,6 +23,10 @@ WORKAREA.analytics.registerAdapter('workarea', function () {
         };
 
     return {
+        'newSession': function () {
+            $.post(WORKAREA.routes.storefront.analyticsNewSessionPath());
+        },
+
         'categoryView': function (payload) {
             if (payload.id && _.isEmpty(payload.filters) && payload.page === 1) {
                 $.ajax({

data/app/assets/stylesheets/workarea/storefront/application.scss.erb

@@ -45,10 +45,8 @@
 <%= append_stylesheets('storefront.typography') %>
 
 @import 'avalanche';
-@import 'jquery_ui/storefront/ui_autocomplete';
 @import 'jquery_ui/storefront/ui_dialog';
 @import 'jquery_ui/storefront/ui_helper_hidden_accessible';
-@import 'jquery_ui/storefront/ui_menu';
 @import 'jquery_ui/storefront/ui_state_focus';
 @import 'jquery_ui/storefront/ui_widget_overlay';
 <%= append_stylesheets('storefront.dependencies') %>

data/app/assets/stylesheets/workarea/storefront/email/_base.scss

@@ -1,8 +1,10 @@
 /*------------------------------------*\
     #BASE
 \*------------------------------------*/
+
 body {
     margin: 0;
+    padding: 0 !important;
 }
 
 body > center {
@@ -11,10 +13,16 @@ body > center {
 
 body > center,
 body > center > table {
-    background: $email-background-color;
     text-align: left;
 }
 
+// Required to ensure background is properly displayed across clients
+body,
+body > center,
+.mso-wrapper {
+    background: $email-background-color;
+}
+
 table {
     border: 0;
     -premailer-cellpadding: 0;

data/app/assets/stylesheets/workarea/storefront/email/_components.scss

@@ -4,7 +4,7 @@
 $email-container-main-bg-color: $white !default;
 
 .email-container {
-    margin: auto;
+    margin: 0 auto;
     text-align: center;
 }
 

data/app/assets/stylesheets/workarea/storefront/email/_helpers.scss

@@ -10,6 +10,22 @@
 .align-right { text-align: right; }
 
 
+/**
+ * Display helpers
+ */
+.hidden {
+    display: none;
+    font-size: 1px;
+    line-height: 1px;
+    max-height: 0px;
+    max-width: 0px;
+    opacity: 0;
+    overflow: hidden;
+    mso-hide: all;
+    font-family: sans-serif;
+}
+
+
 /**
  * Responsive helpers
  *

data/app/assets/stylesheets/workarea/storefront/email/{_settings.scss → _settings.scss.erb}

@@ -18,5 +18,5 @@ $font-size: 16px !default;
  * Email-specific variables are defined separately.
  */
 
-$email-max-width: 600px !default;
+$email-max-width: <%= Workarea.config.storefront_email_width %>px !default;
 $email-background-color: $light-gray !default;

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

@@ -1,44 +1,59 @@
 module Workarea
   module Storefront
-    class AnalyticsController < ActionController::Metal
-      include ActionController::Instrumentation
+    class AnalyticsController < Storefront::ApplicationController
+      skip_before_action :verify_authenticity_token
+      before_action :ignore_bots
+
+      def new_session
+        Metrics::SalesByDay.inc(sessions: 1)
+
+        current_segments.each do |segment|
+          Metrics::SegmentByDay.inc(key: { segment_id: segment.id }, sessions: 1)
+        end
+      end
 
       def category_view
-        unless robot?
+        if params[:category_id].present?
           Metrics::CategoryByDay.inc(key: { category_id: params[:category_id] }, views: 1)
+          Metrics::User.save_affinity(
+            id: current_metrics_id,
+            action: 'viewed',
+            category_ids: params[:category_id]
+          )
         end
       end
 
       def product_view
-        unless robot?
+        if params[:product_id].present?
           Metrics::ProductByDay.inc(key: { product_id: params[:product_id] }, views: 1)
+          Metrics::User.save_affinity(
+            id: current_metrics_id,
+            action: 'viewed',
+            product_ids: params[:product_id]
+          )
         end
       end
 
       def search
-        unless robot?
+        query_string = QueryString.new(params[:q])
+
+        if query_string.present? && !query_string.short?
           Metrics::SearchByDay.save_search(params[:q], params[:total_results])
+          Metrics::User.save_affinity(
+            id: current_metrics_id,
+            action: 'viewed',
+            search_ids: query_string.id
+          )
         end
       end
 
-      def search_abandonment
-      warn <<~eos
-DEPRECATION WARNING: Search abandonment tracking is deprecated and will be removed \
-in Workarea 3.5.
-      eos
-      end
-
-      def filters
-      warn <<~eos
-DEPRECATION WARNING: Filter analytics tracking is deprecated and will be removed \
-in Workarea 3.5.
-      eos
-      end
-
       private
 
-      def robot?
-        Robots.is_robot?(request.user_agent)
+      def ignore_bots
+        if browser.bot?
+          head(:forbidden)
+          return false
+        end
       end
     end
   end

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

@@ -1,13 +1,10 @@
 module Workarea
   module Storefront
     class ApplicationController < Workarea::ApplicationController
-      include HttpCaching
       include Authentication
-      include AdminGuestBrowsing
       include Impersonation
       include CurrentCheckout
       include CurrentRelease
-      include UserActivity
       include OrderLookup
       include CurrentReferrer
 
@@ -16,12 +13,13 @@ module Workarea
       helper :all
       helper_method :layout_content
 
+      around_action :apply_segments
+
       def health_check
         render plain: 'ok'
       end
 
       def current_user_info
-        touch_auth_cookie
         render 'workarea/storefront/users/current_user'
       end
 

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

@@ -11,14 +11,13 @@ module Workarea
       after_action :check_inventory, except: :create
 
       def create
-        @cart = CartViewModel.new(current_order, view_model_options)
-
         # TODO: for v4, use AddItemToCart for this.
         if current_order.add_item(item_params.to_h.merge(item_details.to_h))
           check_inventory
 
           Pricing.perform(current_order, current_shippings)
 
+          @cart = CartViewModel.new(current_order, view_model_options)
           @item = OrderItemViewModel.wrap(
             current_order.items.find_existing(
               item_params[:sku],

data/app/controllers/workarea/storefront/checkout/addresses_controller.rb

@@ -46,8 +46,6 @@ module Workarea
         end
 
         def validate_shipping_options
-          return unless current_order.requires_shipping?
-
           available_options = Workarea::Storefront::CartViewModel.new(current_order).shipping_options
 
           if available_options.empty?

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

@@ -37,12 +37,14 @@ module Workarea
 
         current_order.touch_checkout!(
           ip_address: request.remote_ip,
-          user_activity_id: current_user_activity_id,
           checkout_by_id: current_admin.try(:id) || current_user.try(:id),
           source: current_admin.present? ? 'admin' : 'storefront',
           traffic_referrer: current_referrer,
-          user_agent: request.user_agent
+          user_agent: request.user_agent,
+          segment_ids: current_segments.map(&:id)
         )
+
+        update_tracking!(email: current_order.email)
       end
 
       def with_order_lock
@@ -79,6 +81,7 @@ module Workarea
 
       def setup_view_models
         Pricing.perform(current_order, current_shippings)
+        current_checkout.adjust_tender_amounts!
 
         @cart = CartViewModel.new(current_order, view_model_options)
         @summary = Checkout::SummaryViewModel.new(
@@ -90,11 +93,10 @@ module Workarea
       def set_checkout_user
         return if current_order.checking_out?
 
-        if current_user.present?
+        if logged_in?
           current_checkout.start_as(current_user)
         else
           current_checkout.start_as(:guest)
-          logout
         end
       end
     end