solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -49,10 +49,10 @@
         <td class="align-center"><%=tax_rate.calculator.to_s %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
-            <%= link_to_edit tax_rate, :no_text => true %>
+            <%= link_to_edit tax_rate, no_text: true %>
           <% end %>
           <% if can?(:destroy, tax_rate) %>
-            <%= link_to_delete tax_rate, :no_text => true %>
+            <%= link_to_delete tax_rate, no_text: true %>
           <% end %>
         </td>
       </tr>
@@ -60,7 +60,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::TaxRate,
                  new_resource_url: new_object_url %>

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

@@ -9,16 +9,16 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] 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/new_resource_links' %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
 
   </fieldset>
 <% end %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_inside_taxonomy_form" class="field align-center">
   <%= f.field_container :name do %>
     <%= f.label :name, class: 'required' %><br />
-    <%= error_message_on :taxonomy, :name, :class => 'fullwidth title' %>
+    <%= error_message_on :taxonomy, :name, class: 'fullwidth title' %>
     <%= text_field :taxonomy, :name %>
   <% end %>
 </div>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -22,10 +22,10 @@
         <td class="align-center"><%= taxonomy.name %></td>
         <td class="actions">
           <% if can?(:update, taxonomy) %>
-            <%= link_to_edit taxonomy, :no_text => true %>
+            <%= link_to_edit taxonomy, no_text: true %>
           <% end %>
           <% if can?(:destroy, taxonomy) %>
-            <%= link_to_delete taxonomy, :no_text => true %>
+            <%= link_to_delete taxonomy, no_text: true %>
           <% end %>
         </td>
       </tr>

data/app/views/spree/admin/taxonomies/_taxon.html.erb

@@ -4,7 +4,7 @@
       <li id="<%= child.id %>" rel="taxon">
         <a style="background-image: url(<%= child.icon.url %>);" href="#"><%= child.name %></a>
         <% if child.children.length > 0 %>
-          <%= render :partial => 'taxon', :locals => { :taxon => child } %>
+          <%= render partial: 'taxon', locals: { taxon: child } %>
         <% end %>
       </li>
     <% end %>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -11,7 +11,7 @@
 
 <%= form_for [:admin, @taxonomy] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <div class="filter-actions actions">
       <%= button Spree.t('actions.update') %>
       <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path %>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>
-      <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :id => 'admin_new_taxonomy_link' %>
+      <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, id: 'admin_new_taxonomy_link' %>
     </li>
   <% end %>
 <% end %>
@@ -15,7 +15,7 @@
   <%= render 'list' %>
 </div>
 <% 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::Taxonomy,
                  new_resource_url: new_object_url %>

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

@@ -8,7 +8,7 @@
 
 <%= form_for [:admin, @taxonomy] do |f| %>
 
-  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render partial: 'form', locals: { f: f } %>
   <fieldset class="no-border-top">
     <br>
     <div class="filter-actions actions" data-hook="buttons">

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

@@ -1,14 +1,14 @@
 <div data-hook="admin_inside_taxon_form" class="row">
-  <div class="col-xs-5">
+  <div class="col-5">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= text_field :taxon, :name, :class => 'fullwidth' %>
-      <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>
+      <%= text_field :taxon, :name, class: 'fullwidth' %>
+      <%= error_message_on :taxon, :name, class: 'fullwidth title' %>
     <% end %>
 
     <%= f.field_container :permalink_part do %>
       <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
-      <%= text_field_tag :permalink_part, @permalink_part, :class => 'fullwidth' %><br />
+      <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth' %><br />
       <span class="info" id="permalink_part_display">
         <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
       </span>
@@ -21,27 +21,27 @@
     <% end %>
   </div>
 
-  <div class="col-xs-5">
+  <div class="col-5">
     <%= f.field_container :description do %>
       <%= f.label :description %><br />
-      <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
+      <%= f.text_area :description, class: 'fullwidth', rows: 6 %>
     <% end %>
   </div>
 
-  <div class="col-xs-10">
+  <div class="col-10">
     <%= f.field_container :meta_title do %>
       <%= f.label :meta_title %><br />
-      <%= f.text_field :meta_title, :class => 'fullwidth' %>
+      <%= f.text_field :meta_title, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
       <%= f.label :meta_description %><br />
-      <%= f.text_field :meta_description, :class => 'fullwidth' %>
+      <%= f.text_field :meta_description, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords %><br />
-      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
+      <%= f.text_field :meta_keywords, class: 'fullwidth' %>
     <% end %>
   </div>
 </div>

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -12,7 +12,7 @@
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
         <td class="actions">
-          <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon('delete') + ' ' + Spree.t('actions.remove') %>
+          <%= link_to_delete taxon, url: remove_admin_product_taxon_url(@product, taxon), name: icon('delete') + ' ' + Spree.t('actions.remove') %>
         </td>
       </tr>
     <% end %>

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

@@ -9,8 +9,8 @@
 
 <%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
-<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
-  <%= render 'form', :f => f %>
+<%= form_for [:admin, @taxonomy, @taxon], method: :put, url: form_url, html: { multipart: true } do |f| %>
+  <%= render 'form', f: f %>
 
   <div class="form-buttons filter-actions" data-hook="buttons">
     <%= button Spree.t('actions.update') %>

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

@@ -6,11 +6,11 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <div data-hook="admin_orders_index_search" class="col-xs-4">
+  <div data-hook="admin_orders_index_search" class="col-4">
     <input type='text' id='taxon_id' />
   </div>
 <% end %>
 
-<div class='col-xs-10'>
+<div class='col-10'>
   <div id='taxon_products' class='list-group'></div>
 </div>

data/app/views/spree/admin/users/_addresses_form.html.erb

@@ -1,19 +1,19 @@
 <div class="row">
     
-  <div data-hook="bill_address_wrapper" class="col-xs-6">
+  <div data-hook="bill_address_wrapper" class="col-6">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:billing_address) %></legend>
       <%= f.fields_for :bill_address, @user.bill_address || Spree::Address.build_default do |ba_form| %>
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+        <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
       <% end %>
     </fieldset>
   </div>
 
-  <div data-hook="ship_address_wrapper" class="col-xs-6">
+  <div data-hook="ship_address_wrapper" class="col-6">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <%= f.fields_for :ship_address, @user.ship_address || Spree::Address.build_default do |sa_form| %>
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
+        <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: "shipping" } %>
       <% end %>
     </fieldset>
   </div>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :email do %>
       <%= f.label :email %>
       <% if can?(:update_email, @user) %>
-        <%= f.email_field :email, :class => 'fullwidth' %>
+        <%= f.email_field :email, class: 'fullwidth' %>
       <% else %>
         <span title="<%= Spree.t(:cannot_update_email) %>" class="fa fa-question-circle icon_link no-text with-tip"></span>
-        <%= f.email_field :email, :class => 'fullwidth', disabled: true %>
+        <%= f.email_field :email, class: 'fullwidth', disabled: true %>
       <% end %>
       <%= error_message_on :user, :email %>
     <% end %>
@@ -16,6 +16,7 @@
         <%= label_tag nil, plural_resource_name(Spree::Role) %>
         <ul>
           <% if can? :manage, Spree::Role %>
+            <%= hidden_field_tag('user[spree_role_ids][]', nil) %>
             <% @roles.each do |role| %>
               <li>
                 <%= check_box_tag 'user[spree_role_ids][]', role.id, @user_roles.include?(role), id: "user_spree_role_#{role.name}" %>
@@ -38,7 +39,7 @@
           <% if can?(:manage, Spree::UserStockLocation) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
-                <%= check_box_tag 'user[stock_location_ids][]', stock_location.id, @user.stock_locations.include?(stock_location), :id => "user_spree_stock_locations_#{stock_location.name}" %>
+                <%= check_box_tag 'user[stock_location_ids][]', stock_location.id, @user.stock_locations.include?(stock_location), id: "user_spree_stock_locations_#{stock_location.name}" %>
                 <%= label_tag stock_location.name %>
               </li>
             <% end %>
@@ -53,10 +54,10 @@
 
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="col-xs-6">
+  <div data-hook="admin_user_form_password_fields" class="col-6">
     <%= f.field_container :password do %>
       <%= f.label :password %>
-      <%= f.password_field :password, :class => 'fullwidth' %>
+      <%= f.password_field :password, class: 'fullwidth' %>
       <%= f.error_message_on :password %>
     <% end %>
 
@@ -64,7 +65,7 @@
     <% if f.object.respond_to?(:password_confirmation) %>
       <%= f.field_container :password do %>
         <%= f.label :password_confirmation %>
-        <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
+        <%= f.password_field :password_confirmation, class: 'fullwidth' %>
         <%= f.error_message_on :password_confirmation %>
       <% end %>
     <% end %>

data/app/views/spree/admin/users/addresses.html.erb

@@ -5,22 +5,22 @@
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :address %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses" class="col-xs-12">
+<fieldset data-hook="admin_user_addresses" id="admin_user_edit_addresses">
   <legend><%= plural_resource_name(Spree::Address) %></legend>
 
   <div data-hook="admin_user_edit_form_header">
-    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
   </div>
 
   <div data-hook="admin_user_address_edit_form">
     <%= form_for [:admin, @user], as: :user, url: addresses_admin_user_url(@user), method: :put do |f| %>
-      <%= render :partial => 'addresses_form', :locals => { :f => f } %>
+      <%= render partial: 'addresses_form', locals: { f: f } %>
 
       <% if can?(:update, @user) %>
         <div data-hook="admin_user_edit_form_button">
-          <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
+          <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: admin_users_url } %>
         </div>
       <% end %>
     <% end %>

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

@@ -4,22 +4,22 @@
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :account %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_edit_general_settings" class="col-xs-9">
+<fieldset data-hook="admin_user_edit_general_settings">
   <legend><%= Spree.t(:general_settings) %></legend>
 
   <div data-hook="admin_user_edit_form_header">
-    <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
   </div>
 
   <div data-hook="admin_user_edit_form">
     <%= form_for [:admin, @user], as: :user, url: admin_user_url(@user), method: :put do |f| %>
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <% if can?(:update, @user) %>
         <div data-hook="admin_user_edit_form_button">
-          <%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
+          <%= render partial: 'spree/admin/shared/edit_resource_links', locals: { collection_url: admin_users_url } %>
         </div>
       <% end %>
     <% end %>
@@ -27,30 +27,30 @@
 </fieldset>
 
 <% if can?(:update, @user) %>
-  <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="col-xs-9">
-    <legend><%= Spree.t('access', :scope => 'api') %></legend>
+  <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key">
+    <legend><%= Spree.t('access', scope: 'api') %></legend>
 
     <% if @user.spree_api_key.present? %>
       <div class="field">
-        <div id="current-api-key"><%= Spree.t('key', :scope => 'api') %>: (<%= Spree.t('hidden') %>)</div>
+        <div id="current-api-key"><%= Spree.t('key', scope: 'api') %>: (<%= Spree.t('hidden') %>)</div>
       </div>
       <div class="filter-actions actions">
-        <%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('clear_key', :scope => 'api') %>
+        <%= form_tag spree.clear_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('clear_key', scope: 'api') %>
         <% end %>
 
-        <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('regenerate_key', :scope => 'api') %>
+        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('regenerate_key', scope: 'api') %>
         <% end %>
       </div>
 
     <% else %>
 
-      <div class="no-objects-found"><%= Spree.t('no_key', :scope => 'api') %></div>
+      <div class="no-objects-found"><%= Spree.t('no_key', scope: 'api') %></div>
 
       <div class="filter-actions actions">
-        <%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
-          <%= button Spree.t('generate_key', :scope => 'api') %>
+        <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
+          <%= button Spree.t('generate_key', scope: 'api') %>
         <% end %>
       </div>
     <% end %>

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

@@ -4,7 +4,7 @@
 <% content_for :page_actions do %>
   <% if can?(:admin, Spree.user_class) && can?(:create, Spree.user_class) %>
     <li>
-      <%= button_link_to Spree.t(:new_user), new_admin_user_url, :id => 'admin_new_user_link' %>
+      <%= button_link_to Spree.t(:new_user), new_admin_user_url, id: 'admin_new_user_link' %>
     </li>
   <% end %>
 <% end %>
@@ -16,7 +16,7 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_users_index_headers">
-      <th><%= sort_link @search,:email, Spree::LegacyUser.model_name.human, {}, {:title => 'users_email_title'} %></th>
+      <th><%= sort_link @search,:email, Spree::LegacyUser.model_name.human, {}, {title: 'users_email_title'} %></th>
       <th data-hook="admin_users_index_header_actions" class="actions"></th>
     </tr>
   </thead>
@@ -26,10 +26,10 @@
         <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
-            <%= link_to_edit user, :no_text => true %>
+            <%= link_to_edit user, no_text: true %>
           <% end %>
           <% if can?(:destroy, user) %>
-            <%= link_to_delete user, :no_text => true %>
+            <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>
       </tr>
@@ -48,7 +48,7 @@
     <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
       <div class="field">
         <%= f.label :email_cont, Spree.t(:email) %> <br>
-        <%= f.text_field :email_cont, :class => 'fullwidth' %>
+        <%= f.text_field :email_cont, class: 'fullwidth' %>
       </div>
       <div data-hook="admin_users_index_search_buttons">
         <%= button Spree.t(:search) %>

data/app/views/spree/admin/users/items.html.erb

@@ -5,9 +5,9 @@
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :items %>
-<%= render :partial => 'spree/admin/users/user_page_actions' %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<fieldset data-hook="admin_user_items_purchased" class="col-xs-9">
+<fieldset data-hook="admin_user_items_purchased">
   <legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
 
   <%= paginate @orders, theme: "solidus_admin" %>
@@ -26,13 +26,13 @@
       </colgroup>
 
       <thead>
-        <th><%= sort_link @search, :completed_at, Spree::Order.human_attribute_name(:completed_at), {}, {:title => 'orders_completed_at_title'} %></th>
+        <th><%= sort_link @search, :completed_at, Spree::Order.human_attribute_name(:completed_at), {}, {title: 'orders_completed_at_title'} %></th>
         <th colspan=2><%= Spree::LineItem.human_attribute_name(:description) %></th>
         <th><%= Spree::LineItem.human_attribute_name(:price) %></th>
         <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th>
         <th><%= Spree::Order.human_attribute_name(:total) %></th>
-        <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {}, {:title => 'orders_state_title'} %></th>
-        <th><%= sort_link @search, :number, Spree.t(:order_num, :scope => 'admin.user'), {}, {:title => 'orders_number_title'} %></th>
+        <th><%= sort_link @search, :state, Spree::Order.human_attribute_name(:state), {}, {title: 'orders_state_title'} %></th>
+        <th><%= sort_link @search, :number, Spree.t(:order_num, scope: 'admin.user'), {}, {title: 'orders_number_title'} %></th>
       </thead>
 
       <tbody>
@@ -41,7 +41,7 @@
             <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
               <td class="align-center order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
               <td class="item-image">
-                <%= image_tag item.variant.display_image.attachment(:mini) %>
+                <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
               </td>
               <td class="item-name">
                 <%= item.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
@@ -73,7 +73,7 @@
         <% end %>
     </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::Order,
                    new_resource_url: spree.new_admin_order_path %>