spree_payment_calculator 1.0.2 → 1.1.0

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_payment_calculator', '~> 1.0.1'
+  gem 'spree_payment_calculator', '~> 1.1.0'
 </pre>
 2. Run `bundle install`
 3. Go to Payment Method in the Admin panel and add a calculator for each type of payment you prefer

data/app/model/spree/payment_calculator/default_tax.rb

@@ -19,7 +19,7 @@ module Spree
     private
 
       def rate
-        rate = self.calculable
+        self.calculable
       end
 
       def compute_order(order)

data/app/model/spree/payment_calculator/flat_percent_item_total.rb

@@ -3,6 +3,8 @@ require_dependency 'spree/calculator'
 module Spree
   class PaymentCalculator::FlatPercentItemTotal < Calculator
     preference :flat_percent, :decimal, :default => 0
+    
+    attr_accessible :preferred_flat_percent
 
     attr_accessible :preferred_flat_percent
 

data/app/model/spree/payment_calculator/flat_rate.rb

@@ -3,6 +3,7 @@ require_dependency 'spree/calculator'
 module Spree
   class PaymentCalculator::FlatRate < Calculator
     preference :amount, :decimal, :default => 0
+    attr_accessible :preferred_amount
 
     attr_accessible :preferred_amount
 

data/app/model/spree/payment_calculator/per_item.rb

@@ -13,7 +13,27 @@ module Spree
     def compute(object=nil)
       return 0 if object.nil?
       self.preferred_amount * object.line_items.reduce(0) do |sum, value|
-        sum + value.quantity
+        if !matching_products || matching_products.include?(value.product)
+          value_to_add = value.quantity
+        else
+          value_to_add = 0
+        end
+        sum + value_to_add
+      end
+    end
+
+    # Returns all products that match this calculator, but only if the calculator
+    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
+    def matching_products
+      # Regression check for #1596
+      # Calculator::PerItem can be used in two cases.
+      # The first is in a typical promotion, providing a discount per item of a particular item
+      # The second is a ShippingMethod, where it applies to an entire order
+      #
+      # Shipping methods do not have promotions attached, but promotions do
+      # Therefore we must check for promotions
+      if self.calculable.respond_to?(:promotion)
+        self.calculable.promotion.rules.map(&:products).flatten
       end
     end
   end

data/app/model/spree/payment_decorator.rb

@@ -1,5 +1,5 @@
 Spree::Payment.class_eval do
-  has_one :adjustment, :as => :source
+  has_one :adjustment, :as => :source, :dependent => :destroy
   before_save :remove_old_adjustment
   after_save :ensure_correct_adjustment, :update_order, :if => Proc.new {|p| !p.payment_method.calculator.blank?}
   

data/lib/spree_payment_calculator/engine.rb

@@ -26,6 +26,7 @@ module SpreePaymentCalculator
         end
         app.config.spree.calculators.add_class('billing_integrations')
         app.config.spree.calculators.billing_integrations = [
+          Spree::PaymentCalculator::DefaultTax,
           Spree::PaymentCalculator::PriceSack,
           Spree::PaymentCalculator::FlatPercentItemTotal,
           Spree::PaymentCalculator::FlatRate,
@@ -38,6 +39,7 @@ module SpreePaymentCalculator
       app.config.spree.calculators.add_class('gateways')
 
       app.config.spree.calculators.payment_methods = [
+        Spree::PaymentCalculator::DefaultTax,
         Spree::PaymentCalculator::PriceSack,
         Spree::PaymentCalculator::FlatPercentItemTotal,
         Spree::PaymentCalculator::FlatRate,
@@ -46,6 +48,7 @@ module SpreePaymentCalculator
       ]
 
       app.config.spree.calculators.gateways = [
+        Spree::PaymentCalculator::DefaultTax,
         Spree::PaymentCalculator::PriceSack,
         Spree::PaymentCalculator::FlatPercentItemTotal,
         Spree::PaymentCalculator::FlatRate,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_payment_calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: