spree_core 0.60.6 → 0.70.0

data/app/views/admin/variants/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_variant").html('<%= escape_javascript(render :template => 'admin/variants/new.html.erb') %>');
+$("#new_var_link").hide();

data/app/views/admin/zones/_country_member.html.erb

@@ -1,5 +1,5 @@
-<li>
-  <%= f.hidden_field :zoneable_type, :value => "Country" %>
+<li data-hook="country_member">
+  <%= f.hidden_field :zoneable_type, :value => 'Country' %>
   <%= f.collection_select(:zoneable_id, @countries, :id, :name, :include_blank => true) %>
   <%= remove_nested f %>
 </li>

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

@@ -1,29 +1,29 @@
 <%= zone_form.field_container :name do %>
-  <%= zone_form.label :name, t("name") %><br />
-  <%=zone_form.text_field :name %>
+  <%= zone_form.label :name, t(:name) %><br />
+  <%= zone_form.text_field :name %>
 <% end %>
 
 <%= zone_form.field_container :description do %>
-  <%= zone_form.label :description, t("description") %><br />
-  <%=zone_form.text_field :description %>
+  <%= zone_form.label :description, t(:description) %><br />
+  <%= zone_form.text_field :description %>
 <% end %>
 
-<p>
-  <label><%= t("type") %></label><br />
+<p data-hook="type">
+  <%= label_tag nil, t(:type) %><br />
   <label class="sub">
-    <%= zone_form.radio_button("kind", "country", {:id => "country_based"}) %>
-    <%= t("country_based") %>
+    <%= zone_form.radio_button('kind', 'country', {:id => 'country_based'}) %>
+    <%= t(:country_based) %>
   </label> &nbsp;
   <label class="sub">
-    <%= zone_form.radio_button("kind", "state", {:id => "state_based"}) %>
-    <%= t("state_based") %>
+    <%= zone_form.radio_button('kind', 'state', {:id => 'state_based'}) %>
+    <%= t(:state_based) %>
   </label> &nbsp;
   <label class="sub">
-    <%= zone_form.radio_button("kind", "zone", {:id => "zone_based"}) %>
-    <%= t("zone_based") %>
+    <%= zone_form.radio_button('kind', 'zone', {:id => 'zone_based'}) %>
+    <%= t(:zone_based) %>
   </label>
 </p>
 
-<%= render "member_type", :type => "country", :zone_form => zone_form %>
-<%= render "member_type", :type => "state", :zone_form => zone_form %>
-<%= render "member_type", :type => "zone", :zone_form => zone_form %>
+<%= render 'member_type', :type => 'country', :zone_form => zone_form %>
+<%= render 'member_type', :type => 'state', :zone_form => zone_form %>
+<%= render 'member_type', :type => 'zone', :zone_form => zone_form %>

data/app/views/admin/zones/_member_type.html.erb

@@ -1,6 +1,6 @@
 <%= javascript_tag "var #{type}_member='#{generate_template(zone_form, :zone_members, {:partial => type + "_member"})}'" %>
 
-<div id="<%= type %>_members">
+<div id="<%= type %>_members" data-hook="member">
   <fieldset id="">
     <legend><%= t(type) %></legend>
     <ul id="ul-nested-<%= type %>" class="member-list">
@@ -8,7 +8,7 @@
         <%= render "#{type}_member", :f => member_form %>
       <% end %>
     </ul>
-    <p>
+    <p data-hook="buttons">
       <%= button_link_to t("add_#{type}"), "##{type}_member", {:icon => 'add', :id => "nested-#{type}"} %>
     </p>
   </fieldset>

data/app/views/admin/zones/_state_member.html.erb

@@ -1,5 +1,5 @@
-<li>
-  <%= f.hidden_field :zoneable_type, :value => "State" %>
+<li data-hook="state_member">
+  <%= f.hidden_field :zoneable_type, :value => 'State' %>
   <%= f.collection_select(:zoneable_id, @states, :id, :name, :include_blank => true) %>
-  <%= remove_nested f %>    
+  <%= remove_nested f %>
 </li>

data/app/views/admin/zones/_zone_member.html.erb

@@ -1,5 +1,5 @@
-<li>                                       
+<li data-hook="zone_member">
   <%= f.hidden_field :zoneable_type, :value => "Zone" %>
   <%= f.collection_select(:zoneable_id, @zones, :id, :name, :include_blank => true) %>
-  <%= remove_nested f %>    
+  <%= remove_nested f %>
 </li>

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

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("editing_zone") %></h1>
+<h1><%= t(:editing_zone) %></h1>
 
-<%= render "shared/error_messages", :target => @zone %>
+<%= render 'shared/error_messages', :target => @zone %>
 
-<%= form_for(@zone, :url => object_url, :html => { :method => :put }) do |zone_form| %>
-  <%= render :partial => "form", :locals => { :zone_form => zone_form } %>
-  <%= render :partial => "admin/shared/edit_resource_links" %>
+<%= form_for [:admin, @zone] do |zone_form| %>
+  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,29 +1,29 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
-      <%= button_link_to t("new_zone"), new_object_url, :icon => 'add', :id => 'admin_new_zone_link' %>
+      <%= button_link_to t(:new_zone), new_object_url, :icon => 'add', :id => 'admin_new_zone_link' %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
 
-<h1><%= t("zones") %></h1>
-<table class="index" id='listing_zones'>
+<h1><%= t(:zones) %></h1>
+<table class="index" id='listing_zones' data-hook>
   <thead>
-    <tr>
-      <th><%= sort_link @search,:name, t("name"), :title => 'zones_order_by_name_title' %></th>
+    <tr data-hook="zones_header">
+      <th><%= sort_link @search,:name, t(:name), :title => 'zones_order_by_name_title' %></th>
       <th>
-        <%= sort_link @search,:description, t("description"), {}, {:title => 'zones_order_by_description_title'} %>
+        <%= sort_link @search,:description, t(:description), {}, {:title => 'zones_order_by_description_title'} %>
       </th>
       <th></th>
     </tr>
   </thead>
   <tbody>
     <% @zones.each do |zone| %>
-      <tr id="<%= dom_id zone %>">
+      <tr id="<%= dom_id zone %>" data-hook="zones_row">
         <td><%=zone.name %></td>
         <td><%=zone.description %></td>
         <td class="actions">
@@ -33,9 +33,8 @@
       </tr>
     <% end %>
     <% if @zones.empty? %>
-      <tr><td colspan="2"><%= t(:none) %></td></tr>
+      <tr data-hook="zones_none"><td colspan="2"><%= t(:none) %></td></tr>
     <% end %>
   </tbody>
 </table>
-<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
-
+<%= paginate @zones %>

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

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("new_zone") %></h1>
+<h1><%= t(:new_zone) %></h1>
 
-<%= render "shared/error_messages", :target => @zone %>
+<%= render 'shared/error_messages', :target => @zone %>
 
-<%= form_for(@zone, :url => collection_url) do |zone_form| %>
-  <%= render "form", :zone_form => zone_form %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for [:admin, @zone] do |zone_form| %>
+  <%= render 'form', :zone_form => zone_form %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

data/app/views/checkout/_address.html.erb

@@ -1,163 +1,154 @@
-<style>
-div.inner input[type=text], div.inner select { width: 80%; }
-.hidden { display: none; }
-</style>
-<fieldset id='billing'>
+<fieldset id="billing" data-hook>
   <%= form.fields_for :bill_address do |bill_form| %>
-    <legend><%= t("billing_address")%></legend>
-    <div class="inner">
-      <p class="field">&nbsp;</p>
-      <p id="bfname" class="field">
-        <%= bill_form.label :firstname, t(:first_name) %>
-        <%= bill_form.text_field :firstname, :class => 'required' %><span class="req">*</span>
-      </p>
-      <p id="blname" class="field">
-        <%= bill_form.label :lastname, t(:last_name) %>
-        <%= bill_form.text_field :lastname, :class => 'required' %><span class="req">*</span>
-      </p>
-      <p id="baddress" class="field">
-        <%= bill_form.label :address1, t(:street_address) %>
-        <%= bill_form.text_field :address1, :class => 'required' %><span class="req">*</span>
-      </p>
-      <p id="baddress2" class="field">
-        <%= bill_form.label :address2, t(:street_address_2) %>
+    <legend><%= t(:billing_address)%></legend>
+    <div class="inner" data-hook="billing_inner">
+      <p class="field" id="bfirstname">
+        <%= bill_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
+        <%= bill_form.text_field :firstname, :class => 'required' %>
+      </p>
+      <p class="field" id="blastname">
+        <%= bill_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
+        <%= bill_form.text_field :lastname, :class => 'required' %>
+      </p>
+      <p class="field" id="baddress1">
+        <%= bill_form.label :address1, t(:street_address) %><span class="req">*</span><br />
+        <%= bill_form.text_field :address1, :class => 'required' %>
+      </p>
+      <p class="field" id="baddress2">
+        <%= bill_form.label :address2, t(:street_address_2) %><br />
         <%= bill_form.text_field :address2 %>
       </p>
-      <p id="bcity" class="field">
-        <%= bill_form.label :city, t(:city) %>
-        <%= bill_form.text_field :city, :class => 'required' %><span class="req">*</span>
+      <p class="field" id="bcity">
+        <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
+        <%= bill_form.text_field :city, :class => 'required' %>
       </p>
+
       <% if Spree::Config[:address_requires_state] %>
-        <p class="field">
-          <span id="bstate">
-            <% have_states = !@order.bill_address.country.states.empty? %>
-            <%= bill_form.label :state, t(:state) %>
-            <noscript>
-              <%= bill_form.text_field :state_name, :class => 'required' %>
-            </noscript>
-            <% state_elements = [
-               bill_form.collection_select(:state_id, @order.bill_address.country.states,
-                                  :id, :name,
-                                  {:include_blank => true},
-                                  {:class => have_states ? "required" : "hidden",
-                                  :disabled => !have_states}) +
-                bill_form.text_field(:state_name,
-                                  :class => !have_states ? "required" : "hidden",
-                                  :disabled => have_states)
-                ].join.gsub('"', "'").gsub("\n", "")
-            %>
-            <script type="text/javascript" language="javascript" charset="utf-8">
-            // <![CDATA[
+        <p class="field" id="bstate">
+          <% have_states = !@order.bill_address.country.states.empty? %>
+          <%= bill_form.label :state, t(:state) %><span class="req">*</span><br />
+          <noscript>
+            <%= bill_form.text_field :state_name, :class => 'required' %>
+          </noscript>
+          <% state_elements = [
+             bill_form.collection_select(:state_id, @order.bill_address.country.states,
+                                :id, :name,
+                                {:include_blank => true},
+                                {:class => have_states ? 'required' : 'hidden',
+                                :disabled => !have_states}) +
+             bill_form.text_field(:state_name,
+                                :class => !have_states ? 'required' : 'hidden',
+                                :disabled => have_states)
+             ].join.gsub('"', "'").gsub("\n", "")
+          %>
+          <%= javascript_tag do -%>
             document.write("<%== state_elements %>");
-            // ]]>
-            </script>
-          </span>
-          <span class="req">*</span>
+          <% end -%>
+        </p>
+      <% end %>
+
+      <p class="field" id="bzipcode">
+        <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
+        <%= bill_form.text_field :zipcode, :class => 'required' %>
+      </p>
+      <p class="field" id="bcountry">
+        <%= bill_form.label :country_id, t(:country) %><span class="req">*</span><br />
+        <span id="bcountry">
+          <%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
+        </span>
+      </p>
+      <p class="field" id="bphone">
+        <%= bill_form.label :phone, t(:phone) %><span class="req">*</span><br />
+        <%= bill_form.text_field :phone, :class => 'required' %>
+      </p>
+      <% if Spree::Config[:alternative_billing_phone] %>
+        <p class="field" id="baltphone">
+          <%= bill_form.label :alternative_phone, t(:alternative_phone) %><br />
+          <%= bill_form.text_field :alternative_phone %>
         </p>
       <% end %>
