workarea-core 3.5.15 → 3.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18e8846e0d53604a413bfebe9180793059f63eef7478a6efb5e3c0762e95112
-  data.tar.gz: 6bc004faf032a0172b6d6495ef3d666944cef5726f91a9d41fca8fc69ce03af3
+  metadata.gz: c6261fa607f871ebfb3c05fb63ba16c8fdd08cd08d3dd0e34971ad18b1868f21
+  data.tar.gz: de5b0e46393f51fd7b1259ed6acd2aac028a4f7d8f311e19f26ec0bf331bffb3
 SHA512:
-  metadata.gz: b367c165ee4ead94e2969e1ced60328c3fe0696bcac53df7a0a67f0eea1faad9e6b82c1eb6a4d1de2530460a7424326357ab6173c70fb7f0362e5c6435bb7f20
-  data.tar.gz: c7a378a34ebc05ee82b12bf92c85b89e22ca1035ed01a429986d4f82ad7cc664cc54ba411eef0419c9773848296dab6f5beae749e7206e33c5c88c9e032279ad
+  metadata.gz: 9c8b791f8733b306e0411a309550e32055716ffd6abb952b9ce9e171bd7b3ade86a7cc6868a2d18a586c1ab847c18552b4f024dd9b2a4280a7eb2cd446fbd825
+  data.tar.gz: 033113c7e285a55c87f1fbf9b4a108d50767b9fa83041e7a9bb6bb8391164fd5a1986aa59ee1bd7c14ad0f55398d72a094cbbad4ab2c3e93dc37293be28385be

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,10 @@ 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!(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/mailers/workarea/application_mailer.rb

@@ -8,7 +8,10 @@ module Workarea
     default from: -> (*) { Workarea.config.email_from }
 
     def default_url_options(options = {})
-      super.merge(host: Workarea.config.host)
+      # super isn't returning the configured options, so manually merge them in
+      super
+        .merge(Rails.application.config.action_mailer.default_url_options.to_h)
+        .merge(host: Workarea.config.host)
     end
   end
 end

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/checkout.rb

@@ -47,11 +47,7 @@ module Workarea
     def inventory
       @inventory ||= Inventory::Transaction.from_order(
         order.id,
-        order.items.inject({}) do |memo, item|
-          memo[item.sku] ||= 0
-          memo[item.sku] += item.quantity
-          memo
-        end
+        order.sku_quantities
       )
     end
 
@@ -158,10 +154,14 @@ module Workarea
     # Used in auto completing an order for a logged in user.
     #
     # @param [Hash] parameters for updating
-    # @return [self]
+    # @return [Boolean] whether the update was successful.
     #
     def update(params = {})
-      steps.each { |s| s.new(self).update(params) }
+      return true if params.blank?
+
+      steps.reduce(true) do |result, step|
+        result &= step.new(self).update(params)
+      end
     end
 
     # Whether this checkout needs any further information

data/app/models/workarea/data_file/csv.rb

@@ -17,7 +17,15 @@ module Workarea
           assign_attributes(root, attrs)
           assign_embedded_attributes(root, attrs)
 
-          if root.save || failed_new_record_ids.exclude?(id)
+          possibly_affected_models = root.embedded_children + [root]
+          was_successful = true
+
+          possibly_affected_models.each do |model|
+            meaningful_changes = model.changes.except('updated_at')
+            was_successful &= model.save if model.changed? && meaningful_changes.present?
+          end
+
+          if was_successful || failed_new_record_ids.exclude?(id)
             log(index, root)
           else
             operation.total += 1 # ensure line numbers remain consistent

data/app/models/workarea/inquiry.rb

@@ -15,7 +15,8 @@ module Workarea
     validate :subject_exists
 
     def full_subject
-      Workarea.config.inquiry_subjects[subject]
+      I18n.t('workarea.inquiry.subjects')[subject.optionize.to_sym].presence ||
+        Workarea.config.inquiry_subjects[subject]
     end
 
     private

data/app/models/workarea/inventory/sku.rb

@@ -142,11 +142,11 @@ module Workarea
       end
 
       def policy_class
-        "Workarea::Inventory::Policies::#{policy.classify}".constantize
+        "Workarea::Inventory::Policies::#{policy.camelize}".constantize
       rescue NameError
         raise(
           InvalidPolicy,
-          "Workarea::Inventory::Policies::#{policy.classify} must be a policy class"
+          "Workarea::Inventory::Policies::#{policy.camelize} must be a policy class"
         )
       end
 

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

@@ -110,14 +110,28 @@ module Workarea
       end
 
       def merge!(other)
-        %w(orders revenue discounts cancellations refund).each do |field|
-          self.send("#{field}=", send(field) + other.send(field))
-        end
-
-        self.first_order_at = [first_order_at, other.first_order_at].compact.min
-        self.last_order_at = [last_order_at, other.last_order_at].compact.max
-        self.average_order_value = average_order_value
-        save!
+        # To recalculate average_order_value
+        self.orders += other.orders
+        self.revenue += other.revenue
+
+        update = {
+          '$set' => {
+            average_order_value: average_order_value,
+            updated_at: Time.current.utc
+          },
+          '$inc' => {
+            orders: other.orders,
+            revenue: other.revenue,
+            discounts: other.discounts,
+            cancellations: other.cancellations,
+            refund: other.refund
+          }
+        }
+
+        update['$min'] = { first_order_at: other.first_order_at.utc } if other.first_order_at.present?
+        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)
 
         self.class.save_affinity(
           id: id,
@@ -133,6 +147,8 @@ module Workarea
           category_ids: other.purchased.category_ids,
           search_ids: other.purchased.search_ids
         )
+
+        reload
       end
     end
   end

data/app/models/workarea/order.rb

@@ -375,6 +375,16 @@ module Workarea
       )
     end
 
+    # A hash with the quantity of each SKU in the order
+    #
+    # @return [Hash]
+    #
+    def sku_quantities
+      items.each_with_object(Hash.new(0)) do |item, quantities|
+        quantities[item.sku] += item.quantity
+      end
+    end
+
     private
 
     def item_count_limit

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/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     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/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/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/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/22_session_store.rb

@@ -7,5 +7,5 @@ env_expire_after = ENV['WORKAREA_SESSION_STORE_EXPIRE_AFTER']
 Rails.application.config.session_store(
   :cookie_store,
   key: "_#{Rails.application.class.name.deconstantize.underscore}_session",
-  expire_after: env_expire_after.present? ? env_expire_after.to_i : 2.weeks
+  expire_after: env_expire_after.present? ? env_expire_after.to_i : 30.minutes
 )

data/config/locales/en.yml

@@ -102,6 +102,9 @@ en:
       name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
+      jump_to_text: "%{id} (%{count} sellable)"
+    inquiry:
+      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:

data/lib/generators/workarea/install/install_generator.rb

@@ -55,6 +55,19 @@ module Workarea
       remove_file 'public/favicon.ico'
     end
 
+    def add_development_mailer_port
+      development_port = <<-CODE
+
+  config.action_mailer.default_url_options = { port: 3000 }
+      CODE
+
+      inject_into_file(
+        'config/environments/development.rb',
+        development_port,
+        before: /^end/
+      )
+    end
+
     private
 
     def app_name