workarea-admin 3.5.5 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c3df00470a31e816821532e171ac24779d1bd24939a26d4ebb89fdeda1958b
-  data.tar.gz: 67bf84adf3a1b7af8d418079fb24bce185bd9faada61424be0cb6a12f7a6f355
+  metadata.gz: 2a8fa975ea8aaf2ec8c71f21118f5a6672be8af2a16221654ee8caef70edf542
+  data.tar.gz: 7aecf7b4a34ccf6f640940302d8c1f66441786457d1cba7d628e37dd2c9d305a
 SHA512:
-  metadata.gz: 2ddc8fc67de539abf69940ae959bb52fe8b6d78166729c73ed65e840d597ccc843b25dc5bee8845d434f9c93ad2263a7c5b698e75443e263389d9eaef9c2e3c8
-  data.tar.gz: 48a1dea49c725eee0ad9ad9671a5d8bb7858c837863476c438a364cea14122cef40420d53258911c7a36cdc43f06cf3a71b9aa5f26edcba5ee2885e286be221b
+  metadata.gz: 596fb4fccb2975532e5f7cd53a4b9855cb403a39abf885760f05e99fa86adf900ff1868285d0dc63e48a11b0dba603955727f65b0bfb184ee9d5b936b82ef15b
+  data.tar.gz: 135d270f27bb7fa8cd61b803f5c568278a477e16dfb8dcd0669a4bd334a79937c2269b3e16f7ac7118a9f176f125b95d5c305dd3417d0850a52e057b9462c1dd

data/app/controllers/workarea/admin/create_segments_controller.rb

@@ -23,6 +23,7 @@ module Workarea
       end
 
       def edit
+        render :setup
       end
 
       def rules

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) / orders
+          (merchandise - discounts) / units_sold
         end
 
         def previous_average_price
           return nil if previous_orders.zero?
-          (previous_merchandise - previous_discounts) / previous_orders
+          (previous_merchandise - previous_discounts) / previous_units_sold
         end
 
         def average_price_percent_change

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

@@ -16,6 +16,55 @@ 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 != 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 min_price.format unless show_range?
+        "#{max_price.format} – #{min_price.format}"
+      end
     end
   end
 end

data/app/views/workarea/admin/pricing_skus/index.html.haml

@@ -47,8 +47,7 @@
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.sku')
             %th.align-right= t('workarea.admin.fields.msrp')
-            %th.align-right= t('workarea.admin.fields.regular')
-            %th.align-right= t('workarea.admin.fields.sale_price')
+            %th.align-right= t('workarea.admin.fields.sell_price')
             %th.align-center= t('workarea.admin.fields.on_sale')
             %th.align-center= t('workarea.admin.fields.allow_discounting')
             %th= t('workarea.admin.fields.updated_at')
@@ -63,8 +62,7 @@
                 = link_to result.id, pricing_sku_path(result)
                 = upcoming_changesets_icon_for(result)
               %td.align-right= number_to_currency result.msrp
-              %td.align-right= number_to_currency result.regular_price
-              %td.align-right= number_to_currency result.sale_price
+              %td.align-right= result.sell_price
               %td.align-center= t("workarea.admin.#{result.on_sale?}")
               %td.align-center= t("workarea.admin.#{result.discountable?}")
               %td= local_time_ago(result.updated_at)

data/app/views/workarea/admin/releases/list.html.haml

@@ -47,7 +47,6 @@
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.name')
             %th.align-center= t('workarea.admin.fields.publishes')
-            %th.align-center= t('workarea.admin.fields.changes')
             %th= t('workarea.admin.fields.last_published')
             %th= t('workarea.admin.fields.updated_at')
         %tbody
@@ -65,7 +64,6 @@
                   #{local_time_ago(result.publish_at)}
                 - else
                   = t('workarea.admin.releases.index.unscheduled')
-              %td.align-center= result.changesets_with_releasable.count || 0
               %td
                 - if result.published_at.present?
                   = local_time_ago(result.published_at)

data/app/views/workarea/admin/reports/timeline.html.haml

@@ -42,7 +42,7 @@
                 = form_tag report_custom_events_path, method: 'post' do
                   .property
                     = label_tag 'custom_event_name', t('workarea.admin.fields.name'),  class: 'property__name'
-                    = text_field_tag 'custom_event[name]', nil, class: 'text-box'
+                    = text_field_tag 'custom_event[name]', nil, class: 'text-box', required: true
                   .property
                     .box.box--rounded.box--padded
                       = hidden_field_tag 'custom_event[occurred_at]', nil, data: { datetimepicker_field: { inline: true } }

data/config/locales/en.yml

@@ -1768,6 +1768,7 @@ en:
         search_terms: Search Terms
         searches: Searches
         segments: Segments
+        sell_price: Sell Price
         send_account_creation_email: Notify Them by Email
         service: Service
         service_code: Service Code

data/test/view_models/workarea/admin/insights/product_view_model_test.rb

@@ -77,13 +77,13 @@ module Workarea
 
           product = create_product(id: 'foo')
           view_model = ProductViewModel.wrap(product, starts_at: '2018-10-28', ends_at: '2018-10-29')
-          assert_equal(11.6, view_model.average_price)
-          assert_equal(10, view_model.previous_average_price)
+          assert_equal(5.8, view_model.average_price)
+          assert_equal(5.0, view_model.previous_average_price)
           assert_in_delta(15.999, view_model.average_price_percent_change)
 
           view_model = ProductViewModel.wrap(product, starts_at: '2018-10-29', ends_at: '2018-10-30')
-          assert_equal(11, view_model.average_price)
-          assert_in_delta(11.666, view_model.previous_average_price)
+          assert_equal(5.5, view_model.average_price)
+          assert_in_delta(5.833, view_model.previous_average_price)
           assert_in_delta(-5.714, view_model.average_price_percent_change)
         end
       end

data/test/view_models/workarea/admin/pricing_sku_view_model_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class PricingSkuViewModelTest < Workarea::TestCase
+      setup :setup_pricing_sku_and_prices
+
+      def setup_pricing_sku_and_prices
+        @sku = PricingSkuViewModel.wrap(
+          create_pricing_sku(on_sale: true).tap do |sku|
+            sku.prices.create!(
+              regular: 4.to_m,
+              sale: 1.to_m
+            )
+            sku.prices.create!(
+              regular: 3.to_m,
+              sale: 2.to_m
+            )
+          end
+        )
+      end
+
+      def test_sell_prices
+        assert_equal(@sku.prices.count, @sku.sell_prices.count)
+      end
+
+      def test_min_price
+        assert_equal(1.to_m, @sku.min_price)
+
+        @sku.update!(on_sale: false)
+
+        assert_equal(3.to_m, @sku.min_price)
+      end
+
+      def test_max_price
+        assert_equal(2.to_m, @sku.max_price)
+
+        @sku.update!(on_sale: false)
+
+        assert_equal(4.to_m, @sku.max_price)
+      end
+
+      def test_show_range?
+        assert(@sku.show_range?)
+
+        @sku.prices.last.destroy!
+
+        refute(@sku.show_range?)
+      end
+
+      def test_on_sale?
+        assert(@sku.on_sale?)
+
+        @sku.update!(on_sale: false)
+
+        refute(@sku.on_sale?)
+
+        @sku.prices.first.update!(on_sale: true)
+
+        assert(@sku.on_sale?)
+      end
+
+      def test_price
+        assert_match(/.2\.00 – .1\.00/, @sku.sell_price)
+
+        @sku.update!(on_sale: false)
+
+        assert_match(/.4\.00 – .3\.00/, @sku.sell_price)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: 3.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: 3.5.6
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: 3.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.5
+        version: 3.5.6
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1484,6 +1484,7 @@ files:
 - test/view_models/workarea/admin/insights/product_view_model_test.rb
 - test/view_models/workarea/admin/insights/segment_view_model_test.rb
 - test/view_models/workarea/admin/order_timeline_view_model_test.rb
+- test/view_models/workarea/admin/pricing_sku_view_model_test.rb
 - test/view_models/workarea/admin/product_images_view_model_test.rb
 - test/view_models/workarea/admin/product_rules_preview_view_model_test.rb
 - test/view_models/workarea/admin/product_view_model_test.rb