-      <p id="bzip" class="field">
-        <%= bill_form.label :zipcode, t(:zip) %>
-        <%= bill_form.text_field :zipcode, :class => 'required' %><span class="req">*</span>
-      </p>
-      <p id="bcountry" class="field">
-        <%= bill_form.label :country_id, t(:country) %>
-        <span id="bcountry"><%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
-        <span class="req">*</span>
-      </p>
-      <p id="bphone" class="field">
-        <%= bill_form.label :phone, t(:phone) %>
-        <%= bill_form.text_field :phone, :class => 'required' %><span class="req">*</span>
-          </p>
-          <% if Spree::Config[:alternative_billing_phone] %>
-            <p id="baltphone">
-              <%= bill_form.label :alternative_phone, t(:alternative_phone) %>
-              <%= bill_form.text_field :alternative_phone %>
-            </p>
-          <% end %>
     </div>
   <% end %>
 </fieldset>
-<fieldset id='shipping'>
+
+<fieldset id="shipping" data-hook>
   <%= form.fields_for :ship_address do |ship_form| %>
-    <legend><%= t("shipping_address")%></legend>
-    <p class="field checkbox">
-      <label for="order_use_billing" id="use_billing">
-        <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t("use_billing_address") %>
-      </label>
+    <legend><%= t(:shipping_address)%></legend>
+    <p class="field checkbox" data-hook="use_billing">
+      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> 
+      <%= label_tag :order_use_billing, t(:use_billing_address), :id => 'use_billing' %>
     </p>
-    <div class="inner">
-      <p id="sfname" class="field">
-        <%= ship_form.label :firstname, t(:first_name) %>
-        <%= ship_form.text_field :firstname, :class => 'required' %><span class="req">*</span>
+    <div class="inner" data-hook="shipping_inner">
+      <p class="field" id="sfirstname">
+        <%= ship_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
+        <%= ship_form.text_field :firstname, :class => 'required' %>
       </p>
-      <p id="slname" class="field">
-        <%= ship_form.label :lastname, t(:last_name) %>
-        <%= ship_form.text_field :lastname, :class => 'required' %><span class="req">*</span>
+      <p class="field" id="slastname">
+        <%= ship_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
+        <%= ship_form.text_field :lastname, :class => 'required' %>
       </p>
-      <p id="saddress" class="field">
-        <%= ship_form.label :address1, t(:street_address) %>
-        <%= ship_form.text_field :address1, :class => 'required' %><span class="req">*</span>
+      <p class="field" id="saddress1">
+        <%= ship_form.label :address1, t(:street_address) %><span class="req">*</span><br />
+        <%= ship_form.text_field :address1, :class => 'required' %>
       </p>
-      <p id="saddress2" class="field">
-        <%= ship_form.label :address2, t(:street_address_2) %>
+      <p class="field" id="saddress2">
+        <%= ship_form.label :address2, t(:street_address_2) %><br />
         <%= ship_form.text_field :address2 %>
       </p>
-      <p id="scity" class="field">
-        <%= ship_form.label :city, t(:city) %>
-        <%= ship_form.text_field :city, :class => 'required' %><span class="req">*</span>
+      <p class="field" id="scity">
+        <%= ship_form.label :city, t(:city) %><span class="req">*</span><br />
+        <%= ship_form.text_field :city, :class => 'required' %>
       </p>
+
       <% if Spree::Config[:address_requires_state] %>
-        <p class="field">
-          <span id="sstate">
-            <% have_states = !@order.ship_address.country.states.empty? %>
-            <%= ship_form.label :state, t(:state) %>
-            <noscript>
-              <%= ship_form.text_field :state_name, :class => 'required' %>
-            </noscript>
-            <% state_elements = [
-                  ship_form.collection_select(:state_id, @order.bill_address.country.states,
-                                    :id, :name,
-                                    {:include_blank => true},
-                                    {:class => have_states ? "required" : "hidden",
-                                    :disabled => !have_states}) +
-                  ship_form.text_field(:state_name,
-                                    :class => !have_states ? "required" : "hidden",
-                                    :disabled => have_states)
-                ].join.gsub('"', "'").gsub("\n", "")
-            %>
-            <script type="text/javascript" language="javascript" charset="utf-8">
-            // <![CDATA[
+        <p class="field" id="sstate">
+          <% have_states = !@order.ship_address.country.states.empty? %>
+          <%= ship_form.label :state, t(:state) %><span class="req">*</span><br />
+          <noscript>
+            <%= ship_form.text_field :state_name, :class => 'required' %>
+          </noscript>
+          <% state_elements = [
+             ship_form.collection_select(:state_id, @order.ship_address.country.states,
+                                :id, :name,
+                                {:include_blank => true},
+                                {:class => have_states ? 'required' : 'hidden',
+                                :disabled => !have_states}) +
+             ship_form.text_field(:state_name,
+                                :class => !have_states ? 'required' : 'hidden',
+                                :disabled => have_states)
+             ].join.gsub('"', "'").gsub("\n", "")
+          %>
+          <%= javascript_tag do -%>
             document.write("<%== state_elements %>");
-            // ]]>
-            </script>
-          </span>
-          <span class="req">*</span>
+          <% end %>
+        </p>
+      <% end %>
+
+      <p class="field" id="szipcode">
+        <%= ship_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
+        <%= ship_form.text_field :zipcode, :class => 'required' %>
+      </p>
+      <p class="field" id="scountry">
+        <%= ship_form.label :country_id, t(:country) %><span class="req">*</span><br />
+        <span id="scountry">
+          <%= ship_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
+        </span>
+      </p>
+      <p class="field" id="sphone">
+        <%= ship_form.label :phone, t(:phone) %><span class="req">*</span><br />
+        <%= ship_form.text_field :phone, :class => 'required' %>
+      </p>
+      <% if Spree::Config[:alternative_shipping_phone] %>
+        <p class="field" id="saltphone">
+          <%= ship_form.label :alternative_phone, t(:alternative_phone) %><br />
+          <%= ship_form.text_field :alternative_phone %>
         </p>
       <% end %>
-      <p id="szip" class="field">
-        <%= ship_form.label :zipcode, t(:zip) %>
-        <%= ship_form.text_field :zipcode, :class => 'required' %><span class="req">*</span>
-      </p>
-      <p id="scountry" class="field">
-        <%= ship_form.label :country_id, t(:country) %>
-        <span id="scountry"><%= ship_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
-        <span class="req">*</span>
-      </p>
-      <p id="sphone" class="field">
-        <%= ship_form.label :phone, t(:phone) %>
-        <%= ship_form.text_field :phone, :class => 'required' %><span class="req">*</span>
-          </p>
-          <% if Spree::Config[:alternative_shipping_phone] %>
-            <p id="saltphone">
-              <%= ship_form.label :alternative_phone, t(:alternative_phone) %>
-              <%= ship_form.text_field :alternative_phone %>
-            </p>
-          <% end %>
     </div>
   <% end %>
 </fieldset>
 
 <hr class="space" />
-<div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
+<div class="form-buttons" data-hook="buttons">
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

data/app/views/checkout/_confirm.html.erb

@@ -1,4 +1,4 @@
-<fieldset id="order_details">
+<fieldset id="order_details" data-hook>
   <div class="clear"></div>
   <legend><%= t(@order.state, :scope => :order_state).titleize %></legend>
   <%= render :partial => 'shared/order_details', :locals => {:order => @order} %>
@@ -6,6 +6,6 @@
 
 <hr />
 
-<div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("place_order") %>"/>
+<div class="form-buttons" data-hook="buttons">
+  <%= submit_tag t(:place_order), :class => 'continue button primary' %>
 </div>

data/app/views/checkout/_delivery.html.erb

@@ -1,25 +1,29 @@
-<fieldset id='shipping_method'>
-  <legend><%= t("shipping_method") %></legend>
-  <div class="inner">
+<fieldset id='shipping_method' data-hook>
+  <legend><%= t(:shipping_method) %></legend>
+  <div class="inner" data-hook="shipping_method_inner">
     <div id="methods">
       <p class="field radios">
         <% @order.rate_hash.each do |shipping_method| %>
           <label>
             <%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
+            <% if Spree::Config[:shipment_inc_vat] %>
+              <%= shipping_method[:name] %> <%= format_price (1 + TaxRate.default) * shipping_method[:cost] %>
+            <% else %>
             <%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
+            <% end %>
           </label><br />
         <% end %>
       </p>
     </div>
     <% if Spree::Config[:shipping_instructions] && @order.rate_hash.present? %>
-      <p id="minstrs">
-        <%= form.label :special_instructions, t("shipping_instructions") %><br />
+      <p id="minstrs" data-hook>
+        <%= form.label :special_instructions, t(:shipping_instructions) %><br />
         <%= form.text_area :special_instructions, :cols => 40, :rows => 7 %>
       </p>
     <% end %>
   </div>
 </fieldset>
 
-<div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>"/>
+<div class="form-buttons" data-hook="buttons">
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

data/app/views/checkout/_payment.html.erb

@@ -1,6 +1,6 @@
-<fieldset id="payment">
-  <legend><%= t("payment_information") %></legend>
-  <%= hook :checkout_payment_step, {:form => form} do %>
+<fieldset id="payment" data-hook>
+  <legend><%= t(:payment_information) %></legend>
+  <div data-hook="checkout_payment_step">
     <% @order.available_payment_methods.each do |method| %>
     <p>
       <label>
@@ -10,21 +10,21 @@
     </p>
     <% end %>
 
-    <ul id="payment-methods">
+    <ul id="payment-methods" data-hook>
       <% @order.available_payment_methods.each do |method| %>
-        <li id="payment_method_<%= method.id %>"<%= ' class="last"' if method == @order.available_payment_methods.last %>>
+        <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods.last %>" data-hook>
           <fieldset>
             <%= render "checkout/payment/#{method.method_type}", :payment_method => method %>
           </fieldset>
         </li>
       <% end %>
     </ul>
-    <br style='clear:both;' />
-    <%= hook :coupon_code_field, {:form => form} %>
-  <% end %>
+    <br style="clear:both;" />
+    <div data-hook="coupon_code_field" data-hook></div>
+  </div>
 </fieldset>
 
 <hr class="space" />
-<div class="form-buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
+<div class="form-buttons" data-hook="buttons">
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

data/app/views/checkout/_summary.html.erb

@@ -1,20 +1,21 @@
 <h3><%= t(:order_summary) %></h3>
-<table>
+<table data-hook="order_summary">
   <tbody>
-    <tr>
-      <td><strong><%= t('item_total') %>:</strong></td>
+    <tr data-hook="item_total">
+      <td><strong><%= t(:item_total) %>:</strong></td>
       <td><strong><%= number_to_currency order.item_total %></strong></td>
     </tr>
-    <tbody id="summary-order-charges">
-      <% order.adjustments.each do |adjustment| %>
+    <tbody id="summary-order-charges" data-hook>
+      <% order.adjustments.eligible.each do |adjustment| %>
+      <% next if (adjustment.originator_type == "TaxRate") and (adjustment.amount == 0) %>
         <tr>
           <td><%= adjustment.label %>: </td>
           <td><%= number_to_currency adjustment.amount %></td>
         </tr>
       <% end %>
     </tbody>
-    <tr>
-      <td><strong><%= t('order_total') %>:</strong></td>
+    <tr data-hook="order_total">
+      <td><strong><%= t(:order_total) %>:</strong></td>
       <td><strong><span id='summary-order-total'><%= number_to_currency @order.total %></span></strong></td>
     </tr>
   </tbody>