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 orders management in admin (#12289)

Łukasz Adamczyk90bf799112e5
diff --git a/admin/Gemfile b/admin/Gemfile
index a8a7fd21d7..1dc0e76e77 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -2,6 +2,7 @@ eval_gemfile('../common_spree_dependencies.rb')
gem 'spree_core', path: '../core'
gem 'spree_api', path: '../api'
+gem 'spree_emails', path: '../emails'
group :test, :development do
gem 'selenium-webdriver'
diff --git a/admin/app/controllers/spree/admin/line_items_controller.rb b/admin/app/controllers/spree/admin/line_items_controller.rb
new file mode 100644
index 0000000000..461b589994
--- /dev/null
+++ b/admin/app/controllers/spree/admin/line_items_controller.rb
@@ -0,0 +1,114 @@
+module Spree
+ module Admin
+ class LineItemsController < Spree::Admin::ResourceController
+ belongs_to 'spree/order', find_by: :number
+
+ layout 'turbo_rails/frame'
+
+ def create
+ @variant = Spree::Variant.accessible_by(current_ability, :manage).find(params[:line_item][:variant_id])
+
+ @order.transaction do
+ line_item_result = create_service.call(order: @order, line_item_attributes: permitted_resource_params)
+
+ if line_item_result.success?
+ unless @order.completed?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless result.success?
+ flash[:error] = result.error.value.full_messages.to_sentence
+ raise ActiveRecord::Rollback
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:line_item))
+ else
+ flash[:error] = line_item_result.value.errors.full_messages.to_sentence
+ raise ActiveRecord::Rollback
+ end
+ end
+
+ redirect_to spree.edit_admin_order_path(@order, line_item_updated: true)
+ rescue ActiveRecord::Rollback
+ redirect_to spree.edit_admin_order_path(@order)
+ end
+
+ def update
+ @order.transaction do
+ line_item_result = update_service.call(line_item: @line_item, line_item_attributes: permitted_resource_params)
+
+ if line_item_result.success?
+ unless @order.completed?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless result.success?
+ flash[:error] = result.error.value.full_messages.to_sentence
+ raise ActiveRecord::Rollback
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:line_item))
+ else
+ flash[:error] = line_item_result.value.errors.full_messages.to_sentence
+ raise ActiveRecord::Rollback
+ end
+ end
+
+ redirect_to spree.edit_admin_order_path(@order, line_item_updated: true)
+ rescue ActiveRecord::Rollback
+ redirect_to spree.edit_admin_order_path(@order)
+ end
+
+ def destroy
+ result = destroy_service.call(line_item: @line_item)
+ flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:line_item)) if result.success?
+
+ redirect_to spree.edit_admin_order_path(@order, line_item_updated: true)
+ end
+
+ private
+
+ def model_class
+ Spree::LineItem
+ end
+
+ def collection_url
+ spree.edit_admin_order_path(@order)
+ end
+
+ def update_service
+ Spree::Dependencies.line_item_update_service.constantize
+ end
+
+ def destroy_service
+ Spree::Dependencies.line_item_destroy_service.constantize
+ end
+
+ def create_service
+ Spree::Dependencies.line_item_create_service.constantize
+ end
+
+ def build_resource
+ if parent_data.present?
+ model_class.new(resource.model_name => parent)
+ else
+ model_class.new
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders/billing_address_controller.rb b/admin/app/controllers/spree/admin/orders/billing_address_controller.rb
new file mode 100644
index 0000000000..13ae0647f1
--- /dev/null
+++ b/admin/app/controllers/spree/admin/orders/billing_address_controller.rb
@@ -0,0 +1,103 @@
+module Spree
+ module Admin
+ module Orders
+ class BillingAddressController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
+ before_action :load_order
+
+ def new
+ @address = @order.build_bill_address
+ if @order.user.present?
+ @address.first_name = @order.user.first_name
+ @address.last_name = @order.user.last_name
+ @address.phone = @order.user.phone
+ end
+ end
+
+ def create
+ if params[:billing_address_type] == 'same_as_shipping'
+ @order.clone_shipping_address
+
+ elsif params[:billing_address_id].present?
+ @address = Spree::Address.accessible_by(current_ability, :manage).find(params[:billing_address_id])
+ @order.bill_address_id = @address.id
+ else
+ @order.bill_address_attributes = address_params
+ @address = @order.bill_address
+ end
+
+ if @order.save
+ if [email protected]? && @order.line_items.any?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless advance_to_payment_result.success?
+ flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ return redirect_to spree.edit_admin_order_path(@order)
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:billing_address))
+ redirect_to spree.edit_admin_order_path(@order)
+ else
+ render :create, status: :unprocessable_entity
+ end
+ end
+
+ def edit
+ @address = @order.bill_address
+ end
+
+ def update
+ if params[:billing_address_type] == 'same_as_shipping'
+ @order.clone_shipping_address
+ elsif params[:billing_address_id].present?
+ @address = Spree::Address.accessible_by(current_ability, :manage).find(params[:billing_address_id])
+ @order.bill_address_id = @address.id
+ else
+ @order.bill_address_attributes = address_params
+ @address = @order.bill_address
+ end
+
+ if @order.save
+ if [email protected]? && @order.line_items.any?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless advance_to_payment_result.success?
+ flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ return redirect_to spree.edit_admin_order_path(@order)
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:billing_address))
+ redirect_to spree.edit_admin_order_path(@order)
+ else
+ render :update, status: :unprocessable_entity
+ end
+ end
+
+ private
+
+ def address_params
+ params.require(:address).permit(permitted_address_attributes)
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders/contact_information_controller.rb b/admin/app/controllers/spree/admin/orders/contact_information_controller.rb
new file mode 100644
index 0000000000..1c16605af7
--- /dev/null
+++ b/admin/app/controllers/spree/admin/orders/contact_information_controller.rb
@@ -0,0 +1,45 @@
+module Spree
+ module Admin
+ module Orders
+ class ContactInformationController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
+ before_action :load_order
+
+ def edit; end
+
+ def update
+ if Spree::Orders::UpdateContactInformation.call(order: @order, order_params: order_params).success?
+ unless @order.completed?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless result.success?
+ flash[:error] = result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ return redirect_to spree.edit_admin_order_path(@order)
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:contact_information))
+ redirect_to spree.edit_admin_order_path(@order)
+ else
+ render :edit
+ end
+ end
+
+ private
+
+ def order_params
+ params.require(:order).permit(:email)
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb b/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb
new file mode 100644
index 0000000000..e64932ec0e
--- /dev/null
+++ b/admin/app/controllers/spree/admin/orders/shipping_address_controller.rb
@@ -0,0 +1,85 @@
+module Spree
+ module Admin
+ module Orders
+ class ShippingAddressController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
+ before_action :load_order
+
+ def new
+ @address = @order.build_ship_address
+ if @order.user.present?
+ @address.first_name = @order.user.first_name
+ @address.last_name = @order.user.last_name
+ @address.phone = @order.user.phone
+ end
+ end
+
+ def create
+ @order.ship_address_attributes = address_params
+ @address = @order.ship_address
+
+ if @order.save
+ @order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)
+ if [email protected]? && @order.line_items.any?
+ @order.ensure_updated_shipments
+ advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')
+
+ unless advance_to_payment_result.success?
+ flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ return redirect_to spree.edit_admin_order_path(@order)
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:shipping_address))
+
+ redirect_to spree.edit_admin_order_path(@order)
+ else
+ render :create, status: :unprocessable_entity
+ end
+ end
+
+ def edit
+ @address = @order.ship_address
+ end
+
+ def update
+ if params[:shipping_address_id].present?
+ @address = Spree::Address.accessible_by(current_ability, :manage).find(params[:shipping_address_id])
+ @order.ship_address_id = @address.id
+ else
+ @order.ship_address_attributes = address_params
+ @address = @order.ship_address
+ end
+
+ if @order.save
+ @order.shipments.update_all(address_id: @order.ship_address.id, updated_at: Time.current)
+ if [email protected]? && @order.line_items.any?
+ @order.ensure_updated_shipments
+ advance_to_payment_result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: 'payment')
+
+ unless advance_to_payment_result.success?
+ flash[:error] = advance_to_payment_result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ return redirect_to spree.edit_admin_order_path(@order)
+ end
+ end
+
+ flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:shipping_address))
+
+ redirect_to spree.edit_admin_order_path(@order)
+ else
+ render :update, status: :unprocessable_entity
+ end
+ end
+
+ private
+
+ def address_params
+ params.require(:address).permit(permitted_address_attributes)
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders/user_controller.rb b/admin/app/controllers/spree/admin/orders/user_controller.rb
new file mode 100644
index 0000000000..d13052842a
--- /dev/null
+++ b/admin/app/controllers/spree/admin/orders/user_controller.rb
@@ -0,0 +1,90 @@
+module Spree
+ module Admin
+ module Orders
+ class UserController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+ before_action :load_order
+ before_action :check_authorization
+
+ def new
+ @user = @order.build_user
+ end
+
+ def create
+ @user = Spree.user_class.find_by(email: params.dig(:user, :email))
+
+ if @user
+ @order.associate_user!(@user)
+ if @user.update(user_params) && @order.line_items.any?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ flash[:error] = result.error.value.full_messages.to_sentence unless result.success?
+
+ render :create, status: :ok
+ else
+ render :create, status: :unprocessable_entity
+ end
+ else
+ @user = @order.build_user(user_params)
+ @user.password ||= SecureRandom.hex(16) # we need to set a password to pass validation
+ @user.password_confirmation ||= @user.password
+
+ if @user.save
+ @order.associate_user!(@user)
+
+ render :create, status: :ok
+ else
+ render :create, status: :unprocessable_entity
+ end
+ end
+ end
+
+ def update
+ user = Spree.user_class.find(params[:user_id])
+ @order.associate_user!(user)
+
+ if [email protected]? && @order.line_items.any?
+ max_state = if @order.ship_address.present?
+ @order.ensure_updated_shipments
+ 'payment'
+ else
+ 'address'
+ end
+
+ result = Spree::Dependencies.checkout_advance_service.constantize.call(order: @order, state: max_state)
+
+ unless result.success?
+ flash[:error] = result.error.value.full_messages.to_sentence
+ @order.ensure_updated_shipments
+ end
+ end
+
+ render :update, status: :ok
+ end
+
+ def destroy
+ @order.update(user_id: nil)
+
+ redirect_to spree.edit_admin_order_path(@order)
+ end
+
+ private
+
+ def user_params
+ params.require(:user).permit(permitted_user_attributes)
+ end
+
+ def check_authorization
+ authorize! :update_customer, @order
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rb
new file mode 100644
index 0000000000..0d0f27ed4a
--- /dev/null
+++ b/admin/app/controllers/spree/admin/orders_controller.rb
@@ -0,0 +1,85 @@
+module Spree
+ module Admin
+ class OrdersController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+ include Spree::Admin::OrdersFiltersHelper
+
+ before_action :initialize_order_events
+ before_action :load_order, only: %i[edit cancel resend]
+ before_action :load_order_items, only: :edit
+ before_action :load_user, only: [:index]
+
+ helper_method :model_class
+
+ def create
+ @order = Spree::Order.create(created_by: try_spree_current_user, store: current_store)
+
+ redirect_to spree.edit_admin_order_path(@order)
+ end
+
+ def index
+ params[:q] ||= {}
+ params[:q][:s] ||= 'completed_at desc'
+
+ load_orders
+ end
+
+ def cancel
+ @order.canceled_by(try_spree_current_user)
+ flash[:success] = Spree.t(:order_canceled)
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
+ end
+
+ def resend
+ @order.deliver_order_confirmation_email
+ if @order.errors.any?
+ flash[:error] = @order.errors.full_messages.join(', ')
+ else
+ flash[:success] = Spree.t(:order_email_resent)
+ end
+
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
+ end
+
+ private
+
+ def scope
+ base_scope = current_store.orders.accessible_by(current_ability, :index)
+
+ if action_name == 'index'
+ base_scope.complete
+ else
+ base_scope
+ end
+ end
+
+ def order_params
+ params[:created_by_id] = try_spree_current_user.try(:id)
+ params.permit(:created_by_id, :user_id, :store_id, :channel)
+ end
+
+ def load_order
+ @order = scope.includes(:adjustments).find_by!(number: params[:id])
+ authorize! action, @order
+ end
+
+ def load_order_items
+ @line_items = @order.line_items.includes(variant: [:product, :option_values])
+ @shipments = @order.shipments.includes(:inventory_units, :selected_shipping_rate, shipping_rates: [:shipping_method, :tax_rate]).order(:created_at)
+ @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
+ @refunds = @order.refunds
+
+ @customer_returns = @order.customer_returns
+ end
+
+ # Used for extensions which need to provide their own custom event links on the order details view.
+ def initialize_order_events
+ @order_events = %w{approve cancel resume}
+ end
+
+ def model_class
+ Spree::Order
+ end
+ end
+ end
+end
diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rb
new file mode 100644
index 0000000000..587b90081b
--- /dev/null
+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb
@@ -0,0 +1,97 @@
+module Spree
+ module Admin
+ module OrdersFiltersHelper
+ def params_to_filters(search_params:, vendor: nil, user: nil)
+ if search_params.is_a?(String)
+ search_params = JSON.parse(search_params).deep_symbolize_keys
+ end
+
+ search_params.delete(:inventory_units_shipment_id_null) if search_params[:inventory_units_shipment_id_null] == '0'
+
+ if search_params[:number_cont]
+ search_params[:number_cont] = search_params[:number_cont].split('-').first
+ end
+
+ if search_params[:created_at_gt].present?
+ search_params[:created_at_gt] = begin
+ Time.zone.parse(search_params[:created_at_gt]).beginning_of_day
+ rescue StandardError
+ ''
+ end
+ end
+
+ if search_params[:created_at_lt].present?
+ search_params[:created_at_lt] = begin
+ Time.zone.parse(search_params[:created_at_lt]).end_of_day
+ rescue StandardError
+ ''
+ end
+ end
+
+ if search_params[:completed_at_gt].present?
+ search_params[:completed_at_gt] = begin
+ Time.zone.parse(search_params[:completed_at_gt]).beginning_of_day
+ rescue StandardError
+ ''
+ end
+ end
+
+ if search_params[:created_at_lt].present?
+ search_params[:created_at_lt] = begin
+ Time.zone.parse(search_params[:created_at_lt]).end_of_day
+ rescue StandardError
+ ''
+ end
+ end
+
+ search_params[:vendor_orders_vendor_id_eq] = vendor.id if vendor.present?
+ search_params[:user_id_eq] = user.id if user.present?
+
+ search_params
+ end
+
+ def load_orders
+ base_scope = scope.preload(:user).accessible_by(current_ability, :index)
+
+ if params.dig(:q, :multisearch).present?
+ shared_context = Ransack::Context.for(Spree::Order)
+
+ search_by_number = Spree::Order.ransack(
+ { number_i_cont: params.dig(:q, :multisearch) }, context: shared_context
+ )
+
+ search_by_email = Spree::Order.ransack(
+ { email_eq: params.dig(:q, :multisearch) }, context: shared_context
+ )
+
+ search_by_firstname = Spree::Order.ransack(
+ { bill_address_firstname_i_cont_any: params.dig(:q, :multisearch) }, context: shared_context
+ )
+
+ search_by_lastname = Spree::Order.ransack(
+ { bill_address_lastname_eq: params.dig(:q, :multisearch) }, context: shared_context
+ )
+
+ shared_conditions = [search_by_number, search_by_email, search_by_firstname, search_by_lastname].map do |search|
+ Ransack::Visitor.new.accept(search.base)
+ end
+
+ @multisearch_orders = base_scope.joins(shared_context.join_sources).where(shared_conditions.reduce(&:or)).distinct
+ end
+
+ @search = base_scope.ransack(params_to_filters(search_params: params[:q].clone, vendor: @vendor, user: @user))
+
+ # lazy loading other models here (via includes) may result in an invalid query
+ # e.g. SELECT DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
+ # see https://github.com/spree/spree/pull/3919
+ @orders = @search.result(distinct: true)
+ @orders = @orders.merge(@multisearch_orders) if @multisearch_orders.present?
+ @orders = @orders.page(params[:page]).per(params[:per_page])
+ end
+
+ def load_user
+ @user = Spree.user_class.find(params[:user_id]) if params[:user_id].present?
+ end
+ end
+ end
+end
diff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rb
new file mode 100644
index 0000000000..48b9ca6ee6
--- /dev/null
+++ b/admin/app/helpers/spree/admin/orders_helper.rb
@@ -0,0 +1,173 @@
+module Spree
+ module Admin
+ module OrdersHelper
+ TaxLine = Struct.new(:label, :display_amount, :item, :for_shipment, keyword_init: true) do
+ def name
+ item_name = item.name
+ item_name += " #{Spree.t(:shipment).downcase}" if for_shipment
+
+ "#{label} (#{item_name})"
+ end
+ end
+
+ def order_summary_tax_lines_additional(order)
+ line_item_taxes = order.line_item_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment) }
+ shipment_taxes = order.shipment_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment, for_shipment: true) }
+
+ line_item_taxes + shipment_taxes
+ end
+
+ def order_payment_state(order, options = {})
+ return if order.payment_state.blank?
+
+ content_tag :span, class: "badge #{options[:class]} badge-#{order.partially_refunded? ? 'warning' : order.payment_state}" do
+ if order.order_refunded?
+ icon('credit-card-refund') + Spree.t('payment_states.refunded')
+ elsif order.partially_refunded?
+ icon('credit-card-refund') + Spree.t('payment_states.partially_refunded')
+ elsif order.payment_state == 'failed' || order.payment_state == 'void'
+ icon('cancel') + Spree.t('payment_states.failed')
+ elsif order.payment_state == 'paid'
+ icon('check') + Spree.t('payment_states.paid')
+ else
+ Spree.t("payment_states.#{order.payment_state}")
+ end
+ end
+ end
+
+ def order_shipment_state(order, options = {})
+ shipment_state(order.shipment_state, options)
+ end
+
+ def shipment_state(shipment_state, options = {})
+ return if shipment_state.blank?
+
+ content_tag :span, class: "badge #{options[:class]} badge-#{shipment_state}" do
+ if shipment_state == 'shipped'
+ icon('check') + Spree.t('shipment_states.shipped')
+ elsif shipment_state == 'partial'
+ icon('progress-check') + Spree.t('shipment_states.partial')
+ elsif shipment_state == 'canceled'
+ icon('cancel') + Spree.t('shipment_states.cancelled')
+ else
+ icon('progress') + Spree.t("shipment_states.#{shipment_state}")
+ end
+ end
+ end
+
+ def payment_state_badge(state)
+ content_tag :span, class: "badge badge-#{state}" do
+ if state == 'completed'
+ icon('check') + Spree.t('payment_states.completed')
+ elsif state == 'failed'
+ icon('cancel') + Spree.t('payment_states.failed')
+ elsif state == 'processing'
+ icon('progress') + Spree.t('payment_states.processing')
+ else
+ Spree.t("payment_states.#{state}")
+ end
+ end
+ end
+
+ # Renders all the extension partials that may have been specified in the extensions
+ def event_links(order, events)
+ links = []
+ events.each do |event|
+ next unless order.send("can_#{event}?")
+
+ label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
+ links << button_link_to(
+ label.capitalize,
+ [event.to_sym, :admin, order],
+ method: :put,
+ icon: event.to_s + '.svg',
+ data: { turbo_confirm: Spree.t(:order_sure_want_to, event: label) },
+ class: 'btn-light'
+ )
+ end
+ safe_join(links, ''.html_safe)
+ end
+
+ def line_item_shipment_price(line_item, quantity)
+ Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
+ end
+
+ def ready_to_ship_orders_count
+ @ready_to_ship_orders_count ||= if defined?(current_vendor) && current_vendor.present?
+ current_vendor.orders.complete.ready_to_ship.count
+ else
+ current_store.orders.without_vendor.complete.ready_to_ship.count
+ end
+ end
+
+ def avs_response_code
+ {
+ 'A' => 'Street address matches, but 5-digit and 9-digit postal code do not match.',
+ 'B' => 'Street address matches, but postal code not verified.',
+ 'C' => 'Street address and postal code do not match.',
+ 'D' => 'Street address and postal code match. ',
+ 'E' => 'AVS data is invalid or AVS is not allowed for this card type.',
+ 'F' => "Card member's name does not match, but billing postal code matches.",
+ 'G' => 'Non-U.S. issuing bank does not support AVS.',
+ 'H' => "Card member's name does not match. Street address and postal code match.",
+ 'I' => 'Address not verified.',
+ 'J' => "Card member's name, billing address, and postal code match.",
+ 'K' => "Card member's name matches but billing address and billing postal code do not match.",
+ 'L' => "Card member's name and billing postal code match, but billing address does not match.",
+ 'M' => 'Street address and postal code match. ',
+ 'N' => 'Street address and postal code do not match.',
+ 'O' => "Card member's name and billing address match, but billing postal code does not match.",
+ 'P' => 'Postal code matches, but street address not verified.',
+ 'Q' => "Card member's name, billing address, and postal code match.",
+ 'R' => 'System unavailable.',
+ 'S' => 'Bank does not support AVS.',
+ 'T' => "Card member's name does not match, but street address matches.",
+ 'U' => 'Address information unavailable. Returned if the U.S. bank does not support non-U.S. AVS or if the AVS in a U.S. bank is not functioning properly.',
+ 'V' => "Card member's name, billing address, and billing postal code match.",
+ 'W' => 'Street address does not match, but 9-digit postal code matches.',
+ 'X' => 'Street address and 9-digit postal code match.',
+ 'Y' => 'Street address and 5-digit postal code match.',
+ 'Z' => 'Street address does not match, but 5-digit postal code matches.'
+ }
+ end
+
+ def cvv_response_code
+ {
+ 'M' => 'CVV2 Match',
+ 'N' => 'CVV2 No Match',
+ 'P' => 'Not Processed',
+ 'S' => 'Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card',
+ 'U' => 'Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys',
+ '' => 'Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered'
+ }
+ end
+
+ def order_filter_dropdown_value
+ if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']
+ Spree.t('admin.orders.unfulfilled')
+ elsif params[:q][:shipment_state_eq] == 'shipped'
+ Spree.t('admin.orders.fulfilled')
+ elsif params[:q][:state_in] == ['canceled','partially_canceled']
+ Spree.t('admin.orders.cancelled')
+ elsif params.dig(:q, :refunded) && params[:q][:refunded].present?
+ Spree.t('admin.orders.refunded')
+ elsif params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?
+ Spree.t('admin.orders.partially_refunded')
+ else
+ Spree.t('admin.orders.all_orders')
+ end
+ end
+
+ private
+
+ def map_to_tax_line(tax_adjustment, for_shipment: false)
+ TaxLine.new(
+ label: tax_adjustment.label,
+ display_amount: tax_adjustment.display_amount,
+ item: tax_adjustment.adjustable,
+ for_shipment: for_shipment
+ )
+ end
+ end
+ end
+end
diff --git a/admin/app/views/spree/admin/orders/_body_custom.html.erb b/admin/app/views/spree/admin/orders/_body_custom.html.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erb
new file mode 100644
index 0000000000..2acab03d45
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_customer.html.erb
@@ -0,0 +1,79 @@
+<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-4 blur-busy" do %>
+ <div class="card-header">
+ <h5 class="card-title">
+ <%= Spree.t(:customer) %>
+ </h5>
+ <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
+ <div class="dropdown ml-auto" id="customer-edit-dropdown">
+ <%= link_to_with_icon 'dots', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>
+ <div class="dropdown-menu dropdown-menu-right" >
+ <div data-toggle="modal" data-target="#modal">
+ <% if can?(:update_customer, @order) && [email protected]? %>
+ <%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } %>
+ <% end %>
+ <% if can?(:update_addresses, @order) %>
+ <%= link_to Spree.t('admin.edit_shipping_address'), spree.edit_admin_order_shipping_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } if @order.shipping_address.present? %>
+ <%= link_to Spree.t('admin.edit_billing_address'), spree.edit_admin_order_billing_address_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } if @order.billing_address.present? %>
+ <% end %>
+ </div>
+ <% if can?(:update_customer, @order) %>
+ <div class="dropdown-divider"></div>
+ <% if @order.user.present? %>
+ <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %>
+ <% else %>
+ <%= link_to Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: 'dropdown-item' %>
+ <% end %>
+ <% end %>
+ </div>
+ </div>
+ <% end %>
+ </div>
+ <div class="card-body">
+ <% unless current_vendor %>
+ <% unless @order.user.present? %>
+ <h6><%= Spree.t(:contact_information) %></h6>
+ <% end %>
+ <div class='card-text d-flex flex-col'>
+ <% if @order.user.present? %>
+ <%= render 'spree/admin/shared/user', user: @order.user %>
+ <%= render 'spree/admin/orders/user_overview', user: @order.user %>
+ <% elsif @order.email.present? %>
+ <%= mail_to truncate(@order.email, length: 35), class: 'text-dark with-tip', title: @order.email %>
+ <% else %>
+ <span class="text-muted">
+ <%= Spree.t(:no_email_provided) %>
+ </span>
+ <% end %>
+ <% if [email protected]? && can?(:update_customer, @order) %>
+ <%= link_to_with_icon 'plus', Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: "btn btn-link mt-3" %>
+ <% end %>
+ </div>
+ <% end %>
+ <h6 class="<%= current_vendor ? "" : "mt-4" %> font-weight-bold"><%= Spree.t(:shipping_address) %></h6>
+ <%= turbo_frame_tag :order_ship_address do %>
+ <% if @order.ship_address.present? %>
+ <%= render 'spree/admin/shared/address', address: @order.ship_address %>
+ <% elsif can?(:update_addresses, @order) %>
+ <div data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-link w-100", data: { turbo_frame: 'dialog_modal' } %>
+ </div>
+ <% else %>
+ <span class="text-muted"><%= Spree.t(:no_shipping_address_available) %></span>
+ <% end %>
+ <% end %>
+ <h6 class="mt-4 font-weight-bold"><%= Spree.t(:billing_address) %></h6>
+ <%= turbo_frame_tag :order_bill_address do %>
+ <% if @order.shipping_eq_billing_address? && @order.bill_address.present? %>
+ <span class="text-muted"><%= Spree.t(:same_as_shipping_address) %></span>
+ <% elsif @order.bill_address.present? %>
+ <%= render 'spree/admin/shared/address', address: @order.bill_address %>
+ <% elsif can?(:update_addresses, @order) %>
+ <div data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-link w-100", data: { turbo_frame: 'dialog_modal' } %>
+ </div>
+ <% else %>
+ <span class="text-muted"><%= Spree.t(:no_billing_address_available) %></span>
+ <% end %>
+ <% end %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_customer_returns.html.erb b/admin/app/views/spree/admin/orders/_customer_returns.html.erb
new file mode 100644
index 0000000000..63297ffd67
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_customer_returns.html.erb
@@ -0,0 +1,23 @@
+<% if @customer_returns.any? %>
+ <div class="card mb-4">
+ <div class="card-header">
+ <h5 class="card-title"><%= Spree.t(:customer_returns) %></h5>
+ </div>
+ <div class="card-body">
+ <ul class="list-group">
+ <% @customer_returns.each do |customer_return| %>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <span class="text-muted"><%= local_time(customer_return.created_at) %></span>
+ <% if customer_return.fully_reimbursed? %>
+ <span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
+ <% else %>
+ <span class="badge badge-inactive"><%= Spree.t(:incomplete) %></span>
+ <% end %>
+ <span><%= customer_return.display_pre_tax_total.to_html %></span>
+ <%= link_to_edit Spree.t(:edit), url: spree.edit_admin_order_customer_return_path(@order, customer_return), class: 'btn btn-light btn-sm' if can?(:edit, customer_return) %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/orders/_customer_summary.html.erb b/admin/app/views/spree/admin/orders/_customer_summary.html.erb
new file mode 100644
index 0000000000..f07429bf44
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_customer_summary.html.erb
@@ -0,0 +1,22 @@
+<% if order %>
+ <% if order.user %>
+ <span class="d-flex">
+ <%#= image_tag(avatar_url_for( order.user), width: 24, height: 24, class: 'mr-2 rounded') %>
+
+ <% if can?(:manage, order.user) %>
+ <%= link_to order.full_name, [:admin, order.user], class: 'text-dark', data: { 'turbo-frame': '_top' } %>
+ <% else %>
+ <%= order.full_name %>
+ <% end %>
+ </span>
+ <% elsif order.email.present? %>
+ <span class="text-muted">
+ <%= order.full_name %>
+ </span>
+ <%= help_bubble('This order was placed by a guest customer') %>
+ <% else %>
+ <span class="text-muted">
+ <%= Spree.t(:not_provided) %>
+ </span>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erb
new file mode 100644
index 0000000000..6ab72ee791
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_filters.html.erb
@@ -0,0 +1,113 @@
+<div id="table-filter">
+ <%= search_form_for [:admin, @vendor || @user, @search], url: controller_name == 'checkouts' ? spree.admin_checkouts_url : nil do |f| %>
+ <div class="filter-wrap border-bottom">
+ <div class="d-flex flex-column flex-lg-row">
+ <div class="flex-grow-1 mr-lg-2 mb-3 mb-lg-0">
+ <div class="form-control d-flex align-items-center py-0 focus-shadow-blue focus-border-blue shadow-xs">
+ <%= icon 'search', class: 'mr-3 text-muted' %>
+ <%= text_field_tag 'q[multisearch]', params.dig(:q, :multisearch), class: "form-control-plaintext js-quick-search px-0", placeholder: 'Search orders' %>
+ </div>
+ </div>
+
+ <div class="d-flex align-items-center justify-content-between">
+ <div class="mr-2 h-100">
+ <% if controller_name == 'checkouts' %>
+ <%= render 'shared/calendar_range_picker',
+ date_from_input_name: 'q[created_at_gt]',
+ date_to_input_name: 'q[created_at_lt]',
+ date_from_value: params.dig(:q, :created_at_gt),
+ date_to_value: params.dig(:q, :created_at_lt),
+ dropdown_direction: 'right'
+ %>
+ <% else %>
+ <%= render 'shared/calendar_range_picker',
+ date_from_input_name: 'q[completed_at_gt]',
+ date_to_input_name: 'q[completed_at_lt]',
+ date_from_value: params.dig(:q, :completed_at_gt),
+ date_to_value: params.dig(:q, :completed_at_lt),
+ dropdown_direction: 'right' %>
+ <% end %>
+ </div>
+
+ <%= render 'spree/admin/orders/table_filter_dropdown' %>
+
+ <button class="btn btn-light h-100" type="button" data-toggle="collapse" data-target="#more-filters" href="#more-filters" aria-expanded="false" aria-controls="more-filters">
+ <%= icon "adjustments", class: 'mr-1' %>
+ <%= Spree.t('admin.filters') %>
+ </button>
+ </div>
+ </div>
+ <div class="collapse mt-4" id="more-filters">
+ <%= f.hidden_field :payment_state_eq, value: params.dig(:q, :payment_state_eq) %>
+ <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
+ <%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>
+ <%= f.hidden_field :partially_refunded, value: params.dig(:q, :partially_refunded) %>
+ <%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
+ <%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
+
+ <% unless @user %>
+ <div class="row">
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= label_tag :q_bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
+ <%= f.text_field :bill_address_firstname_i_cont_any, class: 'form-control js-filterable' %>
+ </div>
+ </div>
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= label_tag :q_bill_address_lastname_eq, Spree.t(:last_name) %>
+ <%= f.text_field :bill_address_lastname_eq, class: 'form-control js-filterable' %>
+ </div>
+ </div>
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= label_tag :q_email_eq, Spree.t(:email) %>
+ <%= f.email_field :email_eq, class: 'form-control js-filterable' %>
+ </div>
+ </div>
+ </div>
+ <% end %>
+
+ <div class="row">
+
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
+ <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
+ </div>
+ </div>
+
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+ <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'js-filterable', data: { controller: 'autocomplete-select' } %>
+ </div>
+ </div>
+
+ <% if !current_vendor && !@vendor %>
+ <div class="col-12 col-lg-4">
+ <div class="form-group">
+ <%= f.label :vendor_orders_vendor_id_eq, Spree.t(:vendor) %>
+ <%= f.label :vendor_orders_vendor_id_eq, Spree.t(:vendor), class: 'hidden' %>
+ <%= tom_select_tag 'q[vendor_orders_vendor_id_eq]',
+ active_option: params.dig(:q, :vendor_orders_vendor_id_eq),
+ select_class: 'js-filterable',
+ options: vendor_options,
+ url: spree.select_options_admin_vendors_path(format: :json) %>
+ </div>
+ </div>
+ <% end %>
+ </div>
+
+ <div class="form-actions">
+ <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+ <%= icon('search') %>
+ <%= Spree.t(:filter_results) %>
+ <% end %>
+ </div>
+ </div>
+ </div>
+ <% end %>
+</div>
+
+<div class="table-active-filters border-bottom js-filters"></div>
diff --git a/admin/app/views/spree/admin/orders/_header.html.erb b/admin/app/views/spree/admin/orders/_header.html.erb
new file mode 100644
index 0000000000..44bac7d9e6
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_header.html.erb
@@ -0,0 +1,39 @@
+<% content_for :page_title do %>
+ <% if controller_name == 'orders' %>
+ <%= page_header_back_button spree.admin_orders_path, @order %>
+ <% else %>
+ <%= page_header_back_button spree.edit_admin_order_path(@order) %>
+ <% end %>
+ <%= @order.number %>
+ <%= order_payment_state(@order, class: 'ml-3') %>
+ <%= order_shipment_state(@order, class: 'ml-3') %>
+ <%= local_time(@order.completed_at, class: 'badge badge-light with-tip ml-3') if @order.completed? %>
+<% end %>
+
+<% content_for(:page_actions_dropdown) do %>
+ <% if @order.completed? %>
+ <%= link_to_with_icon 'eye',
+ Spree.t(:preview),
+ spree.order_path(@order, host: current_store.url, token: @order.token),
+ class: 'text-left dropdown-item',
+ target: '_blank' %>
+ <% end %>
+ <% if @order.completed? && can?(:resend, @order) %>
+ <%= link_to_with_icon 'send',
+ Spree.t(:resend),
+ resend_admin_order_path(@order),
+ data: { turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure) },
+ class: 'btn btn text-left rounded-0 dropdown-item' %>
+ <% end %>
+
+ <% if can?(:cancel, @order) %>
+ <div class="dropdown-divider"></div>
+ <%= link_to spree.cancel_admin_order_path(@order),
+ class: 'text-left btn-danger dropdown-item',
+ data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } do %>
+ <%= icon 'cancel' %>
+ <%= Spree.t(:cancel_order) %>
+ <% end %>
+ <div class="dropdown-divider"></div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_header_custom.html.erb b/admin/app/views/spree/admin/orders/_header_custom.html.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/admin/app/views/spree/admin/orders/_line_item.html.erb b/admin/app/views/spree/admin/orders/_line_item.html.erb
new file mode 100644
index 0000000000..2743ad42ff
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_line_item.html.erb
@@ -0,0 +1,26 @@
+<%= turbo_frame_tag dom_id(line_item), class: "border-bottom px-3 order-line-items__form hover-light" do %>
+ <%= render 'spree/admin/variants/variant', variant: line_item.variant %>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.single_money.to_html %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.quantity %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.display_amount %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.display_additional_tax_total || line_item.display_included_tax_total %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.display_promo_total %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item.display_total %>
+ </span>
+ <span class="d-flex align-items-center justify-content-end">
+ <% if can?(:edit, line_item) %>
+ <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_line_item_path(@order, line_item), class: 'with-tip btn btn-sm btn-light', no_text: true, data: {test_id: :edit_line_item} %>
+ <% end %>
+ </span>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_line_items.html.erb b/admin/app/views/spree/admin/orders/_line_items.html.erb
new file mode 100644
index 0000000000..8e5064ab89
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_line_items.html.erb
@@ -0,0 +1,65 @@
+
+<%= turbo_frame_tag dom_id(@order, :line_items), class: "card mb-4 overflow-hidden" do %>
+ <% if @line_items.any? %>
+ <div class="card-header d-flex justify-content-between align-items-center">
+ <h5 class="card-title d-flex align-items-center">
+ <%= Spree.t(:line_items) %>
+ <span class="badge badge-info ml-2"><%= @line_items.count %></span>
+ </h5>
+ <div class="d-flex gap-2">
+ <% if can?(:create, Spree::LineItem.new(order: @order)) %>
+ <div data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: :dialog_modal }, class: "btn btn-link btn-sm" %>
+ </div>
+ <% end %>
+ <% if @order.completed? %>
+ <button class="btn btn-light btn-sm text-muted" type="button" data-toggle="collapse" data-target="#line-items" aria-expanded="false" aria-controls="collapseExample">
+ <%= Spree.t(:show_details) %>
+ <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
+ </button>
+ <% end %>
+ </div>
+ </div>
+ <div class="card-body mb-0 p-0 <% if @order.completed? && params[:line_item_updated].blank? %>collapse<% else %>show<% end %>" id="line-items">
+ <div class="order-line-items">
+ <div class="text-muted text-center border-bottom py-2 px-3 font-weight-bold font-size-sm order-line-items__row">
+ <span class="text-left">
+ <%= Spree.t(:item_description) %>
+ </span>
+ <span>
+ <%= Spree.t(:price) %>
+ </span>
+ <span>
+ <%= Spree.t(:quantity) %>
+ </span>
+ <span>
+ <%= Spree.t(:subtotal) %>
+ </span>
+ <span>
+ <%= Spree.t(:tax) %>
+ </span>
+ <span>
+ <%= Spree.t(:discount) %>
+ </span>
+ <span>
+ <%= Spree.t(:total) %>
+ </span>
+ <span>
+ </span>
+ </div>
+ <% if @line_items.any? %>
+ <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %>
+ <% else %>
+ <div class="px-3 py-3 text-center text-muted" style="grid-column: 0/-1" >
+ No line items for this order yet.
+ </div>
+ <% end %>
+ </div>
+ </div>
+ <% elsif can?(:create, Spree::LineItem.new(order: @order)) %>
+ <div data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: :dialog_modal }, class: "btn btn-link w-100 py-3" %>
+ </div>
+ <% end %>
+<% end %>
+
diff --git a/admin/app/views/spree/admin/orders/_list.html.erb b/admin/app/views/spree/admin/orders/_list.html.erb
new file mode 100644
index 0000000000..16ad157dd4
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_list.html.erb
@@ -0,0 +1,30 @@
+<% if @orders.any? %>
+ <div class="table-responsive">
+ <table class="table position-relative" id="listing_orders">
+ <thead class="text-muted">
+ <tr data-hook="admin_orders_index_headers">
+ <th><%= I18n.t(:number, scope: 'activerecord.attributes.spree/order') %></th>
+ <% if controller_name == 'orders' %>
+ <th><%= sort_link @search, :completed_at, Spree.t(:date) %></th>
+ <% else %>
+ <th><%= sort_link @search, :created_at, Spree.t(:date) %></th>
+ <% end %>
+ <th class="d-customer"><%= Spree.t(:customer) %></th>
+ <th><%= Spree.t(:fulfilled_from) %></th>
+ <th><%= I18n.t(:payment_state, scope: 'activerecord.attributes.spree/order') %></th>
+ <th><%= I18n.t(:shipment_state, scope: 'activerecord.attributes.spree/order') %></th>
+ <th class="text-right"><%= sort_link @search, :item_count, I18n.t(:item_count, scope: 'activerecord.attributes.spree/order') %></th>
+ <th class="text-right"><%= sort_link @search, :total, I18n.t(:total, scope: 'activerecord.attributes.spree/order') %></th>
+ </tr>
+ </thead>
+ <tbody>
+ <%= render collection: @orders, partial: 'spree/admin/orders/order', cached: !current_vendor ? spree_base_cache_scope : false %>
+ </tbody>
+ </table>
+ </div>
+<% else %>
+ <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
+ <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>
+ </div>
+<% end %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders, simple: true if @orders.any? %>
diff --git a/admin/app/views/spree/admin/orders/_order.html.erb b/admin/app/views/spree/admin/orders/_order.html.erb
new file mode 100644
index 0000000000..51e140a9b5
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_order.html.erb
@@ -0,0 +1,28 @@
+<tr id="<%= dom_id(order) %>" data-controller="row-link">
+ <td class="p-0 w-10">
+ <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bolder d-block p-2 px-3 text-decoration-none', data: { 'turbo-frame': '_top', row_link_target: :link } %>
+ </td>
+ <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
+ <%= local_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P', class: 'with-tip') %>
+ </td>
+ <td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink">
+ <%= render 'spree/admin/orders/customer_summary', order: order %>
+ </td>
+ <td class="text-wrap w-20 cursor-pointer" data-action="click->row-link#openLink">
+ <% order.shipments.map(&:stock_location).compact.uniq.each_with_index do |stock_location, index| %>
+ <% if index > 0 %>, <% end %><%= stock_location.name %>
+ <% end %>
+ </td>
+ <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+ <%= order_payment_state(order) %>
+ </td>
+ <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
+ <%= order_shipment_state(order) %>
+ </td>
+ <td class="text-right w-10 cursor-pointer" data-action="click->row-link#openLink">
+ <%= pluralize(order.item_count, 'item') %>
+ </td>
+ <td class="text-right w-10 cursor-pointer" data-action="click->row-link#openLink">
+ <%= order.display_total.to_html %>
+ </td>
+</tr>
diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erb
new file mode 100644
index 0000000000..f86e26a7a5
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_payments.html.erb
@@ -0,0 +1,69 @@
+<% if @payments.any? && can?(:read, Spree::Payment) %>
+ <div class="card mb-4">
+ <% if @order.payment_state.present? %>
+ <div class="card-header justify-content-between">
+ <%= order_payment_state(@order) %>
+ <%= local_time(@payments.first.updated_at, class: 'badge badge-light with-tip') %>
+ </div>
+ <% else %>
+ <div class="card-header justify-content-between">
+ <span class="badge badge-info"><%= icon('progress') %><%= Spree.t(:processing) %></span>
+ <%= local_time(@payments.first.updated_at, class: 'badge badge-light with-tipl') %>
+ </div>
+ <% end %>
+ <div class="card-body p-0">
+ <% @payments.each do |payment| %>
+ <div class="p-3 border-bottom">
+ <%= render 'spree/admin/shared/payment', payment: payment %>
+ </div>
+ <% end %>
+ </div>
+ <div class="card-body">
+ <h6 class="d-flex justify-content-between align-items-center mb-0" id="risk-analysis-header">
+ <span>
+ <%= Spree.t(:risk_analysis) %>
+ &nbsp;
+ <% if @order.is_risky? %>
+ <span class="text-warning font-weight-normal"><%= icon('exclamation-circle') %> <%= Spree.t(:risky) %></span>
+ <% else %>
+ <span class="text-success font-weight-normal"><%= icon('check') %> <%= Spree.t(:not_risky) %></span>
+ <% end %>
+ </span>
+ <%= link_to '#risk-analysis', class: 'btn btn-light btn-sm text-muted', data: { toggle: 'collapse' } do %>
+ <%= Spree.t(:show_details) %>
+ <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
+ <% end %>
+ </h6>
+ <%= render 'spree/admin/orders/risk_analysis', latest_payment: @payments.first %>
+ </div>
+
+ <% if @refunds.any? %>
+ <div class="card-body border-top">
+ <h6><%= Spree.t(:refunds) %></h6>
+ <%= render partial: 'spree/admin/shared/refunds', locals: { refunds: @refunds, show_actions: can?(:edit, @refunds.first) } %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
+
+<% if @order.payment_required? && @order.bill_address.present? && @order.payment_total < @order.total_minus_store_credits && can?(:create, Spree::Payment.new(order: @order)) %>
+ <div class="card mb-4">
+ <div class="card-header justify-content-between">
+ <h5 class="card-title"><%= Spree.t(:payments) %></h5>
+ </div>
+ <div class="card-body">
+ <div class="d-flex mb-3 w-100 gap-3">
+ <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
+ <%= link_to_with_icon 'send', Spree.t(:send_payment_link), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-outline-primary with-tip', title: Spree.t(:send_payment_link_title) %>
+
+ <div data-controller="clipboard">
+ <input type="hidden" value="<%= spree.checkout_state_url(@order.token, :payment, host: current_store.url_or_custom_domain) %>" readonly data-clipboard-target="source">
+ <button class="btn btn-outline-primary" type="button" data-action="click->clipboard#copy">
+ <%= icon('copy') %>
+ <%= Spree.t(:copy_payment_link) %>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_risk_analysis.html.erb b/admin/app/views/spree/admin/orders/_risk_analysis.html.erb
new file mode 100644
index 0000000000..7f98d41358
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_risk_analysis.html.erb
@@ -0,0 +1,37 @@
+<ul class="list-group mt-3 mb-3 collapse" id="risk-analysis">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <%= Spree.t(:failed_payment_attempts) %>
+ <span class="badge badge-<%= @payments.failed.any? ? 'warning' : 'complete' %>">
+ <% if @payments.failed.any? %>
+ <%= icon('exclamation-circle') %>
+ <% else %>
+ <%= icon('check') %>
+ <% end %>
+ <%= Spree.t 'payments_count', count: @payments.failed.count, default: pluralize(@payments.failed.count, Spree.t(:payment_attempts)) %>
+ </span>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <%= Spree.t(:avs_response) %>
+ <span class="badge badge-<%= latest_payment.is_avs_risky? ? 'warning' : 'complete' %>">
+ <% if latest_payment.is_avs_risky? %>
+ <%= icon('exclamation-circle') %>
+ <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
+ <% else %>
+ <%= icon('check') %>
+ <%= Spree.t(:success) %>
+ <% end %>
+ </span>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <%= Spree.t(:cvv_response) %>
+ <span class="badge badge-<%= latest_payment.is_cvv_risky? ? 'warning' : 'complete' %>">
+ <% if latest_payment.is_cvv_risky? %>
+ <%= icon('exclamation-circle') %>
+ <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
+ <% else %>
+ <%= icon('check') %>
+ <%= Spree.t(:success) %>
+ <% end %>
+ </span>
+ </li>
+</ul>
diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erb
new file mode 100644
index 0000000000..cca88d9089
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb
@@ -0,0 +1,90 @@
+<% order ||= shipment.order %>
+<%= turbo_frame_tag dom_id(shipment), class: "card mb-4" do %>
+ <div class="card-header stock-location justify-content-between flex-wrap" data-hook="stock-location" id="shipment">
+ <span class="shipment-number d-none"><%= shipment.number %></span>
+ <span class="d-flex align-items-center"><%= shipment_state(shipment.state, class: 'mr-3') %></span>
+ <% if shipment.shipped_at.present? %>
+ <small class="text-muted text-xs mr-2">
+ <%= Spree.t(:fulfilled_at).downcase %>
+ <%= local_time_ago(shipment.shipped_at, class: 'with-tip') %>
+ </small>
+ <% end %>
+
+ <span class="d-flex justify-content-between align-items-center gap-2">
+ <strong><%= shipment.number %></strong>
+ <small class="text-muted"><%= Spree.t(:fulfilled_from).downcase %></small>
+ <strong class="stock-location-name" data-hook="stock-location-name">
+ <%= shipment.stock_location.name %>
+ </strong>
+ </span>
+ </div>
+ <div class="card-body mb-0 p-0">
+ <div class="shipment-line-items">
+ <div class="text-muted text-center border-bottom py-2 px-3 font-weight-bold font-size-sm shipment-line-items__row">
+ <span class="text-left">
+ <%= Spree.t(:item_description) %>
+ </span>
+ <span>
+ <%= Spree.t(:price) %>
+ </span>
+ <span>
+ <%= Spree.t(:quantity) %>
+ </span>
+ <span>
+ <%= Spree.t(:total) %>
+ </span>
+ <span>
+ </span>
+ </div>
+ <%= render collection: shipment.manifest, partial: 'spree/admin/orders/shipment_manifest_item', as: :item, locals: { shipment: shipment } %>
+ </div>
+ <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "hover-light py-2 px-3 d-flex justify-content-between align-items-center min-h-14" do %>
+ <div>
+ <% if rate = shipment.selected_shipping_rate %>
+ <strong><%= rate.name %></strong>
+ <span>
+ <%= shipment.display_cost %>
+ </span>
+ <% else %>
+ <%= Spree.t(:no_shipping_method_selected) %>
+ <% end %>
+ </div>
+
+ <% if( (can? :update, shipment) and !shipment.shipped? && !order.canceled? && !shipment.canceled?) %>
+ <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'with-tip btn btn-sm btn-light', no_text: true %>
+ <% end %>
+ <% end %>
+
+ <%= turbo_frame_tag dom_id(shipment, :tracking), class: "hover-light border-top px-3 d-flex justify-content-between align-items-center min-h-14" do %>
+ <div class="py-3">
+ <% if shipment.tracked? %>
+ <strong><%= Spree.t(:tracking) %>: </strong>
+ <% if shipment.tracking_url.present? %>
+ <span><%= link_to shipment.tracking, shipment.tracking_url, target: '_blank', rel: "noopener noreferrer" %></span>
+ <% elsif shipment.tracking.present? %>
+ <span><%= shipment.tracking %></span>
+ <% end %>
+ <% else %>
+ <%= Spree.t('admin.add_tracking_details') %>
+ <% end %>
+ </div>
+
+ <% if can?(:update, shipment) && (!order.canceled? && !shipment.canceled?) %>
+ <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'edit-tracking btn btn-light btn-sm', no_text: true, title: Spree.t(:edit) %>
+ <% end %>
+ <% end %>
+
+ <% if can_ship?(shipment) %>
+ <div class="card-footer d-flex justify-content-end">
+ <% if shipment.tracked? %>
+ <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure)} %>
+ <% else %>
+ <span class="ship-tooltip with-tip ship ml-auto btn btn-primary disabled mb-0" data-toggle="tooltip" data-placement="left" title="Before marking shipment as shipped please provide tracking details">
+ <%= icon 'send.svg'%>
+ <%= Spree.t(:ship) %>
+ </span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb b/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb
new file mode 100644
index 0000000000..3f3667ec2b
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag dom_id(item.variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>
+ <%= render 'spree/admin/variants/variant', variant: item.variant %>
+ <span class="d-flex align-items-center justify-content-center"><%= item.line_item.single_money.to_html %></span>
+ <span class="d-flex align-items-center justify-content-center">
+ <% item.states.each do |state,count| %>
+ <%= count %> x <%= Spree.t(state).downcase %>
+ <% end %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= line_item_shipment_price(item.line_item, item.quantity) %>
+ </span>
+ <% if can?(:split, shipment) %>
+ <span class="d-flex align-items-center justify-content-end">
+ <%= link_to_with_icon 'arrows-split', Spree.t(:split), spree.split_admin_order_shipment_path(@order, shipment, variant_id: item.variant), class: "btn btn-sm btn-light with-tip", no_text: true, data: { test_id: :split_item } %>
+ </span>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_shipments.html.erb b/admin/app/views/spree/admin/orders/_shipments.html.erb
new file mode 100644
index 0000000000..ed92e19982
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_shipments.html.erb
@@ -0,0 +1,7 @@
+<% if @shipments.any? %>
+ <%= render partial: "shipment", collection: @shipments %>
+<% elsif [email protected]?(['address', 'cart']) %>
+ <p class="text-center text-muted p-3">
+ <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Shipment)) %>
+ </p>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erb
new file mode 100644
index 0000000000..119926f2d7
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_summary.html.erb
@@ -0,0 +1,90 @@
+<div class="card mb-4" id="order_tab_summary">
+ <div class="card-header">
+ <h5 class="card-title"><%= Spree.t(:summary) %></h5>
+ </div>
+ <ul class="list-group list-group-flush">
+ <% if @order.canceled? && @order.canceled_at %>
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span><%= Spree.t(:canceled_at) %></span>
+ <span class="text-rightfont-weight-bold">
+ <%= local_time(@order.canceled_at) %>
+ </span>
+ </li>
+ <% if @order.canceler.present? %>
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span><%= Spree.t(:canceler) %></span>
+ <span class="text-rightfont-weight-bold">
+ <%= @order.canceler.name %>
+ </span>
+ </li>
+ <% end %>
+ <% end %>
+
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span>
+ <span id='item_total'>
+ <%= @order.display_item_total.to_html %>
+ </span>
+ </li>
+
+ <% if @order.promo_total != 0 %>
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span><%= Spree.t(:discounts) %></span>
+ <span class="text-right span" id='date_complete'>
+ <%= @order.display_promo_total.to_html %>
+ </span>
+ </li>
+ <% end %>
+
+ <% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span data-hook='admin_order_tab_ship_total_title'>
+ <%= Spree.t(:ship_total) %>
+ </span>
+ <span id='ship_total'>
+ <%= @order.display_ship_total.to_html %>
+ </span>
+ </li>
+ <% end %>
+
+ <% if @order.parent_order? && @order.included_tax_total != 0 %>
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span>
+ <span id='included_tax_total'>
+ <%= @order.display_included_tax_total.to_html %>
+ </span>
+ </li>
+ <% end %>
+
+ <% if @order.parent_order? && @order.additional_tax_total != 0 %>
+ <% tax_lines = order_summary_tax_lines_additional(@order) %>
+
+ <li class="list-group-item border-0">
+ <span class="d-flex justify-content-between align-items-center">
+ <span><%= Spree.t(:tax) %></span>
+ <span id="additional_tax_total">
+ <% if tax_lines.any? %>
+ <%= link_to '#tax-lines-additional', class: 'btn btn-light btn-sm mr-2', data: { toggle: 'collapse' } do %>
+ <%= Spree.t(:show_details) %>
+ <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>
+ <% end %>
+ <% end %>
+
+ <%= @order.display_additional_tax_total.to_html %>
+ </span>
+ </span>
+
+ <%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
+ </li>
+ <% end %>
+
+ <%= render 'summary_custom', order: @order %>
+
+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">
+ <span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>
+ <span class="font-weight-bold text-capitalize" id='order_total'>
+ <%= @order.display_total.to_html %>
+ </span>
+ </li>
+ </ul>
+</div>
diff --git a/admin/app/views/spree/admin/orders/_summary_custom.html.erb b/admin/app/views/spree/admin/orders/_summary_custom.html.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
new file mode 100644
index 0000000000..7b7a71e4e1
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb
@@ -0,0 +1,32 @@
+<% if controller_name == 'orders' %>
+ <div class="dropdown h-100 mr-2">
+ <button class="btn btn-light h-100" type="button" data-toggle="dropdown" aria-expanded="false">
+ <span class="text-muted font-weight-normal">Show:</span> <%= order_filter_dropdown_value %>
+ <%= icon('chevron-down', class: 'arrow ml-1 mr-0 mr-0') %>
+ </button>
+ <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">
+ <%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
+ <%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
+ class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>
+ <%= Spree.t('admin.orders.unfulfilled') %>
+ <% if ready_to_ship_orders_count&.positive? %>
+ <span class="badge badge-primary ml-2">
+ <%= ready_to_ship_orders_count %>
+ </span>
+ <% end %>
+ <% end %>
+ <%= link_to Spree.t('admin.orders.fulfilled'),
+ params.to_unsafe_h.deep_merge({q: {shipment_state_eq: :shipped, shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
+ class: "dropdown-item #{'active' if params[:q][:shipment_state_eq] == 'shipped'}" %>
+ <%= link_to Spree.t('admin.orders.cancelled'),
+ params.to_unsafe_h.deep_merge({q: {state_eq: nil, state_in: [:canceled, :partially_canceled], shipment_state_not_in: '', shipment_state_eq: '', refunded: '', partially_refunded: ''}}),
+ class: "dropdown-item #{'active' if params[:q][:state_in] == ['canceled','partially_canceled']}" %>
+ <%= link_to Spree.t('admin.orders.refunded'),
+ params.to_unsafe_h.deep_merge({q: {refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', partially_refunded: ''}}),
+ class: "dropdown-item #{'active' if params.dig(:q, :refunded) && params[:q][:refunded].present?}" %>
+ <%= link_to Spree.t('admin.orders.partially_refunded'),
+ params.to_unsafe_h.deep_merge({q: {partially_refunded: '1', shipment_state_not_in: '', shipment_state_eq: '', state_eq: '', state_in: '', refunded: '' }}),
+ class: "dropdown-item #{'active' if params.dig(:q, :partially_refunded) && params[:q][:partially_refunded].present?}" %>
+ </div>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/_tax_lines.html.erb b/admin/app/views/spree/admin/orders/_tax_lines.html.erb
new file mode 100644
index 0000000000..07d97a62b3
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_tax_lines.html.erb
@@ -0,0 +1,11 @@
+<ul class="list-group mt-3 mb-3 collapse" id="<%= id %>">
+ <% tax_lines.each do |tax_line| %>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <%= tax_line.name %>
+
+ <span class="text-right">
+ <%= tax_line.display_amount %>
+ </span>
+ </li>
+ <% end %>
+</ul>
diff --git a/admin/app/views/spree/admin/orders/_user_overview.html.erb b/admin/app/views/spree/admin/orders/_user_overview.html.erb
new file mode 100644
index 0000000000..f241929b87
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/_user_overview.html.erb
@@ -0,0 +1,13 @@
+<% if @order.user.orders.complete.any? %>
+ <div class="alert alert-info mt-2 mb-0">
+ <div>
+ <h6 class="font-weight-bold">
+ <%= icon('magic') %> Assistant
+ </h6>
+ This is a repeat customer that has spent a total of
+ <strong><%= Spree::Money.new(@order.user.orders.complete.sum(:total)) %></strong> across
+ <strong><%= @order.user.orders.complete.count %> orders</strong>, averaging
+ <strong><%= Spree::Money.new(@order.user.orders.complete.average(:total)) %></strong> per order.
+ </div>
+ </div>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/orders/billing_address/_form.html.erb b/admin/app/views/spree/admin/orders/billing_address/_form.html.erb
new file mode 100644
index 0000000000..863d3a2d76
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/billing_address/_form.html.erb
@@ -0,0 +1,14 @@
+<div data-form="new_address" class="d-none">
+ <%= render 'spree/admin/shared/error_messages', target: address %>
+ <%= render 'spree/addresses/form',
+ address_name: 'address',
+ address_form: f,
+ address_type: 'billing',
+ address: address %>
+</div>
+<% if @order.user.present? && @order.user.addresses.many? %>
+ <div data-form="existing_address" class="d-none">
+ <%= label_tag :billing_address_id, Spree.t(:existing_address), class: "sr-only" %>
+ <%= tom_select_tag :billing_address_id, {include_blank: Spree.t(:existing_address), class: "mb-2", options: @order.user.addresses.map { |a| {id: a.id, name: a.to_s.gsub('<br/>', ", ")}}.as_json, select_data: {action: 'form#submit'} } %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb
new file mode 100644
index 0000000000..1be66f7898
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb
@@ -0,0 +1,35 @@
+<%= turbo_stream.update :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_billing_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
+ <div>
+ <% if @order.shipping_address.present? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+ <% end %>
+ <% end %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+ <% end %>
+ <% if @order.user.present? && @order.user.addresses.many? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+ <% end %>
+ <% end %>
+ </div>
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.save') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb b/admin/app/views/spree/admin/orders/billing_address/edit.html.erb
new file mode 100644
index 0000000000..44464be5c1
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/billing_address/edit.html.erb
@@ -0,0 +1,42 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
+ <div>
+ <% if @order.shipping_address.present? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+ <% end %>
+ <% end %>
+ <% if @order.shipping_eq_billing_address? %>
+ <%= link_to spree.new_admin_order_billing_address_path(@order, selected_form: :new), class:"form-control custom-radio mb-2" do %>
+ <%= radio_button_tag :billing_address_type, :new, false, class: 'custom-control-input' %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+ <% end %>
+ <% else %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :new, true, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>
+ <% end %>
+ <% end %>
+ <% if @order.user.present? && @order.user.addresses.many? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+ <% end %>
+ <% end %>
+ </div>
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/billing_address/new.html.erb b/admin/app/views/spree/admin/orders/billing_address/new.html.erb
new file mode 100644
index 0000000000..e2e1a3c5a1
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/billing_address/new.html.erb
@@ -0,0 +1,35 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
+ <div>
+ <% if @order.shipping_address.present? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+ <% end %>
+ <% end %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil? || params[:selected_form] == 'new', class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>
+ <% end %>
+ <% if @order.user.present? && @order.user.addresses.many? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+ <% end %>
+ <% end %>
+ </div>
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.save') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb
new file mode 100644
index 0000000000..0f946fd525
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb
@@ -0,0 +1,35 @@
+<%= turbo_stream.update :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_billing_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
+ <div>
+ <% if @order.shipping_address.present? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>
+ <% end %>
+ <% end %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :new, [email protected]_eq_billing_address?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>
+ <% end %>
+ <% if @order.user.present? && @order.user.addresses.many? %>
+ <%= label_tag nil, class: 'form-control custom-radio' do %>
+ <%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>
+ <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>
+ <% end %>
+ <% end %>
+ </div>
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/contact_information/edit.html.erb b/admin/app/views/spree/admin/orders/contact_information/edit.html.erb
new file mode 100644
index 0000000000..5fd61730b8
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/contact_information/edit.html.erb
@@ -0,0 +1,20 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_for @order, url: spree.admin_order_contact_information_path(@order), method: :put, data: { turbo_frame: :_top } do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_contact_information) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
+ </div>
+ <div class="modal-body">
+ <div class="form-group">
+ <%= f.label :email, Spree.t(:email) %>
+ <%= f.email_field :email, class: 'form-control', required: true %>
+ </div>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/edit.html.erb b/admin/app/views/spree/admin/orders/edit.html.erb
new file mode 100644
index 0000000000..5243972e0c
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/edit.html.erb
@@ -0,0 +1,21 @@
+<%= render 'header' %>
+<%= render 'header_custom' %>
+
+<div class="container px-0">
+ <div class="row">
+ <div class="col-lg-8">
+
+ <%= render 'line_items' %>
+ <%= render 'shipments' %>
+ <%= render 'customer_returns' %>
+ <%= render 'payments'%>
+
+ <%= render 'body_custom' %>
+ <%= render 'summary' %>
+ </div>
+ <div class="col-lg-4">
+ <!-- TODO: add notes -->
+ <%= render 'customer' %>
+ </div>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/orders/index.html.erb b/admin/app/views/spree/admin/orders/index.html.erb
new file mode 100644
index 0000000000..5d7b31a7da
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/index.html.erb
@@ -0,0 +1,23 @@
+ <% content_for :page_title do %>
+ <% if controller_name == 'checkouts' %>
+ <%= Spree.t(:draft_orders) %>
+ <% else %>
+ <%= Spree.t(:orders) %>
+ <% end %>
+<% end %>
+
+<% content_for :page_actions do %>
+ <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary ml-2", data: { turbo_method: :post } if can?(:create, Spree::Order) %>
+<% end %>
+
+<div class="card-lg p-0">
+ <% if params[:frame_name].present? %>
+ <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+ <%= render 'spree/admin/orders/filters' %>
+ <%= render 'spree/admin/orders/list' %>
+ <% end %>
+ <% else %>
+ <%= render 'spree/admin/orders/filters' %>
+ <%= render 'spree/admin/orders/list' %>
+ <% end %>
+</div>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb b/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb
new file mode 100644
index 0000000000..594ca7e986
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb
@@ -0,0 +1,13 @@
+<%= render 'spree/admin/shared/error_messages', target: address %>
+<%= render 'spree/addresses/form',
+ address_name: 'address',
+ address_form: f,
+ address_type: 'shipping',
+ address: address %>
+<% if @order.user.present? && @order.user.addresses.many? %>
+ <div>
+ <div class="w-100 text-center mb-2"><%= Spree.t(:or_select_other_address) %></div>
+ <%= label_tag :shipping_address_id, Spree.t(:existing_address), class: "sr-only" %>
+ <%= tom_select_tag :shipping_address_id, {include_blank: Spree.t(:existing_address), class: "mb-2", options: @order.user.addresses.map { |a| {id: a.id, name: a.to_s.gsub('<br/>', ", ")}}.as_json, select_data: {action: 'form#submit'} } %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb
new file mode 100644
index 0000000000..0506e9e5cb
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb
@@ -0,0 +1,17 @@
+<%= turbo_stream.update :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3">
+ <%= render 'form', address: @address, f: f%>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.save') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb
new file mode 100644
index 0000000000..45ce5b2a31
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3">
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/new.html.erb b/admin/app/views/spree/admin/orders/shipping_address/new.html.erb
new file mode 100644
index 0000000000..19850a4179
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/shipping_address/new.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_shipping_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3">
+ <%= render 'form', address: @address, f: f%>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.save') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb
new file mode 100644
index 0000000000..d366b243de
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb
@@ -0,0 +1,17 @@
+<%= turbo_stream.update :dialog_modal do %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
+ </div>
+ <div class="modal-body d-flex flex-col gap-3">
+ <%= render 'form', address: @address, f: f %>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/user/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/user/create.turbo_stream.erb
new file mode 100644
index 0000000000..9d046fcffa
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/user/create.turbo_stream.erb
@@ -0,0 +1,12 @@
+<% if @user.valid? %>
+ <%= turbo_stream.append :modal_scripts do %>
+ <%= javascript_tag do %>
+ Turbo.visit("<%= spree.edit_admin_order_path(@order) %>", { action: "replace" })
+ <% end %>
+ <% end %>
+<% else %>
+ <%= turbo_stream.replace dom_id(@order, :customer_information) do %>
+ <%= render template: 'spree/admin/orders/user/new', locals: { show_form: true } %>
+ <% end %>
+<% end %>
+<%= turbo_render_alerts %>
diff --git a/admin/app/views/spree/admin/orders/user/edit.html.erb b/admin/app/views/spree/admin/orders/user/edit.html.erb
new file mode 100644
index 0000000000..19e8d5e4f1
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/user/edit.html.erb
@@ -0,0 +1,3 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= render 'spree/admin/orders/user/form', order: @order, user: @user %>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/user/new.html.erb b/admin/app/views/spree/admin/orders/user/new.html.erb
new file mode 100644
index 0000000000..f50350eb28
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/user/new.html.erb
@@ -0,0 +1,30 @@
+<% show_form ||= params[:show_form] %>
+<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-4 blur-busy" do %>
+ <div class="card-header d-flex justify-content-between">
+ <h5 class="card-title">
+ <%= Spree.t(:customer) %>
+ </h5>
+ <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ </div>
+ <div class="card-body">
+ <% if show_form %>
+ <%= form_with model: @user, scope: :user, url: spree.admin_order_user_path(@order) do |f| %>
+ <%= render 'spree/admin/shared/error_messages', target: @user %>
+ <%= render 'spree/admin/users/form', f: f %>
+ <div class="d-flex justify-content-between">
+ <%= link_to Spree.t(:discard), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ <%= turbo_save_button_tag Spree.t(:save), data: { turbo_frame: dom_id(@order, :edit) }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
+ </div>
+ <% end %>
+ <% else %>
+ <div class="d-flex gap-2 flex-column">
+ <%= form_with url: spree.admin_order_user_path(@order), data: { controller: 'form', form_target: 'form' }, method: :patch do %>
+ <%= label_tag :user_id, Spree.t(:select_user), class: "sr-only" %>
+ <%= tom_select_tag :user_id, { include_blank: Spree.t(:select_user), options: users_for_select_options, select_data: {action: 'form#submit'}, disable_with: "<span class='spinner-border spinner-border-sm' role='status'></span>" } %>
+ <% end %>
+ <span class="d-flex w-100 justify-content-center align-items-center"><%= Spree.t(:or) %></span>
+ <%= link_to Spree.t(:create_new), spree.new_admin_order_user_path(@order, show_form: true), class: "btn btn-light w-100" %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/orders/user/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/user/update.turbo_stream.erb
new file mode 100644
index 0000000000..2556eee9b1
--- /dev/null
+++ b/admin/app/views/spree/admin/orders/user/update.turbo_stream.erb
@@ -0,0 +1,5 @@
+<%= turbo_stream.append :modal_scripts do %>
+ <%= javascript_tag do %>
+ Turbo.visit("<%= spree.edit_admin_order_path(@order) %>", { action: "replace" })
+ <% end %>
+<% end %>
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 234e21d3dc..a171c170ff 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -1,6 +1,7 @@
en:
spree:
admin:
+ add_tracking_details: Add tracking details
url: URL
active: Active
name: Name
@@ -33,6 +34,9 @@ en:
export_only_filtered_records: Export only filtered records, matching the search criteria
export_all: Export all records (can be slow for large datasets)
export_created: Your export was started. You will receive an email with a download link when it is ready!
+ edit_contact_information: Edit contact information
+ edit_shipping_address: Edit shipping address
+ edit_billing_address: Edit billing address
linkable:
search_for_a_page: Search for a page
search_for_a_taxon: Search for a Taxon
@@ -116,11 +120,20 @@ en:
orders:
all: All
unpaid: Unpaid
+ fulfilled: Fulfilled
unfulfilled: Unfulfilled
+ cancelled: Cancelled
+ refunded: Refunded
+ partially_refunded: Partially Refunded
cart: Cart
all_orders: All Orders
draft_orders: Draft Orders
abandoned_checkouts: Abandoned Checkouts
+ orders_to_fulfill: Orders to fulfill
+ remove_user_from_this_order: Remove customer from this order
+ add_user_to_this_order: Add customer to this order
+ payment_link_sent: Payment link was sent to the customer
+ no_email_present: Please add an email address to send the payment link
oauth_applications:
list: oAuth applications
new: New oAuth application
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index 486f0df8f0..2b7165129d 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -49,6 +49,54 @@ Spree::Core::Engine.add_routes do
resources :oauth_applications
resources :webhooks_subscribers
+ # orders
+ resources :orders, only: [:index, :edit, :create] do
+ member do
+ post :resend
+ put :cancel
+ end
+
+ resource :shipping_address, except: [:index, :show], controller: 'orders/shipping_address'
+ resource :billing_address, except: [:index, :show], controller: 'orders/billing_address'
+ resource :contact_information, only: [:edit, :update], controller: 'orders/contact_information'
+ resource :user, except: [:edit, :show, :index], controller: 'orders/user'
+ resources :shipments, only: [:edit, :update, :create], controller: 'shipments' do
+ member do
+ post :ship
+ get :split
+ post :transfer
+ end
+ end
+ resources :line_items, except: :show
+
+ resources :customer_returns, only: [:index, :new, :edit, :create, :update] do
+ member do
+ put :refund
+ end
+ end
+
+ resources :return_authorizations do
+ member do
+ put :cancel
+ end
+ end
+ resources :payments, except: [:index, :show] do
+ member do
+ put :capture
+ put :void
+ end
+
+ resources :refunds, only: [:new, :create, :edit, :update]
+ end
+ resources :payment_links, only: [:create], controller: 'orders/payment_links'
+
+ resources :reimbursements, only: [:index, :create, :show, :edit, :update] do
+ member do
+ post :perform
+ end
+ end
+ end
+
# products
resources :products do
collection do
diff --git a/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
new file mode 100644
index 0000000000..b336397d8e
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
+ stub_authorization!
+
+ let(:order) { create(:order, user: nil, email: nil) }
+ let(:user_params) do
+ {
+ email: '[email protected]',
+ tag_list: ['tag1', 'tag2']
+ }
+ end
+
+ describe '#create' do
+ context 'when user exists' do
+ let!(:existing_user) { create(:user, email: user_params[:email]) }
+
+ it 'updates user with new details' do
+ post :create, params: { user: user_params, order_id: order.number }, as: :turbo_stream
+
+ expect(order.reload.user).to eq(existing_user)
+ expect(order.email).to eq(existing_user.email)
+
+ expect(existing_user.email).to eq(user_params[:email])
+ expect(existing_user.tag_list).to eq(user_params[:tag_list])
+ end
+ end
+
+ context 'when user does not exist' do
+ it 'saves user' do
+ post :create, params: { user: user_params, order_id: order.number }, as: :turbo_stream
+
+ new_user = Spree.user_class.find_by(email: user_params[:email])
+
+ expect(order.reload.user).to eq(new_user)
+ expect(order.email).to eq(new_user.email)
+
+ expect(new_user.email).to eq(user_params[:email])
+ expect(new_user.tag_list).to eq(user_params[:tag_list])
+ end
+ end
+ end
+
+ describe '#update' do
+ let!(:existing_user) { create(:user, email: user_params[:email]) }
+
+ it 'associates new user with order' do
+ put :update, params: { user_id: existing_user.id, order_id: order.number }, as: :turbo_stream
+
+ expect(order.reload.user).to eq(existing_user)
+ expect(order.email).to eq(existing_user.email)
+ end
+ end
+
+ describe '#destroy' do
+ let!(:existing_user) { create(:user, email: user_params[:email]) }
+
+ it 'removes user association from order' do
+ order.update(user: existing_user)
+
+ delete :destroy, params: { order_id: order.number }, as: :turbo_stream
+
+ expect(order.reload.user).to be_nil
+ end
+ end
+end
diff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rb
new file mode 100644
index 0000000000..2fa89d9e30
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::OrdersController, type: :controller do
+ stub_authorization!
+
+ let(:user) { create(:admin_user) }
+
+ describe '#create' do
+ subject { post :create }
+
+ let(:order) { Spree::Order.last }
+
+ it 'creates a blank order' do
+ expect { subject }.to change(Spree::Order, :count).by(1)
+
+ expect(assigns[:order]).to eq(order)
+ expect(response).to redirect_to(spree.edit_admin_order_path(order))
+
+ expect(order.line_items).to be_empty
+ expect(order.created_by).to eq(user)
+ expect(order.store).to eq(assigns[:current_store])
+ end
+ end
+
+ describe '#index' do
+ let!(:shipped_order) { create(:shipped_order) }
+ let!(:order) { create(:completed_order_with_totals, line_items_count: 2) }
+ let(:line_item) { order.line_items.first }
+ let!(:cancelled_order) { create(:completed_order_with_totals, state: 'canceled') }
+ let!(:payment) { create(:payment, state: 'completed', amount: shipped_order.total, order: shipped_order) }
+ let!(:cancelled_order_payment) { create(:payment, state: 'completed', amount: shipped_order.total, order: cancelled_order) }
+ let!(:refund) { create(:refund, payment: payment, amount: payment.amount) }
+ let!(:payment_one) { create(:payment, state: 'completed', amount: order.total, order: order) }
+ let!(:partial_refund) { create(:refund, payment: payment_one, amount: (payment_one.amount - 10)) }
+
+ it 'renders index' do
+ get :index
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'return all completed orders' do
+ get :index
+ expect(assigns(:orders).to_a).to include(order)
+ expect(assigns(:orders).to_a).to include(shipped_order)
+ end
+
+ it "returns all fulfilled orders" do
+ get :index, params: { q: { shipment_state_eq: :shipped } }
+
+ expect(assigns(:orders).to_a).to eq([shipped_order])
+ end
+
+ it "returns all cancelled orders" do
+ get :index, params: { q: { state_eq: :canceled } }
+
+ expect(assigns(:orders).to_a).to eq([cancelled_order])
+ end
+
+ it "returns all refunded orders" do
+ get :index, params: { q: { refunded: '1' } }
+
+ expect(assigns(:orders).to_a).to eq([shipped_order])
+ end
+
+ it "returns all partially refunded orders" do
+ get :index, params: { q: { partially_refunded: '1' } }
+
+ expect(assigns(:orders).to_a).to eq([order])
+ end
+
+ context 'filtering by date' do
+ let(:order1) { create(:completed_order_with_totals) }
+ let(:order2) { create(:completed_order_with_totals) }
+
+ context 'for All Orders' do
+ before do
+ order2
+ order1.update(completed_at: 5.month.ago)
+ get :index, params: { q: { completed_at_gt: 4.months.ago, completed_at_lt: 1.month.from_now } }
+ end
+
+ it 'uses completed_at column' do
+ expect(assigns(:orders).to_a).to include(order2)
+ expect(assigns(:orders).to_a).not_to include(order1)
+ end
+ end
+ end
+ end
+
+ describe '#edit' do
+ subject { get :edit, params: { id: order.number } }
+
+ let(:order) { create(:order_ready_to_ship) }
+
+ it 'shows an order' do
+ subject
+
+ expect(assigns[:order]).to eq(order)
+ expect(assigns[:line_items]).to eq(order.line_items)
+ expect(assigns[:shipments]).to eq(order.shipments)
+ expect(assigns[:payments]).to eq(order.payments)
+ end
+ end
+
+
+ describe '#cancel' do
+ subject(:cancel) { put :cancel, params: { id: order.number } }
+
+ let(:order) { create(:order_ready_to_ship) }
+
+ it 'cancels an order' do
+ cancel
+ expect(flash[:success]).to eq Spree.t(:order_canceled)
+ order.reload
+ expect(order.canceled?).to eq true
+ expect(order.canceler).to eq user
+ end
+ end
+
+ describe '#resend' do
+ subject { put :resend, params: { id: order.number } }
+
+ context 'for a complete order' do
+ let(:order) { create(:order_ready_to_ship) }
+
+ it 'resends an email' do
+ subject
+ expect(flash[:success]).to eq Spree.t(:order_email_resent)
+ end
+ end
+
+ context 'for an incomplete order' do
+ let(:order) { create(:order) }
+
+ it "doesn't resend the email" do
+ subject
+ expect(flash[:error]).to eq Spree.t(:order_email_resent_error)
+ end
+ end
+ end
+end
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 8fa97dcdf9..8d6e8d5623 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_core', ">= #{s.version}"
s.add_dependency 'spree_api', ">= #{s.version}"
+ s.add_dependency 'spree_emails', ">= #{s.version}"
s.add_dependency 'active_link_to'
s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 3bbfb082b5..e48170c03d 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -77,7 +77,7 @@ module Spree
self.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store]
self.whitelisted_ransackable_attributes = %w[
completed_at email number state payment_state shipment_state
- total item_total considered_risky channel
+ total item_total item_count considered_risky channel
]
self.whitelisted_ransackable_scopes = %w[refunded partially_refunded]
@@ -231,6 +231,19 @@ module Spree
completed_at.present?
end
+ def order_refunded?
+ (payment_state == 'void' && refunds.sum(:amount).positive?) || refunds.sum(:amount) == total
+ end
+
+ def partially_refunded?
+ return false if refunds.empty?
+
+ # we must deduct not returned amount, otherwise it can look like order has not been fully refunded
+ amount_not_refunded = additional_tax_total.abs + total_applied_store_credit
+
+ refunds.sum(:amount) < total - amount_not_refunded
+ end
+
# Indicates whether or not the user is allowed to proceed to checkout.
# Currently this is implemented as a check for whether or not there is at
# least one LineItem in the Order. Feel free to override this logic in your
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 1a42ae8963..de1ae841e4 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -197,6 +197,11 @@ module Spree
end
end
+ def url_or_custom_domain
+ # Overwrite this if you have a custom domain
+ url
+ end
+
def countries_available_for_checkout
@countries_available_for_checkout ||= Rails.cache.fetch(countries_available_for_checkout_cache_key) do
checkout_zone.try(:country_list) || Spree::Country.all
diff --git a/core/app/services/spree/orders/update_contact_information.rb b/core/app/services/spree/orders/update_contact_information.rb
new file mode 100644
index 0000000000..caab0958c8
--- /dev/null
+++ b/core/app/services/spree/orders/update_contact_information.rb
@@ -0,0 +1,19 @@
+module Spree
+ module Orders
+ class UpdateContactInformation
+ prepend ::Spree::ServiceModule::Base
+
+ def call(order:, order_params:)
+ ActiveRecord::Base.transaction do
+ order.update_columns(email: order_params[:email], updated_at: Time.current)
+
+ if order.respond_to?(:vendor_orders) && order.vendor_orders.any?
+ order.vendor_orders.update_all(email: order_params[:email], updated_at: Time.current)
+ end
+ end
+
+ success(order.reload)
+ end
+ end
+ end
+end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 825b59b4cf..58ac9ceb32 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -630,6 +630,7 @@ en:
canceled: Canceled
canceler: Canceler
canceled_at: Canceled at
+ cancel_order: Cancel order
cannot_be_destroyed: Order cannot be destroyed.
cannot_empty: Cannot empty order.
cannot_empty_completed_order: Order has already been processed so it cannot be emptied
@@ -698,11 +699,13 @@ en:
confirm: Confirm
confirm_delete: Confirm Deletion
confirm_password: Password Confirmation
+ contact_information: Contact information
contact_phone: Contact phone
contact_us: Contact us
continue: Continue
continue_as_guest: Continue as a guest
continue_shopping: Continue shopping
+ copy_payment_link: Copy payment link
cost_currency: Cost Currency
cost_price: Cost Price
could_not_create_customer_return: Could not create customer return
@@ -734,6 +737,7 @@ en:
coupon_code_used: The coupon code you entered has already been used. Please try again.
create: Create
create_a_new_account: Create a new account
+ create_new: Create new
create_new_order: Create new order
create_reimbursement: Create reimbursement
created_at: Created At
@@ -873,6 +877,7 @@ en:
message: Good work, your export is ready! Please use the link below to download it.
extension: Extension
extensions_directory: Extensions Directory
+ existing_address: Existing address
existing_shipments: Existing shipments
facebook: Facebook
failed_payment_attempts: Failed Payment Attempts
@@ -900,6 +905,9 @@ en:
free_shipping: Free Shipping
free_shipping_amount: "-"
front_end: Front End
+ fulfilled_at: Fulfilled at
+ fulfilled_by: Fulfilled by
+ fulfilled_from: Fulfilled from
gateway: Gateway
gateway_error: Gateway Error
general: General
@@ -1067,10 +1075,12 @@ en:
mobile: Mobile navigation
new: New
new_adjustment: New Adjustment
+ new_shipping_address: New Bhipping Address
new_customer: Create new account
new_customer_return: New Customer Return
new_country: New Country
new_image: New Image
+ new_line_item: Add line item
new_option_type: New Option Type
new_order: New Order
new_order_completed: New Order Completed
@@ -1087,6 +1097,7 @@ en:
new_rma_reason: New RMA Reason
new_return_authorization: New Return Authorization
new_role: New Role
+ new_shipping_address: New Shipping Address
new_shipping_category: New Shipping Category
new_shipping_method: New Shipping Method
new_shipment_at_location: New shipment at location
@@ -1109,6 +1120,7 @@ en:
no_address_given: No address given
no_available_date_set: No available date set
no_country: No country set
+ no_email_provided: No email provided
no_payment_found: No payment found
no_payment_provider_settings_message: This payment provider has no custom settings available
no_pending_payments: No pending payments
@@ -1123,6 +1135,8 @@ en:
no_shipping_method_selected: No shipping method selected.
no_state_changes: No state changes yet.
no_tracking_present: No tracking details provided.
+ not_provided: Not provided
+ not_risky: Not risky
user_not_found: User not found
none: None
none_selected: None Selected
@@ -1159,6 +1173,7 @@ en:
options: Options
or: or
or_over_price: ! '%{price} or over'
+ or_select_other_address: or select other address
order: Order
order_adjustments: Order adjustments
order_already_updated: The order has already been updated.
@@ -1166,6 +1181,7 @@ en:
order_canceled: Order canceled
order_details: Order Details
order_email_resent: Order Email Resent
+ order_email_resent_error: Order confirmation mail can only be sent for completed orders
order_information: Order Information
order_line_items: Order Line Items
order_mailer:
@@ -1229,6 +1245,7 @@ en:
path: Path
pay: pay
payment: Payment
+ payment_attempts: failed attempts
payment_could_not_be_created: Payment could not be created.
payment_identifier: Payment Identifier
payment_information: Payment Information
@@ -1450,6 +1467,7 @@ en:
sales_total: Sales Total
sales_total_description: Sales Total For All Orders
sales_totals: Sales Totals
+ same_as_shipping_address: Same as shipping address
save_and_continue: Save and Continue
save_my_address: Save my address
saving: Saving
@@ -1478,9 +1496,11 @@ en:
select_an_option: Select an option
select_stock: Select stock
select_stores: Select Store(s)
+ select_user: Select customer
selected_quantity_not_available: ! 'selected of %{item} is not available.'
send_copy_of_all_mails_to: Send Copy of All Mails To
send_mails_as: Send Mails As
+ send_payment_link: Send payment link
seo: SEO
seo_robots: SEO Robots
seo_title: SEO Title
@@ -1538,6 +1558,7 @@ en:
show: Show
show_active: Show Active
show_deleted: Show Deleted
+ show_details: Show details
show_discontinued: Show Discontinued
show_only_complete_orders: Only show complete orders
show_only_considered_risky: Only show risky orders
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index 746586ce35..8bcd1c2864 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -1846,4 +1846,53 @@ describe Spree::Order, type: :model do
it { expect(subject).to eq(40) }
end
+
+ describe '#partially_refunded?' do
+ subject { order.partially_refunded? }
+
+ context 'when orders has refunds' do
+ let(:order) { create(:order_ready_to_ship) }
+ let!(:refund) { create(:refund, amount: amount, payment: order.payments.first) }
+
+ let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method, stores: [store]) }
+ let!(:store_credits) { create(:store_credit_payment, amount: 15, order: order) }
+
+ before do
+ order.update_attribute(:total, 100)
+ order.update_attribute(:additional_tax_total, 10.00)
+ end
+
+ context 'when sum of refunds is less than max amount which could be refunded' do
+ let(:amount) { 50 }
+
+ it 'returns true' do
+ expect(subject).to be true
+ end
+ end
+
+ context 'when sum of refunds is equal to max amount which could be refunded' do
+ let(:amount) { 75 }
+
+ it 'returns false' do
+ expect(subject).to be false
+ end
+ end
+
+ context 'when sum of refunds is greater than max amount which could be refunded' do
+ let(:amount) { 75 }
+
+ it 'returns false' do
+ expect(subject).to be false
+ end
+ end
+ end
+
+ context 'when order does not have refunds' do
+ let(:order) { create(:order) }
+
+ it 'returns false' do
+ expect(subject).to be false
+ end
+ end
+ end
end
diff --git a/emails/app/models/spree/order/emails.rb b/emails/app/models/spree/order/emails.rb
index 7d2abde617..f333531d56 100644
--- a/emails/app/models/spree/order/emails.rb
+++ b/emails/app/models/spree/order/emails.rb
@@ -2,8 +2,12 @@ module Spree
class Order < Spree.base_class
module Emails
def deliver_order_confirmation_email
- OrderMailer.confirm_email(id).deliver_later
- update_column(:confirmation_delivered, true)
+ if completed?
+ OrderMailer.confirm_email(id).deliver_later
+ update_column(:confirmation_delivered, true)
+ else
+ errors.add(:base, Spree.t(:order_email_resent_error))
+ end
end
# Returns true if: