spree_admin 5.0.0.rc1

data/app/views/spree/admin/orders/_payments.html.erb

@@ -0,0 +1,35 @@
+<% if can?(:read, Spree::Payment) && (@order.payment_required? && @order.bill_address.present?) || @payments.any? %>
+  <div class="card mb-4 bg-transparent">
+    <div class="card-header d-flex align-items-center border-0">
+      <h6 class="card-title">
+        <%= icon('credit-card-pay', class: 'mr-2') %>
+        <%= Spree.t(:payments) %>
+      </h6>
+      <% if @payments.any? %>
+        <span class="badge badge-info ml-2"><%= @payments.count %></span>
+        <%= order_payment_state(@order, class: "ml-auto") %>
+      <% end %>
+    </div>
+    <div class="card-body d-flex flex-column gap-2 px-1 pt-0 pb-1">
+      <%= render collection: @payments, partial: 'spree/admin/payments/payment', as: :payment %>
+
+      <% if @order.payment_total < @order.total && can?(:create, Spree::Payment.new(order: @order)) %>
+        <div class="d-flex justify-content-center w-100 gap-3 p-3">
+          <%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
+
+          <% 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 with-tip', title: Spree.t(:send_payment_link_title) %>
+
+            <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') %>
+                <%= Spree.t('admin.copy_payment_link') %>
+              </button>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/_refunds.html.erb

@@ -0,0 +1,49 @@
+<% if @refunds.any? %>
+  <div class="card mb-4">
+    <div class="card-header d-flex align-items-center">
+      <h6 class="card-title">
+        <%= icon('credit-card-refund', class: 'mr-2') %>
+        <%= Spree.t(:refunds) %>
+      </h6>
+      <span class="badge badge-info ml-2"><%= @refunds.count %></span>
+    </div>
+    <div class="card-body p-0">
+      <div class="table-responsive">
+        <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
+          <thead class="text-muted">
+            <tr data-hook="refunds_header" class="border-bottom">
+              <th><%= Spree.t(:amount) %></th>
+              <th><%= Spree.t(:status) %></th>
+              <th><%= Spree.t(:reason) %></th>
+              <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @refunds.each do |refund| %>
+              <tr id="<%= spree_dom_id(refund) %>">
+                <td class="amount"><%= refund.display_amount %></td>
+                <td>
+                  <% if refund.transaction_id.present? %>
+                    <span class="badge badge-success"><%= icon('check') %><%= Spree.t('state_machine_states.completed') %></span>
+                  <% else %>
+                    <span class="badge badge-warning"><%= icon('clock') %><%= Spree.t('state_machine_states.pending') %></span>
+                  <% end %>
+                </td>
+                <td><%= truncate(refund.reason.name, length: 100) %></td>
+                <td><%= local_time(refund.created_at) %></td>
+                <% if refund.editable? && can?(:edit, refund) %>
+                  <td class="actions">
+                    <span data-toggle="modal" data-target="#modal">
+                      <%= link_to_with_icon('edit', Spree.t(:edit), spree.edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, data: { turbo_frame: 'dialog_modal' }, class: "btn btn-light btn-sm") if can?(:edit, refund) %>
+                    </span>
+                  </td>
+                <% end %>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/_return_authorizations.html.erb

@@ -0,0 +1,26 @@
+<% if @return_authorizations.exists? && can?(:read, Spree::ReturnAuthorization) %>
+  <div class="card mb-4">
+    <div class="card-header justify-content-between">
+      <h5 class="card-title">
+        <%= Spree.t(:return_authorizations) %></h5>
+    </div>
+    <div class="card-body p-0">
+      <div class="table-responsive">
+        <table class="table">
+          <thead class="border-bottom">
+            <tr>
+              <th><%= Spree.t(:rma_number) %></th>
+              <th><%= Spree.t(:status) %></th>
+              <th><%= Spree.t(:pre_tax_total) %></th>
+              <th><%= "#{Spree.t("date")}/#{Spree.t("time")}" %></th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= render partial: 'spree/admin/orders/return_authorizations/return_authorization', collection: @return_authorizations, cached: spree_base_cache_scope %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/_risk_analysis.html.erb

@@ -0,0 +1,26 @@
+<ul class="list-group mt-3 collapse" id="risk-analysis-<%= payment.id %>">
+  <li class="list-group-item d-flex justify-content-between align-items-center">
+    <%= Spree.t(:avs_response) %>
+    <span class="badge badge-<%= payment.is_avs_risky? ? 'warning' : 'complete' %>">
+      <% if payment.is_avs_risky? %>
+        <%= icon('exclamation-circle') %>
+        <%= "#{Spree.t(:error)}: #{avs_response_code[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-<%= payment.is_cvv_risky? ? 'warning' : 'complete' %>">
+      <% if payment.is_cvv_risky? %>
+        <%= icon('exclamation-circle') %>
+        <%= "#{Spree.t(:error)}: #{cvv_response_code[payment.cvv_response_code]}" %>
+      <% else %>
+        <%= icon('check') %>
+        <%= Spree.t(:success) %>
+      <% end %>
+    </span>
+  </li>
+</ul>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -0,0 +1,104 @@
+<% order ||= shipment.order %>
+<%= turbo_frame_tag dom_id(shipment), class: "card" do %>
+  <div class="card-header align-items-center justify-content-between">
+    <div class="d-flex align-items-center gap-2">
+      <span class="d-flex align-items-center"><%= shipment_state(shipment.state) %></span>
+      <strong class="shipment-number"><%= shipment.number %></strong>
+      <% if shipment.shipped_at.present? %>
+        <small class="text-muted">
+          <%= local_time_ago(shipment.shipped_at, class: 'with-tip') %>
+        </small>
+      <% end %>
+    </div>
+
+    <span class="d-flex justify-content-between align-items-center gap-2">
+      <small class="text-muted"><%= Spree.t(:package_from).downcase %></small>
+      <strong>
+        <% 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 %>
+          <%= shipment.stock_location.name %>
+        <% end %>
+      </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-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: "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 %>
+
+    <% unless shipment.digital? %>
+      <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-top px-3 d-flex justify-content-between align-items-center min-h-14" do %>
+        <div class="py-3">
+          <strong><%= Spree.t(:tracking) %>: </strong>
+          <% if shipment.tracked? %>
+            <% 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 %>
+            <span class="text-muted"><%= Spree.t(:no_tracking_present) %></span>
+          <% end %>
+        </div>
+
+        <% if can?(:update, shipment) && (!order.canceled? && !shipment.canceled?) %>
+          <% if shipment.tracking.present? %>
+            <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm with-tip', no_text: true, title: Spree.t(:edit) %>
+          <% else %>
+            <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.edit_admin_order_shipment_path(order, shipment), class: 'btn btn-light btn-sm with-tip', no_text: true, title: Spree.t(:add_one) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% if can_ship?(shipment) %>
+      <div class="card-footer d-flex justify-content-end border-top bg-gray-25">
+        <% 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)} %>
+        <% elsif !shipment.digital? %>
+          <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' %>
+            <%= Spree.t(:ship) %>
+          </span>
+        <% else %>
+          <span class="text-muted w-100">
+            <%= Spree.t('admin.digital_shipment_fulfillment_note') %>
+          </span>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/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 %>

data/app/views/spree/admin/orders/_shipments.html.erb

@@ -0,0 +1,22 @@
+<div class="card mb-4 bg-transparent">
+  <div class="card-header d-flex align-items-center border-0">
+    <h6 class="card-title">
+      <%= icon('truck', class: 'mr-2') %>
+      <%= Spree.t(:shipments) %>
+    </h6>
+    <% if @shipments.any? %>
+      <span class="badge badge-info ml-2"><%= @shipments.count %></span>
+
+      <%= order_shipment_state(@order, class: "ml-auto") %>
+    <% end %>
+  </div>
+  <div class="card-body px-1 pt-0 pb-1 d-flex flex-column gap-2">
+    <% if @shipments.any? %>
+      <%= render partial: "shipment", collection: @shipments %>
+    <% else %>
+      <p class="text-center text-muted p-5">
+        <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Shipment)) %>
+      </p>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/orders/_summary.html.erb

@@ -0,0 +1,100 @@
+<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(:discount_amount) %></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 %>
+
+    <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>
+
+    <% 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>
+
+    <%= 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>
+
+    <li class="list-group-item d-flex justify-content-between align-items-center border-top bg-gray-25">
+      <span data-hook='admin_order_tab_payment_total_title'><%= Spree.t(:payment_total) %></span>
+      <span id='payment_total'>
+        <%= @order.display_payment_total.to_html %>
+      </span>
+    </li>
+
+    <li class="list-group-item d-flex justify-content-between align-items-center bg-gray-25">
+      <span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span>
+      <span id='outstanding_balance'>
+        <%= @order.display_outstanding_balance.to_html %>
+      </span>
+    </li>
+  </ul>
+</div>

data/app/views/spree/admin/orders/_table_filter_dropdown.html.erb

@@ -0,0 +1,34 @@
+<% if controller_name == 'orders' %>
+  <div class="dropdown h-100 mr-2">
+    <button class="btn btn-light h-100 dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+      <span class="text-muted font-weight-normal mr-1">
+        <%= Spree.t(:show) %>
+      </span>
+      <%= order_filter_dropdown_value %>
+    </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-light 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.canceled'),
+        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 %>

data/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>

data/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 %>

data/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: 'auto-submit#submit'} }  %>
+  </div>
+<% end %>

data/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: 'auto-submit', 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 %>

data/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: 'auto-submit', 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 %>

data/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: 'auto-submit', 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 %>

data/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: 'auto-submit', 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, !@order.shipping_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 %>