spree_storefront 5.4.5 → 5.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f19a77df22de90e0318f79b859fb980e290ce71eb2498d425a7523e3667cdf71
4
- data.tar.gz: d2aaac44425273c8b8c900002d883629851473da2ad4be8e65dee01271bcb1ef
3
+ metadata.gz: 28a526d8f3532a343d6745ae58dfa7ee127e5c790ab756ab3df8e325540eaaea
4
+ data.tar.gz: 3cc4fc50567e9676e01d0aa0f3996fabfa01952b286d010c09d3f8c699736cfa
5
5
  SHA512:
6
- metadata.gz: b2959a382e2d1ccd4f1fa0c78ca02acaf075b7905ce5663de76f571aa4a9a90adb7417b9addf83e957d20b0a6dc181b63a2374e7ca152471dabd64c91d6e8e70
7
- data.tar.gz: 6b78637997d7a6e3948d88e9d547233db94617133e99a1fa6226fa0c9c4dff0864ec20ed90b4a96cdfb79af50b84cacada89ef4381cc9f9926dbbf9e4c29e2eb
6
+ metadata.gz: 68c714758f383ae4b158339bb9af2c8d4391e42b5949bcc11d902297033d3ee21cdb943d15b5dcc0a88d698a32c0ffa95862cdedd929850a5ee56c4cc81dfd12
7
+ data.tar.gz: 2c8a16f90f36abe4b03ddcafdf25b5bb49daf4bf0fd863d7917168bb15f571fa9246f7ed61d7b6c4b45093e7be52dfeef20948d8f4bf2cf0dfe4b363a2c47d6c
@@ -10,6 +10,7 @@ module Spree
10
10
  include Spree::AnalyticsHelper
11
11
  include Spree::IntegrationsHelper
12
12
  include Spree::Storefront::PaginationConcern
13
+ include Spree::StorefrontCountriesHelper
13
14
 
14
15
  layout :choose_layout
15
16
 
@@ -22,6 +23,11 @@ module Spree
22
23
  helper 'spree/wishlist'
23
24
  helper 'spree/integrations'
24
25
 
26
+ # declared as a `helper_method` so it takes precedence over
27
+ # `Spree::Admin::BaseHelper#available_countries`, which Rails'
28
+ # `include_all_helpers` would otherwise mix into storefront views
29
+ helper_method :available_countries
30
+
25
31
  helper_method :title
26
32
  helper_method :title=
27
33
  helper_method :accurate_title
@@ -0,0 +1,20 @@
1
+ module Spree
2
+ # Rails' `include_all_helpers` mixes every engine helper into every view, so
3
+ # `Spree::Admin::BaseHelper#available_countries` (which builds bare
4
+ # `Spree::Country.new(iso:)` records for admin autocompletes) can shadow
5
+ # `Spree::BaseHelper#available_countries` in storefront views. Those records
6
+ # have no `id` or `name`, which renders the address form country select as
7
+ # empty options.
8
+ #
9
+ # `Spree::StoreController` includes this module and exposes it via
10
+ # `helper_method`, which takes precedence over mixed-in helper modules, so
11
+ # storefront views get the storefront implementation.
12
+ module StorefrontCountriesHelper
13
+ def available_countries
14
+ @storefront_available_countries ||= current_store.countries_available_for_checkout.map do |country|
15
+ country.name = localized_country_name(country)
16
+ country
17
+ end.sort_by { |country| country.name.parameterize }
18
+ end
19
+ end
20
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_storefront
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.5
4
+ version: 5.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vendo Connect Inc.
@@ -15,14 +15,14 @@ dependencies:
15
15
  requirements:
16
16
  - - ">="
17
17
  - !ruby/object:Gem::Version
18
- version: 5.4.5
18
+ version: 5.4.6
19
19
  type: :runtime
20
20
  prerelease: false
21
21
  version_requirements: !ruby/object:Gem::Requirement
22
22
  requirements:
23
23
  - - ">="
24
24
  - !ruby/object:Gem::Version
25
- version: 5.4.5
25
+ version: 5.4.6
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: active_link_to
28
28
  requirement: !ruby/object:Gem::Requirement
@@ -253,6 +253,7 @@ files:
253
253
  - app/helpers/spree/payment_methods_helper.rb
254
254
  - app/helpers/spree/posts_helper.rb
255
255
  - app/helpers/spree/products_helper.rb
256
+ - app/helpers/spree/storefront_countries_helper.rb
256
257
  - app/helpers/spree/storefront_helper.rb
257
258
  - app/helpers/spree/storefront_locale_helper.rb
258
259
  - app/helpers/spree/taxons_helper.rb
@@ -592,9 +593,9 @@ licenses:
592
593
  - MIT
593
594
  metadata:
594
595
  bug_tracker_uri: https://github.com/spree/spree-rails-storefront/issues
595
- changelog_uri: https://github.com/spree/spree-rails-storefront/releases/tag/v5.4.5
596
+ changelog_uri: https://github.com/spree/spree-rails-storefront/releases/tag/v5.4.6
596
597
  documentation_uri: https://docs.spreecommerce.org/
597
- source_code_uri: https://github.com/spree/spree-rails-storefront/tree/v5.4.5
598
+ source_code_uri: https://github.com/spree/spree-rails-storefront/tree/v5.4.6
598
599
  rdoc_options: []
599
600
  require_paths:
600
601
  - lib