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
Storefront: open source account order history
Damian Legawiec15f32e2dac5c
diff --git a/storefront/app/controllers/spree/account/orders_controller.rb b/storefront/app/controllers/spree/account/orders_controller.rbindex b453d4da5c..3d39d2ecfa 100644--- a/storefront/app/controllers/spree/account/orders_controller.rb+++ b/storefront/app/controllers/spree/account/orders_controller.rb@@ -6,7 +6,8 @@ module Spreeenddef show- @order = orders_scope.includes(vendor_orders: [:shipments, :line_items]).find_by!(number: params[:id])+ @order = orders_scope.find_by!(number: params[:id])+ @shipments = @order.shipmentsendprivate@@ -18,6 +19,10 @@ module SpreeSpree.t(:my_orders)endend++ def orders_scope+ @user.completed_orders.for_store(current_store).order(completed_at: :desc)+ endendendenddiff --git a/storefront/app/controllers/spree/account/profile_controller.rb b/storefront/app/controllers/spree/account/profile_controller.rbindex 8c0f3200f2..7ff460552a 100644--- a/storefront/app/controllers/spree/account/profile_controller.rb+++ b/storefront/app/controllers/spree/account/profile_controller.rb@@ -16,10 +16,6 @@ module Spreedef user_paramsparams.require(:user).permit(:title, :first_name, :last_name, :phone)end-- def accurate_title- Spree.t(:my_account)- endendendenddiff --git a/storefront/app/views/themes/default/spree/shared/_address.html.erb b/storefront/app/views/themes/default/spree/shared/_address.html.erbnew file mode 100644index 0000000000..23afa17717--- /dev/null+++ b/storefront/app/views/themes/default/spree/shared/_address.html.erb@@ -0,0 +1,35 @@+<% cache [*spree_base_cache_scope.call(address), address.user] do %>+ <div class="text-sm">+ <div class="mb-1"><%= address.full_name %></div>+ <% unless address.company.blank? %>+ <div class="org">+ <%= address.company %>+ </div>+ <% end %>+ <div class="adr">+ <div class="street-address-line">+ <%= address.street %>+ </div>+ <div class="local">+ <span class="locality"><%= address.city %></span>,+ <span class="region"><%= address.state_text %></span>+ <span class="postal-code"><%= address.zipcode %></span>+ <span class="country-name"><%= address.country.try(:iso3) %></span>+ </div>+ </div>+ <% if address.user %>+ <div class="flex flex-wrap gap-2 mt-3">+ <% if address.id == address.user.ship_address_id %>+ <div class="bg-accent border border-default rounded-full px-3 py-2 text-xs">+ <%= Spree.t(:default_shipping_address) %>+ </div>+ <% end %>+ <% if address.id == address.user.bill_address_id %>+ <div class="bg-accent border border-default rounded-full px-3 py-2 text-xs">+ <%= Spree.t(:default_billing_address) %>+ </div>+ <% end %>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb b/storefront/app/views/themes/default/spree/shared/_order_details.html.erbnew file mode 100644index 0000000000..1ef6a9229a--- /dev/null+++ b/storefront/app/views/themes/default/spree/shared/_order_details.html.erb@@ -0,0 +1,102 @@+<% if order.order_refunded? || order.partially_refunded? %>+ <div class="alert-warning mb-5 py-2 px-3">+ <% if order.gift_card %>+ <% key = "refund_action_required_message.order_#{@shipments.shipped_but_canceled.any? ? 'refunded' : 'canceled'}.#{order.partially_refunded? ? 'partially' : 'fully'}" %>+ <%= Spree.t(key, customer_support_email: order.store.customer_support_email ) %>+ <% else %>+ <% key = "refund_action_not_required_message.order_#{@shipments.shipped_but_canceled.any? ? 'refunded' : 'canceled'}.#{order.partially_refunded? ? 'partially' : 'fully'}" %>+ <%= Spree.t(key) %>+ <% end %>+ </div>+<% end %>++<p class="mb-6">+ <%= Spree.t(:completed_at) %> <%= local_time(order.completed_at) %>+</p>++<%== color_options_style_for_line_items(@shipments.flat_map(&:line_items)) %>++<ul>+ <%= render partial: 'spree/shared/order_shipment', collection: @shipments, as: :shipment, cached: spree_base_cache_scope %>+</ul>++<div class="mt-6 bg-accent mb-24">+ <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">+ <!-- billing address -->+ <div>+ <div class="uppercase tracking-widest">+ <%= Spree.t(:billing_address) %>+ </div>+ <div class="!leading-[1.375rem] text-neutral-800">+ <%= render 'spree/shared/address', address: @order.billing_address %>+ </div>+ </div>+ <!-- payment into -->+ <div class="mb-5 lg:mb-0">+ <div class="uppercase tracking-widest">+ <%= Spree.t(:payment_information) %>+ </div>+ <div class="!leading-[1.375rem] text-neutral-800">+ <%= render collection: @order.payments.valid, partial: 'spree/shared/payment', cached: spree_base_cache_scope %>+ </div>+ </div>+ </div>+ <!-- totals/summary -->+ <div class="p-4 lg:p-6 text-sm">+ <div class="flex items-center justify-between py-2">+ <div>+ <%= Spree.t(:subtotal) %>+ </div>+ <div>+ <%= order.display_item_total.to_html %>+ </div>+ </div>+ <div class="flex items-center justify-between py-2">+ <div>+ <%= Spree.t(:shipping) %>+ </div>+ <div>+ <%= order.display_ship_total.to_html %>+ </div>+ </div>+ <% if order.promo_total != 0 %>+ <div class="flex items-center justify-between py-2">+ <div>+ <%= Spree.t(:discount) %>+ </div>+ <div>+ <%= order.display_promo_total.to_html %>+ </div>+ </div>+ <% end %>+ <div class="flex items-center justify-between py-2">+ <div>+ <%= Spree.t(:tax) %>+ </div>+ <div>+ <%= order.display_tax_total.to_html %>+ </div>+ </div>++ <% if order.respond_to?(:gift_card) && order.gift_card.present? %>+ <div class="flex items-center justify-between py-2">+ <div><%= Spree.t(:gift_card) %></div>+ <div>-<%= order.display_gift_card_total.to_html %></div>+ </div>+ <% elsif order.using_store_credit? %>+ <div class="flex items-center justify-between py-2">+ <div><%= Spree.t(:store_credits) %></div>+ <div><%= order.display_total_applied_store_credit %></div>+ </div>+ <% end %>++ <div class="flex items-center justify-between text-lg pt-4 font-medium border-default border-t">+ <div>+ <%= Spree.t(:total) %>+ </div>+ <div>+ <%= order.display_total_minus_store_credits.to_html %>+ </div>+ </div>+ </div>+</div>diff --git a/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb b/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erbnew file mode 100644index 0000000000..909be3c1d6--- /dev/null+++ b/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb@@ -0,0 +1,29 @@+<div>+ <div class="flex gap-4">+ <div class="flex-shrink-0">+ <% image = line_item.variant.default_image %>+ <% if image.present? && image.attached? && image.variable? %>+ <%= link_to spree_storefront_resource_url(line_item.product, relative: true) do %>+ <%= image_tag main_app.cdn_image_url(image.variant(spree_image_variant_options(resize_to_fit: [256, 256]))), width: 128, loaging: :lazy %>+ <% end %>+ <% end %>+ </div>+ <div class="flex flex-col gap-2">+ <div class="font-medium uppercase">+ <%= link_to line_item.name, spree_storefront_resource_url(line_item.product, relative: true) %>+ </div>+ <div class="font-medium">+ <%= line_item.display_price %>+ </div>+ <div class="flex flex-wrap gap-2">+ <%= render 'spree/shared/line_item_options', line_item: line_item %>+ <div class="h-[30px] border border-default px-2 inline-flex items-center hover:border-dashed hover:border-primary text-sm">+ <%= Spree.t(:quantity) %>: <%= line_item.quantity %>+ </div>+ </div>+ </div>+ </div>+ <div class="mt-3">+ <%= link_to Spree.t(:order_again), spree_storefront_resource_url(line_item.product, relative: true), class: 'link' %>+ </div>+</div>diff --git a/storefront/app/views/themes/default/spree/shared/_order_shipment.html.erb b/storefront/app/views/themes/default/spree/shared/_order_shipment.html.erbnew file mode 100644index 0000000000..310e6d8ce9--- /dev/null+++ b/storefront/app/views/themes/default/spree/shared/_order_shipment.html.erb@@ -0,0 +1,58 @@+<li class="border border-accent mb-4">+ <div class="p-4 lg:p-6">+ <div class="flex flex-col lg:flex-row lg:gap-6 gap-4">+ <div class="text-sm lg:w-1/2">+ <div class="tracking-widest uppercase mb-1">+ <%= Spree.t(:delivery_address) %>+ </div>+ <div class="!leading-[1.375rem] text-neutral-800">+ <%= render 'spree/shared/address', address: shipment.address || shipment.order.ship_address %>+ </div>+ </div>+ <div class="text-sm lg:w-1/2 lg:flex justify-between">+ <div>+ <div class="tracking-widest uppercase mb-1">+ <%= Spree.t(:shipping_method) %>+ </div>+ <div class="!leading-[1.375rem] text-neutral-800">+ <% if shipment.shipping_method.present? %>+ <%= shipment.shipping_method.name %>+ <% else %>+ <%= Spree.t('shipment_states.canceled') %>+ <% end %>+ <br >+ <% if shipment.stock_location.present? %>+ <%= Spree.t(:shipped_from) %> <%= shipment.stock_location.name %>+ <% end %>+ </div>+ </div>+ <div class="mt-4 lg:-mt-2 lg:-mr-2">+ <% if shipment.shipped? && shipment.tracked? && shipment.tracking_url.present? %>+ <%= link_to Spree.t(:track_items), shipment.tracking_url, class: "!px-3 !py-1 block btn-primary !leading-6 text-sm text-center", target: :_blank %>+ <% else %>+ <button class="!px-3 !py-1 block btn-primary !leading-6 text-sm text-center" disabled><%= Spree.t(:track_items) %></button>+ <% end %>+ </div>+ </div>+ </div>+ <% if shipment.canceled? && shipment.shipped_at.present? %>+ <%# No message if shipment has been shipped already %>+ <% elsif shipment.canceled? && shipment.shipped_at.nil? %>+ <div class="alert-warning text-sm uppercase mt-3 px-3 py-2">+ <strong><%= Spree.t(:shipment) %> <%= Spree.t('shipment_states.canceled') %></strong>.+ <%= Spree.t(:shipment_refunded_message) %>+ </div>+ <% elsif shipment.shipped? && shipment.tracked? %>+ <% else %>+ <div class="text-sm uppercase text-center bg-neutral-100 mt-3 px-3 py-2">+ <%= Spree.t(:no_tracking_present) %>+ </div>+ <% end %>+ </div>++ <hr class="border-accent mx-4" >++ <div class="grid grid-cols-1 gap-4 lg:gap-6 p-4 lg:p-6">+ <%= render partial: 'spree/shared/order_line_item', collection: shipment.line_items, as: :line_item, cached: spree_base_cache_scope %>+ </div>+</li>diff --git a/storefront/config/routes.rb b/storefront/config/routes.rbindex 47e91d2faf..86fa0c0cfc 100644--- a/storefront/config/routes.rb+++ b/storefront/config/routes.rb@@ -7,7 +7,9 @@ Spree::Core::Engine.add_routes dopatch '/cart', to: 'orders#update', as: :update_cartresources :addresses, except: [:index]+ resource :account, to: redirect('/account/orders')namespace :account do+ resources :orders, only: [:index, :show]resource :wishlist, only: [:show], controller: '/spree/wishlists' doresources :wished_items, only: [:create, :destroy]enddiff --git a/storefront/spec/controllers/spree/account/orders_controller_spec.rb b/storefront/spec/controllers/spree/account/orders_controller_spec.rbnew file mode 100644index 0000000000..d267699d19--- /dev/null+++ b/storefront/spec/controllers/spree/account/orders_controller_spec.rb@@ -0,0 +1,82 @@+require 'spec_helper'++describe Spree::Account::OrdersController, type: :controller do+ let(:store) { Spree::Store.default }+ let(:user) { create(:user) }+ let(:order) { create(:completed_order_with_totals, user: user, store: store) }++ before do+ allow(controller).to receive(:current_store).and_return(store)+ allow(controller).to receive(:spree_login_path).and_return('/login')+ end++ describe '#index' do+ subject { get :index }++ context 'when user is logged in' do+ before do+ allow(controller).to receive_messages try_spree_current_user: user+ allow(controller).to receive_messages spree_current_user: user+ end++ it 'lists orders for the user' do+ order # create the order+ subject+ expect(assigns(:orders)).to include(order)+ expect(response).to have_http_status(:ok)+ end++ it 'paginates orders' do+ subject+ expect(assigns(:orders)).to respond_to(:total_pages)+ end++ it 'renders the index template' do+ subject+ expect(response).to render_template(:index)+ end+ end++ context 'when user is not logged in' do+ it 'redirects to login page' do+ expect(subject).to have_http_status(302)+ end+ end+ end++ describe '#show' do+ subject { get :show, params: { id: order.number } }++ context 'when user is logged in' do+ before do+ allow(controller).to receive_messages try_spree_current_user: user+ allow(controller).to receive_messages spree_current_user: user+ end++ it 'shows the order details' do+ subject+ expect(assigns(:order)).to eq order+ expect(response).to have_http_status(:ok)+ end++ it 'renders the order details' do+ subject+ expect(response).to render_template(:show)+ end++ context 'when order number does not exist' do+ subject { get :show, params: { id: 'invalid' } }++ it 'raises ActiveRecord::RecordNotFound' do+ expect { subject }.to raise_error(ActiveRecord::RecordNotFound)+ end+ end+ end++ context 'when user is not logged in' do+ it 'redirects to login page' do+ expect(subject).to have_http_status(302)+ end+ end+ end+end