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.

Admin: managing promotion rules finalized

Damian Legawiecfef32c086991
diff --git a/admin/app/controllers/spree/admin/promotion_rules_controller.rb b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
index 88b2bba4d6..f81aa62e07 100644
--- a/admin/app/controllers/spree/admin/promotion_rules_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
@@ -1,6 +1,6 @@
module Spree
module Admin
- class PromotionActionsController < ResourceController
+ class PromotionRulesController < ResourceController
belongs_to 'spree/promotion', find_by: :id
helper_method :allowed_rule_types
diff --git a/admin/app/helpers/spree/admin/promotion_rules_helper.rb b/admin/app/helpers/spree/admin/promotion_rules_helper.rb
index 211a7aae92..6076f5ba5b 100644
--- a/admin/app/helpers/spree/admin/promotion_rules_helper.rb
+++ b/admin/app/helpers/spree/admin/promotion_rules_helper.rb
@@ -3,9 +3,7 @@ module Spree
module PromotionRulesHelper
def options_for_promotion_rule_types(promotion)
existing = promotion.rules.map { |rule| rule.class.name }
- rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
- options = rule_names.map { |name| [Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
- options_for_select(options)
+ Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
end
def active_options_for_option_value_promotion_rule(promotion_rule)
diff --git a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb
index 40f7b7e60c..7fb82ceb03 100644
--- a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb
+++ b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb
@@ -16,15 +16,13 @@
<div class="card-body">
<p class="text-muted"><%= promotion_action.human_description %></p>
+ <% if promotion_action.preferences.present? %>
+ <%= render 'spree/admin/shared/preferences', object: promotion_action %>
+ <% end %>
+
<% if promotion_action.respond_to?(:calculator) && promotion_action.calculator.preferences.present? %>
<h6><%= Spree.t(:calculator) %>: <%= promotion_action.calculator.description %></h6>
- <p class="mb-0">
- <% promotion_action.calculator.preferences.each do |key, value| %>
- <% next if value.blank? %>
- <span><%= Spree.t(key) %></span>
- <code><%= value %></code>
- <% end %>
- </p>
+ <%= render 'spree/admin/shared/preferences', object: promotion_action.calculator %>
<% end %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/promotion_actions/edit.html.erb b/admin/app/views/spree/admin/promotion_actions/edit.html.erb
index 5291fba60e..9e3e9b3429 100644
--- a/admin/app/views/spree/admin/promotion_actions/edit.html.erb
+++ b/admin/app/views/spree/admin/promotion_actions/edit.html.erb
@@ -5,6 +5,7 @@
<h5 class="card-title"><%= @promotion_action.human_name %></h5>
</div>
<div class="card-body pb-0">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %>
<%= render "spree/admin/promotion_actions/forms/#{@promotion_action.key}", f: f %>
</div>
<div class="card-footer d-flex justify-content-between">
diff --git a/admin/app/views/spree/admin/promotion_actions/new.html.erb b/admin/app/views/spree/admin/promotion_actions/new.html.erb
index 44f3eae342..7426bc9d23 100644
--- a/admin/app/views/spree/admin/promotion_actions/new.html.erb
+++ b/admin/app/views/spree/admin/promotion_actions/new.html.erb
@@ -11,7 +11,8 @@
</h5>
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
</div>
- <div class="modal-body border-bottom pb-3">
+ <div class="modal-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %>
<% if @promotion_action.type.nil? %>
<ul class="list-group">
<% allowed_action_types.each do |action_type| %>
diff --git a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb
index 1a5eab2cdd..080ee0f82a 100644
--- a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb
+++ b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb
@@ -17,13 +17,31 @@
<p class="text-muted"><%= promotion_rule.human_description %></p>
<% if promotion_rule.preferences.present? %>
- <p class="mb-0">
- <% promotion_rule.preferences.each do |key, value| %>
- <% next if value.blank? %>
- <span><%= Spree.t(key) %></span>
- <code><%= value %></code>
+ <%= render 'spree/admin/shared/preferences', object: promotion_rule %>
+ <% end %>
+
+ <% if promotion_rule.respond_to?(:products) %>
+ <div class="small mt-3">
+ <% promotion_rule.products.pluck(:name).each do |product_name| %>
+ <code><%= product_name %></code>
+ <% end %>
+ </div>
+ <% end %>
+
+ <% if promotion_rule.respond_to?(:taxons) %>
+ <div class="small mt-3">
+ <% promotion_rule.taxons.pluck(:pretty_name).each do |taxon_name| %>
+ <code><%= taxon_name %></code>
<% end %>
- </dl>
+ </div>
+ <% end %>
+
+ <% if promotion_rule.respond_to?(:users) %>
+ <div class="small mt-3">
+ <% promotion_rule.users.pluck(:email).each do |user_email| %>
+ <code><%= user_email %></code>
+ <% end %>
+ </div>
<% end %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/promotion_rules/edit.html.erb b/admin/app/views/spree/admin/promotion_rules/edit.html.erb
new file mode 100644
index 0000000000..6602332fa7
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/edit.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_frame_tag @promotion_rule do %>
+ <%= form_with model: @promotion_rule, url: spree.admin_promotion_rule_path(@promotion, @promotion_rule), method: :put, scope: :promotion_rule do |f| %>
+ <div class="card mb-3" id="<%= spree_dom_id(@promotion_rule) %>">
+ <div class="card-header d-flex justify-content-between align-items-center">
+ <h5 class="card-title"><%= @promotion_rule.human_name %></h5>
+ </div>
+ <div class="card-body pb-0">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
+ <%= render "spree/admin/promotion_rules/forms/#{@promotion_rule.key}", f: f %>
+ </div>
+ <div class="card-footer d-flex justify-content-between">
+ <%= turbo_save_button_tag Spree.t('actions.update') %>
+ <%= link_to Spree.t('actions.discard'), spree.admin_promotion_path(@promotion), class: 'btn btn-light' %>
+ </div>
+ </div>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb
new file mode 100644
index 0000000000..cb5d8ab378
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_country.html.erb
@@ -0,0 +1,8 @@
+<div class="form-group">
+ <%= f.label :preferred_country_iso, Spree.t(:country) %>
+ <%= f.country_select(:preferred_country_iso,
+ { selected: f.object.preferred_country_iso },
+ { data: { controller: 'autocomplete-select' }
+ }) %>
+</div>
+
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_currency.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_currency.html.erb
new file mode 100644
index 0000000000..340cb92f0e
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_currency.html.erb
@@ -0,0 +1,10 @@
+<div class="form-group">
+ <%= f.select :preferred_currency,
+ currency_options_for_select(
+ f.object.preferred_currency,
+ current_store.supported_currencies.split(',')
+ ),
+ {},
+ { data: { controller: 'autocomplete-select' } }
+ %>
+</div>
diff --git a/admin/app/views/spree/admin/promotions/rules/_first_order.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_first_order.html.erb
similarity index 100%
rename from admin/app/views/spree/admin/promotions/rules/_first_order.html.erb
rename to admin/app/views/spree/admin/promotion_rules/forms/_first_order.html.erb
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb
new file mode 100644
index 0000000000..f8af8c82ed
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb
@@ -0,0 +1,26 @@
+<div class="row mb-3">
+ <div class="col-6">
+ <%= f.select :preferred_operator_min,
+ options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, f.object.preferred_operator_min),
+ {},
+ { class: 'custom-select' } %>
+ </div>
+ <div class="col-6">
+ <%= f.number_field :preferred_amount_min, class: 'form-control', required: true %>
+ </div>
+</div>
+<div class="row">
+ <div class="col-6">
+ <%= f.select :preferred_operator_max,
+ options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, f.object.preferred_operator_max),
+ {},
+ { class: 'custom-select' } %>
+ </div>
+ <div class="col-6">
+ <%= f.number_field :preferred_amount_max, class: 'form-control' %>
+
+ <span class="form-text text-muted mt-2">
+ Leave this field blank to not limit the maximum amount.
+ </span>
+ </div>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_one_use_per_user.html.erb
similarity index 100%
rename from admin/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
rename to admin/app/views/spree/admin/promotion_rules/forms/_one_use_per_user.html.erb
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb
new file mode 100644
index 0000000000..28cf8c404c
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb
@@ -0,0 +1,9 @@
+<div class="form-group">
+ <%= tom_select_tag "promotion_rule[preferred_eligible_values][]",
+ placeholder: Spree.t(:type_to_search),
+ url: spree.admin_promotion_rules_option_values_search_path,
+ remote_search: true,
+ remote_search_active_option: active_options_for_option_value_promotion_rule(f.object),
+ multiple: true,
+ class: 'w-100 mr-2' %>
+</div>
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_product.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_product.html.erb
new file mode 100644
index 0000000000..b5739dc662
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_product.html.erb
@@ -0,0 +1,9 @@
+<div class="form-group">
+ <%= label_tag "promotion_rule[product_ids_to_add][]", Spree.t('product_rule.choose_products') %>
+ <%= tom_select_tag "promotion_rule[product_ids_to_add][]",
+ multiple: true,
+ url: spree.select_options_admin_products_path,
+ active_option: f.object.product_ids,
+ preloaded_options: f.object.products.pluck(:name, :id)
+ %>
+</div>
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_taxon.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_taxon.html.erb
new file mode 100644
index 0000000000..4390193e45
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_taxon.html.erb
@@ -0,0 +1,9 @@
+<div class="form-group">
+ <%= label_tag "promotion_rule[taxon_ids_to_add][]", Spree.t('taxon_rule.choose_taxons') %>
+ <%= tom_select_tag "promotion_rule[taxon_ids_to_add][]",
+ multiple: true,
+ url: spree.admin_taxons_select_options_path,
+ active_option: f.object.taxon_ids,
+ preloaded_options: f.object.taxons.pluck(:pretty_name, :id)
+ %>
+</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_user.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_user.html.erb
new file mode 100644
index 0000000000..b72aa493cc
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/forms/_user.html.erb
@@ -0,0 +1,7 @@
+<div class="form-group">
+ <%= f.label :user_ids_to_add, Spree.t('user_rule.choose_users') %>
+ <%= f.select :user_ids_to_add,
+ Spree.user_class.pluck(:email, :id),
+ { selected: f.object.user_ids },
+ { multiple: true, data: { controller: 'autocomplete-select' }, required: true } %>
+</div>
diff --git a/admin/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_user_logged_in.html.erb
similarity index 100%
rename from admin/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
rename to admin/app/views/spree/admin/promotion_rules/forms/_user_logged_in.html.erb
diff --git a/admin/app/views/spree/admin/promotion_rules/new.html.erb b/admin/app/views/spree/admin/promotion_rules/new.html.erb
new file mode 100644
index 0000000000..3dc64cb5d3
--- /dev/null
+++ b/admin/app/views/spree/admin/promotion_rules/new.html.erb
@@ -0,0 +1,47 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <%= form_with model: @promotion_rule, url: spree.admin_promotion_rules_path(@promotion), method: :post, scope: :promotion_rule do |f| %>
+ <div class="modal-content" data-controller="search-picker">
+ <div class="modal-header">
+ <h5 class="modal-title">
+ <% if @promotion_rule.type.nil? %>
+ <%= Spree.t(:add_rule_of_type) %>
+ <% else %>
+ <%= @promotion_rule.human_name %>
+ <% end %>
+ </h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
+ </div>
+ <div class="modal-body">
+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
+ <% if @promotion_rule.type.nil? %>
+ <ul class="list-group">
+ <% options_for_promotion_rule_types(@promotion).each do |rule_type| %>
+ <% key = rule_type.demodulize.underscore %>
+ <li class="list-group-item p-0">
+ <%= link_to spree.new_admin_promotion_rule_path(@promotion, promotion_rule: { type: rule_type }), class: 'd-flex align-items-top w-100 p-3 hover-light', data: { turbo_prefetch: false } do %>
+ <%= radio_button_tag :type, rule_type %>
+ <div class="ml-3">
+ <h6><%= Spree.t("promotion_rule_types.#{key}.name") %></h6>
+ <p class="text-muted mb-0"><%= Spree.t("promotion_rule_types.#{key}.description") %></p>
+ </div>
+ <% end %>
+ </li>
+ <% end %>
+ </ul>
+ <% else %>
+ <p class="text-muted">
+ <%= @promotion_rule.human_description %>
+ </p>
+ <%= f.hidden_field :type, value: @promotion_rule.type %>
+ <%= render "spree/admin/promotion_rules/forms/#{@promotion_rule.key}", f: f %>
+ <% end %>
+ </div>
+ <% if @promotion_rule.type.present? %>
+ <div class="modal-footer d-flex justify-content-between">
+ <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+ <%= turbo_save_button_tag Spree.t('actions.create'), data: { turbo_frame: '_top' } %>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/promotions/_actions.html.erb b/admin/app/views/spree/admin/promotions/_actions.html.erb
index dc08bf9b72..2bf4daab81 100644
--- a/admin/app/views/spree/admin/promotions/_actions.html.erb
+++ b/admin/app/views/spree/admin/promotions/_actions.html.erb
@@ -1,17 +1,20 @@
<div class="card mb-4">
<div class="card-header d-flex justify-content-between">
<h5 class="card-title">
+ <%= icon('bolt', class: 'mr-2') %>
<%= Spree.t(:promotion_actions) %>
</h5>
<span data-toggle="modal" data-target="#modal">
- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm', data: { turbo_frame: 'dialog_modal' } %>
+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog_modal' } %>
</span>
</div>
- <div class="card-body">
+ <div class="card-body pb-0">
<% if @promotion.promotion_actions.empty? %>
<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
<%= Spree.t(:no_resource_found, resource: Spree.t(:promotion_actions)) %>
- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm', data: { turbo_frame: 'dialog_modal' } %>
+ <span data-toggle="modal" data-target="#modal">
+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog_modal' } %>
+ </span>
</div>
<% else %>
<%= render collection: @promotion.promotion_actions, partial: 'spree/admin/promotion_actions/promotion_action', as: :promotion_action %>
diff --git a/admin/app/views/spree/admin/promotions/_rules.html.erb b/admin/app/views/spree/admin/promotions/_rules.html.erb
index 53df86a4bb..bdbdd72b24 100644
--- a/admin/app/views/spree/admin/promotions/_rules.html.erb
+++ b/admin/app/views/spree/admin/promotions/_rules.html.erb
@@ -1,10 +1,11 @@
<div class="card mb-4">
<div class="card-header d-flex justify-content-between">
<h5 class="card-title">
+ <%= icon('checklist', class: 'mr-2') %>
<%= Spree.t(:rules) %>
</h5>
<span data-toggle="modal" data-target="#modal">
- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-light btn-sm' %>
+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog_modal' } %>
</span>
</div>
<div class="card-body">
@@ -21,7 +22,7 @@
</div>
</div>
</div>
- <div class="card-body pb-0">
+ <div class="card-body py-0">
<% if @promotion.promotion_rules.empty? %>
<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
<%= Spree.t(:no_resource_found, resource: Spree.t(:promotion_rules)) %>
diff --git a/admin/app/views/spree/admin/promotions/_sidebar.html.erb b/admin/app/views/spree/admin/promotions/_sidebar.html.erb
index b5c41758cd..1ef5038be4 100644
--- a/admin/app/views/spree/admin/promotions/_sidebar.html.erb
+++ b/admin/app/views/spree/admin/promotions/_sidebar.html.erb
@@ -37,7 +37,7 @@
</div>
<div class="card-body">
<ul class="list-group">
- <li class="list-group-item d-flex justify-content-between">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted">
<%= Spree.t(:name) %>
</span>
@@ -46,7 +46,7 @@
</span>
</li>
- <li class="list-group-item d-flex justify-content-between">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted">
<%= Spree.t(:kind) %>
</span>
@@ -56,17 +56,17 @@
</li>
<% if @promotion.code.present? %>
- <li class="list-group-item d-flex justify-content-between" data-controller="clipboard" data-clipboard-success-content="Copied!">
- <%= Spree.t(:coupon_code) %>
- <span>
- <span class="p-2 bg-light rounded mr-2 h-100">
+ <li class="list-group-item d-flex justify-content-between align-items-center" data-controller="clipboard" data-clipboard-success-content="Copied!">
+ <span class="text-muted"><%= Spree.t(:coupon_code) %></span>
+ <div class="d-flex align-items-center gap-1">
+ <span class="form-control form-control-sm">
<span data-clipboard-target="source"><%= @promotion.code.upcase %></span>
</span>
<button type="button" class="btn btn-light btn-sm with-tip p-1" data-action="clipboard#copy" title="<%= Spree.t(:copy) %>">
<%= icon 'copy', class: 'mr-0' %>
</button>
- </span>
+ </div>
</li>
<% end %>
</ul>
@@ -85,12 +85,12 @@
<div class="card-body">
<ul class="list-group">
<% unless @promotion.multi_codes? %>
- <li class="list-group-item d-flex justify-content-between">
- <%= Spree.t(:usage_limit) %>
+ <li class="list-group-item d-flex justify-content-between align-items-center">
+ <span class="text-muted"><%= Spree.t(:usage_limit) %></span>
<%= render 'spree/admin/promotions/usage_limit', promotion: @promotion %>
</li>
<% end %>
- <li class="list-group-item d-flex justify-content-between">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted">
<%= I18n.t('activerecord.attributes.spree/promotion.starts_at') %>
</span>
@@ -100,14 +100,14 @@
<span class="text-muted"><%= Spree.t(:no_start_date) %></span>
<% end %>
</li>
- <li class="list-group-item d-flex justify-content-between">
+ <li class="list-group-item d-flex justify-content-between align-items-center">
<span class="text-muted">
<%= I18n.t('activerecord.attributes.spree/promotion.expires_at') %>
</span>
<% if @promotion.expires_at %>
<span><%= local_time(@promotion.expires_at) %></span>
<% else %>
- <span class="text-muted"><%= Spree.t(:no_expiration) %></span>
+ <span class="text-muted"><%= Spree.t(:not_available) %></span>
<% end %>
</li>
</ul>
diff --git a/admin/app/views/spree/admin/promotions/_usage_limit.html.erb b/admin/app/views/spree/admin/promotions/_usage_limit.html.erb
index 95bfff47f3..59881b8f26 100644
--- a/admin/app/views/spree/admin/promotions/_usage_limit.html.erb
+++ b/admin/app/views/spree/admin/promotions/_usage_limit.html.erb
@@ -1,11 +1,11 @@
<% if promotion.multi_codes? %>
- <span class="badge badge-light">
+ <span class="badge <% if promotion.all_codes_used? %>badge-danger<% else %>badge-info<% end %>">
<%= promotion.coupon_codes.used.count %>
/
<%= promotion.coupon_codes.count %>
</span>
<% else %>
- <span class="badge badge-light">
+ <span class="badge <% if promotion.credits_count == promotion.usage_limit %>badge-danger<% else %>badge-info<% end %>">
<%= promotion.credits_count %>
/
<%= promotion.usage_limit || '∞' %>
diff --git a/admin/app/views/spree/admin/promotions/edit.html.erb b/admin/app/views/spree/admin/promotions/edit.html.erb
index f5cfb7b609..5b9a9c8150 100644
--- a/admin/app/views/spree/admin/promotions/edit.html.erb
+++ b/admin/app/views/spree/admin/promotions/edit.html.erb
@@ -18,6 +18,13 @@
Customers will see this in their cart and at checkout.
</span>
</div>
+
+ <% if @promotion.coupon_code? && [email protected]_codes? %>
+ <div class="form-group">
+ <%= f.label :code %>
+ <%= f.text_field :code, class: 'form-control text-uppercase', placeholder: 'Your coupon code' %>
+ </div>
+ <% end %>
</div>
<div class="card-footer d-flex justify-content-between">
<%= turbo_save_button_tag Spree.t('actions.update') %>
diff --git a/admin/app/views/spree/admin/promotions/form/_settings.html.erb b/admin/app/views/spree/admin/promotions/form/_settings.html.erb
index 702ea2f2b4..6c7d6e54da 100644
--- a/admin/app/views/spree/admin/promotions/form/_settings.html.erb
+++ b/admin/app/views/spree/admin/promotions/form/_settings.html.erb
@@ -6,11 +6,6 @@
Leave this field blank for unlimited usage.
</span>
</div>
- <% if @promotion.persisted? %>
- <span class="form-text text-muted">
- <%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
- </span>
- <% end %>
<% end %>
<div class="form-group">
diff --git a/admin/app/views/spree/admin/promotions/rules/_country.html.erb b/admin/app/views/spree/admin/promotions/rules/_country.html.erb
deleted file mode 100644
index b5d0acab22..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_country.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% active_option ||= current_store.default_country_iso %>
-<% active_option = rule_form.object.preferred_country_iso if rule_form.object.persisted? && rule_form.object.respond_to?(:preferred_country_iso) %>
-
-<div class="form-group">
- <%= label_tag "#{prefix}[preferred_country_iso]", Spree.t(:country) %>
- <%= country_select("#{prefix}[preferred_country_iso]", { selected: active_option }, {}, { data: { controller: 'autocomplete-select' } }) %>
-</div>
-
diff --git a/admin/app/views/spree/admin/promotions/rules/_currency.html.erb b/admin/app/views/spree/admin/promotions/rules/_currency.html.erb
deleted file mode 100644
index feab4ca885..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_currency.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<% active_option ||= current_store.default_currency %>
-<% active_option = rule_form.object.preferred_currency if rule_form.object.persisted? && rule_form.object.respond_to?(:preferred_currency) %>
-
-<div class="form-group">
- <%= select_tag "#{prefix}[preferred_currency]",
- currency_options_for_select(
- active_option,
- current_store.supported_currencies.split(',')
- ),
- { data: { controller: 'autocomplete-select' } }
- %>
-</div>
diff --git a/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb b/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb
deleted file mode 100644
index ce47268cd2..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<% preferred_operator_min_value = rule_form.object.respond_to?(:preferred_operator_min) ? rule_form.object.preferred_operator_min : Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.first %>
-<% preferred_operator_max_value = rule_form.object.respond_to?(:preferred_operator_max) ? rule_form.object.preferred_operator_max : Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.first %>
-<% preferred_amount_min_value = rule_form.object.respond_to?(:preferred_amount_min) ? rule_form.object.preferred_amount_min : 0 %>
-<% preferred_amount_max_value = rule_form.object.respond_to?(:preferred_amount_max) ? rule_form.object.preferred_amount_max : nil %>
-
-<div class="row mb-3">
- <div class="col-6">
- <%= select_tag "#{prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, preferred_operator_min_value), { class: 'custom-select' } %>
- </div>
- <div class="col-6">
- <%= text_field_tag "#{prefix}[preferred_amount_min]", preferred_amount_min_value, class: 'form-control' %>
- </div>
-</div>
-<div class="row">
- <div class="col-6">
- <%= select_tag "#{prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, preferred_operator_max_value), { class: 'custom-select' } %>
- </div>
- <div class="col-6">
- <%= text_field_tag "#{prefix}[preferred_amount_max]", preferred_amount_max_value, class: 'form-control' %>
-
- <span class="form-text text-muted mt-2">
- Leave this field blank to not limit the maximum amount.
- </span>
- </div>
-</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/promotions/rules/_option_value.html.erb b/admin/app/views/spree/admin/promotions/rules/_option_value.html.erb
deleted file mode 100644
index 8ca8f851bf..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_option_value.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% active_options = [] %>
-<% active_options = active_options_for_option_value_promotion_rule(rule_form.object) if rule_form.object.persisted? && rule_form.object.respond_to?(:eligible_values) %>
-
-<%= tom_select_tag "#{prefix}[preferred_eligible_values][]",
- placeholder: Spree.t(:type_to_search),
- url: spree.admin_promotion_rules_option_values_search_path,
- remote_search: true,
- remote_search_active_option: active_options,
- multiple: true,
- class: 'w-100 mr-2' %>
-
diff --git a/admin/app/views/spree/admin/promotions/rules/_product.html.erb b/admin/app/views/spree/admin/promotions/rules/_product.html.erb
deleted file mode 100644
index 505f375ac8..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_product.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% active_options = [] %>
-<% active_options = rule_form.object.product_ids if rule_form.object.persisted? && rule_form.object.respond_to?(:product_ids) %>
-
-<div class="form-group">
- <%= label_tag "#{prefix}[product_ids_string]", Spree.t('product_rule.choose_products') %>
- <%= tom_select_tag "#{prefix}[product_ids_string]", multiple: true, url: spree.select_options_admin_products_path, active_option: active_options %>
-</div>
diff --git a/admin/app/views/spree/admin/promotions/rules/_taxon.html.erb b/admin/app/views/spree/admin/promotions/rules/_taxon.html.erb
deleted file mode 100644
index ed4be761a7..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_taxon.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<% active_options = [] %>
-<% active_options = rule_form.object.taxon_ids if rule_form.object.persisted? && rule_form.object.respond_to?(:taxon_ids) %>
-
-<div class="form-group">
- <%= label_tag "#{prefix}[taxon_ids]", Spree.t('taxon_rule.choose_taxons') %>
- <%= tom_select_tag "#{prefix}[taxon_ids]", multiple: true, url: spree.admin_taxons_select_options_path, active_option: active_options %>
-</div>
-
-
diff --git a/admin/app/views/spree/admin/promotions/rules/_user.html.erb b/admin/app/views/spree/admin/promotions/rules/_user.html.erb
deleted file mode 100644
index ab0a46b49e..0000000000
--- a/admin/app/views/spree/admin/promotions/rules/_user.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% active_options = [] %>
-<% active_options = rule_form.object.user_ids if rule_form.object.persisted? && rule_form.object.respond_to?(:user_ids) %>
-
-<div class="form-group mb-0">
- <%= label_tag "#{prefix}[user_ids]", Spree.t('user_rule.choose_users') %>
- <%= tom_select_tag "#{prefix}[user_ids]", multiple: true, options: users_for_select_options, active_option: active_options %>
-</div>
diff --git a/admin/app/views/spree/admin/shared/_preferences.html.erb b/admin/app/views/spree/admin/shared/_preferences.html.erb
new file mode 100644
index 0000000000..a30200636a
--- /dev/null
+++ b/admin/app/views/spree/admin/shared/_preferences.html.erb
@@ -0,0 +1,9 @@
+<% if object.preferences.present? %>
+ <p class="mb-0">
+ <% object.preferences.each do |key, value| %>
+ <% next if value.blank? %>
+ <span><%= Spree.t(key) %></span>
+ <code><%= value %></code>
+ <% end %>
+ </p>
+<% end %>
\ No newline at end of file
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index 7975976da5..2f0344ce38 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -125,6 +125,10 @@ module Spree
!!(starts_at && Time.current < starts_at || expires_at && Time.current > expires_at)
end
+ def all_codes_used?
+ coupon_codes.used.count == coupon_codes.count
+ end
+
def activate(payload)
order = payload[:order]
return unless self.class.order_activatable?(order)
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index c7a4496d72..474e02be6c 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -121,6 +121,7 @@ module Spree
Rails.application.config.spree.promotions.rules.concat [
Spree::Promotion::Rules::Currency,
+ Spree::Promotion::Rules::Country,
Spree::Promotion::Rules::ItemTotal,
Spree::Promotion::Rules::Product,
Spree::Promotion::Rules::User,
@@ -129,7 +130,6 @@ module Spree
Spree::Promotion::Rules::OneUsePerUser,
Spree::Promotion::Rules::Taxon,
Spree::Promotion::Rules::OptionValue,
- Spree::Promotion::Rules::Country
]
Rails.application.config.spree.promotions.actions = [