spree_core 1.2.3 → 1.2.4

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -89,7 +89,7 @@ $(document).ready(function(){
       html = format_user_autocomplete(item);
       return $("<li></li>")
               .data("item.autocomplete", item)
-              .append("<a class='ui-menu-item'>" + html + "</a>")
+              .append("<a>" + html + "</a>")
               .appendTo(ul);
     }
 

data/app/assets/javascripts/admin/shipping_methods.js.coffee

@@ -1,5 +1,5 @@
 $ ->
-  ($ 'input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
+  ($ 'fieldset.categories input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
   categoryCheckboxes = '.categories input[type=checkbox]'
   $(categoryCheckboxes).change ->
     if ($ this).is(':checked')

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

@@ -108,7 +108,7 @@ module Spree
 
             tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
             tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
-            @collection.concat(tmp)
+            @collection.concat(tmp).uniq!
           end
           @collection
         end

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/models/spree/payment/processing.rb

@@ -111,7 +111,7 @@ module Spree
       options = { :email    => order.email,
                   :customer => order.email,
                   :ip       => '192.168.1.100', # TODO: Use an actual IP
-                  :order_id => order.number }
+                  :order_id => "#{order.number}-#{self.identifier}" }
 
       options.merge!({ :shipping => order.ship_total * 100,
                        :tax      => order.tax_total * 100,

data/app/models/spree/payment.rb

@@ -8,6 +8,8 @@ module Spree
     has_many :offsets, :class_name => "Spree::Payment", :foreign_key => :source_id, :conditions => "source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'"
     has_many :log_entries, :as => :source
 
+    before_save :set_unique_identifier
+
     after_save :create_payment_profile, :if => :profiles_supported?
 
     # update the order totals, etc.
@@ -100,5 +102,22 @@ module Spree
         order.payments.reload
         order.update!
       end
+
+      # Necessary because some payment gateways will refuse payments with
+      # duplicate IDs. We *were* using the Order number, but that's set once and
+      # is unchanging. What we need is a unique identifier on a per-payment basis,
+      # and this is it. Related to #1998.
+      # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
+      def set_unique_identifier
+        chars = [('A'..'Z').to_a, ('0'..'9').to_a].flatten - %w(0 1 I O)
+        identifier = ''
+        8.times { identifier << chars[rand(chars.length)] }
+        if Spree::Payment.exists?(:identifier => identifier)
+          # Call it again, we've got a duplicate ID.
+          set_unique_identifier
+        else
+          self.identifier = identifier
+        end
+      end
   end
 end

data/app/models/spree/variant.rb

@@ -67,7 +67,7 @@ module Spree
     end
 
     def options_text
-      values = self.option_values.sort_by(&:position)
+      values = self.option_values.joins(:option_type).order("#{Spree::OptionType.table_name}.position asc")
 
       values.map! do |ov|
         "#{ov.option_type.presentation}: #{ov.presentation}"

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

@@ -4,7 +4,7 @@
                               :scope => 'spree.date_picker',
                               :default => 'yy/mm/dd'),
     :abbr_day_names => I18n.t(:abbr_day_names, :scope => :date),
-    :month_names    => I18n.t(:month_names, :scope => :date).delete_if(&:blank?),
+    :month_names    => I18n.t(:month_names, :scope => :date).reject(&:blank?),
     :previous       => I18n.t(:previous),
     :next           => I18n.t(:next),
     :no_results     => I18n.t(:no_results),

data/app/views/spree/admin/taxonomies/get_children.json.erb

@@ -1,7 +1,7 @@
 [<% @taxons.each_with_index do |t,i| %>
   { "attr" :
     { "id" : "<%= t.id %>" },
-    "data" : "<%= escape_javascript(raw(t.name)) %>"
+    "data" : "<%= raw(t.name.gsub('"','\"')) %>"
     <% unless t.children.empty? %>
       ,"state" : "closed"
     <% end %>

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

@@ -76,7 +76,7 @@
         </td>
         <td data-hook="order_item_description">
           <h4><%= item.variant.product.name %></h4>
-          <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
+          <%= truncate(raw(item.variant.product.description), :length => 100, :omission => "...") %>
           <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
         </td>
         <td data-hook="order_item_price" class="price"><span><%= money item.price %></span></td>

data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb

@@ -0,0 +1,5 @@
+class AddIdentifierToSpreePayments < ActiveRecord::Migration
+  def change
+    add_column :spree_payments, :identifier, :string
+  end
+end

data/lib/spree/core/controller_helpers.rb

@@ -164,8 +164,8 @@ module Spree
         locale = session[:locale]
         locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
         locale ||= Rails.application.config.i18n.default_locale
-        locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
-        I18n.locale = locale.to_sym
+        locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
+        I18n.locale = locale
       end
 
       # Returns which layout to render.

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.3"
+    "1.2.4"
   end
 end

data/lib/tasks/core.rake

@@ -3,13 +3,13 @@ require 'spree/core/custom_fixtures'
 
 namespace :db do
   desc %q{Loads a specified fixture file:
-For .yml/.csv use rake db:load_file[spree/filename.yml,/absolute/path/to/parent/]
+For .yml      use rake db:load_file[spree/filename.yml,/absolute/path/to/parent/]
 For .rb       use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
   task :load_file , [:file, :dir] => :environment do |t, args|
     file = Pathname.new(args.file)
 
-    if %w{.csv .yml}.include? file.extname
+    if %w{.yml}.include? file.extname
       puts "loading fixture #{Pathname.new(args.dir).join(file)}"
       Spree::Core::Fixtures.create_fixtures(args.dir, file.to_s.sub(file.extname, ""))
     elsif file.exist?
@@ -25,7 +25,7 @@ For .rb       use rake db:load_file[/absolute/path/to/sample/filename.rb]}
 
     fixtures = ActiveSupport::OrderedHash.new
     ruby_files = ActiveSupport::OrderedHash.new
-    Dir.glob(File.join(dir , '**/*.{yml,csv,rb}')).each do |fixture_file|
+    Dir.glob(File.join(dir , '**/*.{yml,rb}')).each do |fixture_file|
       ext = File.extname fixture_file
       if ext == ".rb"
         ruby_files[File.basename(fixture_file, '.*')] = fixture_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: select2-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -1018,6 +1034,7 @@ files:
 - db/migrate/20121009142519_add_lock_version_to_variant.rb
 - db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
 - db/migrate/20121124203911_add_position_to_taxonomies.rb
+- db/migrate/20130203232234_add_identifier_to_spree_payments.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -1118,7 +1135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3458993315221565622
+      hash: -97604365585348825
 requirements:
 - none
 rubyforge_project: spree_core