spree_promo 1.2.2 → 1.2.3

data/app/assets/javascripts/admin/spree_promo.js

@@ -9,29 +9,31 @@ function cleanUsers(data) {
 }
 
 $(document).ready(function() {
-  $('.user_picker').select2({
-    minimumInputLength: 1,
-    multiple: true,
-    initSelection: function(element, callback) {
-      $.get(Spree.routes.user_search, { ids: element.val() }, function(data) { 
-        callback(cleanUsers(data))
-      })
-    },
-    ajax: {
-      url: Spree.routes.user_search,
-      datatype: 'json',
-      data: function(term, page) {
-        return { q: term }
+  if ($('user_picker').length > 0) {
+    $('.user_picker').select2({
+      minimumInputLength: 1,
+      multiple: true,
+      initSelection: function(element, callback) {
+        $.get(Spree.routes.user_search, { ids: element.val() }, function(data) { 
+          callback(cleanUsers(data))
+        })
       },
-      results: function(data, page) {
-        return { results: cleanUsers(data) }
+      ajax: {
+        url: Spree.routes.user_search,
+        datatype: 'json',
+        data: function(term, page) {
+          return { q: term }
+        },
+        results: function(data, page) {
+          return { results: cleanUsers(data) }
+        }
+      },
+      formatResult: function(user) {
+        return user.email;
+      },
+      formatSelection: function(user) {
+        return user.email;
       }
-    },
-    formatResult: function(user) {
-      return user.email;
-    },
-    formatSelection: function(user) {
-      return user.email;
-    }
-  });
+    });
+  }
 })

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

@@ -4,7 +4,17 @@ module Spree
       class FirstOrder < PromotionRule
         def eligible?(order, options = {})
           user = order.try(:user) || options[:user]
-          !!(user && user.orders.complete.count == 0)
+          if user
+            return orders_by_email(user.email) == 0
+          elsif order.email
+            return orders_by_email(order.email) == 0
+          end
+
+          return false
+        end
+
+        def orders_by_email(email)
+          Spree::Order.where(:email => email).count
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70301845341720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70301845341720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -107,7 +112,8 @@ files:
 - db/migrate/20120119024708_create_spree_pending_promotions.rb
 - db/migrate/20120119024721_content_visited_event.rb
 homepage: http://spreecommerce.com
-licenses: []
+licenses:
+- BSD-3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -126,11 +132,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4584730679565675092
+      hash: 3116838314541820160
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Promotion functionality for use with Spree.