Merge pull request #4891 from nebulab/elia/admin-erb-fixes

ERB fixes for the backend (🐛+💅)

Author: kennyadsl

backend/app/assets/javascripts/spree/backend/shipments.js

@@ -53,7 +53,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         json = response.responseJSON;
         message = json.error;
         for (error in json.errors) {
-          message += '<br />' + json.errors[error].join();
+          message += '<br>' + json.errors[error].join();
         }
         window.show_flash('error', message);
       }

backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs

@@ -9,7 +9,7 @@
   <td class="line-item-name">
     {{ line_item.variant.name }}<br>
     {{#if line_item.variant.options_text }}
-      {{ line_item.variant.options_text }}<br/>
+      {{ line_item.variant.options_text }}<br>
     {{/if}}
     <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }}
   </td>

backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs

@@ -1,8 +1,8 @@
 <fieldset>
   <table class="stock-levels" data-hook="stock-levels">
     <colgroup>
-      <col style="width: 50%;" />
-      <col style="width: 50%;" />
+      <col style="width: 50%;">
+      <col style="width: 50%;">
     </colgroup>
     <thead>
       <th>{{ t "name" }}</th>

backend/app/helpers/spree/admin/adjustments_helper.rb

@@ -27,15 +27,15 @@ def display_line_item(line_item)
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_amount
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_shipment(shipment)
         parts = [
           "#{t('spree.shipment')} ##{shipment.number}",
           shipment.display_cost
         ]
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_order(_order)

backend/app/helpers/spree/admin/base_helper.rb

@@ -17,7 +17,7 @@ def error_message_on(object, method, _options = {})
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
         if obj && obj.errors[method].present?
-          errors = safe_join(obj.errors[method], "<br />".html_safe)
+          errors = safe_join(obj.errors[method], "<br>".html_safe)
           content_tag(:span, errors, class: 'formError')
         else
           ''

backend/app/helpers/spree/admin/stock_movements_helper.rb

@@ -23,7 +23,7 @@ def display_variant(stock_movement)
         variant = stock_movement.stock_item.variant
         output = [variant.name]
         output << variant.options_text unless variant.options_text.blank?
-        safe_join(output, "<br />".html_safe)
+        safe_join(output, "<br>".html_safe)
       end
     end
   end

backend/app/views/spree/admin/adjustment_reasons/index.html.erb

@@ -17,9 +17,9 @@
 <% if @adjustment_reasons.any? %>
   <table class="index" id='listing_adjustment_reasons'>
     <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
+      <col style="width: 65%">
+      <col style="width: 20%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="adjustment_reasons_header">

backend/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb

@@ -1,12 +1,12 @@
 <div data-hook="admin_adjustment_reason_form_fields" class="row">
   <div class="col-3">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
-      <%= f.label :code, class: 'required' %><br />
+      <%= f.label :code, class: 'required' %><br>
       <%= f.text_field :code, class: 'fullwidth' %>
     <% end %>
 

backend/app/views/spree/admin/adjustments/_form.html.erb

@@ -19,7 +19,7 @@
 
     <div class="col-3">
       <%= f.field_container :label do %>
-        <%= f.label :adjustment_reason_id %><br/>
+        <%= f.label :adjustment_reason_id %><br>
         <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => t('spree.select_a_reason'), class: 'custom-select fullwidth'}) %>
       <% end %>
     </div>

backend/app/views/spree/admin/adjustments/index.html.erb

@@ -18,6 +18,6 @@
     <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>
   </div>
 <% end %>
-<%= javascript_tag do -%>
+<script>
   var order_number = '<%= @order.number %>';
-<% end -%>
+</script>