solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @state } %>
 
 <% admin_breadcrumb(Spree.t(:settings)) %>
 <% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
@@ -11,7 +11,7 @@
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>
     <legend><%= Spree.t(:new_state) %></legend>
-    <%= 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/stock_items/_stock_management.html.erb

@@ -28,7 +28,7 @@
         <td class="align-center no-padding" rowspan="<%= row_count %>">
           <div class='variant-container'>
             <div class='variant-image'>
-              <%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
+              <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
             </div>
             <div class='variant-details'>
               <table class='stock-variant-field-table'>
@@ -69,7 +69,7 @@
       <% if display_add_row %>
         <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
           <td class='location-name-cell'>
-            <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), { :include_blank => true, :class => 'select2', "data-placeholder" => Spree.t(:add_to_stock_location), :id => "variant-stock-location-#{variant.id}" } %>
+            <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), { include_blank: true, class: 'select2', "data-placeholder" => Spree.t(:add_to_stock_location), id: "variant-stock-location-#{variant.id}" } %>
           </td>
           <td class="align-center">
             <%= check_box_tag :backorderable, 'backorderable', false, id: "variant-backorderable-#{variant.id}" %>
@@ -78,7 +78,7 @@
             <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
           </td>
           <td class="actions">
-            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', :no_text => true, :data => {:action => 'green' }, class: "submit" %>
+            <%= link_to_with_icon 'plus', Spree.t('actions.create'), '#', no_text: true, data: {action: 'green' }, class: "submit" %>
           </td>
         </tr>
       <% end %>

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

@@ -1,6 +1,6 @@
 <% if @product %>
-  <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Stock Management' } %>
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
+  <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Stock Management' } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @product } %>
   <% admin_breadcrumb(Spree.t(:manage_stock)) %>
 
 <% else %>
@@ -15,11 +15,11 @@
 
 <% content_for :table_filter do %>
   <% form_path = @product ? admin_product_stock_path(product: @product) : admin_stock_items_path %>
-  <%= render :partial => 'spree/admin/shared/variant_search', :locals => { :form_path => form_path, :stock_locations => @stock_locations } %>
+  <%= render partial: 'spree/admin/shared/variant_search', locals: { form_path: form_path, stock_locations: @stock_locations } %>
 <% end %>
 
 <% if @variants.any? %>
-  <%= render :partial => 'stock_management', :locals => { :variants => @variants } %>
+  <%= render partial: 'stock_management', locals: { variants: @variants } %>
 <% else %>
   <div class="fullwidth no-objects-found">
     <%= Spree.t(:no_variants_found_try_again) %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="col-xs-7" data-hook="stock_location_names">
+  <div class="col-7" data-hook="stock_location_names">
     <div data-hook="stock_location_name">
       <%= f.field_container :name do %>
         <%= f.label :name, class: 'required' %><br />
@@ -9,7 +9,7 @@
     <div data-hook="stock_location_code">
       <%= f.field_container :code do %>
         <%= f.label :code %>
-        <%= f.text_field :code, :class => 'fullwidth', :label => false %>
+        <%= f.text_field :code, class: 'fullwidth', label: false %>
       <% end %>
     </div>
     <div data-hook="stock_location_admin_name">
@@ -20,7 +20,7 @@
     </div>
   </div>
 
-  <div class="col-xs-3" data-hook="stock_location_status">
+  <div class="col-3" data-hook="stock_location_status">
     <%= f.field_container :active do %>
       <label for="active"><%= Spree.t(:status) %></label>
       <ul>
@@ -56,49 +56,49 @@
     <% end %>
   </div>
 
-  <div class="col-xs-5" data-hook="stock_location_address1">
+  <div class="col-5" data-hook="stock_location_address1">
     <div class="field">
       <%= f.label :address1 %>
       <%= f.text_field :address1, class: 'fullwidth' %>
     </div>
   </div>
 
-  <div class="col-xs-5" data-hook="stock_location_city">
+  <div class="col-5" data-hook="stock_location_city">
     <div class="field">
       <%= f.label :city %>
       <%= f.text_field :city, class: 'fullwidth' %>
     </div>
   </div>
 
-  <div class="col-xs-5" data-hook="stock_location_address2">
+  <div class="col-5" data-hook="stock_location_address2">
     <div class="field">
       <%= f.label :address2 %>
       <%= f.text_field :address2, class: 'fullwidth' %>
     </div>
   </div>
 
-  <div class="col-xs-2" data-hook="stock_location_zipcode">
+  <div class="col-2" data-hook="stock_location_zipcode">
     <div class="field">
       <%= f.label :zipcode %>
       <%= f.text_field :zipcode, class: 'fullwidth' %>
     </div>
   </div>
 
-  <div class="col-xs-3" data-hook="stock_location_phone">
+  <div class="col-3" data-hook="stock_location_phone">
     <div class="field">
       <%= f.label :phone %>
       <%= f.phone_field :phone, class: 'fullwidth' %>
     </div>
   </div>
 
-  <div class="col-xs-5" data-hook="stock_location_country">
+  <div class="col-5" data-hook="stock_location_country">
     <div class="field">
       <%= f.label :country_id %>
       <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
     </div>
   </div>
 
-  <div class="col-xs-5" data-hook="stock_location_state">
+  <div class="col-5" data-hook="stock_location_state">
     <div class="field">
       <% if f.object.country %>
         <%= f.label :state_id %>

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -2,27 +2,27 @@
   <fieldset>
     <legend align="center"><%= Spree.t(:move_stock_between_locations)%></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" id="stock_movement_transfer_from_field">
           <%= label_tag :stock_location_from_id, Spree.t(:transfer_from_location) %>
           <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
         </div>
       </div>
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" id="stock_movement_transfer_to_field">
           <%= label_tag :stock_location_to_id, Spree.t(:transfer_to_location) %>
           <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2 fullwidth' %>
         </div>
       </div>
 
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree::Variant.model_name.human %>
           <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2 fullwidth' %>
         </div>
       </div>
 
-      <div class="col-xs-3">
+      <div class="col-3">
         <div class="field" id="stock_movement_quantity_field">
           <%= label_tag 'quantity', Spree::StockMovement.human_attribute_name(:quantity) %>
           <%= number_field_tag :quantity, 1, class: 'fullwidth' %>
@@ -32,7 +32,7 @@
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:transfer_stock) %>
-      <%= link_to Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+      <%= link_to Spree.t('actions.cancel'), collection_url, class: 'button' %>
     </div>
   </fieldset>
 <% end %>

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

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

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

@@ -9,7 +9,7 @@
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::StockLocation) %>
       <li>
-        <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :id => 'admin_new_stock_location' } %>
+        <%= button_link_to Spree.t(:new_stock_location), new_object_url, { id: 'admin_new_stock_location' } %>
       </li>
     <% end %>
 
@@ -67,10 +67,10 @@
           </td>
           <td class="actions">
             <% if can?(:update, stock_location) %>
-              <%= link_to_edit stock_location, :no_text => true %>
+              <%= link_to_edit stock_location, no_text: true %>
             <% end %>
             <% if can?(:destroy, stock_location) %>
-              <%= link_to_delete stock_location, :no_text => true %>
+              <%= link_to_delete stock_location, no_text: true %>
             <% end %>
           </td>
         </tr>
@@ -78,7 +78,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::StockLocation,
                         new_resource_url: new_object_url %>

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

@@ -9,11 +9,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_locations } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @stock_locations } %>
 
 <%= form_for [:admin, @stock_location] 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/stock_movements/index.html.erb

@@ -4,15 +4,9 @@
 
 
 <% content_for :page_actions do %>
-  <% if can?(:create, Spree::StockMovement) %>
-    <li>
-      <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), id: 'admin_new_stock_movement_link' %>
-    </li>
-  <% end %>
-
   <% if can?(:display, Spree::StockLocation) %>
     <li>
-      <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %>
+      <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, class: 'button' %>
     </li>
   <% end %>
 <% end %>
@@ -44,7 +38,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::StockMovement,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb

@@ -1,4 +1,4 @@
-<div id="source-movements-table" class="col-xs-9">
+<div id="source-movements-table" class="col-9">
 <table class="index sortable">
   <colgroup>
     <col style="width: 40%" />

data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb

@@ -22,7 +22,7 @@
           <td class="align-center no-padding">
             <div class='variant-container' data-variant-id="<%= variant.id %>">
               <div class='variant-image'>
-                <%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
+                <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
               </div>
               <div class='variant-details'>
 

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

@@ -42,7 +42,7 @@
   <div data-hook="transfer_item_selection">
     <%= hidden_field_tag :stock_transfer_number, @stock_transfer.number %>
     <%= hidden_field_tag :variant_display_attributes, @variant_display_attributes.to_json %>
-    <%= text_field_tag :transfer_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    <%= text_field_tag :transfer_item_variant_id, "", class: "variant_autocomplete fullwidth" %>
   </div>
 </fieldset>
 

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

@@ -18,36 +18,36 @@
   <div data-hook="admin_stock_transfers_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="field">
             <%= f.label nil, Spree::StockLocation.model_name.human %>
             <%= f.select :source_location_id_or_destination_location_id_eq, options_from_collection_for_select(@stock_locations, :id, :name, params[:q][:source_location_id_or_destination_location_id_eq]), {include_blank: true}, {class: 'select2 fullwidth'} %>
           </div>
         </div>
 
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="date-range-filter field">
             <%= f.label nil, Spree.t(:date_range) %>
-            <div class="date-range-fields">
-              <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
+            <div class="date-range-fields input-group">
+              <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', include_blank: true, value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
 
-              <span class="range-divider">
+              <span class="range-divider input-group-addon">
                 <i class="fa fa-arrow-right"></i>
               </span>
 
-              <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
+              <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', include_blank: true, value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
             </div>
           </div>
         </div>
 
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="field">
             <%= f.label nil, Spree::StockTransfer.human_attribute_name(:number) %>
             <%= f.text_field :number_cont, value: params[:q][:number_cont] %>
           </div>
         </div>
 
-        <div class="field-block col-xs-3">
+        <div class="field-block col-3">
           <div class="field checkbox">
             <label>
               <%= f.check_box :closed_at_null, { checked: @show_only_open }, '1', '0' %>
@@ -109,7 +109,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::StockTransfer,
                   new_resource_url: new_object_url %>

data/app/views/spree/admin/stock_transfers/receive.html.erb

@@ -28,7 +28,7 @@
   <div data-hook="transfer_item_selection">
     <%= hidden_field_tag :stock_transfer_number, @stock_transfer.number %>
     <%= hidden_field_tag :variant_display_attributes, @variant_display_attributes.to_json %>
-    <%= text_field_tag :transfer_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    <%= text_field_tag :transfer_item_variant_id, "", class: "variant_autocomplete fullwidth" %>
   </div>
 </fieldset>
 

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

@@ -17,27 +17,27 @@
   </div>
 
   <div class="row">
-    <div class='field-block col-xs-3'>
+    <div class='field-block col-3'>
       <label><%= Spree::StockTransfer.human_attribute_name(:created_by_id) %></label>
       <p><%= @stock_transfer.created_by.email %></p>
     </div>
 
-    <div class='field-block col-xs-2'>
+    <div class='field-block col-2'>
       <label><%= Spree::StockTransfer.human_attribute_name(:created_at) %></label>
       <p><%= @stock_transfer.created_at.try(:to_date) %></p>
     </div>
 
-    <div class='field-block col-xs-2'>
+    <div class='field-block col-2'>
       <label><%= Spree::StockTransfer.human_attribute_name(:finalized_at) %></label>
       <p><%= @stock_transfer.finalized_at.try(:to_date) %></p>
     </div>
 
-    <div class='field-block col-xs-3'>
+    <div class='field-block col-3'>
       <label><%= Spree::StockTransfer.human_attribute_name(:finalized_by_id) %></label>
       <p><%= @stock_transfer.finalized_by.try(:email) %></p>
     </div>
 
-    <div class='field-block col-xs-2'>
+    <div class='field-block col-2'>
       <label><%= Spree::StockTransfer.human_attribute_name(:shipped_at) %></label>
       <p><%= @stock_transfer.shipped_at.try(:to_date) %></p>
     </div>

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

@@ -1,20 +1,21 @@
 <div data-hook="admin_store_credit_form_fields" class="row">
-  <div class="col-xs-12">
+  <div class="col-12">
     <%= f.field_container :amount do %>
       <%= f.label :amount, class: 'required' %><br />
-      <%= f.number_field :amount, min: 0.00, step: :any %>
+      <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency_attr: :currency, required: true %>
       <%= f.error_message_on :amount %>
+      <%= f.error_message_on :currency %>
     <% end %>
   </div>
-  <div class="col-xs-12">
-    <%= f.field_container :category do %>
+  <div class="col-12">
+    <%= f.field_container :category_id do %>
       <%= f.label :category_id, class: 'required' %><br />
       <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
         { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t("admin.store_credits.select_reason") } %>
-      <%= f.error_message_on :category %>
+      <%= f.error_message_on :category_id %>
     <% end %>
   </div>
-  <div data-hook="admin_store_credit_memo_field" class="col-xs-12">
+  <div data-hook="admin_store_credit_memo_field" class="col-12">
     <%= f.field_container :memo do %>
       <%= f.label :memo %>
       <%= f.text_area :memo, class: "fullwidth" %>

data/app/views/spree/admin/store_credits/_update_reason_field.html.erb

@@ -1,4 +1,4 @@
-<div class="col-xs-12">
+<div class="col-12">
   <%= f.field_container :reason do %>
     <%= f.label :reason, Spree.t(:reason), class: 'required' %><br />
     <%= select_tag :update_reason_id, options_from_collection_for_select(@update_reasons, :id, :name),

data/app/views/spree/admin/store_credits/edit_amount.html.erb

@@ -14,7 +14,7 @@
   <fieldset>
     <legend align="center"><%= Spree.t("admin.store_credits.edit_amount") %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
-      <div class="col-xs-9">
+      <div class="col-9">
         <%= f.field_container :amount do %>
           <%= f.label :amount, class: 'required' %><br />
           <%= f.number_field :amount, min: 0.00, step: :any %>