spree_core 0.60.6 → 0.70.RC1

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

@@ -1,16 +1,16 @@
-<div id="add-line-item">
+<div id="add-line-item" data-hook>
   <fieldset>
     <legend><%= t('add_product') %></legend>
-    <div style="float:left;width:65%;margin-right:5%;">
+    <div style="float:left;width:65%;margin-right:5%;" data-hook="add_product_name">
       <%= label_tag :add_product_name, t("name_or_sku") %>
       <%= 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%;">
+    <div style="float:left;width:10%;margin-right:5%;" data-hook="add_quantity">
       <%= label_tag :add_quantity, t("qty") %>
       <%= text_field_tag :add_quantity,  1 , :class => 'fullwidth title'  %>
     </div>
-    <div style="float: left; width: 15%; padding-top: 17px;">
+    <div style="float: left; width: 15%; padding-top: 17px;" data-hook="add_button">
       <%= link_to text_for_button_link(t("add"), :icon => 'add'),
             admin_order_line_items_url(@order),
             {:id => 'add_line_item_to_order', :class => 'button', 'data-update' => 'order-form-wrapper'} %>

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

@@ -6,56 +6,46 @@
   <%= f.hidden_field :number %>
   <table class="index">
     <tbody id='line-items'>
-      <tr>
-        <%= hook :admin_order_form_line_items_headers do %>
-          <th><%= t('item_description') %></th>
-          <th class="price"><%= t('price') %></th>
-          <th class="qty"><%= t('qty') %></th>
-          <th class="total"><span><%= t('total') %></span></th>
-        <% end %>
-        <th class="orders-actions"><%= hook :admin_order_form_line_items_header_actions %></th>
+      <tr data-hook="admin_order_form_line_items_headers">
+        <th><%= t('item_description') %></th>
+        <th class="price"><%= t('price') %></th>
+        <th class="qty"><%= t('qty') %></th>
+        <th class="total"><span><%= t('total') %></span></th>
+        <th class="orders-actions" data-hook="admin_order_form_line_items_header_actions"></th>
       </tr>
       <%= f.fields_for :line_items do |li_form| %>
         <%= render :partial => "admin/orders/line_item", :locals => { :f => li_form } %>
       <% end %>
     </tbody>
-    <%= hook :admin_order_form_subtotal do %>
-      <tbody id='subtotal'>
-        <tr id="subtotal-row">
-          <td colspan="3"><b><%= t('subtotal') %>:</b></td>
-          <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
-          <td></td>
-        </tr>
-      </tbody>
-    <% end %>
-    <%= hook :admin_order_form_adjustments do %>
-      <tbody id="order-charges">
-        <% @order.adjustments.each do |adjustment| %>
-          <tr>
-            <td colspan="3"><strong><%= adjustment.label %></strong></td>
-            <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
-            <td></td>
-          </tr>
-        <% end %>
-      </tbody>
-    <% end %>
-    <%= hook :admin_order_form_total do %>
-      <tbody id='order-total'>
+    <tbody id='subtotal' data-hook="admin_order_form_subtotal">
+      <tr id="subtotal-row">
+        <td colspan="3"><b><%= t('subtotal') %>:</b></td>
+        <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+        <td></td>
+      </tr>
+    </tbody>
+    <tbody id="order-charges" data-hook="admin_order_form_adjustments">
+      <% @order.adjustments.each do |adjustment| %>
         <tr>
-          <td colspan="3"><b><%= t('order_total') %>:</b></td>
-          <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+          <td colspan="3"><strong><%= adjustment.label %></strong></td>
+          <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
           <td></td>
         </tr>
-      </tbody>
-    <% end %>
+      <% end %>
+    </tbody>
+    <tbody id='order-total' data-hook="admin_order_form_total">
+      <tr>
+        <td colspan="3"><b><%= t('order_total') %>:</b></td>
+        <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+        <td></td>
+      </tr>
+    </tbody>
   </table>
 
-  <%= hook :admin_order_form_buttons do %>
-    <p class="form-buttons">
-      <%= button @order.complete? ? t('update') : t('continue') %>
-      <%= t("or") %> <%= link_to t("actions.cancel"), admin_orders_url %>
-    </p>
-  <% end %>
+  <p class="form-buttons" data-hook="admin_order_form_buttons">
+    <%= button @order.complete? ? t('update') : t('continue') %>
+    <%= t("or") %> <%= link_to t("actions.cancel"), admin_orders_url %>
+  </p>
 
 <% end %>
 
@@ -63,5 +53,4 @@
   <%= render 'admin/shared/update_order_state.js' %>
 </script>
 
-<%= javascript_include_tag 'admin/orders/edit_form.js' %>
-
+<%= javascript_include_tag 'admin/orders/edit_form' %>

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

@@ -1,17 +1,12 @@
-<tr id="<%= dom_id(f.object) %>">
-  <%- locals = {:f => f} %>
-  <%= hook :admin_order_form_line_item_row, locals do %>
-    <td width="300"><%=f.object.variant.product.name%> <%= "(" + variant_options(f.object.variant) + ")" unless f.object.variant.option_values.empty? %></td>
-    <td valign="top" class="price"><%= number_to_currency f.object.price %></td>
-    <td valign="top" class="qty"><%=f.text_field :quantity, :style => "width:30px;", :class => "qty" %></td>
-    <td valign="top" class="total"><%= number_to_currency (f.object.price * f.object.quantity)%></td>
-  <% end %>
-  <td>
-    <%= 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);}"},
-                                    :title => "admin_delete_#{dom_id(@order)}" %>
-    <% end %>
+<tr id="<%= dom_id(f.object) %>" data-hook="admin_order_form_line_item_row">
+  <td width="300"><%=f.object.variant.product.name%> <%= "(" + variant_options(f.object.variant) + ")" unless f.object.variant.option_values.empty? %></td>
+  <td valign="top" class="price"><%= number_to_currency f.object.price %></td>
+  <td valign="top" class="qty"><%=f.text_field :quantity, :style => "width:30px;", :class => "qty" %></td>
+  <td valign="top" class="total"><%= number_to_currency (f.object.price * f.object.quantity)%></td>
+  <td data-hook="admin_order_form_line_item_actions">
+    <%= 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);}"},
+                                  :title => "admin_delete_#{dom_id(@order)}" %>
   </td>
 </tr>

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

@@ -1,11 +1,11 @@
 
 <h3><%= t("customer_details") %></h3>
-<table class="index">
+<table class="index" data-hook="customer_guest">
   <thead>
     <th colspan="8"><%= t('account') %></th>
   </thead>
   <tbody>
-    <tr>
+    <tr data-hook="customer_fields">
       <td class="lbl-col"><%= f.label :email, t(:email)+':' %></td>
       <td class="val-col" colspan="3"><%= f.text_field :email, :class => "fullwidth" %></td>
       <td class="lbl-col"><label><%= t('guest_checkout') %>:</label></td>
@@ -13,15 +13,16 @@
         <% if @order.completed? %>
           <%= @order.user.nil? ? "Yes" : "No" %>
         <% else %>
+          <% guest = @order.user.nil? || @order.user.anonymous? %>
           <label class="sub">
-            <%= radio_button_tag :guest_checkout, true, @order.user.nil? %>
+            <%= radio_button_tag :guest_checkout, true, guest %>
             <%= t("yes") %>
           </label> &nbsp;
           <label class="sub">
-            <%= radio_button_tag :guest_checkout, false, !@order.user.nil?, :disabled => @order.cart? %>
+            <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
             <%= t("no") %>
           </label>
-          <%= hidden_field_tag :user_id, @order.user_id %>
+          <%= text_field_tag :user_id, @order.user_id %>
         <% end %>
       </td>
     </tr>
@@ -37,6 +38,10 @@
   <%= render :partial => "admin/shared/address_form", :locals => {:f => sa_form, :name => t('shipping_address'), :use_billing => true} %>
 <% end %>
 
-<p class="form-buttons">
+<p class="form-buttons" data-hook="buttons">
   <%= button @order.cart? ? t('continue') : t('update') %>
 </p>
+
+<% content_for :head do %>
+  <%= javascript_include_tag '/states.js', 'admin/address_states.js' %>
+<% end %>

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

@@ -1,31 +1,27 @@
-<%= csrf_meta_tag %>
-<div class='order-links'>
-  <%= hook :admin_order_edit_buttons do %>
-    <div class='toolbar'>
-      <%= event_links %>
-    </div>
-    <div class='toolbar'>
-      <%= button_link_to(t("resend"), resend_admin_order_url(@order), :method => :post, :icon => 'send-email') if @order.user %>
-    </div>
-  <% end %>
+<%= csrf_meta_tags %>
+<div class='order-links' data-hook="admin_order_edit_buttons">
+  <div class='toolbar'>
+    <%= event_links %>
+  </div>
+  <div class='toolbar'>
+    <%= button_link_to(t("resend"), resend_admin_order_url(@order), :method => :post, :icon => 'send-email') if @order.user %>
+  </div>
 </div>
 
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
 
-<%= hook :admin_order_edit_header do %>
+<div data-hook="admin_order_edit_header">
   <%= render "shared/error_messages", :target => @order %>
-<% end %>
+</div>
 
 <%= render :partial => "add_product" %>
 
-<%= hook :admin_order_edit_form do %>
+<div data-hook="admin_order_edit_form">
   <div id="order-form-wrapper">
     <%= render :partial => 'form', :locals => {:order => @order} %>
   </div>
-<% end %>
+</div>
 
 <% content_for :head do %>
   <%= javascript_tag "var expand_variants = true;" %>
-  <%= javascript_include_tag 'admin/orders/edit.js' %>
-  <%= stylesheet_link_tag 'admin/edit_orders.css' %>
 <% end %>

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

@@ -3,7 +3,7 @@
 <h2><%= t("history")%></h2>
 
 <table class="index">
-  <tr>
+  <tr data-hook="history_header">
     <th><%= t("event") %></th>
     <th><%= t("from_state") %></th>
     <th><%= t("to_state") %></th>
@@ -11,7 +11,7 @@
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
   </tr>
   <% @order.state_events.sort.each do |event| %>
-    <tr>
+    <tr data-hook="history_row">
       <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>
@@ -20,7 +20,7 @@
     </tr>
   <% end %>
   <% if @order.state_events.empty? %>
-    <tr>
+    <tr data-hook="history_none">
       <td colspan="5"><%= t("none_available") %></td>
     </tr>
   <% end %>

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

@@ -6,66 +6,55 @@
 
 <h1><%= t("listing_orders") %></h1>
 
-<table class="index" id='listing_orders'>
+<table class="index" id='listing_orders' data-hook>
   <thead>
-    <tr>
-      <%= hook :admin_orders_index_headers do %>
-        <% 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>
+    <tr data-hook="admin_orders_index_headers">
+      <% 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>
-        <%= hook :admin_orders_index_header_actions %>
-      </th>
+      <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>
+      <th data-hook="admin_orders_index_header_actions"></th>
     </tr>
   </thead>
   <tbody>
   <% @orders.each do |order| %>
-    <tr>
-      <%- locals = {:order => order} %>
-      <%= hook :admin_orders_index_rows, locals do %>
-        <td><%= (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
-        <td><%= link_to order.number, admin_order_path(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>
-        <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
-        <td><%= order.email %></td>
-        <td><%= number_to_currency order.total %></td>
-      <% end %>
-      <td class='actions'>
-        <%= hook :admin_orders_index_row_actions, locals do %>
-          <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}" %>
-        <% end %>
+    <tr data-hook="admin_orders_index_rows">
+      <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+      <td><%= link_to order.number, admin_order_path(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>
+      <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
+      <td><%= order.email %></td>
+      <td><%= number_to_currency order.total %></td>
+      <td class='actions' data-hook="admin_orders_index_row_actions">
+        <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}" %>
       </td>
     </tr>
   <% end %>
   </tbody>
 </table>
-<%= will_paginate(@orders, :previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+<%= paginate @orders %>
 
 
 <% content_for :sidebar do %>
-<div class="box">
-  <h3><%= t(:search) %></h3>
-  <%= form_for [:admin, @search] do |f| %>
-    <%- locals = {:f => f} %>
-    <%= hook :admin_orders_index_search, locals do %>
+  <div class="box" data-hook="admin_orders_index_search">
+    <h3><%= t(:search) %></h3>
+    <%= form_for [:admin, @search] do |f| %>
       <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.text_field :created_at_greater_than, :class => 'datepicker' %><br />
           <label class="sub"><%= t("start") %></label>
         </div>
         <div class="yui-u sub-field">
-          <%= f.spree_date_picker :created_at_less_than %><br />
+          <%= f.text_field :created_at_less_than, :class => 'datepicker' %><br />
           <label><%= t("stop") %></label>
         </div>
       </div>
@@ -94,10 +83,9 @@
           <%= t("show_only_complete_orders") %>
         </label>
       </p>
+      <div data-hook="admin_orders_index_search_buttons">
+        <p><%= button t("search") %></p>
+      </div>
     <% end %>
-    <%= hook :admin_orders_index_search_buttons, locals do %>
-      <p><%= button t("search") %></p>
-    <% end %>
-  <% end %>
-</div>
+  </div>
 <% end %>

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

@@ -1,20 +1,19 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
-<%= csrf_meta_tag %>
+<%= csrf_meta_tags %>
 
-<%= hook :admin_order_new_header do %>
+<div data-hook="admin_order_new_header">
   <h2><%= t("new_order")%></h2>
   <%= render 'shared/error_messages', :target => @order %>
-<% end %>
+</div>
 
 <%= render :partial => "add_product" %>
 
-<%= hook :admin_order_new_form do %>
+<div data-hook="admin_order_new_form">
   <div id="order-form-wrapper">
     <%= render :partial => "form" %>
   </div>
-<% end %>
+</div>
 
 <% content_for :head do %>
   <%= javascript_tag "var expand_variants = true;" %>
-  <%= javascript_include_tag 'admin/orders/edit.js' %>
 <% end %>

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

@@ -1,13 +1,11 @@
-<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 => t('are_you_sure') if @order.can_cancel? %>
-    <%= button_link_to t("edit"), edit_admin_order_url(@order.number), :icon => 'edit' %>
-  <% end %>
+<div class='toolbar order-links' data-hook="admin_order_show_buttons">
+  <%= 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' %>
 </div>
 
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Order Details"} %>
 
-<%= hook :admin_order_show_addresses do %>
+<div data-hook="admin_order_show_addresses">
   <% if @order.bill_address %>
     <div class='adr'>
       <h4><%= t("bill_address") %></h4>
@@ -21,8 +19,8 @@
     </div>
     <% end %>
   <hr />
-<% end %>
+</div>
 
-<%= hook :admin_order_show_details do %>
+<div data-hook="admin_order_show_details">
   <%= render :partial => 'admin/shared/order_details', :locals => {:order => @order} %>
-<% end %>
+</div>

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

@@ -1,8 +1,8 @@
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Customer Details"} %>
-<%= csrf_meta_tag %>
+<%= csrf_meta_tags %>
 
 <% if @order.cart? %>
-  <div id="add-line-item">
+  <div id="add-line-item" data-hook>
     <fieldset>
       <legend><%= t('customer_search') %></legend>
       <%= label_tag :customer_search, t("enter_atleast_five_letters") %>
@@ -17,8 +17,3 @@
   <%= f.hidden_field :number %>
   <%= render :partial => "user_form", :locals => {:f => f} %>
 <% end %>
-
-<% content_for :head do %>
-  <%= javascript_include_tag 'admin/checkouts/edit.js' %>
-
-<% end %>