spree_promo 1.3.1 → 1.3.2

data/LICENSE

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

data/app/models/spree/order_decorator.rb

@@ -14,6 +14,6 @@ Spree::Order.class_eval do
   end
 
   def promo_total
-    adjustments.eligible.promotion.map(&:amount).sum
+    adjustments.eligible.promotion.pluck(:amount).sum
   end
 end

data/app/models/spree/product_decorator.rb

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

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -1,27 +1,37 @@
 module Spree
   class Promotion
     module Actions
+      # Responsible for the creation and management of an adjustment since an
+      # an adjustment uses its originator to also update its eligiblity and amount
       class CreateAdjustment < PromotionAction
         calculated_adjustments
 
+        has_many :adjustments, :as => :originator
+
         delegate :eligible?, :to => :promotion
 
         before_validation :ensure_action_has_calculator
+        before_destroy :deals_with_adjustments
 
+        # Creates the adjustment related to a promotion for the order passed
+        # through options hash
         def perform(options = {})
-          return unless order = options[:order]
-          # Nothing to do if the promotion is already associated with the order
-          return if order.promotion_credit_exists?(promotion)
-
-          order.adjustments.promotion.reload.clear
-          order.update!
-          create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
-          order.update!
+          order = options[:order]
+          return if order.promotion_credit_exists?(self.promotion)
+
+          self.create_adjustment("#{I18n.t(:promotion)} (#{promotion.name})", order, order)
         end
 
-        # override of CalculatedAdjustments#create_adjustment so promotional
-        # adjustments are added all the time. They will get their eligability
-        # set to false if the amount is 0
+        # Override of CalculatedAdjustments#create_adjustment so promotional
+        # adjustments are added all the time. They will get their eligibility
+        # set to false if the amount is 0.
+        #
+        # Currently an adjustment is created even when its promotion is not eligible.
+        # This helps to figure out later which adjustments should be eligible
+        # as the order is being updated
+        #
+        # BTW The order is updated (through order#update) every time an adjustment
+        # is saved
         def create_adjustment(label, target, calculable, mandatory=false)
           amount = compute_amount(calculable)
           params = { :amount => amount,
@@ -32,16 +42,28 @@ module Spree
           target.adjustments.create(params, :without_protection => true)
         end
 
-        # Ensure a negative amount which does not exceed the sum of the order's item_total and ship_total
+        # Ensure a negative amount which does not exceed the sum of the order's
+        # item_total and ship_total
         def compute_amount(calculable)
           [(calculable.item_total + calculable.ship_total), super.to_f.abs].min * -1
         end
 
         private
-        def ensure_action_has_calculator
-          return if self.calculator
-          self.calculator = Calculator::FlatPercentItemTotal.new
-        end
+          def ensure_action_has_calculator
+            return if self.calculator
+            self.calculator = Calculator::FlatPercentItemTotal.new
+          end
+
+          def deals_with_adjustments
+            self.adjustments.each do |adjustment|
+              if adjustment.adjustable.complete?
+                adjustment.originator = nil
+                adjustment.save
+              else
+                adjustment.destroy
+              end
+            end
+          end
       end
     end
   end

data/app/models/spree/promotion.rb

@@ -71,9 +71,7 @@ module Spree
     end
 
     def order_activatable?(order)
-      order &&
-      created_at.to_i < order.created_at.to_i &&
-      !UNACTIVATABLE_ORDER_STATES.include?(order.state)
+      order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)
     end
 
     # Products assigned to all product rules
@@ -93,7 +91,7 @@ module Spree
     end
 
     def credits
-      Adjustment.promotion.where(:originator_id => actions.map(&:id))
+      Adjustment.promotion.where(:originator_id => actions.pluck(:id))
     end
 
     def credits_count

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

@@ -2,10 +2,11 @@ $('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/pro
 $('#actions .no-objects-found').hide();
 $(document).ready(function(){
   $(".variant_autocomplete").variantAutocomplete();
+  //enable select2 functions for recently added box
+  $('.type-select.select2').last().select2();
 });
 initProductActions();
 
-$('.type-select.select2').select2();
 
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();

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

@@ -45,12 +45,12 @@
     
     <div id="starts_at_field" class="field">
       <%= f.label :starts_at %>
-      <%= f.text_field :starts_at, :class => 'datepicker datepicker-from fullwidth' %>
+      <%= f.text_field :starts_at, :value => datepicker_field_value(@promotion.starts_at), :class => 'datepicker datepicker-from fullwidth' %>
     </div>
 
     <div id="expires_at_field" class="field">
       <%= f.label :expires_at %>
-      <%= f.text_field :expires_at, :class => 'datepicker datepicker-top fullwidth' %>
-    </div>  
+      <%= f.text_field :expires_at, :value => datepicker_field_value(@promotion.expires_at), :class => 'datepicker datepicker-to fullwidth' %>
+    </div>
   </div>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-02-04 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.1
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
 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: -3509403428169566053
+      hash: 4289978919037252357
 requirements:
 - none
 rubyforge_project: