From 6703a797028a84c8c6db232da7cda47d8b1cc7ef Mon Sep 17 00:00:00 2001
From: PSzyszkaSpark <44572993+PSzyszkaSpark@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:35:33 +0100
Subject: [PATCH] [SD-824] Corrects color presentation in admin panel (#10012)

* Corrects color presentation in admin panel

* Corrects handlebar_extensions.js

* Corrects color display in variant form and removes upparcase in handlebar_extensions.js

* Changes checks from option type presentation to name
---
 .../javascripts/spree/backend/handlebar_extensions.js    | 7 +++++++
 .../app/views/spree/admin/variants/_autocomplete.js.erb  | 2 +-
 backend/app/views/spree/admin/variants/_form.html.erb    | 9 +++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/backend/app/assets/javascripts/spree/backend/handlebar_extensions.js b/backend/app/assets/javascripts/spree/backend/handlebar_extensions.js
index f7267e7b7ad..ae849f2e0a1 100644
--- a/backend/app/assets/javascripts/spree/backend/handlebar_extensions.js
+++ b/backend/app/assets/javascripts/spree/backend/handlebar_extensions.js
@@ -8,3 +8,10 @@ Handlebars.registerHelper('t', function (key) {
 Handlebars.registerHelper('edit_product_url', function (productId) {
   return Spree.routes.edit_product(productId)
 })
+Handlebars.registerHelper('name_or_presentation', function (optionValue) {
+  if (optionValue.name === 'color') {
+    return optionValue.name
+  } else {
+    return optionValue.presentation
+  }
+})
diff --git a/backend/app/views/spree/admin/variants/_autocomplete.js.erb b/backend/app/views/spree/admin/variants/_autocomplete.js.erb
index d6499cf428b..4488c186b06 100644
--- a/backend/app/views/spree/admin/variants/_autocomplete.js.erb
+++ b/backend/app/views/spree/admin/variants/_autocomplete.js.erb
@@ -12,7 +12,7 @@
       <h5 class="variant-name media-heading h6 mb-0">{{variant.name}}</h5>
       {{#if variant.option_values}}
         {{#each variant.option_values}}
-          <strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br/>
+          <strong>{{this.option_type_presentation}}:</strong> {{name_or_presentation this}}<br/>
         {{/each}}
       {{/if}}
       <strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}
diff --git a/backend/app/views/spree/admin/variants/_form.html.erb b/backend/app/views/spree/admin/variants/_form.html.erb
index 485dc11a24d..5ee2d0cba16 100644
--- a/backend/app/views/spree/admin/variants/_form.html.erb
+++ b/backend/app/views/spree/admin/variants/_form.html.erb
@@ -4,8 +4,13 @@
       <% @product.option_types.each do |option_type| %>
         <div class="form-group" data-hook="presentation">
           <%= label :new_variant, option_type.presentation %>
-          <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-            { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% if option_type.name == 'color' %>
+            <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% else %>
+            <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% end %>
         </div>
       <% end %>