spree_core 1.1.6 → 1.2.0.rc1

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

@@ -15,15 +15,9 @@
     <li<%== ' class="active"' if current == 'Variants' %>>
       <%= link_to t(:variants),  admin_product_variants_url(@product) %>
     </li>
-    <li<%== ' class="active"' if current == 'Option Types' %>>
-      <%= link_to t(:option_types), selected_admin_product_option_types_url(@product) %>
-    </li>
     <li<%== ' class="active"' if current == 'Product Properties' %>>
       <%= link_to t(:product_properties), admin_product_product_properties_url(@product) %>
     </li>
-    <li<%== ' class="active"' if current == 'Taxons' %>>
-      <%= link_to t(:taxons), selected_admin_product_taxons_url(@product) %>
-    </li>
   </ul>
   <br class="clear" />
 

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

@@ -1,5 +1,5 @@
 <p class="actions" data-hook="actions">
-<%= link_to t(:edit), edit_object_url %> |
-<%= link_to t(:back), collection_url %> |
-<%= link_to t(:delete), object_url, :confirm => t(:are_you_sure_you_want_to_delete_this_record), :method => :delete %>
+  <%= link_to t(:edit), edit_object_url %> |
+  <%= link_to t(:back), collection_url %> |
+  <%= link_to t(:delete), object_url, :method => :delete, :data => { :confirm => t(:are_you_sure_you_want_to_delete_this_record) } %>
 </p>

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

@@ -1,6 +1,5 @@
 <%= tab :overview, :route => :admin %>
-<%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations %>
+<%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations %>
 <%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
 <%= tab :reports %>
 <%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
-<%= tab :users %>

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

@@ -2,7 +2,7 @@
   <ul class="actions" data-hook="admin_shipment_edit_buttons">
     <li>
       <% if @shipment.can_ship? %>
-        <%= button_link_to t(:ship), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :confirm => t(:are_you_sure) %>
+        <%= button_link_to t(:ship), fire_admin_order_shipment_path(@order, @shipment, :e => 'ship'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
       <% end %>
     </li>
   </ul>
@@ -26,7 +26,7 @@
 
       <div data-hook="admin_shipment_edit_form_buttons">
         <p class="form-buttons">
-          <% if self.respond_to?(:current_user) && @shipment.editable_by?(current_user) %>
+          <% if @shipment.editable_by?(try_spree_current_user) %>
             <%= button @order.cart? ? t(:continue) : t(:update) %>
             <%= t(:or) %> <%= link_to t(:cancel), admin_order_shipments_path(@order) %>
           <% else %>

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

@@ -18,7 +18,7 @@
   <% end %>
 </div>
 
-<div data-hook="admin_shipping_method_form_availability_fields">
+<div data-hook"admin_shipping_method_form_availability_fields">
   <fieldset class="categories">
     <legend><%= t(:availability) %></legend>
     <%= f.field_container :shipping_category do %>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -2,7 +2,7 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li id="new_state_link">
-      <%= button_link_to t(:new_state), new_admin_country_state_url(@country), {:remote => true, :icon => 'add', :id => 'new_state_link'} %>
+      <%= button_link_to t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'add', :id => 'new_state_link' } %>
     </li>
   </ul>
   <br class="clear" />

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

@@ -21,7 +21,7 @@
   <tbody>
     <% @tax_rates.each do |tax_rate|%>
     <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-      <td><%=tax_rate.zone.try(:name) || t(:not_available) %></td>
+      <td><%=tax_rate.zone.name %></td>
       <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.included_in_price %></td>

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

@@ -1,4 +1,4 @@
-<div data-hook="admin_taxonomy_form_fields">
+<div data-hook="admin_inside_taxonomy_form">
   <%= f.field_container :name do %>
     <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= error_message_on :taxonomy, :name, :class => 'fullwidth title' %>

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

@@ -1,4 +1,4 @@
-<div data-hook="admin_taxon_form_fields">
+<div data-hook="admin_inside_taxon_form">
   <%= f.field_container :name do %>
     <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -8,7 +8,7 @@
   </thead>
   <tbody>
     <% taxons.each do |taxon| %>
