solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -1,33 +1,29 @@
-<div class="col-12">
-  <div class="calculator-fields js-calculator-fields row">
-
-    <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 js-calculator-type custom-select fullwidth' %>
-      </div>
+<div class="calculator-fields js-calculator-fields row">
+  <div class="col-6">
+    <div class="field">
+      <% field_name = "#{param_prefix}[calculator_type]" %>
+      <%= label_tag field_name, t('spree.admin.promotions.actions.calculator_label') %>
+      <%= select_tag field_name,
+                    options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
+                    class: 'type-select js-calculator-type custom-select fullwidth' %>
     </div>
-
-    <div class="col-6">
-      <div class="settings">
-        <% 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>
+  </div>
+  <div class="col-6">
+    <div class="settings">
+      <% 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>
   </div>
 </div>

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -1,5 +1,6 @@
-<% calculator.preferences.keys.map do |key| %>
-  <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(key)}",
-     name: "#{prefix}[calculator_attributes][preferred_#{key}]",
-     value: calculator.get_preference(key), label: Spree.t(key.to_s) %>
+<% calculator.admin_form_preference_names.map do |name| %>
+  <%= render "spree/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) %>
 <% end %>

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

@@ -1,7 +1,9 @@
-<%= 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 %>
+<div class="field">
+  <%= 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 %>
+</div>
 
 <div class="field">
   <p>

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

@@ -1,4 +1,6 @@
-<%= 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 %>
+<div class="field">
+  <%= 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 %>
+</div>

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

@@ -1,16 +1,16 @@
 <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_amount)}",
   name: "#{prefix}[calculator_attributes][preferred_base_amount]",
-  value: calculator.preferred_base_amount, label: Spree.t(:base_amount) %>
+  value: calculator.preferred_base_amount, label: t('spree.base_amount') %>
 
 <div class="field">
   <%= label_tag(
     "#{prefix}[calculator_attributes][preferred_currency]",
-    Spree.t(:currency)
+    t('spree.currency')
   ) %>
   <%= select_tag(
     "#{prefix}[calculator_attributes][preferred_currency]",
     options_for_select(
-      Money::Currency.all,
+      Spree::Config.available_currencies,
       calculator.preferred_currency || Spree::Config[:currency]
     ),
     { class: 'custom-select fullwidth' }
@@ -18,13 +18,13 @@
 </div>
 
 <div class="field">
-  <%= label_tag nil, Spree.t(:tiers) %>
+  <%= label_tag nil, t('spree.tiers') %>
   <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>
+    <a class="button js-add-tier"><%= t('spree.actions.add') %></a>
   </div>
 </div>

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

@@ -1,16 +1,16 @@
 <%= render "spree/admin/shared/preference_fields/#{calculator.preference_type(:base_percent)}",
   name: "#{prefix}[calculator_attributes][preferred_base_percent]",
-  value: calculator.preferred_base_percent, label: Spree.t(:base_percent) %>
+  value: calculator.preferred_base_percent, label: t('spree.base_percent') %>
 
 <div class="field">
   <%= label_tag(
     "#{prefix}[calculator_attributes][preferred_currency]",
-    Spree.t(:currency)
+    t('spree.currency')
   ) %>
   <%= select_tag(
     "#{prefix}[calculator_attributes][preferred_currency]",
     options_for_select(
-      Money::Currency.all,
+      Spree::Config.available_currencies,
       calculator.preferred_currency || Spree::Config[:currency]
     ),
     { class: 'custom-select fullwidth' }
@@ -18,13 +18,13 @@
 </div>
 
 <div class="field">
-  <%= label_tag nil, Spree.t(:tiers) %>
+  <%= label_tag nil, t('spree.tiers') %>
   <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>
+    <a class="button js-add-tier"><%= t('spree.actions.add') %></a>
   </div>
 </div>

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

@@ -6,7 +6,7 @@
 <% 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) %>
+      <%= button_link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
     <% end %>
 
     <% if can?(:display, Spree::PromotionCodeBatch) %>

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

@@ -3,13 +3,13 @@
 <% content_for :page_actions do %>
   <% if can? :create, Spree::Promotion %>
     <li>
-      <%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path %>
+      <%= button_link_to t('spree.new_promotion'), spree.new_admin_promotion_path %>
     </li>
   <% end %>
 <% end %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -40,7 +40,7 @@
         <div class="col-3">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
-            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.all') }, { class: 'custom-select fullwidth' }) %>
+            <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: t('spree.match_choices.all') }, { class: 'custom-select fullwidth' }) %>
           </div>
         </div>
       </div>
