spree_promo 1.2.3 → 1.2.4

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -1,27 +1,36 @@
 module Spree
   class Promotion
     module Actions
+      # Responsible for the creation and management of an adjustment since an
+      # an adjustment uses its originator to also update its eligiblity and amount
       class CreateAdjustment < PromotionAction
         calculated_adjustments
 
+        has_many :adjustments, :as => :originator, :dependent => :destroy
+
         delegate :eligible?, :to => :promotion
 
         before_validation :ensure_action_has_calculator
 
+        # Creates the adjustment related to a promotion for the order passed
+        # through options hash
         def perform(options = {})
-          return unless order = options[:order]
-          # Nothing to do if the promotion is already associated with the order
-          return if order.promotion_credit_exists?(promotion)
-
-          order.adjustments.promotion.reload.clear
-          order.update!
-          create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
-          order.update!
+          order = options[:order]
+          return if order.promotion_credit_exists?(self.promotion)
+
+          self.create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
         end
 
-        # override of CalculatedAdjustments#create_adjustment so promotional
-        # adjustments are added all the time. They will get their eligability
-        # set to false if the amount is 0
+        # Override of CalculatedAdjustments#create_adjustment so promotional
+        # adjustments are added all the time. They will get their eligibility
+        # set to false if the amount is 0.
+        #
+        # Currently an adjustment is created even when its promotion is not eligible.
+        # This helps to figure out later which adjustments should be eligible
+        # as the order is being updated
+        #
+        # BTW The order is updated (through order#update) every time an adjustment
+        # is saved
         def create_adjustment(label, target, calculable, mandatory=false)
           amount = compute_amount(calculable)
           params = { :amount => amount,
@@ -32,7 +41,8 @@ module Spree
           target.adjustments.create(params, :without_protection => true)
         end
 
-        # Ensure a negative amount which does not exceed the sum of the order's item_total and ship_total
+        # Ensure a negative amount which does not exceed the sum of the order's
+        # item_total and ship_total
         def compute_amount(calculable)
           [(calculable.item_total + calculable.ship_total), super.to_f.abs].min * -1
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 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: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.4
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3116838314541820160
+      hash: 4124392625263849039
 requirements:
 - none
 rubyforge_project: