Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
V-3077 FIX cart on Safari (#12662)
brozekb74b10236d8d
diff --git a/storefront/app/helpers/spree/cart_helper.rb b/storefront/app/helpers/spree/cart_helper.rbindex ba36160786..4ee1b73655 100644--- a/storefront/app/helpers/spree/cart_helper.rb+++ b/storefront/app/helpers/spree/cart_helper.rb@@ -44,5 +44,11 @@ module SpreeSpree::ColorsPreviewStylesPresenter.new(colors).to_sendend++ def cart_id(order)+ return 'cart_contents' if order.blank? || order.id.blank? || order.updated_at.blank?++ "cart_contents_#{order.id}_#{order.updated_at.to_i}"+ endendenddiff --git a/storefront/app/views/spree/line_items/create.turbo_stream.erb b/storefront/app/views/spree/line_items/create.turbo_stream.erbindex d42cc895a5..6e6231562f 100644--- a/storefront/app/views/spree/line_items/create.turbo_stream.erb+++ b/storefront/app/views/spree/line_items/create.turbo_stream.erb@@ -4,7 +4,7 @@<%= spree_turbo_update_cart(@order) %><%= turbo_stream.replace_all '.cart-contents' do %>- <%= turbo_frame_tag :cart_contents, class: 'cart-contents' do %>+ <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %><%= render 'spree/orders/cart' %><% end %><% end %>diff --git a/storefront/app/views/spree/line_items/destroy.turbo_stream.erb b/storefront/app/views/spree/line_items/destroy.turbo_stream.erbindex ee083c38cb..7d33d04b83 100644--- a/storefront/app/views/spree/line_items/destroy.turbo_stream.erb+++ b/storefront/app/views/spree/line_items/destroy.turbo_stream.erb@@ -1,5 +1,5 @@<%= turbo_stream.replace_all '.cart-contents' do %>- <%= turbo_frame_tag :cart_contents, class: 'cart-contents' do %>+ <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %><% if @order.line_items.empty? %><%= render 'spree/orders/empty' %><% else %>diff --git a/storefront/app/views/spree/line_items/update.turbo_stream.erb b/storefront/app/views/spree/line_items/update.turbo_stream.erbindex 257f145b35..2f62d8c08f 100644--- a/storefront/app/views/spree/line_items/update.turbo_stream.erb+++ b/storefront/app/views/spree/line_items/update.turbo_stream.erb@@ -2,7 +2,7 @@<%= spree_turbo_update_flashes %><% else %><%= turbo_stream.replace_all '.cart-contents' do %>- <%= turbo_frame_tag :cart_contents, class: 'cart-contents' do %>+ <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %><%= render 'spree/orders/cart' %><% end %><% end %>diff --git a/storefront/app/views/themes/default/spree/orders/edit.html.erb b/storefront/app/views/themes/default/spree/orders/edit.html.erbindex ce482c9524..0195c09fcb 100644--- a/storefront/app/views/themes/default/spree/orders/edit.html.erb+++ b/storefront/app/views/themes/default/spree/orders/edit.html.erb@@ -5,7 +5,7 @@<%= render 'spree/shared/error_messages', target: @order %>- <%= turbo_frame_tag :cart_contents, class: 'cart-contents' do %>+ <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %><% if !@line_items || @line_items.empty? %><%= render 'spree/orders/empty' %><% else %>diff --git a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erbindex fb6fb5514b..3f1aecdaf3 100644--- a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb@@ -31,7 +31,7 @@</span></div><div class='flex-1 h-0 overflow-y-auto'>- <%= turbo_frame_tag :cart_contents, class: 'cart-contents', src: spree.cart_path, loading: :lazy %>+ <%= turbo_frame_tag cart_id(current_order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %></div></div></div>diff --git a/storefront/lib/generators/spree/storefront/install/templates/application.tailwind.css b/storefront/lib/generators/spree/storefront/install/templates/application.tailwind.cssindex 7a4c272b6e..ea5f91679c 100644--- a/storefront/lib/generators/spree/storefront/install/templates/application.tailwind.css+++ b/storefront/lib/generators/spree/storefront/install/templates/application.tailwind.css@@ -1146,7 +1146,7 @@ html[aria-busy="true"] .hide-on-load {display: none;}-#slideover-cart #cart_contents {+#slideover-cart .cart-contents {display: flex;flex-direction: column;height: 100%;