solidus_friendly_promotions 1.0.1 → 1.9.0

data/app/views/solidus_friendly_promotions/admin/benefits/_calculator_select.html.erb

@@ -0,0 +1,16 @@
+<%= form_with model: benefit, scope: :benefit, url: path, method: :get do |form| %>
+  <%= form.hidden_field :type %>
+  <div class="form-group">
+    <%= form.label :calculator_type %>
+    <%=
+      form.select :calculator_type,
+        options_for_benefit_calculator_types(form.object),
+        {
+          include_blank: t(:choose_benefit_calculator, scope: 'solidus_friendly_promotions')
+        },
+        class: 'custom-select fullwidth',
+        onchange: 'this.form.requestSubmit()',
+        required: true
+    %>
+  </div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/benefits/_form.html.erb

@@ -0,0 +1,3 @@
+<%= form.hidden_field :type %>
+<%= form.hidden_field :calculator_type %>
+<%= render form.object, benefit: form.object, param_prefix: form.object_name, form: form %>

data/app/views/solidus_friendly_promotions/admin/benefits/_new_benefit.html.erb

@@ -0,0 +1,33 @@
+<%= turbo_frame_tag benefit.promotion, "new_benefit" do %>
+<div class="card bg-light mb-3">
+  <div class="card-header">
+    <%= t(:add_benefit, scope: :solidus_friendly_promotions) %>
+  </div>
+  <div class="card-body">
+    <div class="row">
+      <div class="col-6">
+        <%= render 'solidus_friendly_promotions/admin/benefits/type_select', benefit: benefit %>
+        <% if benefit.available_calculators.any? %>
+          <%= render 'solidus_friendly_promotions/admin/benefits/calculator_select', path: solidus_friendly_promotions.new_admin_promotion_benefit_path(@promotion), benefit: benefit %>
+          <% if benefit.calculator %>
+            <%=
+              form_with(
+                model: benefit,
+                scope: :benefit,
+                url: solidus_friendly_promotions.admin_promotion_benefits_path(@promotion),
+                data: { turbo: false }
+              ) do |form| %>
+              <%= render 'form', form: form %>
+              <div class="row">
+                <div class="col-12">
+                  <%= button_tag t(:add, scope: [:solidus_friendly_promotions, :crud]), class: "btn btn-secondary float-right" %>
+                </div>
+              </div>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/benefits/_type_select.html.erb

@@ -0,0 +1,16 @@
+<%= form_with model: benefit, scope: :benefit, url: solidus_friendly_promotions.new_admin_promotion_benefit_path(@promotion), method: :get do |form| %>
+  <div class="form-group">
+    <%= form.label :type %>
+    <%= admin_hint SolidusFriendlyPromotions::Benefit.human_attribute_name(:type), t(:type, scope: [:solidus_friendly_promotions, :hints, "solidus_friendly_promotions/benefit"]) %>
+    <%=
+      form.select :type,
+        options_for_benefit_types(form.object),
+        {
+          include_blank: t(:choose_benefit, scope: 'solidus_friendly_promotions')
+        },
+        class: 'custom-select w-100',
+        onchange: 'this.form.requestSubmit()',
+        required: true
+    %>
+  </div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/benefits/edit.html.erb

@@ -0,0 +1,19 @@
+<%= turbo_frame_tag @promotion, dom_id(@benefit) do %>
+  <%= render 'calculator_select', path: solidus_friendly_promotions.edit_admin_promotion_benefit_path(@promotion, @benefit), benefit: @benefit %>
+
+  <%=
+    form_with(
+      model: @benefit,
+      scope: :benefit,
+      url: solidus_friendly_promotions.admin_promotion_benefit_path(@promotion, @benefit),
+    ) do |form| %>
+    <%= render "form", form: form %>
+
+    <div class="row">
+      <div class="col-12">
+        <%= button_tag "Update", class: "btn btn-secondary float-right" %>
+      </div>
+    </div>
+
+  <% end %>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/benefits/new.html.erb

@@ -0,0 +1 @@
+<%= render "new_benefit", benefit: @benefit %>

data/app/views/solidus_friendly_promotions/admin/{promotion_actions/calculators → calculator_fields}/_default_fields.html.erb

@@ -1,5 +1,5 @@
 <% calculator.admin_form_preference_names.map do |name| %>
-  <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(name)}",
+  <%= render "solidus_friendly_promotions/admin/shared/preference_fields/#{calculator.preference_type(name)}",
     name: "#{prefix}[calculator_attributes][preferred_#{name}]",
     value: calculator.get_preference(name),
     label: t(name.to_s, scope: 'spree', default: name.to_s.humanize) %>

data/app/views/solidus_friendly_promotions/admin/{promotion_actions/calculators → calculator_fields}/distributed_amount/_fields.html.erb

@@ -1,11 +1,11 @@
-<div class="field">
+<div class="form-group">
   <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
     <%= f.label :preferred_amount %>
-    <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
   <% end %>
 </div>
 
-<div class="field">
+<div class="form-group">
   <p>
     <%= admin_hint(
       calculator.model_name.human,

data/app/views/solidus_friendly_promotions/admin/calculator_fields/flat_rate/_fields.html.erb

@@ -0,0 +1,6 @@
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_amount %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/calculator_fields/flexi_rate/_fields.html.erb

@@ -0,0 +1,24 @@
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_first_item %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_first_item, currency: f.object.preferred_currency %>
+  <% end %>
+</div>
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_additional_item %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_additional_item, currency: f.object.preferred_currency %>
+  <% end %>
+</div>
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_max_items %>
+    <%= f.number_field :preferred_max_items, step: 1, min: 1, default: 1, class: "form-control" %>
+  <% end %>
+</div>
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_currency %>
+    <%= f.select :preferred_currency, Spree::Config.available_currencies.map(&:iso_code), {selected: f.object.preferred_currency }, { is: "select-two", class: "w-100"} %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/calculator_fields/percent/_fields.html.erb

@@ -0,0 +1,6 @@
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_percent %>
+    <%= f.number_field :preferred_percent, step: 1, min: 1, max: 100, default: 1, class: "form-control" %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/calculator_fields/tiered_flat_rate/_fields.html.erb

@@ -0,0 +1,32 @@
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_base_amount %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_base_amount, currency_attr: :preferred_currency %>
+  <% end %>
+</div>
+
+<div class="form-group">
+  <%= label_tag nil, calculator.class.human_attribute_name(:tiers) %>
+  <div data-controller="calculator-tiers">
+    <div class="d-flex">
+      <div class="item-total-label" style="flex-grow: 1">
+        <%= SolidusFriendlyPromotions::Calculators::TieredFlatRate.human_attribute_name(:order_item_total) %>
+      </div>
+      <div class="discount-label mx-2" style="flex-grow: 1">
+        <%= SolidusFriendlyPromotions::Calculators::TieredFlatRate.human_attribute_name(:discount) %>
+      </div>
+      <div class="tools m-3">
+
+      </div>
+    </div>
+    <template data-calculator-tiers-target="template">
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_flat_rate/tier_fields", tier: [nil, nil], form: form, currency: calculator.preferred_currency %>
+    </template>
+    <% form.object.calculator.preferred_tiers.each do |tier| %>
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_flat_rate/tier_fields", tier: tier, form: form, currency: calculator.preferred_currency %>
+    <% end %>
+    <div class="my-3" data-calculator-tiers-target="links">
+      <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
+    </div>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/{promotion_actions/calculators → calculator_fields}/tiered_flat_rate/_tier_fields.html.erb

@@ -1,10 +1,9 @@
-<div class="fullwidth tier calculator-tiers">
-  <a class="fa fa-trash remove" data-action="click->calculator-tiers#remove_association"></a>
-  <div class="row">
-    <div class="col-6">
+<div class="fullwidth tier calculator-tiers mb-3">
+  <div class="d-flex">
+    <div class="mr-2">
       <div class="input-group">
         <div class="input-group-prepend">
-          <span class="input-group-text">$</span>
+          <span class="input-group-text"><%= ::Money::Currency.find(currency).symbol %></span>
         </div>
         <input
           class="js-base-input form-control"
@@ -14,10 +13,10 @@
         >
       </div>
     </div>
-    <div class="col-6">
+    <div class="mx-2">
       <div class="input-group">
         <div class="input-group-prepend">
-          <span class="input-group-text">$</span>
+          <span class="input-group-text"><%= ::Money::Currency.find(currency).symbol %></span>
         </div>
         <input
           class="js-value-input form-control"
@@ -27,6 +26,6 @@
         >
       </div>
     </div>
+    <a class="fa fa-trash remove p-2" data-action="click->calculator-tiers#remove_association"></a>
   </div>
-  <div class="clear"></div>
 </div>

data/app/views/solidus_friendly_promotions/admin/calculator_fields/tiered_percent/_fields.html.erb

@@ -0,0 +1,47 @@
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_base_percent %>
+    <%= f.number_field :preferred_base_percent, step: 1, min: 0, max: 100, default: 1, class: "form-control" %>
+  <% end %>
+</div>
+
+<div class="form-group">
+  <%= label_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    t('spree.currency')
+  ) %>
+  <%= select_tag(
+    "#{prefix}[calculator_attributes][preferred_currency]",
+    options_for_select(
+      Spree::Config.available_currencies,
+      calculator.preferred_currency || Spree::Config[:currency]
+    ),
+    { is: "select-two", class: 'fullwidth' }
+  ) %>
+</div>
+
+<div class="form-group">
+  <%= label_tag nil, calculator.class.human_attribute_name(:tiers)  %>
+  <div data-controller="calculator-tiers">
+    <div class="d-flex">
+      <div class="item-total-label" style="flex-grow: 1">
+        <%= SolidusFriendlyPromotions::Calculators::TieredPercent.human_attribute_name(:order_item_total) %>
+      </div>
+      <div class="discount-label mx-2" style="flex-grow: 1">
+        <%= SolidusFriendlyPromotions::Calculators::TieredPercent.human_attribute_name(:percent) %>
+      </div>
+      <div class="tools m-3">
+
+      </div>
+    </div>
+    <template data-calculator-tiers-target="template">
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_percent/tier_fields", tier: [nil, nil], form: form %>
+    </template>
+    <% form.object.calculator.preferred_tiers.each do |tier| %>
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_percent/tier_fields", tier: tier, form: form %>
+    <% end %>
+    <div class="mb-3" data-calculator-tiers-target="links">
+      <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>
+    </div>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/{promotion_actions/calculators → calculator_fields}/tiered_percent/_tier_fields.html.erb

@@ -1,7 +1,6 @@
-<div class="fullwidth tier calculator-tiers">
-  <a class="fa fa-trash remove" data-action="click->calculator-tiers#remove_association"></a>
-  <div class="row">
-    <div class="col-6">
+<div class="fullwidth tier calculator-tiers mb-3">
+  <div class="d-flex">
+    <div class="mr-2">
       <div class="input-group">
         <div class="input-group-prepend">
           <span class="input-group-text">$</span>
@@ -14,12 +13,14 @@
         >
       </div>
     </div>
-    <div class="col-6">
+    <div class="mx-2">
       <div class="input-group">
         <input
           class="js-value-input form-control right-align"
           name="<%= form.object_name %>[calculator_attributes][preferred_tiers][<%= tier[0] %>]"
-          type="text"
+          type="number"
+          min="0"
+          max="100"
           value="<%= tier[1] %>"
         >
         <div class="input-group-append">
@@ -27,6 +28,6 @@
         </div>
       </div>
     </div>
+    <a class="fa fa-trash remove p-2" data-action="click->calculator-tiers#remove_association"></a>
   </div>
-  <div class="clear"></div>
 </div>

data/app/views/solidus_friendly_promotions/admin/{promotion_actions/calculators → calculator_fields}/tiered_percent_on_eligible_item_quantity/_fields.html.erb

@@ -1,9 +1,11 @@
-<%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_percent)}",
-  name: "#{prefix}[calculator_attributes][preferred_base_percent]",
-  value: calculator.preferred_base_percent,
-  label: calculator.class.human_attribute_name(:preferred_base_percent) %>
+<div class="form-group">
+  <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
+    <%= f.label :preferred_base_percent %>
+    <%= f.number_field :preferred_base_percent, step: 1, min: 0, max: 100, default: 1, class: "form-control" %>
+  <% end %>
+</div>
 
-<div class="field">
+<div class="form-group">
   <%= label_tag(
     "#{prefix}[calculator_attributes][preferred_currency]",
     t('spree.currency')
@@ -14,18 +16,18 @@
       Spree::Config.available_currencies,
       calculator.preferred_currency || Spree::Config[:currency]
     ),
-    { class: 'custom-select fullwidth' }
+    { is: "select-two", class: 'fullwidth' }
   ) %>
 </div>
 
-<div class="field">
+<div class="form-group">
   <%= label_tag nil, calculator.class.human_attribute_name(:tiers)  %>
   <div data-controller="calculator-tiers">
     <template data-calculator-tiers-target="template">
-      <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/tier_fields", tier: [nil, nil], form: form %>
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_percent_on_eligible_item_quantity/tier_fields", tier: [nil, nil], form: form %>
     </template>
     <% form.object.calculator.preferred_tiers.each do |tier| %>
-      <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/tiered_percent/tier_fields", tier: tier, form: form %>
+      <%= render "solidus_friendly_promotions/admin/calculator_fields/tiered_percent_on_eligible_item_quantity/tier_fields", tier: tier, form: form %>
     <% end %>
     <div class="mb-3" data-calculator-tiers-target="links">
       <%= link_to t(:add_tier, scope: [:solidus_friendly_promotions, :admin, :promotions, :calculator]), "#", class: "btn btn-outline-primary", data: { action: "click->calculator-tiers#add_association" } %>

data/app/views/solidus_friendly_promotions/admin/calculator_fields/tiered_percent_on_eligible_item_quantity/_tier_fields.html.erb

@@ -0,0 +1,35 @@
+<div class="fullwidth tier calculator-tiers mb-3">
+  <div class="d-flex">
+    <div class="mr-2">
+      <div class="input-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text">∑</span>
+        </div>
+        <input
+          class="js-base-input form-control"
+          data-action="calculator-tiers#propagate_base_to_value_input"
+          type="number"
+          min=="1"
+          step="1"
+          value="<%= tier[0] %>"
+        >
+      </div>
+    </div>
+    <div class="mx-2">
+      <div class="input-group">
+        <input
+          class="js-value-input form-control right-align"
+          name="<%= form.object_name %>[calculator_attributes][preferred_tiers][<%= tier[0] %>]"
+          type="number"
+          min="1"
+          max="100"
+          value="<%= tier[1] %>"
+        >
+        <div class="input-group-append">
+          <span class="input-group-text">%</span>
+        </div>
+      </div>
+    </div>
+    <a class="fa fa-trash remove p-2" data-action="click->calculator-tiers#remove_association"></a>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_first_order.html.erb

@@ -0,0 +1,3 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_first_repeat_purchase_since.html.erb

@@ -0,0 +1,7 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="form-group">
+  <%= label_tag "#{param_prefix}[preferred_days_ago]", condition.class.human_attribute_name(:preferred_days_ago) %>
+  <%= number_field_tag "#{param_prefix}[preferred_days_ago]", condition.preferred_days_ago, class: 'fullwidth' %>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_item_total.html.erb

@@ -0,0 +1,15 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+
+<div class="form-group">
+  <%= label_tag "#{param_prefix}[preferred_operator]", condition.class.human_attribute_name(:preferred_operator) %>
+  <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(condition.class.operator_options, condition.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
+</div>
+
+<div class="form-group">
+  <%= fields_for param_prefix, condition do |f| %>
+    <%= f.label :preferred_amount %>
+    <%= render "solidus_friendly_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+  <% end %>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_line_item_option_value.html.erb

@@ -0,0 +1,25 @@
+
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="field promo-condition-option-values">
+  <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
+  <div class="row">
+    <div class="col-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
+    <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+  </div>
+
+  <div class="form-group">
+    <div data-controller="product-option-values">
+      <template data-product-option-values-target="template">
+        <%= render "solidus_friendly_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form %>
+      </template>
+      <% form.object.preferred_eligible_values.each do |product_option_values| %>
+        <%= render "solidus_friendly_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: product_option_values, form: form %>
+      <% end %>
+      <div class="mb-3" data-product-option-values-target="links">
+        <%= link_to t(:add_product, scope: [:solidus_friendly_promotions, :line_item_option_value_condition]), "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/{promotion_rules/rules → condition_fields}/_line_item_product.html.erb

@@ -1,19 +1,19 @@
 <p>
-  <%= promotion_rule.class.human_attribute_name(:description) %>
+  <%= condition.class.human_attribute_name(:description) %>
 </p>
 <div class="row">
   <div class="col-12">
-    <div class="field products_rule_products">
-      <%= label_tag "#{param_prefix}_product_ids_string", t('solidus_friendly_promotions.product_rule.choose_products') %>
-      <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker fullwidth" %>
+    <div class="field products_condition_products">
+      <%= label_tag "#{param_prefix}_product_ids_string", t('solidus_friendly_promotions.product_condition.choose_products') %>
+      <%= hidden_field_tag "#{param_prefix}[product_ids_string]", condition.product_ids.join(","), class: "fullwidth", is: "product-picker" %>
     </div>
   </div>
   <div class="col-12">
-    <div class="field">
-        <%= label_tag("#{param_prefix}_preferred_match_policy", promotion_rule.class.human_attribute_name(:preferred_match_policy)) %>
+    <div class="form-group">
+        <%= label_tag("#{param_prefix}_preferred_match_policy", condition.class.human_attribute_name(:preferred_match_policy)) %>
         <%= select_tag(
           "#{param_prefix}[preferred_match_policy]",
-          options_for_select(I18n.t("solidus_friendly_promotions.promotion_rules.line_item_product.match_policies").to_a.map(&:reverse), promotion_rule.preferred_match_policy),
+          options_for_select(I18n.t("solidus_friendly_promotions.conditions.line_item_product.match_policies").to_a.map(&:reverse), condition.preferred_match_policy),
           class: "custom-select fullwidth"
         ) %>
     </div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_line_item_taxon.html.erb

@@ -0,0 +1,17 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="field taxons_condition_taxons">
+  <%= label_tag "#{param_prefix}_taxon_ids_string", t("solidus_friendly_promotions.taxon_condition.choose_taxons") %>
+  <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", condition.taxon_ids.join(","), is: "taxon-picker", class: "fullwidth", id: "product_taxon_ids" %>
+</div>
+<div class="form-group">
+   <div class="form-group">
+        <%= label_tag("#{param_prefix}_preferred_match_policy", condition.class.human_attribute_name(:preferred_match_policy)) %>
+        <%= select_tag(
+              "#{param_prefix}[preferred_match_policy]",
+              options_for_select(I18n.t("solidus_friendly_promotions.conditions.line_item_taxon.match_policies").to_a.map(&:reverse), condition.preferred_match_policy),
+              class: "custom-select fullwidth",
+            ) %>
+    </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_minimum_quantity.html.erb

@@ -0,0 +1,5 @@
+<div class="form-group">
+  <% field_name = "#{param_prefix}[preferred_minimum_quantity]" %>
+  <%= label_tag field_name, condition.model_name.human %>
+  <%= number_field_tag field_name, condition.preferred_minimum_quantity, class: "fullwidth", min: 1 %>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_nth_order.html.erb

@@ -0,0 +1,15 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="row">
+  <div class="col-6">
+    <div class="form-group">
+      <%= SolidusFriendlyPromotions::Conditions::NthOrder.human_attribute_name(:form_text) %>
+    </div>
+  </div>
+  <div class="col-6">
+    <div class="form-group">
+      <%= number_field_tag "#{param_prefix}[preferred_nth_order]", condition.preferred_nth_order, class: 'fullwidth' %>
+    </div>
+  </div>
+</div>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_one_use_per_user.html.erb

@@ -0,0 +1,3 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>

data/app/views/solidus_friendly_promotions/admin/{promotion_rules/rules → condition_fields}/_option_value.html.erb

@@ -2,39 +2,39 @@
 
 <% if context == :order %>
   <p>
-    <%= promotion_rule.class.human_attribute_name(:description) %>
+    <%= condition.class.human_attribute_name(:description) %>
   </p>
-  <div class="field promo-rule-option-values">
+  <div class="field promo-condition-option-values">
     <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
     <div class="row">
       <div class="col-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
       <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
     </div>
 
-    <div class="field">
+    <div class="form-group">
       <div data-controller="product-option-values">
         <template data-product-option-values-target="template">
-          <%= render "solidus_friendly_promotions/admin/promotion_rules/rules/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form %>
+          <%= render "solidus_friendly_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form %>
         </template>
         <% form.object.preferred_eligible_values.each do |product_option_values| %>
-          <%= render "solidus_friendly_promotions/admin/promotion_rules/rules/line_item_option_value/option_value_fields", product_option_values: product_option_values, form: form %>
+          <%= render "solidus_friendly_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: product_option_values, form: form %>
         <% end %>
         <div class="mb-3" data-product-option-values-target="links">
-          <%= link_to "Add Row", "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
+          <%= link_to t(:add_product, scope: [:solidus_friendly_promotions, :option_value_condition]), "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
         </div>
       </div>
     </div>
 
-    <div class="field">
+    <div class="form-group">
       <%= form.label :preferred_line_item_applicable do %>
         <%= form.check_box :preferred_line_item_applicable %>
-        <%= promotion_rule.class.human_attribute_name(:preferred_line_item_applicable) %>
+        <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
       <% end %>
     </div>
   </div>
 <% else %>
   <p>
-    <%= SolidusFriendlyPromotions::Rules::LineItemOptionValue.human_attribute_name(:description) %>
+    <%= SolidusFriendlyPromotions::Conditions::LineItemOptionValue.human_attribute_name(:description) %>
   </p>
   <table>
     <thead>
@@ -48,7 +48,7 @@
       </tr>
     </thead>
     <tbody>
-      <% promotion_rule.preferred_eligible_values.each do |product_id, option_value_ids| %>
+      <% condition.preferred_eligible_values.each do |product_id, option_value_ids| %>
         <tr>
           <td>
             <%= Spree::Product.find(product_id).name %>

data/app/views/solidus_friendly_promotions/admin/condition_fields/_product.html.erb

@@ -0,0 +1,28 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+  <%= fields_for param_prefix, condition do |form| %>
+    <div class="field products_condition_products">
+      <%= form.label :product_ids_string, t('solidus_friendly_promotions.product_condition.choose_products') %>
+      <%= form.hidden_field :product_ids_string, value: condition.product_ids.join(","), class: "fullwidth", is: "product-picker" %>
+    </div>
+
+    <div class="form-group">
+      <%
+        match_policy_options = options_for_select(
+          SolidusFriendlyPromotions::Conditions::Product::MATCH_POLICIES.map { |s| [t("solidus_friendly_promotions.product_condition.match_#{s}"),s] },
+          condition.preferred_match_policy
+        )
+      %>
+      <% select = form.select :preferred_match_policy, match_policy_options %>
+      <%= form.label :preferred_match_policy, t('solidus_friendly_promotions.product_condition.label', select: select).html_safe %>
+      </label>
+    </div>
+
+    <div class="form-group">
+      <%= form.label :preferred_line_item_applicable do %>
+        <%= form.check_box :preferred_line_item_applicable %>
+        <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
+      <% end %>
+    </div>
+  <% end %>

data/app/views/solidus_friendly_promotions/admin/{promotion_rules/rules → condition_fields}/_shipping_method.html.erb

@@ -1,10 +1,10 @@
 <p>
-  <%= promotion_rule.class.human_attribute_name(:description) %>
+  <%= condition.class.human_attribute_name(:description) %>
 </p>
 <div class="form-group">
-  <%= label_tag "#{param_prefix}_preferred_shipping_method_ids", SolidusFriendlyPromotions::Rules::ShippingMethod.human_attribute_name(:preferred_shipping_method_ids) %>
+  <%= label_tag "#{param_prefix}_preferred_shipping_method_ids", SolidusFriendlyPromotions::Conditions::ShippingMethod.human_attribute_name(:preferred_shipping_method_ids) %>
   <%= select_tag "#{param_prefix}[preferred_shipping_method_ids]",
     options_from_collection_for_select(
-      Spree::ShippingMethod.all, :id, :name, promotion_rule.preferred_shipping_method_ids
+      Spree::ShippingMethod.all, :id, :name, condition.preferred_shipping_method_ids
     ), class: 'select2 fullwidth', multiple: true %>
 </div>