workarea-storefront 3.5.9 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fb50b29bbd87bd91ecf4a2abc692b17b8b767664e9afaddcb13b3e1b4b31e6
-  data.tar.gz: e9960fb2e4b27272fdc8966cb0b8bd3bfe3c1249f10030fba994f9dbbcaa7391
+  metadata.gz: f8ee66bdca09fe14b714c4593cecdd5a83f6dc256e294974e2314a480ae69c6a
+  data.tar.gz: '0469acdaf83ebefbfd1364dbc1d45d1b1c4cebbdebc67ca95141e730c7485487'
 SHA512:
-  metadata.gz: 417940f49bf5f39cf909f945a9fd4a4dcedadf3080d409514ae2b0c1c12602f18cec1fc61e655cad8a38069d8017c427cc00c05f8f46403815c66d39f75e3156
-  data.tar.gz: 28eb9182e7b1d3a24f5cc2bac7576976e0340318e4588de57548d3cd096669e9b167028f2576a77a36e2e10974b722a5c4d8225e182b657e490678f4e091257f
+  metadata.gz: d684e7669a8eff46a3cdc6ac95d778159621a93dd4341242dfd51ac6237e5a8de79edad7aeecc1aa9201744b3cbfd33bebc757bb8fc226d93a0c705f5944e1c7
+  data.tar.gz: 654ee0e80589bccd1cb1ef3be7b6fcdab0f9bc58610685e5883f094c96325b54caf0a5e5acfa2ca1e24da5e6c2f1282001427ede7b24ac120f192125049441a9

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/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/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

metadata

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