workarea-admin 3.4.42 → 3.4.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f2aebd5326ae73d326a0da5946c65394af32592db518b99386d710a4843f3e
-  data.tar.gz: 56f42f24deb50a9f8508ae4c187b6c940a0205ae922544b2edb208e5028fafec
+  metadata.gz: 77790287084463abb8d04c359a6d42c242195353e79735b9e09b7661ed37a724
+  data.tar.gz: 15ffda628b192e3cb6f50195142b374d8e67ba1f354cc5110c215a32d263da44
 SHA512:
-  metadata.gz: '02804b99d7bd74e9b2e466e770d9c769a3937010a361f30c0f73e6904f16ee930d5385e9b49b66356ac82ccf855a6cae0c87a854d48f2328afbc4668ef9c18d0'
-  data.tar.gz: 0ea526e27c8248f012b08a700c4fada40867e1f41caef37b9fce47699d55b2fe49bf8933ad95ed4c955c05860e355d53656543365af092f2eafadf8af2e975de
+  metadata.gz: 4a6ad1147f3584866134b8ff83e3228fa15f9e8fa96c48557100fa996f6ba09b5bd9d48985fd31049a40c648fbd4ba653a2590a4881dbf25908981ca27751d43
+  data.tar.gz: 7f2f2d7940d4901d35f3274bab3b26e93aec4530c48544d214e9e0dc8c41474d2f8ae81a7b9978d06672844f34c5aea8ed2546b6c527278f18a926ea6c5b8abb

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

@@ -27,7 +27,8 @@ module Workarea
         self.current_order = nil
 
         flash[:success] = t('workarea.admin.users.flash_messages.stopped')
-        redirect_back_or(user_path(previous_user_id))
+        referrer = URI.parse(request.referrer).request_uri rescue nil
+        redirect_back_or(referrer.presence || user_path(previous_user_id))
       end
     end
   end

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

@@ -60,6 +60,9 @@
             .property
               = label_tag 'category_default_sort', t('workarea.admin.fields.default_sort'), class: 'property__name'
               = select_tag 'category[default_sort]', options_for_select(@category.sort_options, selected: @category.default_sort)
+              - if @category.featured_products?
+                %span.property__note
+                  = t('workarea.admin.catalog_categories.edit.default_sort_note')
 
         .property
           = label_tag 'category_terms_facets_list', t('workarea.admin.fields.terms_facets_list'), class: 'property__name'

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

@@ -90,6 +90,18 @@
                     = @user.insights.average_order_value_percentile.ordinalize
                     = t('workarea.admin.users.insights.percentile')
 
+        .align-center
+          = link_to '#customer-insights-info', data: { tooltip: { side: 'bottom', interactive: true } } do
+            = t('workarea.admin.users.insights.customer_insights')
+          #customer-insights-info.tooltip-content.align-center
+            = t( |
+              'workarea.admin.users.insights.customer_insights_info_html', |
+              best_customers_path: insights_report_path(type: Workarea::Insights::BestCustomers), |
+              customers_at_risk_path: insights_report_path(type: Workarea::Insights::CustomersAtRisk), |
+              repeat_purchase_rate_path: insights_report_path(type: Workarea::Insights::RepeatPurchaseRate), |
+              orders_path: orders_user_path(@user) |
+            ) |
+
     .section
       %h2.align-center= t('workarea.admin.users.insights.recently_viewed.title')
       .grid.grid--center

data/config/locales/en.yml

@@ -286,6 +286,7 @@ en:
             views: views
         edit:
           client_id_note: Identifies the category for product import
+          default_sort_note: 'Since this category has featured products, this sort controls the products listed after the selected featured products.'
           filters_note_html: 'Comma separated: just, like, this. If these fields are blank, the global values will be used from %{search_settings_link}.'
           page_title: Attributes for %{category}
           search_settings: search settings
@@ -3553,6 +3554,17 @@ en:
           aov: AOV
           insights_for_this_customer: Insights for this Customer
           percentile: percentile
+          customer_insights: Wondering about how Workarea customer insights work?
+          customer_insights_info_html: >
+            <strong>How are customer metrics tracked?</strong>
+            <p>Workarea's metrics engine saves reporting and insights data based on the customer's email address.
+            This allows for the best tracking of customers for generating helpful insights like
+            <a href="%{best_customers_path}">Best Customers</a>, <a href="%{customers_at_risk_path}">Customers at Risk</a>,
+            and <a href="%{repeat_purchase_rate_path}">Repeat Purchase Rate</a> as accurately as possible across both
+            guest and account checkouts.</p>
+            <strong>Wondering why some numbers don't line up?</strong>
+            <p>Because reporting is tracked by email address, changes in email address and/or having an account
+            can cause mismatch between the <a href="%{orders_path}">Orders</a> card and these insights.</p>
         login:
           never: Never logged in
           time_ago: "%{period} ago"

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

@@ -70,17 +70,35 @@ module Workarea
         post admin.impersonations_path, params: { user_id: @user.id }
         delete admin.impersonations_path
 
-        assert_redirected_to(admin.user_path(@user.id))
         assert_equal(previous_user_id, response_cookies['user_id'])
         assert(session['admin_id'].blank?)
 
         post admin.impersonations_path, params: { user_id: @user.id }
-        delete admin.impersonations_path(return_to: '/foo')
+        delete admin.impersonations_path
 
-        assert_redirected_to('/foo')
         assert_equal(previous_user_id, response_cookies['user_id'])
         assert(session['admin_id'].blank?)
       end
+
+      def test_redirection_after_destroy
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path
+        assert_redirected_to(admin.user_path(@user.id))
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo')
+        assert_redirected_to('/foo')
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path(return_to: '/foo'),
+          headers: { 'HTTP_REFERER' => admin.catalog_products_path }
+        assert_redirected_to('/foo')
+
+        post admin.impersonations_path, params: { user_id: @user.id }
+        delete admin.impersonations_path,
+          headers: { 'HTTP_REFERER' => admin.catalog_products_url(host: 'foo.com') }
+        assert_redirected_to(admin.catalog_products_path)
+      end
     end
   end
 end

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

@@ -49,7 +49,7 @@ module Workarea
           click_button 'Stop Impersonation'
         end
 
-        assert_equal(admin.user_path(user), current_path)
+        assert_equal(admin.root_path, current_path)
         assert(page.has_content?('Success'))
       end
     end

metadata

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