solidus_backend 2.1.1 → 2.2.0.beta1

data/app/views/spree/admin/promotions/_activations_edit.html.erb

@@ -0,0 +1,22 @@
+<% if @promotion.apply_automatically? %>
+  <p>
+    <%= t('.auto') %>
+  </p>
+<% end %>
+
+<% if @promotion.codes.count == 1 %>
+  <p>
+    <%= t('.single_code_html', code: @promotion.codes.first.value) %>
+  </p>
+<% elsif @promotion.codes.count > 1 %>
+  <p>
+    <%= t('.multiple_codes_html', count: @promotion.codes.count) %>
+  </p>
+<% end %>
+
+<% if @promotion.path %>
+  <div class="field">
+    <%= f.label :path %>
+    <%= f.text_field :path, class: "fullwidth" %>
+  </p>
+<% end %>

data/app/views/spree/admin/promotions/_activations_new.html.erb

@@ -0,0 +1,66 @@
+<% activation_type = params[:activation_type] || 'single_code' %>
+<div class="row" id="js_promotion_activation">
+  <div class="col-3">
+    <div class="form-check">
+      <label class="form-check-label">
+        <%= radio_button_tag('activation_type', 'auto', activation_type == 'auto') %>
+        <%= t('.auto') %>
+      </label>
+    </div>
+    <div class="form-check">
+      <label class="form-check-label">
+        <%= radio_button_tag('activation_type', 'single_code', activation_type == 'single_code') %>
+        <%= t('.single_code') %>
+      </label>
+    </div>
+    <div class="form-check">
+      <label class="form-check-label">
+        <%= radio_button_tag('activation_type', 'multiple_codes', activation_type == 'multiple_codes') %>
+        <%= t('.multiple_codes') %>
+      </label>
+    </div>
+    <div class="form-check">
+      <label class="form-check-label">
+        <%= radio_button_tag('activation_type', 'path', activation_type == 'path') %>
+        <%= t('.path') %>
+      </label>
+    </div>
+  </div>
+  <div class="col-9">
+    <input name="promotion[apply_automatically]" type="hidden" value="0">
+    <div data-activation-type="auto">
+      <input name="promotion[apply_automatically]" type="hidden" value="1">
+    </div>
+
+    <div data-activation-type="single_code">
+      <div class="field">
+        <%= label_tag :single_code, Spree::PromotionCode.model_name.human, class: "required" %>
+        <%= text_field_tag :single_code, @promotion.codes.first.try!(:value), class: "fullwidth", required: true %>
+      </div>
+    </div>
+
+    <div data-activation-type="multiple_codes">
+      <%= fields_for :promotion_code_batch, @promotion_code_batch do |batch| %>
+        <div class="field">
+          <%= batch.label :base_code, class: "required" %>
+          <%= batch.text_field :base_code, class: "fullwidth", required: true %>
+        </div>
+        <div class="field">
+          <%= batch.label :number_of_codes, class: "required" %>
+          <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
+        </div>
+        <div class="field">
+          <%= f.label :per_code_usage_limit %>
+          <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
+        </div>
+      <% end %>
+    </div>
+
+    <div data-activation-type="path">
+      <div class="field" id="promotion_path_field">
+        <%= f.label :path, class: "required" %>
+        <%= f.text_field :path, class: "fullwidth", required: true %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/promotions/_form.html.erb

@@ -1,79 +1,66 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
-<div class="row">
-  <div id="general_fields" class="col-xs-9">
-    <div class="row">
-      <div class="col-xs-3">
-        <%= f.field_container :name do %>
-          <%= f.label :name %>
-          <%= f.text_field :name, :class => 'fullwidth' %>
-        <% end %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @promotion } %>
+<fieldset class="form-group no-border-bottom">
+  <legend><%= t '.general' %></legend>
 
-        <%= fields_for :promotion_builder do |bf| %>
-          <%= bf.field_container :base_code do %>
-            <%= bf.label :base_code %>
-            <%= bf.text_field :base_code, :readonly => !@promotion.new_record?, :class => 'fullwidth' %>
+  <div class="row">
+    <div id="general_fields" class="col-9">
+      <div class="row">
+        <div class="col-3">
+          <%= f.field_container :name do %>
+            <%= f.label :name, class: 'required' %>
+            <%= f.text_field :name, class: 'fullwidth', required: true %>
           <% end %>
 
-          <%= bf.field_container :number_of_codes do %>
-            <%= bf.label :number_of_codes %>
-            <%= bf.text_field :number_of_codes, :readonly => !@promotion.new_record?, class: 'fullwidth' %>
+          <%= f.field_container :advertise do %>
+            <%= f.check_box :advertise %>
+            <%= f.label :advertise %>
           <% end %>
-        <% end %>
+        </div>
 
-        <%= f.field_container :per_code_usage_limit do %>
-          <%= f.label :per_code_usage_limit %>
-          <%= f.text_field :per_code_usage_limit, class: 'fullwidth' %>
-        <% end %>
+        <div class="col-9">
+          <%= f.field_container :description do %>
+            <%= f.label :description %><br />
+            <%= f.text_area :description, rows: 7, class: 'fullwidth' %>
+          <% end %>
 
-        <%= f.field_container :path do %>
-          <%= f.label :path %>
-          <%= f.text_field :path, :class => 'fullwidth' %>
-        <% end %>
+          <%= f.field_container :category do %>
+            <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br />
+            <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
+          <% end %>
+        </div>
+      </div>
+    </div>
 
-        <%= f.field_container :advertise do %>
-          <%= f.check_box :advertise %>
-          <%= f.label :advertise %>
-        <% end %>
+    <div id="expiry_fields" class="col-3">
+      <%= f.field_container :overall_usage_limit do %>
+        <%= f.label :usage_limit %><br />
+        <%= f.number_field :usage_limit, min: 0, class: 'fullwidth' %><br>
+        <span class="info">
+          <%= Spree.t(:current_promotion_usage, count: @promotion.usage_count) %>
+        </span>
+      <% end %>
 
-        <%= f.field_container :apply_automatically do %>
-          <%= f.check_box :apply_automatically %>
-          <%= f.label :apply_automatically %>
-        <% end %>
+      <div id="starts_at_field" class="field">
+        <%= f.label :starts_at %>
+        <%= f.field_hint :starts_at %>
+        <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at), placeholder: t(".starts_at_placeholder"), class: 'datepicker datepicker-from fullwidth' %>
       </div>
 
-      <div class="col-xs-9">
-        <%= f.field_container :description do %>
-          <%= f.label :description %><br />
-          <%= f.text_area :description, :rows => 7, :class => 'fullwidth' %>
-        <% end %>
-
-        <%= f.field_container :category do %>
-          <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br />
-          <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
-        <% end %>
+      <div id="expires_at_field" class="field">
+        <%= f.label :expires_at %>
+        <%= f.field_hint :expires_at %>
+        <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at), placeholder: t(".expires_at_placeholder"), class: 'datepicker datepicker-to fullwidth' %>
       </div>
     </div>
   </div>
+</fieldset>
 
-  <div id="expiry_fields" class="col-xs-3">
-    <%= f.field_container :overall_usage_limit do %>
-      <%= f.label :usage_limit %><br />
-      <%= f.number_field :usage_limit, :min => 0, :class => 'fullwidth' %><br>
-      <span class="info">
-        <%= Spree.t(:current_promotion_usage, :count => @promotion.usage_count) %>
-      </span>
-    <% end %>
+<fieldset class="form-group no-border-bottom">
+  <legend><%= t '.activation' %></legend>
 
-    <div id="starts_at_field" class="field">
-      <%= f.label :starts_at %>
-      <%= f.field_hint :starts_at %>
-      <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :placeholder => t(".starts_at_placeholder"), :class => 'datepicker datepicker-from fullwidth' %>
-    </div>
-
-    <div id="expires_at_field" class="field">
-      <%= f.label :expires_at %>
-      <%= f.field_hint :expires_at %>
-      <%= f.text_field :expires_at, :value => datepicker_field_value(@promotion.expires_at), :placeholder => t(".expires_at_placeholder"), :class => 'datepicker datepicker-to fullwidth' %>
-    </div>
-  </div>
-</div>
+  <% if @promotion.new_record? %>
+    <%= render 'spree/admin/promotions/activations_new', f: f %>
+  <% else %>
+    <%= render 'spree/admin/promotions/activations_edit', f: f %>
+  <% end %>
+</fieldset>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -2,13 +2,13 @@
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <h6 class="promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h6>
   <% if can?(:destroy, promotion_action) %>
