spree_core 1.1.6 → 1.2.0.rc1

data/app/models/spree/zone.rb

@@ -53,30 +53,29 @@ module Spree
 
     # convenience method for returning the countries contained within a zone
     def country_list
-      @countries ||= members.includes(:zoneable).map { |zone_member|
-        case zone_member.zoneable_type
-        when 'Spree::Country'
-          zone_member.zoneable
-        when 'Spree::State'
-          zone_member.zoneable.country
-        else
-          nil
-        end
-      }.flatten.compact.uniq
+      @countries ||=
+      case kind
+      when 'country'
+        zoneables
+      when 'state'
+        zoneables.collect(&:country)
+      else
+        nil
+      end.flatten.compact.uniq
     end
 
     def <=>(other)
       name <=> other.name
     end
 
-    # All zoneables belonging to the zone members.  Will be a colelction of either
+    # All zoneables belonging to the zone members.  Will be a collection of either
     # countries or states depending on the zone type.
     def zoneables
-      members.collect { |m| m.zoneable }
+      members.collect(&:zoneable)
     end
 
     def self.default_tax
-      Zone.where(:default_tax => true).first
+      where(:default_tax => true).first
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -98,6 +97,7 @@ module Spree
     end
 
     private
+
       def remove_defunct_members
         zone_members.each do |zone_member|
           zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{kind.capitalize}"
@@ -106,7 +106,8 @@ module Spree
 
       def remove_previous_default
         return unless default_tax
-        Zone.all.each do |zone|
+
+        self.class.all.each do |zone|
           zone.update_column 'default_tax', false unless zone == self
         end
       end

data/app/models/spree/zone_member.rb

@@ -1,6 +1,6 @@
 module Spree
   class ZoneMember < ActiveRecord::Base
-    belongs_to :zone, :class_name => "Spree::Zone", :counter_cache => true
+    belongs_to :zone, :counter_cache => true
     belongs_to :zoneable, :polymorphic => true
 
     attr_accessible :zone, :zone_id, :zoneable, :zoneable_id, :zoneable_type

data/app/views/spree/admin/image_settings/edit.html.erb

@@ -9,14 +9,14 @@
   <p data-hook="attachment_path">
     <label>
       <%= label_tag 'preferences[attachment_path]', t(:attachment_path) %>
-      <%= preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string %>
+      <%= preference_field_tag 'preferences[attachment_path]', Spree::Config[:attachment_path], :type => :string, :size => 70 %>
     </label>
   </p>
 
   <p data-hook="attachment_default_url">
     <label>
       <%= label_tag 'preferences[attachment_default_url]', t(:attachment_default_url) %>
-      <%= preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string %>
+      <%= preference_field_tag 'preferences[attachment_default_url]', Spree::Config[:attachment_default_url], :type => :string, :size => 60 %>
     </label>
   </p>
 

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

@@ -3,10 +3,14 @@
     <td><%= t(:filename) %>:</td>
     <td><%= f.file_field :attachment %></td>
   </tr>
-  <tr data-hook="variant">
-    <td><%= Spree::Variant.model_name.human %>:</td>
-    <td><%= f.select :viewable_id, @variants %></td>
-  </tr>
+  <% if @product.has_variants? %>
+    <tr data-hook="variant">
+      <td><%= Spree::Variant.model_name.human %>:</td>
+      <td><%= f.select :viewable_id, @variants %></td>
+    </tr>
+  <% else %>
+    <%= hidden_field_tag :product_id, @product.id %>
+  <% end %>
   <tr data-hook="alt_text">
     <td><%= t(:alt_text) %>:</td>
     <td><%= f.text_area :alt %></td>

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

@@ -53,5 +53,5 @@
 <div id="images" data-hook></div>
 <br />
 <p data-hook="links">
-    <%= link_to icon('add') + ' ' + t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link' %>
+  <%= link_to icon('add') + ' ' + t(:new_image), new_admin_product_image_url(@product), :id => 'new_image_link' %>
 </p>

data/app/views/spree/admin/line_items/create.js.erb

@@ -1,4 +1,4 @@
 $("#order-form-wrapper").html('<%= escape_javascript(render :partial => "spree/admin/orders/form") %>');
-$('#add_product_name').val('');
+$('.product_autocomplete').val('');
 $('#add_variant_id').val('');
 $('#add_quantity').val(1);

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

@@ -1,4 +1,4 @@
-<tr class="option_value fields" id="<%= spree_dom_id(f.object) %>"  data-hook="option_value">
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value">
   <td class="name"><span class="handle"></span> </span><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields t(:remove), f %></td>

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

@@ -3,7 +3,7 @@
 <div class="toolbar" data-hook="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', :id => 'new_option_type_link'} %>
+      <%= 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" />

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

@@ -3,7 +3,7 @@
     <legend><%= t(:add_product) %></legend>
     <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' %>
+      <%= text_field_tag :add_product_name, nil, :class => 'fullwidth title product_autocomplete' %>
       <%= hidden_field_tag :add_variant_id %>
     </div>
     <div style="float:left; width:10%; margin-right:5%;" data-hook="add_quantity">

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

@@ -2,7 +2,7 @@
 <%= csrf_meta_tags %>
 
 <% if @order.cart? %>
-  <div id="customer-search" data-hook>
+  <div id="add-line-item" data-hook>
     <fieldset>
       <legend><%= t(:customer_search) %></legend>
       <%= label_tag :customer_search, t(:enter_at_least_five_letters) %>

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

@@ -50,11 +50,11 @@
       <%= label_tag nil, t(:date_range) %><br />
       <div class="date-range-filter">
         <div class="left sub-field">
-          <%= f.text_field :created_at_gt, :class => 'datepicker' %><br />
+          <%= f.text_field :created_at_gt, :class => 'datepicker', :value => params[:q][:created_at_gt] %><br />
           <%= label_tag nil, t(:start), :class => 'sub' %>
         </div>
         <div class="right sub-field">
-          <%= f.text_field :created_at_lt, :class => 'datepicker' %><br />
+          <%= f.text_field :created_at_lt, :class => 'datepicker', :value => params[:q][:created_at_lt] %><br />
           <%= label_tag nil, t(:stop), :class => 'sub' %>
         </div>
       </div>
@@ -71,11 +71,11 @@
         <%= f.text_field :email_cont, :size => 25 %>
       </p>
       <p>
-        <%= label_tag nil, t(:first_name_start) %><br />
+        <%= label_tag nil, t(:first_name_begins_with) %><br />
         <%= f.text_field :bill_address_firstname_start, :size => 25 %>
       </p>
       <p>
-        <%= label_tag nil, t(:last_name_start) %><br />
+        <%= label_tag nil, t(:last_name_begins_with) %><br />
         <%= f.text_field :bill_address_lastname_start, :size => 25 %>
       </p>
       <p>

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

@@ -1,5 +1,5 @@
 <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(:cancel), fire_admin_order_url(@order.number, { :e => 'cancel' }), :icon => 'delete', :data => { :confirm => t(:are_you_sure) } if @order.can_cancel? %>
   <%= button_link_to t(:edit), edit_admin_order_url(@order.number), :icon => 'edit' %>
 </div>
 

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

@@ -6,7 +6,7 @@
 
   <% @payment_methods.each do |method| %>
 
-    <label data-hook="payment_method">
+    <label data-hook="payment_method_field">
       <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
       <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
     </label>

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

@@ -18,7 +18,3 @@
   <%= t(:cannot_create_payment_without_payment_methods) %>
   <%= link_to t(:please_define_payment_methods), admin_payment_methods_url %>
 <% end %>
-
-<% content_for :head do %>
-  <%= javascript_include_tag '/admin/javascripts/payments/new.js' %>
-<% end %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -6,7 +6,7 @@
     <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= t(:use_new_cc) %></label>
   </p>
   <div id="card_form" data-hook>
-    <%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
+    <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div data-hook="card_number">

data/app/views/spree/admin/payments/source_views/_gateway.html.erb

@@ -1,5 +1,5 @@
-<fieldset data-hook="creditcard">
-  <legend><%= t(:creditcard) %></legend>
+<fieldset data-hook="credit_card">
+  <legend><%= t(:credit_card) %></legend>
 
   <table class="index">
     <tr>

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

@@ -85,6 +85,17 @@
     </div>
   </div>
 
+
+  <%= f.field_container :taxons do %>
+    <%= f.label :taxon_ids, t(:taxons) %><br />
+    <%= f.select :taxon_ids, taxon_options_for(@product), {}, :class => "select2", :multiple => true %>
+  <% end %>
+
+  <%= f.field_container :option_types do %>
+    <%= f.label :option_type_ids, t(:option_types) %><br />
+    <%= f.select :option_type_ids, option_types_options_for(@product), {}, :class => "select2", :multiple => true %>
+  <% end %>
+
   <h2><%= t(:metadata) %></h2>
   <div data-hook="admin_product_form_meta">
     <%= f.field_container :meta_keywords do %>
@@ -98,9 +109,14 @@
     <% 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>
+  <div data-hook="admin_product_form_additional_fields"></div>
 </div>
+
+<script>
+
+$("#product_taxon_ids").select2({
+  formatSelection: function(item) { return item.text.split(' -> ').slice(-1)[0] },
+});
+
+$("#product_option_type_ids").select2();
+</script>

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

@@ -3,7 +3,7 @@
 <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'} %>
+      <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'add', :id => 'admin_new_product' } %>
     </li>
   </ul>
   <br class="clear" />
@@ -35,7 +35,7 @@
   </tr>
 <% end %>
 </table>
-<%= paginate @products %>
+<%= paginate @collection %>
 
 <% content_for :sidebar do %>
   <div data-hook="admin_products_sidebar">

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

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

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

@@ -3,7 +3,7 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li id="new_property_link">
-      <%= button_link_to t(:new_property), new_admin_property_url, {:remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link'} %>
+      <%= button_link_to t(:new_property), new_admin_property_url, { :remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link' } %>
     </li>
   </ul>
   <br class="clear" />

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

@@ -20,8 +20,8 @@
           <% elsif units.select(&:shipped?).empty? %>
             0
           <% else %>
-            <%= number_field_tag "return_quantity[#{variant.id}]",
-                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:50px;', :min => 0} %>
+            <%= text_field_tag "return_quantity[#{variant.id}]",
+                @return_authorization.inventory_units.group_by(&:variant)[variant].try(:size) || 0, {:style => 'width:30px;'} %>
           <% end %>
         </td>
       </tr>
@@ -33,7 +33,7 @@
     <% if @return_authorization.received? %>
       <%= number_to_currency @return_authorization.amount %>
     <% else %>
-      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value">0.00</span>
+      <%= f.text_field :amount, {:style => 'width:80px;'} %> <%= t(:rma_value) %>: <span id="rma_value"></span>
       <%= f.error_message_on :amount %>
     <% end %>
   <% end %>
@@ -45,19 +45,35 @@
   <% end %>
 
 
-<script>
-  $(document).ready(function(){
-    var rma_amount = 0;
-    $("td.return_quantity input").on('change', function() {
-      var rma_amount = 0;
-      $.each($("td.return_quantity input"), function(i, input) {
-        var variant_id = $(input).attr('id').replace("return_quantity_", "");
-         rma_amount += variant_prices[variant_id] * $(input).val()
-      });
+  <% content_for :head do %>
+    <%= javascript_tag do -%>
+      var variant_prices = new Array();
+      <% @return_authorization.order.inventory_units.group_by(&:variant).each do | variant, units| %>
+        variant_prices[<%= variant.id.to_s %>] = <%= variant.price %>;
+      <% end %>
+
+      function calculate_rma_price(object, value){
+        var rma_amount = 0;
 
-      if(!isNaN(rma_amount)){
-        $("span#rma_value").html(rma_amount.toFixed(2));
+        $.each($("td.return_quantity input"), function(i, inpt){
+          var variant_id = $(inpt).attr('id').replace("return_quantity_", "");
+           rma_amount += variant_prices[variant_id] * $(inpt).val()
+        });
+
+        if(!isNaN(rma_amount)){
+          $("span#rma_value").html(rma_amount.toFixed(2));
+        }
       }
-    })
-  });
-</script>
+
+      $(document).ready(function(){
+        $.each($("td.return_quantity input"), function(i, inpt){
+          $(inpt).delayedObserver(function() {
+            calculate_rma_price();
+          }, 0.5);
+        });
+
+        calculate_rma_price();
+      });
+    <% end -%>
+  <% end %>
+</div>

data/app/views/spree/admin/return_authorizations/edit.html.erb

@@ -2,10 +2,10 @@
   <ul class="actions">
     <li>
       <% if @return_authorization.can_receive? %>
-        <%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :confirm => t(:are_you_sure) %>
+        <%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
       <% end %>
       <% if @return_authorization.can_cancel? %>
-        <%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :confirm => t(:are_you_sure) %>
+        <%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => t(:are_you_sure) } %>
       <% end %>
     </li>
   </ul>

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

@@ -71,7 +71,7 @@
       <td class="lbl-col">
         <%= f.label :phone, t(:phone) + ':' %>
       </td>
-      <td colspan="7"><%= f.text_field :phone %></td>
+      <td colspan="7"><%= f.phone_field :phone %></td>
     </tr>
   </tbody>
 </table>

data/app/views/spree/admin/shared/_head.html.erb

@@ -6,8 +6,18 @@
 <%= stylesheet_link_tag 'admin/all' %>
 <%= javascript_include_tag 'admin/all' %>
 
-<%= render "spree/admin/shared/translations" %>
-<%= render "spree/admin/shared/routes" %>
+<%= javascript_tag do %>
+  Spree.routes = <%== {
+    :product_search       => spree.admin_products_path(:format => 'json'),
+    :product_search_basic => spree.admin_products_path(:format => 'json', :json_format => 'basic', :limit => 10),
+    :user_search          => spree.admin_search_users_path(:format => 'json', :limit => 10)
+  }.to_json %>;
+
+  strings = <%==
+    [:no_results, :type_to_search, :searching].
+    inject({}){|memo, item| {item => t(item) }}.to_json
+  %>
+<% end %>
 
 <%= javascript_tag do -%>
   jQuery.alerts.dialogClass = 'spree';

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

@@ -6,7 +6,7 @@
     <h5 id="order_status" data-hook><%= t(:status) %>: <%= t(@order.state, :scope => :order_state) %></h5>
     <h5 id="order_total" data-hook><%= t(:total) %>: <%= number_to_currency @order.total %></h5>
     <% if @order.completed? %>
-      <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %></h5>
+      <h5 id="shipment_status"><%= t(:shipment) %>: <%= t(@order.shipment_state, :scope => :shipment_state, :default => [:missing, "none"]) %></h5>
       <h5 id="payment_status"><%= t(:payment) %>: <%= t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %></h5>
     <% end %>
     <br class="clear" />
@@ -50,9 +50,6 @@
       <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' %>>
-         <%= link_to t(:history), history_admin_order_url(@order) %>
-      </li>
     <% end %>
   </ul>