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.

Fixed rule forms

Damian Legawiecac6c59dae91e
diff --git a/admin/app/views/spree/admin/promotions/_rule_form.html.erb b/admin/app/views/spree/admin/promotions/_rule_form.html.erb
index 5fd835fe8a..e74edca090 100644
--- a/admin/app/views/spree/admin/promotions/_rule_form.html.erb
+++ b/admin/app/views/spree/admin/promotions/_rule_form.html.erb
@@ -2,7 +2,7 @@
<% if rf.object.new_record? %>
<% @promotion_rules.each do |promotion_rule| %>
<template id="rule-form-template-<%= promotion_rule.to_s.demodulize %>" data-rule-form-target="template">
- <%= render "spree/admin/promotions/rules/#{promotion_rule.to_s.demodulize.underscore}", rule_form: rf %>
+ <%= render "spree/admin/promotions/rules/#{promotion_rule.to_s.demodulize.underscore}", rule_form: rf, prefix: prefix %>
</template>
<% end %>
@@ -16,7 +16,7 @@
<% end %>
<div class="form-group" data-rule-form-target="value">
<% if rf.object.type.present? %>
- <%= render "spree/admin/promotions/rules/#{rf.object.type.demodulize.underscore}", rule_form: rf %>
+ <%= render "spree/admin/promotions/rules/#{rf.object.type.demodulize.underscore}", rule_form: rf, prefix: prefix %>
<% end %>
</div>
<button type="button" data-action="nested-form#remove" class="btn btn-sm btn-danger">
diff --git a/admin/app/views/spree/admin/promotions/_rules_form.html.erb b/admin/app/views/spree/admin/promotions/_rules_form.html.erb
index a8bf5dafc4..adc570764a 100644
--- a/admin/app/views/spree/admin/promotions/_rules_form.html.erb
+++ b/admin/app/views/spree/admin/promotions/_rules_form.html.erb
@@ -19,12 +19,12 @@
<div data-controller="nested-form">
<template data-nested-form-target="template">
<%= f.fields_for :promotion_rules, Spree::PromotionRule.new(type: @promotion_rules.first.to_s), child_index: 'NEW_RECORD' do |rf, index| %>
- <%= render 'spree/admin/promotions/rule_form', rf: rf %>
+ <%= render 'spree/admin/promotions/rule_form', rf: rf, prefix: "promotion[promotion_rules_attributes][#{rf.index}]" %>
<% end %>
</template>
<%= f.fields_for :promotion_rules, @promotion.promotion_rules do |rf, index| %>
- <%= render 'spree/admin/promotions/rule_form', rf: rf %>
+ <%= render 'spree/admin/promotions/rule_form', rf: rf, prefix: "promotion[promotion_rules_attributes][#{rf.index}]" %>
<% end %>
<!-- Inserted elements will be injected before that target. -->
diff --git a/admin/app/views/spree/admin/promotions/rules/_country.html.erb b/admin/app/views/spree/admin/promotions/rules/_country.html.erb
index 981c876f6e..085665a31c 100644
--- a/admin/app/views/spree/admin/promotions/rules/_country.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_country.html.erb
@@ -3,7 +3,7 @@
<% 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">
- <%= rule_form.label Spree.t('country_rule.label') %>
- <%= rule_form.country_select('preferred_country_iso', { selected: active_option }, { data: { controller: 'autocomplete-select' } }) %>
+ <%= 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/_item_total.html.erb b/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb
index 9d759ddf28..ce47268cd2 100644
--- a/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_item_total.html.erb
@@ -1,16 +1,25 @@
+<% 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">
- <%= rule_form.select :preferred_operator_min, options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, rule_form.object.try(:preferred_operator_min)), {}, { class: 'custom-select' } %>
+ <%= 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">
- <%= rule_form.text_field :preferred_amount_min, class: 'form-control' %>
+ <%= text_field_tag "#{prefix}[preferred_amount_min]", preferred_amount_min_value, class: 'form-control' %>
</div>
</div>
<div class="row">
<div class="col-6">
- <%= rule_form.select :preferred_operator_max, options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, rule_form.object.try(:preferred_operator_max)), {}, { class: 'custom-select' } %>
+ <%= 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">
- <%= rule_form.text_field :preferred_amount_max, class: 'form-control' %>
+ <%= 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
index 0457ecc0b6..8ca8f851bf 100644
--- a/admin/app/views/spree/admin/promotions/rules/_option_value.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_option_value.html.erb
@@ -1,7 +1,7 @@
<% 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 "[preferred_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,
diff --git a/admin/app/views/spree/admin/promotions/rules/_product.html.erb b/admin/app/views/spree/admin/promotions/rules/_product.html.erb
index 9ec553ce34..505f375ac8 100644
--- a/admin/app/views/spree/admin/promotions/rules/_product.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_product.html.erb
@@ -2,6 +2,6 @@
<% active_options = rule_form.object.product_ids if rule_form.object.persisted? && rule_form.object.respond_to?(:product_ids) %>
<div class="form-group">
- <%= rule_form.label "product_ids_string", Spree.t('product_rule.choose_products') %>
- <%= tom_select_tag "product_ids_string", multiple: true, url: select_options_admin_products_path, active_option: active_options %>
+ <%= 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
index c73c716d05..ed4be761a7 100644
--- a/admin/app/views/spree/admin/promotions/rules/_taxon.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_taxon.html.erb
@@ -2,8 +2,8 @@
<% active_options = rule_form.object.taxon_ids if rule_form.object.persisted? && rule_form.object.respond_to?(:taxon_ids) %>
<div class="form-group">
- <%= rule_form.label "taxon_ids", Spree.t('taxon_rule.choose_taxons') %>
- <%= tom_select_tag "taxon_ids", multiple: true, url: spree.admin_taxons_select_options_path, active_option: active_options %>
+ <%= 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
index dae782510d..ab0a46b49e 100644
--- a/admin/app/views/spree/admin/promotions/rules/_user.html.erb
+++ b/admin/app/views/spree/admin/promotions/rules/_user.html.erb
@@ -2,6 +2,6 @@
<% 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">
- <%= rule_form.label Spree.t('user_rule.choose_users') %>
- <%= tom_select_tag "promotion[promotion_rules_attributes][#{rule_form.index}][user_ids]", multiple: true, options: users_for_select_options, active_option: active_options %>
+ <%= 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>