workarea-storefront 3.4.30 → 3.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f6fa3a951c3d12fedefc302b38c90265351850580d4dfc159700622e30589c
-  data.tar.gz: e989f30cd502dfc2ccd005bb93f379701548e0e87db65e78bf7414cc865aa71e
+  metadata.gz: c588d8b08c81fbfc1285b0604c0930ac4b329c0602ba31ab8f2e55dec15426e6
+  data.tar.gz: d595c48ad2af14dcb8eb51a28d9d9e8de6abab5e71ccee668c1b1146a2729bc1
 SHA512:
-  metadata.gz: 406cf8056c0038a5a035e772c48692e97a5d964be38469582f7fb7f1a7cbfe4f99c9ec2cd2a78c878982028d7b4fadf56421f56fe0670a5cda805363890dfa82
-  data.tar.gz: efc2aeeb8127384987139327f39d7b848c6df3b28c971b6fb16f0d74cda9c1242801b4a69655413eefa720c8f0de7964f075cf5e970f17101faed616d8e3449d
+  metadata.gz: 6a5c4d36837437aea5cdb7e4af8174f80aea7703d65dd43ca3445d8237a90a80aab554d7dbfd66473393bf1fc8ac2744e3850436d8c7a8219e44f0b0312f38a4
+  data.tar.gz: fa319e2eb878babef617a146933364fb4d06404ad9771d830435bdc6b74ecb4e211ff29f22a6943f708b35fa903e58378bff1a5355b192879dc469b14cdd17f1

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/users/passwords_controller.rb

@@ -8,7 +8,11 @@ module Workarea
 
     def edit
       reset = User::PasswordReset.find_by(token: params[:token]) rescue nil
-      redirect_to forgot_password_path unless reset
+
+      unless reset
+        flash[:error] = t('workarea.storefront.flash_messages.password_reset_expired')
+        redirect_to forgot_password_path
+      end
     end
 
     def create

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,
             terms_facets: terms_facets - %w(category),

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

@@ -1,7 +1,7 @@
 = append_partials('storefront.fulfillment_shipped_mailer.top')
 
 - 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/app/views/workarea/storefront/products/templates/_option_selects.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/app/views/workarea/storefront/products/templates/_option_thumbnails.html.haml

@@ -10,6 +10,8 @@
     .product-prices.product-prices--details{ itemprop: 'offers', itemscope: true, itemtype: 'http://schema.org/Offer' }
       = render 'workarea/storefront/products/pricing', product: product
 
+    = append_partials('storefront.product_pricing_details', product: product)
+
     - if product.description.present?
       .product-details__description
         %p= truncated_product_description(product, t('workarea.storefront.products.read_more'))

data/config/locales/en.yml

@@ -201,13 +201,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.
-        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.
+        download_unavailable: This download is no longer available. Contact customer support for more information.
 
       forms:
         required: '*'

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

@@ -262,6 +262,32 @@ module Workarea
 
         assert(flash[:error].present?)
       end
+
+      def test_no_required_shipping_address_options_flash_message
+        product = create_product(digital: true)
+
+        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/search_integration_test.rb

@@ -123,6 +123,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/users/passwords_integration_test.rb

@@ -31,6 +31,7 @@ module Workarea
 
         def test_handles_a_missing_password_reset
           get storefront.reset_password_path(token: 'foo')
+          assert(flash[:error].present?)
           assert_redirected_to(storefront.forgot_password_path)
         end
 
@@ -42,6 +43,24 @@ module Workarea
           assert(flash[:error].present?)
           assert(response.redirect?)
         end
+
+        def test_expired_resets
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          first = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: first.token)
+          assert(response.ok?)
+
+          post storefront.forgot_password_path, params: { email: 'passwords@workarea.com' }
+          second = User::PasswordReset.desc(:created_at).first
+
+          get storefront.reset_password_path(token: second.token)
+          assert(response.ok?)
+
+          get storefront.reset_password_path(token: first.token)
+          assert(flash[:error].present?)
+          assert_redirected_to(storefront.forgot_password_path)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.4.30
+  version: 3.4.35
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 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.4.30
+        version: 3.4.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.30
+        version: 3.4.35
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email: