spree_core 1.1.2 → 1.1.3

data/app/assets/javascripts/admin/admin.js.erb

@@ -164,9 +164,9 @@ $.fn.product_autocomplete = function(){
 $.fn.objectPicker = function(url){
   $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
     searchDelay          : 600,
-    hintText             : strings.type_to_search,
-    noResultsText        : strings.no_results,
-    searchingText        : strings.searching,
+    hintText             : Spree.strings.type_to_search,
+    noResultsText        : Spree.strings.no_results,
+    searchingText        : Spree.strings.searching,
     prePopulateFromInput : true
   });
 };
@@ -174,26 +174,11 @@ $.fn.objectPicker = function(url){
 $.fn.productPicker = function(){
   $(this).objectPicker(Spree.routes.product_search_basic);
 }
+
 $.fn.userPicker = function(){
   $(this).objectPicker(Spree.routes.user_search);
 }
 
-$(".observe_field").on('change', function() {
-  target = $(this).attr("data-update");
-  ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
-  $(target).hide();
-  $(ajax_indicator).show();
-  $.ajax({ dataType: 'html',
-           url: $(this).attr("data-base-url")+encodeURIComponent($(this).val()),
-           type: 'get',
-           success: function(data){
-             $(target).html(data);
-             $(ajax_indicator).hide();
-             $(target).show();
-           }
-  });
-});
-
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
     dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
@@ -209,6 +194,22 @@ handle_date_picker_fields = function(){
 }
 
 $(document).ready(function(){
+  $(".observe_field").on('change', function() {
+    target = $(this).attr("data-update");
+    ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
+    $(target).hide();
+    $(ajax_indicator).show();
+    $.ajax({ dataType: 'html',
+             url: $(this).attr("data-base-url")+encodeURIComponent($(this).val()),
+             type: 'get',
+             success: function(data){
+               $(target).html(data);
+               $(ajax_indicator).hide();
+               $(target).show();
+             }
+    });
+  });
+
   $('.add_fields').click(function() {
     var target = $(this).data("target");
     var new_table_row = $(target + ' tr:visible:last').clone();
@@ -255,7 +256,7 @@ $(document).ready(function(){
 
   handle_date_picker_fields();
 
-  $(".select_properties_from_prototype").on("click", function(){
+  $('body').on('click', '.select_properties_from_prototype', function(){
     $("#busy_indicator").show();
     var clicked_link = $(this);
     $.ajax({ dataType: 'script', url: clicked_link.attr("href"), type: 'get',

data/app/assets/stylesheets/store/screen.css.scss

@@ -530,6 +530,10 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       text-align: center;
       border: 1px solid lighten($body_text_color, 60);
       background-color: $product_background_color;
+
+      img {
+        min-height: 240px;
+      }
     }
     #product-thumbnails {
       li {

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -22,7 +22,7 @@ module Spree
         invoke_callbacks(:update, :before)
         payment_method_type = params[:payment_method].delete(:type)
         if @payment_method['type'].to_s != payment_method_type
-          @payment_method.update_attribute(:type, payment_method_type)
+          @payment_method.update_column(:type, payment_method_type)
           @payment_method = PaymentMethod.find(params[:id])
         end
 

data/app/controllers/spree/admin/products_controller.rb

@@ -23,7 +23,7 @@ module Spree
       # instead of actually deleting the product.
       def destroy
         @product = Product.find_by_permalink!(params[:id])
-        @product.update_attribute(:deleted_at, Time.now)
+        @product.update_column(:deleted_at, Time.now)
 
         @product.variants_including_master.update_all(:deleted_at => Time.now)
 

data/app/controllers/spree/admin/shipping_methods_controller.rb

@@ -5,7 +5,7 @@ module Spree
       before_filter :set_shipping_category, :only => [:create, :update]
 
       def destroy
-        @object.update_attribute(:deleted_at, Time.now)
+        @object.touch :deleted_at
 
         flash.notice = flash_message_for(@object, :successfully_removed)
 

data/app/controllers/spree/admin/taxons_controller.rb

@@ -58,7 +58,7 @@ module Spree
             @taxon.move_to_right_of(new_siblings[new_position]) # we move down
           end
           # Reset legacy position, if any extensions still rely on it
-          new_parent.children.reload.each{|t| t.update_attribute(:position, t.position)}
+          new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
       
           if parent_id
             @taxon.reload

data/app/controllers/spree/content_controller.rb

@@ -16,7 +16,7 @@ module Spree
 
     def cvv
       respond_with do |format|
-        format.html { render 'cvv', :layout => false }
+        format.html { render :layout => false }
       end
     end
   end

data/app/controllers/spree/products_controller.rb

@@ -1,6 +1,5 @@
 module Spree
   class ProductsController < BaseController
-    HTTP_REFERER_REGEXP = /^https?:\/\/[^\/]+\/t\/([a-z0-9\-\/]+)$/
     before_filter :load_product, :only => :show
     rescue_from ActiveRecord::RecordNotFound, :with => :render_404
     helper 'spree/taxons'
@@ -20,9 +19,11 @@ module Spree
       @product_properties = ProductProperty.includes(:property).where(:product_id => @product.id)
 
       referer = request.env['HTTP_REFERER']
-
-      if referer && referer.match(HTTP_REFERER_REGEXP)
-        @taxon = Taxon.find_by_permalink($1)
+      if referer
+        referer_path = URI.parse(request.env['HTTP_REFERER']).path
+        if referer_path && referer_path.match(/\/t\/(.*)/)
+          @taxon = Taxon.find_by_permalink($1)
+        end
       end
 
       respond_with(@product)

data/app/helpers/spree/admin/products_helper.rb

@@ -1,15 +1,6 @@
 module Spree
   module Admin
     module ProductsHelper
-      def option_type_select(so)
-        select(:new_variant,
-               so.option_type.presentation,
-               so.option_type.option_values.collect { |ov| [ ov.presentation, ov.id ] })
-      end
-
-      def pv_tag_id(product_value)
-        "product-property-value-#{product_value.id}"
-      end
     end
   end
 end

data/app/helpers/spree/products_helper.rb

@@ -14,11 +14,24 @@ module Spree
 
     # converts line breaks in product description into <p> tags (for html display purposes)
     def product_description(product)
-      raw(product.description.gsub(/(.*?)\n\n/m, '<p>\1</p>\n\n'))
+      raw(product.description.gsub(/(.*?)\r?\n\r?\n/m, '<p>\1</p>'))
     end
 
     def variant_images_hash(product)
       product.variant_images.inject({}) { |h, img| (h[img.viewable_id] ||= []) << img; h }
     end
+
+    def line_item_description(variant)
+      description = variant.product.description
+      if description.present?
+        truncate(strip_tags(description.gsub('&nbsp;', ' ')), :length => 100)
+      else
+        t(:product_has_no_description)
+      end
+    end
+
+    def get_taxonomies
+      @taxonomies ||= Spree::Taxonomy.includes(:root => :children)
+    end
   end
 end

data/app/helpers/spree/taxons_helper.rb

@@ -9,6 +9,7 @@ module Spree
         taxon.descendants.each do |taxon|
           to_get = max - products.length
           products += taxon.active_products.limit(to_get)
+          products = products.uniq
           break if products.size >= max
         end
       end

data/app/models/spree/address.rb

@@ -44,7 +44,7 @@ module Spree
     end
 
     def zones
-      Zone.match(self)
+      @zones ||= Zone.match(self)
     end
 
     def same_as?(other)

data/app/models/spree/app_configuration.rb

@@ -76,6 +76,7 @@ module Spree
     preference :s3_secret, :string
     preference :s3_headers, :string, :default => "{\"Cache-Control\":\"max-age=31557600\"}"
     preference :use_s3, :boolean, :default => false # Use S3 for images rather than the file system
+    preference :s3_protocol, :string
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/creditcard.rb

@@ -12,7 +12,7 @@ module Spree
     validates :verification_value, :presence => true, :unless => :has_payment_profile?, :on => :create
 
     attr_accessible :first_name, :last_name, :number, :verification_value, :year,
-                    :month, :gateway_customer_profile_id
+                    :month, :gateway_customer_profile_id, :gateway_payment_profile_id
 
     scope :with_payment_profile, where('gateway_customer_profile_id IS NOT NULL')
 

data/app/models/spree/image.rb

@@ -21,6 +21,7 @@ module Spree
       Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
       Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
       Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+      Spree::Image.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
     end
 
     Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])

data/app/models/spree/line_item.rb

@@ -15,7 +15,7 @@ module Spree
     validate :stock_availability
     validate :quantity_no_less_than_shipped
 
-    attr_accessible :quantity
+    attr_accessible :quantity, :variant_id
 
     before_save :update_inventory
     before_destroy :ensure_not_shipped, :remove_inventory

data/app/models/spree/order.rb

@@ -383,10 +383,10 @@ module Spree
     # Finalizes an in progress order after checkout is complete.
     # Called after transition to complete state when payments will have been processed
     def finalize!
-      update_attribute(:completed_at, Time.now)
+      touch :completed_at
       InventoryUnit.assign_opening_inventory(self)
       # lock any optional adjustments (coupon promotions, etc.)
-      adjustments.optional.each { |adjustment| adjustment.update_attribute('locked', true) }
+      adjustments.optional.each { |adjustment| adjustment.update_column('locked', true) }
       deliver_order_confirmation_email
 
       self.state_changes.create({

data/app/models/spree/payment_method.rb

@@ -35,7 +35,7 @@ module Spree
     end
 
     def destroy
-      self.update_attribute(:deleted_at, Time.now.utc)
+      touch :deleted_at
     end
 
     def self.find_with_destroyed *args

data/app/models/spree/product.rb

@@ -60,7 +60,8 @@ module Spree
 
     def variant_images
       Image.joins("LEFT JOIN #{Variant.quoted_table_name} ON #{Variant.quoted_table_name}.id = #{Asset.quoted_table_name}.viewable_id").
-      where("#{Variant.quoted_table_name}.product_id = #{self.id}").
+      where("(#{Asset.quoted_table_name}.viewable_type = ? AND #{Asset.quoted_table_name}.viewable_id = ?) OR
+             (#{Asset.quoted_table_name}.viewable_type = ? AND #{Asset.quoted_table_name}.viewable_id = ?)", Variant.name, self.master.id, Product.name, self.id).
       order("#{Asset.quoted_table_name}.position").
       extend(Spree::Core::RelationSerialization)
     end

data/app/models/spree/product/scopes.rb

@@ -34,17 +34,6 @@ module Spree
       joins(:variants_with_only_master).order("#{variant_table_name}.price DESC")
     end
 
-    # Ryan Bates - http://railscasts.com/episodes/112
-    # general merging of conditions, names following the searchlogic pattern
-    add_search_scope :conditions do |*args|
-      where(args)
-    end
-
-    # conditions_all is a more descriptively named enhancement of the above
-    add_search_scope :conditions_all do |*args|
-      where([args].flatten)
-    end
-
     add_search_scope :price_between do |low, high|
       joins(:master).where(Variant.table_name => { :price => low..high })
     end

data/app/models/spree/shipment.rb

@@ -86,7 +86,7 @@ module Spree
     def update!(order)
       old_state = state
       new_state = determine_state(order)
-      update_attribute_without_callbacks 'state', determine_state(order)
+      update_column 'state', new_state
       after_ship if new_state == 'shipped' and old_state != 'shipped'
     end
 
@@ -105,12 +105,6 @@ module Spree
         "#{I18n.t(:shipping)} (#{shipping_method.name})"
       end
 
-      # def transition_order
-      #   update_attribute(:shipped_at, Time.now)
-      #   # transition order to shipped if all shipments have been shipped
-      #   order.ship! if order.shipments.all?(&:shipped?)
-      # end
-
       def validate_shipping_method
         unless shipping_method.nil?
           errors.add :shipping_method, I18n.t(:is_not_available_to_shipment_address) unless shipping_method.zone.include?(address)
@@ -138,6 +132,11 @@ module Spree
 
       def after_ship
         inventory_units.each &:ship!
+        send_shipped_email
+        touch :shipped_at
+      end
+
+      def send_shipped_email
         ShipmentMailer.shipped_email(self).deliver
       end
 

data/app/models/spree/tax_category.rb

@@ -14,7 +14,7 @@ module Spree
       #set existing default tax category to false if this one has been marked as default
 
       if is_default && tax_category = self.class.where(:is_default => true).first
-        tax_category.update_attribute(:is_default, false) unless tax_category == self
+        tax_category.update_column(:is_default, false) unless tax_category == self
       end
     end
 

data/app/models/spree/taxonomy.rb

@@ -13,7 +13,7 @@ module Spree
     private
       def set_name
         if root
-          root.update_attribute(:name, name)
+          root.update_column(:name, name)
         else
           self.root = Taxon.create!({ :taxonomy_id => id, :name => name }, :without_protection => true)
         end

data/app/models/spree/tracker.rb

@@ -3,7 +3,8 @@ module Spree
     attr_accessible :analytics_id, :environment, :active
 
     def self.current
-      first(:conditions => { :active => true, :environment => Rails.env })
+      tracker = first(:conditions => { :active => true, :environment => Rails.env })
+      tracker.analytics_id.present? ? tracker : nil if tracker
     end
   end
 end

data/app/models/spree/variant.rb

@@ -22,6 +22,7 @@ module Spree
     validates :count_on_hand, :numericality => true
 
     before_save :touch_product
+    after_save :recalculate_product_on_hand, :if => :is_master?
 
     # default variant scope only lists non-deleted variants
     scope :active, where(:deleted_at => nil)
@@ -166,6 +167,10 @@ module Spree
       def touch_product
         product.touch unless is_master?
       end
+
+      def recalculate_product_on_hand
+        product.update_column(:count_on_hand, product.on_hand)
+      end
   end
 end
 

data/app/models/spree/zone.rb

@@ -14,13 +14,8 @@ module Spree
     attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
 
     def kind
-      member = members.last
-
-      case member && member.zoneable_type
-      when 'Spree::State' then 'state'
-      else
-        'country'
-      end
+      return nil if members.empty? || members.any? { |member| member.try(:zoneable_type).nil? }
+      members.last.zoneable_type.demodulize.downcase
     end
 
     def kind=(value)
@@ -46,7 +41,7 @@ module Spree
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
-      return unless matches = self.order('created_at').select { |zone| zone.include? address }
+      return unless matches = self.includes(:zone_members).order('zone_members_count', 'created_at').select { |zone| zone.include? address }
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
@@ -58,7 +53,7 @@ module Spree
 
     # convenience method for returning the countries contained within a zone
     def country_list
-      members.map { |zone_member|
+      @countries ||= members.includes(:zoneable).map { |zone_member|
         case zone_member.zoneable_type
         when 'Spree::Country'
           zone_member.zoneable
@@ -111,9 +106,8 @@ module Spree
 
       def remove_previous_default
         return unless default_tax
-
         Zone.all.each do |zone|
-          zone.update_attribute 'default_tax', false unless zone == self
+          zone.update_column 'default_tax', false unless zone == self
         end
       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"
+    belongs_to :zone, :class_name => "Spree::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

@@ -71,6 +71,13 @@
       </label>
     </p>
 
+    <p data-hook="s3_protocol">
+      <label>
+        <%= label_tag 'preferences[s3_protocol]', t(:s3_protocol) %>
+        <%= preference_field_tag 'preferences[s3_protocol]', Spree::Config[:s3_protocol], :type => :string %>
+      </label>
+    </p>
+
     <h2><%= t(:s3_headers) %></h2>
     <ul id="headers_list">
       <% @headers.each do |header_name, header_value| %>

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

@@ -12,6 +12,7 @@
     <th><%= t(:action) %></th>
   </tr>
 
+  <tbody>
   <% @product.images.each do |image| %>
     <tr id="<%= spree_dom_id image %>" data-hook="images_row">
       <td>
@@ -46,6 +47,7 @@
       </tr>
     <% end %>
   <% end %>
+  </tbody>
 </table>
 
 <div id="images" data-hook></div>

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

@@ -19,6 +19,7 @@
     <th><%= t(:presentation) %></th>
     <th></th>
   </tr>
+  <tbody>
   <% @option_types.each do |option_type| %>
     <tr class="spree_option_type" id="<%= spree_dom_id option_type %>" data-hook="option_row">
       <td><span class="handle"></span> <%= option_type.name %></td>
@@ -30,4 +31,5 @@
       </td>
     </tr>
   <% end %>
+  </tbody>
 </table>

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

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

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

@@ -7,16 +7,19 @@
 <%= javascript_include_tag 'admin/all' %>
 
 <%= javascript_tag do %>
-  Spree.routes = <%== {
+  var 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_users_path(:format => 'json', :limit => 10)
-  }.to_json %>;
+  }.to_json %>,
 
-  strings = <%==
-    [:no_results, :type_to_search, :searching].
-    inject({}){|memo, item| {item => t(item) }}.to_json
-  %>
+    strings: {
+      no_results: '<%== t(:no_results) %>',
+      type_to_search: '<%== t(:type_to_search) %>',
+      searching: '<%== t(:searching) %>'
+    }
+  }
 <% end %>
 
 <%= javascript_tag do -%>

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

@@ -13,6 +13,7 @@
     <th><%= t(:on_hand) %></th>
     <th><%= t(:action) %></th>
   </tr>
+  <tbody>
   <% @variants.each do |variant| %>
     <!-- you can skip variant with no options: that's just the default variant that all products have -->
     <% next if variant.option_values.empty? %>
@@ -34,6 +35,7 @@
   <% unless @product.has_variants? %>
     <tr><td colspan="9"><%= t(:none) %></td></tr>
   <% end %>
+  </tbody>
 </table>
 
 <% if @product.empty_option_values? %>

data/app/views/spree/checkout/_address.html.erb

@@ -42,9 +42,6 @@
         <p class="field" id="bstate">
           <% have_states = !@order.bill_address.country.states.empty? %>
           <%= bill_form.label :state, t(:state) %><span class="required">*</span><br />
-          <noscript>
-            <%= bill_form.text_field :state_name, :class => 'required' %>
-          </noscript>
           <% state_elements = [
              bill_form.collection_select(:state_id, @order.bill_address.country.states,
                                 :id, :name,
@@ -60,6 +57,9 @@
             document.write("<%== state_elements %>");
           <% end -%>
         </p>
+          <noscript>
+            <%= bill_form.text_field :state_name, :class => 'required' %>
+          </noscript>
       <% end %>
 
       <p class="field" id="bzipcode">
@@ -129,9 +129,6 @@
         <p class="field" id="sstate">
           <% have_states = !@order.ship_address.country.states.empty? %>
           <%= ship_form.label :state, t(:state) %><span class="required">*</span><br />
-          <noscript>
-            <%= ship_form.text_field :state_name, :class => 'required' %>
-          </noscript>
           <% state_elements = [
              ship_form.collection_select(:state_id, @order.ship_address.country.states,
                                 :id, :name,
@@ -147,6 +144,9 @@
             document.write("<%== state_elements %>");
           <% end %>
         </p>
+          <noscript>
+            <%= ship_form.text_field :state_name, :class => 'required' %>
+          </noscript>
       <% end %>
 
       <p class="field" id="szipcode">

data/app/views/spree/layouts/spree_application.html.erb

@@ -6,20 +6,20 @@
 <!--[if IE 9 ]>    <html class="ie ie9" lang="en"> <![endif]-->
 <!--[if gt IE 9]><!--><html lang="en"><!--<![endif]-->
 
-  
+
   <head data-hook="inside_head">
     <%= render :partial => 'spree/shared/head' %>
   </head>
 
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
-    
+
     <div class="container">
 
       <header id="header" class="row" data-hook>
-      
+
         <figure id="logo" class="columns alpha six" data-hook>
           <%= logo %>
-        </figure> 
+        </figure>
 
         <nav id="top-nav-bar" class="columns omega ten">
           <ul id="nav-bar" class="inline" data-hook>
@@ -29,16 +29,16 @@
 
         <% if store_menu? %>
           <nav class="columns alpha omega sixteen">
-            <ul id="main-nav-bar" class="inline" data-hook>            
+            <ul id="main-nav-bar" class="inline" data-hook>
               <%= render :partial => 'spree/shared/store_menu' %>
             </ul>
           </nav>
         <% end %>
-            
+
       </header>
 
       <div id="wrapper" class="row" data-hook>
-        
+
         <% if content_for?(:sidebar) %>
           <aside id="sidebar" class="columns alpha four" data-hook>
             <%= yield :sidebar %>

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

@@ -14,7 +14,7 @@
         <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br />
       </span>
     <% end %>
-    <%= truncate(variant.product.description.gsub(/<(.*?)>/,""), :length => 100, :omission => "...") %>
+    <%= line_item_description(variant) %>
   </td>
   <td class="cart-item-price" data-hook="cart_item_price">
     <%= number_to_currency line_item.price %>

data/app/views/spree/shared/_google_analytics.html.erb

@@ -1,38 +1,38 @@
 <% if tracker = Spree::Tracker.current %>
 
-  <%= javascript_tag do -%>
+  <%= javascript_tag do %>
     var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '<%= tracker.analytics_id -%>']);
+    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
     _gaq.push(['_trackPageview']);
 
+    <% if flash[:commerce_tracking] %>
+     <%# report e-commerce transaction information when applicable %>
+      _gaq.push(['_addTrans',
+        "<%= @order.number %>",                           <%# Order Number %>
+        "",                                               <%# Affiliation %>
+        "<%= @order.total %>",                            <%# Order total %>
+        "<%= @order.adjustments.tax.sum(:amount) %>",     <%# Tax Amount %>
+        "<%= @order.adjustments.shipping.sum(:amount) %>",<%# Ship Amount %>
+        "",                                               <%# City %>
+        "",                                               <%# State %>
+        ""                                                <%# Country %>
+      ]);
+      <% @order.line_items.each do |line_item| %>
+        _gaq.push(['_addItem',
+          "<%= @order.number %>",                 <%# order ID - required %>
+          "<%= line_item.variant.sku %>",         <%# SKU/code - required %>
+          "<%= line_item.variant.product.name %>",<%# product name %>
+          "",                                     <%# category or variation, Product Category %>
+          "<%= line_item.price %>",               <%# unit price - required %>
+          "<%= line_item.quantity %>"             <%# quantity - required %>
+        ]);
+      <% end %>
+    <% end %>
+
     (function() {
       var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-    <% end -%>
-
-  <% if flash[:commerce_tracking] %>
-
-    <%= javascript_tag do -%>
-      // report e-commerce transaction information when applicable
-      pageTracker._addTrans(
-      "<%= @order.number %>",    //Order Number
-      "",    //Affiliation
-      "<%= @order.total %>",    //Order total
-      "<%= @order.adjustments.tax.sum(:amount).to_s %>",    //Tax Amount
-      "<%= @order.adjustments.shipping.sum(:amount).to_s %>",    //Ship Amount
-      "",    //City
-      "",    //State
-      ""    //Country
-      );
-      <% @order.line_items.each do |line_item| %>
-        pageTracker._addItem("<%= @order.number %>", "<%= line_item.variant.sku %>", "<%= line_item.variant.product.name %>",
-          "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
-      <% end %>
-      pageTracker._trackTrans();
-    <% end -%>
-
   <% end %>
-
-<% end %>
+<% end %>

data/app/views/spree/taxons/show.html.erb

@@ -7,11 +7,11 @@
   </div>
 <% end %>
 
-<% if @taxon.children.empty? || !params[:keywords].blank? %>
-  <div data-hook="taxon_products">
-    <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
-  </div>
-<% else %>
+<div data-hook="taxon_products">
+  <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
+</div>
+
+<% unless params[:keyword].present? %>
   <div data-hook="taxon_children">
     <%= render :partial => 'taxon', :collection => @taxon.children %>
   </div>

data/config/locales/en.yml

@@ -858,6 +858,7 @@ en:
   s3_bucket: "Bucket"
   s3_headers: "S3 Headers"
   s3_secret: "Secret Key"
+  s3_protocol: "S3 Protocol"
   s3_used_for_product_images: "S3 is being used for product images"
   s3_not_used_for_product_images: "S3 is not being used for product images"
   sales_tax: "Sales Tax"

data/config/routes.rb

@@ -40,13 +40,8 @@ Spree::Core::Engine.routes.draw do
     end
   end
 
-  #   # route globbing for pretty nested taxon and product paths
+  # route globbing for pretty nested taxon and product paths
   match '/t/*id', :to => 'taxons#show', :as => :nested_taxons
-  #
-  #   #moved old taxons route to after nested_taxons so nested_taxons will be default route
-  #   #this route maybe removed in the near future (no longer used by core)
-  #   map.resources :taxons
-  #
 
   namespace :admin do
     resources :adjustments
@@ -195,6 +190,6 @@ Spree::Core::Engine.routes.draw do
 
   match '/admin', :to => 'admin/orders#index', :as => :admin
 
-  match '/content/cvv', :to => 'content#cvv'
+  match '/content/cvv', :to => 'content#cvv', :as => :cvv
   match '/content/*path', :to => 'content#show', :via => :get, :as => :content
 end

data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb

@@ -16,7 +16,7 @@ class AddCountOnHandToVariantsAndProducts < ActiveRecord::Migration
 
     say_with_time 'Transfering inventory units with status on_hand to variants table...' do
       Spree::Variant.all.each do |v|
-        v.update_attribute(:count_on_hand, v.inventory_units.with_state('on_hand').size)
+        v.update_column(:count_on_hand, v.inventory_units.with_state('on_hand').size)
         Spree::InventoryUnit.destroy_all(:variant_id => v.id, :state => 'on_hand')
       end
     end
@@ -26,7 +26,7 @@ class AddCountOnHandToVariantsAndProducts < ActiveRecord::Migration
         product_count_on_hand = p.has_variants? ?
             p.variants.inject(0) { |acc, v| acc + v.count_on_hand } :
             (p.master ? p.master.count_on_hand : 0)
-        p.update_attribute(:count_on_hand, product_count_on_hand)
+        p.update_column(:count_on_hand, product_count_on_hand)
       end
     end
 

data/db/migrate/20091015153048_add_openid_field_to_users.rb

@@ -15,7 +15,7 @@ class AddOpenidFieldToUsers < ActiveRecord::Migration
     Spree::User.table_name = 'users'
 
     [:login, :crypted_password, :salt].each do |field|
-      Spree::User.where(field => nil).each { |user| user.update_attribute(field, '') if user.send(field).nil? }
+      Spree::User.where(field => nil).each { |user| user.update_column(field, '') if user.send(field).nil? }
       change_column :users, field, :string, :default => '', :null => false
     end
 

data/db/migrate/20091021133257_charge_refactoring.rb

@@ -12,7 +12,7 @@ class ChargeRefactoring < ActiveRecord::Migration
 
     add_column :orders, :completed_at, :timestamp
     Order.reset_column_information
-    Order.all.each { |o| o.update_attribute(:completed_at, o.checkout && o.checkout.read_attribute(:completed_at)) }
+    Order.all.each { |o| o.update_column(:completed_at, o.checkout && o.checkout.read_attribute(:completed_at)) }
     remove_column :checkouts, :completed_at
 
     change_column :adjustments, :amount, :decimal, :null => true, :default => nil, :precision => 8, :scale => 2
@@ -27,7 +27,7 @@ class ChargeRefactoring < ActiveRecord::Migration
   def down
     add_column :checkouts, :completed_at, :timestamp
     Spree::Checkout.reset_column_information
-    Spree::Checkout.all.each { |c| c.update_attribute(:completed_at, c.order && c.order.completed_at) }
+    Spree::Checkout.all.each { |c| c.update_column(:completed_at, c.order && c.order.completed_at) }
     remove_column :orders, :completed_at
 
     add_column :adjustments, :secondary_type, :string

data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb

@@ -12,7 +12,7 @@ class ShipmentIdForInventoryUnits < ActiveRecord::Migration
         next
       end
       shipment.order.inventory_units.each do |unit|
-        unit.update_attribute('shipment_id', shipment.id)
+        unit.update_column('shipment_id', shipment.id)
       end
     end
 

data/db/migrate/20120712172620_add_counter_cache_to_zone_members.rb

@@ -0,0 +1,14 @@
+class AddCounterCacheToZoneMembers < ActiveRecord::Migration
+  def up
+    add_column :spree_zones, :zone_members_count, :integer, :default => 0
+
+    Spree::Zone.reset_column_information
+    Spree::Zone.find(:all).each do |zone|
+      Spree::Zone.update_counters zone.id, :zone_members_count => zone.zone_members.length
+    end
+  end
+
+  def down
+    remove_column :spree_zones, :zone_members_count
+  end
+end

data/lib/spree/core/controller_helpers.rb

@@ -5,7 +5,6 @@ module Spree
         receiver.send :layout, :get_layout
         receiver.send :before_filter, 'instantiate_controller_and_action_names'
         receiver.send :before_filter, 'set_user_language'
-
         receiver.send :helper_method, 'title'
         receiver.send :helper_method, 'title='
         receiver.send :helper_method, 'accurate_title'
@@ -78,10 +77,6 @@ module Spree
           @current_controller = controller_name
         end
 
-        def get_taxonomies
-          @taxonomies ||= Taxonomy.includes(:root => :children).joins(:root)
-        end
-
         def associate_user
           return unless current_user and current_order
           current_order.associate_user!(current_user)

data/lib/spree/core/mail_interceptor.rb

@@ -16,7 +16,7 @@ module Spree
         end
 
         if mail_method.preferred_mail_bcc.present?
-          message.bcc = mail_method.preferred_mail_bcc
+          message.bcc ||= mail_method.preferred_mail_bcc
         end
       end
 

data/lib/spree/core/permalinks.rb

@@ -47,8 +47,8 @@ module Spree
         permalink_value = self.to_param
         field = self.class.permalink_field
           # Do other links exist with this permalink?
-          other = self.class.all(:conditions => "#{field} LIKE '#{permalink_value}%'")
-          unless other.empty?
+          other = self.class.where("#{field} LIKE ?", "#{permalink_value}%")
+          if other.any?
             # Find the existing permalink with the highest number, and increment that number.
             # (If none of the existing permalinks have a number, this will evaluate to 1.)
             number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1

data/lib/spree/core/testing_support/factories/product_factory.rb

@@ -1,8 +1,6 @@
 FactoryGirl.define do
-  sequence(:product_sequence) { |n| "Product ##{n} - #{rand(9999)}" }
-
   factory :simple_product, :class => Spree::Product do
-    name { FactoryGirl.generate :product_sequence }
+    sequence(:name) { |n| "Product ##{n} - #{rand(9999)}" }
     description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
     price 19.99
     cost_price 17.00

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.2"
+    "1.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70163167995040 !ruby/object:Gem::Requirement
+  requirement: &70251996737660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70163167995040
+  version_requirements: *70251996737660
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70163167992340 !ruby/object:Gem::Requirement
+  requirement: &70251996735520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163167992340
+  version_requirements: *70251996735520
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70163167989400 !ruby/object:Gem::Requirement
+  requirement: &70251996380040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163167989400
+  version_requirements: *70251996380040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70163168002860 !ruby/object:Gem::Requirement
+  requirement: &70251996377420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70163168002860
+  version_requirements: *70251996377420
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70163167999340 !ruby/object:Gem::Requirement
+  requirement: &70251996375460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70163167999340
+  version_requirements: *70251996375460
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70163167996220 !ruby/object:Gem::Requirement
+  requirement: &70251996373560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163167996220
+  version_requirements: *70251996373560
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70163168010080 !ruby/object:Gem::Requirement
+  requirement: &70251996372140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70163168010080
+  version_requirements: *70251996372140
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70163168007600 !ruby/object:Gem::Requirement
+  requirement: &70251996370680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70163168007600
+  version_requirements: *70251996370680
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70163168005980 !ruby/object:Gem::Requirement
+  requirement: &70251996369560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163168005980
+  version_requirements: *70251996369560
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70163168019780 !ruby/object:Gem::Requirement
+  requirement: &70251996368240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70163168019780
+  version_requirements: *70251996368240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70163168017400 !ruby/object:Gem::Requirement
+  requirement: &70251996367220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70163168017400
+  version_requirements: *70251996367220
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70163168015260 !ruby/object:Gem::Requirement
+  requirement: &70251996365100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163168015260
+  version_requirements: *70251996365100
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70163168013540 !ruby/object:Gem::Requirement
+  requirement: &70251996351260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163168013540
+  version_requirements: *70251996351260
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70163168012340 !ruby/object:Gem::Requirement
+  requirement: &70251996338660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70163168012340
+  version_requirements: *70251996338660
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -872,6 +872,7 @@ files:
 - db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb
 - db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb
 - db/migrate/20120605211305_make_users_email_index_unique.rb
+- db/migrate/20120712172620_add_counter_cache_to_zone_members.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -972,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3949392994446669213
+      hash: 173937272433649960
 requirements:
 - none
 rubyforge_project: spree_core