-      <tr id="<%= dom_id(taxon) %>" data-hook="taxons_row">
+      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
         <td class="actions">
@@ -17,7 +17,7 @@
       </tr>
     <% end %>
     <% if taxons.empty? %>
-     <tr data-hook="taxons_none"><td colspan="3"><%= t(:none) %>.</td></tr>
+      <tr data-hook="taxons_none"><td colspan="3"><%= t(:none) %>.</td></tr>
     <% end %>
   </tbody>
 </table>

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

@@ -21,22 +21,22 @@
       <%= f.text_field :sku %></p>
 
       <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
-      <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => '') %></p>
+      <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
 
       <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
-      <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => '') %></p>
+      <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
 
-      <% if Spree::Config[:track_inventory_levels] %>
-        <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />
-        <%= f.text_field :on_hand %></p>
-      <% end %>
-    </div>
-    <div class="right">
-
-      <% Spree::Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
-        <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
-      <% end %>
+    <% if Spree::Config[:track_inventory_levels] %>
+      <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />
+      <%= f.text_field :on_hand %></p>
+    <% end %>
+  </div>
 
-    </div>
+  <div class="right" data-hook="admin_variant_form_additional_fields">
+    <% [:weight, :height, :width, :depth].each do |field| %>
+      <p data-hook="<%= field %>"><%= f.label field, t(field) %>:<br />
+      <% value = number_with_precision(@variant.send(field), :precision => 2) %>
+      <%= f.text_field field, :value => value %></p>
+    <% end %>
   </div>
 </div>

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

@@ -7,9 +7,6 @@
     <th><%= t(:options) %></th>
     <th><%= t(:price) %></th>
     <th><%= t(:sku) %></th>
-    <% Spree::Variant.additional_fields.select { |f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
-      <th><%= t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
-    <% end %>
     <th><%= t(:on_hand) %></th>
     <th><%= t(:action) %></th>
   </tr>
@@ -21,9 +18,6 @@
       <td><span class="handle"></span> <%= variant.options_text %></td>
       <td><%= number_to_currency variant.price %></td>
       <td><%= variant.sku %></td>
-      <% Spree::Variant.additional_fields.select { |f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
-        <td><%= variant[field[:name].gsub(" ", "_").downcase] %></td>
-      <% end %>
       <td><%= variant.on_hand %></td>
       <td valign="top">
         <%= link_to_edit(variant) unless variant.deleted? %>
@@ -42,7 +36,7 @@
 
   <p class='first_add_option_types' data-hook="first_add_option_types">
     <%= t(:to_add_variants_you_must_first_define) %>
-    <%= link_to t(:option_types), selected_admin_product_option_types_url(@product) %>
+    <%= link_to t(:option_types), admin_product_url(@product) %>
     <%= t(:and) %>
     <%= link_to t(:option_values), admin_option_types_url %>
   </p>

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

@@ -1,4 +1,10 @@
 <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>
@@ -68,12 +74,12 @@
       </p>
       <p class="field" id="bphone">
         <%= bill_form.label :phone, t(:phone) %><span class="required">*</span><br />
-        <%= bill_form.text_field :phone, :class => 'required' %>
+        <%= bill_form.phone_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 %>
+          <%= bill_form.phone_field :alternative_phone %>
         </p>
       <% end %>
     </div>
@@ -155,12 +161,12 @@
       </p>
       <p class="field" id="sphone">
         <%= ship_form.label :phone, t(:phone) %><span class="required">*</span><br />
-        <%= ship_form.text_field :phone, :class => 'required' %>
+        <%= ship_form.phone_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 %>
+          <%= ship_form.phone_field :alternative_phone %>
         </p>
       <% end %>
     </div>

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

@@ -13,7 +13,6 @@
     <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| %>
         <%= render @order.state, :form => form %>
-        <%= submit_tag nil, :id => 'post-final', :style => 'display:none;' %>
       <% end %>
     </div>    
     <% if @order.state != 'confirm' %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -1,10 +1,10 @@
-<%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
+<%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <p class="field" data-hook="card_number">
   <%= label_tag nil, t(:card_number) %><br />
   <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
-  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19) %>
+  <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19, :autocomplete => "off") %>
   <span class="required">*</span>
   &nbsp;
   <span id="card_type" style="display:none;">
