spree_promo 1.2.0 → 1.2.2

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

@@ -1,2 +1,37 @@
 //= require admin/spree_core
 //= require_tree .
+
+function cleanUsers(data) {
+  var users = $.map(data['users'], function(result) {
+    return result['user']
+  })
+  return users;
+}
+
+$(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 }
+      },
+      results: function(data, page) {
+        return { results: cleanUsers(data) }
+      }
+    },
+    formatResult: function(user) {
+      return user.email;
+    },
+    formatSelection: function(user) {
+      return user.email;
+    }
+  });
+})

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -8,9 +8,7 @@ Spree::CheckoutController.class_eval do
 
       if @order.coupon_code.present?
         event_name = "spree.checkout.coupon_code_added"
-        if Spree::Promotion.exists?(:code       => @order.coupon_code,
-                                    :event_name => event_name)
-
+        if promo = Spree::Promotion.with_coupon_code(@order.coupon_code).where(:event_name => event_name).first
           fire_event(event_name, :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/controllers/spree/orders_controller_decorator.rb

@@ -13,7 +13,15 @@ Spree::OrdersController.class_eval do
       end
       @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
       fire_event('spree.order.contents_changed')
-      respond_with(@order) { |format| format.html { redirect_to cart_path } }
+      respond_with(@order) do |format|
+        format.html do
+          if params.has_key?(:checkout)
+            redirect_to checkout_state_path(@order.checkout_steps.first)
+          else
+            redirect_to cart_path
+          end
+        end
+      end
     else
       respond_with(@order)
     end
@@ -21,9 +29,11 @@ Spree::OrdersController.class_eval do
 
   def apply_coupon_code
     return if @order.coupon_code.blank?
-    if Spree::Promotion.exists?(:code => @order.coupon_code)
-      fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
-      true
+    if promo = Spree::Promotion.with_coupon_code(@order.coupon_code).first
+      if promo.order_activatable?(@order)
+        fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
+        true
+      end
     end
   end
 

data/app/models/spree/adjustment_decorator.rb

@@ -1,3 +1,7 @@
 Spree::Adjustment.class_eval do
-  scope :promotion, lambda { where('label LIKE ?', "#{I18n.t(:promotion)}%") }
+  class << self
+    def promotion
+      where(:originator_type => 'Spree::PromotionAction')
+    end
+  end
 end

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

@@ -0,0 +1,48 @@
+module Spree
+
+  # A calculator for promotions that calculates a percent-off discount
+  # for all matching products in an order. This should not be used as a 
+  # shipping calculator since it would be the same thing as a flat percent
+  # off the entire order.
+  
+  class Calculator::PercentPerItem < Calculator
+    preference :percent, :decimal, :default => 0
+
+    attr_accessible :preferred_percent
+
+    def self.description
+      I18n.t(:percent_per_item)
+    end
+
+    def compute(object=nil)
+      return 0 if object.nil?
+      object.line_items.reduce(0) do |sum, line_item|
+        sum += value_for_line_item(line_item)
+      end
+    end
+
+  private
+
+    # Returns all products that match the promotion's rule. 
+    def matching_products
+      @matching_products ||= if compute_on_promotion?
+        self.calculable.promotion.rules.map(&:products).flatten
+      end
+    end
+
+    # Calculates the discount value of each line item. Returns zero 
+    # 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)
+      end
+      line_item.price * line_item.quantity * preferred_percent
+    end
+
+    # Determines wether or not the calculable object is a promotion
+    def compute_on_promotion?
+      @compute_on_promotion ||= self.calculable.respond_to?(:promotion)
+    end
+
+  end
+end

data/app/models/spree/order_decorator.rb

@@ -16,11 +16,13 @@ Spree::Order.class_eval do
       most_valuable_adjustment = adjustments.promotion.eligible.max{|a,b| a.amount.abs <=> b.amount.abs}
       current_adjustments = (adjustments.promotion.eligible - [most_valuable_adjustment])
       current_adjustments.each do |adjustment|
-        if adjustment.originator.calculator.is_a?(Spree::Calculator::PerItem)
-          adjustment.update_attribute_without_callbacks(:eligible, false)
-        end
+        adjustment.update_attribute_without_callbacks(:eligible, false)
       end
     end
     alias_method_chain :update_adjustments, :promotion_limiting
   end
+
+  def promo_total
+    adjustments.eligible.promotion.map(&:amount).sum
+  end
 end

data/app/models/spree/payment_decorator.rb

@@ -0,0 +1,5 @@
+Spree::Payment.class_eval do
+  def promo_total
+    order.promo_total * 100
+  end
+end

data/app/models/spree/product_decorator.rb

@@ -2,8 +2,7 @@ Spree::Product.class_eval do
   has_and_belongs_to_many :promotion_rules, :join_table => :spree_products_promotion_rules
 
   def possible_promotions
-    all_rules = promotion_rules
-    promotion_ids = all_rules.map(&:activator_id).uniq
-    Spree::Promotion.advertised.where(:id => promotion_ids)
+    promotion_ids = promotion_rules.map(&:activator_id).uniq
+    Spree::Promotion.advertised.where(:id => promotion_ids).reject(&:expired?)
   end
 end

data/app/models/spree/promotion.rb

@@ -36,12 +36,8 @@ module Spree
       where(:advertise => true)
     end
 
-    # TODO: Remove that after fix for https://rails.lighthouseapp.com/projects/8994/tickets/4329-has_many-through-association-does-not-link-models-on-association-save
-    # is provided
-    def save(*)
-      if super
-        promotion_rules.each(&:save)
-      end
+    def self.with_coupon_code(coupon_code)
+      search(:code_cont => coupon_code).result
     end
 
     def activate(payload)

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

@@ -1,4 +1,5 @@
-# A rule to limit a promotion to a specific user.
+# A rule to apply to an order greater than (or greater than or equal to)
+# a specific amount
 module Spree
   class Promotion
     module Rules

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

@@ -37,7 +37,8 @@
   <legend><%= t(:expiry) %></legend>
   <p>
     <%= f.label :usage_limit %><br />
-    <%= f.text_field :usage_limit %>
+    <%= f.text_field :usage_limit %><br/>
+    <%= t(:current_promotion_usage, :count => @promotion.credits_count) %>
   </p>
 
   <p id="starts_at_field">

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

@@ -1,8 +1,4 @@
-<p class="field">
-  <label>
-    <%= t('user_rule.choose_users') %><br />
-    <% user_names_hash = promotion_rule.users.inject({}){|memo,item| memo[item.id] = item.email; memo} %>
-		<% 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>
+<div class="field alpha omega eight columns">
+  <label><%= t('user_rule.choose_users') %></label><br>
+  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
+</div>

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

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

data/config/locales/en.yml

@@ -18,6 +18,7 @@ en:
   coupon_code: Coupon code
   coupon_code_applied: The coupon code was successfully applied to your order.
   editing_promotion: Editing Promotion
+  current_promotion_usage: 'Current Usage: %{count}'
   events:
     spree:
       checkout:
@@ -34,6 +35,7 @@ en:
     path: Path
   new_promotion: New Promotion
   no_rules_added: No rules added
+  percent_per_item: Percent Per Item
   product_rule:
     choose_products: Choose products
     label: "Order must contain %{select} of these products"

data/lib/spree/promo/engine.rb

@@ -33,6 +33,7 @@ module Spree
           Spree::Calculator::FlatRate,
           Spree::Calculator::FlexiRate,
           Spree::Calculator::PerItem,
+          Spree::Calculator::PercentPerItem,
           Spree::Calculator::FreeShipping
         ]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70361905875780 !ruby/object:Gem::Requirement
+  requirement: &70301845341720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70361905875780
+  version_requirements: *70301845341720
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -44,7 +44,9 @@ files:
 - app/helpers/spree/promotion_rules_helper.rb
 - app/models/spree/adjustment_decorator.rb
 - app/models/spree/calculator/free_shipping.rb
+- app/models/spree/calculator/percent_per_item.rb
 - app/models/spree/order_decorator.rb
+- app/models/spree/payment_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_line_items.rb
@@ -124,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2575003637093529431
+      hash: -4584730679565675092
 requirements:
 - none
 rubyforge_project: