spree_backend 3.0.0.rc1 → 3.0.0.rc3

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

@@ -30,11 +30,11 @@
 
     <div class="col-md-4" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
-      <%= f.field_container :price, class: ['form-group'] do %>
-        <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
-        <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control' %>
-        <%= f.error_message_on :price %>
-      <% end %>
+        <%= f.field_container :price, class: ['form-group'] do %>
+          <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
+          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, Spree::Price) %>
+          <%= f.error_message_on :price %>
+        <% end %>
       </div>
 
       <div data-hook="admin_product_form_cost_price" class="alpha two columns">
@@ -78,7 +78,7 @@
           </div>
           <div class="info-actions">
             <% if can?(:admin, Spree::Variant) %>
-              <%= link_to_with_icon 'variants', 'Manage Variants', admin_product_variants_url(@product), class: "btn btn-default" %>
+              <%= link_to_with_icon 'variants', 'Manage Variants', spree.admin_product_variants_url(@product), class: "btn btn-default" %>
             <% end %>
           </div>
         </div>
@@ -109,9 +109,9 @@
             <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="form-group">
               <%= f.label :width, Spree.t(:width) %>
               <%= f.text_field :width, size: 4, class: 'form-control' %>
-            </div>  
+            </div>
           </div>
-          
+
           <div class="col-md-6">
             <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="form-group">
               <%= f.label :depth, Spree.t(:depth) %>
@@ -124,7 +124,7 @@
       <div data-hook="admin_product_form_shipping_categories">
         <%= f.field_container :shipping_categories, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::ShippingCategory) }) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>
       </div>
@@ -132,7 +132,7 @@
       <div data-hook="admin_product_form_tax_category">
         <%= f.field_container :tax_category, class: ['form-group'] do %>
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', disabled: (cannot? :edit, Spree::TaxCategory) }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>
@@ -143,14 +143,38 @@
   <div data-hook="admin_product_form_taxons">
     <%= f.field_container :taxons, class: ['form-group'] do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
-      <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
+
+      <% if can? :modify, Spree::Classification %>
+        <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
+      <% elsif @product.taxons.any? %>
+        <ul class="text_list">
+          <% @product.taxons.each do |taxon| %>
+            <li><%= taxon.name %></li>
+          <% end %>
+        </ul>
+      <% else %>
+        <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+      <% end %>
+
     <% end %>
   </div>
 
   <div data-hook="admin_product_form_option_types">
     <%= f.field_container :option_types, class: ['form-group'] do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
-      <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
+
+      <% if can? :modify, Spree::OptionType %>
+        <%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
+      <% elsif @product.option_types.any? %>
+        <ul class="text_list">
+          <% @product.option_types.each do |type| %>
+            <li><%= type.presentation %> (<%= type.name %>)</li>
+          <% end %>
+        </ul>
+      <% else %>
+        <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :option_types) %></div>
+      <% end %>
+
     <% end %>
   </div>
 

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

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

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

@@ -68,7 +68,7 @@
 <script type="text/javascript">
 //<![CDATA[
   (function($){
-    var base_url = "<%= admin_prototypes_url %>";
+    var base_url = "<%= spree.admin_prototypes_url %>";
     var prototype_select = $('#product_prototype_id');
     prototype_select.change(function() {
       var id = prototype_select.val();

data/app/views/spree/admin/products/stock.html.erb

@@ -1,9 +1,11 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Stock Management' } %>
 <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @product } %>
 
-<div id="add_stock_form" class="panel panel-default">
-  <%= render 'add_stock_form' %>
-</div>
+<% if can? :create, Spree::StockMovement %>
+  <div id="add_stock_form" class="panel panel-default">
+    <%= render 'add_stock_form' %>
+  </div>
+<% end %>
 
 <div class="panel panel-default">
   <table class="table table-bordered" id="listing_product_stock">
@@ -24,7 +26,7 @@
             </td>
             <td>
               <%= variant.sku_and_options_text %>
-              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :post, class: 'toggle_variant_track_inventory' do %>
                 <div class="checkbox">
                   <%= label_tag :track_inventory do %>
                     <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
@@ -35,7 +37,7 @@
                 <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
                     class: 'variant_track_inventory',
                     id: "variant_track_inventory_#{variant.id}" %>
-              <% end %>
+              <% end if can?(:update, @product) && can?(:update, variant) %>
             </td>
 
             <td colspan="3" class="stock_location_info">
@@ -58,10 +60,10 @@
                                 item.backorderable?,
                                 class: 'stock_item_backorderable',
                                 id: "stock_item_backorderable_#{item.stock_location.id}" %>
-                        <% end %>
+                        <% end if can? :update, item %>
                       </td>
                       <td class="actions actions-1 text-center">
-                        <%= link_to_with_icon 'delete', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true  %>
+                        <%= link_to_with_icon('delete', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true) if can? :destroy, item %>
                       </td>
                     </tr>
                   <% end %>
@@ -73,4 +75,4 @@
       <% end %>
     </tbody>
   </table>
-</div>
+</div>

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

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

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

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

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

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

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

@@ -25,9 +25,4 @@
       <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
-
-  <%= f.field_container :option_type_ids, class: ['form-group'] do %>
-    <%= f.label :option_type_ids, Spree.t(:option_types) %>
-    <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { multiple: true, class: "select2" } %>
-  <% end %>
 </div>

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

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

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

@@ -1,5 +1,6 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree::RefundReason.model_name.human(count: :many),
+  page_title: plural_resource_name(Spree::RefundReason),
   new_button_text: Spree.t(:new_refund_reason),
-  resource_name: Spree::RefundReason.model_name.human(count: :many)
+  resource_name: plural_resource_name(Spree::RefundReason),
+  resource: Spree::RefundReason
 } %>

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

@@ -21,7 +21,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.save'), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -29,7 +29,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:refund), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree::ReimbursementType.model_name.human(count: :many) %>
+  <%= plural_resource_name(Spree::ReimbursementType) %>
 <% end %>
 
 <% if @reimbursement_types.any? %>
@@ -25,7 +25,6 @@
   </table>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::ReimbursementType.model_name.human(count: :many)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReimbursementType)) %>
   </div>
 <% end %>

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

@@ -1,5 +1,6 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree::ReturnAuthorizationReason.model_name.human(count: :many),
+  page_title: plural_resource_name(Spree::ReturnAuthorizationReason),
   new_button_text: Spree.t(:new_rma_reason),
-  resource_name: Spree::ReturnAuthorizationReason.model_name.human(count: :many)
+  resource_name: plural_resource_name(Spree::ReturnAuthorizationReason),
+  resource: Spree::RefundReason
 } %>

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

@@ -24,7 +24,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t('actions.update'), 'repeat' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_actions do %>
-  <% if @order.shipments.any? &:shipped? %>
+  <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::ReturnAuthorization) %>
     <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :class => "btn-success", :icon => 'add' %>
   <% end %>
 <% end %>
@@ -29,8 +29,8 @@
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
           <td class="actions actions-2">
-            <%= link_to_edit return_authorization, :no_text => true, :class => 'edit' %>
-            <% unless return_authorization.customer_returned_items? %>
+            <%= link_to_edit(return_authorization, :no_text => true, :class => 'edit') if can?(:edit, return_authorization) %>
+            <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
               <%= link_to_delete return_authorization, :no_text => true %>
             <% end %>
           </td>
@@ -40,7 +40,7 @@
   </table>
 <% elsif @order.shipments.any?(&:shipped?) %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: Spree::ReturnAuthorization.model_name.human(count: :many)) %>
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>
   </div>
 <% else %>
   <div data-hook="rma_cannont_create" class="alert alert-info no-objects-found">

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

@@ -12,7 +12,7 @@
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:create), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_return_authorizations_url(@order), :icon => 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

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

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

@@ -0,0 +1,10 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Role.model_name.human) %>
+<% end %>
+
+<%= form_for [:admin, @role] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:roles) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_role_link' if can? :create, Spree::Role %>
+<% end if can? :create, Spree::Role %>
+
+<% if @roles.any? %>
+  <table class="table">
+    <thead>
+      <tr data-hook="admin_roles_index_headers">
+        <th><%= Spree.t(:role_id) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @roles.each do |role|%>
+        <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
+          <td><%= role.name %></td>
+          <td class="actions text-right">
+            <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+            <%= link_to_delete(role, no_text: true) if can? :destroy, role %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Role)) %>,
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Role %>!
+  </div>
+<% end %>

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

@@ -0,0 +1,10 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:new_role) %>
+<% end %>
+
+<%= form_for [:admin, @role] do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,38 @@
+<div class="address vcard">
+  <div class="fn"><%= address.full_name %></div>
+  <% unless address.company.blank? %>
+    <div class="org">
+      <%= address.company %>
+    </div>
+  <% end %>
+  <div class="adr">
+    <div class="street-address">
+      <div class="street-address-line">
+        <%= address.address1 %>
+      </div>
+      <% unless address.address2.blank? %>
+        <div class="street-address-line">
+          <%= address.address2 %>
+        </div>
+      <% end %>
+    </div>
+    <div class="local">
+      <span class="locality"><%= address.city %></span>
+      <span class="region"><%= address.state_text %></span>
+      <span class="postal-code"><%= address.zipcode %></span>
+      <div class="country-name"><%= address.country.try(:name) %></div>
+    </div>
+  </div>
+  <% unless address.phone.blank? %>
+    <div class="tel">
+      <span class="type"><%= Spree.t(:phone) %></span>
+      <%= address.phone %>
+    </div>
+  <% end %>
+  <% unless address.alternative_phone.blank? %>
+    <div class="alternative-phone tel">
+      <span class="type"><%= Spree.t(:alternative_phone) %></span>
+      <%= address.alternative_phone %>
+    </div>
+  <% end %>
+</div>

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

@@ -62,9 +62,9 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     $(document).ready(function(){
       $('span#<%= s_or_b %>country .select2').on('change', function() { update_state('<%= s_or_b %>'); });
     });
-  <% end -%>
+  <% end %>
 <% end %>

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

@@ -18,8 +18,8 @@
 <%= javascript_include_tag 'spree/backend/all' %>
 <%= render "spree/admin/shared/translations" %>
 
-<%= javascript_tag do -%>
+<%= javascript_tag do %>
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
-<% end -%>
+<% end %>
 
 <%= yield :head %>

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

@@ -13,11 +13,11 @@
 </div>
 
 <% content_for :head do %>
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $("#js-per-page-select").change(function() {
         $("#js-per-page-form").submit();
       });
     });
-  <% end -%>
+  <% end %>
 <% end %>

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

@@ -13,7 +13,7 @@
 
     <% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
       <li<%== ' class="active"' if current == 'Customer Details' %> data-hook='admin_order_tabs_customer_details'>
-        <%= link_to_with_icon 'user', Spree.t(:customer), admin_order_customer_url(@order) %>
+        <%= link_to_with_icon 'user', Spree.t(:customer), spree.admin_order_customer_url(@order) %>
       </li>
     <% end %>
 
@@ -25,20 +25,20 @@
 
     <% if can? :index, Spree::Adjustment %>
       <li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
-        <%= link_to_with_icon 'wrench', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
+        <%= link_to_with_icon 'wrench', Spree.t(:adjustments), spree.admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:index, Spree::Payment) %>
       <li<%== ' class="active"' if current == 'Payments' %> data-hook='admin_order_tabs_payments'>
-        <%= link_to_with_icon 'credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
+        <%= link_to_with_icon 'credit-card', Spree.t(:payments), spree.admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li<%== ' class="active"' if current == 'Returns' %> data-hook='admin_order_tabs_return_authorizations'>
-          <%= link_to_with_icon 'transfer', Spree.t(:returns), admin_order_return_authorizations_url(@order) %>
+          <%= link_to_with_icon 'transfer', Spree.t(:returns), spree.admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>
@@ -46,14 +46,14 @@
     <% if can? :index, Spree::CustomerReturn %>
       <% if @order.completed? %>
         <li<%== ' class="active"' if current == 'Customer Returns' %>>
-          <%= link_to_with_icon 'transfer', Spree.t(:customer_returns), admin_order_customer_returns_url(@order) %>
+          <%= link_to_with_icon 'transfer', Spree.t(:customer_returns), spree.admin_order_customer_returns_url(@order) %>
         </li>
       <% end %>
     <% end %>
 
     <% if can? :update, @order %>
       <li<%== ' class="active"' if current == 'State Changes' %> data-hook='admin_order_tabs_state_changes'>
-        <%= link_to_with_icon 'refresh', Spree::StateChange.human_attribute_name(:state_changes), admin_order_state_changes_url(@order) %>
+        <%= link_to_with_icon 'refresh', Spree::StateChange.human_attribute_name(:state_changes), spree.admin_order_state_changes_url(@order) %>
       </li>
     <% end %>
   </ul>

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

@@ -9,13 +9,13 @@
       <%= link_to_with_icon 'edit', Spree.t(:details), edit_admin_product_url(@product) %>
     <% end if can?(:admin, Spree::Product) %>
     <%= content_tag :li, :class => ('active' if current == 'Images') do %>
-      <%= link_to_with_icon 'picture', Spree.t(:images), admin_product_images_url(@product) %>
+      <%= link_to_with_icon 'picture', Spree.t(:images), spree.admin_product_images_url(@product) %>
     <% end if can?(:admin, Spree::Image) %>
     <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
-      <%= link_to_with_icon 'th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>
+      <%= link_to_with_icon 'th-large', Spree.t(:variants),  spree.admin_product_variants_url(@product) %>
     <% end if can?(:admin, Spree::Variant) %>
     <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
-      <%= link_to_with_icon 'list-alt', Spree.t(:properties), admin_product_product_properties_url(@product) %>
+      <%= link_to_with_icon 'list-alt', Spree.t(:properties), spree.admin_product_product_properties_url(@product) %>
     <% end if can?(:admin, Spree::ProductProperty) %>
     <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
       <%= link_to_with_icon 'home', Spree.t(:stock), stock_admin_product_url(@product) %>

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

@@ -23,7 +23,7 @@
         <td><%= truncate(refund.reason.name, length: 100) %></td>
         <% if show_actions %>
           <td class="actions actions-1">
-            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, :class => "btn btn-default btn-sm" %>
+            <%= link_to_with_icon('edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, :class => "btn btn-default btn-sm") if can?(:edit, refund) %>
           </td>
         <% end %>
       </tr>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', :class => "btn-success" } %>
-<% end %>
+<% end if can? :create, resource %>
 
 <% if @collection.any? %>
   <table class="table" id='listing_named_types' data-hook>
@@ -26,7 +26,7 @@
           </td>
           <td class="actions actions-1 text-right">
             <% if named_type.mutable? %>
-              <%= link_to_edit named_type, no_text: true %>
+              <%= link_to_edit(named_type, no_text: true) if can? :edit, named_type %>
             <% end %>
           </td>
         </tr>
@@ -36,6 +36,6 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: resource_name) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, resource %>!
   </div>
 <% end %>