workarea-storefront 3.5.16 → 3.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34dae4a866fa8dc6c2bed7e2c9da094199bdfda6f2859ea718e77310756bc875
-  data.tar.gz: 572eeb5fa03e1a3dba3683c83eb21844e372e1c1a4cb65dc771a8babe48970b6
+  metadata.gz: 3c4ad1aaf7be7a71400270c6e992c091d55f4af22e66b268e14996390e693515
+  data.tar.gz: '0190a6d6af19f3714776e50619d52fd221a2d482295ef620a38526e1ec4f1f78'
 SHA512:
-  metadata.gz: c7a9687e4759d591490c9d109ba617c09d88727d0412a51e611d4d5aad60c31f4da51b01fc677dde2b1c3db2f89856b880e7ad30a001898e9e14968895e43a9c
-  data.tar.gz: 323651e9ccedecab9d6be53a4dc2040ec8d6f8b8af4d2968cc34e82d66f15651937a83ac6ba42a6606363d773dfc8efde346874ce6d9ecd2dfefd3a8ab1283a3
+  metadata.gz: 826e30a3e84c4a8e706102d853a9b8bf81404951466219fa7f94e77b04ca8d54025d9e3ce8edb631d3b66d52c4a21ef212d7464c505a3e1008b3ebcffe9795b3
+  data.tar.gz: b63c0a4ccc114ee99f491a334c76a4cc32ae4676c8aa0a4e2aa0a4b2a8b0723fb3b0f2411d28c9aec983b522cc231b43dc1d442ba8d4ef9ae7fbe8c46d37ab4a

data/app/assets/javascripts/workarea/storefront/modules/admin_toolbar.js

