solidus_frontend 4.6.0 → 4.6.4
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/Gemfile +3 -0
- data/app/controllers/spree/orders_controller.rb +1 -6
- data/app/helpers/spree/orders_helper.rb +5 -1
- data/lib/spree/frontend/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2d59375232a4fd5f7d8022ca5aa6e13db48c66b5042b2cc55f6a19c94a91ed96
|
|
4
|
+
data.tar.gz: e6a0feec370f914af45135ecbdf010490b962d378511d1039856ab09b6f44a0e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a1a490324406639835b1d18b99065588231e6c398dc8c4fd31244ac52087fa7407330490b7e17be337205744acee1099734f00a6df34ff2bc735e7b1560c053a
|
|
7
|
+
data.tar.gz: ce59a8716f720a291abc7a5c8360ac16542177e15a035b82e775c526c7ef045405f80b51fdb2c266d2cdb9b17358fd23f182b9f5d54a9a38dc2612cb86002da8
|
data/Gemfile
CHANGED
|
@@ -13,6 +13,9 @@ gem 'solidus', git: "https://github.com/solidusio/solidus.git", branch: branch
|
|
|
13
13
|
rails_version = ENV.fetch('RAILS_VERSION', '7.2')
|
|
14
14
|
gem 'rails', "~> #{rails_version}"
|
|
15
15
|
|
|
16
|
+
# json 3 is incompatible with Rails < 8.1.
|
|
17
|
+
gem 'json', '< 3', require: false
|
|
18
|
+
|
|
16
19
|
# Temporarily locking sprockets to v3.x
|
|
17
20
|
# see https://github.com/solidusio/solidus/issues/3374
|
|
18
21
|
# and https://github.com/rails/sprockets-rails/issues/369
|
|
@@ -6,14 +6,13 @@ module Spree
|
|
|
6
6
|
|
|
7
7
|
respond_to :html
|
|
8
8
|
|
|
9
|
-
before_action :store_guest_token
|
|
10
9
|
before_action :assign_order, only: :update
|
|
11
10
|
# note: do not lock the #edit action because that's where we redirect when we fail to acquire a lock
|
|
12
11
|
around_action :lock_order, only: :update
|
|
13
12
|
|
|
14
13
|
def show
|
|
15
14
|
@order = Spree::Order.find_by!(number: params[:id])
|
|
16
|
-
authorize! :show, @order, cookies.signed[:guest_token]
|
|
15
|
+
authorize! :show, @order, params[:token] || cookies.signed[:guest_token]
|
|
17
16
|
end
|
|
18
17
|
|
|
19
18
|
def update
|
|
@@ -102,10 +101,6 @@ module Spree
|
|
|
102
101
|
|
|
103
102
|
private
|
|
104
103
|
|
|
105
|
-
def store_guest_token
|
|
106
|
-
cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
|
|
107
|
-
end
|
|
108
|
-
|
|
109
104
|
def order_params
|
|
110
105
|
if params[:order]
|
|
111
106
|
params[:order].permit(*permitted_order_attributes)
|
|
@@ -8,7 +8,11 @@ module Spree
|
|
|
8
8
|
include TruncateHtmlHelper
|
|
9
9
|
|
|
10
10
|
def truncated_product_description(product)
|
|
11
|
-
|
|
11
|
+
if Spree::Config.show_raw_product_description
|
|
12
|
+
truncate_html(raw(product.description))
|
|
13
|
+
else
|
|
14
|
+
truncate_html(sanitize(product.description))
|
|
15
|
+
end
|
|
12
16
|
end
|
|
13
17
|
|
|
14
18
|
def order_just_completed?(order)
|