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.

Customer Groups (#13452)

Damian Legawiec8ee670d6bbfb
diff --git a/CLAUDE.md b/CLAUDE.md
index 4ab19fdd61..5f6b8f2981 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -68,6 +68,7 @@ Always inherit from `Spree.base_class` when creating models.
- Include `Spree::Metafields` concern for models that need metadata support
- Don't use enums, use string columns instead
- For models that require state machine, please use https://github.com/state-machines/state_machines-activerecord gem, default column should be `status`, legacy models use `state`
+- Don't ever cast IDs to integer, we need to support also UUIDs so please always treat IDs as strings
```ruby
# ✅ Good model structure
@@ -151,6 +152,7 @@ This will create a dummy rails application and run migrations. If there's alread
- For controller specs always add `render_views` to the test
- For controller spec authentication use `stub_authorization!`
- Don't create test scenarios for standard rails validation, only for custom validations
+- For time-based testing / operations use `Timecop` gem
```ruby
# ✅ Proper spec structure
diff --git a/admin/app/controllers/spree/admin/customer_group_users_controller.rb b/admin/app/controllers/spree/admin/customer_group_users_controller.rb
new file mode 100644
index 0000000000..14524d8a8d
--- /dev/null
+++ b/admin/app/controllers/spree/admin/customer_group_users_controller.rb
@@ -0,0 +1,77 @@
+module Spree
+ module Admin
+ class CustomerGroupUsersController < ResourceController
+ include BulkOperationsConcern
+
+ prepend_before_action :set_customer_group
+
+ def bulk_new
+ # Render the drawer form for adding users
+ end
+
+ def bulk_create
+ @customer_group.add_customers(bulk_collection.pluck(:id))
+
+ @collection = collection
+
+ flash.now[:success] = Spree.t(:customers_added_to_group, count: bulk_collection.size)
+ end
+
+ def create
+ user_ids = params[:user_ids].to_a.reject(&:blank?)
+
+ if user_ids.empty?
+ flash[:error] = Spree.t(:no_users_selected)
+ redirect_to spree.admin_customer_group_path(@customer_group)
+ return
+ end
+
+ added_count = @customer_group.add_customers(user_ids)
+
+ flash[:success] = Spree.t(:customers_added_to_group, count: added_count)
+ redirect_to spree.admin_customer_group_path(@customer_group)
+ end
+
+ def destroy
+ deleted_count = @customer_group.remove_customers([params[:id]])
+
+ if deleted_count > 0
+ flash[:success] = Spree.t(:customer_removed_from_group)
+ else
+ flash[:error] = Spree.t(:customer_could_not_be_removed_from_group)
+ end
+
+ redirect_to spree.admin_customer_group_path(@customer_group)
+ end
+
+ def bulk_destroy
+ user_ids = Array(params[:ids]).reject(&:blank?)
+
+ if user_ids.empty?
+ flash.now[:error] = Spree.t(:no_users_selected)
+ else
+ deleted_count = @customer_group.remove_customers(user_ids)
+ flash.now[:success] = Spree.t(:customers_removed_from_group, count: deleted_count)
+ end
+ end
+
+ private
+
+ def set_customer_group
+ @customer_group = current_store.customer_groups.find(params[:customer_group_id])
+ end
+
+ def model_class
+ Spree.user_class
+ end
+
+ def scope
+ @customer_group.users.includes(:bill_address, :ship_address, avatar_attachment: :blob)
+ end
+
+ def collection_includes
+ [:bill_address, :ship_address, { avatar_attachment: :blob }]
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/customer_groups_controller.rb b/admin/app/controllers/spree/admin/customer_groups_controller.rb
new file mode 100644
index 0000000000..5157600dbd
--- /dev/null
+++ b/admin/app/controllers/spree/admin/customer_groups_controller.rb
@@ -0,0 +1,39 @@
+module Spree
+ module Admin
+ class CustomerGroupsController < ResourceController
+ add_breadcrumb_icon 'users'
+ add_breadcrumb Spree.t(:customer_groups), :admin_customer_groups_path
+
+ def select_options
+ search_params = params[:q].is_a?(String) ? { name_cont: params[:q] } : params[:q]
+ customer_groups = current_store.customer_groups.ransack(search_params).result.order(:name).limit(50)
+
+ render json: customer_groups.pluck(:id, :name).map { |id, name| { id: id, name: name } }
+ end
+
+ def show
+ add_breadcrumb @customer_group.name
+ end
+
+ private
+
+ def update_turbo_stream_enabled?
+ true
+ end
+
+ def model_class
+ Spree::CustomerGroup
+ end
+
+ def collection
+ return @collection if defined?(@collection)
+
+ @collection = super.for_store(current_store)
+ end
+
+ def permitted_resource_params
+ params.require(:customer_group).permit(permitted_customer_group_attributes)
+ end
+ end
+ end
+end
diff --git a/admin/app/controllers/spree/admin/price_rules_controller.rb b/admin/app/controllers/spree/admin/price_rules_controller.rb
index e12bfcb5e5..42ff77e015 100644
--- a/admin/app/controllers/spree/admin/price_rules_controller.rb
+++ b/admin/app/controllers/spree/admin/price_rules_controller.rb
@@ -10,13 +10,11 @@ module Spree
def model_class
@model_class = if params.dig(:price_rule, :type).present?
rule_type = params.dig(:price_rule, :type)
- rule_class = allowed_rule_types.find { |type| type.to_s == rule_type }
+ rule_class = allowed_rule_types.find { |klass| klass.name.to_s == rule_type }
- if rule_class
- rule_class.constantize
- else
- raise 'Unknown price rule type'
- end
+ raise 'Unknown price rule type' unless rule_class
+
+ rule_class
else
Spree::PriceRule
end
@@ -27,7 +25,7 @@ module Spree
end
def allowed_rule_types
- Rails.application.config.spree.pricing.rules
+ Spree.pricing.rules
end
def location_after_save
diff --git a/admin/app/controllers/spree/admin/promotion_rules_controller.rb b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
index 50e81143a3..1607948184 100644
--- a/admin/app/controllers/spree/admin/promotion_rules_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
@@ -40,7 +40,15 @@ module Spree
end
def permitted_resource_params
- params.require(:promotion_rule).permit(*permitted_promotion_rule_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })
+ permitted_preference_keys = @object.preferences.map do |key, value|
+ if value.is_a?(Array)
+ { "preferred_#{key}" => [] }
+ else
+ "preferred_#{key}"
+ end
+ end
+
+ params.require(:promotion_rule).permit(*permitted_promotion_rule_attributes, *permitted_preference_keys)
end
end
end
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rb
index 0b9933774f..957a83eccd 100644
--- a/admin/app/controllers/spree/admin/users_controller.rb
+++ b/admin/app/controllers/spree/admin/users_controller.rb
@@ -20,6 +20,30 @@ module Spree
render json: users.pluck(:id, :email).map { |id, email| { id: id, name: email } }
end
+ def search
+ query = params[:q]&.strip
+
+ head :ok and return if query.blank? || query.length < 3
+
+ scope = model_class.accessible_by(current_ability, :index)
+ scope = scope.where.not(id: params[:omit_ids].split(',')) if params[:omit_ids].present?
+ @users = scope.includes(:bill_address, :ship_address, avatar_attachment: :blob)
+ .multi_search(query)
+ .limit(params[:limit] || 10)
+
+ respond_to do |format|
+ format.turbo_stream do
+ render turbo_stream: [
+ turbo_stream.replace(
+ 'users_search_results',
+ partial: 'spree/admin/users/search_results',
+ locals: { users: @users }
+ )
+ ]
+ end
+ end
+ end
+
def show
add_breadcrumb @user.name, spree.admin_user_path(@user)
end
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rb
index b9edab2e00..de73304b2e 100644
--- a/admin/app/helpers/spree/admin/base_helper.rb
+++ b/admin/app/helpers/spree/admin/base_helper.rb
@@ -366,6 +366,11 @@ module Spree
return Spree.t(:none) if user_ids.empty?
Spree.user_class.where(id: user_ids).map { |u| u.try(:email) || u.id }.join(', ')
+ when :customer_group_ids
+ customer_group_ids = Array(value).reject(&:blank?).map(&:to_i)
+ return Spree.t(:none) if customer_group_ids.empty?
+
+ Spree::CustomerGroup.where(id: customer_group_ids).pluck(:name).join(', ')
when :country_id
Spree::Country.find_by(id: value)&.name || value
else
diff --git a/admin/app/views/spree/admin/customer_group_users/bulk_create.turbo_stream.erb b/admin/app/views/spree/admin/customer_group_users/bulk_create.turbo_stream.erb
new file mode 100644
index 0000000000..1da9bc39b9
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_group_users/bulk_create.turbo_stream.erb
@@ -0,0 +1,15 @@
+<%= turbo_close_drawer %>
+
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace :customer_group_users do %>
+ <%= render template: 'spree/admin/customer_group_users/index' %>
+<% end %>
+
+<%= turbo_stream.replace 'customers_header' do %>
+ <%= render 'spree/admin/customer_groups/customers_header' %>
+<% end %>
+
+<%= turbo_stream.update 'customer_group_users_count' do %>
+ <%= @customer_group.users_count %>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/customer_group_users/bulk_destroy.turbo_stream.erb b/admin/app/views/spree/admin/customer_group_users/bulk_destroy.turbo_stream.erb
new file mode 100644
index 0000000000..267e260c8e
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_group_users/bulk_destroy.turbo_stream.erb
@@ -0,0 +1,17 @@
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace 'bulk-dialog' do %>
+ <%= render 'spree/admin/shared/bulk_modal' %>
+<% end %>
+
+<% params[:ids]&.each do |id| %>
+ <%= turbo_stream.remove("user_#{id}") %>
+<% end %>
+
+<%= turbo_stream.replace 'customers_header' do %>
+ <%= render 'spree/admin/customer_groups/customers_header' %>
+<% end %>
+
+<%= turbo_stream.update 'customer_group_users_count' do %>
+ <%= @customer_group.users_count %>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/customer_group_users/bulk_new.html.erb b/admin/app/views/spree/admin/customer_group_users/bulk_new.html.erb
new file mode 100644
index 0000000000..e66f829dca
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_group_users/bulk_new.html.erb
@@ -0,0 +1,27 @@
+<%= turbo_frame_tag :drawer do %>
+ <div data-controller="search-picker" class="flex flex-col justify-between h-full">
+ <%= drawer_header(Spree.t(:add_customers)) %>
+
+ <div class="drawer-body border-b flex-none">
+ <%= form_with url: spree.search_admin_users_path, method: :post, data: { controller: 'auto-submit' } do |form| %>
+ <%= form.hidden_field :omit_ids, value: @customer_group.users.pluck(:id).join(',') %>
+ <%= form.search_field :q, value: params[:q], class: 'form-input w-full', placeholder: Spree.t(:search_customers), data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
+ <% end %>
+ </div>
+
+ <%= form_with url: spree.bulk_create_admin_customer_group_customer_group_users_path(@customer_group), method: :post, class: 'grow flex flex-col justify-between' do |form| %>
+ <div class="drawer-body grow">
+ <div id="users_search_results" class="search-results overflow-y-auto max-h-96">
+ <p class="text-gray-500 text-center py-8">
+ <%= Spree.t(:type_to_search_customers) %>
+ </p>
+ </div>
+ </div>
+
+ <div class="drawer-footer">
+ <%= turbo_save_button_tag Spree.t(:add_selected), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
+ <%= drawer_discard_button %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/customer_group_users/index.html.erb b/admin/app/views/spree/admin/customer_group_users/index.html.erb
new file mode 100644
index 0000000000..c6f743130d
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_group_users/index.html.erb
@@ -0,0 +1 @@
+<%= render_table @collection, :customer_group_users, container_class: 'card-body p-0', bulk_operations: true %>
diff --git a/admin/app/views/spree/admin/customer_groups/_customers_header.html.erb b/admin/app/views/spree/admin/customer_groups/_customers_header.html.erb
new file mode 100644
index 0000000000..7200ef9c75
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/_customers_header.html.erb
@@ -0,0 +1,12 @@
+<div class="card-header flex justify-between items-center border-gray-200 pr-3" id="customers_header">
+ <h5 class="card-title flex items-center gap-2">
+ <%= Spree.t(:customers) %>
+ <span class="badge badge-info"><%= @customer_group.users_count %></span>
+ </h5>
+ <div class="flex gap-2">
+ <%= link_to_with_icon 'plus', Spree.t(:add_customers),
+ spree.bulk_new_admin_customer_group_customer_group_users_path(@customer_group),
+ class: 'btn btn-sm btn-primary',
+ data: { action: 'drawer#open', turbo_frame: :drawer } if can?(:update, @customer_group) %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/customer_groups/_details.html.erb b/admin/app/views/spree/admin/customer_groups/_details.html.erb
new file mode 100644
index 0000000000..c98aac8474
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/_details.html.erb
@@ -0,0 +1,59 @@
+<div class="card mb-6" id="<%= spree_dom_id(@customer_group) %>_details">
+ <div class="card-header flex justify-between">
+ <h5 class="card-title">
+ <%= Spree.t(:details) %>
+ </h5>
+ <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_customer_group_path(@customer_group),
+ class: 'btn btn-sm btn-light', data: { turbo_frame: :drawer, action: 'drawer#open' } if can?(:update, @customer_group) %>
+ </div>
+ <div class="card-body p-0">
+ <ul class="list-group list-group-flush">
+ <li class="list-group-item flex justify-between items-center">
+ <span class="text-gray-600">
+ <%= Spree.t(:name) %>
+ </span>
+ <span>
+ <%= @customer_group.name %>
+ </span>
+ </li>
+
+ <% if @customer_group.description.present? %>
+ <li class="list-group-item flex justify-between items-top gap-10">
+ <span class="text-gray-600">
+ <%= Spree.t(:description) %>
+ </span>
+ <span class="text-right">
+ <%= @customer_group.description %>
+ </span>
+ </li>
+ <% end %>
+
+ <li class="list-group-item flex justify-between items-center">
+ <span class="text-gray-600">
+ <%= Spree.t(:customers) %>
+ </span>
+ <span id="customer_group_users_count">
+ <%= @customer_group.users_count %>
+ </span>
+ </li>
+
+ <li class="list-group-item flex justify-between items-center">
+ <span class="text-gray-600">
+ <%= Spree.t(:created_at) %>
+ </span>
+ <span>
+ <%= spree_time(@customer_group.created_at, format: :long) %>
+ </span>
+ </li>
+
+ <li class="list-group-item flex justify-between items-center">
+ <span class="text-gray-600">
+ <%= Spree.t(:updated_at) %>
+ </span>
+ <span>
+ <%= spree_time(@customer_group.updated_at, format: :long) %>
+ </span>
+ </li>
+ </ul>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/customer_groups/_form.html.erb b/admin/app/views/spree/admin/customer_groups/_form.html.erb
new file mode 100644
index 0000000000..ab89b1a768
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/_form.html.erb
@@ -0,0 +1,6 @@
+<div class="card mb-6">
+ <div class="card-body">
+ <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
+ <%= f.spree_text_area :description %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/customer_groups/edit.html.erb b/admin/app/views/spree/admin/customer_groups/edit.html.erb
new file mode 100644
index 0000000000..7a4cc4153e
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/edit.html.erb
@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource_in_drawer' %>
diff --git a/admin/app/views/spree/admin/customer_groups/index.html.erb b/admin/app/views/spree/admin/customer_groups/index.html.erb
new file mode 100644
index 0000000000..a55a033619
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/index.html.erb
@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+ <%= Spree.t(:customer_groups) %>
+<% end %>
+
+<% content_for :page_actions do %>
+ <%= link_to_with_icon 'plus', Spree.t(:new_customer_group), spree.new_admin_customer_group_path, class: 'btn btn-primary' if can?(:create, Spree::CustomerGroup) %>
+<% end %>
+
+<%= render_table @collection, :customer_groups %>
diff --git a/admin/app/views/spree/admin/customer_groups/new.html.erb b/admin/app/views/spree/admin/customer_groups/new.html.erb
new file mode 100644
index 0000000000..65a817edc9
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/new.html.erb
@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>
diff --git a/admin/app/views/spree/admin/customer_groups/show.html.erb b/admin/app/views/spree/admin/customer_groups/show.html.erb
new file mode 100644
index 0000000000..e88ca5ff45
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/show.html.erb
@@ -0,0 +1,19 @@
+<% content_for :page_title do %>
+ <%= page_header_back_button(spree.admin_customer_groups_path) %>
+ <%= @customer_group.name %>
+<% end %>
+
+<div class="grid grid-cols-12 gap-6">
+ <div class="col-span-12 lg:col-span-8">
+ <div class="card mb-6">
+ <%= render 'customers_header' %>
+ <%= turbo_frame_tag :customer_group_users, src: spree.admin_customer_group_customer_group_users_path(@customer_group) do %>
+ <%= render 'spree/admin/shared/spinner' %>
+ <% end %>
+ </div>
+ </div>
+
+ <div class="col-span-12 lg:col-span-4">
+ <%= render 'details' %>
+ </div>
+</div>
diff --git a/admin/app/views/spree/admin/customer_groups/update.turbo_stream.erb b/admin/app/views/spree/admin/customer_groups/update.turbo_stream.erb
new file mode 100644
index 0000000000..0de9154fb4
--- /dev/null
+++ b/admin/app/views/spree/admin/customer_groups/update.turbo_stream.erb
@@ -0,0 +1,17 @@
+<% if @customer_group.valid? %>
+ <%= turbo_close_drawer %>
+ <%= turbo_render_alerts %>
+
+ <%= turbo_stream.replace spree_dom_id(@customer_group) + '_details' do %>
+ <%= render 'spree/admin/customer_groups/details' %>
+ <% end %>
+
+ <%= turbo_stream.update 'page_title' do %>
+ <%= page_header_back_button(spree.admin_customer_groups_path) %>
+ <%= @customer_group.name %>
+ <% end %>
+<% else %>
+ <%= turbo_stream.replace :drawer do %>
+ <%= render 'spree/admin/shared/edit_resource_in_drawer' %>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/price_rules/forms/_customer_group_rule.html.erb b/admin/app/views/spree/admin/price_rules/forms/_customer_group_rule.html.erb
new file mode 100644
index 0000000000..55cce5bf61
--- /dev/null
+++ b/admin/app/views/spree/admin/price_rules/forms/_customer_group_rule.html.erb
@@ -0,0 +1,9 @@
+<div class="form-group">
+ <%= f.label :preferred_customer_group_ids, Spree.t(:customer_groups) %>
+ <%= tom_select_tag "price_rule[preferred_customer_group_ids][]",
+ multiple: true,
+ url: spree.select_options_admin_customer_groups_path,
+ active_option: f.object.preferred_customer_group_ids,
+ preloaded_options: Spree::CustomerGroup.where(id: f.object.preferred_customer_group_ids).pluck(:name, :id)
+ %>
+</div>
diff --git a/admin/app/views/spree/admin/price_rules/new.html.erb b/admin/app/views/spree/admin/price_rules/new.html.erb
index c1e9ddc95c..8a4de4a582 100644
--- a/admin/app/views/spree/admin/price_rules/new.html.erb
+++ b/admin/app/views/spree/admin/price_rules/new.html.erb
@@ -5,14 +5,13 @@
<% else %>
<%= dialog_header(@price_rule.class.human_name) %>
<% end %>
- <div class="dialog-body">
+ <div class="dialog-body overflow-visible">
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @price_rule } %>
<% if @price_rule.type.nil? %>
- <% allowed_rule_types.each do |rule_type| %>
- <% rule_class = rule_type.constantize %>
+ <% allowed_rule_types.each do |rule_class| %>
<% key = rule_class.name.demodulize.underscore %>
- <%= link_to spree.new_admin_price_list_price_rule_path(@price_list, price_rule: { type: rule_type }), class: 'flex align-items-top w-full py-2 px-4 hover:bg-gray-100 rounded-xl mb-2 no-underline', data: { turbo_prefetch: false } do %>
- <%= radio_button_tag :type, rule_type, class: 'hidden' %>
+ <%= link_to spree.new_admin_price_list_price_rule_path(@price_list, price_rule: { type: rule_class.name }), class: 'flex align-items-top w-full py-2 px-4 hover:bg-gray-100 rounded-xl mb-2 no-underline', data: { turbo_prefetch: false } do %>
+ <%= radio_button_tag :type, rule_class.name, class: 'hidden' %>
<div class="">
<h6 class="font-bold mb-1"><%= rule_class.human_name %></h6>
<p class="text-gray-600 mb-0"><%= rule_class.description %></p>
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_customer_group.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_customer_group.html.erb
new file mode 100644
index 0000000000..33298f2957
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_customer_group.html.erb
@@ -0,0 +1,9 @@
+<div class="form-group">
+ <%= label_tag "promotion_rule[preferred_customer_group_ids][]", Spree.t('customer_group_rule.choose_customer_groups') %>
+ <%= tom_select_tag "promotion_rule[preferred_customer_group_ids][]",
+ multiple: true,
+ url: spree.select_options_admin_customer_groups_path,
+ active_option: f.object.preferred_customer_group_ids,
+ preloaded_options: Spree::CustomerGroup.where(id: f.object.preferred_customer_group_ids).pluck(:name, :id)
+ %>
+</div>
diff --git a/admin/app/views/spree/admin/promotion_rules/new.html.erb b/admin/app/views/spree/admin/promotion_rules/new.html.erb
index 7350926e35..bcbe027b82 100644
--- a/admin/app/views/spree/admin/promotion_rules/new.html.erb
+++ b/admin/app/views/spree/admin/promotion_rules/new.html.erb
@@ -5,7 +5,7 @@
<% else %>
<%= dialog_header(@promotion_rule.human_name) %>
<% end %>
- <div class="dialog-body">
+ <div class="dialog-body <% if @promotion_rule.type.present? %>overflow-visible<% end %>">
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
<% if @promotion_rule.type.nil? %>
<% options_for_promotion_rule_types(@promotion).each do |rule_type| %>
diff --git a/admin/app/views/spree/admin/users/_details.html.erb b/admin/app/views/spree/admin/users/_details.html.erb
index 3d5a1eae02..0463cd859c 100644
--- a/admin/app/views/spree/admin/users/_details.html.erb
+++ b/admin/app/views/spree/admin/users/_details.html.erb
@@ -33,10 +33,10 @@
<%= active_badge(@user.accepts_email_marketing?) %>
</li>
<li class="list-group-item flex justify-between items-center">
- <%= Spree.t(:tags) %>
+ <%= Spree.t(:customer_groups) %>
<span>
- <% @user.tag_list.each do |tag| %>
- <span class="badge badge-light"><%= tag %></span>
+ <% @user.customer_groups.each do |group| %>
+ <%= link_to group.name, spree.admin_customer_group_path(group), class: 'inline-flex items-center text-blue-500 no-underline hover:text-blue-600 hover:bg-blue-50 p-1 rounded' %>
<% end %>
</span>
</li>
@@ -48,6 +48,14 @@
<% end %>
</span>
</li>
+ <li class="list-group-item flex justify-between items-center">
+ <%= Spree.t(:tags) %>
+ <span>
+ <% @user.tag_list.each do |tag| %>
+ <span class="badge badge-light"><%= tag %></span>
+ <% end %>
+ </span>
+ </li>
<% end %>
</ul>
</div>
diff --git a/admin/app/views/spree/admin/users/_form.html.erb b/admin/app/views/spree/admin/users/_form.html.erb
index 553004d76f..9ac1b764b6 100644
--- a/admin/app/views/spree/admin/users/_form.html.erb
+++ b/admin/app/views/spree/admin/users/_form.html.erb
@@ -8,6 +8,12 @@
<%= f.label :tag_list, Spree.t(:tags) %>
<%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-full', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>
</div>
+ <% if current_store.customer_groups.any? %>
+ <%= f.spree_select :customer_group_ids,
+ options_from_collection_for_select(current_store.customer_groups, 'id', 'name', @user.customer_group_ids),
+ { prompt: false, label: Spree.t(:customer_groups), autocomplete: true },
+ { multiple: true } %>
+ <% end %>
<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>
<%= f.spree_select :spree_role_ids,
options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
diff --git a/admin/app/views/spree/admin/users/_search_result.html.erb b/admin/app/views/spree/admin/users/_search_result.html.erb
new file mode 100644
index 0000000000..6227214244
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_search_result.html.erb
@@ -0,0 +1,13 @@
+<div class="search-picker__option" data-action="click->search-picker#toggle">
+ <%= check_box_tag "ids[]", user.id, false, id: "ids_#{user.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>
+ <label for="ids_<%= user.id %>">
+ <%= render_avatar(user, width: 40, height: 40) %>
+ <div class="ml-4">
+ <% if customer_full_name(user).present? %>
+ <span class="font-medium"><%= highlight(customer_full_name(user), params[:q]) %></span>
+ <br>
+ <% end %>
+ <span class="text-gray-600 text-sm"><%= highlight(user.email, params[:q]) %></span>
+ </div>
+ </label>
+</div>
diff --git a/admin/app/views/spree/admin/users/_search_results.html.erb b/admin/app/views/spree/admin/users/_search_results.html.erb
new file mode 100644
index 0000000000..7e4835f5ba
--- /dev/null
+++ b/admin/app/views/spree/admin/users/_search_results.html.erb
@@ -0,0 +1,9 @@
+<div id="users_search_results" class="search-results">
+ <% if users.any? %>
+ <%= render collection: users, partial: 'spree/admin/users/search_result', as: :user %>
+ <% else %>
+ <p class="text-gray-600 text-center py-12">
+ <%= Spree.t(:no_customers_found) %>
+ </p>
+ <% end %>
+</div>
diff --git a/admin/config/initializers/spree_admin_navigation.rb b/admin/config/initializers/spree_admin_navigation.rb
index bd9139dda5..dce8335c85 100644
--- a/admin/config/initializers/spree_admin_navigation.rb
+++ b/admin/config/initializers/spree_admin_navigation.rb
@@ -152,6 +152,14 @@ Rails.application.config.after_initialize do
icon: 'users',
position: 40,
if: -> { can?(:manage, Spree.user_class) } do |customers|
+ # Customer Groups
+ customers.add :customer_groups,
+ label: :customer_groups,
+ url: :admin_customer_groups_path,
+ position: 5,
+ active: -> { %w[customer_groups customer_group_users].include?(controller_name) },
+ if: -> { can?(:manage, Spree::CustomerGroup) }
+
# Newsletter Subscribers
customers.add :newsletter_subscribers,
label: :newsletter_subscribers,
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index b643eeb02c..09a9e88a89 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -1529,4 +1529,94 @@ Rails.application.config.after_initialize do
button_class: 'btn-danger',
method: :delete,
position: 10
+
+ # ==========================================
+ # Customer Groups Table
+ # ==========================================
+ Spree.admin.tables.register(:customer_groups, model_class: Spree::CustomerGroup, search_param: :name_cont, link_to_action: :show)
+
+ Spree.admin.tables.customer_groups.add :name,
+ label: :name,
+ type: :link,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 10
+
+ Spree.admin.tables.customer_groups.add :description,
+ label: :description,
+ type: :string,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 20,
+ method: ->(cg) { cg.description.to_s.truncate(50) }
+
+ Spree.admin.tables.customer_groups.add :users_count,
+ label: :customers,
+ type: :number,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 30,
+ method: ->(cg) { cg.users_count }
+
+ Spree.admin.tables.customer_groups.add :created_at,
+ label: :created_at,
+ type: :datetime,
+ sortable: true,
+ filterable: true,
+ default: false,
+ position: 40
+
+ Spree.admin.tables.customer_groups.add :updated_at,
+ label: :updated_at,
+ type: :datetime,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 50
+
+ # ==========================================
+ # Customer Group Users Table (users within a customer group)
+ # ==========================================
+ Spree.admin.tables.register(:customer_group_users, model_class: Spree.user_class, search_param: :multi_search, row_actions: false, new_resource: false)
+
+ Spree.admin.tables.customer_group_users.add :name,
+ label: :name,
+ type: :custom,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 10,
+ ransack_attribute: 'first_name',
+ partial: 'spree/admin/shared/user',
+ partial_locals: ->(record) { { user: record } }
+
+ Spree.admin.tables.customer_group_users.add :location,
+ label: :location,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: false,
+ position: 20,
+ partial: 'spree/admin/tables/columns/user_location'
+
+ Spree.admin.tables.customer_group_users.add :created_at,
+ label: :added_at,
+ type: :datetime,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 30
+
+ Spree.admin.tables.customer_group_users.add_bulk_action :remove_from_customer_group,
+ label: 'admin.bulk_ops.customer_group_users.title.remove',
+ icon: 'trash',
+ action_path: ->(view_context) { view_context.spree.bulk_destroy_admin_customer_group_customer_group_users_path(view_context.instance_variable_get(:@customer_group)) },
+ body: 'admin.bulk_ops.customer_group_users.body.remove',
+ button_text: :remove,
+ button_class: 'btn-danger',
+ method: :delete,
+ position: 10
end
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 43ae133044..89a0973aae 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -7,6 +7,11 @@ en:
avg_order_value: Avg. Order Value
back_to_dashboard: Back to dashboard
bulk_ops:
+ customer_group_users:
+ body:
+ remove: Are you sure you want to remove the selected customers from this group?
+ title:
+ remove: Remove from Group
price_list_products:
body:
remove: Are you sure you want to remove the selected products from this price list? This will also remove their prices.
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index f2c611bc0f..d2628a76e1 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -125,10 +125,23 @@ Spree::Core::Engine.add_routes do
resources :gift_cards
collection do
+ post :search
post :bulk_add_tags
post :bulk_remove_tags
end
end
+ resources :customer_groups do
+ collection do
+ get :select_options, defaults: { format: :json }
+ end
+ resources :customer_group_users, only: [:index, :create, :destroy] do
+ collection do
+ get :bulk_new
+ post :bulk_create
+ delete :bulk_destroy
+ end
+ end
+ end
resources :newsletter_subscribers, only: [:index, :destroy]
resources :addresses, except: [:index, :show]
diff --git a/admin/spec/controllers/spree/admin/customer_group_users_controller_spec.rb b/admin/spec/controllers/spree/admin/customer_group_users_controller_spec.rb
new file mode 100644
index 0000000000..07f536c2ee
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/customer_group_users_controller_spec.rb
@@ -0,0 +1,206 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::CustomerGroupUsersController, type: :controller do
+ stub_authorization!
+ render_views
+
+ let(:store) { @default_store }
+ let(:customer_group) { create(:customer_group, store: store) }
+
+ describe 'GET #index' do
+ subject(:index) { get :index, params: { customer_group_id: customer_group.id } }
+
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+
+ before do
+ customer_group.add_customers([user1.id, user2.id])
+ end
+
+ it 'returns success' do
+ index
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'renders the list of users in the group' do
+ index
+
+ expect(response).to render_template(:index)
+ expect(assigns[:collection]).to include(user1, user2)
+ end
+
+ it 'does not include users not in the group' do
+ other_user = create(:user)
+ index
+
+ expect(assigns[:collection]).not_to include(other_user)
+ end
+ end
+
+ describe 'GET #bulk_new' do
+ subject(:bulk_new) { get :bulk_new, params: { customer_group_id: customer_group.id } }
+
+ it 'returns success' do
+ bulk_new
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'renders the bulk_new template' do
+ bulk_new
+ expect(response).to render_template(:bulk_new)
+ end
+ end
+
+ describe 'POST #create' do
+ subject(:create_membership) { post :create, params: { customer_group_id: customer_group.id, user_ids: user_ids } }
+
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+ let(:user_ids) { [user1.id, user2.id] }
+
+ it 'redirects to customer group page' do
+ create_membership
+ expect(response).to redirect_to(spree.admin_customer_group_path(customer_group))
+ end
+
+ it 'adds users to the customer group' do
+ expect { create_membership }.to change(Spree::CustomerGroupUser, :count).by(2)
+
+ expect(customer_group.users).to include(user1, user2)
+ end
+
+ it 'sets success flash message' do
+ create_membership
+ expect(flash[:success]).to eq(Spree.t(:customers_added_to_group, count: 2))
+ end
+
+ context 'when no users are selected' do
+ let(:user_ids) { [] }
+
+ it 'does not create any memberships and shows error' do
+ expect { create_membership }.not_to change(Spree::CustomerGroupUser, :count)
+
+ expect(flash[:error]).to eq(Spree.t(:no_users_selected))
+ end
+ end
+
+ context 'when user is already in the group' do
+ before { customer_group.add_customers([user1.id]) }
+
+ it 'only adds new users' do
+ expect { create_membership }.to change(Spree::CustomerGroupUser, :count).by(1)
+
+ expect(customer_group.users.count).to eq(2)
+ end
+ end
+ end
+
+ describe 'DELETE #destroy' do
+ subject(:destroy_membership) { delete :destroy, params: { customer_group_id: customer_group.id, id: user.id } }
+
+ let(:user) { create(:user) }
+
+ before do
+ customer_group.add_customers([user.id])
+ end
+
+ it 'redirects to customer group page' do
+ destroy_membership
+ expect(response).to redirect_to(spree.admin_customer_group_path(customer_group))
+ end
+
+ it 'removes the user from the customer group' do
+ expect { destroy_membership }.to change(Spree::CustomerGroupUser, :count).by(-1)
+
+ expect(customer_group.reload.users).not_to include(user)
+ end
+
+ it 'sets success flash message' do
+ destroy_membership
+ expect(flash[:success]).to eq(Spree.t(:customer_removed_from_group))
+ end
+
+ context 'when user is not in the group' do
+ let(:other_user) { create(:user) }
+
+ it 'sets error flash message' do
+ delete :destroy, params: { customer_group_id: customer_group.id, id: other_user.id }
+ expect(flash[:error]).to eq(Spree.t(:customer_could_not_be_removed_from_group))
+ end
+ end
+ end
+
+ describe 'POST #bulk_create' do
+ subject(:bulk_create) { post :bulk_create, params: { customer_group_id: customer_group.id, ids: user_ids }, format: :turbo_stream }
+
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+ let(:user_ids) { [user1.id, user2.id] }
+
+ it 'returns success' do
+ bulk_create
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'adds selected users to the customer group' do
+ expect { bulk_create }.to change(Spree::CustomerGroupUser, :count).by(2)
+
+ expect(customer_group.users).to include(user1, user2)
+ end
+
+ it 'sets success flash message' do
+ bulk_create
+ expect(flash[:success]).to eq(Spree.t(:customers_added_to_group, count: 2))
+ end
+
+ context 'when user is already in the group' do
+ before { customer_group.add_customers([user1.id]) }
+
+ it 'only adds new users' do
+ expect { bulk_create }.to change(Spree::CustomerGroupUser, :count).by(1)
+
+ expect(customer_group.users.count).to eq(2)
+ end
+ end
+ end
+
+ describe 'DELETE #bulk_destroy' do
+ subject(:bulk_destroy) { delete :bulk_destroy, params: { customer_group_id: customer_group.id, ids: user_ids }, format: :turbo_stream }
+
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+ let(:user3) { create(:user) }
+ let(:user_ids) { [user1.id, user2.id] }
+
+ before do
+ customer_group.add_customers([user1.id, user2.id, user3.id])
+ end
+
+ it 'returns success' do
+ bulk_destroy
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'removes selected users from the customer group' do
+ expect { bulk_destroy }.to change(Spree::CustomerGroupUser, :count).by(-2)
+
+ customer_group.reload
+ expect(customer_group.users).not_to include(user1, user2)
+ expect(customer_group.users).to include(user3)
+ end
+
+ it 'sets success flash message' do
+ bulk_destroy
+ expect(flash[:success]).to eq(Spree.t(:customers_removed_from_group, count: 2))
+ end
+
+ context 'when no users are selected' do
+ let(:user_ids) { [] }
+
+ it 'sets error flash message' do
+ bulk_destroy
+ expect(flash[:error]).to eq(Spree.t(:no_users_selected))
+ end
+ end
+ end
+end
diff --git a/admin/spec/controllers/spree/admin/customer_groups_controller_spec.rb b/admin/spec/controllers/spree/admin/customer_groups_controller_spec.rb
new file mode 100644
index 0000000000..2581401844
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/customer_groups_controller_spec.rb
@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::CustomerGroupsController, type: :controller do
+ stub_authorization!
+ render_views
+
+ let(:store) { @default_store }
+
+ describe 'GET #index' do
+ subject(:index) { get :index }
+
+ let!(:customer_group) { create(:customer_group, store: store) }
+
+ it 'renders the list of customer groups' do
+ index
+
+ expect(response).to render_template(:index)
+ expect(assigns[:collection]).to include(customer_group)
+ end
+ end
+
+ describe 'GET #new' do
+ subject(:new) { get :new }
+
+ it 'renders the new customer group page' do
+ new
+ expect(response).to render_template(:new)
+ end
+ end
+
+ describe 'POST #create' do
+ subject(:create_customer_group) { post :create, params: { customer_group: customer_group_params } }
+
+ let(:customer_group_params) do
+ {
+ name: 'VIP Customers',
+ description: 'Our most valued customers'
+ }
+ end
+
+ it 'creates a new customer group' do
+ expect { create_customer_group }.to change(Spree::CustomerGroup, :count).by(1)
+
+ customer_group = Spree::CustomerGroup.last
+ expect(customer_group.name).to eq('VIP Customers')
+ expect(customer_group.description).to eq('Our most valued customers')
+ expect(customer_group.store).to eq(store)
+ end
+ end
+
+ describe 'GET #show' do
+ subject(:show) { get :show, params: { id: customer_group.id } }
+
+ let(:customer_group) { create(:customer_group, store: store) }
+
+ it 'renders the show page' do
+ show
+ expect(response).to render_template(:show)
+ expect(assigns[:customer_group]).to eq(customer_group)
+ end
+ end
+
+ describe 'GET #edit' do
+ subject(:edit) { get :edit, params: { id: customer_group.id } }
+
+ let(:customer_group) { create(:customer_group, store: store) }
+
+ it 'renders the edit page' do
+ edit
+ expect(response).to render_template(:edit)
+ end
+ end
+
+ describe 'PUT #update' do
+ let!(:customer_group) { create(:customer_group, store: store) }
+ let(:customer_group_params) do
+ {
+ name: 'Premium Customers',
+ description: 'Updated description'
+ }
+ end
+
+ it 'updates the customer group' do
+ put :update, params: { id: customer_group.id, customer_group: customer_group_params }
+ customer_group.reload
+
+ expect(customer_group.name).to eq('Premium Customers')
+ expect(customer_group.description).to eq('Updated description')
+ end
+
+ context 'with turbo_stream format' do
+ subject(:update_turbo) { put :update, params: { id: customer_group.id, customer_group: customer_group_params }, format: :turbo_stream }
+
+ it 'returns turbo_stream response' do
+ update_turbo
+ expect(response.media_type).to eq('text/vnd.turbo-stream.html')
+ end
+
+ it 'updates the customer group' do
+ update_turbo
+ customer_group.reload
+
+ expect(customer_group.name).to eq('Premium Customers')
+ end
+
+ context 'with invalid params' do
+ let(:customer_group_params) { { name: '' } }
+
+ it 'renders the edit form in drawer' do
+ update_turbo
+ expect(response.body).to include('drawer')
+ end
+ end
+ end
+ end
+
+ describe 'DELETE #destroy' do
+ subject(:destroy_customer_group) { delete :destroy, params: { id: customer_group.id } }
+
+ let!(:customer_group) { create(:customer_group, store: store) }
+
+ it 'destroys the customer group' do
+ expect { destroy_customer_group }.to change(Spree::CustomerGroup, :count).by(-1)
+ end
+ end
+
+ describe 'GET #select_options' do
+ subject(:select_options) { get :select_options, params: { q: 'VIP' }, format: :json }
+
+ let!(:vip_group) { create(:customer_group, name: 'VIP', store: store) }
+ let!(:other_group) { create(:customer_group, name: 'Regular', store: store) }
+
+ it 'returns matching customer groups as JSON' do
+ select_options
+
+ json_response = JSON.parse(response.body)
+ expect(json_response.length).to eq(1)
+ expect(json_response.first['name']).to eq('VIP')
+ end
+ end
+end
diff --git a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
index 4997396b3e..c2f884175e 100644
--- a/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/promotion_rules_controller_spec.rb
@@ -139,6 +139,23 @@ RSpec.describe Spree::Admin::PromotionRulesController, type: :controller do
expect(promotion_rule.preferred_eligible_values).to include(option_value.id.to_s)
end
end
+
+ context 'with customer group rule' do
+ let!(:customer_group) { create(:customer_group, store: store) }
+ let!(:other_customer_group) { create(:customer_group, store: store) }
+ let!(:promotion_rule) { create(:promotion_rule_customer_group, promotion: promotion) }
+ let(:rule_params) do
+ {
+ preferred_customer_group_ids: [customer_group.id, other_customer_group.id]
+ }
+ end
+
+ it 'updates the promotion rule with array preference' do
+ patch :update, params: { promotion_id: promotion.id, id: promotion_rule.id, promotion_rule: rule_params }
+ promotion_rule.reload
+ expect(promotion_rule.preferred_customer_group_ids).to include(customer_group.id.to_s, other_customer_group.id.to_s)
+ end
+ end
end
describe 'DELETE #destroy' do
diff --git a/admin/spec/controllers/spree/admin/users_controller_spec.rb b/admin/spec/controllers/spree/admin/users_controller_spec.rb
index 2a245ad5ea..a8dc679ea8 100644
--- a/admin/spec/controllers/spree/admin/users_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/users_controller_spec.rb
@@ -234,6 +234,61 @@ RSpec.describe Spree::Admin::UsersController, type: :controller do
end
end
+ describe 'POST #search' do
+ let!(:user_1) { create(:user, first_name: 'Alice', last_name: 'Johnson', email: '[email protected]') }
+ let!(:user_2) { create(:user, first_name: 'Bob', last_name: 'Smith', email: '[email protected]') }
+ let!(:user_3) { create(:user, first_name: 'Alice', last_name: 'Williams', email: '[email protected]') }
+
+ it 'returns users matching the search query' do
+ post :search, params: { q: 'alice' }, format: :turbo_stream
+
+ expect(response).to have_http_status(:ok)
+ expect(assigns(:users)).to include(user_1, user_3)
+ expect(assigns(:users)).not_to include(user_2)
+ end
+
+ it 'returns ok with no results for short queries' do
+ post :search, params: { q: 'al' }, format: :turbo_stream
+
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'returns ok for blank queries' do
+ post :search, params: { q: '' }, format: :turbo_stream
+
+ expect(response).to have_http_status(:ok)
+ end
+
+ it 'omits users specified in omit_ids' do
+ post :search, params: { q: 'alice', omit_ids: user_1.id.to_s }, format: :turbo_stream
+
+ expect(assigns(:users)).to include(user_3)
+ expect(assigns(:users)).not_to include(user_1)
+ end
+
+ it 'omits multiple users specified in omit_ids' do
+ post :search, params: { q: 'alice', omit_ids: "#{user_1.id},#{user_3.id}" }, format: :turbo_stream
+
+ expect(assigns(:users)).to be_empty
+ end
+
+ it 'limits results to 10 by default' do
+ 12.times { |i| create(:user, first_name: 'TestCustomer', last_name: "User#{i}") }
+
+ post :search, params: { q: 'TestCustomer' }, format: :turbo_stream
+
+ expect(assigns(:users).size).to eq(10)
+ end
+
+ it 'respects custom limit parameter' do
+ 12.times { |i| create(:user, first_name: 'TestCustomer', last_name: "User#{i}") }
+
+ post :search, params: { q: 'TestCustomer', limit: 5 }, format: :turbo_stream
+
+ expect(assigns(:users).size).to eq(5)
+ end
+ end
+
describe 'GET #select_options' do
let!(:user_1) { create(:user, email: '[email protected]') }
let!(:user_2) { create(:user, email: '[email protected]') }
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index 158a78ee4f..4eec78e1db 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -38,6 +38,8 @@ module Spree
has_many :wished_items, through: :wishlists, source: :wished_items
has_many :gateway_customers, class_name: 'Spree::GatewayCustomer', foreign_key: :user_id
has_many :gift_cards, class_name: 'Spree::GiftCard', foreign_key: :user_id, dependent: :destroy
+ has_many :customer_group_users, class_name: 'Spree::CustomerGroupUser', foreign_key: :user_id, as: :user, dependent: :destroy
+ has_many :customer_groups, through: :customer_group_users, class_name: 'Spree::CustomerGroup'
belongs_to :ship_address, class_name: 'Spree::Address', optional: true
belongs_to :bill_address, class_name: 'Spree::Address', optional: true
diff --git a/core/app/models/spree/customer_group.rb b/core/app/models/spree/customer_group.rb
new file mode 100644
index 0000000000..8206eb3300
--- /dev/null
+++ b/core/app/models/spree/customer_group.rb
@@ -0,0 +1,94 @@
+module Spree
+ class CustomerGroup < Spree.base_class
+ acts_as_paranoid
+
+ #
+ # Associations
+ #
+ belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_groups
+ has_many :customer_group_users, class_name: 'Spree::CustomerGroupUser', dependent: :destroy
+ has_many :users, through: :customer_group_users, source: :user, source_type: Spree.user_class.to_s
+
+ #
+ # Validations
+ #
+ validates :name, presence: true, uniqueness: { scope: [:store_id], conditions: -> { where(deleted_at: nil) } }
+ validates :store, presence: true
+
+ #
+ # Scopes
+ #
+ scope :for_store, ->(store) { where(store: store) }
+
+ #
+ # Instance Methods
+ #
+ def users_count
+ customer_group_users.count
+ end
+
+ # Bulk add customers to the group
+ # @param user_ids [Array] array of user IDs to add
+ # @return [Integer] number of customers added
+ def add_customers(user_ids)
+ return 0 if user_ids.blank?
+
+ user_ids = Array(user_ids).map(&:to_s).uniq
+ return 0 if user_ids.empty?
+
+ # Get existing user IDs to avoid duplicates
+ existing_user_ids = customer_group_users.where(user_id: user_ids).pluck(:user_id).map(&:to_s).to_set
+
+ now = Time.current
+ user_type = Spree.user_class.to_s
+
+ records_to_insert = user_ids.filter_map do |user_id|
+ next if existing_user_ids.include?(user_id)
+
+ {
+ customer_group_id: id,
+ user_id: user_id,
+ user_type: user_type,
+ created_at: now,
+ updated_at: now
+ }
+ end
+
+ return 0 if records_to_insert.empty?
+
+ Spree::CustomerGroupUser.upsert_all(records_to_insert, on_duplicate: :skip)
+ added_user_ids = records_to_insert.map { |r| r[:user_id] }
+ touch_users(added_user_ids)
+ touch
+
+ records_to_insert.size
+ end
+
+ # Bulk remove customers from the group
+ # @param user_ids [Array] array of user IDs to remove
+ # @return [Integer] number of customers removed
+ def remove_customers(user_ids)
+ return 0 if user_ids.blank?
+
+ user_ids = Array(user_ids).map(&:to_s).uniq
+ return 0 if user_ids.empty?
+
+ deleted_count = customer_group_users.where(user_id: user_ids).delete_all
+
+ if deleted_count > 0
+ touch_users(user_ids)
+ touch
+ end
+
+ deleted_count
+ end
+
+ private
+
+ def touch_users(user_ids)
+ return if user_ids.blank?
+
+ Spree.user_class.where(id: user_ids).touch_all
+ end
+ end
+end
diff --git a/core/app/models/spree/customer_group_user.rb b/core/app/models/spree/customer_group_user.rb
new file mode 100644
index 0000000000..330f7704b8
--- /dev/null
+++ b/core/app/models/spree/customer_group_user.rb
@@ -0,0 +1,16 @@
+module Spree
+ class CustomerGroupUser < Spree.base_class
+ #
+ # Associations
+ #
+ belongs_to :customer_group, class_name: 'Spree::CustomerGroup'
+ belongs_to :user, polymorphic: true
+
+ #
+ # Validations
+ #
+ validates :customer_group, presence: true
+ validates :user, presence: true
+ validates :customer_group_id, uniqueness: { scope: [:user_id, :user_type] }
+ end
+end
diff --git a/core/app/models/spree/price_rules/customer_group_rule.rb b/core/app/models/spree/price_rules/customer_group_rule.rb
new file mode 100644
index 0000000000..a2e87425f7
--- /dev/null
+++ b/core/app/models/spree/price_rules/customer_group_rule.rb
@@ -0,0 +1,21 @@
+module Spree
+ module PriceRules
+ class CustomerGroupRule < Spree::PriceRule
+ preference :customer_group_ids, :array, default: []
+
+ def applicable?(context)
+ return false unless context.user
+ return true if preferred_customer_group_ids.empty?
+
+ user_customer_group_ids = Spree::CustomerGroupUser.where(user_id: context.user.id).pluck(:customer_group_id).map(&:to_s)
+
+ # Compare as strings to support both integer and UUID primary keys
+ (preferred_customer_group_ids.map(&:to_s) & user_customer_group_ids).any?
+ end
+
+ def self.description
+ Spree.t('price_rules.customer_group_rule.description')
+ end
+ end
+ end
+end
diff --git a/core/app/models/spree/promotion/rules/customer_group.rb b/core/app/models/spree/promotion/rules/customer_group.rb
new file mode 100644
index 0000000000..1693cd33ed
--- /dev/null
+++ b/core/app/models/spree/promotion/rules/customer_group.rb
@@ -0,0 +1,22 @@
+module Spree
+ class Promotion
+ module Rules
+ class CustomerGroup < PromotionRule
+ preference :customer_group_ids, :array, default: []
+
+ def applicable?(promotable)
+ promotable.is_a?(Spree::Order)
+ end
+
+ def eligible?(order, _options = {})
+ return false unless order.user_id.present?
+ return false if preferred_customer_group_ids.empty?
+
+ user_customer_group_ids = Spree::CustomerGroupUser.where(user_id: order.user_id).pluck(:customer_group_id).map(&:to_s)
+
+ (preferred_customer_group_ids.map(&:to_s) & user_customer_group_ids).any?
+ end
+ end
+ end
+ end
+end
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 3274d3a534..0042c84cf0 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -116,6 +116,8 @@ module Spree
has_many :webhook_endpoints, class_name: 'Spree::WebhookEndpoint', dependent: :destroy, inverse_of: :store
has_many :webhook_deliveries, through: :webhook_endpoints, class_name: 'Spree::WebhookDelivery'
+ has_many :customer_groups, class_name: 'Spree::CustomerGroup', dependent: :destroy, inverse_of: :store
+
#
# ActionText
#
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index b150a96c9c..e48403ccef 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -50,6 +50,9 @@ en:
number: Number
verification_value: Verification Value
year: Year
+ spree/customer_group:
+ description: Description
+ name: Name
spree/gift_card:
amount_used: Amount used
expires_at: Expires at
@@ -381,6 +384,12 @@ en:
spree/credit_card:
one: Credit Card
other: Credit Cards
+ spree/customer_group:
+ one: Customer Group
+ other: Customer Groups
+ spree/customer_group_user:
+ one: Customer Group User
+ other: Customer Group Users
spree/customer_return:
one: Customer Return
other: Customer Returns
@@ -638,6 +647,7 @@ en:
add_address: Add address
add_country: Add Country
add_coupon_code: Add Coupon Code
+ add_customers: Add Customers
add_gift_card: Add Gift Card
add_link: Add link
add_new_address: Add new address
@@ -665,6 +675,7 @@ en:
add_to_waitlist: Add to waitlist
add_to_waitlist_description: Add to waitlist description
add_variant: Add Variant
+ added_at: Added At
added_to_cart: Added to cart successfully!
additional_item: Additional Item
address: Address
@@ -942,13 +953,25 @@ en:
custom_domains: Custom domains
custom_font_code: Custom font code
customer: Customer
+ customer_could_not_be_removed_from_group: Customer could not be removed from group
customer_details: Customer Details
customer_details_updated: Customer Details Updated
+ customer_group: Customer Group
+ customer_group_rule:
+ choose_customer_groups: 'Select the customer group(s) to which this promotion should apply:'
+ customer_groups: Customer Groups
+ customer_removed_from_group: Customer removed from group
customer_return: Customer Return
customer_returns: Customer Returns
customer_search: Customer Search
customer_support_email: Customer Support Email
customers: Customers
+ customers_added_to_group:
+ one: "%{count} customer added to group"
+ other: "%{count} customers added to group"
+ customers_removed_from_group:
+ one: "%{count} customer removed from group"
+ other: "%{count} customers removed from group"
cut: Cut
cvv: CVV
cvv_response: CVV Response
@@ -1379,6 +1402,7 @@ en:
new_country: New Country
new_custom_domain: New Custom Domain
new_customer: New Customer
+ new_customer_group: New Customer Group
new_customer_return: New Customer Return
new_digital_asset: New digital asset
new_domain: New domain
@@ -1450,6 +1474,8 @@ en:
no_billing_address_available: No billing address available
no_cc_type: N/A
no_country: No country set
+ no_customers_found: No customers found
+ no_customers_in_group: No customers in this group yet
no_email_provided: No email provided
no_internal_note: No internal note
no_limits_zone: No Limits
@@ -1474,6 +1500,7 @@ en:
no_state_changes: No state changes yet.
no_taxes: No taxes
no_tracking_present: No tracking details provided.
+ no_users_selected: No users selected
none: None
none_selected: None Selected
normal_amount: Normal Amount
@@ -1723,6 +1750,9 @@ en:
price_lists: Price Lists
price_range: Price Range
price_rule_types:
+ customer_group_rule:
+ description: Apply pricing to specific customer groups
+ name: Customer Group
user_rule:
description: Apply pricing to specific customers
name: User
@@ -1732,6 +1762,9 @@ en:
zone_rule:
description: Apply pricing based on geographic zone
name: Zone
+ price_rules:
+ customer_group_rule:
+ description: Apply pricing to specific customer groups
price_sack: Price Sack
prices: Prices
pricing: Pricing
@@ -1801,6 +1834,9 @@ en:
currency:
description: Limit to orders in a specific currency
name: Currency
+ customer_group:
+ description: Available only to customers in specified customer group(s)
+ name: Customer Group(s)
first_order:
description: Must be the customer's first order
name: First order
@@ -1962,6 +1998,8 @@ en:
search: Search
search_all: Search all
search_by: 'Search by:'
+ search_customers: Search customers
+ search_customers_hint: Search by email address
search_engine_listing: Search engine listing
search_order_number: Order Number
search_products: Search products
@@ -2330,6 +2368,7 @@ en:
twitter: Twitter
type: Type
type_to_search: Type to search
+ type_to_search_customers: Type to search for customers
type_to_search_products: Type to search for products
unable_to_connect_to_gateway: Unable to connect to gateway.
unable_to_create_reimbursements: Unable to create reimbursements because there are items pending manual intervention.
diff --git a/core/db/migrate/20260115120000_create_spree_customer_groups.rb b/core/db/migrate/20260115120000_create_spree_customer_groups.rb
new file mode 100644
index 0000000000..d34edbff5d
--- /dev/null
+++ b/core/db/migrate/20260115120000_create_spree_customer_groups.rb
@@ -0,0 +1,14 @@
+class CreateSpreeCustomerGroups < ActiveRecord::Migration[7.0]
+ def change
+ create_table :spree_customer_groups do |t|
+ t.references :store, null: false, index: true
+ t.string :name, null: false
+ t.text :description
+ t.timestamps
+ t.datetime :deleted_at
+ end
+
+ add_index :spree_customer_groups, [:store_id, :name], unique: true, where: 'deleted_at IS NULL'
+ add_index :spree_customer_groups, :deleted_at
+ end
+end
diff --git a/core/db/migrate/20260115120001_create_spree_customer_group_users.rb b/core/db/migrate/20260115120001_create_spree_customer_group_users.rb
new file mode 100644
index 0000000000..c65b41d96c
--- /dev/null
+++ b/core/db/migrate/20260115120001_create_spree_customer_group_users.rb
@@ -0,0 +1,14 @@
+class CreateSpreeCustomerGroupUsers < ActiveRecord::Migration[7.0]
+ def change
+ create_table :spree_customer_group_users do |t|
+ t.references :customer_group, null: false, index: true
+ t.references :user, polymorphic: true, null: false, index: true
+ t.timestamps
+ end
+
+ add_index :spree_customer_group_users,
+ [:customer_group_id, :user_id, :user_type],
+ unique: true,
+ name: 'index_spree_customer_group_users_unique'
+ end
+end
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 2d23ae9004..0e10d356c4 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -319,6 +319,14 @@ module Spree
Rails.application.config.spree.subscribers = value
end
+ def self.pricing
+ Rails.application.config.spree.pricing
+ end
+
+ def self.pricing=(value)
+ Rails.application.config.spree.pricing = value
+ end
+
def self.analytics
@analytics ||= AnalyticsConfig.new
end
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index 55cca09117..df3fedfb43 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -156,6 +156,7 @@ module Spree
Spree::Promotion::Rules::ItemTotal,
Spree::Promotion::Rules::Product,
Spree::Promotion::Rules::User,
+ Spree::Promotion::Rules::CustomerGroup,
Spree::Promotion::Rules::FirstOrder,
Spree::Promotion::Rules::UserLoggedIn,
Spree::Promotion::Rules::OneUsePerUser,
@@ -164,9 +165,10 @@ module Spree
]
Rails.application.config.spree.pricing.rules.concat [
- 'Spree::PriceRules::ZoneRule',
- 'Spree::PriceRules::UserRule',
- 'Spree::PriceRules::VolumeRule'
+ Spree::PriceRules::ZoneRule,
+ Spree::PriceRules::UserRule,
+ Spree::PriceRules::CustomerGroupRule,
+ Spree::PriceRules::VolumeRule
]
Rails.application.config.spree.promotions.actions = [
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 926ada4e93..ee6922f5f1 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -8,6 +8,7 @@ module Spree
:cms_page_attributes,
:cms_section_attributes,
:custom_domain_attributes,
+ :customer_group_attributes,
:customer_return_attributes,
:digital_attributes,
:digital_link_attributes,
@@ -104,6 +105,8 @@ module Spree
@@custom_domain_attributes = [:url, :default]
+ @@customer_group_attributes = [:name, :description]
+
@@customer_return_attributes = [:stock_location_id, {
return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
:acceptance_status, :exchange_variant_id, :resellable]
@@ -296,7 +299,7 @@ module Spree
@@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
:password_confirmation, :selected_locale, :avatar, :accepts_email_marketing, :phone,
:internal_note,
- { public_metadata: {}, private_metadata: {}, tag_list: [] }]
+ { public_metadata: {}, private_metadata: {}, tag_list: [], customer_group_ids: [] }]
@@variant_attributes = [
:name, :presentation, :cost_price, :discontinue_on, :lock_version,
diff --git a/core/lib/spree/testing_support/factories/customer_group_factory.rb b/core/lib/spree/testing_support/factories/customer_group_factory.rb
new file mode 100644
index 0000000000..94f270e3ef
--- /dev/null
+++ b/core/lib/spree/testing_support/factories/customer_group_factory.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+ factory :customer_group, class: Spree::CustomerGroup do
+ sequence(:name) { |n| "Customer Group #{n}" }
+ store { Spree::Store.default || create(:store) }
+ end
+end
diff --git a/core/lib/spree/testing_support/factories/customer_group_user_factory.rb b/core/lib/spree/testing_support/factories/customer_group_user_factory.rb
new file mode 100644
index 0000000000..9b51994b20
--- /dev/null
+++ b/core/lib/spree/testing_support/factories/customer_group_user_factory.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+ factory :customer_group_user, class: Spree::CustomerGroupUser do
+ customer_group
+ user { create(:user) }
+ end
+end
diff --git a/core/lib/spree/testing_support/factories/price_rule_factory.rb b/core/lib/spree/testing_support/factories/price_rule_factory.rb
index e2bcf76ae6..3959513d53 100644
--- a/core/lib/spree/testing_support/factories/price_rule_factory.rb
+++ b/core/lib/spree/testing_support/factories/price_rule_factory.rb
@@ -35,5 +35,15 @@ FactoryBot.define do
user_ids { [] }
end
end
+
+ factory :customer_group_price_rule, class: Spree::PriceRules::CustomerGroupRule do
+ after(:build) do |rule, evaluator|
+ rule.preferred_customer_group_ids = evaluator.customer_group_ids if evaluator.respond_to?(:customer_group_ids)
+ end
+
+ transient do
+ customer_group_ids { [] }
+ end
+ end
end
end
diff --git a/core/lib/spree/testing_support/factories/promotion_rule_factory.rb b/core/lib/spree/testing_support/factories/promotion_rule_factory.rb
index e6f9752ef1..974d3f210d 100644
--- a/core/lib/spree/testing_support/factories/promotion_rule_factory.rb
+++ b/core/lib/spree/testing_support/factories/promotion_rule_factory.rb
@@ -18,4 +18,16 @@ FactoryBot.define do
factory :promotion_rule_option_value, class: Spree::Promotion::Rules::OptionValue do
association :promotion
end
+
+ factory :promotion_rule_customer_group, class: Spree::Promotion::Rules::CustomerGroup do
+ association :promotion
+
+ after(:build) do |rule, evaluator|
+ rule.preferred_customer_group_ids = evaluator.customer_group_ids if evaluator.respond_to?(:customer_group_ids)
+ end
+
+ transient do
+ customer_group_ids { [] }
+ end
+ end
end
diff --git a/core/spec/models/spree/customer_group_spec.rb b/core/spec/models/spree/customer_group_spec.rb
new file mode 100644
index 0000000000..bfe38d29ff
--- /dev/null
+++ b/core/spec/models/spree/customer_group_spec.rb
@@ -0,0 +1,194 @@
+require 'spec_helper'
+
+RSpec.describe Spree::CustomerGroup, type: :model do
+ let(:store) { create(:store) }
+ let(:customer_group) { create(:customer_group, store: store) }
+
+ describe 'associations' do
+ it { is_expected.to belong_to(:store).optional(false) }
+ it { is_expected.to have_many(:customer_group_users).dependent(:destroy) }
+ it { is_expected.to have_many(:users).through(:customer_group_users) }
+ end
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:name) }
+ it { is_expected.to validate_presence_of(:store) }
+
+ context 'uniqueness' do
+ let!(:existing_group) { create(:customer_group, name: 'VIP', store: store) }
+
+ it 'validates uniqueness of name within store scope' do
+ new_group = build(:customer_group, name: 'VIP', store: store)
+ expect(new_group).not_to be_valid
+ expect(new_group.errors[:name]).to include('has already been taken')
+ end
+
+ it 'allows same name in different store' do
+ other_store = create(:store)
+ new_group = build(:customer_group, name: 'VIP', store: other_store)
+ expect(new_group).to be_valid
+ end
+ end
+ end
+
+ describe 'scopes' do
+ describe '.for_store' do
+ let!(:group1) { create(:customer_group, store: store) }
+ let!(:group2) { create(:customer_group, store: create(:store)) }
+
+ it 'returns groups for the specified store' do
+ expect(described_class.for_store(store)).to include(group1)
+ expect(described_class.for_store(store)).not_to include(group2)
+ end
+ end
+ end
+
+ describe '#users_count' do
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+
+ before do
+ customer_group.users << user1
+ customer_group.users << user2
+ end
+
+ it 'returns the number of users in the group' do
+ expect(customer_group.users_count).to eq(2)
+ end
+ end
+
+ describe 'soft delete' do
+ it 'supports soft deletion' do
+ customer_group.destroy
+ expect(described_class.with_deleted.find(customer_group.id)).to be_present
+ expect(described_class.find_by(id: customer_group.id)).to be_nil
+ end
+ end
+
+ describe '#add_customers' do
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+ let(:user3) { create(:user) }
+
+ it 'adds customers to the group' do
+ expect {
+ customer_group.add_customers([user1.id, user2.id])
+ }.to change { customer_group.customer_group_users.count }.by(2)
+
+ expect(customer_group.users).to include(user1, user2)
+ end
+
+ it 'returns the count of added customers' do
+ count = customer_group.add_customers([user1.id, user2.id])
+ expect(count).to eq(2)
+ end
+
+ it 'skips users already in the group' do
+ customer_group.add_customers([user1.id])
+
+ expect {
+ customer_group.add_customers([user1.id, user2.id])
+ }.to change { customer_group.customer_group_users.count }.by(1)
+
+ expect(customer_group.users.count).to eq(2)
+ end
+
+ it 'returns 0 when no users are added' do
+ customer_group.add_customers([user1.id])
+ count = customer_group.add_customers([user1.id])
+ expect(count).to eq(0)
+ end
+
+ it 'handles empty array' do
+ count = customer_group.add_customers([])
+ expect(count).to eq(0)
+ end
+
+ it 'handles nil' do
+ count = customer_group.add_customers(nil)
+ expect(count).to eq(0)
+ end
+
+ it 'touches the added users' do
+ user1.update_column(:updated_at, 1.day.ago)
+ user2.update_column(:updated_at, 1.day.ago)
+ original_updated_at = user1.reload.updated_at
+
+ customer_group.add_customers([user1.id, user2.id])
+
+ expect(user1.reload.updated_at).to be > original_updated_at
+ expect(user2.reload.updated_at).to be > original_updated_at
+ end
+
+ it 'does not touch users that were already in the group' do
+ customer_group.add_customers([user1.id])
+ user1.update_column(:updated_at, 1.day.ago)
+ original_updated_at = user1.reload.updated_at
+
+ customer_group.add_customers([user1.id, user2.id])
+
+ expect(user1.reload.updated_at).to eq(original_updated_at)
+ end
+ end
+
+ describe '#remove_customers' do
+ let(:user1) { create(:user) }
+ let(:user2) { create(:user) }
+ let(:user3) { create(:user) }
+
+ before do
+ customer_group.add_customers([user1.id, user2.id, user3.id])
+ end
+
+ it 'removes customers from the group' do
+ expect {
+ customer_group.remove_customers([user1.id, user2.id])
+ }.to change { customer_group.customer_group_users.count }.by(-2)
+
+ expect(customer_group.users).not_to include(user1, user2)
+ expect(customer_group.users).to include(user3)
+ end
+
+ it 'returns the count of removed customers' do
+ count = customer_group.remove_customers([user1.id, user2.id])
+ expect(count).to eq(2)
+ end
+
+ it 'returns 0 when users are not in the group' do
+ other_user = create(:user)
+ count = customer_group.remove_customers([other_user.id])
+ expect(count).to eq(0)
+ end
+
+ it 'handles empty array' do
+ count = customer_group.remove_customers([])
+ expect(count).to eq(0)
+ end
+
+ it 'handles nil' do
+ count = customer_group.remove_customers(nil)
+ expect(count).to eq(0)
+ end
+
+ it 'touches the removed users' do
+ user1.update_column(:updated_at, 1.day.ago)
+ user2.update_column(:updated_at, 1.day.ago)
+ original_updated_at = user1.reload.updated_at
+
+ customer_group.remove_customers([user1.id, user2.id])
+
+ expect(user1.reload.updated_at).to be > original_updated_at
+ expect(user2.reload.updated_at).to be > original_updated_at
+ end
+
+ it 'does not touch users that were not in the group' do
+ other_user = create(:user)
+ other_user.update_column(:updated_at, 1.day.ago)
+ original_updated_at = other_user.reload.updated_at
+
+ customer_group.remove_customers([other_user.id])
+
+ expect(other_user.reload.updated_at).to eq(original_updated_at)
+ end
+ end
+end
diff --git a/core/spec/models/spree/customer_group_user_spec.rb b/core/spec/models/spree/customer_group_user_spec.rb
new file mode 100644
index 0000000000..5887197b66
--- /dev/null
+++ b/core/spec/models/spree/customer_group_user_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe Spree::CustomerGroupUser, type: :model do
+ let(:customer_group) { create(:customer_group) }
+ let(:user) { create(:user) }
+
+ describe 'associations' do
+ it { is_expected.to belong_to(:customer_group).optional(false) }
+ it { is_expected.to belong_to(:user).optional(false) }
+ end
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:customer_group) }
+ it { is_expected.to validate_presence_of(:user) }
+
+ context 'uniqueness' do
+ let!(:existing) { create(:customer_group_user, customer_group: customer_group, user: user) }
+
+ it 'validates uniqueness of customer_group_id within user scope' do
+ duplicate = build(:customer_group_user, customer_group: customer_group, user: user)
+ expect(duplicate).not_to be_valid
+ expect(duplicate.errors[:customer_group_id]).to include('has already been taken')
+ end
+
+ it 'allows same user in different groups' do
+ other_group = create(:customer_group)
+ new_membership = build(:customer_group_user, customer_group: other_group, user: user)
+ expect(new_membership).to be_valid
+ end
+ end
+ end
+end
diff --git a/core/spec/models/spree/price_rules/customer_group_rule_spec.rb b/core/spec/models/spree/price_rules/customer_group_rule_spec.rb
new file mode 100644
index 0000000000..3a7ef14ca0
--- /dev/null
+++ b/core/spec/models/spree/price_rules/customer_group_rule_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Spree::PriceRules::CustomerGroupRule, type: :model do
+ let(:store) { create(:store) }
+ let(:price_list) { create(:price_list, store: store) }
+ let(:rule) { create(:customer_group_price_rule, price_list: price_list) }
+ let(:customer_group) { create(:customer_group, store: store) }
+ let(:other_customer_group) { create(:customer_group, store: store) }
+ let(:user) { create(:user) }
+ let(:variant) { create(:variant) }
+
+ describe '#applicable?' do
+ context 'when customer_group_ids preference is empty' do
+ before { rule.preferred_customer_group_ids = [] }
+
+ it 'returns true when user is present' do
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be true
+ end
+
+ it 'returns false when user is not present' do
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD')
+ expect(rule.applicable?(context)).to be false
+ end
+ end
+
+ context 'when customer_group_ids preference is set' do
+ before { rule.preferred_customer_group_ids = [customer_group.id] }
+
+ it 'returns true when context user is in the customer group' do
+ customer_group.add_customers([user.id])
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be true
+ end
+
+ it 'returns false when context user is not in the customer group' do
+ other_customer_group.add_customers([user.id])
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be false
+ end
+
+ it 'returns false when context has no user' do
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD')
+ expect(rule.applicable?(context)).to be false
+ end
+ end
+
+ context 'when customer_group_ids preference contains strings' do
+ before { rule.preferred_customer_group_ids = [customer_group.id.to_s] }
+
+ it 'returns true when context user is in the customer group' do
+ customer_group.add_customers([user.id])
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be true
+ end
+ end
+
+ context 'with multiple customer groups configured' do
+ before { rule.preferred_customer_group_ids = [customer_group.id, other_customer_group.id] }
+
+ it 'returns true when context user is in any of the customer groups' do
+ other_customer_group.add_customers([user.id])
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be true
+ end
+
+ it 'returns false when context user is not in any of the customer groups' do
+ context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', user: user)
+ expect(rule.applicable?(context)).to be false
+ end
+ end
+ end
+
+ describe '.description' do
+ it 'returns the translated description' do
+ expect(Spree::PriceRules::CustomerGroupRule.description).to eq(Spree.t('price_rules.customer_group_rule.description'))
+ end
+ end
+end
diff --git a/core/spec/models/spree/promotion/rules/customer_group_spec.rb b/core/spec/models/spree/promotion/rules/customer_group_spec.rb
new file mode 100644
index 0000000000..58bc01e917
--- /dev/null
+++ b/core/spec/models/spree/promotion/rules/customer_group_spec.rb
@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe Spree::Promotion::Rules::CustomerGroup, type: :model do
+ let(:store) { create(:store) }
+ let(:rule) { Spree::Promotion::Rules::CustomerGroup.new }
+ let(:customer_group) { create(:customer_group, store: store) }
+ let(:other_customer_group) { create(:customer_group, store: store) }
+ let(:user) { create(:user) }
+
+ describe '#applicable?' do
+ it 'returns true for orders' do
+ order = build(:order)
+ expect(rule.applicable?(order)).to be true
+ end
+
+ it 'returns false for non-orders' do
+ expect(rule.applicable?('not an order')).to be false
+ end
+ end
+
+ describe '#eligible?' do
+ let(:order) { build(:order, user: user) }
+
+ context 'when no customer groups are configured' do
+ before { rule.preferred_customer_group_ids = [] }
+
+ it 'is not eligible' do
+ expect(rule).not_to be_eligible(order)
+ end
+ end
+
+ context 'when order has no user' do
+ let(:order) { build(:order, user: nil) }
+
+ before { rule.preferred_customer_group_ids = [customer_group.id] }
+
+ it 'is not eligible' do
+ expect(rule).not_to be_eligible(order)
+ end
+ end
+
+ context 'when user is in the customer group' do
+ before do
+ customer_group.add_customers([user.id])
+ rule.preferred_customer_group_ids = [customer_group.id]
+ end
+
+ it 'is eligible' do
+ expect(rule).to be_eligible(order)
+ end
+ end
+
+ context 'when user is not in any configured customer group' do
+ before do
+ other_customer_group.add_customers([user.id])
+ rule.preferred_customer_group_ids = [customer_group.id]
+ end
+
+ it 'is not eligible' do
+ expect(rule).not_to be_eligible(order)
+ end
+ end
+
+ context 'when user is in one of multiple configured customer groups' do
+ before do
+ customer_group.add_customers([user.id])
+ rule.preferred_customer_group_ids = [customer_group.id, other_customer_group.id]
+ end
+
+ it 'is eligible' do
+ expect(rule).to be_eligible(order)
+ end
+ end
+
+ context 'when customer_group_ids contains strings' do
+ before do
+ customer_group.add_customers([user.id])
+ rule.preferred_customer_group_ids = [customer_group.id.to_s]
+ end
+
+ it 'is eligible' do
+ expect(rule).to be_eligible(order)
+ end
+ end
+ end
+end