solidus_backend 1.3.2 → 1.4.0.beta1

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_shipping_method) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
+<% admin_breadcrumb(Spree.t(:new_shipping_method)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <div data-hook="admin_shipping_method_new_form_header">

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_state) %> <i class="fa fa-arrow-right"></i> <%= @state.name %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::State), spree.admin_states_path) %>
+<% admin_breadcrumb(@state.name) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_states_list), spree.admin_country_states_url(@country), :icon => 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>

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

@@ -1,13 +1,14 @@
 <%= render 'spree/admin/shared/areas_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::State.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::State)) %>
+
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::State) %>
     <li>
-      <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :icon => 'plus', :id => 'new_state_link' } %>
+      <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :id => 'new_state_link' } %>
     </li>
   <% end %>
 <% end %>

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

@@ -2,9 +2,11 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_state) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.areas')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::State), spree.admin_states_path) %>
+<% admin_breadcrumb(Spree.t(:new_state)) %>
+
 
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>

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

@@ -1,15 +1,12 @@
 <% if @product %>
-  <% content_for :page_actions do %>
-    <li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'arrow-left' %></li>
-  <% end %>
-
   <%= 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 %>
 
-  <% content_for :page_title do %>
-    <%= Spree.t(:manage_stock) %>
-  <% end %>
+  <% admin_breadcrumb(Spree.t(:stock)) %>
+
 <% end %>
 
 <% content_for :table_filter_title do %>

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

@@ -31,8 +31,8 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'plus' %>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+      <%= button Spree.t(:transfer_stock) %>
+      <%= link_to Spree.t('actions.cancel'), collection_url, :class => 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,12 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:editing_stock_location) %> <i class="fa fa-arrow-right"></i>
-  <%= @stock_location.name %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
+<% admin_breadcrumb(@stock_location.name) %>
+
 
 <% 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>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_location } %>

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

@@ -1,20 +1,21 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree::StockLocation.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
+
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::StockLocation) %>
       <li>
-        <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :icon => 'plus', :id => 'admin_new_stock_location' } %>
+        <%= button_link_to Spree.t(:new_stock_location), new_object_url, { :id => 'admin_new_stock_location' } %>
       </li>
     <% end %>
 
     <% if can?(:create, Spree::StockTransfer) %>
       <li>
-        <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
+        <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path %>
       </li>
     <% end %>
   </ul>
@@ -34,7 +35,7 @@
         <th class="no-border"></th>
         <th><%= Spree::StockLocation.human_attribute_name(:name) %></th>
         <th><%= Spree::StockLocation.human_attribute_name(:state_id) %></th>
-        <th><%= Spree::StockMovement.model_name.human(count: :other) %></th>
+        <th><%= plural_resource_name(Spree::StockMovement) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -49,11 +50,17 @@
               <span class="handle"></span>
             <% end %>
           </td>
-          <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"><%= admin_stock_location_display_name(stock_location) %></td>
+          <td class="align-center">
+            <% if stock_location.active? %>
+              <span class="state active"><%= Spree.t('active') %></span>
+            <% else %>
+              <span class="state inactive"><%= Spree.t('inactive') %></span>
+            <% end %>
+          </td>
           <td class="align-center">
             <% if can?(:display, Spree::StockMovement) %>
-              <%= link_to Spree::StockMovement.model_name.human(count: :other), admin_stock_location_stock_movements_path(stock_location.id) %>
+              <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(stock_location.id) %>
             <% else %>
               Stock Movements
             <% end %>

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

@@ -1,11 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:new_stock_location) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:settings)) %>
+<% admin_breadcrumb(Spree.t('admin.tab.shipping')) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
+<% admin_breadcrumb(Spree.t(:new_stock_location)) %>
+
 
 <% 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>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @stock_locations } %>

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

@@ -1,13 +1,12 @@
 <%= render 'spree/admin/shared/shipping_tabs' %>
 
-<% content_for :page_title do %>
-  <%= Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name)) %>
+
 
 <% 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),  icon: 'plus', id: 'admin_new_stock_movement_link' %>
+      <%= 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 %>
 

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

@@ -1,6 +1,5 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_stock_movement) %>
-<% end %>
+<% admin_breadcrumb(Spree.t(:new_stock_movement)) %>
+
 
 <% 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>

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

@@ -0,0 +1,7 @@
+<div class='location'>
+  <h5>
+    <span><%= admin_stock_location_display_name(stock_transfer.source_location) %></span>
+    <span class='arrow'>&rarr;</span>
+    <span><%= admin_stock_location_display_name(stock_transfer.destination_location) if stock_transfer.destination_location %></span>
+  </h5>
+</div>

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

@@ -59,5 +59,5 @@
     </tbody>
   </table>
   <div class="no-objects-found" <%= 'hidden' if @stock_transfer.transfer_items.any? %>>
-    <%= Spree.t(:no_resource, resource: Spree::TransferItem.model_name.human(count: :other)) %>
+    <%= Spree.t(:no_resource, resource: plural_resource_name(Spree::TransferItem)) %>
   </div>

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

@@ -1,15 +1,14 @@
-<%content_for :page_title do %>
-  <%= "#{Spree.t(:editing_stock_transfer)} #{@stock_transfer.number}" %>
-<% end %>
+<% admin_breadcrumb(link_to Spree.t(:stock), spree.admin_stock_items_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StockTransfer), spree.admin_stock_transfers_path) %>
+<% admin_breadcrumb(@stock_transfer.number) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %>
   </li>
   <li>
     <%= button_link_to Spree.t(:ready_to_ship),
       finalize_admin_stock_transfer_path(@stock_transfer),
-      icon: 'truck',
       method: 'put',
       data: { confirm: Spree.t('finalize_stock_transfer.confirm') }
     %>
@@ -33,7 +32,7 @@
       <%= f.error_message_on :destination_location %>
     <% end %>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.save'), 'ok' %>
+      <%= button Spree.t('actions.save') %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,11 +1,11 @@
-<% content_for :page_title do %>
-  <%= Spree::StockTransfer.model_name.human(count: :other) %>
-<% end %>
+<% admin_breadcrumb(link_to Spree.t(:stock), spree.admin_stock_items_path) %>
+<% admin_breadcrumb(plural_resource_name(Spree::StockTransfer)) %>
+
 
 <% content_for :page_actions do %>
   <% if can? :create, Spree::StockTransfer %>
     <li>
-      <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, icon: 'plus' %>
+      <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path %>
     </li>
   <% end %>
 <% end %>
@@ -59,7 +59,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_stock_transfers_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
+          <%= button Spree.t(:filter_results) %>
         </div>
       </div>
     <% end %>

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

@@ -1,11 +1,9 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:new_stock_transfer) %>
-<% end %>
+<% admin_breadcrumb(link_to Spree.t(:stock), spree.admin_stock_items_path) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StockTransfer), spree.admin_stock_transfers_path) %>
+<% admin_breadcrumb(Spree.t(:new_stock_transfer)) %>
+
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %>
-  </li>
 <% end %>
 
 <%= form_for [:admin, @stock_transfer] do |f| %>
@@ -21,8 +19,8 @@
       <%= f.error_message_on :description %>
     <% end %>
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'arrow-right' %>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_stock_transfers_path, class: 'button' %>
+      <%= button Spree.t(:continue) %>
+      <%= link_to Spree.t('actions.cancel'), admin_stock_transfers_path, class: 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,28 +1,20 @@
-<% content_for :page_title do %>
-  <%= "#{Spree.t(:receiving)} #{@stock_transfer.number}" %>
-<% end %>
+<% admin_breadcrumb("#{Spree.t(:receiving)} #{@stock_transfer.number}") %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %>
   </li>
   <li>
     <%= button_link_to Spree.t(:close),
       close_admin_stock_transfer_path(@stock_transfer),
-      icon: 'lock',
       method: 'put',
       data: { confirm: Spree.t('close_stock_transfer.confirm') } %>
   </li>
 <% end %>
 
 <div id='stock_transfer_summary' class='fullwidth'>
-  <div class='location'>
-    <span class='summary-field'>From:</span>
-    <span><%= @stock_transfer.source_location.admin_name %></span>
-    <span class='arrow'>&rarr;</span>
-    <span class='summary-field'>To:</span>
-    <span><%= @stock_transfer.destination_location.admin_name %></span>
-  </div>
+  <%= render 'spree/admin/stock_transfers/location', stock_transfer: @stock_transfer %>
   <div class='count-summary'>
     <span id='total-received-quantity'><%= @stock_transfer.received_item_count %></span>
     /

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

