spree_backend 4.1.11 → 4.2.0.beta

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

@@ -1,7 +1,7 @@
 <div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %> card  mb-3" id="<%= dom_id promotion_action %>">
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <div class="card-header d-flex justify-content-between">
-    <%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete order-2' %>
+    <%= link_to_with_icon 'delete.svg', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete order-2' %>
     <h3 class="card-title h5 mb-0 promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
   </div>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>

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

@@ -1,7 +1,7 @@
 <div class="promotion_rule promotion-block card mb-3" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.class.name.demodulize.underscore %>
   <div class="card-header d-flex justify-content-between">
-    <%= link_to_with_icon 'delete', '',
+    <%= link_to_with_icon 'delete.svg', '',
       spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule),
       remote: true,
       method: :delete,

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

@@ -6,13 +6,13 @@
 <div id="rule_fields" class="card-body">
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form', class: 'mb-3' do %>
-    
+
     <div class="form-group">
       <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
       <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2') %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'plus', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
     </div>
 
   <% end %>
@@ -40,7 +40,7 @@
     </div>
 
     <div class="promotion-update actions">
-      <%= button Spree.t('actions.update'), 'ok' %>
-    </div>    
+      <%= button Spree.t('actions.update'), 'save.svg' %>
+    </div>
   <% end %>
 </div>

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

@@ -4,8 +4,8 @@
 <% end %>
 
 <%= form_for @promotion, url: object_url, method: :put do |f| %>
-  <div class="row">
-    <div class="col-12">
+<div class="card mb-4">
+  <div class="card-body">
       <%= render partial: 'form', locals: { f: f } %>
       <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add.svg' %>
 <% end if can?(:create, Spree::Promotion) %>
 
 <% content_for :table_filter do %>
@@ -36,15 +36,16 @@
       </div>
 
       <div data-hook="admin_promotions_index_search_buttons" class="form-actions">
-        <%= button Spree.t(:filter_results), 'search' %>
+        <%= button Spree.t(:filter_results), 'search.svg' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
-<%= paginate @promotions, theme: 'twitter-bootstrap-4' %>
+<%= paginate @promotions, theme: 'admin-twitter-bootstrap-4' %>
 
 <% if @promotions.any? %>
+<div class="table-responsive">
   <table class="table">
     <thead>
       <tr>
@@ -75,6 +76,7 @@
       <% end %>
     </tbody>
   </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Promotion)) %>,

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

@@ -2,10 +2,11 @@
   <%= link_to Spree.t(:promotions), admin_promotions_url %> /
   <%= Spree.t(:new_promotion) %>
 <% end %>
-
-<%= form_for :promotion, url: collection_url do |f| %>
-  <%= render partial: 'form', locals: { f: f } %>
-  <div class="text-center">
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+<div class="card">
+  <div class="card-body">
+    <%= form_for :promotion, url: collection_url do |f| %>
+      <%= render partial: 'form', locals: { f: f } %>
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,6 +1,6 @@
 <div class="card-body">
   <div class="form-group mb-0">
     <%= label_tag Spree.t('country_rule.label') %>
-    <%= select_tag("#{param_prefix}[preferred_country_id]", options_for_select(Spree::Country.pluck(:name, :id), promotion_rule.preferred_country_id), { class: 'select_product form-control' }) %>
+    <%= select_tag("#{param_prefix}[preferred_country_id]", options_for_select(Spree::Country.pluck(:name, :id), promotion_rule.preferred_country_id), { class: 'select_product form-control custom-select' }) %>
   </div>
 </div>

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

@@ -1,11 +1,11 @@
 <div class="card-body">
   <div class="row mb-0">
-    <div class="form-group col-12 col-md-6 mb-0">
-      <%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'select2 select_item_total marginb' } %>
-      <%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'select2 select_item_total' } %>
+    <div class="form-group col-6 mb-3">
+      <%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'custom-select select_item_total mb-3' } %>
+      <%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'custom-select select_item_total' } %>
     </div>
-    <div class="form-group col-12 col-md-6 mb-0">
-      <%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'form-control marginb' %>
+    <div class="form-group col-6 mb-3">
+      <%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'form-control mb-3' %>
       <%= text_field_tag "#{param_prefix}[preferred_amount_max]", promotion_rule.preferred_amount_max, class: 'form-control' %>
     </div>
   </div>

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

@@ -1,9 +1,8 @@
 <div class="card-body">
   <div class="promo-rule-option-values">
     <div class="js-promo-rule-option-values"></div>
-
     <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
-      <span class="icon icon-add"></span>
+      <%= svg_icon name: "add.svg", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
     </button>
   </div>
@@ -17,20 +16,14 @@
 </script>
 
 <script type="text/x-handlebars-template" id="promo-rule-option-value-template">
-  <div class="promo-rule-option-value panel  ">
-    <div class="card-header">
+  <div class="promo-rule-option-value panel card mb-3">
+    <div class="card-header d-flex justify-content-between">
+      <label><%= Spree.t(:product) %> <%= Spree.t(:option_values) %></label>
       <a class="js-remove-promo-rule-option-value delete pull-right">
-        <span class="icon icon-delete"></span>
+        <%= svg_icon name: "delete.svg", width: '16', height: '16' %>
       </a>
-      <div class="col-12 col-md-6">
-        <label><%= Spree.t(:product) %></label>
-      </div>
-      <div class="col-12 col-md-5">
-        <label><%= Spree.t(:option_values) %></label>
-      </div>
-      <div class="clearfix"></div>
     </div>
-    <div class="card-body row">
+    <div class="card-body row p-3">
       <div class="col-12 col-md-6">
         <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
       </div>

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

@@ -5,6 +5,6 @@
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('product_rule.label') %>
-    <%= 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 form-control'}) %>
+    <%= 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 form-control custom-select'}) %>
   </div>
 </div>

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

@@ -5,6 +5,6 @@
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('taxon_rule.label') %>
-    <%= 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 form-control'}) %>
+    <%= 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 form-control custom-select'}) %>
   </div>
 </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_property', id: 'new_property_link' } %>
+  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_property', id: 'new_property_link' } %>
 <% end if can?(:create, Spree::Property) %>
 
 <% content_for :table_filter do %>
@@ -29,7 +29,7 @@
       </div>
 
       <div class="form-actions" data-hook="admin_pproperties_index_search_buttons">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search), 'search.svg' %>
       </div>
 
     <% end %>
@@ -37,6 +37,7 @@
 <% end %>
 
 <% if @properties.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_properties' data-hook>
     <thead>
       <tr data-hook="listing_properties_header">
@@ -58,6 +59,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Property)) %>,
@@ -65,4 +67,4 @@
   </div>
 <% end %>
 
-<%= paginate @collection, theme: 'twitter-bootstrap-4' %>
+<%= paginate @collection, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -1,29 +1,31 @@
-<table class="table table-condensed table-bordered">
-  <thead>
-    <tr data-hook="available_header">
-      <th><%= Spree.t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @prototypes.each do |prototype| %>
-      <tr id="row_<%= prototype.id %>" data-hook="available_row">
-        <td><%= prototype.name %></td>
-        <td class="actions actions-1">
-          <%= link_to_with_icon 'save',
-            Spree.t(:select),
-            select_admin_prototype_url(prototype),
-            class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
-            no_text: true %>
-        </td>
+<div class="table-responsive">
+  <table class="table table-condensed table-bordered">
+    <thead>
+      <tr data-hook="available_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-    <% if @prototypes.empty? %>
-      <tr data-hook="available_none">
-        <td colspan="2">
-          <% Spree.t(:none) %>.
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @prototypes.each do |prototype| %>
+        <tr id="row_<%= prototype.id %>" data-hook="available_row">
+          <td><%= prototype.name %></td>
+          <td class="actions actions-1">
+            <%= link_to_with_icon 'save.svg',
+              Spree.t(:select),
+              select_admin_prototype_url(prototype),
+              class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+              no_text: true %>
+          </td>
+        </tr>
+      <% end %>
+      <% if @prototypes.empty? %>
+        <tr data-hook="available_none">
+          <td colspan="2">
+            <% Spree.t(:none) %>.
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -3,29 +3,31 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
 <% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>
-  <table class="table" id='listing_prototypes' data-hook>
-    <thead>
-      <tr data-hook="prototypes_header">
-        <th><%= Spree.t(:name) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @prototypes.each do |prototype| %>
-        <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
-          <td><%= prototype.name %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') if can?(:edit, prototype) %>
-            <%= link_to_delete(prototype, no_text: true) if can?(:delete, prototype) %>
-          </td>
+  <div class="table-responsive">
+    <table class="table" id='listing_prototypes' data-hook>
+      <thead>
+        <tr data-hook="prototypes_header">
+          <th><%= Spree.t(:name) %></th>
+          <th class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @prototypes.each do |prototype| %>
+          <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
+            <td><%= prototype.name %></td>
+            <td class="actions actions-2 text-right">
+              <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') if can?(:edit, prototype) %>
+              <%= link_to_delete(prototype, no_text: true) if can?(:delete, prototype) %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Prototype)) %>,

data/app/views/spree/admin/prototypes/show.html.erb

@@ -8,14 +8,27 @@
           <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), id: "option_type_#{ot.id}", class: "option-type" %>
           <%= label_tag "option_type_#{ot.id}", ot.presentation %>
         </b>
-        <ul class="option-type-values">
-          <% ot.option_values.each do |ov| %>
-          <li>
-            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
-            <%= label_tag "option_value_#{ov.id}", ov.presentation %>
-          </li>
-          <% end %>
-        </ul>
+        <% if Spree::OptionType.color&.name == ot[:name] %>
+          <ul class="option-type-values option-type-values__color">
+            <% ot.option_values.each do |ov| %>
+              <li>
+                <%= label_tag "option_value_#{ov.id}" do %>
+                  <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value"  %>
+                  <div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        <% else %>
+          <ul class="option-type-values">
+            <% ot.option_values.each do |ov| %>
+              <li>
+                <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
+                <%= label_tag "option_value_#{ov.id}", ov.presentation %>
+              </li>
+            <% end %>
+          </ul>
+        <% end %>
       </li>
     <% end %>
   </ul>

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

@@ -21,9 +21,9 @@
     </div>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.save'), 'save' %>
+      <%= button Spree.t('actions.save'), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "delete.svg" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -31,9 +31,9 @@
     </div>
 
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t(:refund), 'save' %>
+      <%= button Spree.t(:refund), 'save.svg' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), icon: "cancel.svg" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -16,15 +16,15 @@
     </div>
   <% end %>
   <div class="col-12 col-md-5">
-    <%= f.field_container :active, class: ['form-inline'] do %>
-      <%= f.check_box :active, class: 'form-control mr-1' %>
+    <%= f.field_container :active, class: ['form-inline flex-row p-1'] do %>
+      <%= f.check_box :active, class: 'form-control w-auto h-auto mr-1' %>
       <%= f.label :active, Spree.t(:active) %>
       <%= f.error_message_on :active %>
     <% end %>
   </div>
   <div class="col-12 col-md-5">
-    <%= f.field_container :mutable, class: ['form-inline'] do %>
-      <%= f.check_box :mutable, class: 'form-control mr-1' %>
+    <%= f.field_container :mutable, class: ['form-inline flex-row p-1'] do %>
+      <%= f.check_box :mutable, class: 'form-control w-auto h-auto mr-1' %>
       <%= f.label :mutable, Spree.t(:mutable) %>
       <%= f.error_message_on :mutable %>
     <% end %>

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_reimbursement_type' } %>
+  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
 <% if @reimbursement_types.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_reimbursement_types' data-hook>
     <thead>
       <tr data-hook="reimbursement_types_header">
@@ -22,7 +23,7 @@
             <%= reimbursement_type.name.humanize %>
           </td>
           <td>
-            <%= reimbursement_type.type %>
+            <%= reimbursement_type.type.split('::', 3).last %>
           </td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
@@ -32,6 +33,7 @@
       <% end %>
     </tbody>
   </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReimbursementType)) %>