Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Open source Cart/Orders controller

Damian Legawiecab1273989873
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rb
index c96fa039a1..5f55455cbb 100644
--- a/core/app/models/spree/line_item.rb
+++ b/core/app/models/spree/line_item.rb
@@ -168,6 +168,13 @@ module Spree
assign_attributes opts
end
+ # Returns the maximum quantity that can be added to the line item
+ #
+ # @return [Integer]
+ def maximum_quantity
+ @maximum_quantity ||= variant.backorderable? ? Spree::DatabaseTypeUtilities.maximum_value_for(:integer) : variant.total_on_hand
+ end
+
private
def ensure_valid_quantity
diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rb
index fd764424ce..d3cb69b13e 100644
--- a/core/lib/spree/core/controller_helpers/order.rb
+++ b/core/lib/spree/core/controller_helpers/order.rb
@@ -11,6 +11,10 @@ module Spree
end
end
+ def order_token
+ @order_token ||= cookies.signed[:token] || params[:order_token]
+ end
+
# Used in the link_to_cart helper.
def simple_current_order
return @simple_current_order if @simple_current_order
@@ -28,21 +32,29 @@ module Spree
# The current incomplete order from the token for use in cart and during checkout
def current_order(options = {})
options[:create_order_if_necessary] ||= false
- options[:includes] ||= true
+ options[:includes] ||= false
if @current_order
@current_order.last_ip_address = ip_address
return @current_order
end
- @current_order = find_order_by_token_or_user(options, true)
+ @current_order = find_order_by_token_or_user(options, false)
if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
- @current_order = current_store.orders.create!(current_order_params)
+ @current_order = current_store.orders.create!(current_order_params.except(:token))
@current_order.associate_user! try_spree_current_user if try_spree_current_user
@current_order.last_ip_address = ip_address
+
+ create_token_cookie(@current_order.token)
end
+ # There is some edge case where the order doesn't have a token.
+ # but can't reproduce it. So let's generate one on the fly in that case.
+ @current_order.regenerate_token if @current_order && @current_order.token.blank?
+
+ create_token_cookie(@current_order&.token || current_order_params[:token] || params[:token]) if create_cookie_from_token?
+
@current_order
end
@@ -56,14 +68,24 @@ module Spree
def set_current_order
return unless try_spree_current_user && current_order
- orders_scope = try_spree_current_user.orders.
- incomplete.not_canceled.
- where.not(id: current_order.id).
- where(store_id: current_store.id)
+ orders_scope = user_orders_scope
- orders_scope.each do |order|
- current_order.merge!(order, try_spree_current_user)
+ orders_to_merge = orders_scope.limit(10)
+ order_ids_to_delete = orders_scope.ids - orders_to_merge.ids
+
+ orders_scope_exists = orders_scope.exists?
+
+ if orders_scope.exists?
+ orders_to_merge.find_each do |order|
+ current_order.merge!(order, try_spree_current_user)
+ end
+
+ Spree::Order.where(id: order_ids_to_delete).find_each do |order|
+ Rails.logger.error("Failed to destroy order #{order.id} while merging") unless order.destroy
+ end
end
+
+ orders_scope_exists
end
def ip_address
@@ -72,15 +94,43 @@ module Spree
private
+ def user_orders_scope
+ try_spree_current_user.orders.
+ incomplete.
+ not_canceled.
+ where.not(id: current_order.id).
+ where(store_id: current_store.id)
+ end
+
+ def create_cookie_from_token?
+ cookies.signed[:token].blank? &&
+ (current_order_params[:token].present? || params[:token].present?)
+ end
+
+ def checkout_complete_path?
+ request.path == spree.checkout_complete_path(current_order_params[:token] || params[:token])
+ end
+
+ def create_token_cookie(token)
+ cookies.signed[:token] = {
+ value: token,
+ expires: 90.days.from_now,
+ secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
+ domain: current_store.url_or_custom_domain
+ }
+ end
+
def last_incomplete_order(includes = {})
@last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
end
def current_order_params
- { currency: current_currency, token: cookies.signed[:token], user_id: try_spree_current_user.try(:id) }
+ @current_order_params ||= { currency: current_currency, token: order_token, user_id: try_spree_current_user.try(:id) }
end
def find_order_by_token_or_user(options = {}, with_adjustments = false)
+ return nil if try_spree_current_user.nil? && order_token.blank?
+
options[:lock] ||= false
includes = options[:includes] ? order_includes : {}
@@ -102,7 +152,20 @@ module Spree
end
def order_includes
- { line_items: [variant: [:images, :option_values, :product]] }
+ {
+ line_items: {
+ variant: [
+ :images,
+ :prices,
+ :default_price,
+ :stock_items,
+ :stock_locations,
+ { option_values: :option_type },
+ { stock_items: :stock_location },
+ { product: :master }
+ ]
+ }
+ }
end
end
end
diff --git a/core/lib/spree/core/dependencies.rb b/core/lib/spree/core/dependencies.rb
index c1f94bda20..53abac1ebb 100644
--- a/core/lib/spree/core/dependencies.rb
+++ b/core/lib/spree/core/dependencies.rb
@@ -21,6 +21,7 @@ module Spree
cart_destroy_service: 'Spree::Cart::Destroy',
cart_associate_service: 'Spree::Cart::Associate',
cart_change_currency_service: 'Spree::Cart::ChangeCurrency',
+ cart_remove_out_of_stock_items_service: 'Spree::Cart::RemoveOutOfStockItems',
# checkout
checkout_next_service: 'Spree::Checkout::Next',
diff --git a/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/core/spec/lib/spree/core/controller_helpers/order_spec.rb
index df750c0774..19bb89d862 100644
--- a/core/spec/lib/spree/core/controller_helpers/order_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/order_spec.rb
@@ -7,6 +7,18 @@ class FakesController < ApplicationController
include Spree::Core::ControllerHelpers::Locale
end
+class ActionDispatch::Cookies::SignedKeyRotatingCookieJar
+ def fetch_set_cookies
+ @parent_jar.fetch_set_cookies
+ end
+end
+
+class ActionDispatch::Cookies::CookieJar
+ def fetch_set_cookies
+ @set_cookies
+ end
+end
+
describe Spree::Core::ControllerHelpers::Order, type: :controller do
controller(FakesController) {}
@@ -46,25 +58,90 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
controller.current_order(create_order_if_necessary: true)
end.to change(Spree::Order, :count).to(1)
end
+ end
+
+ describe 'creating a token cookie' do
+ let!(:store) { create(:store, default: true, name: 'Test Cookie Store') }
+
+ let(:token_cookie) { request.cookie_jar.signed[:token] }
+ let(:token_cookie_domain) { request.cookie_jar.signed.fetch_set_cookies.dig('token', :domain) }
+
+ context 'for a cart with token' do
+ before do
+ allow(controller).to receive(:current_order_params).and_return(
+ token: 'token-123',
+ currency: 'USD',
+ user_id: user.id
+ )
+ end
+
+ it 'creates a new token cookie' do
+ controller.current_order
+
+ expect(token_cookie).to be_present
+ expect(token_cookie_domain).to eq(store.url)
+ end
+
+ context 'on a custom domain' do
+ let!(:custom_domain) { create(:custom_domain, store: store, url: 'test-cookie-store.com') }
+
+ it 'creates a new token cookie on a custom domain' do
+ controller.current_order
+
+ expect(token_cookie).to be_present
+ expect(token_cookie_domain).to eq('test-cookie-store.com')
+ end
+ end
+ end
- it 'assigns the current_store id' do
- controller.current_order(create_order_if_necessary: true)
- expect(Spree::Order.last.store_id).to eq store.id
+ context 'for a cart without token' do
+ before do
+ allow(controller).to receive(:current_order_params).and_return(
+ token: nil,
+ currency: 'USD',
+ user_id: user.id
+ )
+ end
+
+ it 'does nothing' do
+ controller.current_order
+ expect(token_cookie).to be_nil
+ end
end
- end
- context 'gets using the token' do
- let!(:order) { create :order, user: user, store: store }
- let!(:guest_order) { create :order, user: nil, email: nil, token: 'token', store: store }
+ context 'with a checkout token' do
+ before do
+ allow(controller).to receive(:params).and_return(token: 'token-123')
+ end
+
+ it 'creates a new token cookie' do
+ controller.current_order
- before do
- expect(controller).to receive(:current_order_params).and_return(
- currency: store.default_currency, token: 'token', store_id: guest_order.store_id, user_id: user.id
- )
+ expect(token_cookie).to be_present
+ expect(token_cookie_domain).to eq(store.url)
+ end
+
+ context 'on a custom domain' do
+ let!(:custom_domain) { create(:custom_domain, store: store, url: 'test-cookie-store.com') }
+
+ it 'creates a new token cookie on a custom domain' do
+ controller.current_order
+
+ expect(token_cookie).to be_present
+ expect(token_cookie_domain).to eq('test-cookie-store.com')
+ end
+ end
end
- specify 'without the guest token being bound to any user yet' do
- expect(controller.current_order).to eq guest_order
+ context 'for a checkout without token' do
+ before do
+ allow(controller).to receive(:params).and_return(token: nil)
+ end
+
+ it 'does nothing' do
+ controller.current_order
+ expect(token_cookie).to be_nil
+ end
end
end
end
diff --git a/storefront/app/controllers/spree/orders_controller.rb b/storefront/app/controllers/spree/orders_controller.rb
new file mode 100644
index 0000000000..2414b1f3e4
--- /dev/null
+++ b/storefront/app/controllers/spree/orders_controller.rb
@@ -0,0 +1,92 @@
+# overwrote this controller to drop empty and show actions
+# show action has it's own controller order_status
+# empty is not needed anymore
+module Spree
+ class OrdersController < StoreController
+ include Spree::Core::ControllerHelpers::Order
+ include CartMethods
+
+ helper 'spree/products'
+
+ before_action :assign_order_with_lock, only: :update
+
+ # GET /orders/:id/:token
+ def show
+ @order = complete_order_scope.find_by!(number: params[:id], token: params[:token])
+ end
+
+ # PUT /cart
+ def update
+ @variant = current_store.variants.find(params[:variant_id]) if params[:variant_id]
+ @result = cart_update_service.call(order: @order, params: order_params)
+
+ if @result.success?
+ if params.key?(:checkout)
+ @order.next if @order.cart?
+ redirect_to spree.checkout_state_path(@order.token, @order.checkout_steps.first)
+ else
+ redirect_to spree.cart_path
+ end
+ else
+ render :edit, status: :unprocessable_entity
+ end
+ end
+
+ # GET /cart
+ def edit
+ flash.keep if request.format.turbo_stream?
+ @order = current_order || find_order_by_cookie
+ associate_user
+
+ remove_out_of_stock_items
+ load_line_items
+ end
+
+ private
+
+ def find_order_by_cookie
+ if order_token.present?
+ current_store.orders.incomplete.not_canceled.
+ includes(line_items: [variant: [:images, :product, { option_values: :option_type }]]).
+ find_by(token: order_token)
+ else
+ current_store.orders.incomplete.new
+ end
+ end
+
+ def accurate_title
+ if action_name == 'edit' || action_name == 'update'
+ Spree.t(:shopping_cart)
+ else
+ Spree.t(:order_number, number: @order&.number)
+ end
+ end
+
+ def order_params
+ if params[:order]
+ params[:order].permit(*permitted_order_attributes)
+ else
+ {}
+ end
+ end
+
+ def cart_remove_out_of_stock_items_service
+ Spree::Dependencies.cart_remove_out_of_stock_items_service.constantize
+ end
+
+ def cart_update_service
+ Spree::Dependencies.cart_update_service.constantize
+ end
+
+ def complete_order_scope
+ current_store.orders.complete
+ end
+
+ def remove_out_of_stock_items
+ return unless @order&.persisted?
+
+ @order, messages = cart_remove_out_of_stock_items_service.call(order: @order).value
+ flash[:error] = messages.to_sentence if messages.any?
+ end
+ end
+end
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rb
index 8af794fa03..9c4c007be6 100644
--- a/storefront/app/controllers/spree/store_controller.rb
+++ b/storefront/app/controllers/spree/store_controller.rb
@@ -28,6 +28,8 @@ module Spree
:storefront_products_scope, :storefront_products,
:default_products_sort, :default_products_finder_params
+ helper_method :turbo_frame_request?, :turbo_stream_request?
+
prepend_before_action :set_theme_view_paths
before_action :redirect_to_default_locale
before_action :render_404_if_store_not_exists
@@ -84,6 +86,10 @@ module Spree
@products_filters_params ||= permitted_products_params[:filter]&.compact_blank || {}
end
+ def turbo_stream_request?
+ request.format.turbo_stream?
+ end
+
protected
def set_theme_view_paths
@@ -224,10 +230,6 @@ module Spree
store_location_for(Devise.mappings.keys.first, location)
end
- def skip_ahoy
- false
- end
-
def redirect_to_cart
redirect_to spree.cart_path
end
diff --git a/storefront/app/helpers/spree/cart_helper.rb b/storefront/app/helpers/spree/cart_helper.rb
new file mode 100644
index 0000000000..ba36160786
--- /dev/null
+++ b/storefront/app/helpers/spree/cart_helper.rb
@@ -0,0 +1,48 @@
+module Spree
+ module CartHelper
+ def quantity_field_options(opts = {})
+ opts[:min] ||= 1
+ opts[:max] ||= maximum_quantity
+
+ {
+ min: opts[:min], max: opts[:max],
+ class: opts[:class],
+ data: { 'quantity-picker-target': 'quantity' },
+ aria: { label: Spree.t(:quantity) }
+ }
+ end
+
+ def quantity_modifier_button_tag(text = '+', opts = {})
+ opts[:action] ||= 'increase'
+ opts[:type] ||= 'button'
+
+ button_tag(
+ text,
+ type: opts[:type],
+ class: opts[:class],
+ data: {
+ 'quantity-picker-target': opts[:action],
+ action: "click->quantity-picker##{opts[:action]} click->cart#disableCart"
+ }
+ )
+ end
+
+ def color_options_style_for_line_items(line_items)
+ @color_options_style_for_line_items = begin
+ colors = line_items.map(&:variant).map do |v|
+ color_option_values = v.option_values.find_all do |ov|
+ ov.option_type.color?
+ end
+
+ color_option_values.map do |ov|
+ { name: ov.name, filter_name: ov.name }
+ end
+ end
+
+ colors = colors.flatten.uniq { |color| [color[:name], color[:filter_name]] }
+
+ Spree::ColorsPreviewStylesPresenter.new(colors).to_s
+ end
+ end
+ end
+end
diff --git a/storefront/app/views/themes/default/spree/orders/_cart.html.erb b/storefront/app/views/themes/default/spree/orders/_cart.html.erb
new file mode 100644
index 0000000000..f67554ae16
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/_cart.html.erb
@@ -0,0 +1,14 @@
+<div data-controller="cart" class="h-full">
+ <div class="h-full flex flex-col" id="cart-container" data-cart-target="container">
+ <%== color_options_style_for_line_items(@line_items) %>
+ <ul class="w-full" id="line-items">
+ <%= render collection: @line_items, partial: 'spree/orders/line_item', cached: spree_base_cache_scope %>
+ </ul>
+ <%= render 'spree/orders/summary', order: @order %>
+ </div>
+ <div class="hidden absolute w-full flex justify-center" style="top: 40%;left: 0" data-cart-target="spinner">
+ <span class="group-aria-[busy]:inline-flex gap-2 items-center">
+ <span class="w-10 h-10 border-dotted border-[3px] inline-block rounded-full animate-[spin_2s_linear_infinite] border-current"></span>
+ </span>
+ </div>
+</div>
diff --git a/storefront/app/views/themes/default/spree/orders/_empty.html.erb b/storefront/app/views/themes/default/spree/orders/_empty.html.erb
new file mode 100644
index 0000000000..df02199fbb
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/_empty.html.erb
@@ -0,0 +1,11 @@
+<div class="flex flex-col justify-between h-full">
+ <div class="h-full flex flex-col items-center place-content-center py-10">
+ <%= render 'spree/shared/icons/cart_48' %>
+ <p class="mb-8 mt-4 uppercase text-sm">
+ <%= Spree.t('cart_page.empty_info').html_safe %>
+ </p>
+ <div class="mx-10">
+ <%= link_to Spree.t(:continue_shopping), spree.products_path, class: 'btn-primary !no-underline', data: { 'turbo-frame': '_top' } %>
+ </div>
+ </div>
+</div>
diff --git a/storefront/app/views/themes/default/spree/orders/_line_item.html.erb b/storefront/app/views/themes/default/spree/orders/_line_item.html.erb
new file mode 100644
index 0000000000..72837cad2a
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/_line_item.html.erb
@@ -0,0 +1,47 @@
+<%= turbo_frame_tag dom_id(line_item), data: { controller: 'reveal' } do %>
+ <li class="cart-line-item flex items-top py-6 px-4 w-full" data-reveal-target="item">
+ <div class="line-item-overlay"></div>
+ <div class="cart-product-image flex-shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
+ <% image = line_item.variant.default_image %>
+ <% if image.present? && image.attached? && image.variable? %>
+ <%= link_to spree_storefront_resource_url(line_item.product), data: { 'turbo-frame': '_top' } do %>
+ <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fit: [256, 256]))), width: 128, height: 128, class: 'object-cover', loading: :lazy %>
+ <% end %>
+ <% end %>
+ </div>
+ <div class="ml-3 w-full">
+ <div class="flex justify-between">
+ <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-text', data: { 'turbo-frame': '_top' } %>
+
+ <%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), method: :delete, data: { controller: 'turbo-stream-form' } do |item_form| %>
+ <%= button_tag type: :submit, class: 'remove-line-item-button h-100', data: { action: "click->reveal#hide click->cart#disableCart" } do %>
+ <%= render 'spree/shared/icons/cross', size: 16 %>
+ <% end %>
+ <% end %>
+ </div>
+ <div class="mb-2 text-sm">
+ <% if line_item.variant.on_sale?(current_currency) %>
+ <span class="">
+ <del><%= line_item.variant.display_compare_at_price %></del>
+ </span>
+ <span class="text-danger">
+ <%= line_item.display_price %>
+ </span>
+ <% else %>
+ <span><%= line_item.display_price %></span>
+ <% end %>
+ </div>
+ <div class="flex flex-wrap gap-2">
+ <%= render 'spree/shared/line_item_options', line_item: line_item %>
+ </div>
+ <div class="flex flex-row-reverse w-full mt-3">
+ <%= render 'spree/orders/line_item_quantity', line_item: line_item %>
+ </div>
+ <% if !line_item.variant.backorderable? && line_item.variant.total_on_hand < 5 %>
+ <div class="text-sm -mt-5 text-center text-danger" style="width: 117px">
+ <%= Spree.t(:only_left, count: line_item.variant.total_on_hand) %>
+ </div>
+ <% end %>
+ </div>
+ </li>
+<% end %>
diff --git a/storefront/app/views/themes/default/spree/orders/_line_item_quantity.html.erb b/storefront/app/views/themes/default/spree/orders/_line_item_quantity.html.erb
new file mode 100644
index 0000000000..8f6bd9c531
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/_line_item_quantity.html.erb
@@ -0,0 +1,11 @@
+<div class="flex items-center">
+ <%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), data: { controller: 'turbo-stream-form' } do |item_form| %>
+ <div class="quantity-picker" data-controller="quantity-picker">
+ <!-- this is a dummy button to work with turbo frame forms when hitting ENTER -->
+ <%= button_tag render('spree/shared/icons/minus'), type: 'submit', class: 'hidden' %>
+ <%= quantity_modifier_button_tag render('spree/shared/icons/minus'), type: 'submit', action: 'decrease', class: 'quantity-decrease-button' %>
+ <%= item_form.number_field(:quantity, quantity_field_options(max: line_item.maximum_quantity)) %>
+ <%= quantity_modifier_button_tag render('spree/shared/icons/plus'), type: 'submit', action: 'increase', class: 'quantity-increase-button' %>
+ </div>
+ <% end %>
+</div>
diff --git a/storefront/app/views/themes/default/spree/orders/_summary.html.erb b/storefront/app/views/themes/default/spree/orders/_summary.html.erb
new file mode 100644
index 0000000000..f82a052458
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/_summary.html.erb
@@ -0,0 +1,41 @@
+<%= turbo_frame_tag :cart_summary do %>
+ <% if order.line_items.any? %>
+ <div class="cart-summary-container p-4">
+ <p class="text-center lg:text-right text-sm mb-3">
+ <%= Spree.t(:shipping_and_taxes_calculated_at_checkout) %>
+ </p>
+
+ <div class="shopping-cart-total-text text-center lg:text-right uppercase font-medium">
+ <%= Spree.t(:total) %>
+ <span class="shopping-cart-total-amount">
+ <%= order.display_item_total %>
+ </span>
+ </div>
+
+ <% unless order.cart_promo_total.zero? %>
+ <div class="shopping-cart-total-text mt-3 text-center lg:text-right uppercase font-medium">
+ <%= Spree.t(:promotion) %>
+ <span class="shopping-cart-total-amount">
+ <%= order.display_cart_promo_total %>
+ </span>
+ </div>
+ <% end %>
+ <div class="flex <%= !turbo_frame_request? && !turbo_stream_request? ? 'flex-row' : 'flex-col' %> gap-4 mt-4 w-full justify-end items-end">
+ <% if quick_checkout_enabled?(@order) %>
+ <div class="min-h-[46px] w-full has-[turbo-frame]:block group no-separator">
+ <% if !turbo_frame_request? && !turbo_stream_request? %>
+ <%= render partial: 'spree/checkout/quick_checkout', locals: { height: 46, theme: 'black', button_width: 320, container_class: "w-full flex justify-end" } %>
+ <% else %>
+ <%= render partial: 'spree/checkout/quick_checkout', locals: { height: 46, theme: 'white', max_columns: 2, max_rows: 2 } %>
+ <% end %>
+ </div>
+ <% end %>
+ <div class="flex flex-col gap-4 <%= 'w-full' if turbo_frame_request? || turbo_stream_request? %>">
+ <%= link_to Spree.t(:checkout), spree.checkout_path(order.token),
+ class: 'btn-primary block w-full lg:w-80 text-center !no-underline !mt-0',
+ data: { 'turbo': 'false', 'cart-target': 'checkoutButton' } %>
+ </div>
+ </div>
+ </div>
+ <% 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.erb
new file mode 100644
index 0000000000..ce482c9524
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/edit.html.erb
@@ -0,0 +1,18 @@
+<% if !turbo_frame_request? && !turbo_stream_request? %>
+ <div class="page-container">
+ <%= render 'spree/shared/title' %>
+<% end %>
+
+ <%= render 'spree/shared/error_messages', target: @order %>
+
+ <%= turbo_frame_tag :cart_contents, class: 'cart-contents' do %>
+ <% if !@line_items || @line_items.empty? %>
+ <%= render 'spree/orders/empty' %>
+ <% else %>
+ <%= render 'spree/orders/cart' %>
+ <% end %>
+ <% end %>
+
+<% if !turbo_frame_request? && !turbo_stream_request? %>
+ </div>
+<% end %>
diff --git a/storefront/app/views/themes/default/spree/orders/show.html.erb b/storefront/app/views/themes/default/spree/orders/show.html.erb
new file mode 100644
index 0000000000..79afa7d7d4
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/orders/show.html.erb
@@ -0,0 +1,6 @@
+<div class="page-container">
+ <h1 class="text-2xl uppercase font-medium tracking-tight py-5 text-center lg:text-left mt-5">
+ <%= accurate_title %>
+ </h1>
+ <%= render 'spree/shared/order_details', order: @order %>
+</div>
diff --git a/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb b/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb
new file mode 100644
index 0000000000..58e8bb0d42
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/shared/_error_messages.html.erb
@@ -0,0 +1,9 @@
+<% if target && target.errors.any? %>
+ <div id="errorExplanation" class="alert-error text-center mb-4 p-2">
+ <ul>
+ <% target.errors.full_messages.each do |msg| %>
+ <li><%= msg %></li>
+ <% end %>
+ </ul>
+ </div>
+<% end %>
diff --git a/storefront/app/views/themes/default/spree/shared/_line_item_options.html.erb b/storefront/app/views/themes/default/spree/shared/_line_item_options.html.erb
new file mode 100644
index 0000000000..af88531052
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/shared/_line_item_options.html.erb
@@ -0,0 +1,18 @@
+<% line_item.variant.option_values.select { |ov| ov.option_type.color? }.each do |option| %>
+ <div>
+ <input class="hidden color-input" value="<%= option.name %>" >
+ <div class="label-container h-[30px] border border-default p-0.5 inline-flex items-center hover:border-dashed hover:border-primary">
+ <div class="color-preview w-[24px] h-[24px]"></div>
+ <div class="text-sm px-2">
+ <%= option.presentation %>
+ </div>
+ </div>
+ </div>
+<% end %>
+<% line_item.variant.option_values.reject { |ov| ov.option_type.color? }.each do |option| %>
+ <div>
+ <div class="h-[30px] border border-default px-2 inline-flex items-center hover:border-dashed hover:border-primary text-sm">
+ <%= option.presentation %>
+ </div>
+ </div>
+<% end %>
diff --git a/storefront/app/views/themes/default/spree/shared/_title.html.erb b/storefront/app/views/themes/default/spree/shared/_title.html.erb
new file mode 100644
index 0000000000..9a58b1e2a5
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/shared/_title.html.erb
@@ -0,0 +1,3 @@
+<h1 class="text-2xl uppercase font-medium tracking-tight py-5 text-center lg:text-left mt-5">
+ <%= accurate_title %>
+</h1>
diff --git a/storefront/config/routes.rb b/storefront/config/routes.rb
index cd857fbe77..9e36dd1b7d 100644
--- a/storefront/config/routes.rb
+++ b/storefront/config/routes.rb
@@ -1,5 +1,10 @@
Spree::Core::Engine.add_routes do
scope '(:locale)', locale: /#{Spree.available_locales.join('|')}/, defaults: { locale: nil } do
+ # Cart
+ resources :orders, except: [:index, :new, :create, :destroy]
+ get '/cart', to: 'orders#edit', as: :cart
+ patch '/cart', to: 'orders#update', as: :update_cart
+
namespace :account do
resource :wishlist, only: [:show], controller: '/spree/wishlists' do
resources :wished_items, only: [:create, :destroy]
diff --git a/storefront/spec/controllers/spree/orders_controller_spec.rb b/storefront/spec/controllers/spree/orders_controller_spec.rb
new file mode 100644
index 0000000000..87a4889b2a
--- /dev/null
+++ b/storefront/spec/controllers/spree/orders_controller_spec.rb
@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Spree::OrdersController, type: :controller do
+ let(:store) { Spree::Store.default }
+ let(:user) { create(:user) }
+ let(:product) { create(:product, stores: [store]) }
+ let(:variant) { create(:variant, product: product) }
+
+ describe '#edit' do
+ let(:order) { create(:order_with_totals, store: store, user: user) }
+
+ before do
+ allow(controller).to receive_messages try_spree_current_user: user
+ allow(controller).to receive_messages spree_current_user: user
+ allow(controller).to receive_messages current_order: order
+ end
+
+ it 'render edit template' do
+ get :edit
+ expect(response).to render_template(:edit)
+ expect(flash[:error]).to eq(nil)
+ end
+
+ it 'removes line item and render discontinued flash message' do
+ product = order.products.first
+ product.update_columns(status: 'archive')
+ get :edit
+ expect(flash[:error]).to match(Spree.t('cart_line_item.discontinued', li_name: product.name))
+ end
+
+ it 'removes line item and render out of stock flash message' do
+ product = order.products.first
+ product.stock_items.update_all(count_on_hand: 0, backorderable: false)
+ get :edit
+
+ expect(flash[:error]).to match(Spree.t('cart_line_item.out_of_stock', li_name: product.name))
+ end
+ end
+
+ context 'Order model mock' do
+ let(:order) { create(:order, store: store) }
+
+ before do
+ allow(controller).to receive_messages(try_spree_current_user: user)
+ end
+
+ context '#update' do
+ context 'with authorization' do
+ before do
+ allow(controller).to receive :check_authorization
+ allow(controller).to receive_messages current_order: order
+ end
+
+ it 'renders the edit view (on failure)' do
+ # email validation is only after address state
+ order.update_column(:state, 'payment')
+ put :update, params: { order: { email: '' }, order_id: order.id }
+ expect(response).to render_template :edit
+ end
+
+ it 'redirects to cart path (on success)' do
+ allow(order).to receive(:update).and_return true
+ put :update, params: { order_id: 1 }
+ expect(response).to redirect_to(spree.cart_path)
+ end
+ end
+ end
+
+ # Regression test for #2750
+ context '#update' do
+ before do
+ allow(user).to receive :last_incomplete_spree_order
+ allow(controller).to receive :set_current_order
+ end
+
+ it 'cannot update a blank order' do
+ put :update, params: { order: { email: 'foo' } }
+ expect(response.status).to eq(302)
+ expect(response).to redirect_to(spree.cart_path)
+ end
+ end
+ end
+
+ context 'line items quantity is 0' do
+ let(:order) { create(:order, store: store) }
+ let!(:line_item) { Spree::Cart::AddItem.call(order: order, variant: variant).value }
+
+ before do
+ allow(controller).to receive(:check_authorization)
+ allow(controller).to receive_messages(current_order: order)
+ end
+
+ it 'removes line items on update' do
+ expect(order.line_items.count).to eq 1
+ put :update, params: { order: { line_items_attributes: { '0' => { id: line_item.id, quantity: 0 } } } }
+ expect(order.reload.line_items.count).to eq 0
+ end
+ end
+end