@@ -1,21 +1,15 @@
-<% content_for :page_title do %>
-  <%= Spree::StockTransfer.model_name.human %> <%= @stock_transfer.number %>
-<% end %>
+<% admin_breadcrumb(link_to Spree.t(:stock), spree.admin_stock_items_path) %>
+<% admin_breadcrumb(Spree::StockTransfer.model_name.human, @stock_transfer.number) %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %>
   </li>
 <% end %>
 
 <fieldset class="no-border-bottom">
-  <div class='location'>
-    <h6>
-      <span><%= @stock_transfer.source_location.admin_name %></span>
-      <span class='arrow'>&rarr;</span>
-      <span><%= @stock_transfer.destination_location.try!(:admin_name) %></span>
-    </h6>
-  </div>
+  <%= render 'spree/admin/stock_transfers/location', stock_transfer: @stock_transfer %>
 
   <div>
     <label><%= Spree::StockTransfer.human_attribute_name(:description) %></label>
@@ -49,6 +43,6 @@
 </fieldset>
 
 <fieldset>
-  <legend><%= Spree::TransferItem.model_name.human(count: :other) %></legend>
+  <legend><%= plural_resource_name(Spree::TransferItem) %></legend>
   <%= render partial: 'transfer_item_table', locals: { transfer_items: @stock_transfer.transfer_items, show_expected: true, show_received: true, show_actions: false } %>
 </fieldset>

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

@@ -1,15 +1,13 @@
-<% content_for :page_title do %>
-  <%= "#{Spree.t('actions.ship')} #{Spree::StockTransfer.model_name.human} \##{@stock_transfer.number}" %>
-<% end %>
+<% admin_breadcrumb("#{Spree.t('actions.ship')} #{Spree::StockTransfer.model_name.human} \##{@stock_transfer.number}") %>
+
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, icon: 'arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path %>
   </li>
   <li>
     <%= button_link_to Spree.t('actions.ship'),
       ship_admin_stock_transfer_path(@stock_transfer),
-      icon: 'check',
       method: 'put',
       data: { confirm: Spree.t('ship_stock_transfer.confirm') }
       %>
@@ -17,13 +15,7 @@
 <% end %>
 
 <div id='stock_transfer_summary' class='fullwidth'>
-  <div class='location'>
-    <h5>
-    <span><%= @stock_transfer.source_location.admin_name %></span>
-    <span class='arrow'>&rarr;</span>
-    <span><%= @stock_transfer.destination_location.admin_name %></span>
-    </h5>
-  </div>
+  <%= render 'spree/admin/stock_transfers/location', stock_transfer: @stock_transfer %>
   <div class='shipment-description'>
     <div class='summary-field creator'><%= Spree::StockTransfer.human_attribute_name(:created_by) %>: <%= @stock_transfer.created_by.email %></div>
     <div class='summary-field description'><%= @stock_transfer.description %></div>
@@ -49,6 +41,6 @@
 </fieldset>
 
 <fieldset id='stock-transfer-transfer-items'>
-  <legend align="center"><%= Spree::TransferItem.model_name.human(count: :other) %></legend>
+  <legend align="center"><%= plural_resource_name(Spree::TransferItem) %></legend>
   <%= render partial: 'transfer_item_table', locals: { transfer_items: @stock_transfer.transfer_items, show_expected: true, show_received: false, show_actions: false } %>
 </fieldset>

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

@@ -1,11 +1,13 @@
-<% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
-<% end %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::LegacyUser), spree.admin_users_path) %>
+<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
+<% admin_breadcrumb(link_to plural_resource_name(Spree::StoreCredit), spree.admin_user_store_credits_path(@user)) %>
+<% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
+<% admin_breadcrumb(Spree.t(:edit)) %>
+
 
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t("admin.store_credits.back_to_edit"), admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
 <% end %>
 
 <%= form_for [:admin, @user, @store_credit], url: update_amount_admin_user_store_credit_path, method: :put do |f| %>