workarea-core 3.5.17 → 3.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d24b6af137b806311dbd5d13fb13a57f8693f99d767f94fb3144994fe9c7028
-  data.tar.gz: dbbfb80358c11fc03b2e470ac741f615dc2d68e5f9c6c0d55b3b69567eaa4d02
+  metadata.gz: 48dfcf76f720a117fd8f3a16cdbef856816837692dc53f731b38729c5d37b9ef
+  data.tar.gz: a1ffa660f618f5d1b428ce4db9c6d768f0a12c3490ea45f02d699fa4b5ff441f
 SHA512:
-  metadata.gz: a7f587ddc4e1e9c425eaace526f562f99ec5885002f833fd33a134164d3d20a405938a1e762b3cfd221824a77f435ebb79383591ae2bd0c3b81bd407ba0ceb12
-  data.tar.gz: 61da7b2aa4a72d5e0b5456b401f9124769fa5f43c601d33e6e14b6a64bf820910bed36faf6992a1865e603455710b05647fa62b62488fa8fd973d33edac02564
+  metadata.gz: 509b598d21369c93345837d160e2a95d271c4c0d06276192f050a2997badec0b1542a012be9c1ed10d7bb176816372825abc08370d8fb67b3cd961a96ecb6246
+  data.tar.gz: 0cf582e5e981a1524f7b1cb2229f542c2d99f8b152802386aa68a42a09de7c84602ee8c07659011ecc3a1bec1ca6ddcfdb85c2e7aa8ecdcf6333c42808b81027

data/app/controllers/workarea/current_tracking.rb

@@ -1,7 +1,6 @@
 module Workarea
   module CurrentTracking
     extend ActiveSupport::Concern
-    include HttpCaching
 
     included do
       before_action :ensure_current_metrics
@@ -27,7 +26,12 @@ module Workarea
       if email.blank?
         cookies.delete(:email)
       elsif email != cookies.signed[:email]
-        Metrics::User.find_or_initialize_by(id: email).merge!(current_visit&.metrics)
+        unless impersonating?
+          Metrics::User
+            .find_or_initialize_by(id: email)
+            .merge_views!(current_visit&.metrics)
+        end
+
         cookies.permanent.signed[:email] = email
       end
 

data/app/controllers/workarea/impersonation.rb

@@ -15,10 +15,11 @@ module Workarea
       session[:user_id] = user.id.to_s
 
       user.mark_impersonated_by!(current_user)
-      @current_user = user
+      update_tracking!(email: user.email)
     end
 
     def stop_impersonation
+      update_tracking!(email: current_admin.email)
       session[:user_id] = current_admin.id.to_s
       session.delete(:admin_id)
     end
@@ -39,7 +40,8 @@ module Workarea
     end
 
     def current_impersonation
-      @current_impersonation ||= User.find(session[:user_id])
+      return @current_impersonation if defined?(@current_impersonation)
+      @current_impersonation = User.find(session[:user_id]) rescue nil
     end
 
     def admin_browse_as_guest

data/app/middleware/workarea/application_middleware.rb

@@ -1,12 +1,15 @@
 module Workarea
   class ApplicationMiddleware
+    ASSET_REGEX = /(jpe?g|png|ico|gif|bmp|webp|tif?f|css|js|svg|otf|ttf|woff|woff2)$/
+
     def initialize(app)
       @app = app
     end
 
     def call(env)
       request = Rack::Request.new(env)
-      return @app.call(env) if request.path =~ /(jpe?g|png|ico|gif|css|js|svg)$/
+      env['workarea.asset_request'] = request.path =~ ASSET_REGEX
+      return @app.call(env) if env['workarea.asset_request']
 
       set_locale(env, request)
       setup_environment(env, request)
@@ -25,7 +28,7 @@ module Workarea
       env['workarea.visit'] = Visit.new(env)
       env['workarea.cache_varies'] = Cache::Varies.new(env['workarea.visit']).to_s
       env['rack-cache.cache_key'] = Cache::RackCacheKey
