spree_admin 5.0.0.rc1

data/app/views/spree/admin/users/_billing.html.erb

@@ -0,0 +1,78 @@
+<div class="card" id="user-bill-address" data-controller="reveal">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title"><%= Spree.t(:billing_address) %></h5>
+
+    <% if @user.billing_address.present? %>
+      <button data-action="click->reveal#toggle" data-reveal-target="item" type="button" class="btn btn-light btn-sm">
+        <%= icon('edit', class: 'icon icon-edit') %>
+        <%= Spree.t(:edit) %>
+      </button>
+
+      <button data-action="click->reveal#toggle" data-reveal-target="item" type="button" class="btn btn-light btn-sm hidden">
+        <%= Spree.t('actions.discard') %>
+      </button>
+    <% else %>
+      <%= link_to_with_icon 'plus', Spree.t(:add),
+        spree.new_admin_address_path(user_id: @user.id, default_billing: true, type: 'billing'),
+        class: 'btn btn-light btn-sm',
+        data: { turbo_frame: :new_address_billing } if can?(:create, Spree::Address) && can?(:update, @user) %>
+    <% end %>
+  </div>
+  <div class="card-body">
+    <% if @user.billing_address %>
+      <div data-reveal-target="item">
+        <% if @user.billing_address == @user.shipping_address %>
+          <div class="text-muted">
+            <%= Spree.t(:same_as_shipping_address) %>
+          </div>
+        <% else %>
+          <%= render 'spree/admin/shared/address', address: @user.billing_address %>
+        <% end %>
+      </div>
+
+      <div data-reveal-target="item" class="hidden">
+        <% if @user.billing_address == @user.shipping_address %>
+          <%= turbo_frame_tag :new_address_billing do %>
+            <div class="custom-control custom-radio mb-1">
+              <%= radio_button_tag :bill_address_id, @user.ship_address_id, @user.billing_address == @user.shipping_address,
+                id: 'user_bill_address_id',
+                class: 'custom-control-input',
+                data: { action: 'click->reveal#toggle' } %>
+              <%= label_tag :user_bill_address_id, Spree.t(:use_shipping_address), class: 'custom-control-label' %>
+            </div>
+
+            <div class="custom-control custom-radio">
+              <%= link_to spree.new_admin_address_path(user_id: @user.id, default_billing: true, type: 'billing'), data: { turbo_frame: :new_address_billing } do %>
+                <%= radio_button_tag :user_bill_address_id, nil, false,
+                  id: 'user_bill_address_id_new_address',
+                  class: 'custom-control-input' %>
+                <%= label_tag :user_bill_address_id_new_address, Spree.t(:add_new_address), class: 'custom-control-label' %>
+              <% end %>
+            </div>
+          <% end %>
+        <% else %>
+          <%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put, data: { controller: 'auto-submit' } do |f| %>
+            <div class="custom-control custom-radio mb-4">
+              <%= f.radio_button :bill_address_id, @user.ship_address_id,
+                checked: false,
+                id: 'user_bill_address_id',
+                class: 'custom-control-input',
+                data: { action: 'click->auto-submit#submit' } %>
+              <%= f.label :bill_address_id, Spree.t(:use_shipping_address), class: 'custom-control-label' %>
+            </div>
+          <% end %>
+
+          <%= turbo_frame_tag :edit_address_billing, src: spree.edit_admin_address_path(@user.billing_address, type: 'billing'), loading: :lazy do %>
+            <%= render 'spree/admin/shared/spinner', id: 'edit-address-billing-spinner' %>
+          <% end %>
+        <% end %>
+      </div>
+    <% else %>
+      <%= turbo_frame_tag :new_address_billing do %>
+        <div class="text-center p-5 text-muted">
+          <%= Spree.t(:not_available) %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/users/_details.html.erb

@@ -0,0 +1,52 @@
+<div class="card mb-4" id="user-details">
+  <%= turbo_frame_tag :edit_user do %>
+    <div class="card-header d-flex align-items-center justify-content-between">
+      <h5 class="card-title">
+        <%= Spree.t(:details) %>
+      </h5>
+      <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_user_path(@user), class: 'btn btn-light btn-sm', data: { turbo_frame: :edit_user } %>
+    </div>
+    <div class="card-body p-0">    
+      <ul class="list-group list-group-flush">
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:email) %>
+          <span>
+            <%= @user.email %>
+          </span>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:phone) %>
+          <span>
+            <%= @user.phone.presence || Spree.t(:not_available) %>
+          </span>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:name) %>
+          <span>
+            <%= customer_full_name(@user) %>
+          </span>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:email_marketing) %>
+          <%= active_badge(@user.accepts_email_marketing?) %>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:tags) %>
+          <span>
+            <% @user.tag_list.each do |tag| %>
+              <span class="tag small"><%= tag %></span>
+            <% end %>
+          </span>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          <%= Spree.t(:roles) %>
+          <span>
+            <% @user.spree_roles.each do |role| %>
+              <span class="tag small"><%= role.name %></span>
+            <% end %>
+          </span>
+        </li>
+      </ul>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/users/_filters.html.erb

@@ -0,0 +1,85 @@
+<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+  <div class="d-flex flex-column flex-lg-row gap-2">
+    <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
+
+    <%= render 'spree/admin/shared/filters_button' %>
+  </div>
+  <div data-reveal-target="item" class="d-none" id="table-filter">
+    <div class="row">
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
+          <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
+        </div>
+      </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :bill_address_lastname_eq, Spree.t(:last_name) %>
+          <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>
+        </div>
+      </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
+          <%= tom_select_tag "q[addresses_country_name_eq]",
+          active_option: params[:q][:addresses_country_name_eq],
+          options: Spree::Country.all.to_tom_select_json,
+          value_field: :name,
+          select_class: "w-100",
+          select_data: {
+            filters_target: "input",
+          } %>
+        </div>
+      </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :tags_name_in, Spree.t(:tags) %>
+          <%= tom_select_tag "q[tags_name_in]",
+          active_option: params[:q][:tags_name_in],
+          options: user_tags_json_array,
+          multiple: true,
+          value_field: :name,
+          select_class: "w-100",
+          select_data: {
+            filters_target: "input",
+          } %>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-lg-3">
+        <div class="form-group">
+          <%= f.label :accepts_email_marketing_eq, "Accepts email marketing" %>
+          <%= f.select :accepts_email_marketing_eq,
+                   options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),
+                   { include_blank: true },
+                   { class: "custom-select", data: { filters_target: :input } } %>
+        </div>
+      </div>
+      <div class="col-lg-3">
+        <div class="form-group">
+          <%= f.label :spree_roles_name_in, Spree.t(:roles) %>
+          <%= tom_select_tag "q[spree_roles_name_in]",
+          active_option: params.dig(:q, :spree_roles_name_in),
+          options: user_roles_json_array,
+          multiple: true,
+          value_field: :name,
+          select_class: "w-100",
+          select_data: {
+            filters_target: "input",
+          } %>
+        </div>  
+      </div>
+    </div>
+    <div class="form-actions">
+      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+        <%= icon("search") %>
+        <%= Spree.t(:filter_results) %>
+      <% end %>
+    </div>
+  </div>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

data/app/views/spree/admin/users/_form.html.erb

@@ -0,0 +1,36 @@
+<div class="form-group">
+  <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>
+  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record?, required: true %>
+  <%= f.error_message_on :email %>
+</div>
+<div class="form-group">
+  <%= f.label :first_name, raw(Spree.t(:first_name) + required_span_tag) %>
+  <%= f.text_field :first_name, class: 'form-control', required: true %>
+  <%= f.error_message_on :first_name %>
+</div>
+<div class="form-group">
+  <%= f.label :last_name, raw(Spree.t(:last_name) + required_span_tag) %>
+  <%= f.text_field :last_name, class: 'form-control', required: true %>
+  <%= f.error_message_on :last_name %>
+</div>
+<div class="form-group">
+  <%= f.label :phone, Spree.t(:phone) %>
+  <%= f.text_field :phone, class: 'form-control' %>
+  <%= f.error_message_on :phone %>
+</div>
+<div class="form-group">
+  <%= f.label :tag_list, Spree.t(:tags) %>
+  <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>
+</div>
+<div class="form-group">
+  <%= f.label :spree_role_ids, Spree.t(:roles) %>
+  <%= f.select :spree_role_ids,
+          options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
+          { prompt: false },
+          { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
+</div>
+<div class="custom-control custom-checkbox mb-3">
+  <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>
+  <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>
+  <%= f.error_message_on :accepts_email_marketing %>
+</div>

data/app/views/spree/admin/users/_last_order.html.erb

@@ -0,0 +1,33 @@
+<% if @last_order.present? %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title">
+        <%= Spree.t('admin.user.last_order_placed') %>
+      </h5>
+    </div>
+    <div class="card-body p-0">
+      <% cache spree_base_cache_scope.call(@last_order) do %>
+        <ul class="list-group list-group-flush">
+          <li class="list-group-item">
+            <div class="row">
+              <div class="col-lg-9">
+                <p class="mb-1">
+                  <%= link_to @last_order.number, spree.edit_admin_order_path(@last_order), class: 'font-weight-bold' %>
+                  <%= order_payment_state(@last_order, class: 'ml-2') %>
+                  <%= order_shipment_state(@last_order, class: 'ml-2') %>
+                </p>
+                <span class="text-muted">
+                  <%= local_time_ago(@last_order.completed_at, class: 'with-tip') %>
+                </span>
+              </div>
+              <div class="col-lg-3 text-lg-right font-weight-bold">
+                <%= @last_order.display_total %>
+              </div>
+            </div>
+          </li>
+          <%= render collection: @last_order_line_items, partial: 'spree/admin/users/last_order_line_item', as: :line_item, cached: spree_base_cache_scope %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/users/_last_order_line_item.html.erb

@@ -0,0 +1,19 @@
+<li class="list-group-item">
+  <div class="row">
+    <div class="col-8">
+      <%= link_to spree.edit_admin_product_path(line_item.product), class: 'd-flex text-decoration-none' do %>
+        <%= render 'spree/admin/shared/product_image', object: line_item.product %>
+        <span class="ml-3 text-dark">
+          <strong><%= line_item.name %></strong><br />
+          <%= line_item.options_text %>
+        </span>
+      <% end %>
+    </div>
+    <div class="col-2 text-lg-right">
+      x <%= line_item.quantity %>
+    </div>
+    <div class="col-2 text-lg-right">
+      <%= line_item.display_total %>
+    </div>
+  </div>
+</li>

data/app/views/spree/admin/users/_lifetime_stats.html.erb

@@ -0,0 +1,65 @@
+<div class="card mb-4">
+  <div class="card-body">
+    <div class="row">
+      <div class="col-lg-4">
+        <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
+          <span class="text-muted"><%= Spree.t('admin.amount_spent') %></span>
+          <span class="font-size-lg text-dark font-weight-bold mt-1">
+            <%= @user.display_lifetime_value %>
+          </span>
+        </div>
+      </div>
+
+      <div class="col-lg-4">
+        <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
+          <span class="text-muted"><%= Spree.t(:orders) %></span>
+          <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
+            <%= @user.completed_orders.count %>
+          </span>
+        </div>
+      </div>
+
+      <div class="col-lg-4">
+        <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">
+          <span class="text-muted"><%= Spree.t('admin.avg_order_value') %></span>
+          <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
+            <%= @user.display_average_order_value %>
+          </span>
+        </div>
+      </div>
+    </div>
+
+    <hr />
+
+    <div class="row">
+      <div class="col-lg-4">
+        <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
+          <span class="text-muted"><%= Spree.t(:store_credits) %></span>
+          <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
+            <%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency) %>
+          </span>
+        </div>
+      </div>
+
+      <div class="col-lg-4">
+        <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
+          <span class="text-muted"><%= Spree.t('admin.member_since') %></span>
+          <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
+            <%= local_time(@user.created_at) %>
+          </span>
+        </div>
+      </div>
+
+      <% if @visits_count.present? %>
+        <div class="col-lg-4">
+          <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
+            <span class="text-muted"><%= Spree.t(:visits) %></span>
+            <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
+              <%= @visits_count %>
+            </span>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/users/_shipping.html.erb

@@ -0,0 +1,33 @@
+<div class="card mb-4" id="user-ship-address">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title"><%= Spree.t(:shipping_address) %></h5>
+
+    <% if @user.shipping_address.present? %>
+      <%= link_to_with_icon 'edit', Spree.t(:edit),
+        spree.edit_admin_address_path(@user.shipping_address, type: 'shipping'),
+        class: 'btn btn-light btn-sm',
+        data: { turbo_frame: :edit_address_shipping } if can?(:update, @user.shipping_address) %>
+    <% else %>
+      <%= link_to_with_icon 'plus', Spree.t(:add),
+        spree.new_admin_address_path(user_id: @user.id, default_shipping: true, type: 'shipping'),
+        class: 'btn btn-light btn-sm',
+        data: { turbo_frame: :new_address_shipping } if can?(:create, Spree::Address) && can?(:update, @user) %>
+    <% end %>
+  </div>
+  <div class="card-body">
+    <% if @user.shipping_address %>
+      <%= turbo_frame_tag :edit_address_shipping do %>
+        <%= render 'spree/admin/shared/map', map_object: @user.ship_address, label: customer_full_name(@user) || @user.email %>
+        <div class="mt-3">
+          <%= render 'spree/admin/shared/address', address: @user.shipping_address %>
+        </div>
+      <% end %>
+    <% else %>
+      <%= turbo_frame_tag :new_address_shipping do %>
+        <div class="text-center p-5 text-muted">
+          <%= Spree.t(:not_available) %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/users/_tabs.html.erb

@@ -0,0 +1,74 @@
+<ul class="nav nav-pills mb-3" id="vendor" role="tablist">
+  <% if spree.respond_to?(:admin_user_visits_path) %>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link active" id="pills-overview-tab" data-toggle="pill" data-target="#pills-overview" role="tab" aria-controls="pills-overview" aria-selected="true">Timeline</a>
+    </li>
+  <% end %>
+
+  <% if can?(:read, Spree::Order) %>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link <%= 'active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2-tab" data-toggle="pill" data-target="#pills-orders2" role="tab" aria-controls="pills-orders2" aria-selected="false"><%= Spree.t(:orders) %></a>
+    </li>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link" id="pills-checkouts-tab" data-toggle="pill" data-target="#pills-checkouts" role="tab" aria-controls="pills-checkouts" aria-selected="false"><%= Spree.t(:draft_orders) %></a>
+    </li>
+  <% end %>
+
+  <% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link" id="pills-gift-cards-tab" data-toggle="pill" data-target="#pills-gift-cards" role="tab" aria-controls="pills-gift-cards" aria-selected="false"><%= Spree.t(:gift_cards) %></a>
+    </li>
+  <% end %>
+
+  <% if can?(:read, Spree::StoreCredit) %>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link" id="pills-store-credits-tab" data-toggle="pill" data-target="#pills-store-credits" role="tab" aria-controls="pills-store-credits" aria-selected="false"><%= Spree.t(:store_credits) %></a>
+    </li>
+  <% end %>
+</ul>
+
+<div class="tab-content" id="vendorContent">
+  <% if spree.respond_to?(:admin_user_visits_path) %>
+    <div class="tab-pane fade show active pt-3" id="pills-overview" role="tabpanel" aria-labelledby="pills-overview">
+      <%= turbo_frame_tag :user_visits, src: spree.admin_user_visits_path(@user), target: '_top' %>
+    </div>
+  <% end %>
+
+  <% if can?(:read, Spree::Order) %>
+    <div class="tab-pane fade <%= 'show active' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2">
+      <div class="card-lg p-0">
+        <%= turbo_frame_tag :orders_list, src: spree.admin_user_orders_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+          <%= render 'spree/admin/shared/spinner' %>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="tab-pane fade" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts">
+      <div class="card-lg p-0">
+        <%= turbo_frame_tag :orders_list, src: spree.admin_user_checkouts_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+          <%= render 'spree/admin/shared/spinner' %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+
+  <% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>
+    <div class="tab-pane fade" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards">
+      <div class="card-lg p-0">
+        <%= turbo_frame_tag :gift_cards_list, src: spree.admin_user_gift_cards_path(@user, frame_name: :gift_cards_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+          <%= render 'spree/admin/shared/spinner' %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+
+  <% if can?(:read, Spree::StoreCredit) %>
+    <div class="tab-pane fade" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits">
+      <div class="card-lg p-0">
+        <%= turbo_frame_tag :store_credits_list, src: spree.admin_user_store_credits_path(@user, frame_name: :store_credits_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+          <%= render 'spree/admin/shared/spinner' %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/users/_user.html.erb

@@ -0,0 +1,20 @@
+<tr id="<%= spree_dom_id user %>">
+  <td class="pr-0 w-5">
+    <div class="custom-control custom-checkbox ml-1">
+      <%= check_box_tag "ids[]", user.id, false, class: "custom-control-input", id: "ids_#{user.id}", data: { bulk_operation_target: "checkbox" } %>
+      <label class="custom-control-label" for="ids_<%= user.id %>"><span></span></label>
+    </div>
+  </td>
+  <td class='user_name w-50 no-wrap py-0 pl-1 pr-0'>
+    <%= render 'spree/admin/shared/user', user: user %>
+  </td>
+  <td class="no-wrap">
+    <%= active_badge(user.accepts_email_marketing?) %>
+  </td>
+  <td class="w-25 no-wrap">
+    <%= customer_location_flag(user) %>
+    <%= customer_location(user) %>
+  </td>
+  <td class='user_num_orders w-10 no-wrap'><%= user.completed_orders_for_store(current_store).count %></td>
+  <td class='user_amount_spent w-10 no-wrap'><%= user.display_amount_spent_in(current_currency) %></td>
+</tr>

data/app/views/spree/admin/users/bulk_modal.html.erb

@@ -0,0 +1,21 @@
+<%= turbo_frame_tag :bulk_modal do %>
+  <div class="modal-content">
+    <div class="modal-header">
+      <h5 class="modal-title" id="exampleModalLabel">
+        <%= @title %>
+      </h5>
+      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
+    </div>
+    <div class="modal-body">
+      <p><%= @body %></p>
+
+      <% if params[:kind] == 'add_tags' || params[:kind] == 'remove_tags' %>
+        <%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>
+      <% end %>
+    </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 %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,17 @@
+<%= turbo_frame_tag :edit_user do %>
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title">
+      <%= Spree.t(:details) %>
+    </h5>
+    <%= link_to Spree.t('actions.discard'), spree.admin_user_path(@user), class: 'btn btn-light btn-sm' %>
+  </div>
+  <%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put do |f| %>
+    <div class="card-body pb-0">    
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
+      <%= render 'form', f: f %>
+    </div>
+    <div class="card-footer">
+      <%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: '_top' %>
+    </div>
+  <% end %>
+<% end%>

data/app/views/spree/admin/users/index.csv.erb

@@ -0,0 +1,43 @@
+<%- headers = [
+  'First Name',
+  'Last Name',
+  'Email',
+  'Accepts Email Marketing',
+  'Company',
+  'Address 1',
+  'Address 2',
+  'City',
+  'Province',
+  'Province Code',
+  'Country',
+  'Country Code',
+  'Zip',
+  'Phone',
+  'Total Spent',
+  'Total Orders',
+  'Tags'
+  ]
+-%>
+<%= CSV.generate_line(headers).strip %>
+<%- @users.includes( bill_address: [:country], ship_address: [:country], addresses: [:country]).each do |user| -%>
+<%= CSV.generate_line([
+  user.first_name,
+  user.last_name,
+  user.email,
+  user.accepts_email_marketing ? 'Yes' : 'No',
+  user.address&.company,
+  user.address&.address1,
+  user.address&.address2,
+  user.address&.city,
+  user.address&.state_text,
+  user.address&.state_abbr,
+  user.address&.country&.name,
+  user.address&.country&.iso,
+  user.address&.zipcode,
+  user.phone,
+  user.amount_spent_in(current_currency),
+  user.completed_orders.count,
+  user.tag_list
+  ]).strip.html_safe %>
+<%- end -%>
+