spree_backend 3.1.0.rc1 → 3.1.0.rc2

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

@@ -1,4 +1,3 @@
 <%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  page_title: Spree.t(:editing_rma_reason),
-  back_button_text: Spree.t(:back_to_rma_reason_list)
+  collection_url_label: Spree.t(:return_authorization_reasons)
 } %>

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

@@ -1,4 +1,4 @@
 <%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  page_title: Spree.t(:new_rma_reason),
-  back_button_text: Spree.t(:back_to_rma_reason_list)
+  collection_url_label: Spree.t(:return_authorization_reasons),
+  page_title: Spree.t(:new_rma_reason)
 } %>

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

@@ -2,13 +2,13 @@
   <% if @return_authorization.can_cancel? %>
     <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: "delete" %>
   <% end %>
-  <%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :return_authorizations } %>
 
 <% content_for :page_title do %>
-  / <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
+  / <%= link_to Spree.t(:return_authorizations), spree.admin_order_return_authorizations_url %>
+  / <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @return_authorization } %>

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

@@ -25,7 +25,11 @@
       <% @return_authorizations.each do |return_authorization| %>
         <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
           <td><%= return_authorization.number %></td>
-          <td><%= Spree.t(return_authorization.state.downcase) %></td>
+          <td>
+            <span class="label label-<%= return_authorization.state %>">
+              <%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
+            </span>
+          </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions actions-2">

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

@@ -1,8 +1,9 @@
 <div data-hook="admin_role_form_fields">
-  <div data-hook="role_name" class="form-group">
+  <%= f.field_container :name, class: ["form-group"], 'data-hook' => "role_name" do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
-  </div>
+    <%= f.error_message_on :name %>
+  <% end %>
 
   <div data-hook="additional_role_fields"></div>
 </div>

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

@@ -1,10 +1,9 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::Role.model_name.human) %>
+  <%= link_to Spree.t(:roles), spree.admin_roles_url %> /
+  <%= @role.name.capitalize %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Role.model_name.human, admin_roles_path) %>
-<% end %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>

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

@@ -1,10 +1,9 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:roles), spree.admin_roles_url %> /
   <%= Spree.t(:new_role) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::Role.model_name.human, admin_roles_path) %>
-<% end %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
   <fieldset>

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

@@ -1,42 +1,49 @@
 <% s_or_b = type.chars.first %>
 
 <div id="<%= type %>" data-hook="address_fields">
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :firstname, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :firstname, Spree.t(:first_name) %>
     <%= f.text_field :firstname, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :firstname %>
+  <% end %>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :lastname, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :lastname, Spree.t(:last_name) %>
     <%= f.text_field :lastname, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :lastname %>
+  <% end %>
 
   <% if Spree::Config[:company] %>
-    <div class="form-group <%= "#{type}-row" %>">
+    <%= field_container f.object, :company, class: ["form-group", "#{type}-row"] do %>
       <%= f.label :company, Spree.t(:company) %>
       <%= f.text_field :company, class: 'form-control' %>
-    </div>
+      <%= error_message_on f.object, :company %>
+    <% end %>
   <% end %>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :address1, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :address1, Spree.t(:street_address) %>
     <%= f.text_field :address1, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :address1 %>
+  <% end %>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :address2, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :address2, Spree.t(:street_address_2) %>
     <%= f.text_field :address2, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :address2 %>
+  <% end %>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :city, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :city, Spree.t(:city) %>
     <%= f.text_field :city, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :city %>
+  <% end %>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :zipcode, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :zipcode, Spree.t(:zip) %>
     <%= f.text_field :zipcode, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :zipcode %>
+  <% end %>
 
   <div class="form-group <%= "#{type}-row" %>">
     <%= f.label :country_id, Spree.t(:country) %>
@@ -55,10 +62,11 @@
     </span>
   </div>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :phone, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :phone, Spree.t(:phone) %>
     <%= f.phone_field :phone, class: 'form-control' %>
-  </div>
+    <%= error_message_on f.object, :phone %>
+  <% end %>
 </div>
 
 <% content_for :head do %>

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

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= page_title %> / <%= @object.name %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', back_button_text, collection_url, class: 'btn btn-default' %>
+  <%= link_to collection_url_label, collection_url %> /
+  <%= @object.name %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>

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

@@ -2,6 +2,7 @@
   <%= f.field_container :name, class: ['form-group'] do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
+    <%= f.error_message_on :name %>
   <% end %>
   <div class="checkbox">
     <%= label_tag :active do %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to collection_url_label, collection_url %> /
   <%= page_title %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= link_to_with_icon 'arrow-left', back_button_text, collection_url, class: 'btn btn-default' %>
-<% end %>
-
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @object] do |f| %>

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

@@ -1,6 +1,9 @@
 <div data-hook="admin_shipping_category_form_fields">
   <div data-hook="name" class="form-group">
-    <%= label_tag :shipping_category_name, Spree.t(:name) %><br>
-    <%= f.text_field :name, class: 'form-control' %>
+    <%= f.field_container :name, class: ["form-group"] do %>
+      <%= f.label :name, Spree.t(:name) %><br>
+      <%= f.text_field :name, class: 'form-control' %>
+      <%= f.error_message_on :name %>
+    <% end %>
   </div>
 </div>

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

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::ShippingCategory.model_name.human) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::ShippingCategory.model_name.human, admin_shipping_categories_path) %>
+  <%= link_to Spree.t(:shipping_categories), spree.admin_shipping_categories_url %> /
+  <%= @shipping_category.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>

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

@@ -1,11 +1,8 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_categories), spree.admin_shipping_categories_url %> /
   <%= Spree.t(:new_shipping_category) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::ShippingCategory.model_name.human, admin_shipping_categories_path) %>
-<% end %>
-
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_category } %>
 
 <%= form_for [:admin, @shipping_category] do |f| %>

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

@@ -4,7 +4,7 @@
       <%= f.field_container :name, :class => ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, :class => 'form-control' %>
-        <%= error_message_on :shipping_method, :name %>
+        <%= f.error_message_on :name %>
       <% end %>
     </div>
 
@@ -12,7 +12,7 @@
       <%= f.field_container :display_on, :class => ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
         <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { :class => 'select2' }) %>
-        <%= error_message_on :shipping_method, :display_on %>
+        <%= f.error_message_on :display_on %>
       <% end %>
     </div>
   </div>
@@ -22,7 +22,7 @@
       <%= f.field_container :admin_name, :class => ['form-group'] do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, :class => 'form-control', :label => false %>
-        <%= error_message_on :shipping_method, :admin_name %>
+        <%= f.error_message_on :admin_name %>
       <% end %>
     </div>
 
@@ -30,7 +30,7 @@
       <%= f.field_container :code, :class => ['form-group'] do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, :class => 'form-control', :label => false %>
-        <%= error_message_on :shipping_method, :code %>
+        <%= f.error_message_on :code %>
       <% end %>
     </div>
 
@@ -38,7 +38,7 @@
       <%= f.field_container :tracking_url, :class => ['form-group'] do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, :class => 'form-control', :placeholder => Spree.t(:tracking_url_placeholder) %>
-        <%= error_message_on :shipping_method, :tracking_url %>
+        <%= f.error_message_on :tracking_url %>
       <% end %>
     </div>
   </div>
@@ -63,7 +63,7 @@
               <% end %>
             </div>
           <% end %>
-          <%= error_message_on :shipping_method, :shipping_category_id %>
+          <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
     </div>
@@ -88,7 +88,7 @@
               <% end %>
             </div>
           <% end %>
-          <%= error_message_on :shipping_method, :zone_id %>
+          <%= f.error_message_on :zone_id %>
         <% end %>
       </div>
     </div>
