spree_promo 1.3.2 → 1.3.3

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

@@ -1,29 +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 }
+  if (Spree.routes) {
+    this.select2({
+      minimumInputLength: 1,
+      multiple: true,
+      initSelection: function(element, callback) {
+        $.get(Spree.routes.product_search, { ids: element.val() }, function(data) { 
+          callback(data)
+        })
       },
-      results: function(data, page) {
-        return { results: 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;
       }
-    },
-    formatResult: function(product) {
-      return product.name;
-    },
-    formatSelection: function(product) {
-      return product.name;
-    }
-  });
+    });
+  }
 }
 
 $(document).ready(function () {

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

@@ -1,7 +1,7 @@
 var initProductActions = function(){
 
   // Add classes on promotion items for design
-  $('a.delete').live('mouseover mouseout', function(event) {
+  $(document).on('mouseover mouseout', 'a.delete', function(event) {
     if (event.type == 'mouseover') {
       $(this).parent().addClass('action-remove');
     } else {
@@ -9,7 +9,7 @@ var initProductActions = function(){
     }
   });
 
-  $(".variant_autocomplete").variantAutocomplete();
+  $('#promotion-filters').find(".variant_autocomplete").variantAutocomplete();
 
   $('.calculator-fields').each(function(){
     var $fields_container = $(this);

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

@@ -1,29 +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 }
+  if (Spree.routes) {
+    this.select2({
+      minimumInputLength: 1,
+      multiple: true,
+      initSelection: function(element, callback) {
+        $.get(Spree.routes.user_search, { ids: element.val() }, function(data) { 
+          callback(data)
+        })
       },
-      results: function(data, page) {
-        return { results: 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;
       }
-    },
-    formatResult: function(user) {
-      return user.email;
-    },
-    formatSelection: function(user) {
-      return user.email;
-    }
-  });
+    });
+  }
 }
 
 $(document).ready(function () {

data/app/controllers/spree/orders_controller_decorator.rb

@@ -2,6 +2,11 @@ Spree::OrdersController.class_eval do
 
   def update
     @order = current_order
+    unless @order
+      flash[:error] = t(:order_not_found)
+      redirect_to root_path and return
+    end
+
     if @order.update_attributes(params[:order])
       render :edit and return unless apply_coupon_code
       

data/app/models/spree/calculator/percent_per_item.rb

@@ -34,7 +34,7 @@ module Spree
     # unless the product is included in the promotion rules.
     def value_for_line_item(line_item)
       if compute_on_promotion?
-        return 0 unless matching_products.include?(line_item.product)
+        return 0 unless matching_products.blank? or matching_products.include?(line_item.product)
       end
       line_item.price * line_item.quantity * preferred_percent
     end

data/app/models/spree/promotion.rb

@@ -37,6 +37,10 @@ module Spree
       where(:advertise => true)
     end
 
+    def self.with_code
+      where(:event_name => 'spree.checkout.coupon_code_added')
+    end
+
     def activate(payload)
       return unless order_activatable? payload[:order]
 

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.rb

@@ -8,7 +8,7 @@ module Spree
         has_and_belongs_to_many :users, :class_name => Spree.user_class.to_s, :join_table => 'spree_promotion_rules_users', :foreign_key => 'promotion_rule_id'
 
         def eligible?(order, options = {})
-          users.none? or users.include?(order.user)
+          users.include?(order.user)
         end
 
         def user_ids_string

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/app/overrides/promo_cart_coupon_code_field.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(:virtual_path => "spree/orders/edit",
                      :name => "promo_cart_coupon_code_field",
-                     :insert_after => "[data-hook='cart_buttons']",
+                     :insert_top => "[data-hook='cart_buttons']",
                      :partial => "spree/orders/coupon_code_field",
                      :disabled => false,
                      :original => "c11d9a1996fb86e992aba19035074cf5f688dea2")

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

@@ -1,4 +1,4 @@
-<% if Spree::Promotion.count > 0 %>
+<% if Spree::Promotion.with_code.count > 0 %>
   <p class='field' data-hook='coupon_code'>
     <%= form.label :coupon_code %><br />
     <%= form.text_field :coupon_code %>

data/app/views/spree/orders/_coupon_code_field.html.erb

@@ -1,7 +1,4 @@
-<% if Spree::Promotion.count > 0 %>
-<div class="five columns alpha offset-by-nine coupon-code-field">
-  <%= order_form.label :coupon_code %><br />
-  <%= order_form.text_field :coupon_code, :size => 10 %>
+<% if Spree::Promotion.with_code.count > 0 %>
+  <%= order_form.text_field :coupon_code, :size => 10, :placeholder => I18n.t(:coupon_code) %>
   <%= order_form.submit I18n.t(:apply) %>
-</div>
 <% 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.3.2
+  version: 1.3.3
   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.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4289978919037252357
+      hash: -2378760462746062854
 requirements:
 - none
 rubyforge_project: