spree_promo 1.2.4 → 1.2.5

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

@@ -4,10 +4,13 @@ module Spree
       class CreateLineItems < PromotionAction
         has_many :promotion_action_line_items, :foreign_key => :promotion_action_id
 
+        delegate :eligible?, :to => :promotion
+
         attr_accessor :line_items_string
 
         def perform(options = {})
           return unless order = options[:order]
+          return unless eligible?(order)
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
             if current_quantity < item.quantity

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

@@ -2,20 +2,27 @@ module Spree
   class Promotion
     module Rules
       class FirstOrder < PromotionRule
+        attr_reader :user, :email
+
         def eligible?(order, options = {})
-          user = order.try(:user) || options[:user]
-          if user
-            return orders_by_email(user.email) == 0
-          elsif order.email
-            return orders_by_email(order.email) == 0
-          end
+          @user = order.try(:user) || options[:user]
+          @email = order.email
 
-          return false
+          if user || email
+            completed_orders.blank? || (completed_orders.first == order)
+          else
+            false
+          end
         end
 
-        def orders_by_email(email)
-          Spree::Order.where(:email => email).count
-        end
+        private
+          def completed_orders
+            user ? user.orders.complete : orders_by_email
+          end
+
+          def orders_by_email
+            Spree::Order.where(:email => email).complete
+          end
       end
     end
   end

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

@@ -4,14 +4,7 @@ module Spree
       class UserLoggedIn < PromotionRule
 
         def eligible?(order, options = {})
-          # this is tricky.  We couldn't use any of the devise methods since we aren't in the controller.
-          # we need to rely on the controller already having done this for us.
-
-          # The thinking is that the controller should have some sense of what state
-          # we should be in before firing events,
-          # so the controller will have to set this field.
-
-          return options && options[:user_signed_in]
+          return order.try(:user).try(:anonymous?) == false
         end
 
       end

data/config/routes.rb

@@ -1,4 +1,4 @@
-Spree::Core::Engine.routes.prepend do
+Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :promotions do
       resources :promotion_rules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-06-13 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.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 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: 4124392625263849039
+      hash: -1350861266024134315
 requirements:
 - none
 rubyforge_project: