Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SD-824] Corrects color presentation in admin panel #10012

Merged
merged 4 commits into from Mar 11, 2020
Merged

[SD-824] Corrects color presentation in admin panel #10012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
807071c
Corrects color presentation in admin panel
PSzyszkaSpark Mar 2, 2020
d557ebc
Corrects handlebar_extensions.js
PSzyszkaSpark Mar 2, 2020
2c11e29
Corrects color display in variant form and removes upparcase in handl…
PSzyszkaSpark Mar 11, 2020
9883ba0
Changes checks from option type presentation to name
PSzyszkaSpark Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions backend/app/assets/javascripts/spree/backend/handlebar_extensions.js
View file
Open in desktop
Expand Up @@ -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
}
})
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/variants/_autocomplete.js.erb
View file
Open in desktop
Expand Up @@ -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}}
Expand Down
9 changes: 7 additions & 2 deletions backend/app/views/spree/admin/variants/_form.html.erb
View file
Open in desktop
Expand Up @@ -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 %>

Expand Down