spree_core 0.60.6 → 0.70.RC1

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

@@ -1,8 +1,12 @@
 jQuery('#preview_container').html('<%= escape_javascript( render('admin/product_groups/preview') ) %>');
-<% notice = flash.delete(:notice) %>
+<% notice = flash[:notice] %>
+<% flash.delete(:notice) %>
 flash_notice = jQuery('.flash.notice');
 if (flash_notice.length > 0) {
   flash_notice.html('<%= notice %>');
 } else {
   jQuery('#content h1').before('<div class="flash notice"><%= notice %></div>');
 }
+
+//set form action in case permalink changes
+jQuery('form#product-group-form').attr('action', '<%= url_for([:admin, @product_group]) %>');

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

@@ -1,4 +1,4 @@
-<tr class="product_property fields">
+<tr class="product_property fields"  data-hook="product_property">
   <td class='property_name'>
     <%= f.text_field :property_name, :class => "autocomplete" %>
   </td>

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

@@ -7,13 +7,13 @@
 <%= form_for(@product, :url => admin_product_url(@product), :html => { :method => :put }) do |f| %>
   <table class="index">
     <thead>
-      <tr>
+      <tr data-hook="product_properties_header">
         <th><%= t("property") %></th>
         <th><%= t("value") %></th>
         <th><%= t("action") %></th>
       </tr>
     </thead>
-    <tbody id="product_properties">
+    <tbody id="product_properties" data-hook>
       <%= f.fields_for :product_properties do |pp_form| %>
         <%= render 'product_property_fields', :f => pp_form %>
       <% end %>
@@ -22,7 +22,7 @@
 
   <input type="hidden" name="clear_product_properties" value="true">
 
-  <p class='add_product_properties'>
+  <p class="add_product_properties" data-hook="add_product_properties">
     <%= link_to_add_fields  icon('add') + ' ' + t("add_product_properties"),
                             "tbody#product_properties",
                             f,
@@ -30,14 +30,14 @@
 
     &nbsp;&nbsp;
 
-  	<span id="new_ptype_link">
-  	  <%= link_to t("select_from_prototype"), available_admin_prototypes_url,
-  	              :remote => true, 'data-update' => "prototypes" %>
-  	</span>
-	</p>
-	<div id="prototypes"></div>
-	<%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
-	<br/>
+    <span id="new_ptype_link">
+      <%= link_to t("select_from_prototype"), available_admin_prototypes_url,
+                  :remote => true, 'data-update' => "prototypes" %>
+    </span>
+  </p>
+  <div id="prototypes" data-hook></div>
+    <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+    <br/>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>
 

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

@@ -1,93 +1,96 @@
 <div class="yui-gc">
-  <div class="yui-u first">
-    <%- locals = {:f => f} %>
-    <%= hook :admin_product_form_left, locals do %>
-      <%= f.field_container :name do %>
-        <%= f.label :name, t("name") %> <span class="required">*</span><br />
-        <%= f.text_field :name, :class => 'fullwidth title'  %>
-        <%= f.error_message_on :name %>
-      <% end %>
+  <div class="yui-u first" data-hook="admin_product_form_left">
+    <%= f.field_container :name do %>
+      <%= f.label :name, t("name") %> <span class="required">*</span><br />
+      <%= f.text_field :name, :class => 'fullwidth title'  %>
+      <%= f.error_message_on :name %>
+    <% end %>
 
-      <%= f.field_container :permalink do %>
-        <%= f.label :permalink, t("permalink") %> <span class="required">*</span><br />
-        <%= f.text_field :permalink, :class => 'fullwidth title'  %>
-        <%= f.error_message_on :permalink %>
-      <% end %>
+    <%= f.field_container :permalink do %>
+      <%= f.label :permalink, t("permalink") %> <span class="required">*</span><br />
+      <%= f.text_field :permalink, :class => 'fullwidth title'  %>
+      <%= f.error_message_on :permalink %>
+    <% end %>
 
-      <%= f.field_container :description do %>
-        <%= f.label :description, t("description")%><br />
-        <%= f.text_area :description, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
-        <%= f.error_message_on :description %>
-      <% end %>
+    <%= f.field_container :description do %>
+      <%= f.label :description, t("description")%><br />
+      <%= f.text_area :description, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
+      <%= f.error_message_on :description %>
     <% end %>
   </div>
-  <div class="yui-u">
-    <%= hook :admin_product_form_right, locals do %>
+  <div class="yui-u" data-hook="admin_product_form_right">
       <%= f.field_container :price do %>
-        <%= f.label :price, t("master_price")%> <span class="required">*</span><br />
+        <%= f.label :price, t("master_price")%> <span class="required">*</span><br>
         <%= f.text_field :price, :value => number_with_precision(@product.price, :precision => 2)  %>
         <%= f.error_message_on :price %>
       <% end %>
 
+      <%if Spree::Config[:show_price_inc_vat] %>
+        <%= label_tag :price_includes_vat , I18n.t(:price_with_vat_included, :price => I18n.t(:price)) %><br>
+        <%= text_field_tag :price_including_vat, product_price(@product, :show_vat_text => false), :size => 30 %>
+        <script type="text/javascript">
+          var effective_tax_rate = <%= @product.effective_tax_rate %>;
+        </script>
+      <%end%>
+
       <%= f.field_container :cost_price do %>
         <%= f.label :cost_price, t("cost_price")%><br />
         <%= f.text_field :cost_price, :value => number_with_precision(@product.cost_price, :precision => 2) %>
-        <%= f.error_message_on :cost_price %>
-      <% end %>
+      <%= f.error_message_on :cost_price %>
+    <% end %>
 
-      <p>
-        <%= f.label :available_on, t("available_on") %><br />
-        <%= f.error_message_on :available_on %>
-        <%= f.spree_date_picker :available_on %>
-      </p>
+    <p>
+      <%= f.label :available_on, t("available_on") %><br />
+      <%= f.error_message_on :available_on %>
+      <%= f.text_field :available_on, :class => 'datepicker' %>
+    </p>
 
-      <p>
-        <%= f.label :sku, t("sku") %><br />
-        <%= f.text_field :sku, :size => 16 %>
-      </p>
-      <% unless @product.has_variants? %>
-        <% if Spree::Config[:track_inventory_levels] %>
-          <p>
-            <%= f.label :on_hand, t("on_hand")%><br />
-            <%= f.text_field :on_hand, :size => 4 %>
-          </p>
-        <% end %>
-        <ul id="shipping-specs">
-          <li>
-            <%= f.label :weight, t("weight")%>
-            <%= f.text_field :weight, :size => 4 %>
-          </li>
-          <li>
-            <%= f.label :height, t("height")%>
-            <%= f.text_field :height, :size => 4 %>
-          </li>
-          <li>
-            <%= f.label :width, t("width")%>
-            <%= f.text_field :width, :size => 4 %>
-          </li>
-          <li>
-            <%= f.label :depth, t("depth")%>
-            <%= f.text_field :depth, :size => 4 %>
-          </li>
-        </ul>
+    <p>
+      <%= f.label :sku, t("sku") %><br />
+      <%= f.text_field :sku, :size => 16 %>
+    </p>
+    <% unless @product.has_variants? %>
+      <% if Spree::Config[:track_inventory_levels] %>
+        <p>
+          <%= f.label :on_hand, t("on_hand")%><br />
+          <%= f.text_field :on_hand, :size => 4 %>
+        </p>
       <% end %>
-      <p>
-        <%= f.label :shipping_category_id, t("shipping_categories")%><br />
-        <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
-        <%= f.error_message_on :shipping_category %>
-      </p>
-
-      <p>
-        <%= f.label :tax_category_id, t("tax_category")%><br />
-        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
-        <%= f.error_message_on :tax_category%>
-      </p>
+      <ul id="shipping-specs">
+        <li>
+          <%= f.label :weight, t("weight")%>
+          <%= f.text_field :weight, :size => 4 %>
+        </li>
+        <li>
+          <%= f.label :height, t("height")%>
+          <%= f.text_field :height, :size => 4 %>
+        </li>
+        <li>
+          <%= f.label :width, t("width")%>
+          <%= f.text_field :width, :size => 4 %>
+        </li>
+        <li>
+          <%= f.label :depth, t("depth")%>
+          <%= f.text_field :depth, :size => 4 %>
+        </li>
+      </ul>
     <% end %>
+    <p>
+      <%= f.label :shipping_category_id, t("shipping_categories")%><br />
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
+      <%= f.error_message_on :shipping_category %>
+    </p>
+
+    <p>
+      <%= f.label :tax_category_id, t("tax_category")%><br />
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, {:include_blank => true}, {"style" => "width:200px"}) %>
+      <%= f.error_message_on :tax_category%>
+    </p>
   </div>
 </div>
 
 <h2><%= t("metadata") %></h2>
-<%= hook :admin_product_form_meta, locals do %>
+<div data-hook="admin_product_form_meta">
   <p>
     <%= f.label :meta_keywords, t("meta_keywords")%><br />
     <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
@@ -96,11 +99,11 @@
     <%= f.label :meta_description, t("meta_description")%><br />
     <%= f.text_field :meta_description, :class => 'fullwidth' %>
   </p>
-<% end %>
+</div>
 
 
-<%= hook :admin_product_form_additional_fields, locals do %>
+<div data-hook="admin_product_form_additional_fields">
   <% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
     <%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
   <% end %>
-<% end %>
+</div>

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

@@ -1,40 +1,40 @@
 <h2><%= t("selected_option_types") %></h2>
-<table class="option-types">
-	<thead>
-		<tr>
-			<th><%= t("name") %></th>
-			<th><%= t("display") %></th>
-			<th><%= t("action") %></th>
-		</tr>
-	</thead>
-	<tbody>
-		<% @product.selected_options.each do |so| %>
-			<tr>
-				<td><%=so.option_type.name%></td>
-				<td><%=so.option_type.presentation%></td>
-				<td>
-				  <%= link_to_remote t("remove"),
-				                     :url => {:action => 'remove_option_type', :id=> @product, :product_option_type_id => so},
-				                     :before => "jQuery('#select-link').hide(); jQuery('#busy_indicator').show()", 
-				                     :complete => "jQuery('#busy_indicator').hide()",
-				                     :update => 'option-type-listing' %>
-				</td>
-			</tr>
-		<% end %>
-		<% if @product.selected_options.empty? %>
-			<tr>
-				<td colspan="3"><%= t(:none) %></td>
-			</tr>
-		<% end %>
-	</tbody>
+<table class="option-types" data-hook="option_types">
+  <thead>
+    <tr data-hook="option_types_header">
+      <th><%= t("name") %></th>
+      <th><%= t("display") %></th>
+      <th><%= t("action") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @product.selected_options.each do |so| %>
+      <tr data-hook="option_types_row">
+        <td><%=so.option_type.name%></td>
+        <td><%=so.option_type.presentation%></td>
+        <td>
+          <%= link_to_remote t("remove"),
+                             :url => {:action => 'remove_option_type', :id=> @product, :product_option_type_id => so},
+                             :before => "jQuery('#select-link').hide(); jQuery('#busy_indicator').show()", 
+                             :complete => "jQuery('#busy_indicator').hide()",
+                             :update => 'option-type-listing' %>
+        </td>
+      </tr>
+    <% end %>
+    <% if @product.selected_options.empty? %>
+      <tr>
+        <td colspan="3"><%= t(:none) %></td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 <% unless @product.new_record? %>
-  <span id="select-link">
-	  <%= link_to_remote icon('delete') + ' ' + t("select_option_type"), {
-	                     :url => {:controller => 'option_types', :action => 'select', :id=> @product},
-	                     :update => 'new-option-type'}, :class => 'iconlink' %>
+  <span id="select-link" data-hook>
+    <%= link_to_remote icon('delete') + ' ' + t("select_option_type"), {
+                       :url => {:controller => 'option_types', :action => 'select', :id=> @product},
+                       :update => 'new-option-type'}, :class => 'iconlink' %>
   </span>
-	<%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+  <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 <% end %>
 <br/>
-<div id="new-option-type"></div>
+<div id="new-option-type" data-hook></div>

data/app/views/admin/products/_properties_form.erb

@@ -1,7 +1,7 @@
 <h2>Properties</h2>
 <% f.fields_for :product_properties do |properties_form| %>
-    <p>
+    <p data-hook="value">
       <%= properties_form.label :value, properties_form.object.property.presentation %><br />
       <%= properties_form.text_field :value %>
     </p>
-<% end %>
+<% end %>

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

@@ -1,10 +1,9 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
 <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Product Details"} %>
+<%= render "shared/error_messages", :target => @product %>
 
-<%= form_for(@product, :url => object_url, :html => { :method => :put, :multipart => true }) do |f| %>
+<%= form_for([:admin, @product], :html => { :method => :put, :multipart => true }) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>
-
-

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

@@ -1,7 +1,7 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li id="new_product_link">
       <%= button_link_to t("new_product"), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_product'} %>
     </li>
@@ -11,49 +11,40 @@
 
 <h1><%= "#{t("actions.listing")} #{t("products")}" %></h1>
 
-<div id="new_product"></div>
+<div id="new_product" data-hook></div>
 
 <table class="index" id='listing_products'>
-  <tr>
-    <%= hook :admin_products_index_headers do %>
-      <th><%= t("sku") %></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 %>
-    </th>
+  <tr data-hook="admin_products_index_headers">
+    <th><%= t("sku") %></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>
+    <th data-hook="admin_products_index_header_actions"></th>
   </tr>
 <% @collection.each do |product| %>
-  <tr <%= 'style="color:red;"' if product.deleted? %> id="<%= dom_id product %>">
-    <%- locals = {:product => product} %>
-    <%= hook :admin_products_index_rows, locals do %>
-      <td><%= product.sku %></td>
-      <td><%= product.name %></td>
-      <td><%= product.price %></td>
-    <% end %>
-    <td class="actions">
-      <%= hook :admin_products_index_row_actions, locals do %>
-        <%= link_to_edit product, :class => 'edit' unless product.deleted?  %>
-        &nbsp;
-        <%= link_to_clone product, :class => 'clone' %>
-        &nbsp;
-        <%= link_to_delete product unless product.deleted?  %>
-      <% end %>
+  <tr <%= 'style="color:red;"' if product.deleted? %> id="<%= dom_id product %>" data-hook="admin_products_index_rows">
+    <td><%= product.sku %></td>
+    <td><%= product.name %></td>
+    <td><%= number_to_currency product.price %></td>
+    <td class="actions" data-hook="admin_products_index_row_actions">
+      <%= link_to_edit product, :class => 'edit' unless product.deleted?  %>
+      &nbsp;
+      <%= link_to_clone product, :class => 'clone' %>
+      &nbsp;
+      <%= link_to_delete product unless product.deleted?  %>
     </td>
   </tr>
 <% end %>
 </table>
-<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+<%= paginate @products %>
 
 <% content_for :sidebar do %>
-  <%= hook :admin_products_sidebar do %>
+  <div data-hook="admin_products_sidebar">
     <%= form_for [:admin, @search] do |f| %>
       <div class="box">
         <h3><%= t(:search) %></h3>
 
         <%- locals = {:f => f} %>
-        <%= hook :admin_products_index_search, locals do %>
+        <div data-hook="admin_products_index_search">
           <p>
             <%= f.label :name_contains, t("name") %><br />
             <%= f.text_field :name_contains, :size => 15 %>
@@ -66,15 +57,15 @@
             <%= 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 %>
+        </div>
 
-        <%= hook :admin_products_index_search_buttons, locals do %>
+        <div data-hook="admin_products_index_search_buttons">
           <p class="form-buttons">
             <%= button t("search") %>
           </p>
-        <% end %>
+        </div>
       </div>
     <% end %>
-  <% end %>
+  </div>
 <% end %>