-    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
+    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete' %>
   <% end %>
 
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
 
-  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_action } %>
-  <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
-             :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
+  <%= render partial: "spree/shared/error_messages", locals: { target: promotion_action } %>
+  <%= render partial: "spree/admin/promotions/actions/#{type_name}",
+             locals: { promotion_action: promotion_action, param_prefix: param_prefix } %>
 </div>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -1,12 +1,12 @@
-<div class="promotion_rule promotion-block col-xs-12" id="<%= dom_id promotion_rule %>">
+<div class="promotion_rule promotion-block col-12" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
   <% if can?(:destroy, promotion_rule) %>
-    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
+    <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), remote: true, method: :delete, class: 'delete' %>
   <% end %>
 
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
-  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_rule } %>
-  <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
+  <%= render partial: "spree/shared/error_messages", locals: { target: promotion_rule } %>
+  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
 </div>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,13 +1,13 @@
 <fieldset id="rule_fields" class ="no-border-bottom no-border-top">
 
-  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), :remote => true, :id => 'new_product_rule_form' do %>
+  <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
     <fieldset>
       <legend align="center"><%= Spree.t(:rules) %></legend>
 
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
-          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
+          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2 fullwidth') %>
         </div>
         <div class="filter-actions actions">
           <%= button Spree.t('actions.add') %>
@@ -17,11 +17,11 @@
   <% end %>
 
 
-    <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
+    <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
         <div id="promotion-pilicy-select" class="align-center row">
           <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-            <div class="col-xs-6">
+            <div class="col-6">
               <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>
             </div>
           <% end %>
@@ -29,9 +29,9 @@
 
         <div id="rules" class="filter_list">
           <% if @promotion.rules.any? %>
-            <div class="col-xs-12">
+            <div class="col-12">
               <div class="row">
-                <%= render :partial => 'promotion_rule', :collection => @promotion.rules, :locals => {} %>
+                <%= render partial: 'promotion_rule', collection: @promotion.rules, locals: {} %>
               </div>
             </div>
           <% else %>
@@ -48,6 +48,4 @@
         <% end %>
       </fieldset>
     <% end %>
-
-
 </fieldset>

data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb

@@ -1,6 +1,6 @@
-<div class="col-xs-12">
+<div class="col-12">
   <div class="row">
-    <div class="col-xs-12">
+    <div class="col-12">
       <div class="field">
         <% field_name = "#{param_prefix}[preferred_group_size]" %>
         <%= label_tag field_name, Spree.t(:group_size) %>

data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb

@@ -1,34 +1,33 @@
-<div class="col-xs-12">
-  <div class="calculator-fields row">
+<div class="col-12">
+  <div class="calculator-fields js-calculator-fields row">
 
-    <div class="col-xs-6">
+    <div class="col-6">
       <div class="field">
         <% field_name = "#{param_prefix}[calculator_type]" %>
         <%= label_tag field_name, Spree::Calculator.model_name.human %>
         <%= select_tag field_name,
                       options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
-                      :class => 'type-select select2 fullwidth' %>
-        <% if promotion_action.calculator.respond_to?(:preferences) %>
-          <span class="warning info"><%= Spree.t(:calculator_settings_warning) %></span>
-        <% end %>
+                      class: 'type-select js-calculator-type select2 fullwidth' %>
       </div>
     </div>
 
