spree_backend 4.2.0.rc2 → 4.2.0.rc3

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -83,8 +83,8 @@
             <%= f.fields_for :ship_address do |sa_form| %>
               <div class="form-group">
                 <span data-hook="use_billing">
-                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
-                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address?, class: 'checkbox' %>
+                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address), class: 'form-check-label' %>
                 </span>
               </div>
 

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -12,7 +12,7 @@
       </h1>
     </div>
     <div class="card-body" id="customer-search-field">
-      <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+      <%= select_tag :customer_search, nil, class: 'd-block w-100' %>
       <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
     </div>
   </div>

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

@@ -67,21 +67,21 @@
           <%= f.select :state_eq,
             Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
             { include_blank: true },
-            class: 'select2 js-filterable' %>
+            class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
@@ -124,21 +124,21 @@
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_store_id_in, Spree.t(:store) %>
-          <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_channel_eq, Spree.t(:channel) %>
-          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
@@ -206,22 +206,21 @@
           <%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
         </td>
         <td>
-          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
+          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %> text-uppercase">
             <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
           </span>
         </td>
         <td class="no-wrap">
-          <span class="badge badge-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="badge badge-<%= order.state.downcase %> text-uppercase"><%= Spree.t("order_state.#{order.state}") %></span>
           <span class="filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>">
             <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
           </span>
         </td>
         <td class="no-wrap">
           <% if order.payment_state %>
-
             <%= link_to Spree.t("payment_states.#{order.payment_state}"),
               admin_order_payments_path(order),
-              class: "badge badge-#{order.payment_state}" %>
+              class: "badge badge-#{order.payment_state} text-uppercase" %>
 
             <span class="filterable js-add-filter"
               data-ransack-field="q_payment_state_eq"
@@ -233,7 +232,7 @@
         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
           <td class="no-wrap">
             <% if order.shipment_state %>
-              <span class="badge badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+              <span class="badge badge-<%= order.shipment_state %> text-uppercase"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
               <span class="filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>">
                 <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
               </span>

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

@@ -2,59 +2,78 @@
 
   <div data-hook="payment_method" class="row">
 
-    <div class="col-12 col-md-4">
-      <div id="preference-settings" data-hook class="form-group">
-        <%= f.label :type, Spree.t(:provider) %>
-        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
-
-        <% unless @object.new_record? %>
-          <%= preference_fields(@object, f) %>
-
-          <% if @object.respond_to?(:preferences) %>
-            <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
-          <% end %>
-        <% end %>
-      </div>
-      <div data-hook="store" class="form-group">
-        <%= label_tag :payment_method_store, Spree.t(:store) %>
-        <%= collection_select(:payment_method, :store_id, @stores, :id, :unique_name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
-      </div>
-      <div data-hook="display" class="form-group">
-        <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
-      </div>
-      <div data-hook="auto_capture" class="form-group">
-        <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
-      </div>
-      <div data-hook="active" class="form-group">
-        <strong><%= Spree.t(:active) %></strong>
-        <div class="radio my-2">
-          <%= label_tag :payment_method_active_true do %>
-            <%= radio_button :payment_method, :active, true %>
-            <%= Spree.t(:say_yes) %>
-          <% end %>
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:settings) %></h5>
         </div>
+        <div class="card-body">
+          <div class="form-group">
+            <%= f.label :type, Spree.t(:provider) %>
+            <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
+          </div>
+          <hr class="my-4">
+          <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
+            <%= label_tag :payment_method_name, Spree.t(:name) %>
+            <%= text_field :payment_method, :name, class: 'form-control' %>
+            <%= error_message_on :payment_method, :name %>
+          <% end %>
 
-        <div class="radio my-2">
-          <%= label_tag :payment_method_active_false do %>
-            <%= radio_button :payment_method, :active, false %>
-            <%= Spree.t(:say_no) %>
+          <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
+            <%= label_tag :payment_method_description, Spree.t(:description) %>
+            <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
           <% end %>
+
+          <div data-hook="store" class="form-group">
+            <%= label_tag :payment_method_stores, Spree.t(:stores) %>
+            <%= collection_select(:payment_method, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
+          </div>
+
+          <div data-hook="display" class="form-group">
+            <%= label_tag :payment_method_display_on, Spree.t(:display) %>
+            <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
+          </div>
+          <div data-hook="auto_capture" class="form-group">
+            <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
+            <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
+          </div>
+
+          <div data-hook="active" class="form-group">
+            <strong><%= Spree.t(:active) %></strong>
+            <div class="radio my-2 form-check">
+              <%= radio_button :payment_method, :active, true, class: 'form-check-input' %>
+              <%= label_tag :payment_method_active_true, Spree.t(:say_yes), class: 'form-check-label' %>
+            </div>
+
+            <div class="radio my-2 form-check">
+              <%= radio_button :payment_method, :active, false, class: 'form-check-input' %>
+              <%= label_tag :payment_method_active_false, Spree.t(:say_no), class: 'form-check-label' %>
+            </div>
+          </div>
         </div>
       </div>
     </div>
 
-    <div class="col-12 col-md-8">
-      <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
-        <%= label_tag :payment_method_name, Spree.t(:name) %>
-        <%= text_field :payment_method, :name, class: 'form-control' %>
-        <%= error_message_on :payment_method, :name %>
-      <% end %>
-      <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
-        <%= label_tag :payment_method_description, Spree.t(:description) %>
-        <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
-      <% end %>
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:payment_provider_settings) %></h5>
+        </div>
+        <div class="card-body">
+          <div id="preference-settings" data-hook class="form-group">
+            <% unless @object.new_record? %>
+            <% if preference_fields(@object, f).empty? %>
+              <%= Spree.t('no_payment_provider_settings_message') %>
+            <% end %>
+              <%= preference_fields(@object, f) %>
+
+              <% if @object.respond_to?(:preferences) %>
+                <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>

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

@@ -30,7 +30,7 @@
           <td><%= method.name %></td>
           <td><%= method.type.split('::', 3).last %></td>
           <td class="text-center"><%= Spree.t(method.display_on) %></td>
-          <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center"><%= active_badge(method.active) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit(method, no_text: true) if can? :edit, method %>
             <%= link_to_delete(method, no_text: true) if can? :delete, method %>

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

@@ -56,7 +56,7 @@
       <div data-hook="admin_product_form_cost_currency" class="omega two columns">
         <%= f.field_container :cost_currency, class: ['form-group'] do %>
           <%= f.label :cost_currency, Spree.t(:cost_currency) %>
-          <%= f.text_field :cost_currency, class: 'form-control' %>
+          <%= f.select :cost_currency, currency_options(@product.cost_currency), {}, { class: 'select2' } %>
           <%= f.error_message_on :cost_currency %>
         <% end %>
       </div>
@@ -195,7 +195,7 @@
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible'  %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>
@@ -214,7 +214,7 @@
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
-        <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
+        <%= f.select :option_type_ids, options_from_collection_for_select(Spree::OptionType.all, :id, :name, @product.option_types.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">
           <% @product.option_types.each do |type| %>
@@ -246,7 +246,7 @@
     <div data-hook="admin_product_form_meta_description">
       <%= f.field_container :meta_description, class: ['form-group'] do %>
         <%= f.label :meta_description, Spree.t(:meta_description) %>
-        <%= f.text_field :meta_description, class: 'form-control' %>
+        <%= f.text_area :meta_description, class: 'form-control' %>
       <% end %>
     </div>
 

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

@@ -64,6 +64,7 @@
     </thead>
     <tbody>
       <% @collection.each do |product| %>
+        <% available_status = available_status(product) %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td scope="row" class="image">
               <%= link_to edit_admin_product_path(product) do %>
@@ -72,7 +73,7 @@
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="sku"><%= product.sku rescue '' %></td>
-            <td class="status"><%= available_status(product) %> </td>
+            <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
             <td class="actions " data-hook="admin_products_index_row_actions">
               <span class="d-flex justify-content-end">

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

@@ -27,7 +27,7 @@
       <div data-hook="new_product_prototype" class="col-12 col-md-4">
         <%= f.field_container :prototype, class: ['form-group'] do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
-          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {include_blank: true}, {class: 'select2'} %>
+          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
         <% end %>
       </div>
 
@@ -59,7 +59,7 @@
       <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
         <%= f.field_container :shipping_category, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -7,4 +7,4 @@ $('.user_picker').userAutocomplete();
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
 $('#promotion_rule_type').select2();
 
-set_taxon_select('#product_taxon_ids')
+$('#product_taxon_ids').taxonAutocomplete()

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

@@ -43,7 +43,7 @@
 
     <%= f.field_container :category, class: ['form-group'] do %>
       <%= f.label :promotion_category %>
-      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+      <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
     <% end %>
   </div>
 

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

@@ -15,7 +15,7 @@
         <% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
         <div class="form-group">
           <%= label_tag "#{line_item_prefix}_variant_id", Spree.t(:variant) %>
-          <%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: "variant_autocomplete" %>
+          <%= select_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, class: 'variant_autocomplete d-block w-100' %>
         </div>
         <div class="form-group mb-0">
           <%= label_tag "#{line_item_prefix}_quantity", Spree.t(:quantity) %>

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

@@ -1,6 +1,6 @@
 <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">
       <%= svg_icon name: "add.svg", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
@@ -12,11 +12,11 @@
   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 card mb-3">
+  <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">
@@ -24,12 +24,13 @@
       </a>
     </div>
     <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 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,7 +1,7 @@
 <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') %>

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

@@ -1,7 +1,7 @@
 <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' %>
+    <%= select_tag "#{param_prefix}[taxon_ids_string]", nil, class: 'taxon_picker d-block w-100', id: :product_taxon_ids  %>
   </div>
   <div class="form-group mb-0">
     <%= label_tag Spree.t('taxon_rule.label') %>

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/refunds/new.html.erb

@@ -25,7 +25,7 @@
       <% end %>
       <%= f.field_container :reason, class: ['form-group'] 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>

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

@@ -26,7 +26,9 @@
             <% return_item = item_fields.object %>
             <tr>
               <td>
-                <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+                <div class="variant-name">
+                  <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+                </div>
                 <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
               </td>
               <td>
@@ -49,7 +51,7 @@
                 <% if return_item.exchange_processed? %>
                   <%= return_item.exchange_variant.exchange_name %>
                 <% else %>
-                  <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 return-item-exchange-selection" } %>
+                  <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2-clear return-item-exchange-selection" } %>
                 <% end %>
               </td>
             </tr>

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

@@ -24,7 +24,9 @@
         <% @reimbursement.return_items.each do |return_item| %>
           <tr>
             <td>
-              <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+              <div class="variant-name">
+                <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+              </div>
               <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
             </td>
             <td>