spree_promo 1.3.3 → 1.3.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 40582bf42f5cd6675df3f3f3db1480808111213f
+  data.tar.gz: 2868fc07c91b0cecf867536dddcb1af9efaccda0
+SHA512:
+  metadata.gz: 5c949e94bd1b46aaf8a9240ee90366068676fcce700b5081e7117699b2944823ed22df631707ee6c0670eddbafb9389bda7d8afa2459f9b8316b2f76a30ff6aa
+  data.tar.gz: e82b0b25514add622fa7645073a5a748aaaabb79ba8880f034531c774be28a64bf7ef1854f640624480d51e4fe3f0813505ddcf517acb4c5c523b6142ce4a5e5

data/app/controllers/spree/orders_controller_decorator.rb

@@ -15,6 +15,7 @@ Spree::OrdersController.class_eval do
       respond_with(@order) do |format|
         format.html do
           if params.has_key?(:checkout)
+            @order.next_transition.run_callbacks if @order.cart?
             redirect_to checkout_state_path(@order.checkout_steps.first)
           else
             redirect_to cart_path

data/app/controllers/spree/store_controller_decorator.rb

@@ -4,37 +4,37 @@ Spree::StoreController.class_eval do
     def apply_coupon_code
       if @order.coupon_code.present?
         # check if coupon code is already applied
-        if @order.adjustments.promotion.eligible.detect { |p| p.originator.promotion.code == @order.coupon_code }.present?
+        if @order.coupon_code_applied?
           flash[:notice] = t(:coupon_code_already_applied)
           true
         else
           event_name = "spree.checkout.coupon_code_added"
 
           # TODO should restrict to payload's event name?
-          promotion = Spree::Promotion.find_by_code(@order.coupon_code)
+          current_promotion = @order.find_promo_for_coupon_code
 
-          if promotion.present?
-            if promotion.expired?
+          if current_promotion.present?
+            if current_promotion.expired?
               flash[:error] = t(:coupon_code_expired)
               return false
             end
 
-            if promotion.usage_limit_exceeded?
+            if current_promotion.usage_limit_exceeded?
               flash[:error] = t(:coupon_code_max_usage)
               return false
             end
 
             previous_promo = @order.adjustments.promotion.eligible.first
-            fire_event(event_name, :coupon_code => @order.coupon_code)
-            promo = @order.adjustments.promotion.detect { |p| p.originator.promotion.code == @order.coupon_code }
+            current_promotion.activate(:order => @order, :coupon_code => @order.coupon_code)
+            promo_adjustment = @order.find_adjustment_for_coupon_code
 
-            if promo.present? and promo.eligible
+            if promo_adjustment.present? and promo_adjustment.eligible
               flash[:success] = t(:coupon_code_applied)
               true
-            elsif previous_promo.present? and promo.present?
+            elsif previous_promo.present? and promo_adjustment.present?
               flash[:error] = t(:coupon_code_better_exists)
               false
-            elsif promo.present?
+            elsif promo_adjustment.present?
               flash[:error] = t(:coupon_code_not_eligible)
               false
             else

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

@@ -1,10 +1,10 @@
 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 
+  # 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
 
@@ -23,10 +23,12 @@ module Spree
 
   private
 
-    # Returns all products that match the promotion's rule. 
+    # 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
+      if compute_on_promotion?
+        self.calculable.promotion.rules.map do |rule|
+          rule.respond_to?(:products) ? rule.products : []
+        end.flatten
       end
     end
 

data/app/models/spree/order_decorator.rb

@@ -1,10 +1,7 @@
 Spree::Order.class_eval do
-  attr_accessible :coupon_code
-  attr_reader :coupon_code
 
-  def coupon_code=(code)
-    @coupon_code = code.strip.downcase rescue nil
-  end
+  attr_accessible :coupon_code
+  attr_accessor   :coupon_code
 
   # Tells us if there if the specified promotion is already associated with the order
   # regardless of whether or not its currently eligible.  Useful because generally
@@ -16,4 +13,24 @@ Spree::Order.class_eval do
   def promo_total
     adjustments.eligible.promotion.pluck(:amount).sum
   end
+
+  def coupon_code_applied?
+    adjustments.promotion.eligible.detect do |p|
+      Spree::Promotion.normalize_coupon_code(p.originator.promotion.code) == normalized_coupon_code
+    end.present?
+  end
+
+  def find_adjustment_for_coupon_code
+    adjustments.promotion.detect do |p|
+      Spree::Promotion.normalize_coupon_code(p.originator.promotion.code) == normalized_coupon_code
+    end
+  end
+
+  def find_promo_for_coupon_code
+    Spree::Promotion.where("LOWER(code) = '#{normalized_coupon_code}'").first
+  end
+
+  def normalized_coupon_code
+    Spree::Promotion.normalize_coupon_code(coupon_code)
+  end
 end

data/app/models/spree/promotion.rb

@@ -45,8 +45,9 @@ module Spree
       return unless order_activatable? payload[:order]
 
       if code.present?
-        event_code = payload[:coupon_code]
-        return unless event_code == self.code
+        normalized_submitted_code = Spree::Promotion.normalize_coupon_code(payload[:coupon_code])
+        normalized_expected_code = Spree::Promotion.normalize_coupon_code(self.code)
+        return unless normalized_submitted_code == normalized_expected_code
       end
 
       if path.present?
@@ -102,8 +103,10 @@ module Spree
       credits.count
     end
 
-    def code=(coupon_code)
-      write_attribute(:code, (coupon_code.downcase.strip rescue nil))
+    private
+
+    def self.normalize_coupon_code(code)
+      code.to_s.strip.downcase rescue ""
     end
   end
 end

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

@@ -6,9 +6,11 @@ module Spree
         accepts_nested_attributes_for :promotion_action_line_items
         attr_accessible :promotion_action_line_items_attributes
 
+        delegate :eligible?, :to => :promotion
 
         def perform(options = {})
           return unless order = options[:order]
+          return unless eligible?(order)
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
             if current_quantity < item.quantity

data/app/overrides/promo_admin_tabs.rb

@@ -3,4 +3,4 @@ Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
                      :text => "<%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>",
                      :disabled => false,
-                     :original => '3e847740dc3e7f924aba1ccb4cb00c7b841649e3')
+                     :original => '031652cf5a054796022506622082ab6d2693699f')

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

@@ -6,6 +6,7 @@
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
   
+  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_action } %>
   <%= render :partial => "spree/admin/promotions/actions/#{type_name}",
              :locals => { :promotion_action => promotion_action, :param_prefix => param_prefix } %>
-</div>
+</div>

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

@@ -5,5 +5,6 @@
   
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>  
+  <%= render :partial => "spree/shared/error_messages", :locals => { :target => promotion_rule } %>
   <%= render :partial => "spree/admin/promotions/rules/#{type_name}", :locals => { :promotion_rule => promotion_rule, :param_prefix => param_prefix } %>
 </div>

data/config/locales/en.yml

@@ -16,12 +16,12 @@ en:
   add_rule_of_type: Add rule of type
   back_to_promotions_list: "Back To Promotions List"
   coupon: Coupon
-  coupon_code: Coupon code
+  coupon_code: Coupon code (NOT case sensitive)
   coupon_code_applied: The coupon code was successfully applied to your order.
   coupon_code_expired: The coupon code is expired
   coupon_code_already_applied: The coupon code has already been applied to this order
   coupon_code_better_exists: The previously applied coupon code results in a better deal
-  coupon_code_not_found: The coupon code you entered doesn't exist. Please try again.
+  coupon_code_not_found: The coupon code you entered doesn't exist. Please try again. Coupon codes are not case sensitive.
   coupon_code_max_usage: Coupon code usage limit exceeded
   coupon_code_not_eligible: This coupon code is not eligible for this order
   editing_promotion: Editing Promotion

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spree_promo
 version: !ruby/object:Gem::Version
-  version: 1.3.3
-  prerelease: 
+  version: 1.3.4
 platform: ruby
 authors:
 - David North
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.4
 description: Required dependency for Spree
 email: david@spreecommerce.com
 executables: []
@@ -105,30 +102,26 @@ files:
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2378760462746062854
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Promotion functionality for use with Spree.
 test_files: []