Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fixes #13390 - ability to manage Adjustments & Promotions on Order page in Admin
Damian Legawiec7c2b7f342193
diff --git a/admin/app/assets/tailwind/spree/admin/base/_base.css b/admin/app/assets/tailwind/spree/admin/base/_base.cssindex 8df102a80b..ade27502a7 100644--- a/admin/app/assets/tailwind/spree/admin/base/_base.css+++ b/admin/app/assets/tailwind/spree/admin/base/_base.css@@ -33,12 +33,11 @@}h1, h2, h3, h4, h5, h6 {- @apply font-bold leading-none;- font-family: var(--font-sans);+ @apply font-semibold leading-none;}strong, b {- @apply font-bold;+ @apply font-semibold;}h1 { @apply text-4xl; }diff --git a/admin/app/assets/tailwind/spree/admin/base/_theme.css b/admin/app/assets/tailwind/spree/admin/base/_theme.cssindex af157bc3ec..93ecfc68cf 100644--- a/admin/app/assets/tailwind/spree/admin/base/_theme.css+++ b/admin/app/assets/tailwind/spree/admin/base/_theme.css@@ -14,7 +14,7 @@--color-info: var(--color-blue-900);/* Typography */- --font-sans: Inter, sans-serif;+ --font-sans: "Inter", ui-sans-serif, system-ui, sans-serif;/* Override Tailwind's text-* scale to match Spree design system */--text-2xs: 0.625rem;diff --git a/admin/app/assets/tailwind/spree/admin/components/_alerts.css b/admin/app/assets/tailwind/spree/admin/components/_alerts.cssindex a6e305d07f..66baa2a84e 100644--- a/admin/app/assets/tailwind/spree/admin/components/_alerts.css+++ b/admin/app/assets/tailwind/spree/admin/components/_alerts.css@@ -18,12 +18,12 @@}.alert-success {- @apply bg-green-50 text-green-900 border-green-200;+ @apply bg-green-50 text-green-900 border-green-100;background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-check-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M9 12l2 2l4 -4' /%3E%3C/svg%3E");}.alert-danger {- @apply bg-red-50 text-red-900 border-red-200;+ @apply bg-red-50 text-red-900 border-red-100;background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-exclamation-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M12 9v4' /%3E%3Cpath d='M12 16v.01' /%3E%3C/svg%3E");}diff --git a/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.css b/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.cssindex 0e0f62d046..c99272a450 100644--- a/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.css+++ b/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.css@@ -8,27 +8,6 @@@apply gap-2 p-0 pl-4 h-8 border-l border-gray-100;}- .breadcrumb-item + .breadcrumb-item {- @apply pl-0;- }-- .breadcrumb-item + .breadcrumb-item::before {- @apply float-left text-gray-500 pr-2;- content: "/";- }-- .breadcrumb-item.active {- @apply text-gray-600;- }-- .breadcrumb-item a {- @apply text-inherit no-underline;- }-- .breadcrumb-item a:hover {- @apply text-zinc-950 underline;- }-.breadcrumb li a {@apply no-underline;}@@ -36,4 +15,8 @@.breadcrumb li a:hover {@apply text-zinc-950 underline;}++ .breadcrumb li:last-child:not(:first-child) {+ @apply font-semibold;+ }}diff --git a/admin/app/assets/tailwind/spree/admin/components/_cards.css b/admin/app/assets/tailwind/spree/admin/components/_cards.cssindex 953135f68f..4163dde6a7 100644--- a/admin/app/assets/tailwind/spree/admin/components/_cards.css+++ b/admin/app/assets/tailwind/spree/admin/components/_cards.css@@ -23,6 +23,10 @@@apply border-x-0 mb-0;}+ .card .card {+ @apply rounded-lg;+ }+.card > .table:last-child,.card > .table:last-of-type,.card .table-responsive > .table:last-child,@@ -83,11 +87,11 @@}.card-header {- @apply flex items-center mb-0 p-5 h-14 border-b border-gray-100 rounded-t-[calc(var(--radius-2xl)-1px)];+ @apply flex items-center mb-0 p-5 pr-3 h-14 border-b border-gray-100 rounded-t-[calc(var(--radius-2xl)-1px)];}.card-header .card-title {- @apply mb-0 font-sans;+ @apply mb-0 font-sans text-lg font-medium flex items-center gap-2;}.card-header .arrow {@@ -118,10 +122,6 @@@apply border-gray-100!;}- .card-title {- @apply mb-2 font-bold;- }-.card-text {@apply break-words;}diff --git a/admin/app/assets/tailwind/spree/admin/components/_dialogs.css b/admin/app/assets/tailwind/spree/admin/components/_dialogs.cssindex 9dfebf2cd7..8ebd9929b0 100644--- a/admin/app/assets/tailwind/spree/admin/components/_dialogs.css+++ b/admin/app/assets/tailwind/spree/admin/components/_dialogs.css@@ -108,7 +108,7 @@}.drawer-title {- @apply mb-0 font-bold;+ @apply mb-0 font-semibold;}.drawer-body {diff --git a/admin/app/assets/tailwind/spree/admin/components/_layout.css b/admin/app/assets/tailwind/spree/admin/components/_layout.cssindex 51a9a05b99..2a4db83ea7 100644--- a/admin/app/assets/tailwind/spree/admin/components/_layout.css+++ b/admin/app/assets/tailwind/spree/admin/components/_layout.css@@ -71,7 +71,7 @@}.page-header-title {- @apply text-xl mb-2 font-medium;+ @apply text-2xl font-medium mb-2;}/* Page Tabs */@@ -88,7 +88,7 @@}#page-tabs .nav .nav-link.active {- @apply bg-transparent text-zinc-950 font-bold;+ @apply bg-transparent text-zinc-950 font-semibold;}/* Main Content */@@ -211,7 +211,7 @@}#main-sidebar .nav-link.active {- @apply text-zinc-950 bg-white font-normal;+ @apply text-zinc-950 bg-white font-semibold;box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;}@@ -244,7 +244,7 @@#main-sidebar .nav-submenu .nav-link.active,#main-sidebar .nav-submenu .nav-link:active,#main-sidebar .nav-submenu .nav-link:focus {- @apply font-bold bg-transparent! shadow-none;+ @apply font-semibold bg-transparent! shadow-none;}#main-sidebar .nav-submenu .nav-link.active:before,@@ -506,7 +506,7 @@.sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link.active,.sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:active,.sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:focus {- @apply font-bold bg-transparent! shadow-none;+ @apply font-semibold bg-transparent! shadow-none;}.sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link.active:before,diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.css b/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.cssindex d38b508a45..6d27416634 100644--- a/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.css+++ b/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.css@@ -266,7 +266,7 @@}.ts-wrapper .ts-control > .item .remove {- @apply inline-block align-middle text-base font-bold ml-[3px] py-0 px-[3px] text-inherit no-underline rounded-sm opacity-50;+ @apply inline-block align-middle text-base font-semibold ml-[3px] py-0 px-[3px] text-inherit no-underline rounded-sm opacity-50;}.ts-wrapper .ts-control > .item .remove:hover {diff --git a/admin/app/controllers/concerns/spree/admin/order_concern.rb b/admin/app/controllers/concerns/spree/admin/order_concern.rbindex da44a7a94c..1505c3aa94 100644--- a/admin/app/controllers/concerns/spree/admin/order_concern.rb+++ b/admin/app/controllers/concerns/spree/admin/order_concern.rb@@ -15,6 +15,20 @@ module Spree@orderend+ 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++ @return_authorizations = @order.return_authorizations.includes(:return_items)+ @customer_returns = @order.customer_returns.distinct++ @order_promotions = @order.order_promotions.includes(promotion: :promotion_actions)+ @tax_adjustments = @order.all_adjustments.tax.includes(:source, :adjustable)+ end+def resource_not_foundflash[:error] = flash_message_for(model_class.new, :not_found)redirect_to spree.admin_orders_pathdiff --git a/admin/app/controllers/spree/admin/checkouts_controller.rb b/admin/app/controllers/spree/admin/checkouts_controller.rbindex 7de78b8385..9e263b507d 100644--- a/admin/app/controllers/spree/admin/checkouts_controller.rb+++ b/admin/app/controllers/spree/admin/checkouts_controller.rb@@ -22,6 +22,10 @@ module Spreedef scopecurrent_store.checkouts.accessible_by(current_ability, :index)end++ def edit_object_url(object, options = {})+ spree.admin_order_path(object, options)+ endendendenddiff --git a/admin/app/controllers/spree/admin/orders/adjustments_controller.rb b/admin/app/controllers/spree/admin/orders/adjustments_controller.rbnew file mode 100644index 0000000000..d3a6933c1e--- /dev/null+++ b/admin/app/controllers/spree/admin/orders/adjustments_controller.rb@@ -0,0 +1,120 @@+module Spree+ module Admin+ module Orders+ class AdjustmentsController < Spree::Admin::BaseController+ include Spree::Admin::OrderConcern++ before_action :load_order+ before_action :load_adjustment, except: [:new, :create]++ layout 'turbo_rails/frame'++ # GET /admin/orders/:order_id/adjustments/new+ def new+ @adjustment = @order.adjustments.new+ end++ # POST /admin/orders/:order_id/adjustments+ def create+ @adjustment = @order.adjustments.new(permitted_resource_params)+ @adjustment.order = @order+ @adjustment.label = params.dig(:adjustment, :label).presence || Spree.t(:manual_adjustment)+ @adjustment.state = 'closed'++ if @adjustment.save+ @order.update_with_updater!+ flash.now[:success] = Spree.t(:successfully_created, resource: Spree.t(:adjustment))++ load_order_items++ respond_to do |format|+ format.turbo_stream+ format.html { redirect_to spree.edit_admin_order_path(@order) }+ end+ else+ flash.now[:error] = @adjustment.errors.full_messages.to_sentence+ respond_to do |format|+ format.turbo_stream+ format.html { render :new, status: :unprocessable_entity }+ end+ end+ end++ # GET /admin/orders/:order_id/adjustments/:id/edit+ def edit; end++ # PATCH /admin/orders/:order_id/adjustments/:id+ def update+ if @adjustment.update(permitted_resource_params)+ @adjustment.close if @adjustment.open?+ @order.update_with_updater!+ flash.now[:success] = Spree.t(:successfully_updated, resource: Spree.t(:adjustment))++ load_order_items++ respond_to do |format|+ format.turbo_stream+ format.html { redirect_to spree.edit_admin_order_path(@order) }+ end+ else+ flash.now[:error] = @adjustment.errors.full_messages.to_sentence+ render :edit, status: :unprocessable_entity+ end+ end++ # DELETE /admin/orders/:order_id/adjustments/:id+ def destroy+ if @adjustment.destroy+ @order.update_with_updater!+ load_order_items+ flash.now[:success] = Spree.t(:successfully_removed, resource: Spree.t(:adjustment))+ else+ flash.now[:error] = @adjustment.errors.full_messages.to_sentence+ end++ respond_to do |format|+ format.turbo_stream+ format.html { redirect_to spree.edit_admin_order_path(@order) }+ end+ end++ # PUT /admin/orders/:order_id/adjustments/:id/toggle_state+ def toggle_state+ if @adjustment.closed?+ @adjustment.open+ else+ @adjustment.close+ end++ @order.update_with_updater!+ flash.now[:success] = Spree.t(:successfully_updated, resource: Spree.t(:adjustment))++ respond_to do |format|+ format.turbo_stream+ format.html { redirect_to spree.edit_admin_order_path(@order) }+ end+ end++ private++ def model_class+ Spree::Adjustment+ end++ def load_order+ @order = current_store.orders.find_by!(number: params[:order_id])+ authorize! :update, @order+ end++ def load_adjustment+ @adjustment = @order.all_adjustments.find(params[:id])+ authorize! action, @adjustment+ end++ def permitted_resource_params+ params.require(:adjustment).permit(:amount, :label)+ end+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/orders/order_promotions_controller.rb b/admin/app/controllers/spree/admin/orders/order_promotions_controller.rbnew file mode 100644index 0000000000..46aad1e60c--- /dev/null+++ b/admin/app/controllers/spree/admin/orders/order_promotions_controller.rb@@ -0,0 +1,59 @@+module Spree+ module Admin+ module Orders+ class OrderPromotionsController < Spree::Admin::BaseController+ include Spree::Admin::OrderConcern++ before_action :load_order+ before_action :load_order_promotion, only: :destroy++ layout 'turbo_rails/frame'++ # GET /admin/orders/:order_id/order_promotions/new+ def new; end++ # POST /admin/orders/:order_id/order_promotions+ def create+ authorize! :update, @order++ @order.coupon_code = params[:coupon_code]++ @handler = Spree::PromotionHandler::Coupon.new(@order)+ @handler.apply++ if @handler.successful?+ flash.now[:success] = @handler.success+ @order.reload+ load_order_items+ else+ flash.now[:error] = @handler.error+ end+ end++ # DELETE /admin/orders/:order_id/promotions/:id+ def destroy+ authorize! :update, @order++ coupon_code = @order_promotion.code.presence || @order_promotion.name++ @handler = Spree::PromotionHandler::Coupon.new(@order)+ @handler.remove(coupon_code)++ if @handler.successful?+ flash.now[:success] = @handler.success+ @order.reload+ load_order_items+ else+ flash.now[:error] = @handler.error+ end+ end++ private++ def load_order_promotion+ @order_promotion = @order.order_promotions.find(params[:id])+ end+ end+ end+ end+enddiff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rbindex 679b6c5cb7..54596677bb 100644--- a/admin/app/controllers/spree/admin/orders_controller.rb+++ b/admin/app/controllers/spree/admin/orders_controller.rb@@ -7,12 +7,10 @@ module Spreeinclude Spree::Admin::TableConcernbefore_action :initialize_order_events- before_action :load_order, only: %i[edit cancel resend destroy]- before_action :load_order_items, only: :edit+ before_action :load_order, only: %i[show edit cancel resend destroy]+ before_action :load_order_items, only: :showbefore_action :load_user, only: [:index]- helper_method :model_class, :object_url-# GET /admin/orders/newdef new@order = current_store.orders.new@@ -30,13 +28,18 @@ module Spreeendend- # GET /admin/orders/:id/edit- def edit+ # GET /admin/orders/:id+ def showunless @order.completed?add_breadcrumb Spree.t(:draft_orders), :admin_checkouts_pathend- add_breadcrumb @order.number, spree.edit_admin_order_path(@order)+ add_breadcrumb @order.number, spree.admin_order_path(@order)+ end++ # GET /admin/orders/:id/edit+ def edit+ redirect_to spree.admin_order_path(@order)end# GET /admin/orders@@ -100,17 +103,6 @@ module Spreeauthorize! action, @orderend- 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-- @return_authorizations = @order.return_authorizations.includes(:return_items)- @customer_returns = @order.customer_returns.distinct- 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}diff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rbindex c325f6a6ac..ad716c3bcb 100644--- a/admin/app/helpers/spree/admin/orders_helper.rb+++ b/admin/app/helpers/spree/admin/orders_helper.rb@@ -3,6 +3,7 @@ module Spreemodule OrdersHelperTaxLine = Struct.new(:label, :display_amount, :item, :for_shipment, keyword_init: true) dodef name+ Spree::Deprecation.warn("TaxLine is deprecated and will be removed in Spree 5.5")item_name = item.nameitem_name += " #{Spree.t(:shipment).downcase}" if for_shipment@@ -11,6 +12,7 @@ module Spreeenddef order_summary_tax_lines_additional(order)+ Spree::Deprecation.warn("order_summary_tax_lines_additional is deprecated and will be removed in Spree 5.5")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) }diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erbindex a31f3d0f90..c19ac8c5de 100644--- a/admin/app/views/layouts/spree/admin.html.erb+++ b/admin/app/views/layouts/spree/admin.html.erb@@ -6,14 +6,14 @@</head><body class="admin min-h-screen <%= controller_name %> <%= action_name %>"- data-controller="admin sidebar"+ data-controller="admin sidebar drawer dialog"data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save"><%= render_admin_partials(:body_start_partials) %><%= render "spree/admin/shared/header" %><%= render "spree/admin/shared/sidebar" %>- <main id="content" data-controller="drawer dialog export-dialog">+ <main id="content" data-controller=" export-dialog"><%= render "spree/admin/shared/content_header" %><%= render "spree/admin/shared/page_tabs" %><%= render "spree/admin/shared/page_alerts" %>diff --git a/admin/app/views/spree/admin/orders/_adjustment.html.erb b/admin/app/views/spree/admin/orders/_adjustment.html.erbnew file mode 100644index 0000000000..8e09b79998--- /dev/null+++ b/admin/app/views/spree/admin/orders/_adjustment.html.erb@@ -0,0 +1,78 @@+<tr id="<%= dom_id(adjustment) %>">+ <td>+ <div class="font-medium"><%= adjustment.label %></div>+ </td>+ <td>+ <% if adjustment.source_type.blank? %>+ <span class="badge badge-light"><%= Spree.t(:manual) %></span>+ <% else %>+ <span class="badge badge-info"><%= adjustment.source_type.demodulize.underscore.humanize %></span>+ <% end %>+ </td>+ <td class="text-sm text-gray-600">+ <% if adjustment.adjustable.is_a?(Spree::LineItem) %>+ <%= icon('shopping-cart') %>+ <%= truncate(adjustment.adjustable.name, length: 30) %>+ <% elsif adjustment.adjustable.is_a?(Spree::Shipment) %>+ <%= icon('truck') %>+ <%= Spree.t(:shipment) %> #<%= adjustment.adjustable.number %>+ <% elsif adjustment.adjustable.is_a?(Spree::Order) %>+ <%= icon('receipt') %>+ <%= Spree.t(:order) %>+ <% end %>+ </td>+ <td>+ <% if adjustment.closed? %>+ <span class="badge badge-light" title="<%= Spree.t(:adjustment_closed_description) %>">+ <%= icon('lock') %>+ <%= Spree.t(:closed) %>+ </span>+ <% else %>+ <span class="badge badge-success" title="<%= Spree.t(:adjustment_open_description) %>">+ <%= icon('lock-open') %>+ <%= Spree.t(:open) %>+ </span>+ <% end %>+ <% unless adjustment.eligible? %>+ <span class="badge badge-warning ml-1" title="<%= Spree.t(:ineligible_adjustment_description) %>">+ <%= Spree.t(:ineligible) %>+ </span>+ <% end %>+ </td>+ <td>+ <%= adjustment.display_amount.to_html %>+ </td>+ <td class="text-right">+ <% if can?(:update, adjustment) || can?(:destroy, adjustment) %>+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>+ <%= icon "dots-vertical", class: "mr-0" %>+ <% end %>+ <%= dropdown_menu do %>+ <% if can?(:update, adjustment) %>+ <% if adjustment.source_type.blank? %>+ <%= link_to_with_icon "edit",+ Spree.t(:edit),+ spree.edit_admin_order_adjustment_path(@order, adjustment),+ data: { turbo_frame: 'dialog', action: 'dialog#open' },+ class: "dropdown-item" %>+ <% end %>+ <%= link_to_with_icon adjustment.closed? ? "lock-open" : "lock",+ adjustment.closed? ? Spree.t(:open_adjustment) : Spree.t(:close_adjustment),+ spree.toggle_state_admin_order_adjustment_path(@order, adjustment),+ data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) },+ class: "dropdown-item" %>+ <% end %>+ <% if can?(:destroy, adjustment) && adjustment.source_type.blank? %>+ <div class="dropdown-divider"></div>+ <%= link_to_with_icon "trash",+ Spree.t(:delete),+ spree.admin_order_adjustment_path(@order, adjustment),+ data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) },+ class: 'dropdown-item text-red-600 hover:bg-red-100' %>+ <% end %>+ <% end %>+ <% end %>+ <% end %>+ </td>+</tr>diff --git a/admin/app/views/spree/admin/orders/_adjustments.html.erb b/admin/app/views/spree/admin/orders/_adjustments.html.erbnew file mode 100644index 0000000000..7c1dcf6bbc--- /dev/null+++ b/admin/app/views/spree/admin/orders/_adjustments.html.erb@@ -0,0 +1,41 @@+<% adjustments = @order.all_adjustments.where.not(source_type: ['Spree::PromotionAction', 'Spree::TaxRate']).or(@order.all_adjustments.where(source_type: nil)).includes(:source, :adjustable).order(created_at: :desc) %>++<div class="card mb-6" id="order_adjustments">+ <div class="card-header flex justify-between items-center border-0">+ <h5 class="card-title flex items-center">+ <%= icon('adjustments', class: 'mr-2') %>+ <%= Spree.t(:adjustments) %>+ <% if adjustments.any? %>+ <span class="badge badge-info ml-2"><%= adjustments.count %></span>+ <% end %>+ </h5>+ <% if can?(:create, Spree::Adjustment.new(order: @order)) %>+ <%= link_to_with_icon 'plus', Spree.t(:new_adjustment), spree.new_admin_order_adjustment_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %>+ <% end %>+ </div>+ <div class="card-body p-0 border-t">+ <% if adjustments.any? %>+ <div class="table-responsive">+ <table class="table">+ <thead>+ <tr>+ <th class="rounded-none"><%= Spree.t(:label) %></th>+ <th class="rounded-none"><%= Spree.t(:type) %></th>+ <th class="rounded-none"><%= Spree.t(:applied_to) %></th>+ <th class="rounded-none"><%= Spree.t(:state) %></th>+ <th class="rounded-none"><%= Spree.t(:amount) %></th>+ <th class="rounded-none"></th>+ </tr>+ </thead>+ <tbody>+ <%= render collection: adjustments, partial: 'spree/admin/orders/adjustment', as: :adjustment %>+ </tbody>+ </table>+ </div>+ <% else %>+ <p class="text-center text-gray-600 p-8">+ <%= Spree.t(:no_adjustments) %>+ </p>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex ef8f9801de..c02365a4e6 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -30,7 +30,7 @@<div class="card-body"><% unless defined?(current_vendor) && current_vendor %><% unless @order.user.present? %>- <h5><%= Spree.t(:contact_information) %></h5>+ <h6><%= Spree.t(:contact_information) %></h6><% end %><div class='card-text flex flex-col'><% if @order.user.present? %>diff --git a/admin/app/views/spree/admin/orders/_order_promotion.html.erb b/admin/app/views/spree/admin/orders/_order_promotion.html.erbnew file mode 100644index 0000000000..406a45d2c5--- /dev/null+++ b/admin/app/views/spree/admin/orders/_order_promotion.html.erb@@ -0,0 +1,32 @@+<% promotion = order_promotion.promotion %>+<tr>+ <td>+ <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: "font-bold" %>+ </td>+ <td>+ <% if promotion.coupon_code? %>+ <span class="badge badge-light"><%= Spree.t(:coupon_code) %></span>+ <% else %>+ <span class="badge badge-info"><%= Spree.t(:automatic_promotion) %></span>+ <% end %>+ </td>+ <td>+ <%= Spree::Money.new(order_promotion.amount, currency: @order.currency).to_html %>+ </td>+ <td class="text-right">+ <% if can?(:destroy, order_promotion) %>+ <%= dropdown do %>+ <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>+ <%= icon('dots-vertical', class: 'mr-0') %>+ <% end %>+ <%= dropdown_menu do %>+ <%= link_to_with_icon 'trash',+ Spree.t('actions.destroy'),+ spree.admin_order_order_promotion_path(@order, order_promotion),+ data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) },+ class: "dropdown-item text-red-600 hover:bg-red-100" %>+ <% end %>+ <% end %>+ <% end %>+ </td>+</tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erbindex 0dd2cc90a2..b4735eb1a9 100644--- a/admin/app/views/spree/admin/orders/_payments.html.erb+++ b/admin/app/views/spree/admin/orders/_payments.html.erb@@ -15,7 +15,7 @@<% if @order.payment_total < @order.total && can?(:create, Spree::Payment.new(order: @order)) %><div class="flex justify-center w-full gap-6 p-6">- <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>+ <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-secondary' %><% if spree.respond_to?(:checkout_state_url) %><%= link_to_with_icon 'send', Spree.t('admin.send_payment_link'), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-light', title: Spree.t(:send_payment_link_title) %>@@ -23,7 +23,7 @@<div data-controller="clipboard" data-clipboard-success-content-value="<%= Spree.t('admin.copied') %>"><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-light" type="button" data-clipboard-target="button" data-action="click->clipboard#copy">- <%= icon('copy-check') %>+ <%= icon('copy') %><%= Spree.t('admin.copy_payment_link') %></button></div>diff --git a/admin/app/views/spree/admin/orders/_promotions.html.erb b/admin/app/views/spree/admin/orders/_promotions.html.erbnew file mode 100644index 0000000000..95046bc54a--- /dev/null+++ b/admin/app/views/spree/admin/orders/_promotions.html.erb@@ -0,0 +1,37 @@+<div class="card mb-6" id="order_promotions">+ <div class="card-header flex justify-between items-center border-0">+ <h5 class="card-title flex items-center">+ <%= icon('tag', class: 'mr-2') %>+ <%= Spree.t(:promotions) %>+ <% if @order_promotions.any? %>+ <span class="badge badge-info ml-2"><%= @order_promotions.count %></span>+ <% end %>+ </h5>+ <% if can?(:update, @order) && Spree::Promotion.order_activatable?(@order) %>+ <%= link_to_with_icon 'plus', Spree.t(:add_coupon_code), spree.new_admin_order_order_promotion_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %>+ <% end %>+ </div>+ <div class="card-body p-0 border-t">+ <% if @order_promotions.any? %>+ <div class="table-responsive">+ <table class="table">+ <thead>+ <tr>+ <th class="rounded-none"><%= Spree.t(:name) %></th>+ <th class="rounded-none"><%= Spree.t(:type) %></th>+ <th class="rounded-none"><%= Spree.t(:amount) %></th>+ <th class="rounded-none"></th>+ </tr>+ </thead>+ <tbody>+ <%= render collection: @order_promotions, partial: 'spree/admin/orders/order_promotion' %>+ </tbody>+ </table>+ </div>+ <% else %>+ <p class="text-center text-gray-600 p-8">+ <%= Spree.t(:no_promotions_applied) %>+ </p>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erbindex 9d3eca271d..9346cd61cb 100644--- a/admin/app/views/spree/admin/orders/_shipment.html.erb+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb@@ -1,5 +1,5 @@<% order ||= shipment.order %>-<%= turbo_frame_tag dom_id(shipment), class: "card" do %>+<%= turbo_frame_tag dom_id(shipment), class: "card rounded-lg" do %><div class="card-header items-center justify-between"><div class="flex items-center gap-2"><span class="flex items-center"><%= shipment_state(shipment.state) %></span>@@ -12,8 +12,8 @@</div><span class="flex justify-between items-center gap-2">- <small class="text-gray-600"><%= Spree.t(:package_from).downcase %></small>- <strong>+ <span class="text-gray-600"><%= Spree.t(:package_from).downcase %></span>+ <span class="font-semibold"><% if can?(:edit, shipment.stock_location) %><%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_path(shipment.stock_location), data: { turbo_frame: '_top' } %><% else %>diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erbindex 237a6fdeaa..2a5db2afd3 100644--- a/admin/app/views/spree/admin/orders/_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_summary.html.erb@@ -3,6 +3,32 @@<h5 class="card-title"><%= Spree.t(:summary) %></h5></div><ul class="list-group list-group-flush">+ <% if @order.created_by %>+ <li class="list-group-item flex justify-between items-center border-0 rounded-none">+ <span><%= Spree.t(:created_by) %></span>+ <span class="text-rightfont-bold">+ <%= link_to @order.created_by.name, spree.admin_admin_user_path(@order.created_by), data: { turbo_frame: '_top' } %>+ </span>+ </li>+ <% end %>+++ <li class="list-group-item flex justify-between items-center border-0 rounded-none">+ <span><%= Spree.t(:created_at) %></span>+ <span class="text-rightfont-bold">+ <%= spree_time(@order.created_at) %>+ </span>+ </li>++ <% if @order.completed_at %>+ <li class="list-group-item flex justify-between items-center border-0">+ <span><%= Spree.t(:completed_at) %></span>+ <span class="text-rightfont-bold">+ <%= spree_time(@order.completed_at) %>+ </span>+ </li>+ <% end %>+<% if @order.canceled? && @order.canceled_at %><li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:canceled_at) %></span>@@ -20,11 +46,13 @@<% end %><% end %>+ <hr class="border-gray-100" />+<li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:currency) %></span>- <span id='currency'>+ <code id='currency'><%= @order.currency %>- </span>+ </code></li><li class="list-group-item flex justify-between items-center border-0">@@ -37,9 +65,20 @@<% if @order.promo_total != 0 %><li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:discount_amount) %></span>- <span class="text-right span" id='date_complete'>- <%= @order.display_promo_total.to_html %>- </span>+ <span class="text-right" id='promo_total'>+ <%= @order.display_promo_total.to_html %>+ </span>+ </li>+ <% end %>++ <% other_adjustments = @order.all_adjustments.eligible.where.not(source_type: ['Spree::PromotionAction', 'Spree::TaxRate']) %>+ <% if other_adjustments.any? %>+ <% other_adjustment_total = other_adjustments.sum(:amount) %>+ <li class="list-group-item flex justify-between items-center border-0">+ <span><%= Spree.t(:adjustments) %></span>+ <span class="text-right" id='other_adjustment_total'>+ <%= Spree::Money.new(other_adjustment_total, currency: @order.currency).to_html %>+ </span></li><% end %>@@ -61,24 +100,13 @@</span></li>- <% tax_lines = order_summary_tax_lines_additional(@order) %>-<li class="list-group-item border-0" data-controller="reveal"><span class="flex justify-between items-center"><span><%= Spree.t(:tax) %></span><span id="additional_tax_total">- <% if tax_lines.any? %>- <button type="button" class="btn btn-light btn-sm mr-2" data-action="click->reveal#toggle">- <%= Spree.t(:show_details) %>- <%= icon('selector', height: 12, class: 'mr-0 ml-2') %>- </button>- <% end %>-<%= @order.display_additional_tax_total.to_html %></span></span>-- <%= render 'tax_lines', tax_lines: tax_lines %></li><%= render_admin_partials(:order_page_summary_partials, order: @order) %>@@ -99,7 +127,7 @@<li class="list-group-item flex justify-between items-center bg-gray-25"><span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span>- <span id='outstanding_balance'>+ <span id='outstanding_balance' class="text-danger"><%= @order.display_outstanding_balance.to_html %></span></li>diff --git a/admin/app/views/spree/admin/orders/_taxes.html.erb b/admin/app/views/spree/admin/orders/_taxes.html.erbnew file mode 100644index 0000000000..9c70f50cb1--- /dev/null+++ b/admin/app/views/spree/admin/orders/_taxes.html.erb@@ -0,0 +1,79 @@+<div class="card mb-6" id="order_taxes">+ <div class="card-header flex justify-between items-center border-0">+ <h5 class="card-title flex items-center">+ <%= icon('receipt-tax', class: 'mr-2') %>+ <%= Spree.t(:tax_rates) %>+ <% if @tax_adjustments.any? %>+ <span class="badge badge-info ml-2"><%= @tax_adjustments.count %></span>+ <% end %>+ </h5>+ </div>+ <div class="card-body p-0 border-t">+ <% if @tax_adjustments.any? %>+ <div class="table-responsive">+ <table class="table">+ <thead>+ <tr>+ <th class="rounded-none"><%= Spree.t(:name) %></th>+ <th class="rounded-none"><%= Spree.t(:applied_to) %></th>+ <th class="rounded-none"><%= Spree.t(:included_in_price) %></th>+ <th class="rounded-none"><%= Spree.t(:pre_tax_amount) %></th>+ <th class="rounded-none"><%= Spree.t(:rate) %></th>+ <th class="rounded-none"><%= Spree.t(:amount) %></th>+ </tr>+ </thead>+ <tbody>+ <% @tax_adjustments.each do |adjustment| %>+ <% tax_rate = adjustment.source %>+ <tr>+ <td>+ <div class="font-medium"><%= adjustment.label %></div>+ <% if tax_rate.present? %>+ <div class="text-sm text-gray-500">+ <%= link_to tax_rate.zone&.name || Spree.t(:all_zones), spree.edit_admin_tax_rate_path(tax_rate), class: "text-blue-600 hover:underline" %>+ </div>+ <% end %>+ </td>+ <td class="text-sm text-gray-600">+ <% if adjustment.adjustable.is_a?(Spree::LineItem) %>+ <%= icon('shopping-cart') %>+ <%= Spree.t(:line_item) %> - <%= adjustment.adjustable.name %>+ <% elsif adjustment.adjustable.is_a?(Spree::Shipment) %>+ <%= icon('truck') %>+ <%= Spree.t(:shipment) %> #<%= adjustment.adjustable.number %>+ <% elsif adjustment.adjustable.is_a?(Spree::Order) %>+ <%= icon('receipt') %>+ <%= Spree.t(:order) %>+ <% end %>+ </td>+ <td>+ <% if adjustment.included? %>+ <span class="badge badge-info"><%= Spree.t(:yes) %></span>+ <% else %>+ <span class="badge badge-light"><%= Spree.t(:no) %></span>+ <% end %>+ </td>+ <td>+ <%= adjustment.adjustable.display_pre_tax_amount if adjustment.adjustable.respond_to?(:display_pre_tax_amount) %>+ <td>+ <% if tax_rate.present? %>+ <%= number_to_percentage(tax_rate.amount * 100, precision: 2) %>+ <% else %>+ -+ <% end %>+ </td>+ <td>+ <%= adjustment.display_amount.to_html %>+ </td>+ </tr>+ <% end %>+ </tbody>+ </table>+ </div>+ <% else %>+ <p class="text-center text-gray-600 p-8">+ <%= Spree.t(:no_taxes) %>+ </p>+ <% end %>+ </div>+</div>diff --git a/admin/app/views/spree/admin/orders/adjustments/_form.html.erb b/admin/app/views/spree/admin/orders/adjustments/_form.html.erbnew file mode 100644index 0000000000..1d5da3131c--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/_form.html.erb@@ -0,0 +1,6 @@+<%= f.spree_text_field :label, autofocus: true %>+<%= f.spree_number_field :amount,+ required: true,+ step: 0.01,+ prepend: @order.currency,+ hint: Spree.t(:adjustment_amount_help) %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/adjustments/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/adjustments/create.turbo_stream.erbnew file mode 100644index 0000000000..4f2311d808--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/create.turbo_stream.erb@@ -0,0 +1,10 @@+<%= turbo_render_alerts %>+<%= turbo_close_dialog %>++<%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+<% end %>++<%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/adjustments/destroy.turbo_stream.erb b/admin/app/views/spree/admin/orders/adjustments/destroy.turbo_stream.erbnew file mode 100644index 0000000000..037d5ecde6--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/destroy.turbo_stream.erb@@ -0,0 +1,9 @@+<%= turbo_render_alerts %>++<%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+<% end %>++<%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+<% end %>diff --git a/admin/app/views/spree/admin/orders/adjustments/edit.html.erb b/admin/app/views/spree/admin/orders/adjustments/edit.html.erbnew file mode 100644index 0000000000..371957f74e--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/edit.html.erb@@ -0,0 +1,16 @@+<%= turbo_frame_tag :dialog do %>+ <%= dialog_header(Spree.t(:edit_adjustment)) %>+ <%= form_with model: @adjustment, url: spree.admin_order_adjustment_path(@order, @adjustment), data: { turbo_frame: '_top' } do |f| %>+ <div class="dialog-body">+ <%= render 'spree/admin/shared/error_messages', target: @adjustment %>+ <%= render 'form', f: f %>+ <div class="alert alert-warning">+ <%= Spree.t(:editing_adjustment_warning) %>+ </div>+ </div>+ <div class="dialog-footer">+ <%= dialog_discard_button %>+ <%= turbo_save_button_tag %>+ </div>+ <% end %>+<% end %>diff --git a/admin/app/views/spree/admin/orders/adjustments/new.html.erb b/admin/app/views/spree/admin/orders/adjustments/new.html.erbnew file mode 100644index 0000000000..c1ffdcc95b--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/new.html.erb@@ -0,0 +1,15 @@+<%= turbo_frame_tag :dialog do %>+ <div>+ <%= dialog_header(Spree.t(:new_adjustment)) %>+ <%= form_with model: @adjustment, url: spree.admin_order_adjustments_path(@order), data: { turbo_frame: '_top' } do |f| %>+ <div class="dialog-body">+ <%= render 'spree/admin/shared/error_messages', target: @adjustment %>+ <%= render 'form', f: f %>+ </div>+ <div class="dialog-footer">+ <%= dialog_discard_button %>+ <%= turbo_save_button_tag Spree.t('actions.create') %>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/orders/adjustments/toggle_state.turbo_stream.erb b/admin/app/views/spree/admin/orders/adjustments/toggle_state.turbo_stream.erbnew file mode 100644index 0000000000..037d5ecde6--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/toggle_state.turbo_stream.erb@@ -0,0 +1,9 @@+<%= turbo_render_alerts %>++<%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+<% end %>++<%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+<% end %>diff --git a/admin/app/views/spree/admin/orders/adjustments/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/adjustments/update.turbo_stream.erbnew file mode 100644index 0000000000..73fbd111bb--- /dev/null+++ b/admin/app/views/spree/admin/orders/adjustments/update.turbo_stream.erb@@ -0,0 +1,10 @@+<%= turbo_render_alerts %>+<%= turbo_close_dialog %>++<%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+<% end %>++<%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+<% end %>diff --git a/admin/app/views/spree/admin/orders/order_promotions/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/order_promotions/create.turbo_stream.erbnew file mode 100644index 0000000000..6ea38dfe05--- /dev/null+++ b/admin/app/views/spree/admin/orders/order_promotions/create.turbo_stream.erb@@ -0,0 +1,16 @@+<%= turbo_render_alerts %>+<%= turbo_close_dialog %>++<% if @handler.successful? %>+ <%= turbo_stream.replace 'order_promotions' do %>+ <%= render 'spree/admin/orders/promotions' %>+ <% end %>++ <%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+ <% end %>++ <%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+ <% end %>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/order_promotions/destroy.turbo_stream.erb b/admin/app/views/spree/admin/orders/order_promotions/destroy.turbo_stream.erbnew file mode 100644index 0000000000..30b68572a3--- /dev/null+++ b/admin/app/views/spree/admin/orders/order_promotions/destroy.turbo_stream.erb@@ -0,0 +1,15 @@+<%= turbo_render_alerts %>++<% if @handler.successful? %>+ <%= turbo_stream.replace 'order_promotions' do %>+ <%= render 'spree/admin/orders/promotions' %>+ <% end %>++ <%= turbo_stream.replace 'order_adjustments' do %>+ <%= render 'spree/admin/orders/adjustments' %>+ <% end %>++ <%= turbo_stream.replace 'order_tab_summary' do %>+ <%= render 'spree/admin/orders/summary' %>+ <% end %>+<% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/order_promotions/new.html.erb b/admin/app/views/spree/admin/orders/order_promotions/new.html.erbnew file mode 100644index 0000000000..15781b37b0--- /dev/null+++ b/admin/app/views/spree/admin/orders/order_promotions/new.html.erb@@ -0,0 +1,15 @@+<%= turbo_frame_tag :dialog do %>+ <div>+ <%= dialog_header(Spree.t(:add_coupon_code)) %>+ <%= form_with url: spree.admin_order_order_promotions_path(@order) do |f| %>+ <div class="dialog-body">+ <%= f.spree_text_field :coupon_code,+ placeholder: Spree.t(:enter_coupon_code),+ autofocus: true %>+ </div>+ <div class="dialog-footer">+ <%= turbo_save_button_tag Spree.t(:apply) %>+ </div>+ <% end %>+ </div>+<% end %>diff --git a/admin/app/views/spree/admin/orders/edit.html.erb b/admin/app/views/spree/admin/orders/show.html.erbsimilarity index 80%rename from admin/app/views/spree/admin/orders/edit.html.erbrename to admin/app/views/spree/admin/orders/show.html.erbindex 36e496bfab..ae38edbf30 100644--- a/admin/app/views/spree/admin/orders/edit.html.erb+++ b/admin/app/views/spree/admin/orders/show.html.erb@@ -5,10 +5,13 @@<div class="col-span-12 lg:col-span-8"><%= render 'line_items' %><%= render 'shipments' %>+ <%= render 'promotions' %>+ <%= render 'adjustments' %>+ <%= render 'taxes' %>+ <%= render 'payments' %>+ <%= render 'refunds' %><%= render 'customer_returns' %><%= render 'return_authorizations' %>- <%= render 'payments'%>- <%= render 'refunds'%><%= render_admin_partials(:order_page_body_partials, order: @order) %><%= render 'summary' %></div>diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex d098050896..1ed50a8bb6 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -1,4 +1,4 @@-<div class="card" id="<%= dom_id(payment) %>">+<div class="card rounded-lg" id="<%= dom_id(payment) %>"><div class="card-header flex items-center gap-2"><span class="badge badge-<%= payment.state %> gap-1"><% if payment.completed? %>diff --git a/admin/app/views/spree/admin/products/form/_inventory.html.erb b/admin/app/views/spree/admin/products/form/_inventory.html.erbindex 9809ec4e1b..1977ac41f9 100644--- a/admin/app/views/spree/admin/products/form/_inventory.html.erb+++ b/admin/app/views/spree/admin/products/form/_inventory.html.erb@@ -21,7 +21,7 @@class="master-variant-quantity-form <%= @product.has_variants? || [email protected]_inventory ? 'hidden' : '' %>"data-product-form-target="<%= @product.has_variants? ? '' : 'quantityForm' %>">- <h6 class="font-bold"><%= Spree.t(:quantity) %></h6>+ <h6 class="font-semibold"><%= Spree.t(:quantity) %></h6><hr class="my-6"><div><%= f.fields_for :master, @product.master do |vf| %>diff --git a/admin/app/views/spree/admin/tables/_table.html.erb b/admin/app/views/spree/admin/tables/_table.html.erbindex 0cac97d7b7..fd4cdd21f9 100644--- a/admin/app/views/spree/admin/tables/_table.html.erb+++ b/admin/app/views/spree/admin/tables/_table.html.erb@@ -12,7 +12,7 @@<%= turbo_frame_tag frame_name, autoscroll: true, data: { autoscroll_block: :start, turbo_action: 'advance' } do %><div class="<%= local_assigns[:container_class] || 'card-lg' %>" data-controller="table" data-table-url-value="<%= request.path %>">- <div class="p-2 border-b border-gray-200">+ <div class="p-3 border-b border-gray-200"><div class="flex flex-col lg:flex-row gap-3 items-start lg:items-center justify-between"><div class="flex gap-2 items-center flex-wrap"><%= search_form_for @search, url: url_for, html: { data: { turbo_frame: frame_name, turbo_action: 'advance' } } do |f| %>diff --git a/admin/app/views/spree/admin/tables/columns/_product_status.html.erb b/admin/app/views/spree/admin/tables/columns/_product_status.html.erbindex ab73fd56c4..721b2cdc7c 100644--- a/admin/app/views/spree/admin/tables/columns/_product_status.html.erb+++ b/admin/app/views/spree/admin/tables/columns/_product_status.html.erb@@ -1,6 +1,4 @@<%# locals: (record:, column:, value:) %><% product = record %>-<div class="text-center">- <%= product_status(product) %>- <%= help_bubble(Spree.t("admin.products.help_bubble")) %>-</div>+<%= product_status(product) %>+<%= help_bubble(Spree.t("admin.products.help_bubble")) %>diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rbindex 18685d9a71..b643eeb02c 100644--- a/admin/config/initializers/spree_admin_tables.rb+++ b/admin/config/initializers/spree_admin_tables.rb@@ -1384,7 +1384,7 @@ Rails.application.config.after_initialize domethod: ->(delivery) { delivery.response_code || '-' }Spree.admin.tables.webhook_deliveries.add :actions,- label: :actions,+ label: :details,type: :custom,sortable: false,filterable: false,diff --git a/admin/config/routes.rb b/admin/config/routes.rbindex 1e278eaaa4..f2c611bc0f 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -73,7 +73,7 @@ Spree::Core::Engine.add_routes do# ordersresources :checkouts, only: %i[index]- resources :orders, only: [:index, :edit, :new, :create, :destroy] do+ resources :orders domember dopost :resendput :cancel@@ -109,6 +109,12 @@ Spree::Core::Engine.add_routes dopost :performendend+ resources :adjustments, except: [:index, :show], controller: 'orders/adjustments' do+ member do+ put :toggle_state+ end+ end+ resources :order_promotions, only: [:new, :create, :destroy], controller: 'orders/order_promotions'end# customersdiff --git a/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rbnew file mode 100644index 0000000000..e4c6aec6e5--- /dev/null+++ b/admin/spec/controllers/spree/admin/orders/adjustments_controller_spec.rb@@ -0,0 +1,218 @@+require 'spec_helper'++RSpec.describe Spree::Admin::Orders::AdjustmentsController do+ stub_authorization!+ render_views++ let(:store) { @default_store }+ let(:order) { create(:order_with_line_items, store: store) }++ describe '#new' do+ subject { get :new, params: { order_id: order.number } }++ it 'returns a success response' do+ subject+ expect(response).to be_successful+ expect(response).to render_template(:new)+ end+ end++ describe '#create' do+ let(:adjustment_params) { { label: 'Test Adjustment', amount: -10.00 } }++ context 'with HTML format' do+ subject { post :create, params: { order_id: order.number, adjustment: adjustment_params } }++ it 'creates a new adjustment on order' do+ expect { subject }.to change { order.adjustments.reload.count }.by(1)+ end++ it 'redirects to order edit page' do+ subject+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(flash[:success]).to be_present+ end++ it 'sets the adjustment as closed' do+ subject+ order.reload+ adjustment = order.adjustments.find_by(label: 'Test Adjustment')+ expect(adjustment.state).to eq('closed')+ end++ context 'with positive amount' do+ let(:adjustment_params) { { label: 'Surcharge', amount: 5.00 } }++ it 'creates a charge adjustment' do+ subject+ order.reload+ adjustment = order.adjustments.find_by(label: 'Surcharge')+ expect(adjustment.amount).to eq(5.00)+ end+ end++ context 'with missing label' do+ let(:adjustment_params) { { amount: -10.00 } }++ it 'uses default manual adjustment label' do+ subject+ order.reload+ adjustment = order.adjustments.find_by(amount: -10.00)+ expect(adjustment.label).to eq(Spree.t(:manual_adjustment))+ end+ end++ context 'with invalid params' do+ let(:adjustment_params) { { label: 'Test', amount: nil } }++ it 'renders new template with error' do+ subject+ expect(response).to have_http_status(:unprocessable_content)+ expect(response).to render_template(:new)+ end+ end+ end++ context 'with turbo_stream format' do+ subject { post :create, params: { order_id: order.number, adjustment: adjustment_params }, format: :turbo_stream }++ it 'creates a new adjustment on order' do+ expect { subject }.to change { order.adjustments.reload.count }.by(1)+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end+ end+ end++ describe '#edit' do+ subject { get :edit, params: { order_id: order.number, id: adjustment.id } }++ let(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5) }++ it 'returns a success response' do+ subject+ expect(response).to be_successful+ expect(response).to render_template(:edit)+ end+ end++ describe '#update' do+ let(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5, state: 'open') }+ let(:update_params) { { label: 'Updated Label', amount: -15.00 } }++ context 'with HTML format' do+ subject { put :update, params: { order_id: order.number, id: adjustment.id, adjustment: update_params } }++ it 'updates the adjustment' do+ subject+ adjustment.reload+ expect(adjustment.label).to eq('Updated Label')+ expect(adjustment.amount).to eq(-15.00)+ end++ it 'closes the adjustment after update' do+ subject+ adjustment.reload+ expect(adjustment.state).to eq('closed')+ end++ it 'redirects to order edit page' do+ subject+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ end++ it 'updates order totals' do+ subject+ order.reload+ expect(order.all_adjustments.find(adjustment.id).amount).to eq(-15.00)+ end+ end++ context 'with turbo_stream format' do+ subject { put :update, params: { order_id: order.number, id: adjustment.id, adjustment: update_params }, format: :turbo_stream }++ it 'updates the adjustment' do+ subject+ adjustment.reload+ expect(adjustment.label).to eq('Updated Label')+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end+ end+ end++ describe '#destroy' do+ let!(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5) }++ context 'with HTML format' do+ subject { delete :destroy, params: { order_id: order.number, id: adjustment.id } }++ it 'destroys the adjustment' do+ expect { subject }.to change { Spree::Adjustment.count }.by(-1)+ end++ it 'redirects to order edit page' do+ subject+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ end++ it 'removes the adjustment from order' do+ subject+ expect(Spree::Adjustment.where(id: adjustment.id)).to be_empty+ end+ end++ context 'with turbo_stream format' do+ subject { delete :destroy, params: { order_id: order.number, id: adjustment.id }, format: :turbo_stream }++ it 'destroys the adjustment' do+ expect { subject }.to change { Spree::Adjustment.count }.by(-1)+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end+ end+ end++ describe '#toggle_state' do+ context 'when adjustment is open' do+ let(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5, state: 'open') }++ it 'closes the adjustment' do+ put :toggle_state, params: { order_id: order.number, id: adjustment.id }+ adjustment.reload+ expect(adjustment.state).to eq('closed')+ end+ end++ context 'when adjustment is closed' do+ let(:adjustment) { create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5, state: 'closed') }++ it 'opens the adjustment' do+ put :toggle_state, params: { order_id: order.number, id: adjustment.id }+ adjustment.reload+ expect(adjustment.state).to eq('open')+ end+ end++ it 'redirects to order edit page with HTML format' do+ adjustment = create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5)+ put :toggle_state, params: { order_id: order.number, id: adjustment.id }+ expect(response).to redirect_to(spree.edit_admin_order_path(order))+ end++ it 'responds with turbo_stream format' do+ adjustment = create(:adjustment, adjustable: order, order: order, label: 'Manual', amount: -5)+ put :toggle_state, params: { order_id: order.number, id: adjustment.id }, format: :turbo_stream+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/orders/order_promotions_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/order_promotions_controller_spec.rbnew file mode 100644index 0000000000..2d426454dc--- /dev/null+++ b/admin/spec/controllers/spree/admin/orders/order_promotions_controller_spec.rb@@ -0,0 +1,111 @@+require 'spec_helper'++RSpec.describe Spree::Admin::Orders::OrderPromotionsController do+ stub_authorization!+ render_views++ let(:store) { @default_store }+ let(:order) { create(:order_with_line_items, store: store) }++ describe '#new' do+ subject { get :new, params: { order_id: order.number } }++ it 'returns a success response' do+ subject+ expect(response).to be_successful+ expect(response).to render_template(:new)+ end+ end++ describe '#create' do+ subject { post :create, params: { order_id: order.number, coupon_code: coupon_code }, format: :turbo_stream }++ context 'with valid coupon code' do+ let(:promotion) { create(:promotion, :with_order_adjustment, code: 'TESTCODE', stores: [store]) }+ let(:coupon_code) { promotion.code }++ it 'applies the promotion' do+ expect { subject }.to change { order.order_promotions.count }.by(1)+ end++ it 'sets success flash message' do+ subject+ expect(flash[:success]).to be_present+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end++ it 'sets @handler instance variable' do+ subject+ expect(assigns(:handler)).to be_a(Spree::PromotionHandler::Coupon)+ expect(assigns(:handler)).to be_successful+ end+ end++ context 'with invalid coupon code' do+ let(:coupon_code) { 'INVALID' }++ it 'does not create order promotion' do+ expect { subject }.not_to change { order.order_promotions.count }+ end++ it 'sets error flash message' do+ subject+ expect(flash[:error]).to be_present+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end+ end++ context 'with expired promotion' do+ let(:promotion) { create(:promotion, :with_order_adjustment, code: 'EXPIRED', stores: [store], starts_at: 3.days.ago, expires_at: 1.day.ago) }+ let(:coupon_code) { promotion.code }++ it 'sets error flash message' do+ subject+ expect(flash[:error]).to be_present+ end+ end+ end++ describe '#destroy' do+ subject { delete :destroy, params: { order_id: order.number, id: order_promotion.id }, format: :turbo_stream }++ context 'with valid applied promotion' do+ let(:promotion) { create(:promotion, :with_order_adjustment, code: 'REMOVE', stores: [store]) }+ let(:order_promotion) { order.order_promotions.find_by(promotion: promotion) }++ before do+ order.coupon_code = promotion.code+ Spree::PromotionHandler::Coupon.new(order).apply+ order.reload+ end++ it 'removes the promotion' do+ expect { subject }.to change { order.order_promotions.count }.by(-1)+ end++ it 'sets success flash message' do+ subject+ expect(flash[:success]).to be_present+ end++ it 'responds with turbo_stream' do+ subject+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')+ end++ it 'sets @handler instance variable' do+ subject+ expect(assigns(:handler)).to be_a(Spree::PromotionHandler::Coupon)+ expect(assigns(:handler)).to be_successful+ end+ end+ end+enddiff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex 06562e0b58..23ae28066e 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -213,6 +213,15 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller dodescribe '#edit' dosubject { get :edit, params: { id: order.number } }+ let(:order) { create(:order_ready_to_ship, total: 100, with_payment: false, store: store) }+ it 'redirects to the show page' do+ subject+ expect(response).to redirect_to(spree.admin_order_path(order))+ end+ end++ describe '#show' do+ subject { get :show, params: { id: order.number } }let(:order) { create(:order_ready_to_ship, total: 100, with_payment: false, store: store) }@@ -241,7 +250,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doit 'shows an order' dosubject- expect(response).to render_template(:edit)+ expect(response).to render_template(:show)expect(assigns[:payments]).to contain_exactly(payment)endend