spree_core 0.60.6 → 0.70.0

data/app/models/product_group.rb

@@ -90,14 +90,10 @@ class ProductGroup < ActiveRecord::Base
   end
 
   def add_scope(scope_name, arguments=[])
-    if scope_name.to_s !~ /eval|send|system|[^a-z0-9_!?]/
-      self.product_scopes << ProductScope.new({
-          :name => scope_name.to_s,
-          :arguments => [*arguments]
-        })
-    else
-      raise ArgumentError.new("'#{scope_name}` can't be used as scope")
-    end
+    self.product_scopes << ProductScope.new({
+        :name => scope_name.to_s,
+        :arguments => [*arguments]
+      })
     self
   end
 

data/app/models/product_scope.rb

@@ -31,7 +31,7 @@ class ProductScope < ActiveRecord::Base
                       Product.send(self.name.intern, *array)
                   end
     else
-      relation2 = Product.metasearch({self.name.intern => array}).relation
+      relation2 = Product.search({self.name.intern => array}).relation
     end
     unless another_scope.class == ActiveRecord::Relation
       another_scope = another_scope.send(:relation)

data/app/models/shipment.rb

@@ -4,11 +4,10 @@ class Shipment < ActiveRecord::Base
   belongs_to :shipping_method
   belongs_to :address
   has_many :state_events, :as => :stateful
-  has_many :inventory_units
+  has_many :inventory_units, :dependent => :nullify
   has_one :adjustment, :as => :source
 
   before_create :generate_shipment_number
-  after_destroy :release_inventory_units
   after_save :ensure_correct_adjustment, :update_order
 
   attr_accessor :special_instructions
@@ -113,10 +112,6 @@ class Shipment < ActiveRecord::Base
     end
   end
 
-  def release_inventory_units
-    inventory_units.each {|unit| unit.update_attribute(:shipment_id, nil)}
-  end
-
   # Determines the appropriate +state+ according to the following logic:
   #
   # pending    unless +order.payment_state+ is +paid+

data/app/models/tax_category.rb

@@ -12,4 +12,10 @@ class TaxCategory < ActiveRecord::Base
       tax_category.update_attribute(:is_default, false)
     end
   end
+
+  def effective_amount(address=nil)
+    address ||= Address.new(:country_id => Spree::Config[:default_country_id])
+
+    self.tax_rates.detect{|rate| rate.zone.include? address }.try(:amount) 
+  end
 end

data/app/models/tax_rate.rb

@@ -13,4 +13,14 @@ class TaxRate < ActiveRecord::Base
   def self.match(address)
     TaxRate.all.select { |rate| rate.zone.include? address }
   end
+
+  # For Vat the default rate is the rate that is configured for the default category
+  # It is needed for every price calculation (as all customer facing prices include vat )
+  # The function returns the actual amount, which may be 0 in case of wrong setup, but is never nil
+  def self.default
+    category = TaxCategory.includes(:tax_rates).where(:is_default => true).first
+    return 0 unless category
+
+    category.effective_amount || 0
+  end
 end

data/app/models/taxon.rb

@@ -9,9 +9,9 @@ class Taxon < ActiveRecord::Base
   has_attached_file :icon,
                 :styles => { :mini => '32x32>', :normal => '128x128>' },
                 :default_style => :mini,
-                :url => "/assets/taxons/:id/:style/:basename.:extension",
-                :path => ":rails_root/public/assets/taxons/:id/:style/:basename.:extension",
-                :default_url => "/images/default_taxon.png"
+                :url => "/spree/taxons/:id/:style/:basename.:extension",
+                :path => ":rails_root/public/spree/taxons/:id/:style/:basename.:extension",
+                :default_url => "/assets/default_taxon.png"
 
 
   include ::ProductFilters  # for detailed defs of filters

data/app/models/taxonomy.rb

@@ -3,7 +3,7 @@ class Taxonomy < ActiveRecord::Base
   validates :name, :presence => true
 
   has_many :taxons, :dependent => :destroy
-  has_one :root, :class_name => 'Taxon', :conditions => "parent_id is null"
+  has_one :root, :class_name => 'Taxon', :conditions => {:parent_id => nil}
 
   after_save :set_name
 

data/app/models/zone.rb

@@ -1,7 +1,7 @@
 class Zone < ActiveRecord::Base
-  has_many :zone_members
+  has_many :zone_members, :dependent => :destroy
   has_many :tax_rates, :dependent => :destroy
-  has_many :shipping_methods
+  has_many :shipping_methods, :dependent => :nullify
 
   validates :name, :presence => true, :uniqueness => true
   after_save :remove_defunct_members
@@ -41,9 +41,9 @@ class Zone < ActiveRecord::Base
       when "Zone"
         zone_member.zoneable.include?(address)
       when "Country"
-        zone_member.zoneable == address.country
+        zone_member.zoneable_id == address.country_id
       when "State"
-        zone_member.zoneable == address.state
+        zone_member.zoneable_id == address.state_id
       else
         false
       end

data/app/views/admin/adjustments/_adjustments_table.html.erb

@@ -1,18 +1,18 @@
-<table class="index">
-  <tr>
+<table class="index" data-hook="adjustments">
+  <tr data-hook="adjustmment_head">
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t("description") %></th>
-    <th><%= t("amount") %></th>
+    <th><%= t(:description) %></th>
+    <th><%= t(:amount) %></th>
     <th></th>
   </tr>
   <% @order.adjustments.each do |adjustment|
          @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
          @delete_url = admin_order_adjustment_path(@order, adjustment)
   %>
-    <tr id="<%= dom_id(adjustment) %>">
+    <tr id="<%= dom_id(adjustment) %>" data-hook="adjustment_row">
       <td><%= adjustment.created_at.to_s(:date_time24) %></td>
       <td><%= adjustment.label %></td>
-      <td><%= number_to_currency(adjustment.amount) %></td>
+      <td><%= number_to_currency adjustment.amount %></td>
       <td class='actions'>
         <%= link_to_edit adjustment, :class => 'edit' %>
         &nbsp;

data/app/views/admin/adjustments/_form.html.erb

@@ -1,12 +1,12 @@
 <%= f.field_container :amount do %>
-  <%= f.label :amount, t("amount")%> <span class="required">*</span><br />
-  <%= text_field :adjustment, :amount, {:style => "width:80px;"} %>
+  <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
+  <%= text_field :adjustment, :amount, {:style => 'width:80px;'} %>
   <%= f.error_message_on :amount %>
 <% end %>
 
 <%= f.field_container :label do %>
-  <%= f.label :label, t("description")%> <span class="required">*</span><br />
-  <%= text_field :adjustment, :label, {:style => "width:180px;"} %>
+  <%= f.label :label, t(:description) %> <span class="required">*</span><br />
+  <%= text_field :adjustment, :label, {:style => 'width:180px;'} %>
   <%= f.error_message_on :label %>
 <% end %>
 

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

@@ -1,13 +1,13 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 
-<h2><%= t("adjustment")%></h2>
+<h2><%= t(:adjustment) %></h2>
 
-<%= render "shared/error_messages", :target => @adjustment %>
-<%= form_for(@adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put}) do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
+<%= render 'shared/error_messages', :target => @adjustment %>
+<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :html => { :method => :put} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
 
-  <p class="form-buttons">
-    <%= button t('continue') %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_adjustments_url(@order) %>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:continue) %>
+    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_adjustments_url(@order) %>
   </p>
 <% end %>

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

@@ -1,4 +1,4 @@
 <%= render 'admin/shared/new_adjustment_button' %>
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 <%= render 'adjustments_table' %>
-<%= button_link_to t('continue'), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>
+<%= button_link_to t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>

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

@@ -1,14 +1,14 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Adjustments'} %>
 
-<h2><%= t("new_adjustment")%></h2>
+<h2><%= t(:new_adjustment) %></h2>
 
-<%= render "shared/error_messages", :target => @adjustment %>
+<%= render 'shared/error_messages', :target => @adjustment %>
 
 <%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
 
-  <p class="form-buttons">
-    <%= button t('continue') %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_order_adjustments_url(@order) %>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:continue) %>
+    <%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_adjustments_url(@order) %>
   </p>
 <% end %>

data/app/views/admin/configurations/index.html.erb

@@ -1,66 +1,64 @@
-<h1><%= t("configurations") %></h1>
+<h1><%= t(:configurations) %></h1>
 
-<table class="index">
+<table class="index" data-hook="configuration">
   <thead>
     <tr>
-      <th><%= t("system") %></th>
-      <th><%= t("description") %></th>
+      <th><%= t(:system) %></th>
+      <th><%= t(:description) %></th>
     </tr>
   </thead>
-  <tbody>
-    <%= hook :admin_configurations_menu do %>
-      <tr>
-        <td><%= link_to t("general_settings"), admin_general_settings_path %></td>
-        <td><%= t("general_settings_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("mail_methods"), admin_mail_methods_path %></td>
-        <td><%= t("email_server_settings_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("tax_categories"), admin_tax_categories_path %></td>
-        <td><%= t("tax_categories_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("zones"), admin_zones_path %></td>
-        <td><%= t("zone_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></td>
-        <td><%= t("state_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("payment_methods"), admin_payment_methods_path %></td>
-        <td><%= t("payment_methods_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("taxonomies"), admin_taxonomies_path %></td>
-        <td><%= t("taxonomies_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("shipping_methods"), admin_shipping_methods_path %></td>
-        <td><%= t("shipping_methods_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("shipping_categories"), admin_shipping_categories_path %></td>
-        <td><%= t("shipping_categories_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("inventory_settings"), admin_inventory_settings_path %></td>
-        <td><%= t("inventory_setting_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("tax_rates"), admin_tax_rates_path %></td>
-        <td><%= t("tax_rates_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("tax_settings"), admin_tax_settings_path %></td>
-        <td><%= t("tax_settings_description") %></td>
-      </tr>
-      <tr>
-        <td><%= link_to t("analytics_trackers"), admin_trackers_path %></td>
-        <td><%= t("google_analytics_setting_description") %></td>
-      </tr>
-    <% end %>
+  <tbody data-hook="admin_configurations_menu">
+    <tr>
+      <td><%= link_to t(:general_settings), admin_general_settings_path %></td>
+      <td><%= t(:general_settings_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:mail_methods), admin_mail_methods_path %></td>
+      <td><%= t(:email_server_settings_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:tax_categories), admin_tax_categories_path %></td>
+      <td><%= t(:tax_categories_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:zones), admin_zones_path %></td>
+      <td><%= t(:zone_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %></td>
+      <td><%= t(:state_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:payment_methods), admin_payment_methods_path %></td>
+      <td><%= t(:payment_methods_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:taxonomies), admin_taxonomies_path %></td>
+      <td><%= t(:taxonomies_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:shipping_methods), admin_shipping_methods_path %></td>
+      <td><%= t(:shipping_methods_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:shipping_categories), admin_shipping_categories_path %></td>
+      <td><%= t(:shipping_categories_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:inventory_settings), admin_inventory_settings_path %></td>
+      <td><%= t(:inventory_setting_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:tax_rates), admin_tax_rates_path %></td>
+      <td><%= t(:tax_rates_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:tax_settings), admin_tax_settings_path %></td>
+      <td><%= t(:tax_settings_description) %></td>
+    </tr>
+    <tr>
+      <td><%= link_to t(:analytics_trackers), admin_trackers_path %></td>
+      <td><%= t(:google_analytics_setting_description) %></td>
+    </tr>
   </tbody>
 </table>

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

@@ -1,46 +1,21 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t('edit_general_settings') %></h1>
+<h1><%= t(:edit_general_settings) %></h1>
 
-<%= form_tag(admin_general_settings_path, :method => :put) do %>
-  <p>
-    <label><%= t("site_name") %></label>
-    <%= text_field_tag('preferences[site_name]', Spree::Config[:site_name]) %>
-  </p>
-  <p>
-    <label><%= t("default_seo_title") %></label>
-    <%= text_field_tag('preferences[default_seo_title]', Spree::Config[:default_seo_title]) %>
-  </p>
-  <p>
-    <label><%= t('site_url') %></label>
-    <%= text_field_tag('preferences[site_url]', Spree::Config[:site_url])%>
-  </p>
-  <p>
-    <label>
-      <input name="preferences[allow_ssl_in_production]" type="hidden" value="0" />
-      <%= check_box_tag('preferences[allow_ssl_in_production]', "1", Spree::Config[:allow_ssl_in_production]) %>
-      <%= t('allow_ssl_to_be_used_when_in_production_mode') %>
-    </label>
-  </p>
-
-  <p>
-    <label>
-      <input name="preferences[allow_ssl_in_development_and_test]" type="hidden" value="0" />
-      <%= check_box_tag('preferences[allow_ssl_in_development_and_test]', "1", Spree::Config[:allow_ssl_in_development_and_test]) %>
-      <%= t('allow_ssl_to_be_used_when_in_developement_and_test_modes') %>
-    </label>
-  </p>
-
-  <p>
-    <label>
-      <input name="preferences[check_for_spree_alerts]" type="hidden" value="0" />
-      <%= check_box_tag('preferences[check_for_spree_alerts]', "1", Spree::Config[:check_for_spree_alerts]) %>
-      <%= t('spree_alert_checking') %>
-    </label>
- </p>
-
-  <p class="form-buttons">
-    <%= button t('update') %>
-    <%= t("or") %> <%= link_to t("cancel"), admin_general_settings_url %>
+<%= form_for Spree::Config.instance, :url => admin_general_settings_path do |form| %>
+  <fieldset id="preferences" data-hook>
+  <% @preferences.each do |key| 
+      type = AppConfiguration.preference_definitions[key].instance_eval{@type}.to_sym
+      field = "preferred_#{key}" %>
+     <%= form.field_container field do %>
+       <%= form.label(field, t(key) + ': ') + tag(:br) if type != :boolean %>
+       <%= preference_field(form, field, :type => type) %>
+       <%= form.label(field, t(key)) if type == :boolean %>
+     <% end %>
+  <% end %>
+  </fieldset>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %>
+    <%= t(:or) %> <%= link_to t(:cancel), admin_general_settings_url %>
   </p>
 <% end %>

data/app/views/admin/general_settings/show.html.erb

@@ -1,36 +1,25 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("general_settings") %></h1>
+<h1><%= t(:general_settings) %></h1>
 
-<table>
+<table data-hook="preferences">
+  <% @preferences.each do |key| %>
+    <tr>
+      <th scope="row"><%= t(key) %>:</th>
+      <td><%= Spree::Config[key] %></td>
+    </tr>
+  <% end %>
   <tr>
-    <th scope="row"><%= t("site_name") %>:</th>
-    <td><%=  Spree::Config[:site_name] %></td>
+    <td colspan="2">
+      <%= Spree::Config[:allow_ssl_in_production] ? t(:ssl_will_be_used_in_production_mode) : t(:ssl_will_not_be_used_in_production_mode) %>
+    </td>
   </tr>
   <tr>
-    <th scope="row"><%= t("default_seo_title") %>:</th>
-    <td><%=  Spree::Config[:default_seo_title] %></td>
-  </tr>
-  <tr>
-    <th scope="row"><%= t("site_url") %>:</th>
-    <td><%=  Spree::Config[:site_url] %></td>
-  </tr>
-  <tr>
-	<td colspan="2">
-	  <%= (Spree::Config[:allow_ssl_in_production] ? t("ssl_will_be_used_in_production_mode") : t("ssl_will_not_be_used_in_production_mode")) %>
-	</td>
-  </tr>
-  <tr>
-	<td colspan="2">
-	  <%= (Spree::Config[:allow_ssl_in_development_and_test] ? t("ssl_will_be_used_in_development_and_test_modes") : t("ssl_will_not_be_used_in_development_and_test_modes")) %>
-  </td>
-  </tr>
-  <tr>
-  <td colspan="2">
-    <%= (Spree::Config[:check_for_spree_alerts] ? t("spree_alert_checking") : t("spree_alert_not_checking")) %>
+    <td colspan="2">
+      <%= Spree::Config[:allow_ssl_in_development_and_test] ? t(:ssl_will_be_used_in_development_and_test_modes) : t(:ssl_will_not_be_used_in_development_and_test_modes) %>
+    </td>
   </tr>
 </table>
 
-<p><%= link_to_with_icon 'edit', t("edit"), edit_admin_general_settings_path, :id => 'admin_general_settings_link' %></p>
-
+<p><%= link_to_with_icon 'edit', t(:edit), edit_admin_general_settings_path, :id => 'admin_general_settings_link' %></p>
 

data/app/views/admin/images/_form.html.erb

@@ -1,16 +1,16 @@
-<tr>
-  <td><%= t("filename") %>:</td>
+<tr data-hook="file">
+  <td><%= t(:filename) %>:</td>
   <td><%= f.file_field :attachment %></td>
 </tr>
 <% if @product.has_variants? %>
-  <tr>
+  <tr data-hook="variant">
     <td><%= Variant.model_name.human %>:</td>
     <td><%= f.select :viewable_id, @variants %></td>
   </tr>
 <% else %>
   <%= hidden_field_tag :product_id, @product.id %>
 <% end %>
-<tr>
-  <td><%= t("alt_text") %>:</td>
+<tr data-hook="alt_text">
+  <td><%= t(:alt_text) %>:</td>
   <td><%= f.text_area :alt %></td>
-</tr>
+</tr>

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

@@ -1,19 +1,19 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Images"} %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
-<%= render "shared/error_messages", :target => @image %>
+<%= render 'shared/error_messages', :target => @image %>
 
-<%= form_for(:image, :url => admin_product_image_url(@product), :html => { :method => :put, :multipart => true }) do |f| %>
-  <table class="basic-table">
-    <tr>
-      <td><%= t("thumbnail") %>:</td>
-      <td><%= link_to(image_tag(@image.attachment.url(:mini)), @image.attachment.url(:product)) %></td>
+<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+  <table class="basic-table" data-hook="edit_image">
+    <tr data-hook="thumbnail">
+      <td><%= t(:thumbnail) %>:</td>
+      <td><%= link_to image_tag(@image.attachment.url(:mini)), @image.attachment.url(:product) %></td>
     </tr>
-    <%= render :partial => "form", :locals => { :f => f } %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
   </table>
-  <p class="form-buttons">
-    <%= button t("update") %>
-    <%= t('or') %> <%= link_to t("cancel"), admin_product_images_url(@product), :id => "cancel_link" %>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %>
+    <%= t(:or) %> <%= link_to t(:cancel), admin_product_images_url(@product), :id => 'cancel_link' %>
   </p>
 <% end %>

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

@@ -1,29 +1,29 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Images"} %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Images'} %>
 
-<table class="index sortable">
-  <tr>
-    <th><%= t("thumbnail") %></th>
+<table class="index sortable" data-hook="images_table">
+  <tr data-hook="images_header">
+    <th><%= t(:thumbnail) %></th>
     <% if @product.has_variants? %>
       <th><%= Variant.model_name.human %></th>
     <% end %>
-    <th><%= t("alt_text") %></th>
-    <th><%= t("action") %></th>
+    <th><%= t(:alt_text) %></th>
+    <th><%= t(:action) %></th>
   </tr>
 
   <% @product.images.each do |image| %>
-    <tr id="<%= dom_id(image) %>">
+    <tr id="<%= dom_id(image) %>" data-hook="images_row">
       <td>
         <span class="handle"></span>
-        <%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %>
+        <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
       </td>
       <% if @product.has_variants? %>
-        <td><%= t('all') %></td>
+        <td><%= t(:all) %></td>
       <% end %>
       <td><%= image.alt %></td>
       <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_product_image_url(@product, image), :class => 'edit') %>
+        <%= link_to_with_icon 'edit', t(:edit), edit_admin_product_image_url(@product, image), :class => 'edit' %>
         &nbsp;
         <%= link_to_delete image, {:url => admin_product_image_url(@product, image) }%>
       </td>
@@ -32,14 +32,14 @@
 
   <% @product.variants.each do |variant| %>
     <% variant.images.each do |image| %>
-      <tr id="<%= dom_id(image) %>">
-        <td><span class="handle"></span><%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)) %></td>
+      <tr id="<%= dom_id(image) %>" data-hook="images_row">
+        <td><span class="handle"></span><%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %></td>
         <% if @product.has_variants? %>
           <td><%= variant.options_text %></td>
         <% end %>
         <td><%= image.alt %></td>
         <td class="actions">
-          <%= link_to_with_icon('edit', t("edit"), edit_admin_product_image_url(@product, image)) %>
+          <%= link_to_with_icon 'edit', t(:edit), edit_admin_product_image_url(@product, image) %>
           &nbsp;
           <%= link_to_delete image, {:url => admin_product_image_url(@product, image) }%>
         </td>
@@ -48,22 +48,8 @@
   <% end %>
 </table>
 
-<div id="images"></div>
-<br/>
-<p>
-    <%= link_to icon('add') + ' ' + t("new_image"), new_admin_product_image_url(@product), :id => "new_image_link" %>
-</p>
-
-<% content_for :head do %>
-  <script type="text/javascript">
-    jQuery(document).ready(function(){
-
-      jQuery('#new_image_link').click(function (event) {
-        event.preventDefault();
-        jQuery(this).hide();
-        jQuery.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}), success: function(r){ jQuery('#images').html(r);} });
-      });
-
-    });
-  </script>
-<% end %>
+<div id="images" data-hook></div>
+<br />
+<p data-hook="links">
+    <%= link_to icon('add') + ' ' + t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link' %>
+</p>