-      env['rack-cache.force-pass'] = env['workarea.visit'].admin?
+      env['rack-cache.force-pass'] = env['workarea.visit'].admin? && !env['workarea.asset_request']
     end
 
     def set_segment_request_headers(env)

data/app/models/workarea/metrics/user.rb

@@ -110,6 +110,8 @@ module Workarea
       end
 
       def merge!(other)
+        return if other.blank?
+
         # To recalculate average_order_value
         self.orders += other.orders
         self.revenue += other.revenue
@@ -132,14 +134,8 @@ module Workarea
         update['$max'] = { last_order_at: other.last_order_at.utc } if other.last_order_at.present?
 
         self.class.collection.update_one({ _id: id }, update, upsert: true)
+        other.delete
 
-        self.class.save_affinity(
-          id: id,
-          action: 'viewed',
-          product_ids: other.viewed.product_ids,
-          category_ids: other.viewed.category_ids,
-          search_ids: other.viewed.search_ids
-        )
         self.class.save_affinity(
           id: id,
           action: 'purchased',
@@ -148,7 +144,21 @@ module Workarea
           search_ids: other.purchased.search_ids
         )
 
-        reload
+        merge_views!(other)
+      end
+
+      def merge_views!(other)
+        return if other.blank?
+
+        self.class.save_affinity(
+          id: id,
+          action: 'viewed',
+          product_ids: other.viewed.product_ids,
+          category_ids: other.viewed.category_ids,
+          search_ids: other.viewed.search_ids
+        )
+
+        reload rescue self # save_affinity might not have actually persisted anything
       end
     end
   end

data/app/models/workarea/order/item.rb

@@ -33,17 +33,17 @@ module Workarea
     # To allow for custom policies defining their own methods here
     Workarea.config.fulfillment_policies.each do |class_name|
       define_method "#{class_name.demodulize.underscore}?" do
-        fulfillment == class_name.demodulize.underscore
+        fulfilled_by?(class_name.demodulize.underscore)
       end
     end
 
     # These methods exist for findability
     def shipping?
-      fulfillment == 'shipping'
+      fulfilled_by?('shipping')
     end
 
     def download?
-      fulfillment == 'download'
+      fulfilled_by?('download')
     end
 
     # Whether this order has any items that need to be fulfilled by a particular
@@ -53,7 +53,7 @@ module Workarea
     # @return [Boolean]
     #
     def fulfilled_by?(*types)
-      types.any? { |t| send("#{t}?") }
+      types.map(&:to_s).include?(fulfillment)
     end
 
     # Whether this item is a digital (not-shipped) type of item.

data/app/models/workarea/release.rb

@@ -129,6 +129,14 @@ module Workarea
       scoped.sort_by { |r| [r.publish_at, r.created_at] }
     end
 
+    def self.schedule_affected_by_changesets(changesets)
+      changesets
+        .uniq(&:release)
+        .reject { |cs| cs.release.blank? }
+        .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
+        .uniq
+    end
+
     def as_current
       self.class.with_current(self) { yield }
     end

data/app/models/workarea/search/admin/inventory_sku.rb

@@ -11,7 +11,11 @@ module Workarea
         end
 
         def jump_to_text
-          "#{model.id} (#{model.available} available)"
+          I18n.t(
+            'workarea.inventory_sku.jump_to_text',
+            id: model.id,
+            count: model.available_to_sell
+          )
         end
 
         def jump_to_position

data/app/models/workarea/search/storefront.rb

@@ -83,11 +83,7 @@ module Workarea
       end
 
       def releases
-        changesets
-          .uniq(&:release)
-          .reject { |cs| cs.release.blank? }
-          .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
-          .uniq
+        Release.schedule_affected_by_changesets(changesets)
       end
 
       def as_document

data/app/models/workarea/search/storefront/product.rb

@@ -122,21 +122,8 @@ module Workarea
           ProductPrimaryImageUrl.new(model).path
         end
 
-        # All {Releasable}s that could affect the product's Elasticsearch document
-        # should add their changesets to this method.
-        #
-        # @example Add to the changesets affecting a product in a decorator
-        #   def changesets
-        #     super.merge(SomeReleasable.for_product(product.id).changesets_with_children)
-        #   end
-        #
-        # @return [Mongoid::Criteria]
-        #
         def changesets
-          criteria = model.changesets_with_children
-          pricing.each { |ps| criteria.merge!(ps.changesets_with_children) }
-          criteria.merge!(FeaturedProducts.changesets(model.id))
-          criteria.includes(:release)
+          ProductReleases.new(model).changesets
         end
 
         private

data/app/models/workarea/shipping/service.rb

@@ -37,15 +37,22 @@ module Workarea
       end
 
       def self.by_price(price)
-        cache.select do |method|
-          (method.subtotal_min.nil? || method.subtotal_min <= price) &&
-            (method.subtotal_max.nil? || method.subtotal_max >= price)
+        cache.select do |service|
+          (service.subtotal_min.nil? || service.subtotal_min <= price) &&
+            (service.subtotal_max.nil? || service.subtotal_max >= price)
         end
       end
 
       def self.find_tax_code(carrier, name)
-        method = find_by(carrier: carrier, name: name) rescue nil
-        method.try(:tax_code)
+        service = find_by(carrier: carrier, name: name) rescue nil
+        service.present? ? service.tax_code : default_tax_code(carrier, name)
+      end
+
+      def self.default_tax_code(carrier, name)
+        default = Workarea.config.default_shipping_service_tax_code
+        return default unless default.respond_to?(:call)
+
+        default.call(carrier, name)
       end
 
       def find_rate(price = 0.to_m)

data/app/models/workarea/tax/rate.rb

@@ -57,7 +57,9 @@ module Workarea
         percentage_field = super
         return percentage_field unless percentage_field.zero?
 
-        country_percentage + region_percentage + postal_code_percentage
+        [country_percentage, region_percentage, postal_code_percentage]
+          .compact
+          .sum
       end
     end
   end

data/app/queries/workarea/product_releases.rb

@@ -1,10 +1,4 @@
 module Workarea
-  #
-  # TODO remove in v3.6
-  #
-  # This is no longer used, this logic was moved into the search models to allow
-  # it to be used for any model (not just products).
-  #
   class ProductReleases
     attr_reader :product
 
@@ -13,11 +7,7 @@ module Workarea
     end
 
     def releases
-      changesets
-        .uniq(&:release)
-        .reject { |cs| cs.release.blank? }
-        .flat_map { |cs| [cs.release] + cs.release.scheduled_after }
-        .uniq
+      Release.schedule_affected_by_changesets(changesets)
     end
 
     # All {Releasable}s that could affect the product's Elasticsearch document

data/app/queries/workarea/search/admin_search.rb

@@ -11,6 +11,10 @@ module Workarea
       def self.available_sorts
         AdminSorting.available_sorts
       end
+
+      def default_admin_sort
+        [{ _score: :desc }, { updated_at: :desc }]
+      end
     end
   end
 end

data/app/queries/workarea/search/admin_sorting.rb

@@ -16,7 +16,7 @@ module Workarea
       end
 
       def default_admin_sort
-        [{ _score: :desc },  { updated_at: :desc }]
+        [{ updated_at: :desc }, { _score: :desc }]
       end
 
       def user_selected_sort

data/app/queries/workarea/search/product_entries.rb

@@ -18,17 +18,23 @@ module Workarea
 
       def live_entries
         @live_entries ||= @products.reduce([]) do |memo, product|
-          memo + Array.wrap(index_entries_for(product.without_release))
+          memo + live_entries_for(product)
         end
       end
 
       def release_entries
-        @release_entries ||= @products.reduce([]) do |results, product|
-          releases = ProductReleases.new(product).releases
+        @release_entries ||= @products.reduce([]) do |memo, product|
+          memo + release_entries_for(product)
+        end
+      end
+
+      def live_entries_for(product)
+        Array.wrap(index_entries_for(product.without_release))
+      end
 
-          results + releases.reduce([]) do |memo, release|
-            memo + Array.wrap(index_entries_for(product.in_release(release)))
-          end
+      def release_entries_for(product)
+        ProductReleases.new(product).releases.reduce([]) do |memo, release|
+          memo + Array.wrap(index_entries_for(product.in_release(release)))
         end
       end
 

data/app/workers/workarea/update_email.rb

@@ -0,0 +1,33 @@
+module Workarea
+  class UpdateEmail
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: { User => :update, with: -> { [id, changes] } }
+    )
+
+    def perform(id, changes)
+      return unless changes['email'].present? && changes['email'].first.present?
+
+      old_email, new_email = changes['email']
+      update_payment_profile(id, old_email, new_email)
+      update_metrics(old_email, new_email)
+    end
+
+    def update_payment_profile(id, old_email, new_email)
+      user = User.find(id)
+      user.email = old_email # set old email so we lookup by old email value
+
+      Payment::Profile.update_email(PaymentReference.new(user), new_email)
+    end
+
+    def update_metrics(old_email, new_email)
+      old_metrics = Metrics::User.find(old_email) rescue nil
+      return if old_metrics.blank?
+
+      new_metrics = Metrics::User.find_or_initialize_by(id: new_email)
+      new_metrics.merge!(old_metrics)
+    end
+  end
+end

data/config/initializers/00_configuration.rb

@@ -76,6 +76,17 @@ Workarea::Configuration.define_fields do
         zip: '19106'
       },
       description: 'Origin location for calculating shipping costs'
+
+    # This can be overwritten within the app to use a proc for more complex
+    # scenarios.
+    field 'Default Shipping Service Tax Code',
+      type: String,
+      allow_blank: true,
+      description: %(
+        Tax code assigned to shipping options when an existing service does
+        not exist. This is useful for third-party gateways to assign tax codes
+        to dynamically generated options.
+      ).squish
   end
 
   fieldset 'Payment', namespaced: false do
@@ -116,11 +127,6 @@ Workarea::Configuration.define_fields do
   end
 
   fieldset 'Search', namespaced: false do
-    field 'Default Search Facet Result Sizes',
-      type: :integer,
-      default: 10,
-      description: 'The number of filter results returned for each filter type.'
-
     field 'Search Facet Result Sizes',
       type: :hash,
       values_type: :integer,
@@ -128,7 +134,15 @@ Workarea::Configuration.define_fields do
       description: %(
         The number of filter results returned for any specified filter type. If no
         size is defined for a filter type, the default will be what is specified
-        in the default config above.
+        in the default config below.
+      ).squish
+
+    field 'Default Search Facet Result Sizes',
+      type: :integer,
+      default: 10,
+      description: %(
+        The number of filter results returned for each filter type when not
+        specified above.
       ).squish
 
     field 'Search Size Facet Sort',
@@ -156,14 +170,15 @@ Workarea::Configuration.define_fields do
   end
 
   fieldset 'Communication', namespaced: false do
+
     field 'Email From',
       type: :string,
-      default: 'noreply@example.com',
+      default: -> { "#{Workarea.config.site_name} <noreply@#{Workarea.config.host}>" },
       description: 'The email address used as the sender of system emails'
 
     field 'Email To',
       type: :string,
-      default: 'customerservice@example.com',
+      default: -> { "#{Workarea.config.site_name} <customerservice@#{Workarea.config.host}>" },
       description: 'The email address that receives user generated emails, e.g. contact us inquiries'
 
     field 'Inquiry Subjects',

data/config/initializers/05_scheduled_jobs.rb

@@ -1,4 +1,4 @@
-unless Workarea.config.skip_service_connections
+unless Workarea.skip_services?
   Sidekiq::Cron::Job.create(
     name: 'Workarea::CleanInventoryTransactions',
     klass: 'Workarea::CleanInventoryTransactions',