spree_core 0.40.4 → 0.50.0

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

@@ -1,11 +1,11 @@
 <%= f.field_container :name do %>
-  <%= f.label :name, t("name") %><br />
+  <%= f.label :name, t("name") %> <span class="required">*</span><br />
   <%= f.text_field :name %>
   <%= f.error_message_on :name %>
 <% end %>
 
-<%= f.field_container :name do %>
-  <%= f.label :presentation, t("presentation") %><br />
+<%= f.field_container :presentation do %>
+  <%= f.label :presentation, t("presentation") %> <span class="required">*</span><br />
   <%= f.text_field :presentation %>
   <%= f.error_message_on :presentation %>
-<% end %>
+<% end %>

data/app/views/admin/option_types/_option_value_fields.html.erb

@@ -1,5 +1,5 @@
 <tr class="option_value fields" id="<%= dom_id(f.object) %>">
-  <td><%= f.text_field :name %></td>
-  <td><%= f.text_field :presentation %></td>
+  <td class='name'><%= f.text_field :name %></td>
+  <td class='presentation'><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields t("remove"), f %></td>
 </tr>

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

@@ -18,12 +18,14 @@
       <tr id="none">
         <td colspan="3"><%= @option_type.option_values.empty? ? t("none") : "" %></td>
       </tr>
-      <% f.fields_for :option_values do |option_value_form| %>
+      <%= f.fields_for :option_values do |option_value_form| %>
         <%= render "option_value_fields", :f => option_value_form %>
       <% end %>
     </tbody>
   </table>
-  <%= link_to_add_fields t("add_option_value"), "tbody#option_values", f, :option_values %>
+  <span id='new_add_option_value'>
+    <%= link_to_add_fields t("add_option_value"), "tbody#option_values", f, :option_values %>
+  </span>
 
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 </fieldset>

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

@@ -3,7 +3,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li id="new_ot_link">
-      <%= button_link_to t("new_option_type"), new_admin_option_type_url, {:remote => true, :icon => 'add'} %>
+      <%= button_link_to t("new_option_type"), new_admin_option_type_url, {:remote => true, :icon => 'add', :id => 'new_option_type_link'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -13,7 +13,7 @@
 
 <div id="new_option_type"></div>
 
-<table class="index">
+<table class="index sortable" id='listing_option_types'>
   <tr>
     <th><%= t("name") %></th>
     <th><%= t("presentation") %></th>
@@ -21,10 +21,10 @@
   </tr>
   <% @option_types.each do |option_type| %>
     <tr id="<%= dom_id option_type %>">
-      <td><%= option_type.name %></td>
-      <td><%= option_type.presentation %></td>
+      <td><span class="handle"></span> <%= option_type.name %></td>
+      <td class='presentation'><%= option_type.presentation %></td>
       <td class="actions">
-        <%= link_to_edit(option_type) %>
+        <%= link_to_edit(option_type, :class => 'admin_edit_option_type') %>
         &nbsp;
         <%= link_to_delete(option_type) %>
       </td>

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

@@ -10,7 +10,8 @@
     <%= hook :admin_order_form_line_item_actions, locals do %>
       <%= link_to_delete f.object, {:url => admin_order_line_item_url(@order.number, f.object),
                                     :dataType => "html" ,
-                                    :success => "function(r){ jQuery('#order-form-wrapper').html(r);}"} %>
+                                    :success => "function(r){ jQuery('#order-form-wrapper').html(r);}"},
+                                    :title => "admin_delete_#{dom_id(@order)}" %>
     <% end %>
   </td>
 </tr>

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

@@ -5,12 +5,16 @@
 <table class="index">
   <tr>
     <th><%= t("event") %></th>
+    <th><%= t("from_state") %></th>
+    <th><%= t("to_state") %></th>
     <th><%= t("user") %></th>
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
   </tr>
   <% @order.state_events.sort.each do |event| %>
     <tr>
-      <td><%=t("#{event.name}") %></td>
+      <td><%=t("#{event.name}") if event.name.present? %></td>
+      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.previous_state}") %></td>
+      <td><%=t("#{event.name}_state#{'s' unless event.name == 'order'}.#{event.next_state}") %></td>
       <td><%=event.user.email if event.user %></td>
       <td><%=event.created_at.to_s(:date_time24) %></td>
     </tr>
@@ -22,4 +26,4 @@
   <% end %>
 </table>
 
-<%= button_link_to t('continue'), admin_orders_url %>
+<%= button_link_to t('continue'), admin_orders_url %>

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

@@ -1,22 +1,26 @@
 <div class='toolbar order-links'>
-  <%= button_link_to t("new_order"), new_admin_order_url, :icon => 'add' %>
+  <%= button_link_to t("new_order"), new_admin_order_url, :icon => 'add', :id => 'admin_new_order' %>
 </div>
 
 <%= render :partial => 'admin/shared/order_sub_menu' %>
 
 <h1><%= t("listing_orders") %></h1>
 
-<table class="index">
+<table class="index" id='listing_orders'>
   <thead>
     <tr>
       <%= hook :admin_orders_index_headers do %>
-        <th><%= order @search, :by => :completed_at,     :as => t("order_date") %></th>
-        <th><%= order @search, :by => :number,           :as => t("order_number") %></th>
-        <th><%= order @search, :by => :state,            :as => t("status") %></th>
-        <th><%= order @search, :by => :payment_state,    :as => t("payment_state") %></th>
-        <th><%= order @search, :by => :shipment_state,   :as => t("shipment_state") %></th>
-        <th><%= order @search, :by => :email,            :as => t("customer") %></th>
-        <th><%= order @search, :by => :total,            :as => t("total") %></th>
+        <% if @show_only_completed %>
+          <th><%= sort_link @search, :completed_at, t("activerecord.attributes.order.completed_at") %></th>
+        <% else %>
+          <th><%= sort_link @search, :created_at,   t("order_date") %></th>
+        <% end %>
+        <th><%= sort_link @search, :number,         t("order_number") %></th>
+        <th><%= sort_link @search, :state,          t("status") %></th>
+        <th><%= sort_link @search, :payment_state,  t("payment_state") %></th>
+        <th><%= sort_link @search, :shipment_state, t("shipment_state") %></th>
+        <th><%= sort_link @search, :email,          t("customer") %></th>
+        <th><%= sort_link @search, :total,          t("total") %></th>
       <% end %>
       <th>
         <%= hook :admin_orders_index_header_actions %>
@@ -28,7 +32,7 @@
     <tr>
       <%- locals = {:order => order} %>
       <%= hook :admin_orders_index_rows, locals do %>
-        <td><%= order.completed_at.to_date if order.completed_at %></td>
+        <td><%= (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
         <td><%= link_to order.number, object_url(order) %></td>
         <td><%= t("order_state.#{order.state.downcase}") %></td>
         <td><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></td>
@@ -36,9 +40,9 @@
         <td><%= order.email %></td>
         <td><%= number_to_currency order.total %></td>
       <% end %>
-      <td>
+      <td class='actions'>
         <%= hook :admin_orders_index_row_actions, locals do %>
-          <%= link_to_edit order %>
+          <%= link_to_edit order, :title => "admin_edit_#{dom_id(order)}" %>
         <% end %>
       </td>
     </tr>
@@ -51,18 +55,17 @@
 <% content_for :sidebar do %>
 <div class="box">
   <h3><%= t(:search) %></h3>
-
-  <%= form_for @search do |f| %>
+  <%= form_for [:admin, @search] do |f| %>
     <%- locals = {:f => f} %>
     <%= hook :admin_orders_index_search, locals do %>
       <label><%= t("date_range") %></label><br />
       <div class="yui-g date-range-filter">
         <div class="yui-u sub-field first">
-          <%= f.spree_date_picker :completed_at_greater_than %><br />
+          <%= f.spree_date_picker :created_at_greater_than %><br />
           <label class="sub"><%= t("start") %></label>
         </div>
         <div class="yui-u sub-field">
-          <%= f.spree_date_picker :completed_at_less_than %><br />
+          <%= f.spree_date_picker :created_at_less_than %><br />
           <label><%= t("stop") %></label>
         </div>
       </div>
@@ -79,14 +82,14 @@
       </p>
       <p>
       <label><%= t 'first_name_begins_with' %></label><br />
-          <%= f.text_field :bill_address_firstname_begins_with, :size=>25 %>
+          <%= f.text_field :bill_address_firstname_starts_with, :size=>25 %>
       </p>
       <p>
         <label><%= t 'last_name_begins_with' %></label><br />
-        <%= f.text_field :bill_address_lastname_begins_with, :size=>25 %>
+        <%= f.text_field :bill_address_lastname_starts_with, :size=>25 %>
       </p>
       <p>
-        <%= f.check_box :completed_at_not_null, {:style => "vertical-align:middle;"} %>
+        <%= f.check_box :completed_at_is_not_null, {:checked => @show_only_completed}, "1", "" %>
         <label>
           <%= t("show_only_complete_orders") %>
         </label>

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

@@ -1,6 +1,6 @@
 <div class='toolbar order-links'>
   <%= hook :admin_order_show_buttons do %>
-    <%= button_link_to t("cancel"), fire_admin_order_url(@order.number, {:e => "cancel"}), :icon => 'delete', :confirm => 'are you sure?' if @order.can_cancel? %>
+    <%= 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' %>
   <% end %>
 </div>

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

@@ -5,7 +5,7 @@
   <div id="add-line-item">
     <fieldset>
       <legend><%= t('customer_search') %></legend>
-      <%= label_tag :customer_search, t("name") %>
+      <%= label_tag :customer_search, t("enter_atleast_five_letters") %>
       <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title'  %>
     </fieldset>
   </div>

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

@@ -3,7 +3,8 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_payment_method"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t("new_payment_method"), new_object_url, :icon => 'add',
+                                                                  :id => 'admin_new_payment_methods_link'  %>
     </li>
   </ul>
   <br class='clear' />
@@ -11,8 +12,8 @@
 
 <h1><%= t("payment_methods") %></h1>
 
-<table class="index">
-  <thead>
+<table class="index" id='listing_payment_methods'>
+  <tr>
     <%= hook :admin_payment_methods_index_headers do %>
       <th><%= t("name") %></th>
       <th><%= t("provider") %></th>
@@ -23,7 +24,7 @@
     <th>
       <%= hook :admin_payment_methods_index_header_actions %>
     </th>
-  </thead>
+  </tr>
   <tbody>
     <% @payment_methods.each do |method|%>
       <tr id="<%= dom_id method %>">
@@ -37,7 +38,8 @@
         <% end %>
         <td width="140px">
           <%= hook :admin_payment_methods_index_row_actions, locals do %>
-            <%= link_to_edit method %> &nbsp;
+            <%= link_to_edit method, :class => 'edit' %>
+            &nbsp;
             <%= link_to_delete method %>
           <% end %>
         </td>

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

@@ -3,15 +3,15 @@
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <th><%= t("amount") %></th>
     <th><%= t("payment_method") %></th>
-    <th><%= t("state") %></th>
-    <th>Actions</th>
+    <th><%= t("payment_state") %></th>
+    <th><%= t("payment_actions") %></th>
   </tr>
   <% payments.each do |payment| %>
     <tr>
       <td><%= payment.created_at.to_s(:date_time24) %></td>
       <td><%= number_to_currency(payment.amount) %></td>
       <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
-      <td><%= payment.state.capitalize %></td>
+      <td><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></td>
       <td>
         <% payment.actions.each do |action| %>
           <%= button_to t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put %>

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

@@ -1,7 +1,7 @@
 <div class='toolbar'>
   <ul class='actions'>
 <% if @order.outstanding_balance? %>
-    <li>
+    <li id='new_payment_section'>
       <%= button_link_to t("new_payment"), new_admin_order_payment_url(@order), :icon => 'add' %>
     </li>
 <% end %>

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

@@ -3,8 +3,8 @@
 <h2><%= t("activerecord.models.#{@object.class.to_s.underscore}.one") %></h2>
 
 <p>
-  <label><%= t("amount") %>:</label></td>
+  <label><%= t("amount") %>:</label>
   <%= object.amount %>
 </p>
 
-<%= render "admin/payments/source_views/#{@payment.payment_method.method_type}", :payment => object %>
+<%= render "admin/payments/source_views/#{@payment.payment_method.method_type}", :payment => object.source.is_a?(Payment) ? object.source : object %>

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

@@ -26,19 +26,19 @@
   <% end %>
 
 
-  <%= form_tag(admin_product_group_product_scopes_path(@product_group), 'data-remote' => true, :id => 'new_product_group_form') do |f| %>
-    <% 
-    options = 
+  <%= form_tag(admin_product_group_product_scopes_path(@product_group), 'data-remote' => true, :id => 'new_product_group_form') do %>
+    <%
+    options =
     grouped_options_for_select(
-    Scopes::Product::SCOPES.map do |group_name, scopes|  
-      [ 
-        t(:name, :scope => [:product_scopes, :groups, group_name]), 
+    Scopes::Product::SCOPES.map do |group_name, scopes|
+      [
+        t(:name, :scope => [:product_scopes, :groups, group_name]),
         scopes.keys.map do |scope_name|
           [ t(:name, :scope => [:product_scopes, :scopes, scope_name]), scope_name]
         end
       ]
     end
-    ) 
+    )
     %>
     <p>
       <label for="product_scope_name"><%= t('add_scope') %></label>

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

@@ -2,7 +2,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_product_group"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t("new_product_group"), new_object_url, :icon => 'add', :id => 'new_product_group_link' %>
     </li>
   </ul>
   <br class='clear' />
@@ -10,7 +10,7 @@
 
 <h1><%= t("listing_product_groups") %></h1>
 
-<table class="index">
+<table class="index" id='listing_product_groups'>
   <thead>
     <tr>
       <th><%= ProductGroup.human_attribute_name("name") %></th>
@@ -27,7 +27,9 @@
         <td><%= link_to pg_search_path(:product_group_name => pg.permalink), pg_search_path(:product_group_name => pg.permalink) %></td>
         <td><%== pg.product_scopes.map(&:to_sentence).join("<br />") %></td>
         <td><%= pg.products.count %></td>
-        <td><%= link_to_edit pg %> &nbsp; <%= link_to_delete pg %></td>
+        <td>
+          <%= link_to_edit pg, :class => 'admin_edit_product_group' %> &nbsp; <%= link_to_delete pg %>
+        </td>
       </tr>
     <% end %>
   </tbody>

data/app/views/admin/product_groups/update.js.erb

@@ -1,7 +1,8 @@
 jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
+<% notice = flash.delete(:notice) %>
 flash_notice = jQuery('.flash.notice');
-if (flash_notice) {
-  flash_notice.html('<%= flash.notice %>');
+if (flash_notice.length > 0) {
+  flash_notice.html('<%= notice %>');
 } else {
-  jQuery('#content').prepend('<div class="flash notice"><%= flash.notice %></div>');
+  jQuery('#content h1').before('<div class="flash notice"><%= notice %></div>');
 }

data/app/views/admin/product_properties/_product_property_fields.html.erb

@@ -1,10 +1,10 @@
 <tr class="product_property fields">
-  <td>
+  <td class='property_name'>
     <%= f.text_field :property_name, :class => "autocomplete" %>
   </td>
-  <td>
+  <td class='value'>
     <%= f.text_field :value, :class => "autocomplete" %>
-  </td>	
+  </td>
   <td class="actions">
     <%= link_to_remove_fields t("remove"), f %>
   </td>

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

@@ -22,11 +22,16 @@
 
   <input type="hidden" name="clear_product_properties" value="true">
 
-  <p>
-    <%= link_to_add_fields icon('add') + ' ' + t("add_product_properties"), "tbody#product_properties", f, :product_properties %>
+  <p class='add_product_properties'>
+    <%= link_to_add_fields  icon('add') + ' ' + t("add_product_properties"),
+                            "tbody#product_properties",
+                            f,
+                            :product_properties %>
+
     &nbsp;&nbsp;
+
   	<span id="new_ptype_link">
-  	  <%= link_to t("select_from_prototype"), available_admin_prototypes_url, 
+  	  <%= link_to t("select_from_prototype"), available_admin_prototypes_url,
   	              :remote => true, 'data-update' => "prototypes" %>
   	</span>
 	</p>
@@ -41,8 +46,8 @@
 
   $("#product_properties input.autocomplete").live("keydown", function(){
     already_auto_completed = $(this).is('ac_input');
-    if (!already_auto_completed) { 
-      $(this).autocomplete(properties); 
+    if (!already_auto_completed) {
+      $(this).autocomplete(properties);
       $(this).focus();
     }
   });

data/app/views/admin/product_scopes/destroy.js.erb

@@ -1,2 +1,3 @@
 jQuery('#<%= dom_id object %>').fadeOut();
+jQuery('#<%= dom_id object %>').remove();
 jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');

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

@@ -3,7 +3,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li id="new_product_link">
-      <%= button_link_to t("new_product"), new_object_url, {:remote => true, :icon => 'add'} %>
+      <%= button_link_to t("new_product"), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_product'} %>
     </li>
   </ul>
   <br class='clear' />
@@ -13,12 +13,12 @@
 
 <div id="new_product"></div>
 
-<table class="index">
+<table class="index" id='listing_products'>
   <tr>
     <%= hook :admin_products_index_headers do %>
       <th><%= t("sku") %></th>
-      <th><%= order @search, :by => :name, :as => t("name") %></th>
-      <th><%= order @search, :by => :master_price, :as => t("master_price") %></th>
+      <th><%= sort_link @search,:name, t("name"), {}, {:title => 'admin_products_listing_name_title'} %></th>
+      <th><%= sort_link @search,:master_price, t("master_price") %></th>
     <% end %>
     <th>
       <%= hook :admin_products_index_header_actions %>
@@ -34,9 +34,9 @@
     <% end %>
     <td class="actions">
       <%= hook :admin_products_index_row_actions, locals do %>
-        <%= link_to_edit product unless product.deleted?  %>
+        <%= link_to_edit product, :class => 'edit' unless product.deleted?  %>
         &nbsp;
-        <%= link_to_clone product %>
+        <%= link_to_clone product, :class => 'clone' %>
         &nbsp;
         <%= link_to_delete product unless product.deleted?  %>
       <% end %>
@@ -47,35 +47,34 @@
 <%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
 
 <% content_for :sidebar do %>
+  <%= hook :admin_products_sidebar do %>
+    <%= form_for [:admin, @search] do |f| %>
+      <div class="box">
+        <h3><%= t(:search) %></h3>
 
-  <%= form_for @search do |f| %>
-    <div class="box">
-      <h3><%= t(:search) %></h3>
+        <%- locals = {:f => f} %>
+        <%= hook :admin_products_index_search, locals do %>
+          <p>
+            <%= f.label :name_contains, t("name") %><br />
+            <%= f.text_field :name_contains, :size => 15 %>
+          </p>
+          <p>
+            <%= f.label :variants_including_master_sku_contains, t("sku") %><br />
+            <%= f.text_field :variants_including_master_sku_contains, :size => 15 %>
+          </p>
+          <p>
+            <%= f.label :deleted_at_is_null, t("show_deleted") %><br />
+            <%= f.check_box :deleted_at_is_null, {:checked => params[:search][:deleted_at_is_null].blank?}, "", "1" %>
+          </p>
+        <% end %>
 
-      <%- locals = {:f => f} %>
-      <%= hook :admin_products_index_search, locals do %>
-        <p>
-          <label><%= t("name") %></label><br />
-          <%= f.text_field :name_contains, :size => 15 %>
-        </p>
-
-        <p>
-          <label><%= t("sku") %></label><br />
-          <%= f.text_field :variants_including_master_sku_contains, :size => 15 %>
-        </p>
-        <p>
-          <label><%= t("show_deleted") %></label><br />
-          <%= f.check_box :deleted_at_not_null, {:checked => (params[:search] and !params[:search][:deleted_at_not_null].blank?)}, "1", "" %>
-        </p>
-      <% end %>
-
-      <%= hook :admin_products_index_search_buttons, locals do %>
-        <p class="form-buttons">
-          <%= button t("search") %>
-        </p>
-      <% end %>
-    </div>
+        <%= hook :admin_products_index_search_buttons, locals do %>
+          <p class="form-buttons">
+            <%= button t("search") %>
+          </p>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
-
 <% end %>