spree_storefront 5.1.6 → 5.1.8
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/app/controllers/spree/checkout_controller.rb +7 -1
- data/app/controllers/spree/line_items_controller.rb +1 -1
- data/app/views/spree/shared/_head.html.erb +4 -2
- data/app/views/themes/default/spree/products/_json_ld.html.erb +5 -3
- data/app/views/themes/default/spree/products/_json_ld_variant.html.erb +2 -0
- data/app/views/themes/default/spree/shared/_order_details.html.erb +20 -16
- data/app/views/themes/default/spree/shared/_order_shipment.html.erb +3 -2
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 337793895fe097335658b9ae76e98990502e1855d07dbda8d61d606b2f1e4a46
|
|
4
|
+
data.tar.gz: 6667eed5b01c42ae7e282379565bcf58ddccc19695d6ba1701f7a6a6bdc983aa
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a833b9d290ab4f7041f72b3d556886475f58f32a218d852e27e77e0b356629b7f61d2392168f0f346ba863a588d25657ba3adc93274c8d44ed12774341286dde
|
|
7
|
+
data.tar.gz: 32cbd6c6a59e411a5bc8e1a06e7f09c1808a8432459415d09e2f17350047887070491b87319d5c3a039897211c882f9b611925ff74c3edb94a36bef6465f2385
|
|
@@ -171,7 +171,7 @@ module Spree
|
|
|
171
171
|
clear_order_token
|
|
172
172
|
flash[:error] = 'You cannot access this checkout'
|
|
173
173
|
redirect_to_cart
|
|
174
|
-
elsif try_spree_current_user.nil? &&
|
|
174
|
+
elsif try_spree_current_user.nil? && !allow_access_to_complete_order_with_new_user?
|
|
175
175
|
if params[:guest] && current_store.prefers_guest_checkout?
|
|
176
176
|
@order = current_store.
|
|
177
177
|
orders.
|
|
@@ -203,6 +203,12 @@ module Spree
|
|
|
203
203
|
@current_order = @order # for compatibility with the rest of storefront, analytics, etc
|
|
204
204
|
end
|
|
205
205
|
|
|
206
|
+
def allow_access_to_complete_order_with_new_user?
|
|
207
|
+
cookies_order_token = cookies.permanent.signed[:token]
|
|
208
|
+
|
|
209
|
+
@order.completed? && @order.signup_for_an_account? && @order.user_id.present? && cookies_order_token.present? && cookies_order_token == @order.token
|
|
210
|
+
end
|
|
211
|
+
|
|
206
212
|
def remove_out_of_stock_items
|
|
207
213
|
_validated_order, messages = Spree::Cart::RemoveOutOfStockItems.call(order: @order).value
|
|
208
214
|
|
|
@@ -15,7 +15,7 @@ module Spree
|
|
|
15
15
|
@quantity = params[:quantity].to_i || 1
|
|
16
16
|
options = params[:options] || {}
|
|
17
17
|
|
|
18
|
-
cookies.permanent.signed[:token] = @order.token if @order.persisted?
|
|
18
|
+
cookies.permanent.signed[:token] = { value: @order.token, domain: current_store.url_or_custom_domain } if @order.persisted?
|
|
19
19
|
|
|
20
20
|
result = cart_add_item_service.call(order: @order,
|
|
21
21
|
variant: @variant,
|
|
@@ -16,9 +16,11 @@
|
|
|
16
16
|
|
|
17
17
|
<script async src="https://ga.jspm.io/npm:es-module-shims@1.8.2/dist/es-module-shims.js" data-turbo-track="reload"></script>
|
|
18
18
|
|
|
19
|
-
<%= javascript_importmap_tags "application-spree-storefront" %>
|
|
20
19
|
<% if Rails.application.importmap.packages["application"].present? %>
|
|
21
|
-
<%=
|
|
20
|
+
<%= javascript_importmap_tags "application" %>
|
|
21
|
+
<%= javascript_import_module_tag "application-spree-storefront" %>
|
|
22
|
+
<% else %>
|
|
23
|
+
<%= javascript_importmap_tags "application-spree-storefront" %>
|
|
22
24
|
<% end %>
|
|
23
25
|
|
|
24
26
|
<%= javascript_tag "wishedVariantIds = #{(current_wishlist&.variant_ids&.map(&:to_s) || []).to_json.html_safe};" %>
|
|
@@ -24,11 +24,13 @@
|
|
|
24
24
|
"name": <%= product.brand_name.to_json.html_safe %>
|
|
25
25
|
},
|
|
26
26
|
<% end %>
|
|
27
|
-
|
|
27
|
+
"offers": [
|
|
28
28
|
<% if product.has_variants? %>
|
|
29
|
-
|
|
29
|
+
<%= raw(product.variants.map do |variant|
|
|
30
|
+
render partial: "spree/products/json_ld_variant", locals: { product: product, variant: variant }
|
|
31
|
+
end.join(",\n")) %>
|
|
30
32
|
<% else %>
|
|
31
|
-
|
|
33
|
+
<%= render "spree/products/json_ld_variant", product: product, variant: first_or_default_variant %>
|
|
32
34
|
<% end %>
|
|
33
35
|
]
|
|
34
36
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
<% cache ["json-ld-variant", spree_base_cache_scope, variant.cache_key_with_version] do %>
|
|
1
2
|
{
|
|
2
3
|
"@type": "Offer",
|
|
3
4
|
<% if variant.sku.present? %>
|
|
@@ -8,3 +9,4 @@
|
|
|
8
9
|
"priceCurrency": <%= current_currency.to_json.html_safe %>,
|
|
9
10
|
"url": <%= spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain).to_json.html_safe %>
|
|
10
11
|
}
|
|
12
|
+
<% end %>
|
|
@@ -37,24 +37,28 @@
|
|
|
37
37
|
|
|
38
38
|
<div class="mt-6 bg-accent mb-24">
|
|
39
39
|
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-border bg-accent-100">
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
<div
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
<!-- payment into -->
|
|
50
|
-
<div class="mb-5 lg:mb-0">
|
|
51
|
-
<div class="uppercase tracking-widest mb-2">
|
|
52
|
-
<%= Spree.t(:payment_information) %>
|
|
40
|
+
<% if order.billing_address.present? %>
|
|
41
|
+
<!-- billing address -->
|
|
42
|
+
<div>
|
|
43
|
+
<div class="uppercase tracking-widest mb-2">
|
|
44
|
+
<%= Spree.t(:billing_address) %>
|
|
45
|
+
</div>
|
|
46
|
+
<div class="!leading-[1.375rem] text-neutral-800">
|
|
47
|
+
<%= render 'spree/shared/address', address: order.billing_address %>
|
|
48
|
+
</div>
|
|
53
49
|
</div>
|
|
54
|
-
|
|
55
|
-
|
|
50
|
+
<% end %>
|
|
51
|
+
<% if order.payments.valid.any? %>
|
|
52
|
+
<!-- payment into -->
|
|
53
|
+
<div class="mb-5 lg:mb-0">
|
|
54
|
+
<div class="uppercase tracking-widest mb-2">
|
|
55
|
+
<%= Spree.t(:payment_information) %>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="!leading-[1.375rem] text-neutral-800">
|
|
58
|
+
<%= render collection: order.payments.valid, partial: 'spree/shared/payment', cached: spree_base_cache_scope %>
|
|
59
|
+
</div>
|
|
56
60
|
</div>
|
|
57
|
-
|
|
61
|
+
<% end %>
|
|
58
62
|
</div>
|
|
59
63
|
<!-- totals/summary -->
|
|
60
64
|
<div class="p-4 lg:p-6 text-sm">
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
<li class="border border-accent mb-4">
|
|
2
2
|
<div class="p-4 lg:p-6">
|
|
3
3
|
<div class="flex flex-col lg:flex-row lg:gap-6 gap-4">
|
|
4
|
-
<%
|
|
4
|
+
<% ship_address = shipment.address || shipment.order.ship_address %>
|
|
5
|
+
<% if shipment.order.requires_ship_address? && ship_address.present? %>
|
|
5
6
|
<div class="text-sm lg:w-1/2">
|
|
6
7
|
<div class="tracking-widest uppercase mb-2">
|
|
7
8
|
<%= Spree.t(:delivery_address) %>
|
|
8
9
|
</div>
|
|
9
10
|
<div class="!leading-[1.375rem] text-neutral-800">
|
|
10
11
|
<%= render "spree/shared/address",
|
|
11
|
-
address:
|
|
12
|
+
address: ship_address %>
|
|
12
13
|
</div>
|
|
13
14
|
</div>
|
|
14
15
|
<% end %>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_storefront
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.1.
|
|
4
|
+
version: 5.1.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vendo Connect Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-10-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: spree_core
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 5.1.
|
|
19
|
+
version: 5.1.8
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - ">="
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 5.1.
|
|
26
|
+
version: 5.1.8
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: active_link_to
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -562,9 +562,9 @@ licenses:
|
|
|
562
562
|
- AGPL-3.0-or-later
|
|
563
563
|
metadata:
|
|
564
564
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
|
565
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.
|
|
565
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.8
|
|
566
566
|
documentation_uri: https://docs.spreecommerce.org/
|
|
567
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.1.
|
|
567
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.1.8
|
|
568
568
|
post_install_message:
|
|
569
569
|
rdoc_options: []
|
|
570
570
|
require_paths:
|