spree_backend 4.1.1 → 4.5.0

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

@@ -40,7 +40,7 @@
             name="{{valueField.name}}" type="text" value={{valueField.value}}>
         </div>
       </div>
-      <a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
+      <a class="js-remove-tier btn btn-light btn-sm"><span class="icon icon-delete"></span></a>
     </div>
   </div>
 </script>

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,47 +36,50 @@
       </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' %>
-
 <% if @promotions.any? %>
-  <table class="table">
-    <thead>
-      <tr>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:code) %></th>
-        <th><%= Spree.t(:description) %></th>
-        <th><%= Spree.t(:usage_limit) %></th>
-        <th><%= Spree.t(:promotion_uses) %></th>
-        <th><%= Spree.t(:expiration) %></th>
-        <th data-hook="admin_promotions_index_header_actions" class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @promotions.each do |promotion| %>
-        <tr id="<%= spree_dom_id promotion %>">
-          <td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td>
-          <td><%= promotion.code %></td>
-          <td><%= promotion.description %></td>
-          <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
-          <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
-          <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-          <td class="actions actions-2" data-hook="admin_promotions_index_row_actions">
-            <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
-            <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
-            <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
-          </td>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table">
+      <thead class="text-muted">
+        <tr>
+          <th><%= Spree.t(:name) %></th>
+          <th><%= Spree.t(:code) %></th>
+          <th><%= Spree.t(:description) %></th>
+          <th><%= Spree.t(:usage_limit) %></th>
+          <th><%= Spree.t(:promotion_uses) %></th>
+          <th><%= Spree.t(:expiration) %></th>
+          <th data-hook="admin_promotions_index_header_actions" class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @promotions.each do |promotion| %>
+          <tr id="<%= spree_dom_id promotion %>">
+            <td><%= link_to promotion.name, spree.edit_admin_promotion_path(promotion) %></td>
+            <td><%= promotion.code %></td>
+            <td><%= promotion.description %></td>
+            <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
+            <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
+            <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+            <td class="actions" data-hook="admin_promotions_index_row_actions">
+              <span class="d-flex justify-content-end">
+               <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
+               <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
+               <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+  <%= render 'spree/admin/shared/index_table_options', collection: @promotions, simple: true %>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Promotion)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Promotion) %>!
   </div>

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>
-
+    <div class="js-promo-rule-option-values"></div> <!-- display div for option value select -->
     <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
-      <span class="icon icon-add"></span>
+      <%= svg_icon name: "plus-circle", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
     </button>
   </div>
@@ -13,30 +12,25 @@
   data: { :'original-option-values' => promotion_rule.preferred_eligible_values } %>
 
 <script type="text/x-handlebars-template" id="promo-rule-option-value-option-values-select-name-template">
-  <%= param_prefix %>[preferred_eligible_values][{{productId}}]
+  <%= param_prefix %>[preferred_eligible_values][{{productId}}][]
 </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" id="promo-rule-option-value-{{productId}}">
+    <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="col-12 col-md-6">
-        <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
+    <div class="card-body row p-3">
+      <div class="col-12 col-md-6 product-select">
+        <%= select_tag "product", nil, class: 'js-promo-rule-option-value-product-select d-block w-100', id: "promo-rule-option-value-product-select-{{productId}}" %>
       </div>
-      <div class="col-12 col-md-6">
-        <input class="js-promo-rule-option-value-option-values-select fullwidth" name="<%= param_prefix %>[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
+      <div class="col-12 col-md-6 option-value-select">
+        <%= select_tag "#{param_prefix}[preferred_eligible_values][{{ productId }}][]", nil, multiple: true, disabled: true, class: 'js-promo-rule-option-value-option-values-select d-none w-100', id: "promo-rule-option-value-option-values-select-{{productId}}" %>
       </div>
     </div>
   </div>
 </script>
+

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

@@ -1,10 +1,10 @@
 <div class="card-body">
   <div class="form-group 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" %>
+    <%= select "#{param_prefix}", 'product_ids_string', options_from_collection_for_select(promotion_rule.products, :id, :name, promotion_rule.products.pluck(:id)), { include_hidden: true }, multiple: true, class: 'product_picker d-block w-100' %>
   </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

@@ -1,10 +1,10 @@
 <div class="card-body">
   <div class="form-group 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", id: 'product_taxon_ids' %>
+    <%= label_tag "#{param_prefix}_taxon_ids", Spree.t('taxon_rule.choose_taxons') %>
+    <%= select_tag "#{param_prefix}[taxon_ids]", options_from_collection_for_select(promotion_rule.taxons, :id, :pretty_name, promotion_rule.taxon_ids), class: 'taxon_picker d-block w-100', multiple: true, id: :product_taxon_ids %>
   </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/promotions/rules/_user.html.erb

@@ -1,6 +1,6 @@
 <div class="card-body">
   <div class="form-group mb-0">
     <%= label_tag Spree.t('user_rule.choose_users') %>
-    <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker' value='<%= promotion_rule.user_ids.join(",") %>'>
+    <%= select "#{param_prefix}", 'user_ids_string', options_from_collection_for_select(promotion_rule.users, :id, :email, promotion_rule.users.pluck(:id)), { include_hidden: true }, multiple: true, class: 'user_picker d-block w-100' %>
   </div>
 </div>

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

@@ -1,16 +1,22 @@
 <div data-hook="admin_property_form" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.field_container :name do %>
+      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :presentation, class: ['form-group'] do %>
-      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
+    <%= f.field_container :presentation do %>
+      <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>
       <%= f.text_field :presentation, class: 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
+  <div class="col-12 col-md-6">
+    <%= f.field_container :filterable do %>
+      <%= f.label :filterable, Spree.t(:filterable) %>
+      <%= f.check_box :filterable %>
+    <% end %>
+  </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 %>
@@ -28,8 +28,18 @@
         </div>
       </div>
 
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= label_tag :q_filterable_eq, Spree.t(:filterable_status) %>
+            <%= f.select :filterable_eq, options_for_select([[Spree.t(:filterable), true], [Spree.t(:non_filterable), false]]), { include_blank: true }, class: 'select2-clear js-filterable' %>
+          </div>
+        </div>
+      </div>
+    </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,11 +47,14 @@
 <% end %>
 
 <% if @properties.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_properties' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="listing_properties_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:presentation) %></th>
+        <th><%= Spree.t(:filterable) %></th>
+        <th><%= Spree.t(:filter_param) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -50,19 +63,24 @@
         <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
           <td><%= property.name %></td>
           <td><%= property.presentation %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(property, no_text: true) if can?(:edit, property) %>
-            <%= link_to_delete(property, no_text: true) if can?(:delete, property) %>
+          <td><%= active_badge(property.filterable) %></td>
+          <td><%= property.filter_param %></td>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(property, no_text: true) if can?(:edit, property) %>
+              <%= link_to_delete(property, no_text: true) if can?(:delete, property) %>
+            </span>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center w-100 no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Property)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::OptionType) %>!
   </div>
 <% end %>
 
-<%= paginate @collection, theme: 'twitter-bootstrap-4' %>
+<%= paginate @collection, theme: 'admin-twitter-bootstrap-4' %>

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

@@ -1,28 +1,28 @@
 <div data-hook="admin_prototype_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+  <%= f.field_container :name do %>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
 
   <div id='properties' data-hook>
-    <%= f.field_container :property_ids, class: ['form-group'] do %>
+    <%= f.field_container :property_ids do %>
       <%= f.label :property_ids, Spree.t(:properties) %><br>
       <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id="option_types" data-hook>
-    <%= f.field_container :option_type_ids, class: ['form-group'] do %>
+    <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
       <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id='taxons' data-hook>
-    <%= f.field_container :taxon_ids, class: ['form-group'] do %>
+    <%= f.field_container :taxon_ids do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
-      <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2" } %>
+      <%= f.select :taxon_ids, current_store.taxons.pluck(:name, :id), {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 </div>

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

@@ -1,29 +1,33 @@
-<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 border rounded bg-white">
+  <table class="table table-condensed border rounded">
+    <thead class="text-muted">
+      <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">
+            <span class="d-flex justify-content-end">
+              <%= 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 %>
+            </span>
+          </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,31 +3,35 @@
 <% 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 border rounded bg-white">
+    <table class="table" id='listing_prototypes' data-hook>
+      <thead class="text-muted">
+        <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">
+              <span class="d-flex justify-content-end">
+                <%= 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) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Prototype)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Prototype) %>!
   </div>

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

@@ -11,19 +11,19 @@
   <fieldset>
     <div data-hook="admin_refund_form_fields">
       <div class="form-group">
-        <%= f.label :amount, Spree.t(:amount) %><br/>
+        <%= f.label :amount, Spree.t(:amount) %><br>
         <%= @refund.amount %>
       </div>
       <div class="form-group">
-        <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
+        <%= f.label :refund_reason_id, Spree.t(:reason) %><br>
         <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2'}) %>
       </div>
     </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

@@ -11,29 +11,29 @@
   <fieldset>
     <div data-hook="admin_refund_form_fields">
       <div class="form-group">
-        <%= f.label :payment_amount, Spree.t(:payment_amount) %><br/>
+        <%= f.label :payment_amount, Spree.t(:payment_amount) %><br>
         <%= @refund.payment.amount %>
       </div>
       <div class="form-group">
-        <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>
+        <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>
         <%= @refund.payment.credit_allowed %>
       </div>
-      <%= f.field_container :amount, class: ['form-group'] do %>
+      <%= f.field_container :amount do %>
         <%= f.label :amount, Spree.t(:amount) %>
         <%= f.text_field :amount, class: 'form-control' %>
         <%= f.error_message_on :amount %>
       <% end %>
-      <%= f.field_container :reason, class: ['form-group'] do %>
+      <%= f.field_container :reason do %>
         <%= f.label :refund_reason_id, Spree.t(:reason) %>
-        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2'}) %>
+        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2-clear'}) %>
         <%= f.error_message_on :reason %>
       <% end %>
     </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 %>