spree_core 1.1.2.rc1 → 1.1.2

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

@@ -1,48 +1,48 @@
+<div data-hook="admin_customer_detail_form_fields">
+  <h3><%= t(:customer_details) %></h3>
+  <table class="index" data-hook="customer_guest">
+    <thead>
+      <th colspan="8"><%= t(:account) %></th>
+    </thead>
+    <tbody>
+      <tr data-hook="customer_fields">
+        <td class="lbl-col"><%= f.label :email, t(:email) + ':' %></td>
+        <td class="val-col" colspan="3"><%= f.email_field :email, :class => 'fullwidth' %></td>
+        <td class="lbl-col"><%= label_tag nil, t(:guest_checkout) %>:</td>
+        <td class="val-col" colspan="3">
+          <% if @order.completed? %>
+            <%= @order.user.nil? ? t(:yes) : t(:no) %>
+          <% else %>
+            <% guest = @order.user.nil? || @order.user.anonymous? %>
+            <label class="sub">
+              <%= radio_button_tag :guest_checkout, true, guest %>
+              <%= t(:yes) %>
+            </label> &nbsp;
+            <label class="sub">
+              <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+              <%= t(:no) %>
+            </label>
+            <%= hidden_field_tag :user_id, @order.user_id %>
+          <% end %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 
-<h3><%= t(:customer_details) %></h3>
-<table class="index" data-hook="customer_guest">
-  <thead>
-    <th colspan="8"><%= t(:account) %></th>
-  </thead>
-  <tbody>
-    <tr data-hook="customer_fields">
-      <td class="lbl-col"><%= f.label :email, t(:email) + ':' %></td>
-      <td class="val-col" colspan="3"><%= f.email_field :email, :class => 'fullwidth' %></td>
-      <td class="lbl-col"><%= label_tag nil, t(:guest_checkout) %>:</td>
-      <td class="val-col" colspan="3">
-        <% if @order.completed? %>
-          <%= @order.user.nil? ? t(:yes) : t(:no) %>
-        <% else %>
-          <% guest = @order.user.nil? || @order.user.anonymous? %>
-          <label class="sub">
-            <%= radio_button_tag :guest_checkout, true, guest %>
-            <%= t(:yes) %>
-          </label> &nbsp;
-          <label class="sub">
-            <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-            <%= t(:no) %>
-          </label>
-          <%= hidden_field_tag :user_id, @order.user_id %>
-        <% end %>
-      </td>
-    </tr>
-  </tbody>
-</table>
+  <h3><%= Spree::Address.model_name.human(:count => 2) %></h3>
+  <%= f.fields_for :bill_address do |ba_form| %>
+    <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => t(:billing_address), :use_billing => false } %>
+  <% end %>
 
-<h3><%= Spree::Address.model_name.human(:count => 2) %></h3>
-<%= f.fields_for :bill_address do |ba_form| %>
-  <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => t(:billing_address), :use_billing => false } %>
-<% end %>
+  <%= f.fields_for :ship_address do |sa_form| %>
+    <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => t(:shipping_address), :use_billing => true } %>
+  <% end %>
 
-<%= f.fields_for :ship_address do |sa_form| %>
-  <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => t(:shipping_address), :use_billing => true } %>
-<% end %>
-
-<p class="form-buttons" data-hook="buttons">
-  <%= button @order.cart? ? t(:continue) : t(:update) %>
-</p>
-
-<% content_for :head do %>
-  <%= javascript_include_tag states_url, 'admin/address_states.js' %>
-<% end %>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button @order.cart? ? t(:continue) : t(:update) %>
+  </p>
 
+  <% content_for :head do %>
+    <%= javascript_include_tag states_url, 'admin/address_states.js' %>
+  <% end %>
+</div>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -1,50 +1,52 @@
-<table data-hook="payment_method">
-  <tr data-hook="name">
-    <td><%= label_tag nil, t(:name) %></td>
-    <td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
-  </tr>
-  <tr data-hook="description">
-    <td><%= label_tag nil, t(:description) %></td>
-    <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
-  </tr>
-  <tr data-hook="environment">
-    <td><%= label_tag nil, t(:environment) %></td>
-    <td>
-      <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
-    </td>
-  </tr>
-  <tr data-hook="display">
-    <td><%= label_tag nil, t(:display) %></td>
-    <td>
-      <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }) %>
-    </td>
-  </tr>
-  <tr data-hook="active">
-    <td><%= label_tag nil, t(:active) %></td>
-    <td>
-      <label class="sub">
-        <%= radio_button :payment_method, :active, true %>
-        <%= t(:yes) %>
-      </label> &nbsp;
-      <label class="sub">
-        <%= radio_button :payment_method, :active, false %>
-        <%= t(:no) %>
-      </label>
-    </td>
-  </tr>
-</table>
+<div data-hook="admin_payment_method_form_fields">
+  <table data-hook="payment_method">
+    <tr data-hook="name">
+      <td><%= label_tag nil, t(:name) %></td>
+      <td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
+    </tr>
+    <tr data-hook="description">
+      <td><%= label_tag nil, t(:description) %></td>
+      <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
+    </tr>
+    <tr data-hook="environment">
+      <td><%= label_tag nil, t(:environment) %></td>
+      <td>
+        <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
+      </td>
+    </tr>
+    <tr data-hook="display">
+      <td><%= label_tag nil, t(:display) %></td>
+      <td>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }) %>
+      </td>
+    </tr>
+    <tr data-hook="active">
+      <td><%= label_tag nil, t(:active) %></td>
+      <td>
+        <label class="sub">
+          <%= radio_button :payment_method, :active, true %>
+          <%= t(:yes) %>
+        </label> &nbsp;
+        <label class="sub">
+          <%= radio_button :payment_method, :active, false %>
+          <%= t(:no) %>
+        </label>
+      </td>
+    </tr>
+  </table>
 
-<h2><%= t(:settings) %></h2>
+  <h2><%= t(:settings) %></h2>
 
-<div id="preference-settings" data-hook>
-  <%= f.label :type, t(:provider) %>
-  <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
+  <div id="preference-settings" data-hook>
+    <%= f.label :type, t(:provider) %>
+    <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
 
-  <% unless @object.new_record? %>
-    <%= preference_fields(@object, f) %>
+    <% unless @object.new_record? %>
+      <%= preference_fields(@object, f) %>
 
-    <% if @object.respond_to?(:preferences) %>
-      <div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
+      <% if @object.respond_to?(:preferences) %>
+        <div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
 </div>

data/app/views/spree/admin/payments/_form.html.erb

@@ -1,15 +1,17 @@
-<p>
-  <%= f.label :amount, t(:amount) %>
-  <%= f.text_field :amount, :size => 8, :value => @order.outstanding_balance %>
-</p>
+<div data-hook="admin_payment_form_fields">
+  <p>
+    <%= f.label :amount, t(:amount) %>
+    <%= f.text_field :amount, :size => 8, :value => @order.outstanding_balance %>
+  </p>
 
-<% @payment_methods.each do |method| %>
+  <% @payment_methods.each do |method| %>
 
-  <label data-hook="payment_method">
-    <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
-    <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
-  </label>
+    <label data-hook="payment_method">
+      <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
+      <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
+    </label>
 
-  <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+    <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
 
-<% end %>
+  <% end %>
+</div>

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

@@ -1,104 +1,106 @@
-<div class="clearfix">
-  <div class="left" 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 %>
+<div data-hook="admin_product_form_fields">
+  <div class="clearfix">
+    <div class="left" 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 :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="right" data-hook="admin_product_form_right">
-      <%= f.field_container :price do %>
-        <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
-        <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
-        <%= f.error_message_on :price %>
+      <%= 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 :cost_price do %>
-        <%= f.label :cost_price, t(:cost_price) %><br />
-        <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
-      <%= f.error_message_on :cost_price %>
-    <% 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="right" data-hook="admin_product_form_right">
+        <%= f.field_container :price do %>
+          <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
+          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
+          <%= f.error_message_on :price %>
+        <% end %>
 
-    <%= f.field_container :available_on do %>
-      <%= f.label :available_on, t(:available_on) %><br />
-      <%= f.error_message_on :available_on %>
-      <%= f.text_field :available_on, :class => 'datepicker' %>
-    <% end %>
+        <%= f.field_container :cost_price do %>
+          <%= f.label :cost_price, t(:cost_price) %><br />
+          <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
+        <%= f.error_message_on :cost_price %>
+      <% end %>
 
-    <% unless @product.has_variants? %>
-      <%= f.field_container :sku do %>
-        <%= f.label :sku, t(:sku) %><br />
-        <%= f.text_field :sku, :size => 16 %>
+      <%= f.field_container :available_on do %>
+        <%= f.label :available_on, t(:available_on) %><br />
+        <%= f.error_message_on :available_on %>
+        <%= f.text_field :available_on, :class => 'datepicker' %>
       <% end %>
 
-      <% if Spree::Config[:track_inventory_levels] %>
-        <%= f.field_container :on_hand do %>
-          <%= f.label :on_hand, t(:on_hand) %><br />
-          <%= f.number_field :on_hand, :min => 0 %>
+      <% unless @product.has_variants? %>
+        <%= f.field_container :sku do %>
+          <%= f.label :sku, t(:sku) %><br />
+          <%= f.text_field :sku, :size => 16 %>
+        <% end %>
+
+        <% if Spree::Config[:track_inventory_levels] %>
+          <%= f.field_container :on_hand do %>
+            <%= f.label :on_hand, t(:on_hand) %><br />
+            <%= f.number_field :on_hand, :min => 0 %>
+          <% end %>
         <% end %>
+
+        <ul id="shipping_specs">
+          <li id="shipping_specs_weight_field">
+            <%= f.label :weight, t(:weight) %>
+            <%= f.text_field :weight, :size => 4 %>
+          </li>
+          <li id="shipping_specs_height_field">
+            <%= f.label :height, t(:height) %>
+            <%= f.text_field :height, :size => 4 %>
+          </li>
+          <li id="shipping_specs_width_field">
+            <%= f.label :width, t(:width) %>
+            <%= f.text_field :width, :size => 4 %>
+          </li>
+          <li id="shipping_specs_depth_field">
+            <%= f.label :depth, t(:depth) %>
+            <%= f.text_field :depth, :size => 4 %>
+          </li>
+        </ul>
       <% end %>
 
-      <ul id="shipping_specs">
-        <li id="shipping_specs_weight_field">
-          <%= f.label :weight, t(:weight) %>
-          <%= f.text_field :weight, :size => 4 %>
-        </li>
-        <li id="shipping_specs_height_field">
-          <%= f.label :height, t(:height) %>
-          <%= f.text_field :height, :size => 4 %>
-        </li>
-        <li id="shipping_specs_width_field">
-          <%= f.label :width, t(:width) %>
-          <%= f.text_field :width, :size => 4 %>
-        </li>
-        <li id="shipping_specs_depth_field">
-          <%= f.label :depth, t(:depth) %>
-          <%= f.text_field :depth, :size => 4 %>
-        </li>
-      </ul>
-    <% end %>
+      <%= f.field_container :shipping_categories do %>
+        <%= 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 %>
+      <% end %>
+
+      <%= f.field_container :tax_category do %>
+        <%= 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 %>
+      <% end %>
+    </div>
+  </div>
 
-    <%= f.field_container :shipping_categories do %>
-      <%= 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 %>
+  <h2><%= t(:metadata) %></h2>
+  <div data-hook="admin_product_form_meta">
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords, t(:meta_keywords) %><br />
+      <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
     <% end %>
 
-    <%= f.field_container :tax_category do %>
-      <%= 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 %>
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, t(:meta_description) %><br />
+      <%= f.text_field :meta_description, :class => 'fullwidth' %>
     <% end %>
   </div>
-</div>
-
-<h2><%= t(:metadata) %></h2>
-<div data-hook="admin_product_form_meta">
-  <%= f.field_container :meta_keywords do %>
-    <%= f.label :meta_keywords, t(:meta_keywords) %><br />
-    <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
-  <% end %>
-
-  <%= f.field_container :meta_description do %>
-    <%= f.label :meta_description, t(:meta_description) %><br />
-    <%= f.text_field :meta_description, :class => 'fullwidth' %>
-  <% end %>
-</div>
 
-<div data-hook="admin_product_form_additional_fields">
-  <% Spree::Variant.additional_fields.select { |af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
-    <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
-  <% end %>
+  <div data-hook="admin_product_form_additional_fields">
+    <% Spree::Variant.additional_fields.select { |af| af[:only].nil? || af[:only].include?(:product) }.each do |field| %>
+      <%= render :partial => 'spree/admin/shared/additional_field', :locals => { :field => field, :f => f } %>
+    <% end %>
+  </div>
 </div>

data/app/views/spree/admin/properties/_form.html.erb

@@ -1,5 +1,4 @@
-<div data-hook="admin_property_form">
-
+<div data-hook="admin_property_form_fields">
   <%= f.field_container :name do %>
     <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= f.text_field :name %>
@@ -11,5 +10,4 @@
     <%= f.text_field :presentation %>
     <%= f.error_message_on :presentation %>
   <% end %>
-
-</div>
+</div>

data/app/views/spree/admin/prototypes/_form.html.erb

@@ -1,44 +1,46 @@
-<%= f.field_container :name do %>
-  <%= f.label :name, t(:name) %><br />
-  <%= f.text_field :name %>
-  <%= f.error_message_on :name %>
-<% end %>
+<div data-hook="admin_prototype_form_fields">
+  <%= f.field_container :name do %>
+    <%= f.label :name, t(:name) %><br />
+    <%= f.text_field :name %>
+    <%= f.error_message_on :name %>
+  <% end %>
 
-<h3><%= t(:properties) %></h3>
+  <h3><%= t(:properties) %></h3>
 
-<ul class='checkbox-list' id='properties' data-hook>
-<% Spree::Property.sorted.each do |property| %>
-  <% selected = if @prototype.new_record?
-    (params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
-  else
-    @prototype.properties.include?(property)
-  end %>
-  <li>
-    <label>
-      <%= check_box_tag 'property[id][]', "#{property.id}", selected %>
-      <%= property.name %>
-    </label>
-  </li>
-<% end %>
-</ul>
+  <ul class='checkbox-list' id='properties' data-hook>
+  <% Spree::Property.sorted.each do |property| %>
+    <% selected = if @prototype.new_record?
+      (params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
+    else
+      @prototype.properties.include?(property)
+    end %>
+    <li>
+      <label>
+        <%= check_box_tag 'property[id][]', "#{property.id}", selected %>
+        <%= property.name %>
+      </label>
+    </li>
+  <% end %>
+  </ul>
 
-<hr />
+  <hr />
 
-<h3><%= t(:option_types) %></h3>
+  <h3><%= t(:option_types) %></h3>
 
-<ul class="checkbox-list" id="option_types" data-hook>
-<% Spree::OptionType.all.each do |option_type| %>
-  <% selected = if @prototype.new_record?
-    (params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
-  else
-    @prototype.option_types.include?(option_type)
-  end %>
-  <li>
-    <label>
-      <%= check_box_tag 'option_type[id][]', "#{option_type.id}", selected %>
-      <%= option_type.name %>
-    </label>
-  </li>
-<% end %>
-</ul>
-<hr />
+  <ul class="checkbox-list" id="option_types" data-hook>
+  <% Spree::OptionType.all.each do |option_type| %>
+    <% selected = if @prototype.new_record?
+      (params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
+    else
+      @prototype.option_types.include?(option_type)
+    end %>
+    <li>
+      <label>
+        <%= check_box_tag 'option_type[id][]', "#{option_type.id}", selected %>
+        <%= option_type.name %>
+      </label>
+    </li>
+  <% end %>
+  </ul>
+  <hr />
+</div>