spree_core 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830a074cf4aa461f6a0048f7b0578b50bec34123
-  data.tar.gz: 89b65b78a3b6402475e921f6adfd77e0cbb1556c
+  metadata.gz: 76d8eb3d2479f484668fccc5c1795f1c62b7b67e
+  data.tar.gz: 4ce1d1792d8bb2ff623031b86240639d11ecf369
 SHA512:
-  metadata.gz: 68771092861e282cbb550d6eadad20cbe20b30d79d26edeb213cffb2a4f34156a77526d60c82f6021b7358833375aa7d2c6b1e045ce371ad06bca4c6b7212c32
-  data.tar.gz: a597449e89e72c2c27f60e3b3c92cc5edccfa43f8827441f5d2497ef5f6f2ab3c16745a4522f81facd00383d718d9ad243a624268e5a380b2e6f98ed01d785e2
+  metadata.gz: 4155e9f4bb960e904001621025b0416c414df65b516729927d39d94e7803e152bbe66ab565e22af23ecb19e2fc93eacaeb33f3f9d4a3e5d03633498795921254
+  data.tar.gz: 412392484d25315800fc78802ac24a82d2780ad2bd187fb649426bb0244091a16f5ffc0037ea96e070f8eedab43dbbacce4212416c4b5d262ac233c654c6a4a4

data/app/models/spree/order_populator.rb

@@ -33,12 +33,10 @@ module Spree
       end
 
       variant = Spree::Variant.find(variant_id)
-      if quantity > 0
-        line_item = @order.contents.add(variant, quantity, options.merge(currency: currency))
-        unless line_item.valid?
-          errors.add(:base, line_item.errors.messages.values.join(" "))
-          return false
-        end
+      begin
+        @order.contents.add(variant, quantity, options.merge(currency: currency))
+      rescue ActiveRecord::RecordInvalid => e
+        errors.add(:base, e.record.errors.messages.values.join(" "))
       end
     end
   end

data/app/models/spree/return_authorization.rb

@@ -29,7 +29,7 @@ module Spree
       before_transition to: :canceled, do: :cancel_return_items
 
       event :cancel do
-        transition to: :canceled, from: :authorized
+        transition to: :canceled, from: :authorized, if: lambda { |return_authorization| return_authorization.can_cancel_return_items? }
       end
 
     end
@@ -54,6 +54,10 @@ module Spree
       customer_returns.exists?
     end
 
+    def can_cancel_return_items?
+      return_items.any?(&:can_cancel?) || return_items.blank?
+    end
+
     private
 
       def must_have_shipped_units
@@ -70,7 +74,7 @@ module Spree
       end
 
       def cancel_return_items
-        return_items.each(&:cancel!)
+        return_items.each { |item| item.cancel! if item.can_cancel? }
       end
 
       def generate_expedited_exchange_reimbursements

data/app/models/spree/return_item.rb

@@ -119,7 +119,7 @@ module Spree
     end
 
     def total
-      pre_tax_amount + additional_tax_total
+      pre_tax_amount + included_tax_total + additional_tax_total
     end
 
     def display_total

data/app/models/spree/store.rb

@@ -5,7 +5,7 @@ module Spree
     validates :url, presence: true
     validates :mail_from_address, presence: true
 
-    before_create :ensure_default_exists_and_is_unique
+    before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
@@ -23,7 +23,7 @@ module Spree
 
     def ensure_default_exists_and_is_unique
       if default
-        Store.update_all(default: false)
+        Store.where.not(id: id).update_all(default: false)
       elsif Store.where(default: true).count == 0
         self.default = true
       end

data/app/models/spree/variant.rb

@@ -89,6 +89,10 @@ module Spree
       is_master? ? name : options_text
     end
 
+    def descriptive_name
+      is_master? ? name + ' - Master' : name + ' - ' + options_text
+    end
+
     # use deleted? rather than checking the attribute directly. this
     # allows extensions to override deleted? if they want to provide
     # their own definition.

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.3"
+    "2.4.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant