spree_payment_calculator 0.70.0 → 0.70.1

data/README.md

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

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

data/app/model/payment_calculator/flat_percent_item_total.rb

@@ -1,12 +1,6 @@
 class PaymentCalculator::FlatPercentItemTotal < Calculator
   preference :flat_percent, :decimal, :default => 0
-  
-  # Register the calculator
-  def self.register
-    super
-    PaymentMethod.register_calculator(self)
-  end
-  
+
   def self.description
     I18n.t("flat_percent")
   end

data/app/model/payment_calculator/flat_rate.rb

@@ -1,12 +1,6 @@
 class PaymentCalculator::FlatRate < Calculator
   preference :amount, :decimal, :default => 0
-  
-  # Register the calculator
-  def self.register
-    super
-    PaymentMethod.register_calculator(self)
-  end
-  
+
   def self.description
     I18n.t("flat_rate_per_order")
   end

data/app/model/payment_calculator/flexi_rate.rb

@@ -2,13 +2,7 @@ class PaymentCalculator::FlexiRate < Calculator
   preference :first_item,      :decimal, :default => 0
   preference :additional_item, :decimal, :default => 0
   preference :max_items,       :decimal, :default => 0
-  
-  # Register the calculator
-  def self.register
-    super
-    PaymentMethod.register_calculator(self)
-  end
-  
+
   def self.description
     I18n.t("flexible_rate")
   end

data/app/model/payment_calculator/per_item.rb

@@ -1,12 +1,6 @@
 class PaymentCalculator::PerItem < Calculator
   preference :amount, :decimal, :default => 0
-  
-  # Register the calculator
-  def self.register
-    super
-    PaymentMethod.register_calculator(self)
-  end
-  
+
   def self.description
     I18n.t("flat_rate_per_item")
   end

data/app/model/payment_calculator/price_sack.rb

@@ -2,13 +2,7 @@ class PaymentCalculator::PriceSack < Calculator
   preference :minimal_amount, :decimal, :default => 0
   preference :normal_amount, :decimal, :default => 0
   preference :discount_amount, :decimal, :default => 0
-  
-  # Register the calculator
-  def self.register
-    super
-    PaymentMethod.register_calculator(self)
-  end
-  
+
   def self.description
     I18n.t("price_sack")
   end

data/app/model/payment_method_decorator.rb

@@ -1,3 +1,17 @@
 PaymentMethod.class_eval do
   calculated_adjustments
+  
+  def self.send_calculator(id = nil)
+    if id
+      if PaymentMethod.find(id).class.to_s.match(/Gateway/)
+        return Gateway.calculators.sort_by(&:name)
+      elsif PaymentMethod.find(id).class.to_s.match(/BillingIntegration/)
+        return BillingIntegration.calculators.sort_by(&:name)
+      else
+        return PaymentMethod.calculators.sort_by(&:name)
+      end
+    else
+      return 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 => 'admin/payment_methods/_form',
                      :name => 'add_calculators_to_payment_methods',
                      :insert_before => %q{[id='preference-settings']}, 
-                     :text => %q{<% @calculators = PaymentMethod.calculators.sort_by(&:name) rescue nil %><%= render :partial => 'admin/shared/calculator_fields', :locals => {:f => f}},
+                     :text => %q{<% @calculators = PaymentMethod.send_calculator(params[:id]) %><%= render :partial => 'admin/shared/calculator_fields', :locals => {:f => f}},
                      :disabled => false)

data/lib/generators/spree_payment_calculator/install/install_generator.rb

@@ -11,19 +11,6 @@ module SpreePaymentCalculator
         #inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_payment_calculator\n", :before => /\*\//, :verbose => true
         #inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_payment_calculator\n", :before => /\*\//, :verbose => true
       end
-
-      def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=spree_payment_calculator'
-      end
-
-      def run_migrations
-         res = ask "Would you like to run the migrations now? [Y/n]"
-         if res == "" || res.downcase == "y"
-           run 'bundle exec rake db:migrate'
-         else
-           puts "Skiping rake db:migrate, don't forget to run it!"
-         end
-      end
     end
   end
 end

data/lib/spree_payment_calculator/engine.rb

@@ -17,12 +17,26 @@ 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')
+        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::PriceSack,
         PaymentCalculator::FlatPercentItemTotal,
@@ -30,6 +44,14 @@ module SpreePaymentCalculator
         PaymentCalculator::FlexiRate,
         PaymentCalculator::PerItem
       ]
+      
+      app.config.spree.calculators.gateways = [
+        PaymentCalculator::PriceSack,
+        PaymentCalculator::FlatPercentItemTotal,
+        PaymentCalculator::FlatRate,
+        PaymentCalculator::FlexiRate,
+        PaymentCalculator::PerItem
+      ]
     end
 
     config.to_prepare &method(:activate).to_proc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_payment_calculator
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.70.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-07-13 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: 0.70.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.70.5
-- !ruby/object:Gem::Dependency
-  name: spree_auth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -68,13 +52,13 @@ files:
 - README.md
 - LICENSE
 - lib/generators/spree_payment_calculator/install/install_generator.rb
-- lib/spree/environment/calculators.rb
 - lib/spree_payment_calculator/engine.rb
 - lib/spree_payment_calculator.rb
 - app/assets/javascripts/admin/spree_payment_calculator.js
 - 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/gateway_decorator.rb
 - app/model/payment_calculator/flat_percent_item_total.rb
 - app/model/payment_calculator/flat_rate.rb
 - app/model/payment_calculator/flexi_rate.rb

data/lib/spree/environment/calculators.rb

@@ -1,9 +0,0 @@
-module Spree
-  class Environment
-    class Calculators
-      include EnvironmentExtension
-
-      attr_accessor :shipping_methods, :tax_rates, :payment_methods
-    end
-  end
-end