spree_promo 0.50.0 → 0.50.1

data/app/models/promotion/rules/first_order.rb

@@ -1,7 +1,7 @@
 class Promotion::Rules::FirstOrder < PromotionRule
 
   def eligible?(order)
-    order.user && order.user.orders.checkout_complete.count == 0
+    order.user && order.user.orders.complete.count == 0
   end
 
 end

data/app/models/promotion.rb

@@ -7,7 +7,7 @@ class Promotion < ActiveRecord::Base
   accepts_nested_attributes_for :promotion_rules
   alias_method :rules, :promotion_rules
 
-  validates :name, :code, :presence => true
+  validates :name, :presence => true
 
   # TODO: Remove that after fix for https://rails.lighthouseapp.com/projects/8994/tickets/4329-has_many-through-association-does-not-link-models-on-association-save
   # is provided
@@ -20,6 +20,7 @@ class Promotion < ActiveRecord::Base
   MATCH_POLICIES = %w(all any)
 
   scope :automatic, where("code IS NULL OR code = ''")
+  scope :manual, where("code IS NOT NULL AND code <> ''")
 
   def eligible?(order)
     !expired? && rules_are_eligible?(order)

data/app/models/promotion_credit.rb

@@ -1,5 +1,4 @@
 class PromotionCredit < ::Adjustment
-  belongs_to :order
   scope :with_order, :conditions => "order_id IS NOT NULL"
 
   def calculate_adjustment

data/app/views/admin/promotions/rules/_product.html.erb

@@ -4,7 +4,7 @@
 </p>
 <p class="field products_rule_product_group">
   <label><%= t('product_group') %><br />
-    <%= select_tag "#{param_prefix}[product_group_id]", '<option></option>' + options_from_collection_for_select(ProductGroup.all, :id, :name, promotion_rule.product_group_id) %></label>
+    <%= select_tag "#{param_prefix}[product_group_id]", options_from_collection_for_select(ProductGroup.all, :id, :name, promotion_rule.product_group_id) %></label>
 </p>
 <p class="field products_rule_products">
   <label>

data/app/views/checkout/_coupon_code_field.html.erb

@@ -1,4 +1,6 @@
+<% if Promotion.manual.count > 0 %>
 <p>
   <%= form.label :coupon_code %><br />
   <%= form.text_field :coupon_code %>
 </p>
+<% end %>

data/config/locales/en.yml

@@ -1,5 +1,14 @@
 ---
 en:
+  activerecord:
+    attributes:
+      promotion:
+        name: "Name"
+        description: "Description"
+        code: "Code"
+        usage_limit: "Usage limit"
+        starts_at: "Starts at"
+        expires_at: "Expires at"
   add_rule_of_type: Add rule of type
   coupon: Coupon
   coupon_code: Coupon code

data/lib/spree_promo.rb

@@ -22,11 +22,11 @@ module SpreePromo
 
       Order.class_eval do
 
-        has_many :promotion_credits, :conditions => "source_type='Promotion'"
+        has_many :promotion_credits, :conditions => "source_type='Promotion'", :dependent => :destroy
 
         attr_accessible :coupon_code
         attr_accessor :coupon_code
-        before_save :process_coupon_code, :if => "@coupon_code"
+        before_save :process_coupon_code, :if => "@coupon_code.present?"
 
         def promotion_credit_exists?(credit)
           promotion_credits.reload.detect { |c| c.source_id == credit.id }
@@ -61,19 +61,36 @@ module SpreePromo
 
 
         def process_automatic_promotions
-          #promotion_credits.reload.clear
-          eligible_automatic_promotions.each do |coupon|
-            # can't use coupon.create_discount as it re-saves the order causing an infinite loop
-            if amount = coupon.calculator.compute(line_items)
-              amount = item_total if amount > item_total
-              promotion_credits.reload.clear unless coupon.combine? and promotion_credits.all? { |credit| credit.adjustment_source.combine? }
-              promotion_credits.create!({
-                  :source => coupon,
-                  :amount => -amount.abs,
-                  :label => coupon.description
-                })
+          # recalculate amount
+          self.promotion_credits.each do |credit|
+            if credit.source.eligible?(self)
+              amount = -credit.source.calculator.compute(self).abs
+              if credit.amount != amount
+                # avoid infinite callbacks
+                PromotionCredit.update_all("amount = #{amount}", { :id => credit.id })
+              end
+            else
+              credit.destroy
             end
-          end.compact
+          end
+          
+          current_promotions = self.promotion_credits.map(&:source)
+          # return if current promotions can not be combined
+          return if current_promotions.any? { |promotion| !promotion.combine? }
+          
+          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
+            if amount > 0
+              self.promotion_credits.create(
+                  :source => promotion,
+                  :amount => -amount,
+                  :label  => promotion.name
+                )
+            end
+          end
         end
 
         def eligible_automatic_promotions

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_promo
 version: !ruby/object:Gem::Version 
-  hash: 215
-  prerelease: false
+  hash: 213
+  prerelease: 
   segments: 
   - 0
   - 50
-  - 0
-  version: 0.50.0
+  - 1
+  version: 0.50.1
 platform: ruby
 authors: 
 - David North
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 215
+        hash: 213
         segments: 
         - 0
         - 50
-        - 0
-        version: 0.50.0
+        - 1
+        version: 0.50.1
   type: :runtime
   version_requirements: *id001
 description: Required dependancy for Spree
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_promo
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.