spree_promo 1.0.0.rc1 → 1.0.0.rc2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

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

@@ -3,7 +3,7 @@ var initProductRuleSourceField = function(){
 
   $products_source_field = jQuery('.products_rule_products_source_field input');
   $products_source_field.click(function() {
-    $rule_container = jQuery(this).parents('.promotion-rule');
+    $rule_container = jQuery(this).parents('.promotion_rule');
     if(this.checked){
       if(this.value == 'manual'){
         $rule_container.find('.products_rule_products').show();

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -7,7 +7,10 @@ Spree::CheckoutController.class_eval do
       if @order.coupon_code.present?
         # Promotion codes are stored in the preference table
         # Therefore we need to do a lookup there and find if one exists
-        if Spree::Preference.where(:value => @order.coupon_code).where("key LIKE 'spree/promotion/code/%'").present?
+        #
+        # TODO: The ActiveRecord::Base.connection.quote_column_name stuff is a bit long...
+        # TODO: Is there a better way to do that?
+        if Spree::Preference.where(:value => @order.coupon_code).where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/promotion/code/%'").present?
           fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
         # If it doesn't exist, raise an error!
         # Giving them another chance to enter a valid coupon code

data/app/models/spree/promotion.rb

@@ -52,7 +52,7 @@ module Spree
       def advertised
         #TODO this is broken because the new preferences aren't a direct relationship returning
         #all for now
-        where(true)
+        scoped
         #includes(:stored_preferences)
         #includes(:stored_preferences).where(:spree_preferences => {:name => 'advertise', :value => '1'})
       end
@@ -79,18 +79,21 @@ module Spree
     # Whether the promotion is eligible for this particular order.
     def eligible?(order, options = {})
       return false if expired? || usage_limit_exceeded?(order)
-      if event_code = options[:coupon_code].to_s.strip.downcase
-        return false unless event_code == self.code.to_s.strip.downcase
-      end
+
+      event_code = options[:coupon_code].to_s.strip.downcase
+      return false unless event_code == self.code.to_s.strip.downcase
+
       rules_are_eligible?(order, options)
     end
 
     def rules_are_eligible?(order, options = {})
       return true if rules.none?
+
+      eligible = lambda { |r| r.eligible?(order, options) }
       if match_policy == 'all'
-        rules.all?{|r| r.eligible?(order, options)}
+        rules.all?(&eligible)
       else
-        rules.any?{|r| r.eligible?(order, options)}
+        rules.any?(&eligible)
       end
     end
 

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="action_fields">
   <legend><%= t(:promotion_actions) %></legend>
 
-  <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :html => { :method => :put } do |f| %>
+  <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
     <div id="actions" class="filter_list">
       <% if @promotion.actions.any? %>
         <%#= render :partial => 'promotion_action', :collection => @promotion.actions, :locals => {:f => f} %>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="rule_fields">
   <legend><%= t(:rules) %></legend>
 
-  <%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
+  <%= form_for @promotion, :url => object_url, :method => :put do |f| %>
     <p>
       <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
         <label><%= f.radio_button :preferred_match_policy, policy %> <%= t "promotion_form.match_policies.#{policy}" %></label> &nbsp;

data/app/views/spree/admin/promotions/edit.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t(:editing_promotion) %></h1>
 
-<%= form_for @promotion, :url => object_url, :html => { :method => :put } do |f| %>
+<%= form_for @promotion, :url => object_url, :method => :put do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -2,6 +2,7 @@
   <label>
     <%= t('user_rule.choose_users') %><br />
     <% user_names_hash = promotion_rule.users.inject({}){|memo,item| memo[item.id] = item.email; memo} %>
-    <input type="text" name="<%= param_prefix %>[user_ids_string]" value="<%= promotion_rule.user_ids_string %>" class="tokeninput users" data-names='<%= user_names_hash.to_json %>' />
+		<% user_rules = promotion_rule.users.collect { |u| { :id => u.id, :name => u.email } } %>
+    <input type="text" name="<%= param_prefix %>[user_ids_string]" value="<%= promotion_rule.user_ids_string %>" class="tokeninput users" data-names='<%= user_names_hash.to_json %>' data-pre='<%= user_rules.to_json %>'/>
   </label>
 </p>

metadata

@@ -1,69 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_promo
-version: !ruby/object:Gem::Version 
-  hash: 15424055
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc2
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - rc
-  - 1
-  version: 1.0.0.rc1
 platform: ruby
-authors: 
+authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: spree_core
+  requirement: &70362724534240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424055
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 1
-        version: 1.0.0.rc1
-  requirement: *id001
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
-  name: spree_core
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70362724534240
+- !ruby/object:Gem::Dependency
+  name: spree_auth
+  requirement: &70362724533380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424055
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 1
-        version: 1.0.0.rc1
-  requirement: *id002
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
-  name: spree_auth
+  version_requirements: *70362724533380
 description: Required dependency for Spree
-email: david@railsdog.com
+email: david@spreecommerce.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - app/assets/javascripts/admin/promotions.js
 - app/assets/javascripts/admin/spree_promo.js
@@ -140,35 +115,23 @@ files:
 - db/migrate/20111013155037_namespace_promo_tables.rb
 homepage: http://spreecommerce.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
-requirements: 
+requirements:
 - none
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -176,4 +139,3 @@ signing_key:
 specification_version: 3
 summary: Promotion functionality for use with Spree.
 test_files: []
-