spree_core 1.0.6 → 1.0.7

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

@@ -211,9 +211,9 @@ $(".observe_field").live('change', function() {
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
     dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
-    dayNames: ["<%= ::I18n.t(:day_names, :scope => :date).join('","') %>"],
-    dayNamesMin: ["<%= ::I18n.t(:abbr_day_names, :scope => :date).join('","') %>"],
-    monthNames: ["<%= ::I18n.t(:month_names, :scope => :date).join('","') %>"],
+    dayNames: <%= ::I18n.t(:day_names, :scope => :date).to_json %>,
+    dayNamesMin: <%= ::I18n.t(:abbr_day_names, :scope => :date).to_json %>,
+    monthNames: <%= (::I18n.t(:month_names, :scope => :date).delete_if(&:blank?)).to_json %>,
     prevText: '<%= ::I18n.t(:previous) %>',
     nextText: '<%= ::I18n.t(:next) %>',
     showOn: "button",

data/app/controllers/spree/locale_controller.rb

@@ -4,8 +4,8 @@ module Spree
       if request.referer && request.referer.starts_with?('http://' + request.host)
         session['user_return_to'] = request.referer
       end
-      if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
-        session[:locale] = I18n.locale = params[:locale].to_sym
+      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
+        session[:locale] = I18n.locale = params[:locale]
         flash.notice = t(:locale_changed)
       else
         flash[:error] = t(:locale_not_changed)

data/app/controllers/spree/orders_controller.rb

@@ -13,7 +13,7 @@ module Spree
     def update
       @order = current_order
       if @order.update_attributes(params[:order])
-        @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+        @order.line_items = @order.line_items.select { |li| li.quantity > 0 }
         fire_event('spree.order.contents_changed')
         respond_with(@order) { |format| format.html { redirect_to cart_path } }
       else
@@ -63,8 +63,10 @@ module Spree
       redirect_to spree.cart_path
     end
 
-    def accurate_titles
-      @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
-    end
+    private
+
+      def accurate_title
+        @order && @order.completed? ? "#{Order.model_name.human} #{@order.number}" : t(:shopping_cart)
+      end
   end
 end

data/app/models/spree/product.rb

@@ -30,8 +30,8 @@ module Spree
     belongs_to :shipping_category
 
     has_one :master,
-      :class_name => 'Spree::Variant',
-      :conditions => ["#{Variant.quoted_table_name}.is_master = ? AND #{Variant.quoted_table_name}.deleted_at IS NULL", true]
+      :class_name => "Spree::Variant",
+      :conditions => { :is_master => true }
 
     delegate_belongs_to :master, :sku, :price, :weight, :height, :width, :depth, :is_master
     delegate_belongs_to :master, :cost_price if Variant.table_exists? && Variant.column_names.include?('cost_price')

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

@@ -39,17 +39,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
@@ -204,7 +193,7 @@ module Spree
 
     add_search_scope :on_hand do
       variants_table = Variant.table_name
-      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id group by product_id having sum(count_on_hand) > 0)")
+      where("#{table_name}.id in (select product_id from #{variants_table} where product_id = #{table_name}.id and #{variants_table}.deleted_at IS NULL group by product_id having sum(count_on_hand) > 0)")
     end
 
     add_search_scope :taxons_name_eq do |name|

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

@@ -22,7 +22,7 @@
     <% @tax_rates.each do |tax_rate|%>
     <tr id="<%= dom_id tax_rate %>" data-hook="rate_row">
       <td><%=tax_rate.zone.name %></td>
-      <td><%= tax_rate.tax_category ? tax_rate.tax_category.name : "N/A" %></td>
+      <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.included_in_price %></td>
       <td><%=tax_rate.calculator.to_s %></td>

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

@@ -1,37 +1,38 @@
 <% if tracker = Spree::Tracker.current %>
 
-  <%= javascript_tag do -%>
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  <% end -%>
+  <%= javascript_tag do %>
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
+    _gaq.push(['_trackPageview']);
 
-  <%= javascript_tag do -%>
-    var pageTracker = _gat._getTracker("<%= tracker.analytics_id %>");
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  <% 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
-      );
+    <% 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| %>
-        pageTracker._addItem("<%= @order.number %>", "<%= line_item.variant.sku %>", "<%= line_item.variant.product.name %>",
-          "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
+        _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 %>
-      pageTracker._trackTrans();
-    <% 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 %>
-
 <% end %>

data/config/locales/en.yml

@@ -573,6 +573,7 @@ en:
   none_available: "None Available"
   normal_amount: "Normal Amount"
   not: not
+  not_available: "N/A"
   not_found: "%{resource} is not found"
   not_shown: "Not Shown"
   note: Note

data/lib/spree/core/controller_helpers.rb

@@ -100,8 +100,8 @@ module Spree
 
         def set_user_language
           locale = session[:locale] || Spree::Config[:default_locale] || Rails.application.config.i18n.default_locale
-          locale = I18n.default_locale unless locale && I18n.available_locales.include?(locale.to_sym)
-          I18n.locale = locale.to_sym
+          locale = I18n.default_locale unless locale && I18n.available_locales.map(&:to_s).include?(locale)
+          I18n.locale = locale
         end
       end
     end

data/lib/spree/product_filters.rb

@@ -4,7 +4,7 @@ module Spree
   #   the current contents are mainly for testing and documentation
 
   # To override this file...
-  #   1) Make a copy of it in your sites local /lib folder
+  #   1) Make a copy of it in your sites local /lib/spree folder
   #   2) Add it to the config load path, or require it in an initializer, e.g...
   #      
   #      # config/initializers/spree.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,69 +9,91 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70340307658100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70340307658100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70340307652340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70340307652340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70340307669060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.18
-    - - <=
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.19
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70340307669060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70340315380700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70340315380700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70340315376160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340315376160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70340315435560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,54 +101,79 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340315435560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70340315451480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340315451480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70340315459840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340315459840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70340315454400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340315454400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.20.1
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70340315476380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *70340315476380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.10
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70340315493040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +181,15 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340315493040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70340315504320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +197,15 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340315504320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70340315497840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,7 +213,12 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70340315497840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -271,6 +333,7 @@ files:
 - app/assets/images/icons/checkout.png
 - app/assets/images/icons/delete.png
 - app/assets/images/icons/update.png
+- app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
@@ -972,11 +1035,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 468942711593894145
+      hash: 1804394564669674040
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.