spree_storefront 5.0.1 → 5.0.3
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/account/orders_controller.rb +8 -4
- data/app/controllers/spree/account/profile_controller.rb +1 -1
- data/app/helpers/spree/cart_helper.rb +6 -0
- data/app/views/spree/checkout/_payment_methods.html.erb +1 -1
- data/app/views/spree/line_items/create.turbo_stream.erb +1 -1
- data/app/views/spree/line_items/destroy.turbo_stream.erb +1 -1
- data/app/views/spree/line_items/update.turbo_stream.erb +1 -1
- data/app/views/spree/seo/robots.text.erb +1 -1
- data/app/views/spree/shared/_head.html.erb +5 -1
- data/app/views/themes/default/spree/orders/edit.html.erb +1 -1
- data/app/views/themes/default/spree/shared/_cart_pane.html.erb +1 -1
- data/config/routes.rb +4 -0
- data/lib/generators/spree/storefront/install/templates/application.tailwind.css +1 -1
- data/lib/generators/spree/storefront/theme/templates/model.rb.tt +6 -0
- 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: 7a3165bdc79f4acc7b7ac36a86572a2f6d114fdacc1b125af2b0e86d21983d92
|
4
|
+
data.tar.gz: 852b2926ade744ce9b0c41f0d5f04d68b10c3d5408100b3531dea0966b663fee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2727b7cca478cbe94b87e22cca326b11259138f2e36069487d546bb865cc4ca6952b05e94595350e31907916acb2c1d6f1a22ba45e3dbf382cf3c3af5c000aad
|
7
|
+
data.tar.gz: 5bfc483ae97000fe62611cb3cd7fd39eca7c28104e8a193016a5e21dcf35ec2ee526c8fd1311cd2a4de42dfa95cafec65a5d791ceec662d586b92774d35daa48
|
@@ -1,16 +1,15 @@
|
|
1
1
|
module Spree
|
2
2
|
module Account
|
3
3
|
class OrdersController < BaseController
|
4
|
+
before_action :load_order_details, only: :show
|
5
|
+
|
4
6
|
# GET /account/orders
|
5
7
|
def index
|
6
8
|
@orders = orders_scope.order(created_at: :desc).page(params[:page]).per(25)
|
7
9
|
end
|
8
10
|
|
9
11
|
# GET /account/orders/:id
|
10
|
-
def show
|
11
|
-
@order = orders_scope.find_by!(number: params[:id])
|
12
|
-
@shipments = @order.shipments.includes(:stock_location, :address, selected_shipping_rate: :shipping_method, inventory_units: :line_item)
|
13
|
-
end
|
12
|
+
def show; end
|
14
13
|
|
15
14
|
private
|
16
15
|
|
@@ -29,6 +28,11 @@ module Spree
|
|
29
28
|
def order_finder
|
30
29
|
Spree::Dependencies.completed_order_finder.constantize
|
31
30
|
end
|
31
|
+
|
32
|
+
def load_order_details
|
33
|
+
@order = orders_scope.find_by!(number: params[:id])
|
34
|
+
@shipments = @order.shipments.includes(:stock_location, :address, selected_shipping_rate: :shipping_method, inventory_units: :line_item)
|
35
|
+
end
|
32
36
|
end
|
33
37
|
end
|
34
38
|
end
|
@@ -7,7 +7,7 @@ module Spree
|
|
7
7
|
# PUT /account/profile
|
8
8
|
def update
|
9
9
|
if try_spree_current_user.update(user_params)
|
10
|
-
redirect_to spree.edit_account_profile_path, notice: Spree.t(:
|
10
|
+
redirect_to spree.edit_account_profile_path, notice: Spree.t(:successfully_updated, resource: Spree.t(:account))
|
11
11
|
else
|
12
12
|
render :edit, status: :unprocessable_entity
|
13
13
|
end
|
@@ -44,5 +44,11 @@ module Spree
|
|
44
44
|
Spree::ColorsPreviewStylesPresenter.new(colors).to_s
|
45
45
|
end
|
46
46
|
end
|
47
|
+
|
48
|
+
def cart_id(order)
|
49
|
+
return 'cart_contents' if order.blank? || order.id.blank? || order.updated_at.blank?
|
50
|
+
|
51
|
+
"cart_contents_#{order.id}_#{order.updated_at.to_i}"
|
52
|
+
end
|
47
53
|
end
|
48
54
|
end
|
@@ -12,7 +12,7 @@
|
|
12
12
|
</p>
|
13
13
|
</div>
|
14
14
|
<div class="flex justify-end w-full">
|
15
|
-
<%= button_tag Spree.t(:
|
15
|
+
<%= button_tag Spree.t(:place_order),
|
16
16
|
class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
|
17
17
|
data: { 'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false) } %>
|
18
18
|
</div>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<%= spree_turbo_update_cart(@order) %>
|
5
5
|
|
6
6
|
<%= turbo_stream.replace_all '.cart-contents' do %>
|
7
|
-
<%= turbo_frame_tag
|
7
|
+
<%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
|
8
8
|
<%= render 'spree/orders/cart' %>
|
9
9
|
<% end %>
|
10
10
|
<% end %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= turbo_stream.replace_all '.cart-contents' do %>
|
2
|
-
<%= turbo_frame_tag
|
2
|
+
<%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
|
3
3
|
<% if @order.line_items.empty? %>
|
4
4
|
<%= render 'spree/orders/empty' %>
|
5
5
|
<% else %>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<%= spree_turbo_update_flashes %>
|
3
3
|
<% else %>
|
4
4
|
<%= turbo_stream.replace_all '.cart-contents' do %>
|
5
|
-
<%= turbo_frame_tag
|
5
|
+
<%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
|
6
6
|
<%= render 'spree/orders/cart' %>
|
7
7
|
<% end %>
|
8
8
|
<% end %>
|
@@ -27,5 +27,5 @@ Disallow: /shipment_trackings
|
|
27
27
|
Disallow: /locale
|
28
28
|
Disallow: /currency
|
29
29
|
|
30
|
-
Sitemap: <%= sitemap_url(host: store.formatted_url_or_custom_domain, format: :xml) %>
|
30
|
+
Sitemap: <%= spree.sitemap_url(host: store.formatted_url_or_custom_domain, format: :xml) %>
|
31
31
|
<% end %>
|
@@ -14,7 +14,11 @@
|
|
14
14
|
<%= render 'spree/shared/css_variables' %>
|
15
15
|
<%= render 'spree/shared/fonts' %>
|
16
16
|
|
17
|
-
<%= javascript_importmap_tags
|
17
|
+
<%= javascript_importmap_tags "application-spree-storefront" %>
|
18
|
+
<% if Rails.application.importmap.packages["application"].present? %>
|
19
|
+
<%= javascript_import_module_tag "application" %>
|
20
|
+
<% end %>
|
21
|
+
|
18
22
|
<%= javascript_tag "wishedVariantIds = #{(current_wishlist&.variant_ids&.map(&:to_s) || []).to_json.html_safe};" %>
|
19
23
|
|
20
24
|
<%= stylesheet_link_tag "tailwind", defer: true, data: { turbo_track: 'reload' } %>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
<%= render 'spree/shared/error_messages', target: @order %>
|
7
7
|
|
8
|
-
<%= turbo_frame_tag
|
8
|
+
<%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
|
9
9
|
<% if !@line_items || @line_items.empty? %>
|
10
10
|
<%= render 'spree/orders/empty' %>
|
11
11
|
<% else %>
|
@@ -31,7 +31,7 @@
|
|
31
31
|
</span>
|
32
32
|
</div>
|
33
33
|
<div class='flex-1 h-0 overflow-y-auto'>
|
34
|
-
<%= turbo_frame_tag
|
34
|
+
<%= turbo_frame_tag cart_id(current_order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %>
|
35
35
|
</div>
|
36
36
|
</div>
|
37
37
|
</div>
|
data/config/routes.rb
CHANGED
@@ -7,6 +7,12 @@ module Spree
|
|
7
7
|
license: 'MIT',
|
8
8
|
}
|
9
9
|
end
|
10
|
+
|
11
|
+
def custom_page_sections
|
12
|
+
# you can override this method in your theme to return a list of custom page sections for your theme
|
13
|
+
# [Spree::PageSections::Custom, Spree::PageSections::Custom2]
|
14
|
+
[]
|
15
|
+
end
|
10
16
|
end
|
11
17
|
end
|
12
18
|
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.0.
|
4
|
+
version: 5.0.3
|
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-05-06 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.0.
|
19
|
+
version: 5.0.3
|
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.0.
|
26
|
+
version: 5.0.3
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: active_link_to
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -542,9 +542,9 @@ licenses:
|
|
542
542
|
- AGPL-3.0-or-later
|
543
543
|
metadata:
|
544
544
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
545
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.
|
545
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.3
|
546
546
|
documentation_uri: https://docs.spreecommerce.org/
|
547
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.0.
|
547
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.0.3
|
548
548
|
post_install_message:
|
549
549
|
rdoc_options: []
|
550
550
|
require_paths:
|