Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Open source the Customers section in the admin (#12375)

Łukasz Adamczyk0f1c9ee5946d
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rb
new file mode 100644
index 0000000000..1bb32c9e93
--- /dev/null
+++ b/admin/app/controllers/spree/admin/users_controller.rb
@@ -0,0 +1,85 @@
+module Spree
+ module Admin
+ class UsersController < ResourceController
+ helper UsersHelper
+
+ include Spree::Admin::BulkOperationsConcern
+
+ rescue_from Spree::Core::DestroyWithOrdersError, with: :user_destroy_with_orders_error
+
+ before_action :remove_empty_params, only: :update
+
+ def show; end
+
+ def create
+ @user = Spree.user_class.new(user_params)
+ @user.password ||= SecureRandom.hex(16) # we need to set a password to pass validation
+ @user.password_confirmation ||= @user.password
+
+ if @user.save
+ flash[:success] = flash_message_for(@user, :successfully_created)
+ redirect_to spree.admin_user_path(@user)
+ else
+ render :new, status: :unprocessable_entity
+ end
+ end
+
+ def update
+ if @user.update(user_params)
+ flash[:success] = Spree.t(:account_updated)
+ redirect_to spree.admin_user_path(@user)
+ else
+ render :edit, status: :unprocessable_entity
+ end
+ end
+
+ def model_class
+ Spree.user_class
+ end
+
+ def bulk_modal
+ @title = Spree.t("admin.bulk_ops.users.title.#{params[:kind]}")
+ @body = Spree.t("admin.bulk_ops.users.body.#{params[:kind]}")
+ end
+
+ protected
+
+ def collection
+ return @collection if @collection.present?
+
+ params[:q] ||= {}
+ params[:q][:s] ||= 'created_at desc'
+ params[:q][:created_at_not_null] ||= 1
+
+ @collection = super
+ @search = @collection.ransack(params[:q])
+ @collection = @search.result(distinct: true).
+ includes(
+ addresses: [:country, :state],
+ ship_address: [:country, :state],
+ bill_address: [:country, :state],
+ avatar_attachment: :blob
+ ).
+ page(params[:page]).per(params[:per_page])
+ end
+
+ private
+
+ def user_params
+ params.require(:user).permit(permitted_user_attributes | [spree_role_ids: []])
+ end
+
+ # handling raise from Spree::Admin::ResourceController#destroy
+ def user_destroy_with_orders_error
+ invoke_callbacks(:destroy, :fails)
+ render status: :forbidden, plain: Spree.t(:error_user_destroy_with_orders)
+ end
+
+ def remove_empty_params
+ return if params[:user].blank?
+
+ params[:user][:tag_list] = params.dig(:user, :tag_list).present? ? params.dig(:user, :tag_list).reject(&:empty?) : []
+ end
+ end
+ end
+end
diff --git a/admin/app/helpers/spree/admin/tags_helper.rb b/admin/app/helpers/spree/admin/tags_helper.rb
index 2fafec71a6..9909156c47 100644
--- a/admin/app/helpers/spree/admin/tags_helper.rb
+++ b/admin/app/helpers/spree/admin/tags_helper.rb
@@ -19,6 +19,17 @@ module Spree
def post_tags_json_array
@post_tags_json_array ||= post_tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
end
+
+ def user_tags_scope
+ @user_tags_scope ||= ActsAsTaggableOn::Tag.
+ joins(:taggings).
+ where('taggings.taggable_type = ?', Spree.user_class.to_s).
+ for_context(:tags)
+ end
+
+ def user_tags_json_array
+ @user_tags_json_array ||= user_tags_scope.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
+ end
end
end
end
diff --git a/admin/app/views/spree/admin/products/_list.html.erb b/admin/app/views/spree/admin/products/_list.html.erb
index c878fcdad3..81d9ba8dc3 100644
--- a/admin/app/views/spree/admin/products/_list.html.erb
+++ b/admin/app/views/spree/admin/products/_list.html.erb
@@ -1,7 +1,7 @@
<% if @collection.any? %>
<div data-controller="bulk-operation" data-action="keydown.esc->bulk-operation#cancel" tabindex="0">
<%= form_tag spree.admin_products_path, method: :put, data: { 'bulk-operation-target': 'form' } do %>
- <%= render 'shared/bulk_modal' %>
+ <%= render 'spree/admin/shared/bulk_modal' %>
<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
<div class="bulk-panel-container animate__animated animate__bounceInUp animate__faster">
<div data-toggle="modal" data-target="#bulk-modal">
diff --git a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb
new file mode 100644
index 0000000000..31ae52d597
--- /dev/null
+++ b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb
@@ -0,0 +1,21 @@
+<div class="modal fade" id="bulk-modal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+ <div class="modal-dialog modal-dialog-centered">
+ <%= turbo_frame_tag :bulk_modal do %>
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
+ </div>
+ <div class="modal-body text-center">
+ <div class="spinner-border text-muted" role="status">
+ <span class="sr-only"><%= Spree.t(:loading) %>...</span>
+ </div>
+ </div>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t(:close) %></button>
+ <button type="button" class="btn btn-primary" disabled="disabled"><%= Spree.t(:save_changes) %></button>
+ </div>
+ </div>
+ <% end %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/taxons/_form.html.erb b/admin/app/views/spree/admin/taxons/_form.html.erb
index 2bd8f85392..68609ac396 100644
--- a/admin/app/views/spree/admin/taxons/_form.html.erb
+++ b/admin/app/views/spree/admin/taxons/_form.html.erb
@@ -80,7 +80,7 @@
<div class="card-body border-bottom">
<div class="d-flex align-items-center">
<%= f.label :sort_order, class: 'text-nowrap mr-2 mb-0' %>
- <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'change->auto-submit#submitForm' } } %>
+ <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'change->auto-submit#submit' } } %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/users/_billing.html.erb b/admin/app/views/spree/admin/users/_billing.html.erb
new file mode 100644
index 0000000000..149d73f12b
--- /dev/null
+++ b/admin/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 } %>
+ <% 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 '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_provided) %>
+ </div>
+ <% end %>
+ <% end %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/users/_details.html.erb b/admin/app/views/spree/admin/users/_details.html.erb
new file mode 100644
index 0000000000..8eee8f9493
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_details.html.erb
@@ -0,0 +1,44 @@
+<div class="card mb-4" id="user-details">
+ <div class="card-header d-flex align-items-center justify-content-between">
+ <h5 class="card-title">
+ 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">
+ <%= turbo_frame_tag :edit_user do %>
+ <ul class="list-group">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ Email
+ <span>
+ <%= @user.email %>
+ </span>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ Phone
+ <span>
+ <%= @user.phone.presence || 'N/A' %>
+ </span>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ Name
+ <span>
+ <%= customer_full_name(@user) %>
+ </span>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ Email marketing
+ <%= active_badge(@user.accepts_email_marketing?) %>
+ </li>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ Tags
+ <span>
+ <% @user.tag_list.each do |tag| %>
+ <span class="tag small"><%= tag %></span>
+ <% end %>
+ </span>
+ </li>
+ </ul>
+ <% end %>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/users/_extra_actions.html.erb b/admin/app/views/spree/admin/users/_extra_actions.html.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erb
new file mode 100644
index 0000000000..835f0b04b1
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_filters.html.erb
@@ -0,0 +1,71 @@
+<%= 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: :email_eq, placeholder: [Spree.t(:search), Spree.t(:customers).downcase].join(' ') %>
+
+ <%= render 'spree/admin/shared/filters_button' %>
+ </div>
+ <div data-reveal-target="item" class="d-none mt-4" 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>
+ <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 %>
diff --git a/admin/app/views/spree/admin/users/_form.html.erb b/admin/app/views/spree/admin/users/_form.html.erb
new file mode 100644
index 0000000000..35ca9d0772
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_form.html.erb
@@ -0,0 +1,29 @@
+<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 :phone, Spree.t(:phone) %>
+ <%= f.text_field :phone, class: 'form-control' %>
+ <%= f.error_message_on :phone %>
+</div>
+<div class="form-group">
+ <%= f.label :first_name, Spree.t(:first_name) %>
+ <%= 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, Spree.t(:last_name) %>
+ <%= f.text_field :last_name, class: 'form-control', required: true %>
+ <%= f.error_message_on :last_name %>
+</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="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>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/users/_last_order.html.erb b/admin/app/views/spree/admin/users/_last_order.html.erb
new file mode 100644
index 0000000000..d153900cf2
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_last_order.html.erb
@@ -0,0 +1,37 @@
+<% if @user.completed_orders.any? %>
+ <% order = @user.completed_orders.last %>
+ <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">
+ <% cache spree_base_cache_scope.call(order) do %>
+ <ul class="list-group">
+ <li class="list-group-item">
+ <div class="row">
+ <div class="col-lg-9">
+ <p class="mb-1">
+ <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bold' %>
+ <%= order_payment_state(order, class: 'ml-2') %>
+ <%= order_shipment_state(order, class: 'ml-2') %>
+ </p>
+ <span class="text-muted">
+ <%= local_time_ago(order.completed_at, class: 'with-tip') %>
+ </span>
+ </div>
+ <div class="col-lg-3 text-lg-right font-weight-bold">
+ <%= order.display_total %>
+ </div>
+ </div>
+ </li>
+ <%= render collection: order.all_line_items.includes(variant: :product), partial: 'spree/admin/users/last_order_line_item', as: :line_item, cached: spree_base_cache_scope %>
+ </ul>
+ <% end %>
+ </div>
+ <div class="card-footer d-flex justify-content-end pt-0 mb-1">
+ <%= link_to Spree.t('admin.view_all_orders'), spree.admin_orders_path(q: { user_id_eq: @user.id }), class: 'btn btn-light btn-sm' %>
+ </div>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/users/_last_order_line_item.html.erb b/admin/app/views/spree/admin/users/_last_order_line_item.html.erb
new file mode 100644
index 0000000000..531d8d20a0
--- /dev/null
+++ b/admin/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>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb b/admin/app/views/spree/admin/users/_lifetime_stats.html.erb
new file mode 100644
index 0000000000..b0b9d7a63e
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_lifetime_stats.html.erb
@@ -0,0 +1,56 @@
+<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('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>
diff --git a/admin/app/views/spree/admin/users/_shipping.html.erb b/admin/app/views/spree/admin/users/_shipping.html.erb
new file mode 100644
index 0000000000..3533beb00f
--- /dev/null
+++ b/admin/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 } %>
+ <% 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 } %>
+ <% 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_provided) %>
+ </div>
+ <% end %>
+ <% end %>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/users/_tabs.html.erb b/admin/app/views/spree/admin/users/_tabs.html.erb
new file mode 100644
index 0000000000..6d7889e743
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_tabs.html.erb
@@ -0,0 +1,66 @@
+<ul class="nav nav-pills nav-fill 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 %>
+
+ <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>
+
+ <% if spree.respond_to?(:admin_user_gift_cards_path) %>
+ <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 %>
+
+ <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_credit_name) %></a>
+ </li>
+</ul>
+
+<div class="tab-content" id="vendorContent" style="min-height: 200px">
+ <% 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 %>
+
+ <div class="tab-pane fade <%= 'show active pt-3' unless spree.respond_to?(:admin_user_visits_path) %>" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2">
+ <div class="card-lg p-0" style="min-height: 200px">
+ <%= 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 '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" style="min-height: 200px">
+ <%= 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 'shared/spinner' %>
+ <% end %>
+ </div>
+ </div>
+
+ <% if spree.respond_to?(:admin_user_gift_cards_path) %>
+ <div class="tab-pane fade" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards">
+ <div class="card-lg p-0" style="min-height: 200px">
+ <%= 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 'shared/spinner' %>
+ <% end %>
+ </div>
+ </div>
+ <% end %>
+
+ <div class="tab-pane fade" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits">
+ <div class="card-lg p-0" style="min-height: 200px">
+ <%= 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 'shared/spinner' %>
+ <% end %>
+ </div>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/users/_user.html.erb b/admin/app/views/spree/admin/users/_user.html.erb
new file mode 100644
index 0000000000..43c98b9839
--- /dev/null
+++ b/admin/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>
diff --git a/admin/app/views/spree/admin/users/bulk_modal.html.erb b/admin/app/views/spree/admin/users/bulk_modal.html.erb
new file mode 100644
index 0000000000..c6b4644bb3
--- /dev/null
+++ b/admin/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 %>
diff --git a/admin/app/views/spree/admin/users/edit.html.erb b/admin/app/views/spree/admin/users/edit.html.erb
new file mode 100644
index 0000000000..bb565220cf
--- /dev/null
+++ b/admin/app/views/spree/admin/users/edit.html.erb
@@ -0,0 +1,8 @@
+<%= turbo_frame_tag :edit_user do %>
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
+
+ <%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put do |f| %>
+ <%= render 'form', f: f %>
+ <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+ <% end %>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/users/index.csv.erb b/admin/app/views/spree/admin/users/index.csv.erb
new file mode 100644
index 0000000000..334aabf5e8
--- /dev/null
+++ b/admin/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 -%>
+
diff --git a/admin/app/views/spree/admin/users/index.html.erb b/admin/app/views/spree/admin/users/index.html.erb
new file mode 100644
index 0000000000..bfa8f9a82f
--- /dev/null
+++ b/admin/app/views/spree/admin/users/index.html.erb
@@ -0,0 +1,101 @@
+<% content_for :page_title do %>
+ <%= Spree.t(:customers) %>
+<% end %>
+
+<% content_for :page_actions do %>
+ <%= link_to spree.admin_users_path(q: params[:q].to_unsafe_hash, page: params[:page], per_page: params[:per_page], format: :csv), class: 'btn btn-light bg-transparent with-tip mr-2 d-none d-lg-inline-flex', title: 'Export Customers to a CSV file. To filter specific Customers use "Filters" or Customers/Subscribers tabs before clicking this button' do %>
+ <%= icon 'table-export', class: 'mr-2' %>
+ Export
+ <% end %>
+ <%= render 'extra_actions' %>
+ <%= button_link_to Spree.t(:create_customer), spree.new_admin_user_path, class: "btn-primary", icon: 'plus', id: 'admin_new_user_link' %>
+<% end if can? :create, Spree::user_class %>
+
+<% content_for :table_filter_title do %>
+ <%= Spree.t(:search) %>
+<% end %>
+
+<div class="card-lg p-0">
+ <%= render "spree/admin/users/filters" %>
+
+ <% if @users.any? %>
+ <div data-controller="bulk-operation" data-action="keydown.esc->bulk-operation#cancel" tabindex="0">
+ <%= form_tag spree.admin_users_path, data: { 'bulk-operation-target': 'form' } do %>
+ <%= render 'spree/admin/shared/bulk_modal' %>
+ <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
+ <div class="bulk-panel-container animate__animated animate__bounceInUp animate__faster">
+ <div data-toggle="modal" data-target="#bulk-modal">
+ <% if can?(:manage_tags, Spree.user_class) %>
+ <a
+ href="<%= spree.bulk_modal_admin_users_path(kind: :add_tags) %>"
+ data-turbo-frame="bulk_modal"
+ class="btn btn-primary mr-2"
+ data-action="click->bulk-operation#setBulkAction"
+ data-url="<%= spree.bulk_add_tags_admin_users_path %>"
+ >
+ <%= icon("plus") %>
+ <%= Spree.t("admin.bulk_ops.users.title.add_tags") %>
+ </a>
+
+ <a
+ href="<%= spree.bulk_modal_admin_users_path(kind: :remove_tags) %>"
+ data-turbo-frame="bulk_modal"
+ class="btn btn-light mr-3"
+ data-action="click->bulk-operation#setBulkAction"
+ data-url="<%= spree.bulk_remove_tags_admin_users_path %>"
+ >
+ <%= Spree.t("admin.bulk_ops.users.title.remove_tags") %>
+ </a>
+ <% end %>
+ </div>
+
+ <span>
+ <strong data-bulk-operation-target="counter"></strong>
+ customers selected
+ </span>
+
+ <button
+ type="button"
+ class="btn-close ml-2"
+ data-dismiss="modal"
+ aria-label="<%= Spree.t(:close) %>"
+ data-action="bulk-operation#cancel"
+ />
+ </div>
+ </div>
+
+ <div class="table-responsive">
+ <table class="table" id="listing_users">
+ <thead class="text-muted">
+ <tr data-hook="admin_users_index_headers">
+ <th scope="col" class="pr-0 w-5">
+ <div class="custom-control custom-checkbox ml-1">
+ <input
+ type="checkbox"
+ class="custom-control-input"
+ id="checkAllMasterCheckbox"
+ data-bulk-operation-target="checkboxAll"
+ >
+ <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
+ </div>
+ </th>
+ <th><%= Spree.t(:name) %></th>
+ <th><%= Spree.t(:email_marketing) %></th>
+ <th><%= Spree.t(:location) %></th>
+ <th><%= Spree.t('admin.num_orders') %></th>
+ <th><%= Spree.t('admin.amount_spent') %></th>
+ </tr>
+ </thead>
+ <tbody>
+ <%= render collection: @users, partial: "spree/admin/users/user", cached: spree_base_cache_scope %>
+ </tbody>
+ </table>
+ </div>
+ <% end %>
+ </div>
+ <% else %>
+ <%= render "spree/admin/shared/no_resource_found" %>
+ <% end %>
+
+ <%= render "spree/admin/shared/index_table_options", collection: @users, simple: true if @users.any? %>
+</div>
diff --git a/admin/app/views/spree/admin/users/new.html.erb b/admin/app/views/spree/admin/users/new.html.erb
new file mode 100644
index 0000000000..8e16f52ac9
--- /dev/null
+++ b/admin/app/views/spree/admin/users/new.html.erb
@@ -0,0 +1,14 @@
+<% content_for :page_title do %>
+ <%= page_header_back_button spree.admin_users_path %>
+ <%= Spree.t(:new_user) %>
+<% end %>
+
+<%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>
+ <div class="card mb-4">
+ <div class="card-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
+ <%= render 'form', f: f %>
+ </div>
+ </div>
+ <%= render 'spree/admin/shared/new_resource_links' %>
+<% end %>
diff --git a/admin/app/views/spree/admin/users/show.html.erb b/admin/app/views/spree/admin/users/show.html.erb
new file mode 100644
index 0000000000..d260192e9a
--- /dev/null
+++ b/admin/app/views/spree/admin/users/show.html.erb
@@ -0,0 +1,36 @@
+<% content_for :page_title do %>
+ <%= page_header_back_button spree.admin_users_path, @user %>
+ <%= customer_full_name(@user) || @user.email %>
+ <span class="font-size-base font-weight-normal ml-3">
+ <%= customer_location_flag(@user) %>
+ <%= customer_location(@user) %>
+ </span>
+<% end %>
+
+<% content_for(:page_actions_dropdown) do %>
+ <% if spree.respond_to?(:new_admin_user_gift_card_path) %>
+ <%= link_to_with_icon 'plus.svg', Spree.t(:issue_gift_card), spree.new_admin_user_gift_card_path(@user), class: 'text-left dropdown-item' %>
+ <% end %>
+
+ <%= link_to_with_icon 'plus.svg', Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: 'text-left dropdown-item' %>
+<% end %>
+
+<div class="row">
+ <div class="col-lg-8 mb-4">
+ <%= render 'spree/admin/users/lifetime_stats' %>
+ <%= render 'spree/admin/users/last_order' %>
+
+ <%= render 'spree/admin/users/tabs' %>
+ </div>
+ <div class="col-lg-4">
+ <%= render 'spree/admin/users/details' %>
+ <%= render 'spree/admin/users/shipping' %>
+ <%= render 'spree/admin/users/billing' %>
+ </div>
+</div>
+
+<style>
+ .d-customer {
+ display: none;
+ }
+</style>
\ No newline at end of file
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 96a29a8f27..8d1d574b00 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -180,6 +180,7 @@ en:
addresses: Addresses
items: Items
items_purchased: Items Purchased
+ last_order_placed: Last order placed
order_history: Order History
order_num: "Order #"
orders: Orders
@@ -374,3 +375,24 @@ en:
top_padding: Top padding
button_alignment: Button alignment
not_set: Not set
+ view_all_orders: View all orders
+ bulk_ops:
+ set: Set
+ stock_items:
+ set_backorderable_to_false: Set Backorderable to false
+ set_backorderable_to_true: Set Backorderable to true
+ set_track_inventory_to_false: Disable Inventory Tracking
+ set_track_inventory_to_true: Enable Inventory Tracking
+ backorderable_explanation: Backorderable indicates if a stock item can be backordered when it runs out.
+ track_inventory_explanation: Enable/disable tracking the inventory for stock items.
+ users:
+ title:
+ add_tags: Add tags
+ remove_tags: Remove tags
+ body:
+ add_tags: 'Select tags to add to the customers:'
+ remove_tags: 'Select tags to remove from the customers:'
+ amount_spent: Amount spent
+ avg_order_value: Avg. Order Value
+ num_orders: No. of Orders
+ member_since: Member since
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index e916f816b3..b12c3eeb11 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -93,7 +93,17 @@ Spree::Core::Engine.add_routes do
end
# customers
- resources :users
+ resources :users do
+ resources :store_credits
+ resources :orders, only: [:index]
+ resources :checkouts, only: [:index]
+
+ collection do
+ get :bulk_modal
+ post :bulk_add_tags
+ post :bulk_remove_tags
+ end
+ end
# translations
resources :translations, only: [:edit, :update], path: '/translations/:resource_type'
diff --git a/admin/spec/controllers/spree/admin/classifications_controller_spec.rb b/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
index 4bfde03c99..5b468a50dd 100644
--- a/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
@@ -7,14 +7,18 @@ RSpec.describe Spree::Admin::ClassificationsController, type: :controller do
render_views
- let(:taxon) { create(:taxon) }
+ let(:taxon) { create(:taxon, sort_order: sort_order) }
+ let(:sort_order) { 'manual' }
+
let(:product1) { create(:product) }
let(:product2) { create(:product) }
describe 'GET #index' do
let!(:classifications) do
- [create(:classification, taxon: taxon, product: product1),
- create(:classification, taxon: taxon, product: product2)]
+ [
+ create(:classification, taxon: taxon, product: product1),
+ create(:classification, taxon: taxon, product: product2)
+ ]
end
subject { get :index, params: { taxon_id: taxon.id } }
@@ -28,6 +32,18 @@ RSpec.describe Spree::Admin::ClassificationsController, type: :controller do
subject
expect(assigns(:classifications)).to contain_exactly(*classifications)
end
+
+ context 'when sort_order is best_selling' do
+ let(:sort_order) { 'best-selling' }
+
+ let!(:completed_order_1) { create(:completed_order_with_totals, variants: [product1.master, product2.master]) }
+ let!(:completed_order_2) { create(:completed_order_with_totals, variants: [product2.master]) }
+
+ it 'assigns @classifications' do
+ subject
+ expect(assigns(:classifications)).to eq([classifications[1], classifications[0]])
+ end
+ end
end
describe 'POST #create' do
diff --git a/admin/spec/controllers/spree/admin/users_controller_spec.rb b/admin/spec/controllers/spree/admin/users_controller_spec.rb
new file mode 100644
index 0000000000..05e7bd5d8e
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/users_controller_spec.rb
@@ -0,0 +1,178 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::UsersController, type: :controller do
+ stub_authorization!
+ render_views
+
+ let(:store) { Spree::Store.default }
+
+ describe 'GET #index' do
+ let!(:user_1) { create(:user) }
+ let!(:user_2) { create(:user, tag_list: ['some tag']) }
+ let!(:user_3) { create(:user, accepts_email_marketing: true) }
+
+ let!(:user_1_orders) { create_list(:completed_order_with_totals, 3, user: user_1, completed_at: 1.day.ago) }
+ let!(:user_2_orders) { create_list(:completed_order_with_totals, 1, user: user_2, completed_at: 1.day.ago) }
+
+ before do
+ user_1_orders[0].update_column(:total, 300)
+ user_1_orders[1].update_column(:total, 200)
+ user_1_orders[2].update_column(:total, 500)
+
+ user_2_orders[0].update_column(:total, 20)
+ end
+
+ it 'renders the list of users' do
+ get :index
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(:index)
+
+ expect(assigns(:collection).to_a).to contain_exactly(user_1, user_2, user_3)
+ end
+
+ it 'returns subscribers' do
+ get :index, params: { q: { accepts_email_marketing_eq: 'true' } }
+ expect(assigns(:collection).to_a).to eq([user_3])
+ end
+
+ it 'returns customer based on tags' do
+ get :index, params: { q: { tags_name_in: ['some tag'] } }
+ expect(assigns(:collection).to_a).to eq([user_2])
+ end
+
+ context 'csv' do
+ let!(:country) { create(:country) }
+ let!(:state) { create(:state, country: country) }
+ let!(:address) { create(:address, user: user_1) }
+
+ before do
+ user_1.tag_list = ['Tag 1', 'Tag 2']
+ user_1.save!
+ end
+
+ it 'returns a csv file' do
+ get :index, params: { format: 'csv', q: { first_name_eq: user_1.first_name } }
+
+ expect(response.headers['Content-Type']).to eq 'text/csv; charset=utf-8'
+ expect(response.body.split("\n").count).to eq(2)
+
+ user_csv_line = response.body.split("\n").last
+
+ expect(user_csv_line).to eq(
+ [
+ user_1.first_name,
+ user_1.last_name,
+ user_1.email,
+ user_1.accepts_email_marketing ? 'Yes' : 'No',
+ user_1.address&.company,
+ user_1.address&.address1,
+ user_1.address&.address2,
+ user_1.address&.city,
+ user_1.address&.state_text,
+ user_1.address&.state_abbr,
+ user_1.address&.country&.name,
+ user_1.address&.country&.iso,
+ user_1.address&.zipcode,
+ user_1.phone,
+ user_1.amount_spent_in('USD').to_s,
+ user_1.completed_orders.count.to_s,
+ "\"#{user_1.tag_list.join(', ')}\"",
+ ].join(',')
+ )
+ end
+ end
+
+ context 'search by country name' do
+ let!(:address) { create(:address, user: user_1) }
+ let!(:other_address) { create(:address, user: user_1) }
+
+ it 'should only give distinct user when searched with country name' do
+ get :index, params: { q: { addresses_country_name_eq: address.country.name.to_s } }
+
+ expect(assigns(:collection).to_a).to eq([user_1])
+ end
+ end
+ end
+
+ describe 'GET #new' do
+ it 'renders the new user form' do
+ get :new
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(:new)
+ end
+ end
+
+ describe 'GET #edit' do
+ let(:user) { create(:user) }
+
+ it 'renders the edit user form' do
+ get :edit, params: { id: user.id }
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(:edit)
+ end
+ end
+
+ describe 'POST #create' do
+ it 'creates a new user' do
+ post :create, params: { user: { email: '[email protected]' } }
+ expect(response).to redirect_to(spree.admin_user_path(assigns(:user)))
+ end
+ end
+
+ describe 'PUT #update' do
+ context 'when skipping tag params' do
+ let!(:user) { create(:user, tag_list: ['Tag 1']) }
+
+ it 'removes tags successfully' do
+ put :update, params: { id: user.id, user: { last_name: 'Test' } }
+
+ expect(user.reload.tag_list).to be_empty
+ expect(user.reload.last_name).to eq('Test')
+
+ expect(response).to redirect_to(spree.admin_user_path(user))
+ end
+ end
+ end
+
+ describe 'GET #bulk_modal' do
+ it 'renders the bulk modal' do
+ get :bulk_modal, params: { kind: 'add_tags' }
+
+ expect(response).to have_http_status(:ok)
+ expect(response).to render_template(:bulk_modal)
+
+ expect(assigns[:title]).to eq(Spree.t('admin.bulk_ops.users.title.add_tags'))
+ expect(assigns[:body]).to eq(Spree.t('admin.bulk_ops.users.body.add_tags'))
+ end
+ end
+
+ describe 'POST #bulk_add_tags' do
+ let(:users) { create_list(:user, 3) }
+ let(:tags) { ['tag1', 'tag2'] }
+
+ it 'adds tags to users' do
+ post :bulk_add_tags, params: { ids: users.pluck(:id), tags: tags }, format: :turbo_stream
+
+ users.each do |user|
+ expect(user.reload.tag_list).to contain_exactly(*tags)
+ end
+ end
+ end
+
+ describe 'POST #bulk_remove_tags' do
+ let(:users) { create_list(:user, 3, tag_list: ['tag1', 'tag2']) }
+ let(:tags) { ['tag1', 'tag2'] }
+
+ it 'removes tags from users' do
+ users.each { |user| user.update(tag_list: tags) }
+ post :bulk_remove_tags, params: { ids: users.map(&:id), tags: tags }, format: :turbo_stream
+
+ users.each do |user|
+ expect(user.reload.tag_list).to eq([])
+ end
+ end
+ end
+end
diff --git a/core/app/models/concerns/spree/user_address.rb b/core/app/models/concerns/spree/user_address.rb
index e53febe004..832a53fc6a 100644
--- a/core/app/models/concerns/spree/user_address.rb
+++ b/core/app/models/concerns/spree/user_address.rb
@@ -20,6 +20,10 @@ module Spree
validate :address_not_associated_with_other_user, :address_not_deprecated_in_completed_order
+ def address
+ @address ||= bill_address || ship_address || addresses.first
+ end
+
def persist_order_address(order)
# FIXME: we should check if the User's address is associated with country accepted by Store
# if not we should try to find an address with valid country in User's address book
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index d759cdda98..afebb98973 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -26,6 +26,7 @@ module Spree
has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser', foreign_key: :user_id, dependent: :destroy
has_many :promotion_rules, through: :promotion_rule_users, class_name: 'Spree::PromotionRule'
has_many :orders, foreign_key: :user_id, class_name: 'Spree::Order'
+ has_many :completed_orders, -> { complete }, foreign_key: :user_id, class_name: 'Spree::Order'
has_many :store_credits, class_name: 'Spree::StoreCredit', foreign_key: :user_id, dependent: :destroy
has_many :wishlists, class_name: 'Spree::Wishlist', foreign_key: :user_id, dependent: :destroy
has_many :wished_items, through: :wishlists, source: :wished_items
diff --git a/core/app/models/concerns/spree/user_reporting.rb b/core/app/models/concerns/spree/user_reporting.rb
index f53019f914..d34db0329e 100644
--- a/core/app/models/concerns/spree/user_reporting.rb
+++ b/core/app/models/concerns/spree/user_reporting.rb
@@ -39,6 +39,10 @@ module Spree
Money.new(amount_spent_in(currency), currency: currency).to_html
end
+ def completed_orders_for_store(store)
+ orders.for_store(store).complete.order(currency: :desc)
+ end
+
private
def order_calculate(operation:, column:, store: nil, currency: nil)
@@ -47,9 +51,5 @@ module Spree
completed_orders_for_store(store).where(currency: currency).calculate(operation, column) || BigDecimal('0.00')
end
-
- def completed_orders_for_store(store)
- orders.for_store(store).complete.order(currency: :desc)
- end
end
end
diff --git a/core/app/models/spree/classification.rb b/core/app/models/spree/classification.rb
index b96f083991..2431d662a7 100644
--- a/core/app/models/spree/classification.rb
+++ b/core/app/models/spree/classification.rb
@@ -14,5 +14,14 @@ module Spree
validates :taxon_id, uniqueness: { scope: :product_id, message: :already_linked, allow_blank: true }
self.whitelisted_ransackable_attributes = ['taxon_id', 'product_id']
+
+ scope :by_best_selling, lambda { |order_direction = :desc|
+ left_joins(product: :orders).
+ select("#{Spree::Classification.table_name}.*, COUNT(#{Spree::Order.table_name}.id) AS completed_orders_count, SUM(#{Spree::Order.table_name}.total) AS completed_orders_total").
+ where(Spree::Order.table_name => { id: nil }).
+ or(where.not(Spree::Order.table_name => { completed_at: nil })).
+ group("#{Spree::Classification.table_name}.id").
+ reorder(completed_orders_count: order_direction, completed_orders_total: order_direction)
+ }
end
end
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 23f190709c..ee0a5669a7 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -230,8 +230,14 @@ module Spree
having("SUM(#{Spree::StockItem.table_name}.count_on_hand) <= 0")
}
scope :out_of_stock, -> { joins(:stock_items).where("#{Spree::StockItem.table_name}.count_on_hand <= ? OR #{Spree::Variant.table_name}.track_inventory = ?", 0, false) }
- scope :single_variant, lambda {
- where(variants_count: 0)
+
+ scope :by_best_selling, lambda { |order_direction = :desc|
+ left_joins(:orders).
+ select("#{Spree::Product.table_name}.*, COUNT(#{Spree::Order.table_name}.id) AS completed_orders_count, SUM(#{Spree::Order.table_name}.total) AS completed_orders_total").
+ where(Spree::Order.table_name => { id: nil }).
+ or(where.not(Spree::Order.table_name => { completed_at: nil })).
+ group("#{Spree::Product.table_name}.id").
+ order(completed_orders_count: order_direction, completed_orders_total: order_direction)
}
attr_accessor :option_values_hash
diff --git a/core/app/sorters/spree/classifications/sort.rb b/core/app/sorters/spree/classifications/sort.rb
index 14b7bbce76..ed9a9a73e0 100644
--- a/core/app/sorters/spree/classifications/sort.rb
+++ b/core/app/sorters/spree/classifications/sort.rb
@@ -27,9 +27,7 @@ module Spree
def by_best_selling(scope)
return scope unless (value = sort_by?('best_selling'))
- scope.
- select("#{Spree::Classification.table_name}.*, #{Spree::Product.table_name}.orders_count, #{Spree::Product.table_name}.orders_total").
- order("#{Spree::Product.table_name}.orders_count #{value[1]}, #{Spree::Product.table_name}.orders_total #{value[1]}")
+ scope.by_best_selling(value[1])
end
def by_param_attributes(scope)
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 664518eb15..e2bf7ff105 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1056,7 +1056,6 @@ en:
none: None
max: 'Max'
max_items: Max Items
- member_since: Member Since
memo: Memo
meta_description: Meta Description
meta_keywords: Meta Keywords
@@ -1549,6 +1548,7 @@ en:
sales_totals: Sales Totals
same_as_shipping_address: Same as shipping address
save_and_continue: Save and Continue
+ save_changes: Save changes
save_my_address: Save my address
saving: Saving
say_no: 'No'
diff --git a/core/db/migrate/20250207084000_add_accepts_email_marketing_field_to_spree_users_table.rb b/core/db/migrate/20250207084000_add_accepts_email_marketing_field_to_spree_users_table.rb
new file mode 100644
index 0000000000..28caeab0cf
--- /dev/null
+++ b/core/db/migrate/20250207084000_add_accepts_email_marketing_field_to_spree_users_table.rb
@@ -0,0 +1,6 @@
+class AddAcceptsEmailMarketingFieldToSpreeUsersTable < ActiveRecord::Migration[6.1]
+ def change
+ add_column Spree.user_class.table_name, :accepts_email_marketing, :boolean, default: false, null: false, if_not_exists: true
+ add_index Spree.user_class.table_name, :accepts_email_marketing, if_not_exists: true
+ end
+end
diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb
index da159b8604..c63dd0633f 100644
--- a/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/core/lib/spree/testing_support/factories/order_factory.rb
@@ -47,14 +47,20 @@ FactoryBot.define do
without_line_items { false }
shipment_cost { 100 }
shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
+ variants { [] }
end
after(:create) do |order, evaluator|
- unless evaluator.without_line_items
+ if evaluator.variants.empty? && !evaluator.without_line_items
create_list(:line_item, evaluator.line_items_count, order: order, price: evaluator.line_items_price)
order.line_items.reload
end
+ if evaluator.variants.any?
+ evaluator.variants.each { |variant| create(:line_item, order: order, product: variant.product, variant: variant, price: evaluator.line_items_price) }
+ order.line_items.reload
+ end
+
stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
order.shipments.reload