@@ -111,7 +111,7 @@
       <div class="panel-body">
         <%= f.field_container :categories, :class => ['form-group'] do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2" %>
-          <%= error_message_on :shipping_method, :tax_category_id %>
+          <%= f.error_message_on :tax_category_id %>
         <% end %>
       </div>
     </div>

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

@@ -1,5 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::ShippingMethod.model_name.human) %>
+  <%= link_to Spree.t(:shipping_methods), spree.admin_shipping_methods_url %> /
+  <%= @shipping_method.name %>
 <% end %>
 
 <div data-hook="admin_shipping_method_edit_form_header">

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

@@ -1,4 +1,5 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:shipping_methods), spree.admin_shipping_methods_url %> /
   <%= Spree.t(:new_shipping_method) %>
 <% end %>
 

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

@@ -3,6 +3,7 @@
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, :class => 'form-control' %>
+      <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-md-6">

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

@@ -1,9 +1,6 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::State.model_name.human) %> / <%= @state.name %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::State.model_name.human, admin_country_states_path(@country)) %>
+  <%= link_to Spree.t(:states), spree.admin_country_states_url(@country) %> /
+  <%= @state.name %>
 <% end %>
 
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>

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

@@ -1,13 +1,10 @@
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
 
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:states), spree.admin_country_states_url(@country) %> /
   <%= Spree.t(:new_state) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::State.model_name.human, admin_country_states_path(@country)) %>
-<% end %>
-
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -3,8 +3,9 @@
     <div class="col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
         <%= f.field_container :name, class: ['form-group']  do %>
-        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-        <%= f.text_field :name, class: 'form-control', required: true %>
+          <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+          <%= f.text_field :name, class: 'form-control', required: true %>
+          <%= f.error_message_on :name %>
         <% end %>
       </div>
       <div data-hook="stock_location_admin_name">

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

@@ -1,12 +1,8 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_resource, resource: Spree::StockLocation.model_name.human) %> /
+  <%= link_to Spree.t(:stock_locations), spree.admin_stock_locations_url %> /
   <%= @stock_location.name %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::StockLocation.model_name.human, admin_stock_locations_path) %>
-<% end %>
-
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>

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

@@ -1,12 +1,9 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:stock_locations), spree.admin_stock_locations_url %> /
   <%= Spree.t(:new_stock_location) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= 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/admin/shared/error_messages', :locals => { :target => @stock_locations } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
   <fieldset>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:stock_locations), spree.admin_stock_locations_path %> /
   <%= Spree.t(:stock_movements_for_stock_location, stock_location_name: @stock_location.name) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
-  <%= back_to_list_button(Spree::StockLocation.model_name.human, admin_stock_locations_path) %>
 <% end %>
 
 <% if @stock_movements.any? %>

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

@@ -1,11 +1,9 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:stock_locations), spree.admin_stock_locations_url %> /
+  <%= link_to Spree.t(:stock_movements), spree.admin_stock_location_stock_movements_path(stock_location) %> /
   <%= Spree.t(:new_stock_movement) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <%= back_to_list_button(Spree::StockMovement.model_name.human, admin_stock_location_stock_movements_path(stock_location)) %>
-<% end %>
-
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @stock_movement } %>
 
 <%= form_for [:admin, stock_location, @stock_movement] do |f| %>

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

@@ -1,4 +1,5 @@
 <% content_for :page_title do %>
+  <%= link_to Spree.t(:stock_transfers), spree.admin_stock_transfers_url %> /
   <%= Spree.t(:new_stock_transfer) %>
 <% end %>
 
@@ -48,7 +49,7 @@
           <%= label_tag :transfer_destination_location_id, Spree.t(:destination) %>
           <%= select_tag :transfer_destination_location_id, {}, class: 'select2' %>
         </div>
-      </div>  
+      </div>
     </div>
   </div>