workarea-admin 3.5.6 → 3.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8fa975ea8aaf2ec8c71f21118f5a6672be8af2a16221654ee8caef70edf542
-  data.tar.gz: 7aecf7b4a34ccf6f640940302d8c1f66441786457d1cba7d628e37dd2c9d305a
+  metadata.gz: a50c0890b678de1a3775d9227c9a1cf3a9c2a874e933342d986c943937d9b369
+  data.tar.gz: 0d30f205a6b061caa140360efdc87ebc9bc580a1673d09fb256a7dfc5a70b501
 SHA512:
-  metadata.gz: 596fb4fccb2975532e5f7cd53a4b9855cb403a39abf885760f05e99fa86adf900ff1868285d0dc63e48a11b0dba603955727f65b0bfb184ee9d5b936b82ef15b
-  data.tar.gz: 135d270f27bb7fa8cd61b803f5c568278a477e16dfb8dcd0669a4bd334a79937c2269b3e16f7ac7118a9f176f125b95d5c305dd3417d0850a52e057b9462c1dd
+  metadata.gz: 04c7943314cf9a6fc8ffe116bbdd0f6d15ccfa0f13f55e037869106593759a03d70e7554f1d898d9c9e740a8602722de9383bf067427d59a1f7ad56b6d2d3085
+  data.tar.gz: b305c1426413775da437f2887b25f42d8c4da83c75b4fbb32cf6a19bd05c1949b06425d25cc30feaeb7b2db35ecc64c6daef6ad50264d7c8a7b81a5a32ade014

data/app/assets/javascripts/workarea/admin/modules/datetimepicker_fields.js

@@ -101,11 +101,13 @@ WORKAREA.registerModule('datetimepickerFields', (function () {
         },
 
         injectUI = function($input) {
-            var placeholder = JST['workarea/admin/templates/datetime_picker']({
+            var required = !_.isEmpty($input.attr('required')) ? 'required' : '',
+                placeholder = JST['workarea/admin/templates/datetime_picker']({
                 id: $input.attr('id'),
                 initialDateTime: parseDate($input),
                 fieldSuffixes: WORKAREA.config.datetimepickerFields.fieldSuffixes,
-                name: $input.attr('id')
+                name: $input.attr('id'),
+                required: required
             });
 
             // Prevents UI being injected twice on browser back

data/app/assets/javascripts/workarea/admin/templates/datetime_picker.jst.ejs

@@ -4,13 +4,13 @@
     <div class="grid__cell grid__cell--50-at-medium">
       <div class='property'>
         <label for="<%= name + fieldSuffixes.date %>" class='property__name'><%= I18n.t('workarea.admin.js.datetime_picker.date') %></label>
-        <input type="text" name="<%= name + fieldSuffixes.date %>" id="<%= name  + fieldSuffixes.date %>" class="text-box" data-datetimepicker-field-date-input='' placeholder='YYYY-MM-DD' pattern='^\d{4}-\d{2}-\d{2}$' />
+        <input type="text" name="<%= name + fieldSuffixes.date %>" id="<%= name  + fieldSuffixes.date %>" class="text-box" data-datetimepicker-field-date-input='' placeholder='YYYY-MM-DD' pattern='^\d{4}-\d{2}-\d{2}$' <%= required %> />
       </div>
     </div>
     <div class="grid__cell grid__cell--50-at-medium">
       <div class='property'>
         <label for="<%= name + fieldSuffixes.hours %>" class='property__name'><%= I18n.t('workarea.admin.js.datetime_picker.time') %></label>
-        <select id="<%= name  + fieldSuffixes.hours %>" name="<%= name  + fieldSuffixes.hours %>">
+        <select id="<%= name  + fieldSuffixes.hours %>" name="<%= name  + fieldSuffixes.hours %>" <%= required %>>
           <% for ( var i = 1; i <= 12; i++ ) {
             var selected = ( initialDateTime.hours == i ) ? 'selected' : '';
           %>
@@ -18,7 +18,7 @@
           <% } %>
         </select>
 
-        <select id="<%= name  + fieldSuffixes.minutes %>" name="<%= name  + fieldSuffixes.minutes %>">
+        <select id="<%= name  + fieldSuffixes.minutes %>" name="<%= name  + fieldSuffixes.minutes %>" <%= required %>>
           <% for ( var i = 0; i < 60; i++ ) {
             if (i < 10) { i = '0' + i }
             var selected = ( initialDateTime.minutes == i ) ? 'selected' : '';
@@ -27,7 +27,7 @@
           <% } %>
         </select>
 
-        <select id="<%= name + fieldSuffixes.ampm %>" name="<%= name + fieldSuffixes.ampm %>">
+        <select id="<%= name + fieldSuffixes.ampm %>" name="<%= name + fieldSuffixes.ampm %>" <%= required %>>
           <option value="am" <%= initialDateTime.ampm === 'am' ? 'selected' : '' %> >am</option>
           <option value="pm" <%= initialDateTime.ampm === 'pm' ? 'selected' : '' %> >pm</option>
         </select>

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

@@ -100,7 +100,7 @@ module Workarea
       end
 
       def track_index_filters
-        session[:last_index_path] = request.fullpath
+        session[:last_index_path] = request.fullpath unless request.xhr? || request.format.json?
       end
     end
   end

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

@@ -30,14 +30,14 @@ module Workarea
       #
       # @return [Money]
       def min_price
-        sell_prices.first.sell
+        sell_prices.first&.sell
       end
 
       # The highest regular price set on this SKU.
       #
       # @return [Money]
       def max_price
-        sell_prices.last.sell
+        sell_prices.last&.sell
       end
 
       # Show a price range if the `min_price` and `max_price` are not
@@ -45,7 +45,7 @@ module Workarea
       #
       # @return [Boolean]
       def show_range?
-        min_price != max_price
+        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

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

@@ -14,25 +14,25 @@
             %li
               %strong #{t('workarea.admin.fields.tax_code')}:
               = model.tax_code.presence || '(none)'
-            %li
-              %strong #{t('workarea.admin.fields.msrp')}:
-              - if model.msrp.blank?
-                = t('workarea.admin.cards.attributes.no_value')
-              - else
-                = number_to_currency model.msrp
             %li
               %strong #{t('workarea.admin.fields.on_sale')}:
               = model.on_sale?.to_s.titleize
             %li
               %strong #{t('workarea.admin.fields.discountable')}:
               = model.discountable?.to_s.titleize
+            %li
+              %strong #{t('workarea.admin.fields.msrp')}:
+              - if model.msrp.blank?
+                = t('workarea.admin.cards.attributes.no_value')
+              - else
+                = number_to_currency model.msrp
+            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
             %li
               %strong= t('workarea.admin.fields.updated_at')
               #{local_time_ago(model.updated_at)}
             %li
               %strong= t('workarea.admin.fields.created_at')
               #{local_time_ago(model.created_at)}
-            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
 
           = link_to edit_pricing_sku_path(model), class: 'card__button' do
             %span.button.button--small= t('workarea.admin.cards.attributes.button')

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

@@ -31,11 +31,6 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box'
 
-        .property
-          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
-          = currency_symbol
-          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
-
         .grid
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property
@@ -47,6 +42,11 @@
               %span.property__name= t('workarea.admin.fields.discountable')
               = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
+        .property
+          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
+          = currency_symbol
+          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
+
         = append_partials('admin.pricing_sku_fields', sku: @sku)
 
         .grid.grid--huge

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

@@ -46,6 +46,7 @@
                 = check_box_tag 'select_all', nil, false, id: 'select_all', class: 'checkbox__input', data: { bulk_action_select_all: '' }
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.sku')
+            = append_partials('admin.pricing_skus_additional_field_labels')
             %th.align-right= t('workarea.admin.fields.msrp')
             %th.align-right= t('workarea.admin.fields.sell_price')
             %th.align-center= t('workarea.admin.fields.on_sale')
@@ -61,6 +62,7 @@
               %td
                 = link_to result.id, pricing_sku_path(result)
                 = upcoming_changesets_icon_for(result)
+              = append_partials('admin.pricing_skus_additional_fields', result: result)
               %td.align-right= number_to_currency result.msrp
               %td.align-right= result.sell_price
               %td.align-center= t("workarea.admin.#{result.on_sale?}")

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

@@ -26,13 +26,16 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box', placeholder: t('workarea.admin.pricing_skus.tax_code_placeholder')
 
-        .property
-          %span.property__name= t('workarea.admin.fields.on_sale')
-          = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
+        .grid
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name= t('workarea.admin.fields.on_sale')
+              = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
 
-        .property
-          %span.property__name= t('workarea.admin.fields.discountable')
-          = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name= t('workarea.admin.fields.discountable')
+              = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
         .property
           = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'

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

@@ -45,7 +45,7 @@
                     = 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 } }
+                      = hidden_field_tag 'custom_event[occurred_at]', nil, required: true, data: { datetimepicker_field: { inline: true } }
                   .align-center
                     = submit_tag t('workarea.admin.reports.timeline.add_custom_event'), class: 'button button--create button--small'
 

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

@@ -2,11 +2,13 @@
 
 .view
   .view__header
-    .grid.grid--middle.grid--center
+    .grid.grid--middle.grid--right
       .grid__cell.grid__cell--50
         .view__heading
           = link_to "↑ #{t('workarea.admin.users.index.dashboard_link')}", people_dashboards_path, class: 'view__dashboard-button'
           %h1= t('workarea.admin.users.index.title')
+      .grid__cell.grid__cell--25
+        = append_partials('admin.user_index_aux_navigation')
 
   .view__container
     .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }

data/test/integration/workarea/admin/index_tracking_integration_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class IndexTrackingIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_track_index_filters
+        get admin.pricing_skus_path
+
+        assert_equal(admin.pricing_skus_path, session[:last_index_path])
+        assert_no_changes -> { session[:last_index_path] } do
+          get admin.catalog_products_path(format: :json)
+        end
+        assert_no_changes -> { session[:last_index_path] } do
+          get admin.catalog_products_path, xhr: true
+        end
+      end
+    end
+  end
+end

data/test/integration/workarea/admin/jump_to_integration_test.rb

@@ -234,6 +234,22 @@ module Workarea
         results = JSON.parse(response.body)['results']
         assert_equal(0, results.length)
       end
+
+      def test_limiting_results_by_type
+        Workarea.config.jump_to_type_limit = 2
+        Workarea.config.jump_to_results_per_type = 2
+
+        5.times { |i| create_product(name: "Test Product #{i}") }
+        5.times { |i| create_category(name: "Test Category #{i}") }
+
+        get admin.jump_to_path(q: 'test')
+        results = JSON.parse(response.body)['results']
+
+        assert_equal(
+          %w(Products Products Categories Categories),
+          results.map { |r| r['type'] }
+        )
+      end
     end
   end
 end

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

@@ -30,6 +30,10 @@ module Workarea
         @sku.update!(on_sale: false)
 
         assert_equal(3.to_m, @sku.min_price)
+
+        @sku.prices.destroy_all
+
+        assert_nil(@sku.min_price)
       end
 
       def test_max_price
@@ -38,6 +42,10 @@ module Workarea
         @sku.update!(on_sale: false)
 
         assert_equal(4.to_m, @sku.max_price)
+
+        @sku.prices.destroy_all
+
+        assert_nil(@sku.min_price)
       end
 
       def test_show_range?
@@ -46,6 +54,10 @@ module Workarea
         @sku.prices.last.destroy!
 
         refute(@sku.show_range?)
+
+        @sku.prices.destroy_all
+
+        refute(@sku.show_range?)
       end
 
       def test_on_sale?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.7
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-17 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.6
+        version: 3.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.6
+        version: 3.5.7
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.6
+        version: 3.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.6
+        version: 3.5.7
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1334,6 +1334,7 @@ files:
 - test/integration/workarea/admin/help_articles_integration_test.rb
 - test/integration/workarea/admin/impersonations_integration_test.rb
 - test/integration/workarea/admin/import_taxes_integration_test.rb
+- test/integration/workarea/admin/index_tracking_integration_test.rb
 - test/integration/workarea/admin/inventory_skus_integration_test.rb
 - test/integration/workarea/admin/jump_to_integration_test.rb
 - test/integration/workarea/admin/menus_integration_test.rb