solidus_backend 2.1.1 → 2.2.0.beta1

data/app/views/spree/admin/shared/_report_criteria.html.erb

@@ -1,14 +1,14 @@
-<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
-    <div class="date-range-filter field align-center">
-        <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
-        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
+<%= search_form_for @search, url: spree.sales_total_admin_reports_path  do |s| %>
+    <div class="date-range-filter field">
+      <div class="date-range-fields input-group">
+        <%= s.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_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>
 
-        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
-        <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
+        <%= s.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:created_at_lt]), placeholder: Spree.t(:end) %>
+      </div>
     </div>
 
     <div class="actions filter-actions">

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -1,14 +1,14 @@
-<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
-  <div class="date-range-filter field align-center">
-    <%= label_tag :q_completed_at_gt, Spree.t(:start), :class => 'inline' %>
-    <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
+<%= search_form_for @search, url: spree.sales_total_admin_reports_path  do |s| %>
+  <div class="date-range-filter field">
+    <div class="date-range-fields input-group">
+      <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]), placeholder: Spree.t(:start) %>
 
-    <span class="range-divider">
-      <i class="fa fa-arrow-right"></i>
-    </span>
+      <span class="range-divider input-group-addon">
+        <i class="fa fa-arrow-right"></i>
+      </span>
 
-    <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
-    <%= label_tag :q_completed_at_lt, Spree.t(:end), :class => 'inline' %>
+      <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]), placeholder: Spree.t(:end) %>
+    </div>
   </div>
 
   <div class="actions filter-actions">

data/app/views/spree/admin/shared/_settings_sub_menu.html.erb

@@ -1,6 +1,6 @@
 <ul class="admin-subnav" data-hook="admin_settings_sub_tabs">
-  <% if can?(:edit, :general_settings) %>
-    <%= tab :general_settings, label: :general, url: spree.edit_admin_general_settings_path, match_path: /\/general_settings/ %>
+  <% if can?(:admin, Spree::Store) %>
+    <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
   <% end %>
 
   <% if can?(:display, Spree::PaymentMethod) %>

data/app/views/spree/admin/shared/_sidebar.html.erb

@@ -1,5 +1,5 @@
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" data-hook class="content-sidebar col-xs-3">
+  <aside id="sidebar" data-hook class="content-sidebar col-3">
 
     <% if content_for?(:sidebar_title) %>
       <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>

data/app/views/spree/admin/shared/_variant_search.html.erb

@@ -1,16 +1,16 @@
 <div data-hook="admin_orders_index_search">
   <%= form_for :variant_search, url: form_path, method: :get do |f| %>
     <div class="row">
-      <div class="field-block col-xs-3">
+      <div class="field-block col-3">
         <div class="field">
           <%= label_tag nil, Spree::StockLocation.model_name.human %>
-          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { :include_blank => true, :class => 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
+          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: true, class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location) } %>
         </div>
       </div>
-      <div class="<%= if content_for?(:sidebar) then 'col-xs-6' else 'col-xs-9' end %>">
+      <div class="<%= if content_for?(:sidebar) then 'col-6' else 'col-9' end %>">
         <div data-hook="add_product_name" class="field">
           <%= label_tag :add_variant_id, Spree::Variant.model_name.human %>
-          <%= text_field_tag :variant_search_term, params[:variant_search_term], :class => "fullwidth", :placeholder => Spree.t(:variant_search_placeholder) %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: Spree.t(:variant_search_placeholder) %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/shared/named_types/_edit.html.erb

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

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,14 +1,12 @@
 <div data-hook="admin_named_type_form_fields" class="row">
-  <div class="row">
-    <div class="col-xs-3">
-      <%= f.field_container :name do %>
-        <%= f.label :name, class: 'required' %><br />
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      <% end %>
-      <div class="checkbox">
-        <%= f.check_box :active %>
-        <%= f.label :active %>
-      </div>
+  <div class="col-4">
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, class: 'fullwidth' %>
+    <% end %>
+    <div class="checkbox">
+      <%= f.check_box :active %>
+      <%= f.label :active %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -48,7 +48,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: resource,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/shared/named_types/_new.html.erb

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

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

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

@@ -31,11 +31,11 @@
       <td class="align-center" style="width:350px;"><%= shipping_category.name %></td>
       <td class="actions">
         <% if can?(:udpate, shipping_category) %>
-          <%= link_to_edit shipping_category, :no_text => true %>
+          <%= link_to_edit shipping_category, no_text: true %>
         <% end %>
 
         <% if can?(:destroy, shipping_category) %>
-          <%= link_to_delete shipping_category, :no_text => true %>
+          <%= link_to_delete shipping_category, no_text: true %>
         <% end %>
       </td>
     </tr>
@@ -43,7 +43,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::ShippingCategory,
                  new_resource_url: new_object_url %>

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

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

@@ -1,48 +1,48 @@
 <div data-hook="admin_shipping_method_form_fields" class="row">
-  <div data-hook="admin_shipping_method_form_name_field" class="col-xs-5">
+  <div data-hook="admin_shipping_method_form_name_field" class="col-5">
     <%= f.field_container :name do %>
       <%= f.label :name %><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
       <%= error_message_on :shipping_method, :name %>
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_internal_name_field" class="col-xs-5">
+  <div data-hook="admin_shipping_method_form_internal_name_field" class="col-5">
     <%= f.field_container :admin_name do %>
       <%= f.label :admin_name %><br />
-      <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
+      <%= f.text_field :admin_name, class: 'fullwidth', label: false  %>
       <%= error_message_on :shipping_method, :admin_name %>
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_code" class="col-xs-5">
+  <div data-hook="admin_shipping_method_form_code" class="col-5">
     <%= f.field_container :code do %>
       <%= f.label :code %><br />
-      <%= f.text_field :code, :class => 'fullwidth', :label => false  %>
+      <%= f.text_field :code, class: 'fullwidth', label: false  %>
       <%= error_message_on :shipping_method, :code %>
     <% end %>
   </div>
 
-  <div class="col-xs-5">
+  <div class="col-5">
     <%= f.field_container :carrier do %>
       <%= f.label :carrier %><br />
-      <%= f.text_field :carrier, :class => 'fullwidth', :label => false  %>
+      <%= f.text_field :carrier, class: 'fullwidth', label: false  %>
       <%= error_message_on :shipping_method, :carrier %>
     <% end %>
   </div>
 
-  <div class="col-xs-5">
+  <div class="col-5">
     <%= f.field_container :service_level do %>
       <%= f.label :service_level %><br />
-      <%= f.text_field :service_level, :class => 'fullwidth', :label => false  %>
+      <%= f.text_field :service_level, class: 'fullwidth', label: false  %>
       <%= error_message_on :shipping_method, :service_level %>
     <% end %>
   </div>
 
-  <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-xs-10">
+  <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-10">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url %><br />
-      <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
+      <%= f.text_field :tracking_url, class: 'fullwidth', placeholder: Spree.t(:tracking_url_placeholder) %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
   </div>
@@ -55,7 +55,7 @@
 <% end %>
 
 <div class="row">
-  <div class="col-xs-5">
+  <div class="col-5">
     <div data-hook="admin_shipping_method_form_availability_fields">
       <fieldset class="categories no-border-bottom">
         <legend align="center"><%= plural_resource_name(Spree::ShippingCategory) %></legend>
@@ -88,9 +88,9 @@
       </fieldset>
     </div>
   </div>
-  <div class="col-xs-5">
+  <div class="col-5">
     <div data-hook="admin_shipping_method_form_calculator_fields">
-      <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+      <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
     </div>
     <div>
       <fieldset class="tax_categories no-border-bottom">

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

@@ -10,18 +10,18 @@
 <% end %>
 
 <div data-hook="admin_shipping_method_edit_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_edit_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
     <fieldset class="no-border-top">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="clear"></div>
 
       <div data-hook="admin_shipping_method_edit_form_buttons">
-        <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+        <%= render partial: 'spree/admin/shared/edit_resource_links' %>
       </div>
     </fieldset>
   <% end %>

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

@@ -8,7 +8,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
     <li>
-      <%= button_link_to Spree.t(:new_shipping_method), new_object_url, :id => 'admin_new_shipping_method_link' %>
+      <%= button_link_to Spree.t(:new_shipping_method), new_object_url, id: 'admin_new_shipping_method_link' %>
     </li>
   <% end %>
 <% end %>
@@ -40,11 +40,11 @@
           <td class="align-center"><%= shipping_method.available_to_users? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
             <% if can?(:update, shipping_method) %>
-              <%= link_to_edit shipping_method, :no_text => true %>
+              <%= link_to_edit shipping_method, no_text: true %>
             <% end %>
 
             <% if can?(:destroy, shipping_method) %>
-              <%= link_to_delete shipping_method, :no_text => true %>
+              <%= link_to_delete shipping_method, no_text: true %>
             <% end %>
           </td>
         </tr>
@@ -52,7 +52,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::ShippingMethod,
                  new_resource_url: new_object_url %>

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

@@ -10,18 +10,18 @@
 <% end %>
 
 <div data-hook="admin_shipping_method_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render partial: 'spree/shared/error_messages', locals: { target: @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_new_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
     <fieldset class="no-border-top">
-      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="clear"></div>
 
       <div data-hook="admin_shipping_method_new_form_buttons">
-        <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
       </div>
     </fieldset>
   <% end %>

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

@@ -1,14 +1,14 @@
 <div data-hook="admin_state_form_fields" class="row">
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :name do %>
       <%= f.label :name %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
   </div>
-  <div class="col-xs-6">
+  <div class="col-6">
     <%= f.field_container :abbr do %>
       <%= f.label :abbr %>
-      <%= f.text_field :abbr, :class => 'fullwidth' %>
+      <%= f.text_field :abbr, class: 'fullwidth' %>
     <% end %>
   </div>
 </div>

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

@@ -1,7 +1,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/states/_state_list.html.erb

@@ -18,10 +18,10 @@
         <td class="align-center"><%= state.abbr %></td>
         <td class="actions">
           <% if can?(:update, state) %>
-            <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_country_state_url(@country, state), :no_text => true %>
+            <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_country_state_url(@country, state), no_text: true %>
           <% end %>
           <% if can?(:destroy, state) %>
-            <%= link_to_delete state, :no_text => true %>
+            <%= link_to_delete state, no_text: true %>
           <% end %>
         </td>
       </tr>

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

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

@@ -8,16 +8,16 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::State) %>
     <li>
-      <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :id => 'new_state_link' } %>
+      <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { id: 'new_state_link' } %>
     </li>
   <% end %>
 <% end %>
 
 <div class="row">
-  <div class="col-xs-12">
+  <div class="col-12">
     <div data-hook="country" class="field">
       <%= label_tag :country, Spree::Country.model_name.human %>
-      <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
+      <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(format: :js) %>?country_id=" data-update="#state-list">
       <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
       </select>
     </div>
@@ -28,12 +28,12 @@
   <%= form_for [:admin, @country, Spree::State.new] 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 %>
 </div>
 
 <div id="state-list" data-hook>
-  <%= render :partial => 'state_list'%>
+  <%= render partial: 'state_list'%>
 </div>