@@ -49,7 +49,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_promotions_index_search_buttons">
-          <%= button Spree.t(:filter_results) %>
+          <%= button t('spree.filter_results') %>
         </div>
       </div>
     <% end %>
@@ -78,11 +78,11 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : Spree.t(:number_of_codes, count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
-              <%= Spree.t(promotion.active?? :active : :inactive) %>
+              <%= t(promotion.active?? :active : :inactive, scope: 'spree') %>
             </span>
           </td>
           <td>
@@ -110,7 +110,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Promotion,
                  new_resource_url: new_object_url %>

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

@@ -1,7 +1,7 @@
 <% admin_layout "full-width" %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(Spree.t(:new_promotion)) %>
+<% admin_breadcrumb(t('spree.new_promotion')) %>
 
 <%= form_for @promotion, url: collection_url do |f| %>
   <%= render partial: 'form', locals: { f: f } %>

data/app/views/spree/admin/promotions/rules/_item_total.html.erb

@@ -1,16 +1,14 @@
-<div class="col-12">
-  <div class="row">
-    <div class="col-6">
-      <div class="field">
-        <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
-      </div>
+<div class="row">
+  <div class="col-6">
+    <div class="field">
+      <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [t(o, scope: 'spree.item_total_rule.operators'),o]}, promotion_rule.preferred_operator), {class: 'custom-select select_item_total fullwidth'} %>
     </div>
-    <div class="col-6">
-      <div class="field">
-        <%= fields_for param_prefix, promotion_rule do |f| %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
-        <% end %>
-      </div>
+  </div>
+  <div class="col-6">
+    <div class="field">
+      <%= fields_for param_prefix, promotion_rule do |f| %>
+        <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/promotions/rules/_nth_order.html.erb

@@ -1,14 +1,12 @@
-<div class="col-12">
-  <div class="row">
-    <div class="col-6">
-      <div class="field">
-        <%= Spree::Promotion::Rules::NthOrder.human_attribute_name(:form_text) %>
-      </div>
+<div class="row">
+  <div class="col-6">
+    <div class="field">
+      <%= Spree::Promotion::Rules::NthOrder.human_attribute_name(:form_text) %>
     </div>
-    <div class="col-6">
-      <div class="field">
-        <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, class: 'fullwidth' %>
-      </div>
+  </div>
+  <div class="col-6">
+    <div class="field">
+      <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, class: 'fullwidth' %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -1,17 +1,13 @@
-<div class="col-12">
-  <div class="field promo-rule-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="clear"></div>
+<div class="field promo-rule-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="js-promo-rule-option-values"></div>
+  <%= content_tag :div, nil, class: "js-promo-rule-option-values",
+    data: { :'original-option-values' => promotion_rule.preferred_eligible_values } %>
 
-    <button class="button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
-  </div>
-</div>
+  <button class="button js-add-promo-rule-option-value"><%= t('spree.actions.add') %></button>
 
-<%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values",
-  data: { :'original-option-values' => promotion_rule.preferred_eligible_values } %>
+</div>

data/app/views/spree/admin/promotions/rules/_product.html.erb

