spree_promo 1.3.0.rc1 → 1.3.0.rc2

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

@@ -0,0 +1,31 @@
+$.fn.productAutocomplete = function() {
+  this.select2({
+    minimumInputLength: 1,
+    multiple: true,
+    initSelection: function(element, callback) {
+      $.get(Spree.routes.product_search, { ids: element.val() }, function(data) { 
+        callback(data)
+      })
+    },
+    ajax: {
+      url: Spree.routes.product_search,
+      datatype: 'json',
+      data: function(term, page) {
+        return { q: term }
+      },
+      results: function(data, page) {
+        return { results: data }
+      }
+    },
+    formatResult: function(product) {
+      return product.name;
+    },
+    formatSelection: function(product) {
+      return product.name;
+    }
+  });
+}
+
+$(document).ready(function () {
+  $('.product_picker').productAutocomplete();
+})

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

@@ -1,39 +1,4 @@
 //= require admin/spree_core
+//= require admin/user_picker
+//= require admin/product_picker
 //= require_tree .
-
-function cleanUsers(data) {
-  var users = $.map(data['users'], function(result) {
-    return result['user']
-  })
-  return users;
-}
-
-$(document).ready(function() {
-  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))
-        })
-      },
-      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;
-      }
-    });
-  }
-})

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

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

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

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,12 +1,12 @@
 $('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
+$(document).ready(function(){
+  $(".variant_autocomplete").variantAutocomplete();
+});
 initProductActions();
 
-<% unless Rails.env.test? %>
-  $('.type-select.select2').select2();
-<% end %>
+$('.type-select.select2').select2();
 
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
-$('#<%= dom_id @promotion_action %> .tokeninput.products').productPicker();
-$('.product_autocomplete').product_autocomplete();
+

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -1,13 +1,7 @@
 $('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
 $('#rules .no-objects-found').hide();
 
-$('#<%= dom_id @promotion_rule %>').hide();
-$('#<%= dom_id @promotion_rule %>').fadeIn();
-$('#<%= dom_id @promotion_rule %> .tokeninput.products').productPicker();
-$('#<%= dom_id @promotion_rule %> .tokeninput.users').userPicker();
+$('.product_picker').productAutocomplete();
+$('.user_picker').userAutocomplete();
 
 $('#promotion_rule_type').html('<%= escape_javascript options_for_promotion_rule_types(@promotion) %>');
-
-<% unless Rails.env.test? %>
-  $('.select_item_total.select2, .select_product.select2').select2();
-<% end %>

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

@@ -1,6 +1,6 @@
 <div class="field alpha omega eight columns products_rule_products">
-  <%= label_tag t('product_rule.choose_products') %>
-  <%= product_picker_field "#{param_prefix}[product_ids_string]", promotion_rule.product_ids_string %>
+  <%= label_tag "#{param_prefix}_product_ids_string", t('product_rule.choose_products') %>
+  <%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), :class => "product_picker fullwidth" %>
 </div>
 <div class="field alpha omega eight columns">
   <label>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-16 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.3.0.rc1
+        version: 1.3.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc1
+        version: 1.3.0.rc2
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -34,8 +34,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- app/assets/javascripts/admin/product_picker.js
 - app/assets/javascripts/admin/promotions.js
 - app/assets/javascripts/admin/spree_promo.js
+- app/assets/javascripts/admin/user_picker.js
 - app/assets/javascripts/store/spree_promo.js
 - app/assets/stylesheets/admin/spree_promo.css
 - app/assets/stylesheets/store/spree_promo.css
@@ -101,7 +103,8 @@ files:
 - lib/spree_promo.rb
 - db/migrate/20120831092359_spree_promo_one_two.rb
 homepage: http://spreecommerce.com
-licenses: []
+licenses:
+- BSD-3
 post_install_message: 
 rdoc_options: []
 require_paths: