Skip to content

Commit

Permalink
Fix(Promotion Admin): Improve promotion activation form
Browse files Browse the repository at this point in the history 
This makes use of the previously defined methods to make the promotion
activation form more user-friendly and add some features:

- Activation is now a bootstrap menu
- Only one option can ever be edited
- Reintroduces feature where a promotion code batch is created with the
  promotion
  • Loading branch information
@mamhoff
mamhoff committed Nov 18, 2024
1 parent ddfd801 commit 43a9dcd
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 37 deletions.
4 changes: 4 additions & 0 deletions promotions/config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ en:
general: General
starts_at_placeholder: Immediately
codes_present: This promotion has promotion codes defined. You cannot select the apply automatically option.
automatic: "Automatic"
path: "Path"
single_code: "Single code"
multiple_codes: "Multiple codes"
edit:
order_conditions: Order Conditions
calculator:
Expand Down
10 changes: 5 additions & 5 deletions ...s/lib/views/backend/solidus_promotions/admin/promotion_code_batches/_form_fields.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="form-group">
<%= batch.label :base_code, class: "required" %>
<%= batch.text_field :base_code, class: "fullwidth", required: true %>
<%= batch.text_field :base_code, class: "fullwidth #{'enable' if promotion.can_change_codes?}", required: true, disabled: disabled %>
</div>
<div class="form-group">
<%= batch.label :number_of_codes, class: "required" %>
<%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
<%= batch.number_field :number_of_codes, class: "fullwidth #{'enable' if promotion.can_change_codes?}", min: 1, required: true, disabled: disabled %>
</div>
<div class="form-group">
<%= batch.label :join_characters %>
<%= batch.text_field :join_characters, class: "fullwidth" %>
<%= batch.text_field :join_characters, class: "fullwidth #{'enable' if promotion.can_change_codes?}", disabled: disabled %>
</div>
<% unless promotion_id %>
<div class="form-group">
<%= f.label :per_code_usage_limit %>
<%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
<%= f.text_field :per_code_usage_limit, class: "fullwidth #{'enable' if promotion.can_change_codes?}", disabled: disabled %>
</div>
<% end %>
<div class="form-group">
<%= batch.label :email %>
<%= batch.text_field :email, class: "fullwidth" %>
<%= batch.text_field :email, class: "fullwidth #{'enable' if promotion.can_change_codes?}", disabled: disabled %>
</div>
2 changes: 1 addition & 1 deletion promotions/lib/views/backend/solidus_promotions/admin/promotion_code_batches/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<% admin_breadcrumb(plural_resource_name(SolidusPromotions::PromotionCodeBatch)) %>
<%= form_for :promotion_code_batch, url: collection_url do |batch| %>
<%= batch.hidden_field :promotion_id, value: params[:promotion_id] %>
<%= render partial: 'form_fields', locals: {batch: batch, promotion_id: params[:promotion_id]} %>
<%= render partial: 'form_fields', locals: {batch: batch, promotion: @promotion, disabled: false, promotion_id: params[:promotion_id]} %>
<%= batch.submit t('spree.actions.create'), class: 'btn btn-primary' %>
<% end %>
103 changes: 72 additions & 31 deletions promotions/lib/views/backend/solidus_promotions/admin/promotions/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,40 +85,81 @@
</div>
</fieldset>

<fieldset class="form-group row no-border-bottom">
<fieldset class="no-border-bottom">
<legend><%= t '.activation' %></legend>

<div class="col-4">
<%= f.field_container :apply_automatically do %>
<%= f.label :apply_automatically do %>
<%= f.check_box :apply_automatically, disabled: f.object.codes.any? || f.object.path.present? %>
<%= SolidusPromotions::Promotion.human_attribute_name(:apply_automatically) %>
<%= f.field_hint :promo_code_will_be_disabled %>
<% end %>
<% end %>
</div>

<% if f.object.new_record? || f.object.present? %>
<div class="col-4">
<%= f.field_container :path do %>
<%= f.label :path %>
<%= f.text_field :path, class: "fullwidth", disabled: f.object.apply_automatically || f.object.codes.present? %>
<% end %>
<div class="row">
<div class="col-3">
<div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
<button class="nav-link mb-1 active" id="v-pills-automatic-tab" data-toggle="pill" data-target="#v-pills-automatic" type="button" role="tab" aria-controls="v-pills-automatic" aria-selected="true">
<%= t(".automatic") %>
</button>
<button class="nav-link mb-1" id="v-pills-path-tab" data-toggle="pill" data-target="#v-pills-path" type="button" role="tab" aria-controls="v-pills-path" aria-selected="false">
<%= t(".path") %>
</button>
<button class="nav-link mb-1" id="v-pills-single-code-tab" data-toggle="pill" data-target="#v-pills-single-code" type="button" role="tab" aria-controls="v-pills-single-code" aria-selected="false">
<%= t(".single_code") %>
</button>
<button class="nav-link mb-1" id="v-pills-multiple-codes-tab" data-toggle="pill" data-target="#v-pills-multiple-codes" type="button" role="tab" aria-controls="v-pills-multiple-codes" aria-selected="false">
<%= t(".multiple_codes") %>
</button>
</div>
</div>
<% end %>

<div class="col-4">
<% if f.object.new_record? %>
<div id="promotion_single_code" class="form-group">
<%= label_tag :single_code, SolidusPromotions::PromotionCode.model_name.human %>
<%= text_field_tag :single_code, @promotion.codes.first.try!(:value), class: "fullwidth", disabled: f.object.apply_automatically || f.object.path.present? %>
<div class="col-9">
<div class="tab-content" id="v-pills-tabContent">
<div class="tab-pane fade show active" id="v-pills-automatic" role="tabpanel" aria-labelledby="v-pills-automatic-tab">
<%= f.field_container :apply_automatically do %>
<%= f.label :apply_automatically do %>
<%= f.check_box :apply_automatically, {disabled: !f.object.can_change_apply_automatically?, class: "#{'enable' if f.object.can_change_apply_automatically?}"} %>
<%= SolidusPromotions::Promotion.human_attribute_name(:apply_automatically) %>
<%= f.field_hint :promo_code_will_be_disabled %>
<% end %>
<% if f.object.codes.present? %>
<div class="codes-present">
<p>
<%= t('.codes_present') %>
</p>
</div>
<% end %>
<% end %>
</div>
<% else %>
<div class="codes-present">
<p>
<%= t('.codes_present') %>
</p>
<div class="tab-pane fade" id="v-pills-path" role="tabpanel" aria-labelledby="v-pills-path-tab">
<%= f.field_container :path do %>
<%= f.label :path %>
<%= f.text_field :path, class: "fullwidth #{'enable' if f.object.can_change_path?}", disabled: true %>
<% end %>
</div>
<% end %>
<div class="tab-pane fade" id="v-pills-single-code" role="tabpanel" aria-labelledby="v-pills-single-code-tab">
<%= f.field_container :single_code do%>
<%= label_tag :single_code, SolidusPromotions::PromotionCode.model_name.human %>
<%= text_field_tag :single_code, @promotion.codes.first.try!(:value), class: "fullwidth #{'enable' if f.object.can_change_codes?}", disabled: true %>
<% end %>
</div>
<div class="tab-pane fade" id="v-pills-multiple-codes" role="tabpanel" aria-labelledby="v-pills-multiple-codes-tab">
<%= fields_for :promotion_code_batch, @promotion.code_batches.new do |batch| %>
<%= render partial: 'solidus_promotions/admin/promotion_code_batches/form_fields', locals: {f: f, batch: batch, promotion: @promotion, disabled: true, promotion_id: params[:promotion_id]} %>
<% end %>
</div>
</div>
</div>
</div>
</fieldset>

<script>
function disableInactiveTabFields(event) {
const panes = document.querySelectorAll(".tab-pane");
panes.forEach(pane => {
if (pane.id == event.target.dataset.target.slice(1)) {
pane.querySelectorAll("input.enable, select.enable").forEach(input => {
input.removeAttribute("disabled");
});
} else {
pane.querySelectorAll("input, select").forEach(input => {
input.setAttribute("disabled", true);
});
}
});
}
document.addEventListener("DOMContentLoaded", function() {
$(".nav-link").on("show.bs.tab", disableInactiveTabFields);
});
</script>

0 comments on commit 43a9dcd

Please sign in to comment.