spree_core 0.70.0.rc2 → 0.70.0

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

@@ -1,19 +1,19 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Order Details'} %>
 <%= csrf_meta_tags %>
 
 <div data-hook="admin_order_new_header">
-  <h2><%= t("new_order")%></h2>
+  <h2><%= t(:new_order)%></h2>
   <%= render 'shared/error_messages', :target => @order %>
 </div>
 
-<%= render :partial => "add_product" %>
+<%= render :partial => 'add_product' %>
 
 <div data-hook="admin_order_new_form">
   <div id="order-form-wrapper">
-    <%= render :partial => "form" %>
+    <%= render :partial => 'form' %>
   </div>
 </div>
 
 <% content_for :head do %>
-  <%= javascript_tag "var expand_variants = true;" %>
+  <%= javascript_tag 'var expand_variants = true;' %>
 <% end %>

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

@@ -1,20 +1,20 @@
-<div class='toolbar order-links' data-hook="admin_order_show_buttons">
-  <%= button_link_to t("cancel"), fire_admin_order_url(@order.number, {:e => "cancel"}), :icon => 'delete', :confirm => t('are_you_sure') if @order.can_cancel? %>
-  <%= button_link_to t("edit"), edit_admin_order_url(@order.number), :icon => 'edit' %>
+<div class="toolbar order-links" data-hook="admin_order_show_buttons">
+  <%= button_link_to t(:cancel), fire_admin_order_url(@order.number, {:e => "cancel"}), :icon => 'delete', :confirm => t(:are_you_sure) if @order.can_cancel? %>
+  <%= button_link_to t(:edit), edit_admin_order_url(@order.number), :icon => 'edit' %>
 </div>
 
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Order Details'} %>
 
 <div data-hook="admin_order_show_addresses">
   <% if @order.bill_address %>
-    <div class='adr'>
-      <h4><%= t("bill_address") %></h4>
+    <div class="adr">
+      <h4><%= t(:bill_address) %></h4>
       <%= render :partial => 'admin/shared/address', :locals => {:address => @order.bill_address} %>
     </div>
   <% end %>
   <% if @order.ship_address %>
     <div class='adr'>
-      <h4><%= t("ship_address") %></h4>
+      <h4><%= t(:ship_address) %></h4>
       <%= render :partial => 'admin/shared/address', :locals => {:address => @order.ship_address} %>
     </div>
     <% end %>

data/app/views/admin/orders/user.html.erb

@@ -1,19 +1,19 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Customer Details"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Customer Details'} %>
 <%= csrf_meta_tags %>
 
 <% if @order.cart? %>
   <div id="add-line-item" data-hook>
     <fieldset>
-      <legend><%= t('customer_search') %></legend>
-      <%= label_tag :customer_search, t("enter_atleast_five_letters") %>
+      <legend><%= t(:customer_search) %></legend>
+      <%= label_tag :customer_search, t(:enter_at_least_five_letters) %>
       <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title'  %>
     </fieldset>
   </div>
 <% end %>
 
-<%= render "shared/error_messages", :target => @order %>
+<%= render 'shared/error_messages', :target => @order %>
 
-<%= form_for(@order, :url => admin_order_url(@order), :html => { :method => :put}) do |f| %>
+<%= form_for @order, :url => admin_order_url(@order), :html => { :method => :put} do |f| %>
   <%= f.hidden_field :number %>
-  <%= render :partial => "user_form", :locals => {:f => f} %>
+  <%= render :partial => 'user_form', :locals => {:f => f} %>
 <% end %>

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

@@ -1,50 +1,50 @@
 <table data-hook="payment_method">
   <tr data-hook="name">
-    <td><label><%=t("name")%></label></td>
-    <td><%= text_field :payment_method, :name, {"style" => "width:200px"} %></td>
+    <td><%= label_tag nil, t(:name) %></td>
+    <td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
   </tr>
   <tr data-hook="description">
-    <td><label><%=t("description")%></label></td>
+    <td><%= label_tag nil, t(:description) %></td>
     <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
   </tr>
   <tr data-hook="environment">
-    <td><label><%=t("environment")%></label></td>
+    <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "gtwy-env"}) %>
+      <%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
     </td>
   </tr>
   <tr data-hook="display">
-    <td><label><%=t("display")%></label></td>
+    <td><%= label_tag nil, t(:display) %></td>
     <td>
       <%= select(:payment_method, :display_on, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
     </td>
   </tr>
   <tr data-hook="active">
-    <td><label><%= t("active") %></label></td>
+    <td><%= label_tag nil, t(:active) %></td>
     <td>
       <label class="sub">
-        <%= radio_button(:payment_method, :active, true ) %>
-        <%= t("yes") %>
+        <%= radio_button :payment_method, :active, true %>
+        <%= t(:yes) %>
       </label> &nbsp;
       <label class="sub">
-        <%= radio_button(:payment_method, :active, false ) %>
-        <%= t("no") %>
+        <%= radio_button :payment_method, :active, false %>
+        <%= t(:no) %>
       </label>
     </td>
   </tr>
 </table>
 
-<h2><%= t('settings') %></h2>
+<h2><%= t(:settings) %></h2>
 
 <div id="preference-settings" data-hook>
-  <%= f.label(:type, t("provider")) %>
-  <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => "gtwy-type"}) %>
+  <%= f.label :type, t(:provider) %>
+  <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
 
   <% unless @object.new_record? %>
     <%= preference_fields(@object, f) %>
 
     <% if @object.respond_to?(:preferences) %>
-      <div id="gateway-settings-warning" style="color:#FF0000"><%= t('provider_settings_warning')%></div>
+      <div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
     <% end %>
   <% end %>
 </div>

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

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("editing_payment_method") %></h1>
-<%= render "shared/error_messages", :target => @payment_method %>
-<%= form_for(@payment_method, :url => admin_payment_method_path(@payment_method), :html => { :method => :put }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
+<h1><%= t(:editing_payment_method) %></h1>
+<%= render 'shared/error_messages', :target => @payment_method %>
+<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method), :html => { :method => :put } do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
   <p data-hook="buttons">
-    <%=submit_tag t("update")%>
+    <%= submit_tag t(:update) %>
   </p>
 <% end %>

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

@@ -3,22 +3,21 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_payment_method"), new_object_url, :icon => 'add',
-                                                                  :id => 'admin_new_payment_methods_link'  %>
+      <%= button_link_to t(:new_payment_method), new_object_url, :icon => 'add', :id => 'admin_new_payment_methods_link'  %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<h1><%= t("payment_methods") %></h1>
+<h1><%= t(:payment_methods) %></h1>
 
 <table class="index" id='listing_payment_methods'>
   <tr data-hook="admin_payment_methods_index_headers">
-    <th><%= t("name") %></th>
-    <th><%= t("provider") %></th>
-    <th><%= t("environment") %></th>
-    <th><%= t("display") %></th>
-    <th><%= t("active") %></th>
+    <th><%= t(:name) %></th>
+    <th><%= t(:provider) %></th>
+    <th><%= t(:environment) %></th>
+    <th><%= t(:display) %></th>
+    <th><%= t(:active) %></th>
     <th data-hook="admin_payment_methods_index_header_actions"></th>
   </tr>
   <tbody>
@@ -27,7 +26,7 @@
         <td width="120px"><%= method.name %></td>
         <td width="140px"><%= method.type %></td>
         <td width="100px"><%= method.environment.to_s.titleize %></td>
-        <td width="60px"><%= method.display_on.blank? ? t('both') : t(method.display_on) %></td>
+        <td width="60px"><%= method.display_on.blank? ? t(:both) : t(method.display_on) %></td>
         <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
         <td width="140px" data-hook="admin_payment_methods_index_row_actions">
           <%= link_to_edit method, :class => 'edit' %>

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

@@ -1,11 +1,11 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("new_payment_method") %></h1>
+<h1><%= t(:new_payment_method) %></h1>
 <%= render 'shared/error_messages', :target => @payment_method %>
 
-<%= form_for(@payment_method, :url => collection_url) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
+<%= form_for @payment_method, :url => collection_url do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
   <p data-hook="buttons">
-    <%= submit_tag t("create") %>
+    <%= submit_tag t(:create) %>
   </p>
 <% end %>

data/app/views/admin/payments/_bill_address_form.html.erb

@@ -2,7 +2,7 @@
   <% order_form.fields_for :checkout do |checkout_form|  %>
 
     <% checkout_form.fields_for :bill_address do |ba_form|  %>
-      <%= render :partial => "admin/shared/address_form", :locals => {:f => ba_form, :name => t('billing_address')} %>
+      <%= render :partial => 'admin/shared/address_form', :locals => {:f => ba_form, :name => t(:billing_address)} %>
     <% end %>
 
   <% end %>

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

@@ -1,15 +1,15 @@
 <p>
-  <%= f.label :amount, t(:amount) %> 
-  <%= f.text_field :amount, :size=> 8, :value => @order.outstanding_balance %>
-</p>  
+  <%= f.label :amount, t(:amount) %>
+  <%= f.text_field :amount, :size => 8, :value => @order.outstanding_balance %>
+</p>
 
 <% @payment_methods.each do |method| %>
 
   <label data-hook="payment_method">
-    <%= radio_button_tag "payment[payment_method_id]", method.id, method == @payment_method %> 
+    <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
     <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
   </label>
 
   <%= render "admin/payments/source_forms/#{method.method_type}", :payment_method => method %>
 
-<% end %>  
+<% end %>

data/app/views/admin/payments/_list.html.erb

@@ -1,15 +1,15 @@
 <table class="index">
   <tr data-hook="payments_header">
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t("amount") %></th>
-    <th><%= t("payment_method") %></th>
-    <th><%= t("payment_state") %></th>
-    <th><%= t("payment_actions") %></th>
+    <th><%= t(:amount) %></th>
+    <th><%= t(:payment_method) %></th>
+    <th><%= t(:payment_state) %></th>
+    <th><%= t(:payment_actions) %></th>
   </tr>
   <% payments.each do |payment| %>
     <tr data-hook="payments_row">
       <td><%= payment.created_at.to_s(:date_time24) %></td>
-      <td><%= number_to_currency(payment.amount) %></td>
+      <td><%= number_to_currency payment.amount %></td>
       <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
       <td><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></td>
       <td>

data/app/views/admin/payments/_transaction_list.html.erb

@@ -1,15 +1,15 @@
 <fieldset>
   
-  <legend><%= t('transactions') %></legend>
+  <legend><%= t(:transactions) %></legend>
 
   <table class="index">
     <tr data-hook="transactions_header">
-      <th><%= t('type') %></th>
-      <th><%= 'date' %></th>
-      <th><%= t('amount') %></th>
-      <th><%= t('response_code') %></th>
+      <th><%= t(:type) %></th>
+      <th><%= t('spree.date') %></th>
+      <th><%= t(:amount) %></th>
+      <th><%= t(:response_code) %></th>
     </tr>
-    <% for txn in txns %>
+    <% txns.each do |txn| %>
     <tr data-hook="transaction_row">
       <td>
         <%= txn.txn_type_name %>

data/app/views/admin/payments/credit.html.erb

@@ -1,14 +1,14 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Creditcards"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Creditcards'} %>
 
 <%= form_tag do %>
-  <h3><%= t('refund') %></h3>
+  <h3><%= t(:refund) %></h3>
   <fieldset data-hook="credit">
     <p>
-      <label for="amount"><%= t("amount") %></label>
+      <%= label_tag :amount, t(:amount) %>
       <%= text_field_tag :amount, @payment.amount %>
     </p>
     <p class="form-buttons">
-      <%= button t("make_refund") %>
-    </p>    
+      <%= button t(:make_refund) %>
+    </p>
   </fieldset>
 <% end %>

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

@@ -1,22 +1,22 @@
 <div class="toolbar" data-hook="toolbar">
-  <ul class='actions'>
+  <ul class="actions">
 <% if @order.outstanding_balance? %>
-    <li id='new_payment_section'>
-      <%= button_link_to t("new_payment"), new_admin_order_payment_url(@order), :icon => 'add' %>
+    <li id="new_payment_section">
+      <%= button_link_to t(:new_payment), new_admin_order_payment_url(@order), :icon => 'add' %>
     </li>
 <% end %>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<%= render 'admin/shared/order_tabs', :current => "Payments" %>
+<%= render 'admin/shared/order_tabs', :current => 'Payments' %>
 
 <% if @order.outstanding_balance? %>
-  <p><%= @order.outstanding_balance < 0 ? t('credit_owed') : t('balance_due') %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
+  <p><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
 <% end %>
 
-<h2><%= t("payments") %></h2>
+<h2><%= t(:payments) %></h2>
 <%= render 'list', :payments => @payments %>
 
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t(:continue), admin_orders_url %>

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

@@ -1,19 +1,19 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Payments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Payments'} %>
 
-<h2><%= t('new') %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
+<h2><%= t(:new) %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
 
-<%= render "shared/error_messages", :target => @payment %>
+<%= render 'shared/error_messages', :target => @payment %>
 
 <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
 
