workarea-storefront 3.5.9 → 3.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fb50b29bbd87bd91ecf4a2abc692b17b8b767664e9afaddcb13b3e1b4b31e6
-  data.tar.gz: e9960fb2e4b27272fdc8966cb0b8bd3bfe3c1249f10030fba994f9dbbcaa7391
+  metadata.gz: 8c13d37967ef60ab6477c1bcfe8caba5047140df04ec336837dc9f7beb8c5cec
+  data.tar.gz: 8cb069a9ef9bee78124a82e392a57194c572f74a1e0f49bb81166b2d3dc726c8
 SHA512:
-  metadata.gz: 417940f49bf5f39cf909f945a9fd4a4dcedadf3080d409514ae2b0c1c12602f18cec1fc61e655cad8a38069d8017c427cc00c05f8f46403815c66d39f75e3156
-  data.tar.gz: 28eb9182e7b1d3a24f5cc2bac7576976e0340318e4588de57548d3cd096669e9b167028f2576a77a36e2e10974b722a5c4d8225e182b657e490678f4e091257f
+  metadata.gz: df8cee341873edf5161464a25cb2b8800435ee68822462670b54889f43b8514ce7ca3bb8380443a5f6eaffed842ea97194f2a8b4cc41f3f8e8086151e23e130a
+  data.tar.gz: 97ae96ddefbc49581c0cccf69e0029502a00325948b45af932dd5dcf8cd5adf3585344b7931dcac547f68ac6c368c85bc52a70b675d5f8178faf22b35a9723a2

data/app/controllers/workarea/storefront/checkout/addresses_controller.rb

@@ -46,6 +46,8 @@ module Workarea
         end
 
         def validate_shipping_options
+          return unless current_order.requires_shipping?
+
           available_options = Workarea::Storefront::CartViewModel.new(current_order).shipping_options
 
           if available_options.empty?

data/app/controllers/workarea/storefront/checkouts_controller.rb

@@ -44,7 +44,7 @@ module Workarea
           segment_ids: current_segments.map(&:id)
         )
 
-        update_tracking!(email: current_order.email)
+        update_tracking!(email: current_order.email) unless current_order.email.blank?
       end
 
       def with_order_lock

data/app/controllers/workarea/storefront/current_checkout.rb

@@ -26,7 +26,10 @@ module Workarea
       #
       def current_order=(order)
         @current_order = order
-        cookies.permanent.signed[:order_id] = order&.id
+
+        if order.blank? || order.persisted?
+          cookies.permanent.signed[:order_id] = order&.id
+        end
       end
 
       # Removes the current order from the session.

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

@@ -27,7 +27,7 @@ module Workarea
 
       def search_query
         @search_query ||= Search::CategoryBrowse.new(
-          options.merge(
+          options.except(:per_page).merge(
             category_ids: [model.id],
             rules: model.product_rules.usable,
             terms_facets: terms_facets - %w(category),

data/app/views/workarea/storefront/fulfillment_mailer/shipped.html.haml

@@ -3,7 +3,7 @@
 = render_schema_org(fulfillment_email_schema(@order, @package))
 
 - content_for :preheader_text do
-  = t('workarea.storefront.email.order_cancellation.heading', order_id: @order.id)
+  = t('workarea.storefront.email.order_shipped.heading', order_id: @order.id)
 
 %tr
   %td

data/config/locales/en.yml

@@ -210,14 +210,14 @@ en:
         credit_card_update_error: There were errors updating your credit card.
         credit_card_removed: Your credit card has been removed.
         password_reset_expired: This password reset is expired.
-        password_reset_email_sent: If a valid e-mail address was entered, instructions to reset your password have been sent to "%{email}"
+        password_reset_email_sent: If a valid email address was entered, instructions to reset your password have been sent to "%{email}"
         password_reset: Your password has been reset.
         old_password_invalid: Your old password is not valid.
         password_required: Password is required.
         items_required: You must add an item to your cart to checkout
         order_custom_pricing: Your cart has custom pricing, you cannot edit the contents of your cart.
         download_unavailable: This download is no longer available. Contact customer support for more information.
-        no_available_shipping_options: There are no available shipping options for your shipping adddress.
+        no_available_shipping_options: There are no available shipping options for your shipping address.
 
       forms:
         required: '*'

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

@@ -123,6 +123,26 @@ module Workarea
 
         assert_redirected_to(storefront.login_path)
       end
+
+      def test_no_extra_order_id_cookies
+        user = create_user(password: 'Passw0rd!')
+        post storefront.login_path,
+          params: { email: user.email, password: 'Passw0rd!' }
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+
+        delete storefront.logout_path
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+
+        post storefront.login_path,
+          params: { email: user.email, password: 'Passw0rd!' }
+
+        follow_redirect!
+        assert(cookies[:order_id].blank?)
+      end
     end
   end
 end

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

@@ -16,6 +16,16 @@ module Workarea
         get storefront.category_path(create_category(active: false))
         assert(response.ok?)
       end
+
+      def test_not_accepting_per_page_param
+        products = [create_product, create_product]
+        category = create_category(product_ids: products.map(&:id))
+
+        get storefront.category_path(category, page: 1, per_page: 1)
+        assert(response.ok?)
+        assert_includes(response.body, storefront.product_path(products.first))
+        assert_includes(response.body, storefront.product_path(products.second))
+      end
     end
   end
 end

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

@@ -345,6 +345,39 @@ module Workarea
 
         assert(flash[:error].present?)
       end
+
+      def test_not_setting_a_blank_tracking_email
+        cookies[:email] = 'foo@bar.com'
+        get storefront.checkout_shipping_path
+        assert_equal('foo@bar.com', cookies[:email])
+      end
+
+      def test_no_required_shipping_address_options_flash_message
+        product = create_product(name: 'Digital Product', variants: [{ sku: 'SKU' }])
+        create_fulfillment_sku(id: 'SKU', policy: :download, file: product_image_file)
+
+        post storefront.cart_items_path,
+          params: { product_id: product.id, sku: product.skus.first, quantity: 1 }
+
+        get storefront.checkout_addresses_path
+
+        patch storefront.checkout_addresses_path,
+          params: {
+            email: 'bcrouse@weblinc.com',
+            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'
+            }
+          }
+
+        refute(flash[:error].present?)
+      end
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Workarea
 
         def test_login
           login(User.find(params[:user_id]))
-          self.current_order = Order.new(id: params[:order_id]) if params[:order_id].present?
+          self.current_order = Order.create!(id: params[:order_id]) if params[:order_id].present?
           head :ok
         end
 

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

@@ -87,6 +87,16 @@ module Workarea
         assert_includes(response.body, 'Foo A')
         assert_includes(response.body, 'Foo B')
       end
+
+      def test_not_accepting_per_page_param
+        one = create_product(name: 'Foo A')
+        two = create_product(name: 'Foo B')
+
+        get storefront.search_path(q: 'foo', page: 1, per_page: 1)
+        assert(response.ok?)
+        assert_includes(response.body, storefront.product_path(one))
+        assert_includes(response.body, storefront.product_path(two))
+      end
     end
   end
 end

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

@@ -271,6 +271,19 @@ module Workarea
           headers: { 'HTTP_REFERER' => 'https://www.facebook.com/' }
         assert_equal(google.id.to_s, response.headers['X-Workarea-Segments'])
       end
+
+      def test_missing_email_cookies
+        user = create_user(password: 'w0rkArea!', tags: %w(foo))
+        segment = create_segment(rules: [Segment::Rules::Tags.new(tags: %w(foo))])
+
+        post storefront.login_path,
+          params: { email: user.email, password: 'w0rkArea!' }
+
+        cookies[:email] = nil
+
+        get storefront.current_user_path(format: 'json')
+        assert_equal(segment.id.to_s, response.headers['X-Workarea-Segments'])
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.5.9
+  version: 3.5.14
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-06-25 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.9
+        version: 3.5.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.9
+        version: 3.5.14
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: