spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,39 +1,39 @@
 <%= form_tag transfer_stock_admin_stock_locations_path do %>
   <fieldset>
-    <legend align="center"><%= Spree.t(:move_stock_between_locations)%></legend>
+    <legend><%= Spree.t(:move_stock_between_locations)%></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="five columns">
-        <div class="field" id="stock_movement_transfer_from_field">
+      <div class="col-md-5">
+        <div class="form-group" 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' %>
+          <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
-      <div class="five columns">
-        <div class="field" id="stock_movement_transfer_to_field">
+      <div class="col-md-5">
+        <div class="form-group" 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' %>
+          <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
 
-      <div class="five columns">
-        <div class="field" id="stock_movement_variant_id_field">
+      <div class="col-md-5">
+        <div class="form-group" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree.t(:variant) %>
-          <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2 fullwidth' %>
+          <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2' %>
         </div>
       </div>
 
-      <div class="five columns">
-        <div class="field" id="stock_movement_quantity_field">
+      <div class="col-md-5">
+        <div class="form-group" id="stock_movement_quantity_field">
           <%= label_tag 'quantity', Spree.t(:quantity) %>
-          <%= number_field_tag :quantity, 1, class: 'fullwidth' %>
+          <%= number_field_tag :quantity, 1, class: 'form-control' %>
         </div>
       </div>
     </div>
 
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:transfer_stock), 'plus' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+      <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,18 +1,16 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_stock_location) %> <i class="fa fa-arrow-right"></i>
+  <%= Spree.t(:editing_resource, resource: Spree::StockLocation.model_name.human) %> /
   <%= @stock_location.name %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockLocation.model_name.human), admin_stock_locations_path, class: 'btn btn-default' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_location } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>

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

@@ -1,28 +1,14 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:stock_locations) %>
+  <%= Spree::StockLocation.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :icon => 'plus', :id => 'admin_new_stock_location' } %>
-    </li>
-    <li>
-      <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
-    </li>
-  </ul>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :class => "btn-success", :icon => 'add', :id => 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-primary' } %>
 <% end %>
 
 <% if @stock_locations.any? %>
-  <table class="index" id='listing_stock_locations' data-hook>
-    <colgroup>
-      <col style="width: 40%" />
-      <col style="width: 15%" />
-      <col style="width: 30%" />
-      <col style="width: 15%" />
-    </colgroup>
+  <table class="table" id='listing_stock_locations' data-hook>
     <thead>
       <tr data-hook="stock_locations_header">
         <th><%= Spree.t(:name) %></th>
@@ -36,11 +22,11 @@
            @edit_url = edit_admin_stock_location_path(stock_location)
            @delete_url = admin_stock_location_path(stock_location)
       %>
-        <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= display_name(stock_location) %></td>
-          <td class="align-center"><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
-          <td class="align-center"><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
-          <td class="actions">
+        <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
+          <td><%= display_name(stock_location) %></td>
+          <td><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
+          <td><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
+          <td class="actions actions-2 text-center">
             <%= link_to_edit stock_location, :no_text => true %>
             <%= link_to_delete stock_location, :no_text => true %>
           </td>
@@ -49,8 +35,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_location')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::StockLocation.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,17 +1,15 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_stock_location) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'btn btn-primary' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_locations } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_locations } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

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

@@ -1,14 +1,12 @@
-<div data-hook="admin_stock_movements_form_fields" class="row">
-  <div class="alpha twelve columns">
-    <%= f.field_container :quantity do %>
-      <%= f.label :quantity, Spree.t(:quantity) %>
-      <%= f.text_field :quantity %>
-    <% end %>
-    <%= f.field_container :stock_item_id do %>
-      <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-      <%= f.text_field 'stock_item_id', :class => 'fullwidth', :'data-stock-location-id' => params[:stock_location_id] %>
-    <% end %>
-  </div>
+<div data-hook="admin_stock_movements_form_fields">
+  <%= f.field_container :quantity, class: ['form-group'] do %>
+    <%= f.label :quantity, Spree.t(:quantity) %>
+    <%= f.text_field :quantity %>
+  <% end %>
+  <%= f.field_container :stock_item_id, class: ['form-group'] do %>
+    <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
+    <%= f.text_field 'stock_item_id', :class => 'form-control', :'data-stock-location-id' => params[:stock_location_id] %>
+  <% end %>
 </div>
 
-<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>
+<%= render :partial => "spree/admin/variants/autocomplete", :formats => :js %>

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

@@ -1,15 +1,15 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_stock_movement) %>
+  <%= Spree.t(:editing_resource, resource: Spree::StockMovement.model_name.human) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockMovement.model_name.human), admin_stock_location_stock_movements_path(stock_location), class: 'btn btn-default' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_movement } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_movement } %>
 
 <%= form_for [:admin, stock_location, @stock_movement] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_stock_location_stock_movements_path(stock_location) } %>
   </fieldset>

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

@@ -1,20 +1,14 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location),  icon: 'plus', id: 'admin_new_stock_movement_link' %>
-  </li>
-  <li>
-    <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_locations_list), admin_stock_locations_path, :class => 'button' %>
-  </li>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'plus', id: 'admin_new_stock_movement_link' %>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::StockLocation.model_name.human), admin_stock_locations_path, class: 'btn btn-default' %>
 <% end %>
 
 <% if @stock_movements.any? %>
-<table class="index" id='listing_stock_movements'>
+<table class="table" id='listing_stock_movements'>
   <colgroup>
     <col style="width: 35%">
     <col style="width: 20%">
@@ -29,19 +23,19 @@
   </thead>
   <tbody>
     <% @stock_movements.each do |stock_movement|%>
-      <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center">
+      <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
+        <td>
           <%= display_variant(stock_movement) %>
         </td>
-        <td class="align-center"><%= stock_movement.quantity %></td>
-        <td class="align-center"><%= pretty_originator(stock_movement) %></td>
+        <td><%= stock_movement.quantity %></td>
+        <td><%= pretty_originator(stock_movement) %></td>
       </tr>
     <% end %>
   </tbody>
 </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>,
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::StockMovement.model_name.human(count: :many)) %>,
     <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
   </div>
 <% end %>

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

@@ -3,13 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_stock_movements_list), admin_stock_location_stock_movements_path(stock_location), :class => 'btn btn-default' %></li>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_movement } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_movement } %>
 
 <%= form_for [:admin, stock_location, @stock_movement] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links', locals: { collection_url: admin_stock_location_stock_movements_path(stock_location) } %>
   </fieldset>

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

@@ -1,26 +1,21 @@
 <div id="source-movements-table" class="twelve columns alpha">
-<table class="index sortable">
-  <colgroup>
-    <col style="width: 40%" />
-    <col style="width: 30%" />
-    <col style="width: 10%" />
-    <col style="width: 20%" />
-  </colgroup>
-  <thead data-hook="bulk_variants_header">
-    <tr>
-      <th><%= Spree.t('variant') %></th>
-      <th><%= Spree.t('sku') %></th>
-      <th><%= Spree.t('quantity') %></th>
-      <th><%= Spree.t('count_on_hand') %></th>
-    </tr>
-  </thead>
-  <tbody id="bulk_variants_tbody">
-    <% stock_movements.each do |movement| %>
-    <tr>
-      <td><%= movement.stock_item.variant.name %></td>
-      <td class='align-center'><%= movement.stock_item.variant.sku %></td>
-      <td class='align-center'><%= movement.quantity %></td>
-      <td class='align-center'><%= movement.stock_item.count_on_hand %></td>
+  <table class="table sortable">
+    <thead data-hook="bulk_variants_header">
+      <tr>
+        <th><%= Spree.t('variant') %></th>
+        <th><%= Spree.t('sku') %></th>
+        <th><%= Spree.t('quantity') %></th>
+        <th><%= Spree.t('count_on_hand') %></th>
+      </tr>
+    </thead>
+    <tbody id="bulk_variants_tbody">
+      <% stock_movements.each do |movement| %>
+        <tr>
+          <td><%= movement.stock_item.variant.name %></td>
+          <td><%= movement.stock_item.variant.sku %></td>
+          <td><%= movement.quantity %></td>
+          <td><%= movement.stock_item.count_on_hand %></td>
+        </tr>
       <% end %>
     </tbody>
   </table>

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

@@ -1,48 +1,44 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:stock_transfers) %>
+  <%= Spree::StockTransfer.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
-  </li>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_object_url, { :icon => 'add', :class => 'btn-success' } %>
 <% end %>
 
-<div data-hook="admin_orders_index_search">
+<div data-hook="admin_orders_index_search" class="well">
   <fieldset>
-    <legend align="center"><%= Spree.t(:search) %></legend>
+    <legend><%= Spree.t(:search) %></legend>
     <%= search_form_for @q, :url => admin_stock_transfers_path do |f| %>
 
-      <div class="field-block alpha four columns">
-        <div class="field">
-          <%= f.label :reference_cont, Spree.t(:reference_cont) %>
-          <%= f.text_field :reference_cont, class: 'fullwidth' %>
+      <div class="row no-marginb">
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= f.label :reference_cont, Spree.t(:reference_cont) %>
+            <%= f.text_field :reference_cont, class: 'form-control' %>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= f.label :source_location, Spree.t(:source) %>
-          <%= f.select :source_location_id_eq,
-               options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
-               { include_blank: true }, class: 'select2 fullwidth' %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= f.label :source_location, Spree.t(:source) %>
+            <%= f.select :source_location_id_eq,
+                 options_from_collection_for_select(@stock_locations, :id, :name, @q.source_location_id_eq),
+                 { include_blank: true }, class: 'select2' %>
+          </div>
         </div>
-      </div>
 
-      <div class="omega four columns">
-        <div class="field">
-          <%= f.label :destination_location, Spree.t(:destination) %>
-          <%= f.select :destination_location_id_eq,
-               options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
-               { include_blank: true }, class: 'select2 fullwidth' %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= f.label :destination_location, Spree.t(:destination) %>
+            <%= f.select :destination_location_id_eq,
+                 options_from_collection_for_select(@stock_locations, :id, :name, @q.destination_location_id_eq),
+                 { include_blank: true }, class: 'select2' %>
+          </div>
         </div>
       </div>
 
-      <div class="clearfix"></div>
-
-      <div class="actions filter-actions">
+      <div class="form-actions">
         <div data-hook="admin_stock_transfers_index_search_buttons">
           <%= button Spree.t(:filter_results), 'search' %>
         </div>
@@ -52,14 +48,7 @@
 </div>
 
 <% if @stock_transfers.any? %>
-  <table class='index' id='listing_stock_transfers' data-hook>
-    <colgroup>
-      <col style='width: 25%' />
-      <col style='width: 20%' />
-      <col style='width: 20%' />
-      <col style='width: 25%' />
-      <col style='width: 10%' />
-    </colgroup>
+  <table class="table" id='listing_stock_transfers' data-hook>
     <thead>
       <tr data-hook='stock_transfers_header'>
         <th><%= Spree.t(:created_at) %></th>
@@ -71,24 +60,22 @@
     </thead>
     <tbody>
       <% @stock_transfers.each do |stock_transfer| %>
-        <tr id="<%= spree_dom_id stock_transfer %>" data-hook="stock_transfer_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= stock_transfer.created_at %></td>
-          <td class="align-center"><%= stock_transfer.reference %></td>
-          <td class="align-center"><%= stock_transfer.source_location.try(:name) %></td>
-          <td class="align-center"><%= stock_transfer.destination_location.try(:name) %></td>
-          <td class='actions'>
-            <%= link_to '', admin_stock_transfer_path(stock_transfer),
-            title: 'view', class: 'view icon_link with-tip fa fa-eye-open no-text',
-            data: {action: 'view'} %>
+        <tr id="<%= spree_dom_id stock_transfer %>" data-hook="stock_transfer_row">
+          <td><%= link_to stock_transfer.created_at, admin_stock_transfer_path(stock_transfer) %></td>
+          <td><%= stock_transfer.reference %></td>
+          <td><%= stock_transfer.source_location.try(:name) %></td>
+          <td><%= stock_transfer.destination_location.try(:name) %></td>
+          <td class="actions actions-1">
+            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), :class => 'btn btn-default btn-sm', :no_text => true, :data => {:action => 'view'} %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_transfer')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_transfer_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::StockTransfer.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>