spree_core 1.2.0.rc2 → 1.2.0

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

@@ -31,7 +31,7 @@
   <%= f.field_container :amount do %>
     <%= f.label :amount, t(:amount) %> <span class="required">*</span><br />
     <% if @return_authorization.received? %>
-      <%= number_to_currency @return_authorization.amount %>
+      <%= money @return_authorization.amount %>
     <% else %>
       <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value"></span>
       <%= f.error_message_on :amount %>

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

@@ -23,7 +23,7 @@
     <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
       <td><%= return_authorization.number %></td>
       <td><%= t(return_authorization.state.downcase) %></td>
-      <td><%= number_to_currency return_authorization.amount %></td>
+      <td><%= money return_authorization.amount %></td>
       <td><%= return_authorization.created_at.to_s(:date_time24) %></td>
       <td>
         <%= link_to_edit return_authorization %>

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

@@ -10,16 +10,16 @@
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
         <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %></td>
-        <td class="price"><%= number_to_currency item.price %></td>
+        <td class="price"><%= money item.price %></td>
         <td class="qty"><%= item.quantity %></td>
-        <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
+        <td class="total"><span><%= money(item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>
   <tbody id="subtotal" data-hook="order_details_subtotal">
     <tr class="total" id="subtotal-row">
       <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+      <td class="total"><span><%= money @order.item_total %></span></td>
     </tr>
   </tbody>
   <tbody id="order-charges" data-hook="order_details_adjustments">
@@ -27,14 +27,14 @@
     <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
       <tr class="total">
         <td colspan="3"><strong><%= adjustment.label %>:</strong></td>
-        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+        <td class="total"><span><%= money adjustment.amount %></span></td>
       </tr>
     <% end %>
   </tbody>
   <tbody id="order-total" data-hook="order_details_total">
     <tr class="total">
       <td colspan="3"><b><%= t(:order_total) %>:</b></td>
-      <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+      <td class="total"><span id="order_total"><%= money @order.total %></span></td>
     </tr>
   </tbody>
   <% if order.price_adjustment_totals.present? %>
@@ -42,7 +42,7 @@
       <% @order.price_adjustment_totals.keys.each do |key| %>
         <tr class="total">
           <td colspan="3"><strong><%= key %></strong></td>
-          <td class="total"><span><%= number_to_currency @order.price_adjustment_totals[key] %></span></td>
+          <td class="total"><span><%= money @order.price_adjustment_totals[key] %></span></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -4,10 +4,11 @@
   <div id="order_tab_summary" data-hook>
     <h3 id="order_number" data-hook><%= t(:order) %> #<%= @order.number%></h3>
     <h5 id="order_status" data-hook><%= t(:status) %>: <%= t(@order.state, :scope => :order_state) %></h5>
-    <h5 id="order_total" data-hook><%= t(:total) %>: <%= number_to_currency @order.total %></h5>
+    <h5 id="order_total" data-hook><%= t(:total) %>: <%= money @order.total %></h5>
     <% if @order.completed? %>
       <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></h5>
       <h5 id="payment_status"><%= t(:payment) %>: <%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></h5>
+      <h5 id="date_completed" style="width:100%; float:none;" data-hook><%= t(:date_completed) %>: <%= I18n.l(@order.completed? ? @order.completed_at : @order.created_at) %></h5>
     <% end %>
     <br class="clear" />
   </div>

data/app/views/spree/admin/shared/_update_order_state.js

@@ -1,5 +1,5 @@
 $('#order_tab_summary h5#order_status').html('<%= j t(:status) %>: <%= j t(@order.state, :scope => :order_state) %>');
-$('#order_tab_summary h5#order_total').html('<%= j t(:total) %>: <%= j number_to_currency(@order.total) %>');
+$('#order_tab_summary h5#order_total').html('<%= j t(:total) %>: <%= j @order.display_total.to_s %>');
 
 <% if @order.completed? %>
   $('#order_tab_summary h5#payment_status').html('<%= j t(:payment) %>: <%= j t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>');

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

@@ -14,7 +14,7 @@
 <div data-hook="admin_shipment_edit_header">
   <h2><%= t(:shipment) %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
   <% if @shipment.cost %>
-    <h3><%= t(:charges) %> <%= number_to_currency @shipment.cost %></h3>
+    <h3><%= t(:charges) %> <%= money @shipment.cost %></h3>
   <% end %>
 
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipment } %>

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

@@ -23,7 +23,7 @@
     <tr id="<%= spree_dom_id shipment %>" data-hook="admin_shipments_index_rows">
       <td><%= shipment.number %></td>
       <td><%= shipment.shipping_method.name if shipment.shipping_method %></td>
-      <td><%= number_to_currency shipment.cost %></td>
+      <td><%= money shipment.cost %></td>
       <td><%= shipment.tracking %></td>
       <td><%= t(shipment.state.to_sym, :scope => :state_names, :default => shipment.state.to_s.humanize) %></td>
       <td><%= shipment.shipped_at.to_s(:date_time24) if shipment.shipped_at %></td>

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

@@ -21,10 +21,10 @@
       <%= f.text_field :sku %></p>
 
       <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
-      <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
+      <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => '') %></p>
 
       <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
-      <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
+      <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => '') %></p>
 
     <% if Spree::Config[:track_inventory_levels] %>
       <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />

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

@@ -16,7 +16,7 @@
     <% next if variant.option_values.empty? %>
     <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
       <td><span class="handle"></span> <%= variant.options_text %></td>
-      <td><%= number_to_currency variant.price %></td>
+      <td><%= money variant.price %></td>
       <td><%= variant.sku %></td>
       <td><%= variant.on_hand %></td>
       <td valign="top">

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

@@ -1,10 +1,4 @@
 <div class="columns alpha six" data-hook="billing_fieldset_wrapper">
-<% unless @order.email? %>
-  <p class="field" style='clear: both'>
-    <%= form.label :email %><br />
-    <%= form.text_field :email %>
-  </p>
-<% end %>
 <fieldset id="billing" data-hook>
   <%= form.fields_for :bill_address do |bill_form| %>
     <legend><%= t(:billing_address) %></legend>

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

@@ -6,11 +6,7 @@
         <% @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 + Spree::TaxRate.default) * shipping_method[:cost] %>
-            <% else %>
-            <%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
-            <% end %>
+            <%= shipping_method.name %> <%= shipping_method.display_price %>
           </label>
         <% end %>
       </p>

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

@@ -4,27 +4,27 @@
   <tbody>
     <tr data-hook="item_total">
       <td><strong><%= t(:item_total) %>:</strong></td>
-      <td><strong><%= number_to_currency order.item_total %></strong></td>
+      <td><strong><%= money order.item_total %></strong></td>
     </tr>
     <tbody id="summary-order-charges" data-hook>
       <% order.adjustments.eligible.each do |adjustment| %>
       <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
         <tr>
           <td><%= adjustment.label %>: </td>
-          <td><%= number_to_currency adjustment.amount %></td>
+          <td><%= money adjustment.amount %></td>
         </tr>
       <% end %>
     </tbody>
     <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>
+      <td><strong><span id='summary-order-total'><%= money @order.total %></span></strong></td>
     </tr>
     <% if order.price_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
         <% @order.price_adjustment_totals.keys.each do |key| %>
           <tr class="total">
             <td><strong><%= key %></strong></td>
-            <td><strong><span><%= number_to_currency @order.price_adjustment_totals[key] %></span></strong></td>
+            <td><strong><span><%= money @order.price_adjustment_totals[key] %></span></strong></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/spree/checkout/edit.html.erb

@@ -12,6 +12,12 @@
   <div class="row" data-hook="checkout_content">
     <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
+        <% unless @order.email? %>
+          <p class="field" style='clear: both'>
+            <%= form.label :email %><br />
+            <%= form.text_field :email %>
+          </p>
+        <% end %>
         <%= render @order.state, :form => form %>
       <% end %>
     </div>    

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -1,16 +1,16 @@
-Dear Customer,
+<%= t('order_mailer.cancel_email.dear_customer') %>
 
-Your order has been CANCELED.  Please retain this cancellation information for your records.
+<%= t('order_mailer.cancel_email.instructions') %>
 
 ============================================================