@@ -15,11 +15,11 @@
 </p>
 <p class="field" data-hook="card_expiration">
   <%= 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') %>
+  <%= 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="required">*</span>
 </p>
-<p class="field" data-hook="card_code">
+<p class="field" data-hook="cart_code">
   <%= label_tag nil, t(:card_code) %><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
   <span class="required">*</span>

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

@@ -1,5 +1,5 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
-<h2><%= t(:registration) %></h2>
+<h1><%= t(:registration) %></h1>
 <div id="registration" data-hook>
   <div id="account" class="columns alpha eight">
     <!-- TODO: add partial with registration form -->
@@ -7,7 +7,7 @@
   <% if Spree::Config[:allow_guest_checkout] %>
     <div id="guest_checkout" data-hook class="columns omega eight">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-      <h2><%= t(:guest_user_account) %></h2>
+      <h1><%= t(:guest_user_account) %></h1>
       <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
         <p>
           <%= f.label :email, t(:email) %><br />

data/app/views/spree/content/cvv.html.erb

@@ -1,13 +1,13 @@
 <div class="cvv" data-hook>
-  <h2><%= t(:what_is_a_cvv) %></h2>
+  <h1><%= t(:what_is_a_cvv) %></h1>
   <p>For Visa, MasterCard, and Discover cards, the card code is the last 3 digit number located on the back of your card on or above your signature line. For an American Express card, it is the 4 digits on the FRONT above the end of your card number.</p>
   <p>To help reduce fraud in the card-not-present environment, credit card companies have introduced a card code program. Visa calls this code Card Verification Value (CVV); MasterCard calls it Card Validation Code (CVC); Discover calls it Card ID (CID). The card code is a three- or four- digit security code that is printed on the back of cards. The number typically appears at the end of the signature panel.</p>
   <div class="cid-caption">Visa</div>
-  <%= image_tag 'creditcards/visa_cid.gif' %>
+  <%= image_tag 'credit_cards/visa_cid.gif' %>
   <div class="cid-caption">Master Card</div>
-  <%= image_tag 'creditcards/master_cid.jpg' %>
+  <%= image_tag 'credit_cards/master_cid.jpg' %>
   <div class="cid-caption">American Express</div>
-  <%= image_tag 'creditcards/amex_cid.gif' %>
+  <%= image_tag 'credit_cards/amex_cid.gif' %>
   <div class="cid-caption">Discover</div>
-  <%= image_tag 'creditcards/discover_cid.gif' %>
-</div> 
+  <%= image_tag 'credit_cards/discover_cid.gif' %>
+</div>

data/app/views/spree/layouts/spree_application.html.erb

@@ -1,69 +1,25 @@
 <!doctype html>
-
 <!--[if lt IE 7 ]> <html class="ie ie6" lang="en"> <![endif]-->
 <!--[if IE 7 ]>    <html class="ie ie7" lang="en"> <![endif]-->
 <!--[if IE 8 ]>    <html class="ie ie8" lang="en"> <![endif]-->
 <!--[if IE 9 ]>    <html class="ie ie9" lang="en"> <![endif]-->
 <!--[if gt IE 9]><!--><html lang="en"><!--<![endif]-->
-
-
   <head data-hook="inside_head">
     <%= render :partial => 'spree/shared/head' %>
   </head>
-
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
-
     <div class="container">
-
-      <header id="header" class="row" data-hook>
-
-        <figure id="logo" class="columns alpha six" data-hook>
-          <%= logo %>
-        </figure>
-
-        <nav id="top-nav-bar" class="columns omega ten">
-          <ul id="nav-bar" class="inline" data-hook>
-            <%= render :partial => 'spree/shared/nav_bar' %>
-          </ul>
-        </nav>
-
-        <% if store_menu? %>
-          <nav class="columns alpha omega sixteen">
-            <ul id="main-nav-bar" class="inline" data-hook>
-              <%= render :partial => 'spree/shared/store_menu' %>
-            </ul>
-          </nav>
-        <% end %>
-
-      </header>
-
+      <%= render :partial => 'spree/shared/header' %>
       <div id="wrapper" class="row" data-hook>
-
-        <% if content_for?(:sidebar) %>
-          <aside id="sidebar" class="columns alpha four" data-hook>
-            <%= yield :sidebar %>
-          </aside>
-        <% end %>
-
-        <div id="content" class="columns omega <% if !content_for?(:sidebar) %> sixteen alpha <% else %> twelve <% end %>" data-hook>
           <%= breadcrumbs(@taxon) %>
+        <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
+        <div id="content" class="columns omega <%= !content_for?(:sidebar) ? "sixteen alpha" : "twelve" %>" data-hook>
           <%= flash_messages %>
           <%= yield %>
         </div>
-
       </div>
-
-      <footer id="footer" class="alpha omega sixteen columns" data-hook>
-        <div id="footer-left" class="columns alpha eight" data-hook>
-          <p><%= t(:powered_by) %> <%= link_to 'Spree', 'http://spreecommerce.com/' %></p>
-        </div>
-        <div id="footer-right" class="columns omega eight" data-hook></div>
-      </footer>
-
+      <%= render :partial => 'spree/shared/footer' %>
     </div>
-
     <%= render :partial => 'spree/shared/google_analytics' %>
-
   </body>
-
 </html>

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

@@ -1,16 +1,16 @@
-<%= t('order_mailer.cancel_email.dear_customer') %>
+Dear Customer,
 
-<%= t('order_mailer.cancel_email.instructions') %>
+Your order has been CANCELED.  Please retain this cancellation information for your records.
 
 ============================================================
-<%= t('order_mailer.cancel_email.order_summary_canceled') %>
+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) %>
 <% end %>
 ============================================================
-<%= t('order_mailer.cancel_email.subtotal') %> <%= number_to_currency @order.item_total %>
+Subtotal: <%= number_to_currency @order.item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
 <% end %>
-<%= t('order_mailer.cancel_email.total') %> <%= number_to_currency(@order.total) %>
+Order Total: <%= number_to_currency(@order.total) %>

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

@@ -1,20 +1,19 @@
-<%= t('order_mailer.confirm_email.dear_customer') %>
+Dear Customer,
 
-<%= t('order_mailer.confirm_email.instructions') %>
+Please review and retain the following order information for your records.
 
 ============================================================
-<%= t('order_mailer.confirm_email.order_summary') %>
+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) %>
 <% end %>
 ============================================================
-<%= t('order_mailer.confirm_email.subtotal') %>: <%= number_to_currency @order.item_total %>
-
+Subtotal: <%= number_to_currency @order.item_total %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
 <% end %>
+Order Total: <%= number_to_currency(@order.total) %>
 
-<%= t('order_mailer.confirm_email.total') %>: <%= number_to_currency(@order.total) %>
 
-<%= t('order_mailer.confirm_email.thanks') %>
+Thank you for your business.

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

@@ -0,0 +1,14 @@
+<thead>
+  <tr data-hook="cart_adjustments_headers">
+    <th class="cart-adjustment-header" colspan="6">Order Adjustments</th>
+  </tr>
+</thead>
+<tbody id="cart_adjustments" data-hook>
+  <% @order.adjustments.eligible.each do |adjustment| %>
+    <tr>
+      <td colspan="4"><%= adjustment.label %></td>
+      <td><%= number_to_currency(adjustment.amount) %></td>
+      <td></td>
+    </tr>
+  <% end %>
+</tbody>

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

@@ -14,4 +14,5 @@
       <%= render :partial => 'line_item', :locals => { :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form } %>
     <% end %>
   </tbody>
+  <%= render "spree/orders/adjustments" unless @order.adjustments.eligible.blank? %>
 </table>