-  <%= render "form", :f => f %>
+  <%= render 'form', :f => f %>
 
   <p class="form-buttons" data-hook="buttons">
-    <%= button @order.cart? ? t('continue') : t('update') %>
+    <%= button @order.cart? ? t(:continue) : t(:update) %>
   </p>
 
 <% end %>
 
 <% content_for :head do %>
-<%= javascript_include_tag '/admin/javascripts/payments/new.js' %>
+  <%= javascript_include_tag '/admin/javascripts/payments/new.js' %>
 <% end %>

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

@@ -1,9 +1,9 @@
-<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Payments"} %>
+<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Payments'} %>
 
 <h2><%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
 
 <p data-hook="amount">
-  <label><%= t("amount") %>:</label>
+  <%= label_tag nil, t(:amount) %>
   <%= @payment.amount %>
 </p>
 

data/app/views/admin/payments/source_forms/_gateway.html.erb

@@ -1,7 +1,7 @@
 <fieldset>
   
   <p class="field" data-hook="previous_cards">
-    <% for card in @previous_cards %>
+    <% @previous_cards.each do |card| %>
       <label><%= radio_button_tag :card, card.id, card == @previous_cards.first %> <%= card.display_number %><br /></label>
     <% end %>
     <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= t(:use_new_cc) %></label>
@@ -9,32 +9,32 @@
   
   <div id="card_form" data-hook>
 
-    <%= image_tag "creditcards/creditcard.gif", :id => 'creditcard-image' %>
+    <%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div data-hook="card_number">
-      <label for=""><%= t("card_number") %></label><br />
+      <%= label_tag nil, t(:card_number) %><br />
       <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required', :size => 19, :maxlength => 19 %>
       <span class="req">*</span>
       &nbsp;
       <span id="card_type" style="display:none;">
-        ( <span id="looks_like" ><%= t('card_type_is') %> <span id="type"></span></span>
-          <span id="unrecognized"><%= t('unrecognized_card_type') %></span>
+        ( <span id="looks_like" ><%= t(:card_type_is) %> <span id="type"></span></span>
+          <span id="unrecognized"><%= t(:unrecognized_card_type) %></span>
         )
       </span>
     </div>
     <div data-hook="card_expiration">
-      <label for=""><%= t("expiration") %></label><br />
+      <%= label_tag nil, t(:expiration) %><br />
       <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required') %>
       <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
       <span class="req">*</span>
     </div>
     <div data-hook="card_code">
-      <label for=""><%= t("card_code") %></label><br />
+      <%= label_tag nil, t(:card_code) %><br />
       <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required', :size => 5 %>
       <span class="req">*</span>
       <a href="/content/cvv" target="_blank" onclick="window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
-        (<%= t("whats_this") %>)
+        (<%= t(:whats_this) %>)
       </a>
     </div>
 

data/app/views/admin/payments/source_views/_gateway.html.erb

@@ -1,30 +1,30 @@
 <fieldset data-hook="creditcard">
-  <legend><%= t('creditcard') %></legend>
+  <legend><%= t(:creditcard) %></legend>
 
   <table class="index">
     <tr>
-      <th colspan="6"><%= t('card_details') %></th>
+      <th colspan="6"><%= t(:card_details) %></th>
     </tr>
     <tr>
-      <td><label><%= t("card_number") %>:</label></td>
+      <td><%= label_tag nil, t(:card_number) %>:</td>
       <td>
         <%= payment.source.display_number %>
       </td>
-      <td><label><%= t("expiration") %>:</label></td>
+      <td><%= label_tag nil, t(:expiration) %>:</td>
       <td>
         <%= payment.source.month %>/<%= payment.source.year %>
       </td>
-      <td><label><%= t("card_code") %>:</label></td>
+      <td><%= label_tag nil, t(:card_code) %>:</td>
       <td>
         <%= payment.source.verification_value %>
       </td>
     </tr>
     <tr>
-      <td><label><%= t("maestro_or_solo_cards") %>:</label></td>
+      <td><%= label_tag nil, t(:maestro_or_solo_cards) %>:</td>
       <td>
         <%= payment.source.issue_number %>
       </td>
-      <td><label><%= t('start_date') %>:</label></td>
+      <td><%= label_tag nil, t(:start_date) %>:</td>
       <td colspan="3">
         <%= payment.source.start_month %>/<%= payment.source.start_year %>
       </td>