spree_paypal_adaptive_payment 0.1.0 → 0.1.1

data/app/models/paypal_adaptive_payment_account.rb

@@ -9,18 +9,18 @@ class PaypalAdaptivePaymentAccount < ActiveRecord::Base
   def capture(payment)
     authorization = find_authorization(payment)
 
-    ppx_response = payment.payment_method.provider.capture((100 * payment.amount).to_i, authorization.params["transaction_id"])
-    if ppx_response.success?
-      record_log payment, ppx_response
+    ap_response = payment.payment_method.provider.capture((100 * payment.amount).to_i, authorization.params["transaction"]["0"][".id"])
+    if ap_response.success?
+      record_log payment, ap_response
       payment.complete
     else
-      gateway_error(ppx_response.message)
+      gateway_error(ap_response.message)
     end
 
   end
 
   def can_capture?(payment)
-    !echeck?(payment) && payment.state == "pending"
+    !echeck?(payment) && payment.state == "PENDING"
   end
 
   def credit(payment, amount=nil)
@@ -28,21 +28,20 @@ class PaypalAdaptivePaymentAccount < ActiveRecord::Base
 
     amount = payment.credit_allowed >= payment.order.outstanding_balance.abs ? payment.order.outstanding_balance : payment.credit_allowed
 
-    ppx_response = payment.payment_method.provider.credit(amount.nil? ? (100 * amount).to_i : (100 * amount).to_i, authorization.params['transaction_id'])
+    ap_response = payment.payment_method.provider.credit(amount.nil? ? (100 * amount).to_i : (100 * amount).to_i, authorization.params["transaction"]["0"][".id"])
 
-    if ppx_response.success?
-      record_log payment, ppx_response
+    if ap_response.success?
+      record_log payment, ap_response
       payment.update_attribute(:amount, payment.amount - amount)
       payment.complete
       payment.order.update!
     else
-      gateway_error(ppx_response.message)
+      gateway_error(ap_response.message)
     end
   end
 
   def can_credit?(payment)
-    return false unless payment.state == "completed"
-    return false unless payment.order.payment_state == "credit_owed"
+    return false unless payment.state == "COMPLETED"
     payment.credit_allowed > 0
     !find_capture(payment).nil?
   end
@@ -56,7 +55,7 @@ class PaypalAdaptivePaymentAccount < ActiveRecord::Base
     logs = payment.log_entries.all(:order => 'created_at DESC')
     logs.each do |log|
       details = YAML.load(log.details) # return the transaction details
-      if details.params['payment_type'] == 'echeck'
+      if details.params['type'] == 'echeck'
         return true
       end
     end
@@ -72,7 +71,7 @@ class PaypalAdaptivePaymentAccount < ActiveRecord::Base
     logs = payment.log_entries.all(:order => 'created_at DESC')
     logs.each do |log|
       details = YAML.load(log.details) # return the transaction details
-      if (details.params['payment_status'] == 'Pending' && details.params['pending_reason'] == 'authorization')
+      if (details.params['status'] == 'PENDING')
         return details
       end
     end
@@ -84,8 +83,8 @@ class PaypalAdaptivePaymentAccount < ActiveRecord::Base
     logs = payment.log_entries.all(:order => 'created_at DESC')
     logs.each do |log|
       details = YAML.load(log.details) # return the transaction details
-      if details.params['payment_status'] == 'Completed'
-        return details
+      if details.params['status'] == 'COMPLETED'
+        RETURN details
       end
     end
     return nil

data/config/routes.rb

@@ -10,7 +10,6 @@ Rails.application.routes.draw do
     end
   end
 
-  match '/checkout/paypal_adaptive_payment_finish' => 'checkout#paypal_adaptive_payment_finish', :via => [:get, :post]
   match '/paypal_adaptive_payment_notify' => 'paypal_adaptive_payment_callbacks#notify', :via => [:get, :post]
 
   namespace :admin do

data/db/migrate/20100226133156_create_paypal_adaptive_payment_accounts.rb

@@ -1,6 +1,6 @@
-class CreatePaypalAccounts < ActiveRecord::Migration
+class CreatePaypalAdaptivePaymentAccounts < ActiveRecord::Migration
   def self.up
-    create_table :paypal_accounts do |t|
+    create_table :paypal_adaptive_payment_accounts do |t|
       t.string :email
       t.string :payer_id
       t.string :appid
@@ -10,6 +10,6 @@ class CreatePaypalAccounts < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :paypal_accounts
+    drop_table :paypal_adaptive_payment_accounts
   end
 end

data/spree_paypal_adaptive_payment.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_paypal_adaptive_payment'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.summary     = 'Add PayPal Adaptive Payments to Spree store'
   s.homepage    = 'https://github.com/jpablobr/spree_paypal_adaptive_payment'
   s.author      = 'Jose Pablo Barrantes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_paypal_adaptive_payment
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &14882820 !ruby/object:Gem::Requirement
+  requirement: &20746840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.40.3
   type: :runtime
   prerelease: false
-  version_requirements: *14882820
+  version_requirements: *20746840
 description: 
 email: xjpalobrx@gmail.com
 executables: []
@@ -29,7 +29,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE.txt
 - README.markdown
 - Rakefile
@@ -103,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Add PayPal Adaptive Payments to Spree store
 test_files: []
-has_rdoc: false