@@ -1,13 +1,15 @@
-<div class="col-12">
-  <div class="field products_rule_products">
-    <%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
-    <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker fullwidth" %>
+<div class="row">
+  <div class="col-12">
+    <div class="field products_rule_products">
+      <%= label_tag "#{param_prefix}_product_ids_string", t('spree.product_rule.choose_products') %>
+      <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker fullwidth" %>
+    </div>
   </div>
-</div>
-<div class="col-12">
-  <div class="field">
-    <label>
-      <%= Spree.t('product_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product custom-select'})).html_safe %>
-    </label>
+  <div class="col-12">
+    <div class="field">
+      <label>
+        <%= t('spree.product_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [t("spree.product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product custom-select'})).html_safe %>
+      </label>
+    </div>
   </div>
 </div>

data/app/views/spree/admin/promotions/rules/_taxon.html.erb

@@ -1,15 +1,9 @@
-  <div class="row">
-    <div class="col-11">
-      <div class="field taxons_rule_taxons">
-        <%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
-        <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker fullwidth", id: 'product_taxon_ids' %>
-      </div>
-    </div>
-    <div class="col-12">
-      <div class="field">
-        <label>
-          <%= Spree.t('taxon_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon custom-select'})).html_safe %>
-        </label>
-      </div>
-    </div>
-  </div>
+<div class="field taxons_rule_taxons">
+  <%= label_tag "#{param_prefix}_taxon_ids_string", t('spree.taxon_rule.choose_taxons') %>
+  <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker fullwidth", id: 'product_taxon_ids' %>
+</div>
+<div class="field">
+  <label>
+    <%= t('spree.taxon_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [t("spree.taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon custom-select'})).html_safe %>
+  </label>
+</div>

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -1,6 +1,4 @@
-<div class="col-12">
-  <div class="field">
-    <label><%= Spree.t('user_rule.choose_users') %></label><br>
-    <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
-  </div>
+<div class="field">
+  <label><%= t('spree.user_rule.choose_users') %></label><br>
+  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
 </div>

data/app/views/spree/admin/promotions/rules/_user_role.html.erb

@@ -1,12 +1,12 @@
 <div class="form-group">
-  <%= label_tag "#{param_prefix}_preferred_role_ids", Spree.t('user_role_rule.choose_roles') %>
+  <%= label_tag "#{param_prefix}_preferred_role_ids", t('spree.user_role_rule.choose_roles') %>
   <%= select_tag "#{param_prefix}[preferred_role_ids]",
     options_from_collection_for_select(
       Spree::Role.all, :id, :name, promotion_rule.preferred_role_ids
-    ), class: 'custom-select fullwidth', multiple: true %>
+    ), class: 'select2 fullwidth', multiple: true %>
 </div>
 <div class="form-group">
   <label>
-    <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'custom-select'})).html_safe %>
+    <%= t('spree.user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [t("spree.user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'custom-select'})).html_safe %>
   </label>
 </div>

data/app/views/spree/admin/properties/index.html.erb

@@ -5,13 +5,13 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Property) %>
     <li id="new_property_link">
-      <%= button_link_to Spree.t(:new_property), new_admin_property_url, { remote: true, id: 'new_property_link' } %>
+      <%= button_link_to t('spree.new_property'), new_admin_property_url, { remote: true, id: 'new_property_link' } %>
     </li>
   <% end %>
 <% end %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -25,7 +25,7 @@
           <div class="row">
             <div class="col-6">
               <div class="field">
-                <%= f.label :name_cont, Spree.t(:name) %>
+                <%= f.label :name_cont, t('spree.name') %>
                 <%= f.text_field :name_cont, size: 15 %>
               </div>
             </div>
@@ -35,7 +35,7 @@
         <div class="clear"></div>
 
         <div class="form-buttons actions filter-actions" data-hook="admin_pproperties_index_search_buttons">
-          <%= button Spree.t(:search) %>
+          <%= button t('spree.search') %>
         </div>
     <% end %>
   </div>
@@ -75,7 +75,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Property,
                  new_resource_url: new_object_url %>