-Order Summary [CANCELED]
+<%= t('order_mailer.cancel_email.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= money item.price %> = <%= money(item.price * item.quantity) %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
+<%= t('order_mailer.cancel_email.subtotal') %> <%= money @order.item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
+  <%= raw(adjustment.label) %> <%= money(adjustment.amount) %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
+<%= t('order_mailer.cancel_email.total') %> <%= money(@order.total) %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -1,19 +1,20 @@
-Dear Customer,
+<%= t('order_mailer.confirm_email.dear_customer') %>
 
-Please review and retain the following order information for your records.
+<%= t('order_mailer.confirm_email.instructions') %>
 
 ============================================================
-Order Summary
+<%= t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= money item.price %> = <%= money(item.price * item.quantity) %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
+<%= t('order_mailer.confirm_email.subtotal') %>: <%= money @order.item_total %>
+
 <% @order.adjustments.eligible.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
+  <%= raw(adjustment.label) %> <%= money(adjustment.amount) %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
 
+<%= t('order_mailer.confirm_email.total') %>: <%= money(@order.total) %>
 
-Thank you for your business.
+<%= t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/orders/_adjustments.html.erb

@@ -7,7 +7,7 @@
   <% @order.adjustments.eligible.each do |adjustment| %>
     <tr>
       <td colspan="4"><%= adjustment.label %></td>
-      <td><%= number_to_currency(adjustment.amount) %></td>
+      <td><%= money(adjustment.amount) %></td>
       <td></td>
     </tr>
   <% end %>

data/app/views/spree/orders/_line_item.html.erb

@@ -17,13 +17,13 @@
     <%= line_item_description(variant) %>
   </td>
   <td class="cart-item-price" data-hook="cart_item_price">
-    <%= number_to_currency line_item.price %>
+    <%= money line_item.price %>
   </td>
   <td class="cart-item-quantity" data-hook="cart_item_quantity">
     <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
   </td>
   <td class="cart-item-total" data-hook="cart_item_total">
-    <%= number_to_currency(line_item.price * line_item.quantity) unless line_item.quantity.nil? %>
+    <%= money(line_item.price * line_item.quantity) unless line_item.quantity.nil? %>
   </td>
   <td class="cart-item-delete" data-hook="cart_item_delete">
     <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>

data/app/views/spree/orders/edit.html.erb

@@ -19,14 +19,14 @@
         </div>
 
         <div id="subtotal" data-hook class="columns sixteen alpha omega">
-          <h5><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(@order) %></span></h5>
+          <h5><%= t(:subtotal) %>: <span class="order-total"><%= @order.display_total %></span></h5>
         </div>
 
         <div class="links columns sixteen alpha omega" data-hook="cart_buttons">
           <%= button_tag :class => 'primary', :id => 'update-button' do %>
             <%= t(:update) %>
           <% end %>
-         <%= link_to t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link' %>
+         <%= link_to t(:checkout), checkout_state_path(@order.checkout_steps.first), :class => 'button checkout primary', :id => 'checkout-link' %>
         </div>
 
       </div>

data/app/views/spree/products/_cart_form.html.erb

@@ -31,7 +31,7 @@
         
         <div id="product-price">
           <h6 class="product-section-title"><%= t(:price) %></h6>
-          <div><span class="price selling" itemprop="price"><%= number_to_currency @product.price %></span></div>
+          <div><span class="price selling" itemprop="price"><%= money @product.price %></span></div>
         </div>
 
         <div class="add-to-cart">

data/app/views/spree/shared/_google_analytics.html.erb

@@ -6,27 +6,28 @@
     _gaq.push(['_trackPageview']);
 
     <% if flash[:commerce_tracking] %>
-      // report e-commerce transaction information when applicable
+      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
       _gaq.push(['_addTrans',
-        "<%= @order.number %>",                            // Order Number
-        "",                                                // Affiliation
-        "<%= @order.total %>",                             // Order total
-        "<%= @order.adjustments.tax.sum(:amount) %>",      // Tax Amount
-        "<%= @order.adjustments.shipping.sum(:amount) %>", // Ship Amount
-        "",                                                // City
-        "",                                                // State
-        ""                                                 // Country
+        "<%= @order.number %>",
+        "",
+        "<%= @order.total %>",
+        "<%= @order.adjustments.tax.sum(:amount) %>",
+        "<%= @order.adjustments.shipping.sum(:amount) %>",
+        "<%= @order.bill_address.city %>",
+        "<%= @order.bill_address.state_text %>",
+        "<%= @order.bill_address.country.name %>"
       ]);
       <% @order.line_items.each do |line_item| %>
         _gaq.push(['_addItem',
-          "<%= @order.number %>",                  // order ID - required
-          "<%= line_item.variant.sku %>",          // SKU/code - required
-          "<%= line_item.variant.product.name %>", // product name
-          "",                                      // category or variation, Product Category
-          "<%= line_item.price %>",                // unit price - required
-          "<%= line_item.quantity %>"              // quantity - required
+          "<%= @order.number %>",
+          "<%= line_item.variant.sku %>",
+          "<%= line_item.variant.product.name %>",
+          "",
+          "<%= line_item.price %>",
+          "<%= line_item.quantity %>"
         ]);
       <% end %>
+      _gaq.push(['_trackTrans']);
     <% end %>
 
     (function() {

data/app/views/spree/shared/_order_details.html.erb

@@ -1,26 +1,28 @@
 <div class="row steps-data">
   
-  <div class="columns alpha four">
-    <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-    <div class="address">
-      <%= order.ship_address %>
+  <% if order.has_step?("address") %>
+    <div class="columns alpha four">
+      <h6><%= t(:shipping_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+      <div class="address">
+        <%= order.ship_address %>
+      </div>
     </div>
-  </div>
 
-  <div class="columns alpha four">
-    <h6><%= t(:billing_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
-    <div class="address">
-      <%= order.bill_address %>
-    </div>
-  </div>
-
-  <% if @order.has_step?("delivery") %>
     <div class="columns alpha four">
-      <h6><%= t(:shipping_method) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
-      <div class="delivery">
-        <%= order.shipping_method.name %>
+      <h6><%= t(:billing_address) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
+      <div class="address">
+        <%= order.bill_address %>
       </div>
     </div>
+
+    <% if @order.has_step?("delivery") %>
+      <div class="columns alpha four">
+        <h6><%= t(:shipping_method) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:delivery) unless @order.completed? %></h6>
+        <div class="delivery">
+          <%= order.shipping_method.name %>
+        </div>
+      </div>
+    <% end %>
   <% end %>
 
   <div class="columns omega four">
@@ -75,16 +77,16 @@
           <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
           <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %>
         </td>
-        <td data-hook="order_item_price" class="price"><span><%= number_to_currency item.price %></span></td>
+        <td data-hook="order_item_price" class="price"><span><%= money item.price %></span></td>
         <td data-hook="order_item_qty"><%= item.quantity %></td>
-        <td data-hook="order_item_total" class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
+        <td data-hook="order_item_total" class="total"><span><%= money(item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>
   <tfoot id="order-total" data-hook="order_details_total">
     <tr class="total">
       <td colspan="4"><b><%= t(:order_total) %>:</b></td>
-      <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+      <td class="total"><span id="order_total"><%= money @order.total %></span></td>
     </tr>
   </tfoot>
   <% if order.price_adjustment_totals.present? %>
@@ -92,7 +94,7 @@
       <% @order.price_adjustment_totals.keys.each do |key| %>
         <tr class="total">
           <td colspan="4"><strong><%= key %></strong></td>
-          <td class="total"><span><%= number_to_currency @order.price_adjustment_totals[key] %></span></td>
+          <td class="total"><span><%= money @order.price_adjustment_totals[key] %></span></td>
         </tr>
       <% end %>
     </tfoot>
@@ -100,7 +102,7 @@
   <tfoot id="subtotal" data-hook="order_details_subtotal">
     <tr class="total" id="subtotal-row">
       <td colspan="4"><b><%= t(:subtotal) %>:</b></td>
-      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+      <td class="total"><span><%= money @order.item_total %></span></td>
     </tr>
   </tfoot>
   <tfoot id="order-charges" data-hook="order_details_adjustments">
@@ -108,7 +110,7 @@
     <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
       <tr class="total">
         <td colspan="4"><strong><%= adjustment.label %></strong></td>
-        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
+        <td class="total"><span><%= money adjustment.amount %></span></td>
       </tr>
     <% end %>
   </tfoot>