workarea-admin 3.4.45 → 3.5.0.beta.1

data/app/view_models/workarea/admin/dashboards/reports_view_model.rb

@@ -8,6 +8,12 @@ module Workarea
           end
         end
 
+        def tender_graph_data
+          sales_by_tender.results.take(5).reduce({}) do |memo, result|
+            memo.merge(result.name => result.revenue)
+          end
+        end
+
         def insights
           @insights ||= Reports::InsightsViewModel.wrap(nil, options).feed
         end
@@ -65,6 +71,13 @@ module Workarea
           )
         end
 
+        def sales_by_tender
+          @sales_by_tender ||= Reports::SalesByTenderViewModel.wrap(
+            Workarea::Reports::SalesByTender.new(options),
+            options
+          )
+        end
+
         def one_time_customers
           @one_time_customers ||= Reports::OneTimeCustomersViewModel.wrap(
             Workarea::Reports::OneTimeCustomers.new(options),
@@ -99,6 +112,18 @@ module Workarea
             options
           )
         end
+
+        def timeline
+          @timeline ||= Reports::TimelineViewModel.wrap(
+            Workarea::Reports::SalesOverTime.new(
+              options.merge(
+                starts_at: 3.months.ago,
+                group_by: 'day'
+              )
+            ),
+            options
+          )
+        end
       end
     end
   end

data/app/view_models/workarea/admin/discounts/buy_some_get_some_view_model.rb

@@ -18,6 +18,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -27,6 +31,8 @@ module Workarea
             'order_total'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/category_view_model.rb

@@ -21,6 +21,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -32,6 +36,8 @@ module Workarea
             'item_quantity'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/free_gift_view_model.rb

@@ -18,6 +18,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -27,6 +31,8 @@ module Workarea
             'order_total'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/order_total_view_model.rb

@@ -15,6 +15,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -24,6 +28,8 @@ module Workarea
             'order_total'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/product_attribute_view_model.rb

@@ -19,6 +19,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -30,6 +34,8 @@ module Workarea
             'item_quantity'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/product_view_model.rb

@@ -21,6 +21,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -32,6 +36,8 @@ module Workarea
             'item_quantity'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/quantity_fixed_price_view_model.rb

@@ -18,6 +18,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -27,6 +31,8 @@ module Workarea
             'order_total'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/discounts/shipping_view_model.rb

@@ -19,6 +19,10 @@ module Workarea
             [
               t('workarea.admin.pricing_discounts.options.when_user_is_tagged'),
               'user_tag'
+            ],
+            [
+              t('workarea.admin.pricing_discounts.options.when_in_segment'),
+              'segments'
             ]
           ]
         end
@@ -28,6 +32,8 @@ module Workarea
             'order_total'
           elsif user_tag?
             'user_tag'
+          elsif active_segment_ids.present?
+            'segments'
           end
         end
       end

data/app/view_models/workarea/admin/featured_products_view_model.rb

@@ -2,18 +2,12 @@ module Workarea
   module Admin
     module FeaturedProductsViewModel
       def featured_products
-        @featured_products ||=
-          begin
-            models = Catalog::Product.any_in(id: model.product_ids).to_a
-
-            results = model.product_ids.map do |id|
-              tmp = models.detect { |m| m.id == id }
-              next unless tmp.present?
-              Admin::ProductViewModel.new(tmp)
-            end
-
-            results.compact
-          end
+        @featured_products ||= Catalog::Product.find_ordered(model.product_ids).map do |product|
+          Admin::ProductViewModel.wrap(
+            product,
+            inventory: Inventory::Collection.new(product.skus)
+          )
+        end
       end
     end
   end

data/app/view_models/workarea/admin/fulfillment_sku_view_model.rb

@@ -0,0 +1,22 @@
+module Workarea
+  module Admin
+    class FulfillmentSkuViewModel < ApplicationViewModel
+      def timeline
+        @timeline ||= TimelineViewModel.new(model)
+      end
+
+      def tokens
+        return [] unless download?
+        @tokens ||= Fulfillment::Token.for_sku(id)
+      end
+
+      def product
+        @product ||=
+          begin
+            product = Catalog::Product.find_by_sku(model.id)
+            ProductViewModel.wrap(product, options) if product.present?
+          end
+      end
+    end
+  end
+end

data/app/view_models/workarea/admin/fulfillment_token_view_model.rb

@@ -0,0 +1,15 @@
+module Workarea
+  module Admin
+    class FulfillmentTokenViewModel < ApplicationViewModel
+      def order
+        return unless order_id.present?
+        @order ||= options[:order] || Order.find(order_id)
+      end
+
+      def order_item
+        return unless order.present? && order_item_id.present?
+        @order_item ||= order.items.detect { |i| i.id.to_s == order_item_id }
+      end
+    end
+  end
+end

data/app/view_models/workarea/admin/fulfillment_view_model.rb

@@ -36,6 +36,20 @@ module Workarea
           )
         end.compact
       end
+
+      def skus
+        @skus ||= FulfillmentSkusViewModel.wrap(
+          Fulfillment::Sku.in(id: order.items.map(&:sku).uniq).to_a,
+          options
+        )
+      end
+
+      def tokens
+        @tokens ||= FulfillmentTokenViewModel.wrap(
+          Fulfillment::Token.by_order(order.id).to_a,
+          options.merge(order: order)
+        )
+      end
     end
   end
 end

data/app/view_models/workarea/admin/insight_view_model.rb

@@ -17,12 +17,12 @@ module Workarea
         id_key_name = "#{key_name}_id"
 
         ids = model.results.flat_map { |r| r.select { |k| k =~ /#{id_key_name}$/ }.values }
-        models = klass.any_in(id: ids).to_a
+        models = klass.any_in(id: ids).to_lookup_hash
 
         insight_result.each do |key, value|
           if key =~ /#{id_key_name}$/
             new_key = key.gsub(/#{id_key_name}$/, key_name)
-            model = models.detect { |m| m.id.to_s == value.to_s }
+            model = models[value]
 
             if model.present?
               result.merge!(new_key => ApplicationController.wrap_in_view_model(model))

data/app/view_models/workarea/admin/insights/product_view_model.rb

@@ -38,12 +38,12 @@ module Workarea
 
         def average_price
           return nil if orders.zero?
-          (merchandise - discounts) / units_sold
+          (merchandise - discounts) / orders
         end
 
         def previous_average_price
           return nil if previous_orders.zero?
-          (previous_merchandise - previous_discounts) / previous_units_sold
+          (previous_merchandise - previous_discounts) / previous_orders
         end
 
         def average_price_percent_change

data/app/view_models/workarea/admin/insights/segment_view_model.rb

@@ -0,0 +1,25 @@
+module Workarea
+  module Admin
+    module Insights
+      class SegmentViewModel < ApplicationViewModel
+        include InsightsDetails
+
+        insights_scope -> { Metrics::SegmentByDay.by_segment(model.id) }
+
+        add_sparkline :orders
+        add_summaries :orders, :revenue, :average_order_value
+        add_graph_data :orders, :revenue, :average_order_value
+
+        def average_order_value
+          return nil if orders.zero?
+          revenue / orders.to_f
+        end
+
+        def previous_average_order_value
+          return nil if previous_orders.zero?
+          previous_revenue / previous_orders.to_f
+        end
+      end
+    end
+  end
+end

data/app/view_models/workarea/admin/order_view_model.rb

@@ -40,6 +40,10 @@ module Workarea
           model.updated_at
       end
 
+      def segments
+        @segments ||= Segment.in(id: model.segment_ids).to_a
+      end
+
       #
       # Shipping
       #

data/app/view_models/workarea/admin/pricing_sku_view_model.rb

@@ -16,57 +16,6 @@ module Workarea
       def inventory
         @inventory ||= Inventory::Sku.where(id: model.id).first
       end
-
-      # All prices that this SKU will be sold at. Makes a determination
-      # based on whether the price is on sale.
-      #
-      # @return [Array<Workarea::Pricing::Price>]
-      def sell_prices
-        prices.sort_by(&:sell)
-      end
-
-      # The lowest price that this SKU can be purchased for. Dependent
-      # on the current sale state of the SKU.
-      #
-      # @return [Money]
-      def min_price
-        sell_prices.first&.sell
-      end
-
-      # The highest regular price set on this SKU.
-      #
-      # @return [Money]
-      def max_price
-        sell_prices.last&.sell
-      end
-
-      # Show a price range if the `min_price` and `max_price` are not
-      # the same value.
-      #
-      # @return [Boolean]
-      def show_range?
-        min_price.present? && max_price.present? && min_price != max_price
-      end
-
-      # This SKU is considered "on sale" if it is marked as such, or if
-      # any prices that it contains are marked as such.
-      #
-      # @return [Boolean]
-      def on_sale?
-        model.on_sale? || prices.any?(&:on_sale?)
-      end
-
-      # The price of this SKU as rendered on the index page. Shows a
-      # price range when multiple prices are contained within the SKU,
-      # otherwise it just shows the only sell price available.
-      #
-      # @return [String]
-      def sell_price
-        return if min_price.blank?
-        return min_price.format unless show_range?
-
-        "#{max_price.format} – #{min_price.format}"
-      end
     end
   end
 end

data/app/view_models/workarea/admin/product_rules_preview_view_model.rb

@@ -25,7 +25,7 @@ module Workarea
       #
       def search
         @search ||= Search::CategoryBrowse.new(
-          rules: model.product_rules.select(&:valid?),
+          rules: model.product_rules.usable,
           sort: model.default_sort,
           page: options[:page] || 1,
           show_all: show_all?
@@ -52,7 +52,7 @@ module Workarea
       end
 
       def display_results?
-        model.product_rules.select(&:valid?).present?
+        model.product_rules.usable.present?
       end
 
       def base_query

data/app/view_models/workarea/admin/product_view_model.rb

@@ -42,7 +42,7 @@ module Workarea
       def storefront_view_model
         @storefront_view_model ||= Storefront::ProductViewModel.wrap(
           model,
-          options
+          @options
         )
       end
 
@@ -93,13 +93,16 @@ module Workarea
         end
       end
 
-      def variant_details
-        variants.each_with_object({}) do |variant, memo|
+      def options
+        variants.reduce({}) do |memo, variant|
           variant.details.each do |name, value|
             memo[name] ||= []
-            memo[name] += Array.wrap(value)
+            memo[name] << value
+            memo[name].flatten!
             memo[name].uniq!
           end
+
+          memo
         end
       end
 
@@ -122,7 +125,7 @@ module Workarea
       end
 
       def insights
-        @insights ||= Insights::ProductViewModel.wrap(model, options)
+        @insights ||= Insights::ProductViewModel.wrap(model, @options)
       end
 
       def inventory
@@ -134,6 +137,24 @@ module Workarea
         active? && inventory.any?(&:displayable?)
       end
 
+      def inventory_message
+        @inventory_message ||=
+          if !active?
+            t('workarea.admin.featured_products.statuses.inactive')
+          elsif inventory.backordered?
+            t('workarea.admin.featured_products.statuses.backordered')
+          elsif inventory.out_of_stock?
+            t('workarea.admin.featured_products.statuses.out_of_stock')
+          elsif inventory.low_inventory?
+            t(
+              'workarea.admin.featured_products.statuses.low_inventory',
+              count: inventory.available_to_sell
+            )
+          else
+            ''
+          end
+      end
+
       private
 
       def default_customization_options

data/app/view_models/workarea/admin/recommendations_view_model.rb

@@ -6,17 +6,9 @@ module Workarea
       end
 
       def products
-        @products ||=
-          begin
-            models = Catalog::Product.any_in(id: product_ids).to_a
-
-            product_ids.map do |id|
-              model = models.detect { |m| m.id == id }
-              next unless model
-
-              ProductViewModel.new(model)
-            end.compact
-          end
+        @products ||= Catalog::Product.find_ordered(product_ids).map do |product|
+          ProductViewModel.wrap(product)
+        end
       end
     end
   end

data/app/view_models/workarea/admin/release_calendar_view_model.rb

@@ -31,15 +31,10 @@ module Workarea
       private
 
       def find_releases_for_date(date)
-        releases_in_range.map{ |r| ReleaseViewModel.new(r, options) }
-                         .select { |r| date_within_range?(date, r) }
-      end
-
-      def date_within_range?(date, release)
-        return true if date == release.publish_time.to_date
-        return false if release.undo_at.blank?
-
-        date.to_time.to_i.between?(release.publish_time.to_i, release.undo_at.to_i)
+        releases_in_range
+          .map { |r| ReleaseViewModel.new(r, options) }
+          .select { |r| r.calendar_on == date }
+          .sort_by(&:calendar_at)
       end
 
       def releases_in_range

data/app/view_models/workarea/admin/release_event_view_model.rb

@@ -3,53 +3,20 @@ module Workarea
     class ReleaseEventViewModel < ApplicationViewModel
       include Workarea::Admin::Engine.routes.url_helpers
 
-      def all_day_event?
-        return false unless starts_and_ends?
-        ends_at - starts_at > 1
-      end
-
-      def starts_and_ends?
-        starts_at.present? && ends_at.present?
-      end
-
       def description
-        description = [
-          I18n.t('workarea.admin.releases.feed.view_release',
-            url: release_url(host: Workarea.config.host, id: id))
-        ]
-
-        if all_day_event?
-          description << I18n.t('workarea.admin.releases.feed.starts_on',
-            date: starts_at.strftime('%b %-d, %Y at %r'))
-          description << I18n.t('workarea.admin.releases.feed.ends_on',
-            date: ends_at.strftime('%b %-d, %Y at %r'))
-        end
-
-        unless ends_at.present?
-          description << I18n.t('workarea.admin.releases.feed.no_undo_date')
-        end
-
-        description.join('\n')
-      end
-
-      def publish_time
-        model.publish_at || model.published_at
-      end
-
-      def undo_time
-        model.undo_at || model.undone_at
-      end
+        I18n.t(
+          'workarea.admin.releases.feed.view_release',
+          url: release_url(host: Workarea.config.host, id: id)
+        )
+     end
 
       def starts_at
-        return if publish_time.nil?
-        time = publish_time.strftime('%Y %m %d %H %M %S').split(' ').map(&:to_i)
-        DateTime.civil(*time, publish_time.strftime('%z'))
+        model.publish_at || model.published_at
       end
 
       def ends_at
-        return if undo_time.nil?
-        time = undo_time.strftime('%Y %m %d %H %M %S').split(' ').map(&:to_i)
-        DateTime.civil(*time, undo_time.strftime('%z'))
+        return if starts_at.blank?
+        starts_at + Workarea.config.release_publish_calendar_event_size
       end
     end
   end

data/app/view_models/workarea/admin/release_view_model.rb

@@ -15,29 +15,22 @@ module Workarea
                           .reject { |changeset| changeset.releasable.blank? }
       end
 
-      def can_undo?
-        !undone? && changesets.any? { |c| c.undo.present? }
-      end
-
-      def published_on_date?(date)
-        date == publish_time.to_date
-      end
-
-      def ended_on_date?(date)
-        return true if content_release?
-        date == model.undo_at.to_date
+      def calendar_at
+        model.publish_at || model.published_at
       end
 
-      def content_release?
-        model.undo_at.blank?
+      def calendar_on
+        calendar_at&.to_date
       end
 
-      def publish_time
-        model.publish_at || model.published_at
+      def undo
+        return unless undo?
+        @undo ||= ReleaseViewModel.wrap(model.undo, options)
       end
 
-      def undo_time
-        model.undo_at || model.undone_at
+      def undoes
+        return unless undoes?
+        @undoes ||= ReleaseViewModel.wrap(model.undoes, options)
       end
     end
   end