spree_payment_calculator 1.0.0 → 1.0.1

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_payment_calculator', '~> 1.0.0'
+  gem 'spree_payment_calculator', '~> 1.0.1'
 </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/gateway_decorator.rb

@@ -0,0 +1,3 @@
+Spree::Gateway.class_eval do
+  calculated_adjustments
+end

data/app/model/spree/payment_method_decorator.rb

@@ -1,3 +1,17 @@
 Spree::PaymentMethod.class_eval do
   calculated_adjustments
+  
+  def self.send_calculator(id = nil)
+    if id
+      if Spree::PaymentMethod.find(id).class.to_s.match(/Gateway/)
+        return Spree::Gateway.calculators.sort_by(&:name)
+      elsif Spree::PaymentMethod.find(id).class.to_s.match(/BillingIntegration/)
+        return Spree::BillingIntegration.calculators.sort_by(&:name)
+      else
+        return Spree::PaymentMethod.calculators.sort_by(&:name)
+      end
+    else
+      return Spree::PaymentMethod.calculators.sort_by(&:name)
+    end
+  end
 end

data/app/overrides/add_calculators_to_payment_methods.rb

@@ -1,5 +1,5 @@
 Deface::Override.new(:virtual_path => 'spree/admin/payment_methods/_form',
                      :name => 'add_calculators_to_payment_methods',
                      :insert_before => %q{[id='preference-settings']}, 
-                     :text => %q{<% @calculators = Spree::PaymentMethod.calculators.sort_by(&:name) rescue nil %><%= render :partial => 'spree/admin/shared/calculator_fields', :locals => {:f => f}},
+                     :text => %q{<% @calculators = Spree::PaymentMethod.send_calculator(params[:id]) %><%= render :partial => 'spree/admin/shared/calculator_fields', :locals => {:f => f}},
                      :disabled => false)

data/lib/spree_payment_calculator/engine.rb

@@ -17,14 +17,35 @@ module SpreePaymentCalculator
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/*.rb")) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
       end
-      
-      Dir.glob(File.join(File.dirname(__FILE__), "../../lib/spree/environment/calculator.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
     end
+    
     initializer 'spree.register.calculators' do |app|
+      if Gem::Specification::find_by_name('spree_paypal_express')
+        Spree::BillingIntegration.class_eval do
+          calculated_adjustments
+        end
+        app.config.spree.calculators.add_class('billing_integrations')
+        app.config.spree.calculators.billing_integrations = [
+          PaymentCalculator::PriceSack,
+          PaymentCalculator::FlatPercentItemTotal,
+          PaymentCalculator::FlatRate,
+          PaymentCalculator::FlexiRate,
+          PaymentCalculator::PerItem
+        ]
+      end
+
+      app.config.spree.calculators.add_class('payment_methods')
+      app.config.spree.calculators.add_class('gateways')
+
       app.config.spree.calculators.payment_methods = [
-        PaymentCalculator::DefaultTax,
+        PaymentCalculator::PriceSack,
+        PaymentCalculator::FlatPercentItemTotal,
+        PaymentCalculator::FlatRate,
+        PaymentCalculator::FlexiRate,
+        PaymentCalculator::PerItem
+      ]
+
+      app.config.spree.calculators.gateways = [
         PaymentCalculator::PriceSack,
         PaymentCalculator::FlatPercentItemTotal,
         PaymentCalculator::FlatRate,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_payment_calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -59,6 +59,7 @@ files:
 - app/assets/javascripts/store/spree_payment_calculator.js
 - app/assets/stylesheets/admin/spree_payment_calculator.css
 - app/assets/stylesheets/store/spree_payment_calculator.css
+- app/model/spree/gateway_decorator.rb
 - app/model/spree/payment_calculator/default_tax.rb
 - app/model/spree/payment_calculator/flat_percent_item_total.rb
 - app/model/spree/payment_calculator/flat_rate.rb