solidus_frontend 4.7.2 → 4.8.0
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 +4 -4
- data/.github/workflows/test.yml +1 -2
- data/Gemfile +1 -1
- data/app/controllers/spree/store_controller.rb +2 -2
- data/app/views/spree/address/_form.html.erb +3 -3
- data/app/views/spree/checkout/_confirm.html.erb +1 -1
- data/app/views/spree/checkout/_delivery.html.erb +1 -1
- data/app/views/spree/shared/_taxonomies.html.erb +1 -1
- data/lib/spree/frontend/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a3f3ea9e774d727a0c12a9755ed0f3c1405e3b3d761f215caa1c08cdff868394
|
|
4
|
+
data.tar.gz: 559c880062f70704a1d3729b51580c83898ee931cb26f6ac6996bb6592aabac9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f2abf12cdad00968f8967e9d634c715a01469990e6cedf9b7bb2f1e21325250e12b1caf750cdca5593a566b1236d14209b118201533954ed6fdedb438fddd332
|
|
7
|
+
data.tar.gz: 9ad28935908e0e5780056bfaa8168a7c670249d609fe0cc1197154414832943d9812868d3a5c88af8d8a0b2926080894ee3aef06cd0a185d94a6c507b5ca11b7
|
data/.github/workflows/test.yml
CHANGED
|
@@ -4,7 +4,6 @@ on:
|
|
|
4
4
|
push:
|
|
5
5
|
branches:
|
|
6
6
|
- main
|
|
7
|
-
- v4.7
|
|
8
7
|
pull_request:
|
|
9
8
|
workflow_dispatch:
|
|
10
9
|
schedule:
|
|
@@ -21,5 +20,5 @@ jobs:
|
|
|
21
20
|
test:
|
|
22
21
|
uses: solidusio/test-solidus-extension/.github/workflows/test.yml@main
|
|
23
22
|
with:
|
|
24
|
-
solidus_branches: '["v4.7"]'
|
|
23
|
+
solidus_branches: '["v4.7", "v4.6"]'
|
|
25
24
|
ruby_versions: '["3.2", "3.4"]'
|
data/Gemfile
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
source 'https://rubygems.org'
|
|
4
4
|
|
|
5
|
-
branch = ENV.fetch('SOLIDUS_BRANCH', '
|
|
5
|
+
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
|
|
6
6
|
|
|
7
7
|
# The storefront's promotion features build on the legacy promotion
|
|
8
8
|
# system, which lives in the solidus_legacy_promotions gem since Solidus
|
|
@@ -8,7 +8,7 @@ module Spree
|
|
|
8
8
|
respond_to :html
|
|
9
9
|
|
|
10
10
|
def unauthorized
|
|
11
|
-
render 'spree/shared/unauthorized', layout: Spree::Config
|
|
11
|
+
render 'spree/shared/unauthorized', layout: Spree::Config.layout, status: 401
|
|
12
12
|
end
|
|
13
13
|
|
|
14
14
|
def cart_link
|
|
@@ -19,7 +19,7 @@ module Spree
|
|
|
19
19
|
private
|
|
20
20
|
|
|
21
21
|
def config_locale
|
|
22
|
-
Spree::Frontend::Config
|
|
22
|
+
Spree::Frontend::Config.locale
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
def lock_order
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<%= form.text_field :name, class: 'required', autocomplete: address_type + ' name', required: true, autofocus: true %>
|
|
6
6
|
</div>
|
|
7
7
|
|
|
8
|
-
<% if Spree::Config
|
|
8
|
+
<% if Spree::Config.company %>
|
|
9
9
|
<div class="field" id=<%="#{address_id}company" %>>
|
|
10
10
|
<%= form.label :company, t('spree.company') %>
|
|
11
11
|
<%= form.text_field :company, autocomplete: address_type + ' organization' %>
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
</span>
|
|
39
39
|
</div>
|
|
40
40
|
|
|
41
|
-
<% if Spree::Config
|
|
41
|
+
<% if Spree::Config.address_requires_state %>
|
|
42
42
|
<div class="field field-required" id=<%="#{address_id}state" %>>
|
|
43
43
|
<% have_states = !address.country.states.empty? %>
|
|
44
44
|
<%= form.label :state, t('spree.state') %>
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
<%= form.phone_field :phone, phone_hash.merge({ autocomplete: address_type + ' home tel' }) %>
|
|
83
83
|
</div>
|
|
84
84
|
|
|
85
|
-
<% if Spree::Config
|
|
85
|
+
<% if Spree::Config.alternative_shipping_phone %>
|
|
86
86
|
<div class="field" id=<%="#{address_id}altphone" %>>
|
|
87
87
|
<%= form.label :alternative_phone, t('spree.alternative_phone') %>
|
|
88
88
|
<%= form.phone_field :alternative_phone, autocomplete: address_type + ' tel'%>
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<br />
|
|
8
8
|
|
|
9
9
|
<div class="form-buttons" data-hook="buttons">
|
|
10
|
-
<% Spree::Frontend::Config
|
|
10
|
+
<% Spree::Frontend::Config.require_terms_and_conditions_acceptance.tap do |requires_acceptance| %>
|
|
11
11
|
<% if requires_acceptance %>
|
|
12
12
|
<div class="terms_and_conditions" data-hook="terms_and_conditions">
|
|
13
13
|
<div class="policy"><%= render partial: "spree/checkout/terms_and_conditions" %></div>
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
<% end %>
|
|
93
93
|
|
|
94
94
|
</div>
|
|
95
|
-
<% if Spree::Config
|
|
95
|
+
<% if Spree::Config.shipping_instructions %>
|
|
96
96
|
<p id="minstrs" data-hook>
|
|
97
97
|
<%= form.label :special_instructions, t('spree.shipping_instructions') %><br />
|
|
98
98
|
<%= form.text_area :special_instructions, cols: 40, rows: 7 %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<% max_level = Spree::Config
|
|
1
|
+
<% max_level = Spree::Config.max_level_in_taxons_menu || 1 %>
|
|
2
2
|
<nav id="taxonomies" class="sidebar-item" data-hook>
|
|
3
3
|
<% @taxonomies.each do |taxonomy| %>
|
|
4
4
|
<% cache [I18n.locale, taxonomy, @taxon, max_level] do %>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: solidus_frontend
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.
|
|
4
|
+
version: 4.8.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Solidus Team
|
|
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
401
401
|
- !ruby/object:Gem::Version
|
|
402
402
|
version: 1.8.23
|
|
403
403
|
requirements: []
|
|
404
|
-
rubygems_version: 4.0.
|
|
404
|
+
rubygems_version: 4.0.20
|
|
405
405
|
specification_version: 4
|
|
406
406
|
summary: 'Legacy storefront for the Solidus e-commerce platform. New Solidus installations
|
|
407
407
|
use Solidus Storefront: https://github.com/solidusio/solidus/tree/main/storefront#readme'
|