spree_backend 2.2.1 → 2.2.2

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -3,7 +3,7 @@ module Spree
     module AdjustmentsHelper
       def adjustment_state(adjustment)
         state = adjustment.state.to_sym
-        icon = { closed: 'icon-lock', open: 'icon-unlock' }
+        icon = { closed: 'lock', open: 'unlock' }
         content_tag(:span, '', class: icon[state])
       end
 

data/app/helpers/spree/admin/base_helper.rb

@@ -62,7 +62,7 @@ module Spree
       def remove_nested(fields)
         out = ''
         out << fields.hidden_field(:_destroy) unless fields.object.new_record?
-        out << (link_to icon('icon-remove'), "#", :class => 'remove')
+        out << (link_to icon('remove'), "#", :class => 'remove')
         out.html_safe
       end
 
@@ -143,7 +143,7 @@ module Spree
       def link_to_add_fields(name, target, options = {})
         name = '' if options[:no_text]
         css_classes = options[:class] ? options[:class] + " spree_add_fields" : "spree_add_fields"
-        link_to_with_icon('icon-plus', name, 'javascript:', :data => { :target => target }, :class => css_classes)
+        link_to_with_icon('plus', name, 'javascript:', :data => { :target => target }, :class => css_classes)
       end
 
       # renders hidden field and link to remove record using nested_attributes
@@ -152,7 +152,7 @@ module Spree
         options[:class] = '' unless options[:class]
         options[:class] += 'no-text with-tip' if options[:no_text]
         url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('icon-trash', name, url, :class => "spree_remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => Spree.t(:remove)) + f.hidden_field(:_destroy)
+        link_to_with_icon('trash', name, url, :class => "spree_remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => Spree.t(:remove)) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

data/app/helpers/spree/admin/navigation_helper.rb

@@ -62,23 +62,23 @@ module Spree
 
       def link_to_clone(resource, options={})
         options[:data] = {:action => 'clone'}
-        link_to_with_icon('icon-copy', Spree.t(:clone), clone_object_url(resource), options)
+        link_to_with_icon('copy', Spree.t(:clone), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
         options[:data] = {:action => 'new'}
-        link_to_with_icon('icon-plus', Spree.t(:new), edit_object_url(resource))
+        link_to_with_icon('plus', Spree.t(:new), edit_object_url(resource))
       end
 
       def link_to_edit(resource, options={})
         url = options[:url] || edit_object_url(resource)
         options[:data] = {:action => 'edit'}
-        link_to_with_icon('icon-edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options={})
         options[:data] = {:action => 'edit'}
-        link_to_with_icon('icon-edit', Spree.t(:edit), url, options)
+        link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
       def link_to_delete(resource, options={})
@@ -86,11 +86,11 @@ module Spree
         name = options[:name] || Spree.t(:delete)
         options[:class] = "delete-resource"
         options[:data] = { :confirm => Spree.t(:are_you_sure), :action => 'remove' }
-        link_to_with_icon 'icon-trash', name, url, options
+        link_to_with_icon 'trash', name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
-        options[:class] = (options[:class].to_s + " icon_link with-tip #{icon_name}").strip
+        options[:class] = (options[:class].to_s + " fa fa-#{icon_name} icon_link with-tip").strip
         options[:class] += ' no-text' if options[:no_text]
         options[:title] = text if options[:no_text]
         text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
@@ -103,7 +103,7 @@ module Spree
       end
 
       def button(text, icon_name = nil, button_type = 'submit', options={})
-        button_tag(text, options.merge(:type => button_type, :class => "#{icon_name} button"))
+        button_tag(text, options.merge(:type => button_type, :class => "fa fa-#{icon_name} button"))
       end
 
       def button_link_to(text, url, html_options = {})
@@ -124,7 +124,7 @@ module Spree
           html_options[:class] = 'button'
 
           if html_options[:icon]
-            html_options[:class] += " #{html_options[:icon]}"
+            html_options[:class] += " fa fa-#{html_options[:icon]}"
           end
           link_to(text_for_button_link(text, html_options), url, html_options)
         end

data/app/helpers/spree/admin/orders_helper.rb

@@ -8,7 +8,7 @@ module Spree
           if @order.send("can_#{event}?")
             links << button_link_to(Spree.t(event), [event, :admin, @order],
                                     :method => :put,
-                                    :icon => "icon-#{event}",
+                                    :icon => "#{event}",
                                     :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })
           end
         end

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

@@ -1,11 +1,11 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
@@ -14,9 +14,9 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'icon-arrow-right' %>
+      <%= button Spree.t(:continue), 'arrow-right' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
+      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,12 +1,12 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
 <% content_for :page_title do %>
-   <i class="icon-arrow-right"></i> <%= Spree.t(:adjustments) %>
+   <i class="fa fa-arrow-right"></i> <%= Spree.t(:adjustments) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus' %></li>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'plus' %></li>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'adjustments_table' %>
@@ -14,11 +14,11 @@
 <% if @order.can_add_coupon? %>
   <div data-hook="adjustments_new_coupon_code">
     <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %>
-    <%= button Spree.t(:add_coupon_code), 'icon-plus', 'submit', :id => "add_coupon_code" %>
+    <%= button Spree.t(:add_coupon_code), 'plus', 'submit', :id => "add_coupon_code" %>
   </div>
 <% end %>
 <%= javascript_tag do -%>
   var order_number = '<%= @order.number %>';
 <% end -%>
 
-<%= button_link_to Spree.t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'icon-arrow-right' %>
+<%= button_link_to Spree.t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'arrow-right' %>

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

@@ -1,11 +1,11 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= Spree.t(:new_adjustment) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_adjustment) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
@@ -15,9 +15,9 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'icon-arrow-right' %>
+      <%= button Spree.t(:continue), 'arrow-right' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'icon-remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_countries_list), spree.admin_countries_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_countries_list), spree.admin_countries_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

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

@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <li>
-      <%= button_link_to Spree.t(:new_country), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_country' } %>
+      <%= button_link_to Spree.t(:new_country), new_object_url, { :icon => 'plus', :id => 'admin_new_country' } %>
     </li>
   </ul>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_countries_list), admin_countries_path, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_countries_list), admin_countries_path, :class => 'button' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @countries } %>

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

@@ -75,9 +75,9 @@
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update'), 'icon-refresh' %>
+        <%= button Spree.t('actions.update'), 'refresh' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
+        <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), edit_admin_general_settings_url, :class => 'button' %>
       </div>
 
     </fieldset>

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

@@ -5,7 +5,7 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @image } %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_images_list), admin_product_images_url(@product), :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
@@ -20,9 +20,9 @@
     </div>
     <div class="clear"></div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'icon-refresh' %>
+      <%= button Spree.t('actions.update'), 'refresh' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button icon-remove' %>
+      <%= link_to Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button remove' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,7 @@
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon('icon-plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>
+  <li><%= link_to_with_icon('plus', Spree.t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link', :class => 'button') %></li>
 <% end %>
 
 <div id="images" data-hook></div>
@@ -48,7 +48,7 @@
           <% end %>
           <td><%= image.alt %></td>
           <td class="actions">
-            <%= link_to_with_icon 'icon-edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
+            <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
             <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
           </td>
         </tr>

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

@@ -5,9 +5,9 @@
       <%= render :partial => 'form', :locals => { :f => f } %>
     
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button Spree.t('actions.update'), 'icon-refresh' %>
+        <%= button Spree.t('actions.update'), 'refresh' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
+        <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_product_images_url(@product), :id => 'cancel_link', :class => 'button' %>
       </div>
   </fieldset>
 <% end %>

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

@@ -1,15 +1,15 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i>
+  <i class="fa fa-arrow-right"></i>
   <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
-  <i class="icon-arrow-right"></i>
+  <i class="fa fa-arrow-right"></i>
   <%= Spree.t(:log_entries) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'icon-archive' %></li>
-  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
+  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'arrow-left' %></li>
 <% end %>
 
 <table class='index' id='listing_log_entries'>
@@ -17,7 +17,7 @@
       <thead>
         <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
           <td colspan='2'>
-            <h4><i class='icon icon-<%= entry.parsed_details.success? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
+            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
           </td>
         </tr>
       </thead>

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

@@ -7,11 +7,11 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button icon-plus' %>
+      <%= link_to_add_fields Spree.t(:add_option_value), "tbody#option_values", :class => 'button fa fa-plus' %>
     </span>      
   </li>
   <li>
-    <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_option_types_list), spree.admin_option_types_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :icon => 'icon-plus', :id => 'new_option_type_link' } %>
+    <%= button_link_to Spree.t(:new_option_type), new_admin_option_type_url, { :remote => true, :icon => 'plus', :id => 'new_option_type_link' } %>
   </li>
 <% end %>
 

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

@@ -33,10 +33,10 @@
           <td class="line-item-total align-center"><%= line_item_shipment_price(item, item.quantity) %></td>
           <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
             <% if can? :update, item %>
-              <%= link_to '', '#', :class => 'save-line-item icon_link icon-ok no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'cancel-line-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-              <%= link_to '', '#', :class => 'edit-line-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-              <%= link_to '', '#', :class => 'delete-line-item icon-trash no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete') %>
+              <%= link_to '', '#', :class => 'save-line-item fa fa-check no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'cancel-line-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'edit-line-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+              <%= link_to '', '#', :class => 'delete-line-item fa fa-trash no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete') %>
             <% end %>
           </td>
         </tr>

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

@@ -1,4 +1,4 @@
-<div id="<%= "shipment_#{shipment.id}" %>">
+<div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form">
   <%= render :partial => "spree/admin/variants/split", :formats => :js %>
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location" data-hook="stock-location">
@@ -9,7 +9,7 @@
       <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
       <% if shipment.ready? and can? :update, shipment %>
         -
-        <%= link_to Spree.t(:ship), '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
+        <%= link_to Spree.t(:ship), '#', :class => 'ship button fa fa-arrow-right', :data => {'shipment-number' => shipment.number} %>
       <% end %>
     </legend>
   </fieldset>
@@ -33,7 +33,7 @@
     </thead>
 
     <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
-      <%= render 'spree/admin/orders/shipment_manifest', order: order, shipment: shipment %>
+      <%= render 'spree/admin/orders/shipment_manifest', shipment: shipment %>
 
       <% unless shipment.shipped? %>
         <tr class="edit-method hidden total">
@@ -47,18 +47,19 @@
           </td>
           <td class="actions">
             <% if can? :update, shipment %>
-              <%= link_to '', '#', :class => 'save-method icon_link icon-ok no-text with-tip',
+              <%= link_to '', '#', :class => 'save-method fa fa-check no-text with-tip',
                 :data => {'shipment-number' => shipment.number, :action => 'save'}, title: Spree.t('actions.save') %>
-              <%= link_to '', '#', :class => 'cancel-method icon_link icon-cancel no-text with-tip',
+              <%= link_to '', '#', :class => 'cancel-method fa fa-cancel no-text with-tip',
                 :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
             <% end %>
           </td>
         </tr>
+        <% end %>
 
         <tr class="show-method total">
-          <% if shipment.shipping_method %>
+          <% if rate = shipment.selected_shipping_rate %>
             <td colspan="4">
-              <strong><%= shipment.shipping_method.name %></strong>
+              <strong><%= rate.name %></strong>
             </td>
             <td class="total" align="center">
               <span><%= shipment.display_cost %></span>
@@ -68,12 +69,12 @@
           <% end %>
 
           <td class="actions">
-            <% if can? :update, shipment %>
-              <%= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+            <% if( (can? :update, shipment) and !shipment.shipped?) %>
+              <%= link_to '', '#', :class => 'edit-method fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
             <% end %>
           </td>
         </tr>
-      <% end %>
+
 
       <tr class="edit-tracking hidden total">
         <td colspan="5">
@@ -82,16 +83,16 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
-            <%= link_to '', '#', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
+            <%= link_to '', '#', :class => 'save-tracking fa fa-check no-text with-tip', :data => {'shipment-number' => shipment.number, :action => 'save'}, :title => Spree.t('actions.save') %>
+            <%= link_to '', '#', :class => 'cancel-tracking fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel') %>
           <% end %>
         </td>
       </tr>
 
-      <% if @order.special_instructions.present? %>
+      <% if order.special_instructions.present? %>
         <tr class='special_instructions'>
           <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= @order.special_instructions %>
+            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
           </td>
         </tr>
       <% end %>
@@ -106,7 +107,7 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+            <%= link_to '', '#', :class => 'edit-tracking fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
           <% end %>
         </td>
       </tr>