spree_core 0.30.0.beta1 → 0.30.0

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

@@ -0,0 +1,21 @@
+<table class="index">
+  <tr>
+    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+    <th><%= t("description") %></th>
+    <th><%= t("amount") %></th>
+    <th></th>
+  </tr>
+  <% @order.adjustments.each do |adjustment| %>
+    <tr id="<%= dom_id(adjustment) %>">
+      <td><%= adjustment.created_at.to_s(:date_time24) %></td>
+      <td><%= adjustment.label %></td>
+      <td><%= number_to_currency(adjustment.amount) %></td>
+      <td>
+        <%= link_to_edit adjustment %>
+        &nbsp;
+        <%= link_to_delete adjustment %>
+      </td>
+
+    </tr>
+  <% end %>
+</table>

data/app/views/admin/shared/_configuration_menu.html.erb

@@ -6,7 +6,7 @@
   <ul class="sidebar">
     <%= hook :admin_configurations_sidebar_menu do %>
     <li<%= raw(' class="active"') if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
-    <li<%= raw(' class="active"') if controller.controller_name == 'mail_settings' %>><%= link_to t("mail_server_settings"), admin_mail_settings_path %></li>
+    <li<%= raw(' class="active"') if controller.controller_name == 'mail_methods' %>><%= link_to t("mail_methods"), admin_mail_methods_path %></li>
     <li<%= raw(' class="active"') if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
     <li<%= raw(' class="active"') if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
     <li<%= raw(' class="active"') if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>

data/app/views/admin/shared/_destroy.js.erb

@@ -0,0 +1,3 @@
+$('.flash.notice').html('<%= flash.notice %>');
+$('.flash.notice').show();
+<%= render(:partial => "/admin/shared/update_order_state") if @order %>

data/app/views/admin/shared/_new_adjustment_button.html.erb

@@ -0,0 +1,8 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <li>
+      <%= button_link_to t("new_adjustment"), new_admin_order_adjustment_url(@order), :icon => 'add' %>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>

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

@@ -2,52 +2,56 @@
 
 <% content_for :sidebar do %>
   <div id="order_tab_summary">
-    <h3 id="order_number"><%= t(:order) + " ##{@order.number} " %></h3>
-    <h5 id="order_status">Status: <%= t(@order.state) %></h5>
-    <h5 id="order_total">Total: <%= number_to_currency(@order.total) %></h5>
+    <h3 id="order_number"><%= "#{t(:order)} ##{@order.number} " %></h3>
+    <h5 id="order_status"><%= "#{t(:status)}: #{t("order_state.#{@order.state}")}" %></h5>
+    <h5 id="order_total"><%= "#{t(:total)}: #{number_to_currency(@order.total)}" %></h5>
+    <% if @order.completed? %>
+      <h5 id="shipment_status"><%= "#{t(:shipment)}: #{t("shipment_states.#{@order.shipment_state}")}"  %></h5>
+      <h5 id="payment_status"><%= "#{t(:payment)}: #{t("payment_states.#{@order.payment_state}")}" %></h5>
+    <% end %>
     <br class="clear" />
   </div>
   <br class="clear" />
 
   <ul class="sidebar">
-    <%= hook :admin_order_tabs, {:current => current} do %>
-      <% if @order.state == "in_progress" %>
-        <li <%= ' class="active"' if current == "Order Details" %>>
+    <%= hook :admin_order_tabs do %>
+      <% unless @order.completed? %>
+        <li <%= ' class=active' if current == "Order Details" %>>
           <%= link_to t("order_details"), edit_admin_order_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Customer Details" %>>
-            <%= link_to t("customer_details"), edit_admin_order_checkout_url(@order) %>
+        <li <%= ' class=active' if current == "Customer Details" %>>
+            <%= link_to t("customer_details"), user_admin_order_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Shipments" %>>
-           <%= link_to t("shipment"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
+        <li <%= ' class=active' if current == "Shipments" %>>
+           <%= link_to t("shipment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : edit_admin_order_shipment_url(@order, @order.shipment) %>
         </li>
-        <li <%= ' class="active"' if current == "Adjustments" %>>
-           <%= link_to t("adjustments"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
+        <li <%= ' class=active' if current == "Adjustments" %>>
+           <%= link_to t("adjustments"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : admin_order_adjustments_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Payments" %>>
-           <%= link_to t("payment"), @order.line_items.empty? || !@order.checkout.valid? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
+        <li <%= ' class=active' if current == "Payments" %>>
+           <%= link_to t("payment"), @order.line_items.empty? || !@order.completed? ? "javascript:$('form').submit();" : new_admin_order_payment_url(@order) %>
         </li>
 
       <% else %>
-        <li <%= ' class="active"' if current == "Order Details" %>>
+        <li <%= ' class=active' if current == "Order Details" %>>
           <%= link_to t("order_details"), admin_order_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Customer Details" %>>
-          <%= link_to t("customer_details"), admin_order_checkout_url(@order) %>
+        <li <%= ' class=active' if current == "Customer Details" %>>
+          <%= link_to t("customer_details"), user_admin_order_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Adjustments" %>>
+        <li <%= ' class=active' if current == "Adjustments" %>>
            <%= link_to t("adjustments"), admin_order_adjustments_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Payments" %>>
+        <li <%= ' class=active' if current == "Payments" %>>
            <%= link_to t("payments"), admin_order_payments_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Shipments" %>>
+        <li <%= ' class=active' if current == "Shipments" %>>
            <%= link_to t("shipments"), admin_order_shipments_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "Return Authorizations" %>>
+        <li <%= ' class=active' if current == "Return Authorizations" %>>
            <%= link_to t("return_authorizations"), admin_order_return_authorizations_url(@order) %>
         </li>
-        <li <%= ' class="active"' if current == "History" %>>
+        <li <%= ' class=active' if current == "History" %>>
            <%= link_to t("history"), history_admin_order_url(@order) %>
         </li>
       <% end %>

data/app/views/admin/shared/_report_criteria.html.erb

@@ -2,11 +2,11 @@
     <label><%= t("date_range") %></label><br />
     <div class="yui-g date-range-filter">
       <div class="yui-u sub-field first">
-        <%= s.spree_date_picker :created_at_after %><br />
+        <%= s.spree_date_picker :created_at_greater_than %><br />
         <label class="sub"><%= t("start") %></label>
       </div>
       <div class="yui-u sub-field">
-        <%= s.spree_date_picker :created_at_before %><br />
+        <%= s.spree_date_picker :created_at_less_than %><br />
         <label><%= t("stop") %></label>
       </div>
     </div>

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

@@ -0,0 +1,6 @@
+$('#order_tab_summary h5#order_status').html('<%= "#{t('status')}: #{t("order_state.#{@order.state}")}" %>');
+$('#order_tab_summary h5#order_total').html('<%= "#{t('total')}: #{number_to_currency(@order.total)}" %>');
+<% if @order.completed? %>
+$('#order_tab_summary h5#payment_status').html('<%= "#{t('payment')}: #{t("payment_states.#{@order.payment_state}")}"  %>');
+$('#order_tab_summary h5#shipment_status').html('<%= "#{t('shipment')}: #{t("shipment_states.#{@order.shipment_state}")}"  %>');
+<% end %>

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

@@ -1,6 +1,6 @@
 <%- locals = {:shipment_form => shipment_form} %>
 
-<% unless @shipment.order.in_progress? %>
+<% unless @shipment.order.cart? %>
   <%= hook :admin_shipment_form_inventory_units, locals do %>
     <table class="index" style="width:100%;">
       <tr>
@@ -14,7 +14,10 @@
       <% @shipment.order.inventory_units.each do |inventory_unit| %>
         <tr>
           <td style="text-align:center;">
-            <%= check_box_tag "inventory_units[#{inventory_unit.id}]", :true, (inventory_unit.shipment == @shipment),{:disabled => %w(shipped backordered).include?(inventory_unit.state)} %>
+            <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
+                              :true,
+                              (inventory_unit.shipment == @shipment),
+                              {:disabled => %w(shipped backordered returned).include?(inventory_unit.state)} %>
           </td>
           <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
           <td width="300">
@@ -68,12 +71,3 @@
     <% end %>
   </table>
 <% end %>
-
-<%= hook :admin_shipment_form_recalculate, locals do %>
-  <p>
-    <label>
-      <%= check_box_tag :recalculate, true, true %>
-      <%= t('recalculate_order_total') %>
-    </label>
-  </p>
-<% end %>

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

@@ -15,8 +15,8 @@
 
 <%= hook :admin_shipment_edit_header do %>
   <h2><%= t('shipment') %> #<%= @shipment.number%> (<%= t(@shipment.state.to_sym, :scope => :state_names, :default => @shipment.state.to_s.humanize) %>)</h2>
-  <% if @shipment.shipping_charge %>
-    <h3><%= t('charges') %> <%= number_to_currency @shipment.shipping_charge.amount %></h3>
+  <% if @shipment.cost %>
+    <h3><%= t('charges') %> <%= number_to_currency @shipment.cost %></h3>
   <% end %>
 
   <%= render "shared/error_messages", :target => @shipment %>
@@ -29,10 +29,10 @@
       <%= hook :admin_shipment_edit_form_buttons do %>
         <p class="form-buttons">
           <% if @shipment.editable_by?(current_user) %>
-            <%= button @order.in_progress? ? t('continue') : t('update') %>
+            <%= button @order.cart? ? t('continue') : t('update') %>
             <%= t("or") %> <%= link_to t("cancel"), collection_url %>
           <% else %>
-            <%= link_to "&laquo; #{t("back")}", collection_url %>
+            <%= link_to raw("&laquo; #{t("back")}"), collection_url %>
           <% end %>
         </p>
       <% end %>

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

@@ -15,9 +15,9 @@
     <%= f.file_field :icon %>
   <% end %>
 
-  <%= f.field_container :icon do %>
+  <%= f.field_container :description do %>
     <%= f.label :description, t(:description) %><br />
-    <%= f.text_area :description %></p>
+    <%= f.text_area :description %>
   <% end %>
 
 <% end %>

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

@@ -8,16 +8,11 @@
   </thead>
   <tbody>
     <% taxons.each do |taxon| %>
-      <tr id="<%= dom_id(taxon, :sel)%>">
+      <tr id="<%= dom_id(taxon)%>">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
-  	    <td class="actions">
-          <%= image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :rem_spinner)}" %>		                         
-		      <%= link_to_remote icon('delete') + ' ' + t('remove'), 
-		                         {:url => remove_admin_product_taxon_url(@product, taxon),
-		                         :loading => "jQuery('##{dom_id(taxon, :rem_spinner)}').show()",
-		                         :update => 'selected-taxons',
-		                         :complete => "jQuery('##{dom_id(taxon, :sel)}').remove(); jQuery('##{dom_id(taxon, :rem_spinner)}').hide();"}, :class => 'iconlink' %>
+  	    <td class="actions">	                         
+		      <%= link_to_delete taxon, :url => remove_admin_product_taxon_url(@product, taxon), :name => icon("delete") + ' ' + t("remove") %>
   	    </td>        
       </tr>
     <% end %>

data/app/views/admin/taxons/available.js.erb

@@ -16,16 +16,13 @@
 	</thead>
 	<tbody>
     <% @available_taxons.each do |taxon| %>
-      <tr id="<%= dom_id(taxon) %>">
+      <tr id="<%= dom_id(taxon, :sel) %>">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
 		    <td class="actions">
-          <%= image_tag "spinner.gif", :style => "display:none", :id => "#{dom_id(taxon, :spinner)}" %>		    
-		      <%= link_to_remote icon('add') + ' ' + t('select'), 
-		                         {:url => select_admin_product_taxon_path(@product, taxon),
-		                         :loading => "jQuery('##{dom_id(taxon, :spinner)}').show()",
-		                         :update => 'selected-taxons',
-		                         :complete => "jQuery('##{dom_id(taxon)}').remove(); jQuery('##{dom_id(taxon, :spinner)}').hide();"}, :class => 'iconlink' %>
+          <%= link_to icon('add') + ' ' + t("select"),
+                            select_admin_product_taxon_path(@product, taxon),
+                           :remote => true, :class => 'iconlink' %>
 		    </td>        
       </tr>
     <% end %>

data/app/views/admin/taxons/select.js.erb

@@ -0,0 +1,2 @@
+$("#selected-taxons").html("<%= escape_javascript(render(:partial => "taxon_table", :locals => {:taxons => @taxons})) %>");
+$("#<%= dom_id @taxon, :sel %>").hide();

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

@@ -45,7 +45,7 @@
   <br/>
   <p id="new_var_link">
       <%= link_to icon('add') + ' ' + t("new_variant"), new_admin_product_variant_url(@product), :remote => :true, 'data-update' => 'new_variant', :class => 'iconlink' %>
-    </span>&nbsp;|&nbsp;<%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"), admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
+    &nbsp;|&nbsp;<%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"), admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
   </p>
   <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 <% end %>

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

@@ -62,6 +62,7 @@ div.inner input[type=text], div.inner select { width: 80%; }
       <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) %>
@@ -140,6 +141,7 @@ div.inner input[type=text], div.inner select { width: 80%; }
       <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) %>

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

@@ -11,10 +11,10 @@
         <% end %>
       </p>
     </div>
-    <% if Spree::Config[:shipping_instructions] && @available_methods.present? %>
+    <% if Spree::Config[:shipping_instructions] && @order.rate_hash.present? %>
       <p id="minstrs">
-        <%= checkout_form.label :special_instructions, t("shipping_instructions") %><br />
-        <%= checkout_form.text_area :special_instructions, :cols => 40, :rows => 7 %>
+        <%= form.label :special_instructions, t("shipping_instructions") %><br />
+        <%= form.text_area :special_instructions, :cols => 40, :rows => 7 %>
       </p>
     <% end %>
   </div>

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

@@ -1,25 +1,30 @@
 <fieldset id="payment">
   <legend><%= t("payment_information") %></legend>
-
-  <% @order.available_payment_methods.each do |method| %>
-  <p>
-    <label>
-      <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.payment_method %> 
-      <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
-    </label>
-  </p>
-  <% end %>
-
-  <ul id="payment-methods">
+  <%= hook :checkout_payment_step, {:form => form} do %>
     <% @order.available_payment_methods.each do |method| %>
-      <li id="payment_method_<%= method.id %>"<%= ' class="last"' if method == @order.available_payment_methods.last %>>
-        <fieldset>
-          <%= render "checkout/payment/#{method.method_type}", :payment_method => method %>
-        </fieldset>
-      </li>
-    <% end %>  
-  </ul>
+    <p>
+      <label>
+        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.payment_method %> 
+        <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
+      </label>
+    </p>
+    <% end %>
 
+    <ul id="payment-methods">
+      <% @order.available_payment_methods.each do |method| %>
+        <li id="payment_method_<%= method.id %>"<%= ' class="last"' if method == @order.available_payment_methods.last %>>
+          <fieldset>
+            <%= render "checkout/payment/#{method.method_type}", :payment_method => method %>
+          </fieldset>
+        </li>
+      <% end %>  
+    </ul>
+    <br style='clear:both;' />
+    <p>
+      <label><%= t(:coupon_code) %></label><br />
+      <%= form.text_field :coupon_code, :size => 19 %>
+    </p>
+  <% end %>
 </fieldset>
 
 <hr class="space" />

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

@@ -19,13 +19,3 @@
     </tr>
   </tbody>
 </table>
-<% unless @prev_state.blank? %>
-  <%= form_for @checkout, :url => object_url, :html => { :id => 'checkout-summary-form'} do |summary_form| %>
-    <label><%= t(:coupon_code) %></label>
-    <%= summary_form.text_field :coupon_code, :id => 'coupon-code', :size => 14 %>
-    <input id="post-summary" type="submit" value="<%=t("apply") %>"/>
-    <input type="hidden" name="step" value="<%= @prev_state %>"/>
-    <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'coupon_busy_indicator' %>
-  <% end %>
-<% end %>
-<div id="coupon-error"></div>

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

@@ -3,7 +3,7 @@
 
 <p class="field">
   <label for=""><%= t("card_number") %></label><br />
-  <% options_hash = Rails.env == 'production' ? {:autocomplete => "off"} : {} %>
+  <% options_hash = Rails.env.production? ? {:autocomplete => "off"} : {} %>
   <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:class => 'required', :size => 19, :maxlength => 19) %>
   <span class="req">*</span>
   &nbsp;

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

@@ -0,0 +1,20 @@
+<%= render "shared/error_messages", :target => @user %>
+<h2><%= t("registration")%></h2>
+<div id="registration">
+  <div id="account">
+    <!-- TODO: add partial with registration form -->
+  </div>
+  <% if Spree::Config[:allow_guest_checkout] %>
+    <div id="guest_checkout">
+      <%= render "shared/error_messages", :target => @order %>
+      <h2><%= t(:guest_user_account) %></h2>
+      <%= form_for @order, :url => update_checkout_registration_path, :html => { :method => :put, :id => "checkout_form_registration"} do |f| %>
+        <p>
+          <%= f.label :email, t("email") %><br />
+          <%= f.text_field :email, :class => 'title'  %>
+        </p>
+        <p><%= submit_tag t("continue"), :class => 'button primary' %></p>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/layouts/admin.html.erb

@@ -16,8 +16,8 @@
     <% if current_user %>
     <ul id="login-nav">
       <li><%= t('logged_in_as') %>: <%= current_user.email %></li>
-      <li><%= link_to t('account'), edit_user_registration_path(current_user) %></li>
-      <li><%= link_to t('logout'), destroy_user_session_path %></li>
+      <li><%= link_to t('account'), edit_user_path(current_user) %></li>
+      <li><%= link_to t('logout'), logout_path %></li>
       <li><%= link_to t('store'), products_path %></li>
     </ul>
     <% end %>

data/app/views/order_mailer/{cancel.html.erb → cancel_email.text.erb}

@@ -1,16 +1,16 @@
 Dear Customer,
 
-Your order has been CANCELED.  Please retain this cancellation information for your records.    
+Your order has been CANCELED.  Please retain this cancellation information for your records.
 
 ============================================================
 Order Summary [CANCELED]
 ============================================================
 <% for item in @order.line_items %>
 <%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
-<% end %>      
+<% end %>
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>
-<% @order.charges.each do |charge| %>
-<%= "#{charge.description}: #{number_to_currency charge.amount}"%>
+<% @order.adjustments.each do |adjustment| %>
+<%= "#{adjustment.label}: #{number_to_currency adjustment.amount}"%>
 <% end %>
 Order Total: <%= number_to_currency @order.total %>

data/app/views/order_mailer/{confirm.html.erb → confirm_email.text.erb}

@@ -1,17 +1,17 @@
 Dear Customer,
 
-Please review and retain the following order information for your records.    
+Please review and retain the following order information for your records.
 
 ============================================================
 Order Summary
 ============================================================
 <% for item in @order.line_items %>
 <%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
-<% end %>      
+<% end %>
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>
 <% @order.adjustments.each do |adjustment| %>
-<%= "#{adjustment.description}: #{number_to_currency adjustment.amount}"%>
+<%= "#{adjustment.label}: #{number_to_currency adjustment.amount}"%>
 <% end %>
 Order Total: <%= number_to_currency @order.total %>