spree_admin 5.0.0.rc1

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

data/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb

@@ -0,0 +1,70 @@
+<% edit_link =
+  if can?(:edit, customer_return)
+    spree.edit_admin_order_customer_return_path(@order, customer_return)
+  else
+    "#"
+  end %>
+
+<% can_create_reimbursement =
+  customer_return.can_create_reimbursement? &&
+    can?(:create, Spree::Reimbursement) %>
+
+  <tr
+    id="<%= spree_dom_id(customer_return) %>"
+    data-controller="row-link"
+    class="cursor-pointer"
+  >
+    <td data-action="click->row-link#openLink" class="font-weight-bolder">
+      <%= link_to customer_return.number, edit_link %>
+    </td>
+    <td data-action="click->row-link#openLink">
+      <% 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 %>
+    </td>
+    <td data-action="click->row-link#openLink"><%= customer_return.display_pre_tax_total.to_html %></td>
+    <td data-action="click->row-link#openLink"><%= local_time(customer_return.created_at) %></td>
+    <td class="text-right">
+      <% if can_create_reimbursement %>
+        <span class="dropdown">
+          <button
+            class="btn btn-light btn-sm"
+            type="button"
+            data-toggle="dropdown"
+            aria-expanded="false"
+          >
+            <%= icon("dots", class: "mr-0") %>
+          </button>
+          <div class="dropdown-menu">
+            <%= link_to_edit(
+              customer_return,
+              data: {
+                row_link_target: :link,
+              },
+              class: "dropdown-item",
+              url: edit_link,
+            ) %>
+            <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
+              <%= hidden_field_tag :build_from_customer_return_id, customer_return.id %>
+              <%= f.button class: 'dropdown-item' do %>
+                <%= icon "plus" %>
+                <%= Spree.t(:create_reimbursement) %>
+              <% end %>
+            <% end %>
+          </div>
+        </span>
+      <% else %>
+        <%= link_to_edit(
+          customer_return,
+          no_text: true,
+          data: {
+            row_link_target: :link,
+          },
+          class: "btn btn-light btn-sm",
+          url: edit_link,
+        ) %>
+      <% end %>
+    </td>
+  </tr>

data/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb

@@ -0,0 +1,40 @@
+<table class="table table-condensed">
+  <thead>
+    <tr>
+      <th><%= Spree.t(:number) %></th>
+      <th><%= Spree.t(:total) %></th>
+      <th><%= Spree.t(:status) %></th>
+      <th><%= Spree.t(:date) %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% reimbursements.each do |reimbursement| %>
+      <tr
+        id="<%= spree_dom_id(reimbursement) %>"
+        data-controller="row-link"
+        class="cursor-pointer"
+      >
+        <td data-action="click->row-link#openLink" class="font-weight-bolder">
+          <%= link_to reimbursement.number,
+          (
+            if reimbursement.reimbursed?
+              url_for([:admin, @order, reimbursement])
+            else
+              url_for([:edit, :admin, @order, reimbursement])
+            end
+          ),
+          data: {
+            row_link_target: "link",
+          } %>
+        </td>
+        <td data-action="click->row-link#openLink"><%= reimbursement.display_total %></td>
+        <td data-action="click->row-link#openLink">
+          <span class="badge badge-<%= reimbursement_status_color(reimbursement) %>">
+            <%= reimbursement.reimbursement_status %>
+          </span>
+        </td>
+        <td data-action="click->row-link#openLink"><%= local_time(reimbursement.created_at) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erb

@@ -0,0 +1,54 @@
+<table class="show return-items-table table table-condensed index">
+  <thead class="text-muted">
+    <tr>
+      <th><%= Spree.t(:product) %></th>
+      <th><%= Spree.t(:pre_tax_amount) %></th>
+      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
+      <th><%= Spree.t(:exchange_for) %></th>
+      <th><%= Spree.t(:acceptance_errors) %></th>
+      <% if show_decision %>
+        <th></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% return_items.each do |return_item| %>
+      <tr>
+        <td>
+          <%= if return_item.inventory_unit
+            render "spree/admin/variants/variant",
+            variant: return_item.inventory_unit.variant
+          end %>
+        </td>
+        <td>
+          <%= return_item.display_pre_tax_amount %>
+        </td>
+        <td>
+          <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
+        </td>
+        <td>
+          <%= return_item.exchange_variant.try(:exchange_name) %>
+        </td>
+        <td>
+          <%= if return_item.acceptance_status_errors.present?
+            return_item.acceptance_status_errors
+          end %>
+        </td>
+        <% if show_decision %>
+          <td class='actions d-flex gap-2'>
+            <% if can?(:accept, return_item) %>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-primary btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, title: Spree.t(:accept), method: 'put' } do %>
+                <%= Spree.t(:accept) %>
+              <% end %>
+            <% end %>
+            <% if can?(:reject, return_item) %>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, title: Spree.t('actions.reject'), method: 'put' } do %>
+                <%= Spree.t("actions.reject") %>
+              <% end %>
+            <% end %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erb

@@ -0,0 +1,72 @@
+<div class="table-responsive bg-white rounded-lg">
+  <table class="table">
+    <thead class="border-bottom">
+      <tr>
+        <th>
+          <div class="custom-control custom-checkbox ml-1">
+            <input
+              type="checkbox"
+              class="custom-control-input"
+              id="checkAllMasterCheckbox"
+              data-checkbox-select-all-target="checkboxAll"
+            >
+            <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
+          </div>
+        </th>
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:pre_tax_amount) %></th>
+        <th><%= Spree.t(:exchange_for) %></th>
+        <th><%= Spree.t(:resellable) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= f.fields_for :return_items, return_items do |item_fields| %>
+        <% return_item = item_fields.object %>
+        <tr>
+          <td class="align-center">
+            <div class="custom-control custom-checkbox ml-1">
+              <%= item_fields.hidden_field :inventory_unit_id %>
+              <%= item_fields.hidden_field :return_authorization_id %>
+              <%= item_fields.hidden_field :pre_tax_amount %>
+
+              <%= item_fields.check_box :returned,
+                                    {
+                                      checked: false,
+                                      class: "add-item custom-control-input",
+                                      data: {
+                                        checkbox_select_all_target: "checkbox",
+                                        price: return_item.pre_tax_amount,
+                                      },
+                                    },
+                                    "1",
+                                    "0" %>
+              <%= item_fields.label :returned, class: "custom-control-label" do %>
+                <span></span>
+              <% end %>
+            </div>
+          </td>
+          <td>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name,
+              spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
+            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+          </td>
+          <td>
+            <%= return_item.inventory_unit.variant.sku %>
+          </td>
+          <td class="align-center">
+            <%= return_item.display_pre_tax_amount %>
+          </td>
+          <td class="align-center">
+            <%= return_item.exchange_variant.try(:exchange_name) %>
+          </td>
+          <td class="align-center">
+            <%= item_fields.check_box :resellable, { checked: return_item.resellable } %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/spree/admin/orders/customer_returns/edit.html.erb

@@ -0,0 +1,144 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.edit_admin_order_path(@order) %>
+  <div class="d-flex gap-3 align-items-center">
+    <%= @customer_return.number %>
+
+    <% 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 %>
+  </div>
+<% end %>
+
+<ul class="list-group bg-white mb-4">
+  <% if @customer_return.order %>
+    <li class="list-group-item d-flex justify-content-between align-items-center">
+      <%= Spree.t(:customer) %>
+      <div>
+        <%= render "spree/admin/orders/customer_summary", order: @customer_return.order %>
+      </div>
+    </li>
+    <li class="list-group-item d-flex justify-content-between align-items-center">
+      <%= Spree.t(:order) %>
+      <strong><%= link_to @customer_return.order.number,
+        spree.edit_admin_order_path(@customer_return.order) %></strong>
+    </li>
+  <% end %>
+  <li class="list-group-item d-flex justify-content-between align-items-center">
+    <%= Spree.t(:reimbursement_status) %>
+    <% 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 %>
+  </li>
+  <li class="list-group-item d-flex justify-content-between align-items-center">
+    <%= Spree.t(:pre_tax_total) %>
+    <span><%= @customer_return.display_pre_tax_total.to_html %></span>
+  </li>
+</ul>
+<% if @manual_intervention_return_items.any? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5><%= Spree.t(:manual_intervention_required) %></h5>
+    </div>
+    <div class="card-body p-0">
+      <%= render partial: "return_item_decision",
+      locals: {
+        return_items: @manual_intervention_return_items,
+        show_decision: true,
+      } %>
+    </div>
+  </div>
+<% end %>
+
+<% if @pending_return_items.any? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5><%= Spree.t(:pending) %></h5>
+    </div>
+    <div class="card-body p-0">
+      <%= render partial: "return_item_decision",
+      locals: {
+        return_items: @pending_return_items,
+        show_decision: true,
+      } %>
+    </div>
+  </div>
+<% end %>
+
+<% if @accepted_return_items.any? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5><%= Spree.t(:accepted) %></h5>
+    </div>
+    <div class="card-body p-0">
+      <%= render partial: "return_item_decision",
+      locals: {
+        return_items: @accepted_return_items,
+        show_decision: false,
+      } %>
+    </div>
+  </div>
+<% end %>
+
+<% if @rejected_return_items.any? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5><%= Spree.t(:rejected) %></h5>
+    </div>
+    <div class="card-body p-0">
+      <%= render partial: "return_item_decision",
+      locals: {
+        return_items: @rejected_return_items,
+        show_decision: false,
+      } %>
+    </div>
+  </div>
+<% end %>
+
+<div class="card mb-4">
+  <div class="card-header">
+    <h5><%= plural_resource_name(Spree::Reimbursement) %></h5>
+  </div>
+  <div class="card-body p-0">
+
+    <% if @customer_return.reimbursements.any? %>
+      <%= render partial: "reimbursements_table",
+      locals: {
+        reimbursements: @customer_return.reimbursements,
+      } %>
+    <% 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::Reimbursement),
+        ) %>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<% if @customer_return.can_create_reimbursement? && can?(:create, Spree::Reimbursement) %>
+  <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
+    <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
+    <%= f.button class: 'btn btn-primary' do %>
+      <%= icon "plus" %>
+      <%= Spree.t(:create_reimbursement) %>
+    <% end %>
+  <% end %>
+<% end %>
+<% if !@customer_return.fully_reimbursed? && @customer_return.no_pending_reimbursements? && !@customer_return.completely_decided? %>
+  <div
+    class="
+      text-muted p-5 d-flex align-items-center w-100 justify-content-center
+    "
+  >
+    <%= Spree.t(:unable_to_create_reimbursements) %>
+  </div>
+<% end %>

data/app/views/spree/admin/orders/customer_returns/new.html.erb

@@ -0,0 +1,67 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.edit_admin_order_path(@order) %>
+  <%= Spree.t(:new_customer_return) %>
+<% end %>
+
+<% if @rma_return_items.any? %>
+
+  <%= render partial: "spree/admin/shared/error_messages",
+  locals: {
+    target: @customer_return,
+  } %>
+
+  <%= form_for [:admin, @order, @customer_return] do |f| %>
+    <div class="card mb-4" data-controller="checkbox-select-all">
+      <div class="card-header">
+        <h6 class="card-title"><%= Spree.t(:items_in_rmas) %></h6>
+      </div>
+      <div class="card-body p-0">
+        <% if @rma_return_items.any? %>
+          <%= render partial: "return_item_selection",
+          locals: {
+            f: f,
+            return_items: @rma_return_items,
+          } %>
+        <% else %>
+          <div
+            class="
+              text-muted p-5 d-flex align-items-center w-100 justify-content-center
+            "
+          >
+            <%= Spree.t(:none) %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="card mb-4">
+      <div class="card-body">
+        <div class="form-group">
+          <%= f.label :stock_location, raw(Spree.t(:stock_location) + required_span_tag) %>
+          <%= f.select :stock_location_id,
+                   available_stock_locations_list,
+                   { include_blank: Spree.t(:select_a_stock_location) },
+                   class: "custom-select" %>
+          <%= f.error_message_on :stock_location %>
+        </div>
+      </div>
+    </div>
+
+    <%= render "spree/admin/shared/new_resource_links" %>
+  <% end %>
+
+<% else %>
+  <div class="card">
+    <div
+      class="
+        card-body text-muted d-flex align-items-center justify-content-center
+        flex-column gap-2
+      "
+    >
+      <%= Spree.t(:all_items_have_been_returned) %>,
+      <%= link_to "#{Spree.t(:get_back_to_the)} #{Spree.t(:order)}",
+      spree.edit_admin_order_path(@order) %>
+    </div>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,23 @@
+<%= 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 'return_authorizations' %>
+      <%= render 'payments'%>
+      <%= render 'refunds'%>
+
+      <%= render 'body_custom' %>
+      <%= render 'summary' %>
+    </div>
+    <div class="col-lg-4">
+      <!-- TODO: add notes -->
+      <%= render 'customer' %>
+    </div>
+  </div>
+</div>

data/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", 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', frame_name: params[:frame_name] %>
+      <%= render 'spree/admin/orders/list' %>
+    <% end %>
+  <% else %>
+    <%= render 'spree/admin/orders/filters' %>
+    <%= render 'spree/admin/orders/list' %>
+  <% end %>
+</div>