workarea-storefront 3.4.31 → 3.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 688b10056415b2e71288ba5898f835970ae7d8e19499b0bff0ee149af3a1e3f6
-  data.tar.gz: e16f0d4d08d396dff12da2d1579c75d63f932ed8727eb885ef84b684b7db2923
+SHA1:
+  metadata.gz: 2c08176fc6711c0ef445f52ab703a2fccf8fad36
+  data.tar.gz: 8f76de94d90f040db1e7facc186cf810dd150433
 SHA512:
-  metadata.gz: a365225a86ccff17b85c72aff436bdb4630d231e14d280e4f74ab23e3f43d8688972d09536fb8fe47cea1b42c76131cc9523b8775e7a705523fdab74dc14c3db
-  data.tar.gz: 551bf76be5c0e05beadb4cdb4ceb865d7b77b6d30449245b34e408b5305df43782f67784e48452ef8c0de9186ceb477de96d60b7ac5dae28de752959d7c6619f
+  metadata.gz: c841a63dab99c0b50f079a2d52a640926d0015ddf07bd7516af8b71c786e0c1fb5f448ae8e864fb49fca74fda70270a75388cb9a6acf61e80d9d7c4a5d92a03c
+  data.tar.gz: 490e3726b2062b7bd674e1569f7b83b6c0afd1c8736636ba39fc36cff20f1bab6d543fa96209c23049e56bbcba35be8d2aaff4f733d6f7d21e8e04b47a7642ca

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-storefront
 version: !ruby/object:Gem::Version
-  version: 3.4.31
+  version: 3.4.36
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-07-07 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.31
+        version: 3.4.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.31
+        version: 3.4.36
 description: Provides user-facing ecommerce storefront functionality for the Workarea
   Commerce Platform.
 email:
@@ -736,7 +736,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Storefront for the Workarea Commerce Platform