-    <% unless promotion_action.new_record? %>
-      <div class="col-xs-6">
-        <div class="settings field">
-          <% type_name = promotion_action.calculator.type.demodulize.underscore %>
-          <% if lookup_context.exists?("fields",
-              ["spree/admin/promotions/calculators/#{type_name}"], true) %>
-            <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
-              calculator: promotion_action.calculator, prefix: param_prefix %>
-          <% else %>
-            <%= render "spree/admin/promotions/calculators/default_fields",
-              calculator: promotion_action.calculator, prefix: param_prefix %>
-          <% end %>
-          <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>
-        </div>
+    <div class="col-6">
+      <div class="settings field">
+        <% calculators.each do |calculator_class| %>
+          <% calculator = promotion_action.calculator.class == calculator_class ? promotion_action.calculator : calculator_class.new %>
+          <div class="js-calculator-preferences" data-calculator-type="<%= calculator_class %>">
+            <% type_name = calculator.type.demodulize.underscore %>
+            <% if lookup_context.exists?("fields",
+                ["spree/admin/promotions/calculators/#{type_name}"], true) %>
+              <%= render "spree/admin/promotions/calculators/#{type_name}/fields",
+                calculator: calculator, prefix: param_prefix %>
+            <% else %>
+              <%= render "spree/admin/promotions/calculators/default_fields",
+                calculator: calculator, prefix: param_prefix %>
+            <% end %>
+          </div>
+        <% end %>
       </div>
-    <% end %>
+    </div>
   </div>
 </div>

data/app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb

@@ -0,0 +1,4 @@
+<%= 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 %>
+<% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -6,9 +6,11 @@
   type: calculator.preference_type(:base_amount)) %>
 
 <%= label_tag nil, Spree.t(:tiers) %>
-<%= content_tag :div, nil, class: "js-tiers", data: {
-  'original-tiers' => Hash[calculator.preferred_tiers.sort],
-  'form-prefix' => prefix,
-  'calculator' => 'tiered_flat_rate'
-} %>
-<button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+<div class="js-tiered-calculator">
+  <%= content_tag :div, nil, class: "js-tiers", data: {
+    'original-tiers' => Hash[calculator.preferred_tiers.sort],
+    'form-prefix' => prefix,
+    'calculator' => 'tiered_flat_rate'
+  } %>
+  <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+</div>

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -6,9 +6,11 @@
   type: calculator.preference_type(:base_percent)) %>
 
 <%= label_tag nil, Spree.t(:tiers) %>
-<%= content_tag :div, nil, class: "js-tiers", data: {
-  'original-tiers' => Hash[calculator.preferred_tiers.sort],
-  'form-prefix' => prefix,
-  'calculator' => 'tiered_percent'
-} %>
-<button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+<div class="js-tiered-calculator">
+  <%= content_tag :div, nil, class: "js-tiers", data: {
+    'original-tiers' => Hash[calculator.preferred_tiers.sort],
+    'form-prefix' => prefix,
+    'calculator' => 'tiered_percent'
+  } %>
+  <button class="button js-add-tier"><%= Spree.t('actions.add') %></button>
+</div>

data/app/views/spree/admin/promotions/edit.html.erb

@@ -1,30 +1,33 @@
+<% admin_layout "full-width" %>
+
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
 <% admin_breadcrumb(@promotion.name) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <% if can?(:display, Spree::PromotionCode) %>
       <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
     <% end %>
+
+    <% if can?(:display, Spree::PromotionCodeBatch) %>
+      <%= button_link_to plural_resource_name(Spree::PromotionCodeBatch), admin_promotion_promotion_code_batches_path(promotion_id: @promotion.id) %>
+    <% end %>
   </li>
 <% end %>
 
-<%= form_for @promotion, :url => object_url, :method => :put do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <% if can?(:update, @promotion) %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-    <% end %>
-  </fieldset>
+<%= form_for @promotion, url: object_url, method: :put do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <% if can?(:update, @promotion) %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  <% end %>
 <% end %>
 
 <div id="promotion-filters" class="row">
-  <div id="rules_container" class="col-xs-6">
-    <%= render :partial => 'rules' %>
+  <div id="rules_container" class="col-6">
+    <%= render partial: 'rules' %>
   </div>
 
-  <div id="actions_container" class="col-xs-6">
-    <%= render :partial => 'actions' %>
+  <div id="actions_container" class="col-6">
+    <%= render partial: 'actions' %>
   </div>
 </div>