solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' } %>
 
 <% admin_breadcrumb(plural_resource_name(Spree::Adjustment)) %>
 
@@ -10,12 +10,12 @@
   <% end %>
 <% end %>
 
-<%= render :partial => 'adjustments_table' %>
+<%= render partial: 'adjustments_table' %>
 
 <% if @order.can_add_coupon? %>
   <div data-hook="adjustments_new_coupon_code">
-    <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %>
-    <%= button Spree.t(:add_coupon_code), nil, 'submit', :id => "add_coupon_code" %>
+    <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code) %>
+    <%= button Spree.t(:add_coupon_code), nil, 'submit', id: "add_coupon_code" %>
   </div>
 <% end %>
 <%= javascript_tag do -%>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
 <% admin_breadcrumb(Spree.t(:new_adjustment)) %>
@@ -7,11 +7,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @adjustment } %>
 
-<%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
+<%= form_for @adjustment, url: admin_order_adjustments_path do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:continue) %>

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

@@ -25,7 +25,7 @@
       <% @inventory_units.each do |inventory_unit| %>
         <tr class="inventory-unit">
           <td class="inventory-unit-image">
-            <%= image_tag inventory_unit.variant.display_image.attachment(:mini) %>
+            <%= render 'spree/admin/shared/image', image: inventory_unit.variant.display_image, size: :mini %>
           </td>
           <td class="inventory-unit-name">
             <%= inventory_unit.variant.product.name %><br><%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>

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

@@ -1,17 +1,17 @@
 <div data-hook="admin_country_form_fields" class="row">
-  <div class="col-xs-5">
+  <div class="col-5">
     <div data-hook="name" class="field">
       <%= f.label :name %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     </div>
   </div>
-  <div class="col-xs-5">
+  <div class="col-5">
     <div data-hook="iso_name" class="field">
       <%= f.label :iso_name %>
-      <%= f.text_field :iso_name, :class => 'fullwidth' %>
+      <%= f.text_field :iso_name, class: 'fullwidth' %>
     </div>
   </div>
-  <div class="col-xs-2">
+  <div class="col-2">
     <div data-hook="states_required" class="field checkbox">
       <label>
         <%= f.check_box :states_required %>

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

@@ -8,12 +8,12 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @country } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @country } %>
 
 <%= form_for [:admin, @country] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div class="clear"></div>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -8,7 +8,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::Country) %>
       <li>
-        <%= button_link_to Spree.t(:new_country), new_object_url, { :id => 'admin_new_country' } %>
+        <%= button_link_to Spree.t(:new_country), new_object_url, { id: 'admin_new_country' } %>
       </li>
     <% end %>
   </ul>
@@ -37,10 +37,10 @@
         <td class="align-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">
           <% if can?(:edit, country) %>
-            <%= link_to_edit country, :no_text => true %>
+            <%= link_to_edit country, no_text: true %>
           <% end %>
           <% if can?(:destroy, country) %>
-            <%= link_to_delete country, :no_text => true %>
+            <%= link_to_delete country, no_text: true %>
           <% end %>
         </td>
       </tr>

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

@@ -8,11 +8,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @countries } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @countries } %>
 
 <%= form_for [:admin, @country] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -3,13 +3,13 @@
     <tr>
       <th><%= Spree::Product.model_name.human %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
       <% unless return_items.all?(&:received?)%>
-        <th><%= Spree::ReturnItem.human_attribute_name(:item_received?) %></th>
+        <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:item_received?) %></th>
       <% end %>
       <% if show_decision %>
         <th class="actions"></th>

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -6,12 +6,12 @@
       </th>
       <th><%= Spree::Product.model_name.human %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:inventory_unit_state) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
       <th><%= Spree::ReturnItem.human_attribute_name(:resellable) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
-      <th><%= Spree::ReturnItem.human_attribute_name(:return_reason) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
+      <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:return_reason) %></th>
     </tr>
   </thead>
   <tbody>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
 <% admin_breadcrumb(@customer_return.number) %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% content_for :page_actions do %>
   <% if can? :create, Spree::CustomerReturn %>
@@ -44,7 +44,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::CustomerReturn,
                  new_resource_url: new_object_url %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Returns' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
 <% admin_breadcrumb(Spree.t(:new_customer_return)) %>
@@ -9,7 +9,7 @@
 
 <% if @rma_return_items.any? || @new_return_items.any? %>
 
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @customer_return } %>
   <%= form_for [:admin, @order, @customer_return] do |f| %>
     <fieldset class="no-border-top">
       <div data-hook="admin_customer_return_form_fields">
@@ -18,7 +18,7 @@
           <% if @rma_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @rma_return_items} %>
           <% else %>
-            <div class="col-xs-9 no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="col-9 no-objects-found"><%= Spree.t(:none) %></div>
           <% end %>
         </fieldset>
 
@@ -27,7 +27,7 @@
           <% if @new_return_items.any? %>
             <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
           <% else %>
-            <div class="col-xs-9 no-objects-found"><%= Spree.t(:none) %></div>
+            <div class="col-9 no-objects-found"><%= Spree.t(:none) %></div>
           <% end %>
         </fieldset>
 
@@ -48,7 +48,7 @@
 
 <% else %>
 
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= Spree.t(:all_items_have_been_returned) %>,
     <%= link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_path(@order) %>.
   </div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_image_form_fields">
   <div class="row">
-    <div class="col-xs-3">
+    <div class="col-3">
       <div data-hook="file" class="field">
         <%= f.label :attachment %><br>
         <%= f.file_field :attachment %>
@@ -10,7 +10,7 @@
         <%= f.select :viewable_id, @variants, {}, { class: 'select2 fullwidth' } %>
       </div>
     </div>
-    <div data-hook="alt_text" class="field col-xs-4">
+    <div data-hook="alt_text" class="field col-4">
       <%= f.label :alt %><br>
       <%= f.text_area :alt, rows: 4, class: 'fullwidth' %>
     </div>

data/app/views/spree/admin/images/_image_row.html.erb

@@ -5,7 +5,9 @@
     <% end %>
   </td>
   <td>
-    <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
+    <%= link_to image.attachment.url(:product) do %>
+      <%= render 'spree/admin/shared/image', image: image, size: :mini %>
+    <% end %>
   </td>
   <% if @product.has_variants? %>
     <td><%= options_text_for(image) %></td>
@@ -13,10 +15,10 @@
   <td><%= image.alt %></td>
   <td class="actions">
     <% if can?(:update, image) %>
-      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
+      <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), no_text: true, data: {action: 'edit'} %>
     <% end %>
     <% if can?(:destroy, image) %>
-      <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
+      <%= link_to_delete image, { url: admin_product_image_url(@product, image), no_text: true } %>
     <% end %>
   </td>
 </tr>

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

@@ -1,6 +1,6 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Images' } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images' } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @image } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
 <% admin_breadcrumb(@image.attachment_file_name) %>
@@ -10,24 +10,24 @@
   <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product) %></li>
 <% end %>
 
-<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
   <fieldset data-hook="edit_image">
     <legend align="center"><%= @image.attachment_file_name%></legend>
 
     <div class="row">
-      <div data-hook="thumbnail" class="field col-xs-2 align-center">
+      <div data-hook="thumbnail" class="field col-2 align-center">
         <%= f.label Spree.t(:thumbnail) %><br>
         <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
       </div>
-      <div class="col-xs-10">
-        <%= render :partial => 'form', :locals => { :f => f } %>
+      <div class="col-10">
+        <%= render partial: 'form', locals: { f: f } %>
       </div>
       <div class="clear"></div>
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t('actions.update') %>
-      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
+      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: {current: 'Images'} %>
 
 <% admin_breadcrumb(plural_resource_name(Spree::Image)) %>
 
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>
+    <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
   <% end %>
 <% end %>
 
@@ -16,7 +16,7 @@
 
   <div id="upload-zone">
     <%= form_for [:admin, @product, Spree::Image.new],
-        :html => { :multipart => true, id: 'upload-form' } do |f| %>
+        html: { multipart: true, id: 'upload-form' } do |f| %>
       <label class="upload">
         <i class="fa fa-5x fa-cloud-upload"></i>
         <p>

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

@@ -1,12 +1,12 @@
-<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
   <fieldset data-hook="new_image">
     <legend align="center"><%= Spree.t(:new_image) %></legend>
 
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
         <%= button Spree.t('actions.update') %>
-        <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
+        <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
       </div>
   </fieldset>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
 
 <% admin_breadcrumb(Spree::Payment.model_name.human) %>
 <% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>

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

@@ -1,16 +1,16 @@
 <div data-hook="admin_option_type_form_fields" class="align-center row">
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, :class => "fullwidth" %>
+      <%= f.text_field :name, class: "fullwidth" %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
 
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :presentation do %>
       <%= f.label :presentation, class: 'required' %><br />
-      <%= f.text_field :presentation, :class => "fullwidth" %>
+      <%= f.text_field :presentation, class: "fullwidth" %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -7,5 +7,5 @@
   <% end %>
   <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
-  <td class="actions"><%= link_to_remove_fields Spree.t('actions.remove'), f, :no_text => true %></td>
+  <td class="actions"><%= link_to_remove_fields Spree.t('actions.remove'), f, no_text: true %></td>
 </tr>

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

@@ -6,18 +6,18 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button' %>
+      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", class: 'button' %>
     </span>
   </li>
   <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @option_type } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
 
   <fieldset class="no-border-bottom">
     <legend><%= Spree::OptionType.model_name.human %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
   </fieldset>
 
   <fieldset>
@@ -32,10 +32,10 @@
       </thead>
       <tbody id="option_values">
         <%= f.fields_for :option_values, @option_values do |option_value_form| %>
-          <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
+          <%= render partial: 'option_value_fields', locals: { f: option_value_form } %>
         <% end %>
       </tbody>
     </table>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::OptionType) %>
     <li id="new_ot_link">
-      <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :id => 'new_option_type_link' } %>
+      <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { remote: true, id: 'new_option_type_link' } %>
     </li>
   <% end %>
 <% end %>
@@ -36,10 +36,10 @@
         <td class="align-center presentation"><%= option_type.presentation %></td>
         <td class="actions">
           <% if can?(:update, option_type) %>
-            <%= link_to_edit(option_type, :class => 'admin_edit_option_type', :no_text => true) %>
+            <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) %>
           <% end %>
           <% if can?(:destroy, option_type) %>
-            <%= link_to_delete(option_type, :no_text => true) %>
+            <%= link_to_delete(option_type, no_text: true) %>
           <% end %>
         </td>
       </tr>
@@ -47,7 +47,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::OptionType,
                  new_resource_url: new_object_url %>