spree_core 0.30.2 → 0.40.0

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

@@ -4,7 +4,7 @@
 </tr>
 <% if @product.has_variants? %>
   <tr>
-    <td><%= Variant.human_name %>:</td>
+    <td><%= Variant.model_name.human %>:</td>
     <td><%= f.select :viewable_id, @variants %></td>
   </tr>
 <% else %>

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

@@ -6,7 +6,7 @@
   <tr>
     <th><%= t("thumbnail") %></th>
     <% if @product.has_variants? %>
-      <th><%= Variant.human_name %></th>
+      <th><%= Variant.model_name.human %></th>
     <% end %>
     <th><%= t("alt_text") %></th>
     <th><%= t("action") %></th>

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

@@ -2,7 +2,7 @@
 
 <%= render 'shared/error_messages', :target => @option_type%>
 
-<% form_for(:option_type, :url => collection_url) do |f| %>
+<%= form_for(:option_type, :url => collection_url) do |f| %>
   <fieldset>
     <legend><%= t("new_option_type") %></legend>
     <%= render :partial => "form", :locals => { :f => f } %>

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

@@ -3,7 +3,7 @@
     <legend><%= t('add_product') %></legend>
     <div style="float:left;width:65%;margin-right:5%;">
       <%= label_tag :add_product_name, t("name_or_sku") %>
-      <%= text_field_tag :add_product_name,  {}, :class => 'fullwidth title'  %>
+      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth title'  %>
       <%= hidden_field_tag :add_variant_id %>
     </div>
     <div style="float:left;width:10%;margin-right:5%;">
@@ -11,9 +11,9 @@
       <%= text_field_tag :add_quantity,  1 , :class => 'fullwidth title'  %>
     </div>
     <div style="float: left; width: 15%; padding-top: 17px;">
-      <%= link_to text_for_button_link(t("add"), :icon => 'add'), 
+      <%= link_to text_for_button_link(t("add"), :icon => 'add'),
             admin_order_line_items_url(@order),
-            {:id => 'add_line_item_to_order', :method => :post, :class => 'button', 'data-update' => 'order-form-wrapper'} %>
+            {:id => 'add_line_item_to_order', :class => 'button', 'data-update' => 'order-form-wrapper'} %>
     </div>
 
   </fieldset>

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

@@ -1,4 +1,7 @@
 <%= render 'shared/error_messages', :target => @order %>
+<% if @line_item.try(:errors).present? %>
+  <%= render 'shared/error_messages', :target => @line_item %>
+<% end %>
 
 <%= form_for(@order, :url => admin_order_url(@order), :html => { :method => :put}) do |f| %>
   <%= f.hidden_field :number %>

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

@@ -28,7 +28,7 @@
   </tbody>
 </table>
 
-<h3><%= Address.human_name(:count => 2) %></h3>
+<h3><%= Address.model_name.human(:count => 2) %></h3>
 <%= f.fields_for :bill_address do |ba_form|  %>
   <%= render :partial => "admin/shared/address_form", :locals => {:f => ba_form, :name => t('billing_address'), :use_billing => false} %>
 <% end %>

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

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

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'  if @order.can_cancel? %>
+    <%= 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("edit"), edit_admin_order_url(@order.number), :icon => 'edit' %>
   <% end %>
 </div>
@@ -10,18 +10,13 @@
 <%= hook :admin_order_show_addresses do %>
   <% if @order.bill_address %>
     <div class='adr'>
-      <h4>
-        <%= link_to t("bill_address"), (@current_action=="edit" ? edit_admin_checkout_url(@order.number) : admin_orders_checkout_url(@order.number)) %>
-      </h4>
+      <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>
-        <%= link_to t("ship_address"), (@current_action=="edit" ? edit_admin_checkout_url(@order.number) : admin_orders_checkout_url(@order.number)) %>
-        <%= t("ship_address") if @order.shipments.empty? %>
-      </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

@@ -6,7 +6,7 @@
     <fieldset>
       <legend><%= t('customer_search') %></legend>
       <%= label_tag :customer_search, t("name") %>
-      <%= text_field_tag :customer_search,  {}, :class => 'fullwidth title'  %>
+      <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title'  %>
     </fieldset>
   </div>
 <% end %>

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

@@ -25,7 +25,7 @@
       <tr id="<%= dom_id pg %>">
         <td><%= link_to pg.name, object_path(pg) %></td>
         <td><%= link_to pg_search_path(:product_group_name => pg.permalink), pg_search_path(:product_group_name => pg.permalink) %></td>
-        <td><%= raw pg.product_scopes.map(&:to_sentence).join("<br />") %></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>
       </tr>

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

@@ -1,5 +1,5 @@
 <% render 'admin/shared/product_sub_menu' %>
-<h2><%= ProductGroup.human_name %></h2>
+<h2><%= ProductGroup.model_name.human %></h2>
 <p>
   <%= ProductGroup.human_attribute_name(:name) %>: <%= @product_group.name %>
 </p>

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

@@ -65,7 +65,7 @@
         </p>
         <p>
           <label><%= t("show_deleted") %></label><br />
-          <%= f.check_box :deleted_at_not_null, {}, "1", "" %>
+          <%= f.check_box :deleted_at_not_null, {:checked => (params[:search] and !params[:search][:deleted_at_not_null].blank?)}, "1", "" %>
         </p>
       <% end %>
 

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

@@ -67,7 +67,9 @@
 
     jQuery(document).ready(function(){
       $.each($("td.return_quantity input"), function(i, inpt){
-        $(inpt).delayedObserver(0.5, calculate_rma_price)
+        $(inpt).delayedObserver(function() {
+          calculate_rma_price();
+        }, 0.5);
       });
 
       calculate_rma_price();

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

@@ -57,7 +57,7 @@
         <%= f.label :country_id, t(:country)+':' %>
       </td>
       <td colspan="3">
-        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:style => 'width:150px;'} %></span>
+        <span id="<%= name==t('shipping_address') ? "s" : "b" %>country"><%= f.collection_select :country_id, Country.all, :id, :name, {}, {:style => 'width:150px;'} %></span>
       </td>
     </tr>
     <tr class="<%= name == t('shipping_address') ? "shipping-row" : "billing-row" %>">

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

@@ -5,18 +5,18 @@
 
   <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_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>
-    <li<%= raw(' class="active"') if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
-    <li<%= raw(' class="active"') if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
-    <li<%= raw(' class="active"') if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
-    <li<%= raw(' class="active"') if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
-    <li<%= raw(' class="active"') if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'general_settings' %>><%= link_to t("general_settings"), admin_general_settings_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'mail_methods' %>><%= link_to t("mail_methods"), admin_mail_methods_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'tax_categories' %>><%= link_to t("tax_categories"), admin_tax_categories_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'zones' %>><%= link_to t("zones"), admin_zones_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'states' %>><%= link_to t("states"), admin_country_states_path(Spree::Config[:default_country_id]) %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'payment_methods' %>><%= link_to t("payment_methods"), admin_payment_methods_path %></li>
+    <li<%== ' class="active"' if ['taxonomies', 'taxons'].include? controller.controller_name %>><%= link_to t("taxonomies"), admin_taxonomies_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'shipping_methods' %>><%= link_to t("shipping_methods"), admin_shipping_methods_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'inventory_settings' %>><%= link_to t("inventory_settings"), admin_inventory_settings_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'trackers' %>><%= link_to t("analytics_trackers"), admin_trackers_path %></li>
     <% end %>
-    <li<%= raw(' class="active"') if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
+    <li<%== ' class="active"' if controller.controller_name == 'configurations' %>><%= link_to t("complete_list"), admin_configurations_path %></li>
   </ul>
 
 <% end %>

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

@@ -16,42 +16,42 @@
   <ul class="sidebar">
     <%= hook :admin_order_tabs do %>
       <% unless @order.completed? %>
-        <li <%= ' class=active' if current == "Order Details" %>>
+        <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" %>>
+        <li<%== ' class="active"' if current == "Customer Details" %>>
             <%= link_to t("customer_details"), user_admin_order_url(@order) %>
         </li>
-        <li <%= ' class=active' if current == "Shipments" %>>
+        <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" %>>
+        <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" %>>
+        <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" %>>
+        <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/_product_tabs.html.erb

@@ -8,22 +8,22 @@
   <ul class="sidebar product-menu">
     <%= hook :admin_product_tabs, {:current => current} do %>
 
-      <li<%= raw(' class="active"') if current == "Product Details" %>>
+      <li<%== ' class="active"' if current == "Product Details" %>>
         <%= link_to t("product_details"), edit_admin_product_url(@product) %>
       </li>
-      <li<%= raw(' class="active"') if current == "Images" %>>
+      <li<%== ' class="active"' if current == "Images" %>>
         <%= link_to t("images"), admin_product_images_url(@product) %>
       </li>
-      <li<%= raw(' class="active"') if current == "Variants" %>>
+      <li<%== ' class="active"' if current == "Variants" %>>
         <%= link_to t("variants"),  admin_product_variants_url(@product)  %>
       </li>
-      <li<%= raw(' class="active"') if current == "Option Types" %>>
+      <li<%== ' class="active"' if current == "Option Types" %>>
         <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
       </li>
-      <li<%= raw(' class="active"') if current == "Product Properties" %>>
+      <li<%== ' class="active"' if current == "Product Properties" %>>
         <%= link_to t("product_properties"), admin_product_product_properties_url(@product) %>
       </li>
-      <li<%= raw(' class="active"') if current == "Taxons" %>>
+      <li<%== ' class="active"' if current == "Taxons" %>>
         <%= link_to t("taxons"), selected_admin_product_taxons_url(@product) %>
       </li>
 

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

@@ -8,12 +8,12 @@
   </thead>
   <tbody>
     <% @states.each do |state| %>
-      <tr>
+      <tr id="<%= dom_id state %>">
         <td><%=state.name %></td>
         <td><%=state.abbr %></td>
         <td class="actions">
           <%=link_to_with_icon 'edit', t("edit"), edit_admin_country_state_url(@country, state) %> &nbsp;
-          <%=link_to_with_icon 'delete', t("delete"), object_url(state), :method => :delete %>
+          <%=link_to_delete state %>
         </td>
       </tr>
     <% end %>

data/app/views/admin/taxonomies/_js_head.html.erb

@@ -1,11 +1,9 @@
 <% content_for :head do %>
-  <%= javascript_tag "var taxonomy_id = #{@taxonomy.id}; 
-    var loading = '#{escape_javascript t('loading')}'; 
+  <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};
+    var loading = '#{escape_javascript t('loading')}';
     var new_taxon = '#{escape_javascript t('new_taxon')}';
     var server_error = '#{escape_javascript t('server_error')}';
-    var taxonomy_tree_error = '#{escape_javascript t('taxonomy_tree_error')}';" 
-  %> 
-  <%= javascript_include_tag 'taxonomy' %>
-  <script type="text/javascript" src="/javascripts/jsTree/jquery.tree.js"></script>
-  <script type="text/javascript" src="/javascripts/jsTree/plugins/jquery.tree.contextmenu.js"></script>
-<% end %>
+    var taxonomy_tree_error = '#{escape_javascript t('taxonomy_tree_error')}';"
+  %>
+  <%= javascript_include_tag 'taxonomy' , 'jquery.cookie.js', 'jsTree/jquery.jstree.js' %>
+<% end %>

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

@@ -9,7 +9,7 @@
 <%= form_for(:taxon, :url => admin_taxonomy_url, :html => { :method => :put }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 	  <div>
-	    <label><%= t("tree")%></label><br />	
+	    <label><%= t("tree")%></label><br />
       <div id="taxonomy_tree" class="tree"></div>
   	</div>
   	<p id="progress" style="display:none;">
@@ -26,24 +26,24 @@
 <% content_for :head do %>
   <script type="text/javascript">
     var initial = [
-	   	{ attributes : 
-	   	  { "id" : "<%= @taxonomy.root.id %>" }, 
-			data : "<%= @taxonomy.root.name %>",
-			state : "open",
-			children : [
+	   	{ "attr" :
+	   	  { "id" : "<%= @taxonomy.root.id %>", "rel" : "root" },
+			"data" : "<%= @taxonomy.root.name %>",
+			"state" : "open",
+			"children" : [
 				<% @taxonomy.root.children.each_with_index do |taxon,i| %>
 					{
-						attributes :
-						{ id : "<%= taxon.id %>"},
-						data : "<%= taxon.name %>"
+						"attr" :
+						{ "id" : "<%= taxon.id %>"},
+						"data" : "<%= taxon.name %>"
 						<% unless taxon.children.empty? %>
-							,state : "closed"
+							,"state" : "closed"
 						<% end %>
 					}<%= "," if i < (@taxonomy.root.children.size - 1) %>
 				<% end %>
 			]
       	}
     ];
-    
+
   </script>
 <% end %>

data/app/views/admin/taxonomies/get_children.json.erb

@@ -1,9 +1,9 @@
 [<% @taxons.each_with_index do |t,i| %>
-	{ attributes : 
-	  { "id" : "<%= t.id %>" }, 
-		data : "<%= t.name %>"
+	{ "attr" :
+	  { "id" : "<%= t.id %>" },
+		"data" : "<%= t.name %>"
 		<% unless t.children.empty? %>
-			,state : "closed"
+			,"state" : "closed"
 		<% end %>
 	}<%= "," if i < (@taxons.size - 1) %>
-<% end %>]
+<% end %>]

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

@@ -7,23 +7,23 @@
 </script>
 <h4><%= t('available_taxons') %></h4>
 <table class="index">
-	<thead>
-		<tr>
-			<th><%= t("name") %></th>
-			<th><%= t("path") %></th>
-			<th><%= t("action") %></th>
-		</tr>
-	</thead>
-	<tbody>
+  <thead>
+    <tr>
+      <th><%= t("name") %></th>
+      <th><%= t("path") %></th>
+      <th><%= t("action") %></th>
+    </tr>
+  </thead>
+  <tbody>
     <% @available_taxons.each do |taxon| %>
       <tr id="<%= dom_id(taxon, :sel) %>">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
-		    <td class="actions">
+        <td class="actions">
           <%= link_to icon('add') + ' ' + t("select"),
                             select_admin_product_taxon_path(@product, taxon),
                            :remote => true, :class => 'iconlink' %>
-		    </td>        
+        </td>        
       </tr>
     <% end %>
     <% if @available_taxons.empty? %>

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

@@ -17,25 +17,25 @@
      data: {q: jQuery("#searchtext").val() }, 
      success: function(request){
        jQuery('#search_hits').html(request);
-     }, 
-     type: 'post', 
+     },
+     type: 'post',
      url: '<%= available_admin_product_taxons_url(@product) %>'
-    });    
+    });
   }
-  
-  jQuery("#searchtext").keypress(function (e) {  
-    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {  
+
+  jQuery("#searchtext").keypress(function (e) {
+    if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
       search_for_taxons();
 
-      return false;  
-    } else {  
-       return true;  
-    }  
+      return false;
+    } else {
+       return true;
+    }
   });
-  
-  jQuery("#searchtext").delayedObserver(0.75, function(element, value) {
+
+  jQuery("#searchtext").delayedObserver(function() {
     search_for_taxons();
-  })
+  }, 0.75);
 <% end %>
 <br/>
 <div id="search_hits"></div>