spree_core 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed979ffaeda61e053a4b98e9dc25390529f0f0e
-  data.tar.gz: 3d4c081a21a8f8a118066c765c0970aa18322c5d
+  metadata.gz: 5c3f728999034d676a7bade2faa38354f43b90e7
+  data.tar.gz: f4112e883677f3f9561afac00de040a5191141d5
 SHA512:
-  metadata.gz: b919e8bca207687063f08ddda21b392381991e04f409b86d8d32c63e6ee38158a3b0ea5348158f662d52693dbe17b4af3e402cc99c6f1555b2fe61ed94f235d1
-  data.tar.gz: d9c59d21c2b5faece11d94a153cdb1bcee54adf364662b20d9b069550067b25629a9403fcf709b5b150633356b925bf41462a0252954951171d0f582c1f3d6e2
+  metadata.gz: abc9b0511722dada69919986af38a1c160ea1b4eae247936d57bc0e9bf9316e699e2dfb15469dcfec67ccd59a54fc1689cabb7a19960f00bedf2fbab38edb231
+  data.tar.gz: 6e515054c8250211a602f28d42dcc519502ca09f2928a755546ae44860fea1bc8499562fbf30a70300c75311095f7f69093d26805158d0d4c769eade5dd4247f

data/app/models/spree/promotion/rules/product.rb

@@ -40,7 +40,14 @@ module Spree
         end
 
         def actionable?(line_item)
-          product_ids.include? line_item.variant.product_id
+          case preferred_match_policy
+          when 'any', 'all'
+            product_ids.include? line_item.variant.product_id
+          when 'none'
+            product_ids.exclude? line_item.variant.product_id
+          else
+            raise "unexpected match policy: #{preferred_match_policy.inspect}"
+          end
         end
 
         def product_ids_string

data/app/models/spree/reimbursement.rb

@@ -105,7 +105,7 @@ module Spree
 
       reimbursement_performer.perform(self)
 
-      if unpaid_amount.zero?
+      if unpaid_amount_within_tolerance?
         reimbursed!
         reimbursement_success_hooks.each { |h| h.call self }
         send_reimbursement_email
@@ -146,5 +146,23 @@ module Spree
     def send_reimbursement_email
       Spree::ReimbursementMailer.reimbursement_email(self.id).deliver
     end
+
+    # If there are multiple different reimbursement types for a single
+    # reimbursement we open ourselves to a one-cent rounding error for every
+    # type over the first one. This is due to how we round #unpaid_amount and
+    # how each reimbursement type will round as well. Since at this point the
+    # payments and credits have already been processed, we should allow the
+    # reimbursement to show as 'reimbursed' and not 'errored'.
+    def unpaid_amount_within_tolerance?
+      reimbursement_count = reimbursement_models.count do |model|
+        model.total_amount_reimbursed_for(self) > 0
+      end
+      leniency = if reimbursement_count > 0
+                   (reimbursement_count - 1) * 0.01.to_d
+                 else
+                   0
+                 end
+      unpaid_amount.abs.between?(0, leniency)
+    end
   end
 end

data/app/models/spree/reimbursement/reimbursement_type_validator.rb

@@ -1,7 +1,10 @@
 module Spree
   module Reimbursement::ReimbursementTypeValidator
     def valid_preferred_reimbursement_type?(return_item)
-      !past_reimbursable_time_period?(return_item) || return_item.preferred_reimbursement_type == expired_reimbursement_type
+      preferred_type = return_item.preferred_reimbursement_type.class
+
+      !past_reimbursable_time_period?(return_item) ||
+        preferred_type == expired_reimbursement_type
     end
 
     def past_reimbursable_time_period?(return_item)

data/app/models/spree/reimbursement_type/credit.rb

@@ -4,7 +4,7 @@ module Spree
 
     class << self
       def reimburse(reimbursement, return_items, simulate)
-        unpaid_amount = return_items.sum(&:total).round(2)
+        unpaid_amount = return_items.sum(&:total).round(2, :down)
         reimbursement_list, unpaid_amount = create_credits(reimbursement, unpaid_amount, simulate)
         reimbursement_list
       end

data/app/models/spree/reimbursement_type/original_payment.rb

@@ -3,7 +3,7 @@ class Spree::ReimbursementType::OriginalPayment < Spree::ReimbursementType
 
   class << self
     def reimburse(reimbursement, return_items, simulate)
-      unpaid_amount = return_items.sum(&:total).round(2)
+      unpaid_amount = return_items.sum(&:total).round(2, :down)
       payments = reimbursement.order.payments.completed
 
       refund_list, unpaid_amount = create_refunds(reimbursement, payments, unpaid_amount, simulate)

data/app/models/spree/store.rb

@@ -1,12 +1,12 @@
 module Spree
   class Store < Spree::Base
-
     validates :code, presence: true, uniqueness: { allow_blank: true }
     validates :name, presence: true
     validates :url, presence: true
     validates :mail_from_address, presence: true
 
     before_create :ensure_default_exists_and_is_unique
+    before_destroy :validate_not_default
 
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
@@ -24,10 +24,15 @@ module Spree
     def ensure_default_exists_and_is_unique
       if default
         Store.update_all(default: false)
-      else
+      elsif Store.where(default: true).count == 0
         self.default = true
       end
     end
 
+    def validate_not_default
+      if default
+        errors.add(:base, :cannot_destroy_default_store)
+      end
+    end
   end
 end

data/config/locales/en.yml

@@ -298,6 +298,11 @@ en:
               cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.
             inventory_unit:
               other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"
+        spree/store:
+          attributes:
+            base:
+              cannot_destroy_default_store: Cannot destroy the default Store.
+
 
   devise:
     confirmations:

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.4.0"
+    "2.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant