workarea-core 3.4.45 → 3.5.0.beta.1

data/app/workers/workarea/save_order_metrics.rb

@@ -2,6 +2,7 @@ module Workarea
   class SaveOrderMetrics
     include Sidekiq::Worker
     include Sidekiq::CallbacksWorker
+    include SaveMetrics
 
     sidekiq_options enqueue_on: { Order => :place }, queue: 'low'
 
@@ -15,87 +16,22 @@ module Workarea
         save_catalog(metrics)
         save_traffic(metrics)
         save_pricing(metrics)
+        save_tenders(metrics)
+        save_segments(metrics)
 
         order.metrics_saved!
       end
 
-      def save_sales(metrics)
-        Metrics::SalesByDay.inc(at: metrics.placed_at, **metrics.sales_data)
-      end
-
       def save_user(metrics)
-        Metrics::User.save_order(
-          email: metrics.email,
-          revenue: metrics.total_price,
-          discounts: metrics.sales_data[:discounts],
-          at: metrics.placed_at
+        Metrics::User.save_order(at: metrics.occured_at, **metrics.user_data)
+        Metrics::User.save_affinity(
+          id: metrics.email,
+          action: 'purchased',
+          product_ids: metrics.products.keys,
+          category_ids: metrics.categories.keys,
+          search_ids: metrics.searches.keys
         )
       end
-
-      def save_catalog(metrics)
-        metrics.products.each do |product_id, data|
-          Metrics::ProductByDay.inc(
-            key: { product_id: product_id },
-            at: metrics.placed_at,
-            **data
-          )
-        end
-
-        metrics.categories.each do |category_id, data|
-          Metrics::CategoryByDay.inc(
-            key: { category_id: category_id },
-            at: metrics.placed_at,
-            **data
-          )
-        end
-
-        metrics.skus.each do |sku, data|
-          Metrics::SkuByDay.inc(
-            key: { sku: sku },
-            at: metrics.placed_at,
-            **data
-          )
-        end
-      end
-
-      def save_traffic(metrics)
-        if metrics.country.present?
-          Metrics::CountryByDay.inc(
-            key: { country: metrics.country },
-            at: metrics.placed_at,
-            **metrics.sales_data
-          )
-        end
-
-        metrics.searches.each do |query_id, data|
-          Metrics::SearchByDay.inc(
-            key: { query_id: query_id },
-            at: metrics.placed_at,
-            **metrics.sales_data
-          )
-        end
-
-        if metrics.traffic_referrer.present?
-          Metrics::TrafficReferrerByDay.inc(
-            key: {
-              medium: metrics.traffic_referrer.medium,
-              source: metrics.traffic_referrer.source
-            },
-            at: metrics.placed_at,
-            **metrics.sales_data
-          )
-        end
-      end
-
-      def save_pricing(metrics)
-        metrics.discounts.each do |discount_id, data|
-          Metrics::DiscountByDay.inc(
-            key: { discount_id: discount_id },
-            at: metrics.placed_at,
-            **data
-          )
-        end
-      end
     end
 
     def perform(order_id)

data/app/workers/workarea/status_reporter.rb

@@ -3,10 +3,8 @@ module Workarea
     include Sidekiq::Worker
 
     def perform(*)
-      emails = User.status_email_recipients
-      yesterday = Time.current - 1.day
-
-      Admin::StatusReportMailer.report(emails, yesterday).deliver_now
+      users = User.status_email_recipients.to_a
+      Admin::StatusReportMailer.report_to_many(users).each(&:deliver_now)
     end
   end
 end

data/app/workers/workarea/synchronize_user_metrics.rb

@@ -0,0 +1,17 @@
+module Workarea
+  class SynchronizeUserMetrics
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: { User => :save, only_if: -> { admin_changed? || tags_changed? } },
+      queue: 'low'
+    )
+
+    def perform(id)
+      user = User.find(id)
+      metrics = Metrics::User.find_or_create_by(id: user.email)
+      metrics.set(admin: user.admin?, tags: user.tags)
+    end
+  end
+end

data/app/workers/workarea/update_payment_profile_email.rb

@@ -0,0 +1,22 @@
+module Workarea
+  class UpdatePaymentProfileEmail
+    include Sidekiq::Worker
+    include Sidekiq::CallbacksWorker
+
+    sidekiq_options(
+      enqueue_on: { User => :update, with: -> { [id, changes] } }
+    )
+
+    def perform(id, changes)
+      if changes['email'].present? && changes['email'].first.present?
+        old_email = changes['email'].first
+        new_email = changes['email'].last
+
+        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
+    end
+  end
+end

data/app/workers/workarea/verify_scheduled_releases.rb

@@ -1,14 +1,15 @@
 module Workarea
-  # Verify that jobs for publishing and undoing releases do not get removed
-  # unintentionally from sidekiq and prevent the release from updating at the
+  # Verify that jobs for publishing releases do not get removed
+  # unintentionally from Sidekiq and prevent the release from updating at the
   # expected time. If any are found missing, add a new job.
   # Runs hourly by default, 5 minutes before each hour.
   #
   class VerifyScheduledReleases
     include Sidekiq::Worker
+    sidekiq_options queue: 'releases'
 
     def perform(*)
-      # Both PublishRelease and UndoRelease use the default queue,
+      # PublishRelease uses the default queue,
       # so only look there for scheduled release jobs
       job_ids = Sidekiq::Queue.new.map { |job| job.jid }
       now = Time.current
@@ -21,14 +22,6 @@ module Workarea
           release.set_publish_job
           release.save!
         end
-
-        if release.undo_at.present? &&
-           release.undo_at > now &&
-           !job_ids.include?(release.undo_job_id)
-
-          release.set_undo_job
-          release.save!
-        end
       end
     end
   end

data/config/initializers/00_configuration.rb

@@ -0,0 +1,185 @@
+Workarea::Configuration.define_fields do
+  fieldset 'Users', namespaced: false do
+    field 'Allowed Login Attempts',
+      type: :integer,
+      default: 6,
+      description: 'How many failed login attempts before marking the user locked out'
+
+    field 'Password Reset Timeout',
+      type: :duration,
+      default: 2.hours,
+      description: 'How long a password reset URL stays valid'
+
+    field 'Password Strength',
+      type: :symbol,
+      default: :weak,
+      values: [
+        ['Weak', :weak, title: 'Requires minimum 7 characters'],
+        ['Medium', :medium, title: 'Requires minimum 7 characters of letters and numbers'],
+        ['Strong', :strong, title: 'Requires minimum 8 characters consisting of letters, numbers, and special characters.']
+      ],
+      description: 'Password requirement level for customers. Admin users always require a strong password.'
+  end
+
+  fieldset 'Checkout', namespaced: false do
+    field 'Checkout Expiration',
+      type: :duration,
+      default: 15.minutes,
+      description: 'How long a checkout can be idle before the user is forced to restart'
+
+    field 'Item Count Limit',
+      type: :integer,
+      default: 100,
+      description: 'How many unique items can be added to a single cart'
+  end
+
+  fieldset 'Orders', namespaced: false do
+    field 'Order Active Period',
+      type: :duration,
+      default: 2.hours,
+      description: 'How long an order is active without changing before considering it abandoned'
+
+    field 'Order Expiration Period',
+      type: :duration,
+      default: 6.months,
+      description: 'How long to wait until abandoned orders are deleted from the database'
+
+    field 'Recent Order Count',
+      type: :integer,
+      default: 3,
+      description: 'Number of orders to show in account summary dashboard'
+
+    field 'Storefront User Order Display Count',
+      type: :integer,
+      default: 50,
+      description: 'Number of orders to display on the user order history page'
+  end
+
+  fieldset 'Shipping', namespaced: false do
+    field 'Allow Shipping Address P.O. Box',
+      id: :allow_shipping_address_po_box,
+      type: :boolean,
+      default: false,
+      description: 'Whether or not to allow P.O. Box addresses for shipping addresses'
+
+    field 'Shipping Dimensions',
+      type: :array,
+      default: [1, 1, 1],
+      description: %(
+        Default package dimensions to use for calculating shipping costs.
+        It's recommended to set these to your average or standard box size when
+        using shipping rates from a carrier. Dimensions on specific shipping SKUs
+        will override this value.
+      ).squish
+
+    field 'Shipping Origin',
+      type: :hash,
+      default: {
+        country: 'US',
+        state: 'PA',
+        city: 'Philadelphia',
+        zip: '19106'
+      },
+      description: 'Origin location for calculating shipping costs'
+  end
+
+  fieldset 'Payment', namespaced: false do
+    field 'Allow Payment Address P.O. Box',
+      id: :allow_payment_address_po_box,
+      type: :boolean,
+      default: true,
+      description: 'Whether or not to allow P.O. Box addresses for billing addresses'
+  end
+
+  fieldset 'Inventory', namespaced: false do
+    field 'Low Inventory Threshold',
+      type: :integer,
+      default: 5,
+      description: 'Minimum available quantity for a sku before inventory is considered low'
+  end
+
+  fieldset 'Content', namespaced: false do
+    field 'Minimum Content Search Words',
+      type: :integer,
+      default: 5,
+      description: 'Minimum number of words for content to be searchable on the storefront'
+
+    field 'Placeholder Text',
+      type: :string,
+      default: %(
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sagittis
+        faucibus augue, sit amet mattis leo tincidunt ac. Nullam vulputate
+        eleifend enim. Nunc eu lorem semper, convallis ipsum pharetra, pretium
+        metus. Donec lobortis dolor ac metus vulputate vulputate nec at nulla.
+        Suspendisse potenti. Praesent placerat elementum justo quis malesuada.
+        Donec sollicitudin ligula augue, rutrum vestibulum ex rutrum in.
+        Integer id orci eu nisl accumsan suscipit a ut sapien. Nam non justo at
+        nibh laoreet tempus. Sed sagittis velit eu tellus imperdiet, et ultricies
+        justo aliquet. Fusce id felis sem.
+      ).squish,
+      description: 'Placeholder text used for content block default data'
+  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,
+      default: { color: 10, size: 10 },
+      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.
+      ).squish
+
+    field 'Search Size Facet Sort',
+      id: :search_facet_size_sort,
+      type: :array,
+      default: ['Extra Small', 'Small', 'Medium', 'Large', 'Extra Large'],
+      description: %(
+        The order the size facets will be displayed on storefront search results
+        and category browse.
+      ).squish
+
+    field 'Search Sufficient Results',
+      type: :integer,
+      default: 2,
+      description: %(
+        The minimum number of search results required to consider the results
+        sufficient. If a search result set is not sufficient, the search will
+        try another pass with looser options to bring in more matches.
+      ).squish
+
+    field 'Search Suggestions',
+      type: :integer,
+      default: 5,
+      description: 'How many search suggestions should be shown in the autocomplete searches.'
+  end
+
+  fieldset 'Communication', namespaced: false do
+    field 'Email From',
+      type: :string,
+      default: 'noreply@example.com',
+      description: 'The email address used as the sender of system emails'
+
+    field 'Email To',
+      type: :string,
+      default: 'customerservice@example.com',
+      description: 'The email address that receives user generated emails, e.g. contact us inquiries'
+
+    field 'Inquiry Subjects',
+      type: :hash,
+      default: {
+        'orders' => 'Orders',
+        'returns' => 'Returns and Exchanges',
+        'products' => 'Product Information',
+        'feedback' => 'Feedback',
+        'general' => 'General Inquiry'
+      },
+      description: 'Subjects list for the contact form'
+  end
+end

data/config/initializers/02_assets.rb

@@ -8,6 +8,7 @@ Rails.application.config.assets.precompile += %w(
   workarea/storefront/style_guide_product.jpg
   workarea/**/*.svg
   workarea/**/email.css
+  workarea/admin/email_logo.png
 )
 
 InlineSvg.configure do |config|

data/config/initializers/05_scheduled_jobs.rb

@@ -13,13 +13,6 @@ unless Workarea.config.skip_service_connections
     queue: 'low'
   )
 
-  Sidekiq::Cron::Job.create(
-    name: 'Workarea::CleanUserActivity',
-    klass: 'Workarea::CleanUserActivity',
-    cron: "0 0 * * * #{Time.zone.tzinfo.identifier}",
-    queue: 'low'
-  )
-
   Sidekiq::Cron::Job.create(
     name: 'Workarea::ProcessProductRecommendations',
     klass: 'Workarea::ProcessProductRecommendations',

data/config/initializers/10_rack_middleware.rb

@@ -7,7 +7,6 @@ if !app.config.action_dispatch.rack_cache
 else
   require 'rack/cache'
   app.config.middleware.insert_after Rack::Cache, Dragonfly::Middleware, :workarea
-  app.config.middleware.insert_before Rack::Cache, Workarea::RackCacheConfigMiddleware
 end
 
 unless Rails.env.test? || Rails.env.development?
@@ -23,7 +22,5 @@ Rails.application.config.middleware.insert_after(
 )
 
 app.config.middleware.use Workarea::EnforceHostMiddleware
-
-if Rails.env.test?
-  app.config.middleware.insert(0, Workarea::StripHttpCachingMiddleware)
-end
+app.config.middleware.insert(0, Workarea::ApplicationMiddleware)
+app.config.middleware.insert(0, Workarea::StripHttpCachingMiddleware) if Rails.env.test?

data/config/initializers/11_payment.rb

@@ -2,6 +2,10 @@ if Rails.env.test? || Rails.env.development?
   ActiveMerchant::Billing::Base.mode = :test
 end
 
+if Rails.env.test?
+  Workarea.config.fraud_analyzer = "Workarea::Checkout::Fraud::TestAnalyzer"
+end
+
 if Workarea.config.gateways.credit_card.blank?
   Workarea.config.gateways.credit_card = ActiveMerchant::Billing::BogusGateway.new
   ActiveMerchant::Billing::Base.mode = :test

data/config/initializers/13_rack_attack.rb

@@ -30,7 +30,7 @@ class Rack::Attack
   #
   # Key: "rack::attack:ignore/cookies/admin"
   safelist('ignore/admins') do |request|
-    request.cookies['cache'] == 'false'
+    request.env['workarea.visit']&.admin?
   end
 
   #
@@ -157,9 +157,7 @@ class Rack::Attack
   # number is usable.
   #
   blocklist('req/credit_cards') do |request|
-    key = [request.ip, request.cookies['user_id']].reject(&:blank?).join('/')
-
-    Rack::Attack::Allow2Ban.filter(key, maxretry: 10, findtime: 1.hour, bantime: 1.day) do
+    Rack::Attack::Allow2Ban.filter(request.ip, maxretry: 10, findtime: 1.hour, bantime: 1.day) do
       request.path =~ /place_order|credit_cards/ && !request.get?
     end
   end

data/config/initializers/14_content_block_types.rb

@@ -1,4 +1,4 @@
-Workarea::Content.define_block_types do
+Workarea.define_content_block_types do
   #
   # Columnar Blocks
   #
@@ -8,8 +8,8 @@ Workarea::Content.define_block_types do
     description 'Positionable button over a background image.'
 
     fieldset 'Image' do
-      field 'Asset', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('960x470_light.png')
-      field 'Alt Text', :string, default: 'An Image'
+      field 'Asset', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('960x470_light.png'), alt_field: 'Alt Text'
+      field 'Alt Text', :string, default: ''
     end
 
     fieldset 'Button' do
@@ -38,8 +38,8 @@ Workarea::Content.define_block_types do
     tags %w(image)
     description 'An image with an optional link.'
 
-    field 'Image', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('960x470_light.png')
-    field 'Alt', :string, default: 'An Image'
+    field 'Image', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('960x470_light.png'), alt_field: 'Alt'
+    field 'Alt', :string, default: ''
     field 'Link', :url, default: '/'
     field 'Align', :options, values: %w(Left Center Right), default: 'Center'
   end
@@ -77,8 +77,8 @@ Workarea::Content.define_block_types do
     end
 
     fieldset 'Image' do
-      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png')
-      field 'Image Alt', :string, default: 'An Image'
+      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png'), alt_field: 'Image Alt'
+      field 'Image Alt', :string, default: ''
       field 'Image Link', :url, default: '/'
       field 'Image Position', :options, values: %w(Right Left), default: 'Left'
     end
@@ -96,8 +96,8 @@ Workarea::Content.define_block_types do
     end
 
     fieldset 'Image' do
-      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png')
-      field 'Image Alt', :string, default: 'An Image'
+      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png'), alt_field: 'Image Alt'
+      field 'Image Alt', :string, default: ''
       field 'Image Link', :url, default: '/'
       field 'Image Position', :options, values: %w(Right Left), default: 'Left'
     end
@@ -115,8 +115,8 @@ Workarea::Content.define_block_types do
     end
 
     fieldset 'Image' do
-      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png')
-      field 'Image Alt', :string, default: 'An Image'
+      field 'Image', :asset, file_types: 'image', default: find_asset_id_by_file_name('100x100.png'), alt_field: 'Image Alt'
+      field 'Image Alt', :string, default: ''
       field 'Image Link', :url, default: '/'
       field 'Image Position', :options, values: %w(Right Left), default: 'Left'
     end
@@ -126,7 +126,7 @@ Workarea::Content.define_block_types do
     tags %w(quote)
     description 'A block of text styled like a quote.'
 
-    field 'Quote', :text, required: true, default: Workarea.config.placeholder_text
+    field 'Quote', :text, required: true, default: -> { Workarea.config.placeholder_text }
     field 'Author', :string, default: ''
   end
 
@@ -140,8 +140,8 @@ Workarea::Content.define_block_types do
     description 'A group of images.'
 
     series 6 do
-      field 'Image', :asset, default: find_asset_id_by_file_name('960x470_dark.png')
-      field 'Alt', :string, default: 'An Image'
+      field 'Image', :asset, default: find_asset_id_by_file_name('960x470_dark.png'), alt_field: 'Alt'
+      field 'Alt', :string, default: ''
       field 'Link', :url, default: '/'
     end
   end
@@ -151,8 +151,8 @@ Workarea::Content.define_block_types do
     description 'Image and formatted text including headings, lists, bold, and italic.'
 
     fieldset 'Image' do
-      field 'Image', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('100x100.png')
-      field 'Image Alt', :string, default: 'An Image'
+      field 'Image', :asset, required: true, file_types: 'image', default: find_asset_id_by_file_name('100x100.png'), alt_field: 'Image Alt'
+      field 'Image Alt', :string, default: ''
       field 'Image Link', :url, default: '/'
       field 'Image Position', :options, values: %w(Right Left), default: 'Left'
     end

data/config/initializers/15_endpoint_monitoring.rb

@@ -3,8 +3,7 @@
 #
 Easymon::Repository.add(
   'mongodb',
-  Workarea::Monitoring::MongoidCheck.new,
-  :critical
+  Workarea::Monitoring::MongoidCheck.new
 )
 
 #
@@ -12,8 +11,7 @@ Easymon::Repository.add(
 #
 Easymon::Repository.add(
   'elasticsearch',
-  Workarea::Monitoring::ElasticsearchCheck.new,
-  :critical
+  Workarea::Monitoring::ElasticsearchCheck.new
 )
 
 #
@@ -23,8 +21,7 @@ Easymon::Repository.add(
   "redis",
   Easymon::RedisCheck.new(
     Workarea::Configuration::Redis.persistent.to_h
-  ),
-  :critical
+  )
 )
 
 #

data/config/initializers/{21_premailer.rb → 24_premailer.rb}

@@ -1,3 +1,4 @@
 Premailer::Rails.config.merge!(
+  remove_scripts: false,
   create_shorthands: false
 )

data/config/locales/en.yml

@@ -50,33 +50,12 @@ en:
         unit: instance
       csv:
         unit: row
-    duration:
-      years:
-        one: '%{count} year'
-        other: '%{count} years'
-      months:
-        one: '%{count} month'
-        other: '%{count} months'
-      weeks:
-        one: '%{count} week'
-        other: '%{count} weeks'
-      days:
-        one: '%{count} day'
-        other: '%{count} days'
-      hours:
-        one: '%{count} hour'
-        other: '%{count} hours'
-      minutes:
-        one: '%{count} minute'
-        other: '%{count} minutes'
-      seconds:
-        one: '%{count} second'
-        other: '%{count} seconds'
     errors:
       messages:
         contains_type: cannot contain 'type'
         not_a_date: must be a date
         invalid_credit_card_number: is not a valid credit card number
+        invalid_credit_card_issuer: '%{value} cards are not accepted. We accept %{issuers}.'
         expired_date: is an expired date
         incomplete: is incomplete
         must_be_future: must be in the future
@@ -91,14 +70,16 @@ en:
         must_be_unique: must be unique
         not_star_query: "cannot be '*'"
         undo_unpublished_release: cannot be set when Publish Date is blank
+        max_allowed_segments: You cannot have more than 15 total segments in Workarea.
+        unsupported_segmentation: aren't supported for pricing.
     facets:
       price_range:
         over: 'Over %{price}'
         under: 'Under %{price}'
+    fulfillment_sku:
+      name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
-    inquiry:
-      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:
@@ -108,6 +89,8 @@ en:
         search: search
         social: social
         unknown: unknown
+      errors:
+        count_limit: Orders cannot exceed %{size} items.
     messages:
       info: Info
       error: Error
@@ -131,10 +114,14 @@ en:
       description: Price Override
     pricing_sku:
       name: "Pricing %{id}"
+    release:
+      undo: Undo %{name}
     sorts:
       available: Available
       average_order_value: Average Order Total
+      country: Country
       destination: Destination
+      downloads: Most Downloaded
       end: End Date
       last_updated: Recently Updated
       modified: Last Updated
@@ -147,6 +134,7 @@ en:
       path: Path
       pending: Pending
       popularity: Most Popular
+      postal_code: Postal Code
       price_asc: Price, Low to High
       price_desc: Price, High to Low
       published_date: Published Date
@@ -154,6 +142,7 @@ en:
       query: Search Terms
       rating: Highest Rated
       redemptions: Most Redeemed
+      region: Region
       relevance: Relevance
       sales: Sales
       sku: SKU

data/lib/generators/workarea/content_block_type/templates/initializer.rb

@@ -1,3 +1,3 @@
-Workarea::Content.define_block_types do
+Workarea.define_content_block_types do
 
 end