@@ -70,9 +70,11 @@ WORKAREA.registerModule('adminToolbar', (function () {
         },
 
         shouldDisplay = function (user) {
+            var disable = WORKAREA.url.parse(window.location).queryKey.disable_admin_toolbar;
+
             return user.impersonating
                 || user.browsing_as_guest
-                || (user.admin && user.logged_in);
+                || (user.admin && user.logged_in && disable !== 'true');
         },
 
         create = function (user) {

data/app/view_models/workarea/storefront/inquiry_view_model.rb

@@ -9,7 +9,13 @@ module Workarea
       end
 
       def subjects
-        Workarea.config.inquiry_subjects.map { |k, v| [v, k] }
+        Workarea.config.inquiry_subjects.map do |key, default_value|
+          [
+            I18n.t('workarea.inquiry.subjects')[key.optionize.to_sym].presence ||
+            default_value,
+            key
+          ]
+        end
       end
 
       private

data/app/views/workarea/storefront/order_mailer/_summary.html.haml

@@ -164,8 +164,6 @@
                         %tr
                           %td= link_to t('workarea.storefront.orders.download'), download_url(item.token)
 
-                      = append_partials('storefront.order_summary_item_details', item: item)
-
                       = append_partials('storefront.order_mailer_summary_order_details', item: item)
 
                     - if item.total_adjustments.many?

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

@@ -123,6 +123,84 @@ module Workarea
 
         assert(response.ok?)
       end
+
+      def test_metrics_tracking
+        super_admin = create_user(password: 'W3bl1nc!', super_admin: true)
+        customer = create_user(email: 'bcrouse@workarea.com', password: 'W3bl1nc!')
+        product = create_product
+        create_shipping_service(
+          name: 'Ground',
+          tax_code: '001',
+          rates: [{ price: 7.to_m }]
+        )
+
+        post storefront.login_path,
+          params: { email: super_admin.email, password: 'W3bl1nc!' }
+
+        admin_current_email_cookie = cookies[:email]
+
+        post admin.impersonations_path,
+          params: { user_id: customer.id }
+
+        refute_equal(admin_current_email_cookie, cookies[:email])
+        customer_current_email_cookie = cookies[:email]
+
+        post storefront.cart_items_path,
+          params: {
+            product_id: product.id,
+            sku: product.skus.first,
+            quantity: 2
+          }
+
+        patch storefront.checkout_addresses_path,
+          params: {
+            billing_address: {
+              first_name: 'Ben',
+              last_name: 'Crouse',
+              street: '12 N. 3rd St.',
+              city: 'Philadelphia',
+              region: 'PA',
+              postal_code: '19106',
+              country: 'US',
+              phone_number: '2159251800'
+            },
+            shipping_address: {
+              first_name: 'Ben',
+              last_name: 'Crouse',
+              street: '22 S. 3rd St.',
+              city: 'Philadelphia',
+              region: 'PA',
+              postal_code: '19106',
+              country: 'US',
+              phone_number: '2159251800'
+            }
+          }
+
+        assert_equal(customer_current_email_cookie, cookies[:email])
+
+        patch storefront.checkout_place_order_path,
+          params: {
+            payment: 'new_card',
+            credit_card: {
+              number: '1',
+              month: 1,
+              year: next_year,
+              cvv: '999'
+            }
+          }
+
+        assert_equal(customer_current_email_cookie, cookies[:email])
+        delete admin.impersonations_path
+        assert_equal(admin_current_email_cookie, cookies[:email])
+
+        super_admin_metrics = Metrics::User.find(super_admin.email)
+        assert_equal(0, super_admin_metrics.orders)
+        assert_equal(0, super_admin_metrics.revenue)
+
+        customer_metrics = Metrics::User.find(customer.email)
+        assert_equal(1, customer_metrics.orders)
+        assert(customer_metrics.revenue.positive?)
+      end
     end
   end
 end

data/test/integration/workarea/storefront/store_credit_integration_test.rb

@@ -5,7 +5,9 @@ module Workarea
     class StoreCreditIntegrationTest < Workarea::IntegrationTest
       include Storefront::IntegrationTest
 
-      def setup
+      setup :setup_supporting_data
+
+      def setup_supporting_data
         @user = create_user(email: 'bcrouse@workarea.com', password: 'W3bl1nc!')
 
         @tax = create_tax_category(

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

@@ -113,7 +113,7 @@ module Workarea
         assert(page.has_content?('foo bar'))
 
         resize_window_to('medium')
-        refute(page.has_content?('foo bar'))
+        refute_text('foo bar')
 
         resize_window_to('wide')
         assert(page.has_content?('foo bar'))

data/test/system/workarea/storefront/credit_cards_system_test.rb

@@ -69,7 +69,7 @@ module Workarea
           click_button t('workarea.storefront.forms.save')
         end
 
-        refute(page.has_content?('Success'))
+        refute_text('Success')
         assert(page.has_content?(I18n.t('workarea.payment.store_credit_card_failure')))
       end
     end

data/test/system/workarea/storefront/navigation_system_test.rb

@@ -54,7 +54,7 @@ module Workarea
         assert_current_path(storefront.root_path)
 
         page.execute_script("$('body').trigger('click');")
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
 
       def test_left_navigation
@@ -66,7 +66,7 @@ module Workarea
 
         secondary.navigable.update_attributes!(active: false)
         visit storefront.page_path(primary.navigable)
-        refute(page.has_content?('Foo'))
+        refute_text('Foo')
       end
     end
   end

data/test/system/workarea/storefront/pagination_system_test.rb

@@ -59,7 +59,7 @@ module Workarea
 
         scroll_to_bottom
 
-        refute(page.has_content?(t('workarea.storefront.pagination.next_page')))
+        refute_text(t('workarea.storefront.pagination.next_page'))
         click_link t('workarea.storefront.pagination.load_more')
 
         assert_current_path(storefront.category_path(category))
@@ -70,7 +70,7 @@ module Workarea
         assert(page.has_content?('Product 5'))
         assert(page.has_content?('Product 6'))
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         find('a', text: 'Product 6').click
         page.execute_script("history.back()")
@@ -79,7 +79,7 @@ module Workarea
 
         wait_for_xhr
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         assert_match(/PROD1.*PROD2.*PROD3.*PROD4.*PROD5.*PROD6/m, page.html)
       end
@@ -95,7 +95,7 @@ module Workarea
 
         scroll_to_bottom
 
-        refute(page.has_content?(t('workarea.storefront.pagination.next_page')))
+        refute_text(t('workarea.storefront.pagination.next_page'))
         click_link t('workarea.storefront.pagination.load_more')
 
         assert_current_path(storefront.search_path(q: 'Product'))
@@ -106,7 +106,7 @@ module Workarea
         assert(page.has_content?('Product 5'))
         assert(page.has_content?('Product 6'))
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         find('a', text: 'Product 6').click
         page.execute_script("history.back()")
@@ -115,7 +115,7 @@ module Workarea
 
         wait_for_xhr
 
-        refute(page.has_content?(t('workarea.storefront.pagination.load_more')))
+        refute_text(t('workarea.storefront.pagination.load_more'))
 
         assert(page.has_content?('Product 1'))
         assert(page.has_content?('Product 2'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.16
+  version: 3.5.21
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.16
+        version: 3.5.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.16
+        version: 3.5.21
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: