spree_promo 0.60.4 → 0.60.5

data/app/models/promotion.rb

@@ -47,8 +47,7 @@ class Promotion < ActiveRecord::Base
 
   def create_discount(order)
     return if order.promotion_credit_exists?(self)
-    if eligible?(order) and amount = calculator.compute(order)
-      amount = order.item_total if amount > order.item_total
+    if eligible?(order) and amount = compute(order)
       order.promotion_credits.reload.clear unless combine? and order.promotion_credits.all? { |credit| credit.source.combine? }
       order.update!
       PromotionCredit.create!({
@@ -60,7 +59,11 @@ class Promotion < ActiveRecord::Base
     end
   end
 
-
+  def compute(order)
+    amount = calculator.compute(order)
+    amount = order.item_total if amount > order.item_total
+    -amount
+  end
 
   # Products assigned to all product rules
   def products

data/app/models/promotion_credit.rb

@@ -1,29 +1,9 @@
 class PromotionCredit < ::Adjustment
   scope :with_order, :conditions => "order_id IS NOT NULL"
 
-  def calculate_adjustment
-    adjustment_source && calculate_coupon_credit
-  end
-
   # Checks if credit is still applicable to order
   # If source of adjustment is credit, it checks if it's still valid
   def applicable?
-    adjustment_source && adjustment_source.eligible?(order) && super
-  end
-
-  # Calculates credit for the coupon.
-  #
-  # If coupon amount exceeds the order item_total, credit is adjusted.
-  #
-  # Always returns negative non positive.
-  def calculate_coupon_credit
-    return 0 if order.line_items.empty?
-    amount = adjustment_source.calculator.compute(order.line_items).abs
-    amount = order.item_total if amount > order.item_total
-    -1 * amount
-  end
-
-  def total
-    map(&:amount).sum
+    source && source.eligible?(order) && super
   end
-end
+end

data/lib/spree_promo.rb

@@ -27,6 +27,14 @@ module SpreePromo
         attr_accessible :coupon_code
         attr_accessor :coupon_code
         before_save :process_coupon_code, :if => "@coupon_code.present?"
+        
+        def finalized?
+          self.class.finalized_states.include?(state)
+        end
+        
+        def self.finalized_states
+          ["complete", "awaiting_return", "returned"]
+        end
 
         def promotion_credit_exists?(credit)
           promotion_credits.reload.detect { |c| c.source_id == credit.id }
@@ -47,7 +55,7 @@ module SpreePromo
           self.payment_total = payments.completed.map(&:amount).sum
           self.item_total = line_items.map(&:amount).sum
 
-          process_automatic_promotions
+          process_automatic_promotions unless finalized?
 
           if force_adjustment_recalculation
             applicable_adjustments, adjustments_to_destroy = adjustments.partition{|a| a.applicable?}
@@ -64,7 +72,7 @@ module SpreePromo
           # recalculate amount
           self.promotion_credits.each do |credit|
             if credit.source.eligible?(self)
-              amount = -credit.source.calculator.compute(self).abs
+              amount = credit.source.compute(self)
               if credit.amount != amount
                 # avoid infinite callbacks
                 PromotionCredit.update_all("amount = #{amount}", { :id => credit.id })
@@ -81,12 +89,11 @@ module SpreePromo
           new_promotions = eligible_automatic_promotions - current_promotions
           new_promotions.each do |promotion|
             next if current_promotions.present? && !promotion.combine?
-            amount = promotion.calculator.compute(self).abs
-            amount = item_total if amount > item_total
+            amount = credit.source.compute(self)
             if amount > 0
               self.promotion_credits.create(
                   :source => promotion,
-                  :amount => -amount,
+                  :amount => amount,
                   :label  => promotion.name
                 )
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 231
+  hash: 229
   prerelease: 
   segments: 
   - 0
   - 60
-  - 4
-  version: 0.60.4
+  - 5
+  version: 0.60.5
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -23,12 +23,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 231
+        hash: 229
         segments: 
         - 0
         - 60
-        - 4
-        version: 0.60.4
+        - 5
+        version: 0.60.5
   requirement: *id001
   type: :runtime
   prerelease: false