workarea-admin 3.5.19 → 3.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa740ba48b4fdf3285077508f27e804b4d04dce69d08981d4e3d72174bdae82
-  data.tar.gz: 51da60eac496d3e4133ad3667f9c2e72b4a541ebff5e5f397f603d0f7e6e45b7
+  metadata.gz: a607bf3907ae033b463b4ea975e63e3baa64fb962d657df6cf0441071b815660
+  data.tar.gz: df1ead081c2c5fe988c3f982ee90aaf27c98f45e7d1b3834e5586c1edd6059c0
 SHA512:
-  metadata.gz: 869f45549bf0f404dca21df06c01bed3de546d2d7203a99138e83ca82bfac2098990fc99c379ed5e08837e277c6e16945abf2eb8ed37aaf19ea9e49a66849cb6
-  data.tar.gz: 06eadc8f2a5f7be3d4a24b76d57e9bee8b66a31d7c5a060c86700782b24b617518e6820c9f063242efae9ce97148212dac8fa3aa16009b47cfb8b471b6000987
+  metadata.gz: 201839f44d3f88443143a796a34c6062d9b6ed0abc417ae2e1c54ae661ef767d5d288bd6a3f540c0ecebb464970a6750b550082f7617b1083c8ab8432551d8cd
+  data.tar.gz: 114f7ae013a9df030ddac85460e6e3c689c44243726698a0de307678aeee2d707cef52d7d5d9195f9577121416588007423f09a2a0a7300e48ed117fa0664f7a

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

@@ -27,7 +27,7 @@ module Workarea
         clear_current_order
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_to user_path(previous_user_id)
+        redirect_back_or(user_path(previous_user_id))
       end
     end
   end

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,16 +93,13 @@ module Workarea
         end
       end
 
-      def options
-        variants.reduce({}) do |memo, variant|
+      def variant_details
+        variants.each_with_object({}) do |variant, memo|
           variant.details.each do |name, value|
             memo[name] ||= []
-            memo[name] << value
-            memo[name].flatten!
+            memo[name] += Array.wrap(value)
             memo[name].uniq!
           end
-
-          memo
         end
       end
 
@@ -125,7 +122,7 @@ module Workarea
       end
 
       def insights
-        @insights ||= Insights::ProductViewModel.wrap(model, @options)
+        @insights ||= Insights::ProductViewModel.wrap(model, options)
       end
 
       def inventory

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

@@ -108,7 +108,7 @@
               %p.align-center= t('workarea.admin.fields.inventory')
 
               %span.heading.heading--3.heading--no-margin.align-center
-                = model.options.keys.to_sentence
+                = model.variant_details.keys.to_sentence
               %p.align-center= t('workarea.admin.fields.options')
 
               = link_to catalog_product_variants_path(model), class: 'card__button' do

data/app/views/workarea/admin/navigation_menus/_summary.html.haml

@@ -6,5 +6,5 @@
         #{local_time_ago(model.updated_at)}
       - else
         %span.summary__info-text-inactive= t('workarea.admin.navigation_menus.summary.inactive')
-    %span.summary__info= t('workarea.admin.navigation_menus.summary.content_block', count: model.content.try(:blocks).size)
+    %span.summary__info= t('workarea.admin.navigation_menus.summary.content_block', count: model.content&.blocks&.size.to_i)
   %span.summary__type{ title: t('workarea.admin.navigation_menus.summary.type') }= t('workarea.admin.navigation_menus.summary.type')

data/app/views/workarea/admin/pricing_discounts/properties/_product_attribute.html.haml

@@ -5,7 +5,7 @@
     %span.discount__node
       %span.property.property--inline
         = text_field_tag 'discount[amount]', @discount.amount, class: 'text-box text-box--small', title: 'Amount of Discount', placeholder: '10', required: true
-    %span.discount__node off products
+    %span.discount__node off the item's unit price
 
 .discount__node-line
   %p.discount__node-group

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

@@ -37,7 +37,7 @@
             %ul.list-reset
               - model.newest_rates.each do |rate|
                 %li
-                  %strong= number_to_percentage(rate.percentage * 100, precision: 1)
+                  %strong= number_to_percentage(rate.percentage * 100, strip_insignificant_zeros: true)
 
                   - if rate.tier_min.present? && rate.tier_max.present?
                     #{number_to_currency(rate.tier_min)} - #{number_to_currency(rate.tier_max)},

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

@@ -21,7 +21,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_country_percentage', t('workarea.admin.tax_rates.index.table.country_percentage'), class: 'property__name'
-            = number_field_tag 'rate[country_percentage]', @rate.country_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[country_percentage]', @rate.country_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--50
           .property
@@ -31,7 +31,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_region_percentage', t('workarea.admin.tax_rates.index.table.region_percentage'), class: 'property__name'
-            = number_field_tag 'rate[region_percentage]', @rate.region_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[region_percentage]', @rate.region_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--50
           .property
@@ -41,7 +41,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_postal_code_percentage', t('workarea.admin.tax_rates.index.table.postal_code_percentage'), class: 'property__name'
-            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box text-box--i18n'
+            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box text-box--i18n'
 
         .grid__cell.grid__cell--33
           .property

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

@@ -56,9 +56,9 @@
               %td.align-center= rate.country.try(&:alpha2) || '-'
               %td.align-center= rate.region || '-'
               %td.align-center= rate.postal_code.presence || '-'
-              %td.align-center= number_to_percentage(rate.country_percentage * 100, precision: 1)
-              %td.align-center= number_to_percentage(rate.region_percentage * 100, precision: 1)
-              %td.align-center= number_to_percentage(rate.postal_code_percentage * 100, precision: 1)
+              %td.align-center= number_to_percentage(rate.country_percentage.to_f * 100, strip_insignificant_zeros: true)
+              %td.align-center= number_to_percentage(rate.region_percentage.to_f * 100, strip_insignificant_zeros: true)
+              %td.align-center= number_to_percentage(rate.postal_code_percentage.to_f * 100, strip_insignificant_zeros: true)
               %td.align-center= rate.tier_min.present? ? number_to_currency(rate.tier_min) : t('workarea.admin.tax_rates.index.not_applicable')
               %td.align-center= rate.tier_max.present? ? number_to_currency(rate.tier_max) : t('workarea.admin.tax_rates.index.not_applicable')
               %td.align-center= rate.charge_on_shipping ? t('workarea.admin.true') : t('workarea.admin.false')

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

@@ -19,7 +19,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_country_percentage', t('workarea.admin.tax_rates.index.table.country_percentage'), class: 'property__name'
-            = number_field_tag 'rate[country_percentage]', @rate.country_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[country_percentage]', @rate.country_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--50
           .property
@@ -29,7 +29,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_region_percentage', t('workarea.admin.tax_rates.index.table.region_percentage'), class: 'property__name'
-            = number_field_tag 'rate[region_percentage]', @rate.region_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[region_percentage]', @rate.region_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--50
           .property
@@ -39,7 +39,7 @@
         .grid__cell.grid__cell--50
           .property
             = label_tag 'rate_postal_code_percentage', t('workarea.admin.tax_rates.index.table.postal_code_percentage'), class: 'property__name'
-            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage.to_f * 100, min: 0, max: 100, step: '0.001', class: 'text-box'
 
         .grid__cell.grid__cell--33
           .property

data/app/views/workarea/admin/toolbar/show.html.haml

@@ -81,6 +81,7 @@
                       = link_to current_impersonation.email, user_path(current_impersonation)
                     %br
                     = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                      = hidden_field_tag :return_to, return_to
                       = button_tag t('workarea.admin.toolbar.stop_impersonation'), class: 'text-button text-button--destroy'
 
             - if allow_pricing_override?

data/config/locales/en.yml

@@ -4024,7 +4024,7 @@ en:
           changes_saved: Your changes have been saved
           saved: Your changes have been saved
           started: You are now browsing as %{email}
-          stopped: Impersonation for this user has been stopped.
+          stopped: Impersonation has been stopped, you are now browsing as your account.
           created: This account has been created
           error: There was an error saving this account
           password_reset: Password reset created. User will receive an email shortly.

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

@@ -51,7 +51,14 @@ module Workarea
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
 
-        assert(response.redirect?)
+        assert_redirected_to(admin.user_path(@user.id))
+        assert_equal(previous_user_id, session[:user_id])
+        assert(session[:admin_id].blank?)
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo')
+
+        assert_redirected_to('/foo')
         assert_equal(previous_user_id, session[:user_id])
         assert(session[:admin_id].blank?)
       end

data/test/system/workarea/admin/assets_system_test.rb

@@ -27,7 +27,7 @@ module Workarea
 
         assert_current_path(admin.content_assets_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Edited Asset'))
+        refute_text('Edited Asset')
       end
 
       def test_insertion

data/test/system/workarea/admin/bookmarks_system_test.rb

@@ -16,7 +16,7 @@ module Workarea
 
         find('.message__dismiss-button').click
         find('#shortcuts_menu').hover
-        refute(page.has_content?('Current Page'))
+        refute_text('Current Page')
 
         find('#shortcuts_menu').hover
         menu_item = all('.menu__item').last
@@ -24,7 +24,7 @@ module Workarea
         find('.menu__delete-link').click
         assert_current_path(admin.root_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Current Page'))
+        refute_text('Current Page')
       end
     end
   end

data/test/system/workarea/admin/bulk_actions_system_test.rb

@@ -60,7 +60,7 @@ module Workarea
         click_link t('workarea.admin.catalog.dashboard_link')
 
         visit admin.catalog_products_path
-        refute(page.has_content?('1 selected'))
+        refute_text('1 selected')
       end
 
       def test_persistence
@@ -85,7 +85,7 @@ module Workarea
         click_button t('workarea.admin.catalog_products.index.edit')
         click_link t('workarea.admin.form.cancel')
 
-        refute(page.has_content?('3 selected'))
+        refute_text('3 selected')
       end
 
       def test_select_all
@@ -95,7 +95,7 @@ module Workarea
         assert(page.has_content?("5 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         uncheck 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
 
         check 'select_all'
         uncheck "catalog_product_#{@products.fifth.id}"
@@ -103,14 +103,14 @@ module Workarea
         assert(page.has_content?("3 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         check 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
 
         check "catalog_product_#{@products.fifth.id}"
         check "catalog_product_#{@products.fourth.id}"
         assert(page.has_content?("2 #{t('workarea.admin.shared.bulk_actions.selected')}"))
 
         check 'select_all'
-        refute(page.has_content?(t('workarea.admin.shared.bulk_actions.selected')))
+        refute_text(t('workarea.admin.shared.bulk_actions.selected'))
       end
 
       def test_bulk_editing

data/test/system/workarea/admin/comments_system_test.rb

@@ -39,7 +39,7 @@ module Workarea
 
         find_field('comment[body]').send_keys(['@'])
 
-        refute(page.has_content?('Bar Baby'))
+        refute_text('Bar Baby')
         assert(page.has_content?('Baz Bat'))
 
         find('.tribute-container li', text: 'Baz Bat (baz@workarea.com)').click

data/test/system/workarea/admin/content_system_test.rb

@@ -35,7 +35,7 @@ module Workarea
 
         find('.content-block').click
         click_link t('workarea.admin.actions.delete')
-        refute(page.has_selector?('.content-block'))
+        refute_selector('.content-block')
       end
 
       def test_reordering_content_blocks

data/test/system/workarea/admin/dashboard_system_test.rb

@@ -64,7 +64,7 @@ module Workarea
         Workarea.config.hide_from_settings = %i(fooconfig)
 
         visit admin.settings_dashboards_path
-        refute(page.has_content?('Fooconfig'))
+        refute_text('Fooconfig')
       end
     end
   end

data/test/system/workarea/admin/impersonation_system_test.rb

@@ -34,12 +34,9 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(storefront.root_path, current_path)
         assert(page.has_content?('Success'))
 
-        find('.view').hover # Ensure tooltipster menu isn't open
-        assert(page.has_content?('bcrouse@workarea.com'))
-
         visit storefront.users_account_path
         assert(page.has_no_content?('impersonated@workarea.com'))
 

data/test/system/workarea/admin/inventory_skus_system_test.rb

@@ -28,7 +28,7 @@ module Workarea
 
         assert_current_path(admin.inventory_skus_path)
         assert(page.has_content?('Success'))
-        refute(page.has_content?('SKU1'))
+        refute_text('SKU1')
       end
 
       def test_editing_a_non_existent_sku

data/test/system/workarea/admin/menus_system_test.rb

@@ -39,7 +39,7 @@ module Workarea
         within('.navigation-builder__actions') { click_link 'Delete' }
 
         assert(page.has_content?('Success'))
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
 
       def test_managing_content_redirects_back

data/test/system/workarea/admin/pricing_sku_prices_system_test.rb

@@ -71,9 +71,9 @@ module Workarea
 
         row = find_all("table tr")[1]
         within(row) do
-          refute(page.has_content?('$11.00'))
-          refute(page.has_content?('$9.99'))
-          refute(page.has_content?('1'))
+          refute_text('$11.00')
+          refute_text('$9.99')
+          refute_text('1')
         end
       end
     end

data/test/system/workarea/admin/recommendations_system_test.rb

@@ -65,8 +65,8 @@ module Workarea
         assert(page.has_content?('Success'))
 
         click_link 'Recommendations'
-        refute(page.has_selector?("option[value='#{product_2.id}']"))
-        refute(page.has_selector?("option[value='#{product_3.id}']"))
+        refute_selector("option[value='#{product_2.id}']")
+        refute_selector("option[value='#{product_3.id}']")
         assert(page.has_ordered_text?('Custom', 'Similar Products', 'Also Purchased'))
 
         #

data/test/system/workarea/admin/releases_system_test.rb

@@ -49,8 +49,8 @@ module Workarea
           click_link 'Published (1)'
         end
 
-        refute(page.has_content?('Scheduled Release'))
-        refute(page.has_content?('Unscheduled Release'))
+        refute_text('Scheduled Release')
+        refute_text('Unscheduled Release')
         assert(page.has_content?('Published Release'))
       end
 
@@ -277,7 +277,7 @@ module Workarea
 
         click_link t('workarea.admin.releases.calendar.next_week')
         wait_for_xhr
-        refute(find('.calendar').has_content?('Foo Release'))
+        refute_text('Foo Release')
 
         click_link t('workarea.admin.releases.calendar.previous_week')
         wait_for_xhr
@@ -285,7 +285,7 @@ module Workarea
 
         click_link t('workarea.admin.releases.calendar.next_week')
         wait_for_xhr
-        refute(find('.calendar').has_content?('Foo Release'))
+        refute_text('Foo Release')
 
         click_button t('workarea.admin.releases.calendar.today')
         wait_for_xhr
@@ -321,8 +321,8 @@ module Workarea
 
         visit admin.releases_path
 
-        refute(page.has_content?('Release Five'))
-        refute(page.has_content?('Release Six'))
+        refute_text('Release Five')
+        refute_text('Release Six')
 
         assert(
           page.has_content?(

data/test/system/workarea/admin/tax_categories_system_test.rb

@@ -74,9 +74,9 @@ module Workarea
           assert(page.has_content?('PA'))
           assert(page.has_content?('19106'))
 
-          assert(page.has_content?('6.0%'))
-          assert(page.has_content?('4.0%'))
-          assert(page.has_content?('2.0%'))
+          assert(page.has_content?('6%'))
+          assert(page.has_content?('4%'))
+          assert(page.has_content?('2%'))
 
           assert(page.has_content?("#{Money.default_currency.symbol}5.00"))
           assert(page.has_content?("#{Money.default_currency.symbol}500.00"))
@@ -91,7 +91,7 @@ module Workarea
           click_link t('workarea.admin.actions.edit')
         end
 
-        fill_in 'rate[country_percentage]', with: 0
+        fill_in 'rate[country_percentage]', with: 0.005
         fill_in 'rate[region_percentage]', with: 10
         fill_in 'rate[postal_code_percentage]', with: 20.5
 
@@ -100,7 +100,8 @@ module Workarea
         assert(page.has_content?('Success'))
 
         within '.index-table__row' do
-          assert(page.has_content?('10.0%'))
+          assert(page.has_content?('0.005%'))
+          assert(page.has_content?('10%'))
           assert(page.has_content?('20.5%'))
         end
 

data/test/system/workarea/admin/taxonomy_system_test.rb

@@ -33,8 +33,8 @@ module Workarea
         click_button 'remove_taxon', match: :first
 
         assert(page.has_content?('Success'))
-        refute(page.has_content?('First Taxon'))
-        refute(page.has_content?('Second Taxon'))
+        refute_text('First Taxon')
+        refute_text('Second Taxon')
       end
     end
   end

data/test/system/workarea/admin/trash_system_test.rb

@@ -20,7 +20,7 @@ module Workarea
         assert(page.has_content?('My Category'))
 
         visit admin.trash_index_path
-        refute(page.has_content?('My Category'))
+        refute_text('My Category')
       end
 
       def test_restore_permission

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

@@ -21,7 +21,7 @@ module Workarea
         )
       end
 
-      def test_options
+      def test_variant_details
         @view_model.variants.build(
           sku: 'SKU1',
           name: 'name',
@@ -40,7 +40,7 @@ module Workarea
 
         assert_equal(
           { 'Color' => ['Red', 'Black', 'White'], 'Size' => ['S', 'M', 'L'] },
-          @view_model.options
+          @view_model.variant_details
         )
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.19
+  version: 3.5.20
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-30 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.19
+        version: 3.5.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.20
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.19
+        version: 3.5.20
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email: