spree_core 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87fb0ca165c108a20ebe59aac875f51993d7893e
-  data.tar.gz: e3d57525e215f995bcd5461e7882b1948b2c2f10
+  metadata.gz: 74b9cc11b2915cf6a3cb6aa62104f6eaf77c3c33
+  data.tar.gz: dd6804ed2e43a0cb6d87b41ed06c4bd27b4638a6
 SHA512:
-  metadata.gz: f3a6480f68ab69613d6ee3db64bee5b02d5a1b3bbc7a989c083a5dd1b2f2ffa13508ce33267c17a9e58d964dfcba2887af127ee713c5e1e3704cdd4e4ad053c8
-  data.tar.gz: dfebb91aa974e2a86fb4b7f78202740fcc726eb8e997a4d98efd0fce012f9083e936e80c6eb980a8774b5ddd8e1feee5426ba07ae72422d0e585b1f76f863c1f
+  metadata.gz: f8cb30c856f1491e29066c9afb33aeaa0791cd904d7bc8be5824b9c4bcb0eeaa9c7589cf4f72e4cf215bc10e46fd58f6c51b9fa6804e36123334ff326f454a03
+  data.tar.gz: b199cffe7f6c2e46af52e2bb1d68cfeb98a2fa888829f0bf0be962e24b7dd59b2886b4f38d6c693007964cf660b0c0f39f144cc0e2eb74cdb8952860832f4a85

data/app/models/spree/option_type.rb

@@ -1,5 +1,7 @@
 module Spree
   class OptionType < Spree::Base
+    acts_as_list
+
     has_many :option_values, -> { order(:position) }, dependent: :destroy, inverse_of: :option_type
     has_many :product_option_types, dependent: :destroy, inverse_of: :option_type
     has_many :products, through: :product_option_types

data/app/models/spree/promotion.rb

@@ -41,8 +41,8 @@ module Spree
     end
 
     def self.active
-      where('starts_at IS NULL OR starts_at < ?', Time.now).
-        where('expires_at IS NULL OR expires_at > ?', Time.now)
+      where('spree_promotions.starts_at IS NULL OR spree_promotions.starts_at < ?', Time.now).
+        where('spree_promotions.expires_at IS NULL OR spree_promotions.expires_at > ?', Time.now)
     end
 
     def self.order_activatable?(order)

data/app/models/spree/refund.rb

@@ -47,6 +47,7 @@ module Spree
 
       self.transaction_id = @response.authorization
       update_columns(transaction_id: transaction_id)
+      update_order
     end
 
     # return an activemerchant response object if successful or else raise an error
@@ -87,5 +88,9 @@ module Spree
         errors.add(:amount, :greater_than_allowed)
       end
     end
+
+    def update_order
+      payment.order.updater.update
+    end
   end
 end

data/app/models/spree/taxonomy.rb

@@ -1,5 +1,7 @@
 module Spree
   class Taxonomy < Spree::Base
+    acts_as_list
+
     validates :name, presence: true
 
     has_many :taxons, inverse_of: :taxonomy

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.5"
+    "2.4.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant