spree_backend 3.0.0.rc1 → 3.0.0.rc3

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -1,21 +1,22 @@
 <ul data-hook="admin_configurations_sidebar_menu" class="collapse nav nav-pills nav-stacked" id="sidebar-configuration">
-  <%= configurations_sidebar_menu_item Spree.t(:general_settings), edit_admin_general_settings_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:tax_categories), admin_tax_categories_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path %>
+  <%= configurations_sidebar_menu_item(Spree.t(:general_settings), spree.edit_admin_general_settings_path) if can? :manage, Spree::Config %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can? :manage, Spree::TaxCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can? :manage, Spree::TaxRate %>
+  <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
+  <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
 
   <% if country = Spree::Country.find_by_id(Spree::Config[:default_country_id]) || Spree::Country.first %>
-    <%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(country) %>
+    <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
   <% end %>
 
-  <%= configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:shipping_methods), admin_shipping_methods_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:shipping_categories), admin_shipping_categories_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:stock_transfers), admin_stock_transfers_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:stock_locations), spree.admin_stock_locations_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:refund_reasons), admin_refund_reasons_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:reimbursement_types), admin_reimbursement_types_path %>
-  <%= configurations_sidebar_menu_item Spree.t(:return_authorization_reasons), admin_return_authorization_reasons_path %>  
-</ul>
+  <%= configurations_sidebar_menu_item(Spree.t(:payment_methods), spree.admin_payment_methods_path) if can? :manage, Spree::PaymentMethod %>
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
+  <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
+  <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
+  <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
+  <%= configurations_sidebar_menu_item(Spree.t(:analytics_trackers), spree.admin_trackers_path) if can? :manage, Spree::Tracker %>
+  <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>
+  <%= configurations_sidebar_menu_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can? :manage, Spree::ReturnAuthorizationReason %>
+  <%= configurations_sidebar_menu_item(Spree.t(:roles), spree.admin_roles_path) if can? :manage, Spree::Role %>
+</ul>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::ShippingCategory.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::ShippingCategory) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :class => "btn-success", :icon => 'add' %>
-<% end %>
+<% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>
   <table class="table">
@@ -19,8 +19,8 @@
       <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
         <td><%= shipping_category.name %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit shipping_category, :no_text => true %>
-          <%= link_to_delete shipping_category, :no_text => true %>
+          <%= link_to_edit(shipping_category, :no_text => true) if can? :edit, shipping_category %>
+          <%= link_to_delete(shipping_category, :no_text => true) if can? :edit, shipping_category %>
         </td>
       </tr>
       <% end %>
@@ -28,7 +28,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::ShippingCategory.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingCategory)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::ShippingCategory %>!
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::ShippingMethod.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::ShippingMethod) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :class => "btn-success", :icon => 'add', :id => 'admin_new_shipping_method_link' %>
-<% end %>
+<% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>
   <table class="table" id='listing_shipping_methods'>
@@ -25,8 +25,8 @@
           <td><%= shipping_method.calculator.description %></td>
           <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
           <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit shipping_method, :no_text => true %>
-            <%= link_to_delete shipping_method, :no_text => true %>
+            <%= link_to_edit(shipping_method, :no_text => true) if can? :edit, shipping_method %>
+            <%= link_to_delete(shipping_method, :no_text => true) if can? :delete, shipping_method %>
           </td>
         </tr>
       <% end %>
@@ -34,7 +34,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::ShippingMethod.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ShippingMethod)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::PaymentMethod %>!
   </div>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'State Changes' } %>
 
 <% content_for :page_title do %>
-  <%= Spree::StateChange.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::StateChange) %>
 <% end %>
 
 <% if @state_changes.any? %>

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

@@ -14,8 +14,8 @@
         <td><%= state.name %></td>
         <td class="text-center"><%= state.abbr %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit state, :no_text => true %>
-          <%= link_to_delete state, :no_text => true %>
+          <%= link_to_edit(state, :no_text => true) if can? :edit, state %>
+          <%= link_to_delete(state, :no_text => true) if can? :delete, state %>
         </td>
       </tr>
     <% end %>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::State.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::State) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :class => "btn-success", :icon => 'add', :id => 'new_state_link' } %>
-<% end %>
+<% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">
   <%= label_tag :country, Spree.t(:country) %>

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

@@ -86,10 +86,9 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_include_tag 'spree/backend/address_states.js' %>
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     $(document).ready(function(){
       $('span#country .select2').on('change', function() { update_state(''); });
     });
-  <% end -%>
+  <% end %>
 <% end %>

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

@@ -1,11 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::StockLocation.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::StockLocation) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= 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 %>
+<% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>
   <table class="table" id='listing_stock_locations' data-hook>
@@ -27,8 +26,8 @@
           <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 %>
+            <%= link_to_edit(stock_location, :no_text => true) if can? :create, stock_location %>
+            <%= link_to_delete(stock_location, :no_text => true) if can? :create, stock_location %>
           </td>
         </tr>
       <% end %>
@@ -36,7 +35,7 @@
   </table>
 <% else %>
   <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 %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockLocation)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::StockLocation %>!
   </div>
 <% end %>

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

@@ -35,7 +35,7 @@
 </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::StockMovement.model_name.human(count: :many)) %>,
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockMovement)) %>,
     <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::StockTransfer.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::StockTransfer) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_object_url, { :icon => 'add', :class => 'btn-success' } %>
-<% end %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-success' } %>
+<% end if can? :create, Spree::StockTransfer %>
 
 <div data-hook="admin_orders_index_search" class="well">
   <fieldset>
@@ -74,8 +74,8 @@
   </table>
 <% else %>
   <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 %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockTransfer)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::StockTransfer %>!
   </div>
 <% end %>
 

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::StockTransfer.model_name.human(count: :many) %> (<%= @stock_transfer.number %>)
+  <%= plural_resource_name(Spree::StockTransfer) %> (<%= @stock_transfer.number %>)
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-success' } %>
-<% end %>
+<% end if can? :create, Spree::StockTransfer %>
 
 <fieldset>
   <legend><%= Spree.t(:stock_transfer) %></legend>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::TaxCategory.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::TaxCategory) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_tax_categories_link' %>
-<% end %>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_tax_categories_link' %>
+<% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>
 <table class="table" id='listing_tax_categories' data-hook>
@@ -28,15 +28,15 @@
         <td><%= tax_category.description %></td>
         <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit tax_category, :no_text => true %>
-          <%= link_to_delete tax_category, :no_text => true %>
+          <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
+          <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
       </tr>
     <% end %>
   </tbody>
 </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::TaxCategory.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxCategory)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::TaxCategory %>!
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% content_for :page_title do %>
-  <%= Spree::TaxRate.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::TaxRate) %>
 <% end %>
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add' %>
-<% end %>
+<% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>
   <table class="table">
@@ -31,8 +31,8 @@
         <td><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td><%=tax_rate.calculator.to_s %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit tax_rate, no_text: true %>
-          <%= link_to_delete tax_rate, no_text: true %>
+          <%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %>
+          <%= link_to_delete(tax_rate, no_text: true) if can? :delete, tax_rate %>
         </td>
       </tr>
       <% end %>
@@ -40,7 +40,7 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::TaxRate.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxRate)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::TaxRate %>!
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree::Taxonomy.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::Taxonomy) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -12,7 +12,7 @@
   </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::Taxonomy.model_name.human(count: :many)) %>,
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Taxonomy)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -15,7 +15,7 @@
 <% end %>
 
 <% content_for :head do %>
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       var field  = $('#permalink_part'),
           target = $('#permalink_part_display'),
@@ -26,5 +26,5 @@
         target.text(permalink_part_default + $(this).val());
       });
     });
-  <% end -%>
+  <% end %>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_tracker), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_tracker_link' %>
-<% end %>
+<% end if can? :create, Spree::Tracker %>
 
 <% if @trackers.any? %>
   <table class="table">
@@ -27,8 +27,8 @@
           <td><%= tracker.analytics_id %></td>
           <td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions text-right">
-            <%= link_to_edit tracker, :no_text => true %>
-            <%= link_to_delete tracker, :no_text => true %>
+            <%= link_to_edit(tracker, :no_text => true) if can? :edit, tracker %>
+            <%= link_to_delete(tracker, :no_text => true) if can? :delete, tracker %>
           </td>
         </tr>
       <% end %>
@@ -36,7 +36,7 @@
   </table>
 <% else %>
   <div class="alert alert-warning">
-    <%= Spree.t(:no_resource_found, resource: Spree::Tracker.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Tracker)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Tracker %>!
   </div>
 <% end %>

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

@@ -1,16 +1,16 @@
 <% content_for :sidebar do %>
   <ul class="nav nav-pills nav-stacked" data-hook="admin_user_tab_options">
     <li<%== ' class="active"' if current == :account %>>
-      <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
+      <%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), spree.edit_admin_user_path(@user) %>
     </li>
     <li<%== ' class="active"' if current == :address %>>
-      <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
+      <%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
     </li>
     <li<%== ' class="active"' if current == :orders %>>
-      <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
+      <%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), spree.orders_admin_user_path(@user) %>
     </li>
     <li<%== ' class="active"' if current == :items %>>
-      <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
+      <%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), spree.items_admin_user_path(@user) %>
     </li>
   </ul>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: Spree::Address.model_name.human(count: :many)) %>
+  <%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: plural_resource_name(Spree::Address)) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :address } %>
@@ -16,7 +16,7 @@
       <%= render :partial => 'addresses_form', :locals => { :f => f } %>
 
       <div class="form-actions text-center well" 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 => spree.admin_users_url } %>
       </div>
     <% end %>
   </div>

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

@@ -18,11 +18,11 @@
     </div>
 
     <div data-hook="admin_user_edit_form">
-      <%= form_for [:admin, @user], as: :user, url: admin_user_url(@user), method: :put do |f| %>
+      <%= form_for [:admin, @user], as: :user, url: spree.admin_user_url(@user), method: :put do |f| %>
         <%= render :partial => 'form', :locals => { :f => f } %>
 
         <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 => spree.admin_users_url } %>
         </div>
       <% end %>
     </div>

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

@@ -12,7 +12,7 @@
 
 <% content_for :table_filter do %>
   <div data-hook="admin_users_index_search">
-    <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
+    <%= search_form_for [:admin, @search], url: spree.admin_users_url do |f| %>
       <div class="form-group">
         <%= f.label Spree.t(:email) %>
         <%= f.text_field :email_cont, class: "form-control js-quick-search-target" %>

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

@@ -53,7 +53,7 @@
     </table>
   <% else %>
     <div class="alert alert-info no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
+      <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>
   <% end %>

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

@@ -7,7 +7,7 @@
 </div>
 
 <div data-hook="admin_user_new_form">
-  <%= form_for [:admin, @user], url: admin_users_url, method: :post do |f| %>
+  <%= form_for [:admin, @user], url: spree.admin_users_url, method: :post do |f| %>
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div data-hook="admin_user_new_form_buttons">

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

@@ -40,7 +40,7 @@
     </table>
   <% else %>
     <div class="alert alert-info no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
+      <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>
   <% end %>

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

@@ -17,14 +17,16 @@
     <% @variants.each do |variant| %>
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
-          <span class="icon icon-move handle"></span>
+          <% if can? :edit, variant %>
+            <span class="icon icon-move handle"></span>
+          <% end %>
         </td>
         <td><%= variant.options_text %></td>
         <td><%= variant.display_price.to_html %></td>
         <td><%= variant.sku %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(variant, :no_text => true) unless variant.deleted? %>
-          <%= link_to_delete(variant, :no_text => true) unless variant.deleted? %>
+          <%= link_to_edit(variant, :no_text => true) if can?(:edit, variant) && !variant.deleted? %>
+          <%= link_to_delete(variant, :no_text => true) if can?(:destroy, variant) && !variant.deleted? %>
         </td>
       </tr>
       <% end %>
@@ -37,21 +39,23 @@
   </table>
 <% else %>
   <div class="no-objects-found alert alert-info">
-    <%= Spree.t(:no_resource_found, resource: Spree::Variant.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_product_variant_path(@product) %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Variant)) %>,
+    <%= link_to(Spree.t(:add_one), spree.new_admin_product_variant_path(@product)) if can? :create, Spree::Variant %>!
   </div>
 <% end %>
 
 <% if @product.empty_option_values? %>
-  <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
-    <%= Spree.t(:to_add_variants_you_must_first_define) %>
-    <%= link_to Spree.t(:option_types), admin_product_url(@product) %>
-    <%= Spree.t(:and) %>
-    <%= link_to Spree.t(:option_values), admin_option_types_url %>
-  </p>
+  <% if can?(:create, Spree::OptionType) && can?(:create, Spree::OptionValue) %>
+    <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
+      <%= Spree.t(:to_add_variants_you_must_first_define) %>
+      <%= link_to(Spree.t(:option_types), spree.admin_product_url(@product)) %>
+      <%= Spree.t(:and) %>
+      <%= link_to Spree.t(:option_values), spree.admin_option_types_url %>
+    </p>
+  <% end %>
 <% else %>
   <% content_for :page_actions do %>
-    <%= button_link_to Spree.t(:new_variant), new_admin_product_variant_url(@product), { :remote => :true, :icon => 'add', :'data-update' => 'new_variant', :class => 'btn-success', id: 'new_var_link' } %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), { :class => 'btn-default', :icon => 'filter' } %>
+    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { :remote => :true, :icon => 'add', :'data-update' => 'new_variant', :class => 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), { :class => 'btn-default', :icon => 'filter' } %>
   <% end %>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_zone), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_zone_link' %>
-<% end %>
+<% end if can? :create, Spree::Zone %>
 
 <%= paginate @zones %>
 
@@ -27,8 +27,8 @@
           <td><%= zone.description %></td>
           <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td class="actions actions-2 text-right">
-            <%=link_to_edit zone, :no_text => true %>
-            <%=link_to_delete zone, :no_text => true %>
+            <%= link_to_edit(zone, :no_text => true) if can? :edit, zone %>
+            <%= link_to_delete(zone, :no_text => true) if can? :delete, zone %>
           </td>
         </tr>
       <% end %>
@@ -36,8 +36,8 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::Zone.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Zone)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Zone %>!
   </div>
 <% end %>
 

data/config/routes.rb

@@ -164,6 +164,7 @@ Spree::Core::Engine.add_routes do
 
     resources :trackers
     resources :payment_methods
+    resources :roles
 
     resources :users do
       member do