killbill-paypal-express 1.0.8 → 1.0.9

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/paypal_express/api.rb

@@ -39,6 +39,19 @@ module Killbill::PaypalExpress
       response.to_payment_response
     end
 
+    def get_payment_info(kb_account_id, kb_payment_id, tenant_context, options = {})
+      paypal_express_transaction = PaypalExpressTransaction.from_kb_payment_id(kb_payment_id.to_s)
+
+      begin
+        transaction_id = paypal_express_transaction.paypal_express_txn_id
+        response = @gateway.transaction_details transaction_id
+        PaypalExpressResponse.from_response(:transaction_details, kb_payment_id.to_s, response).to_payment_response
+      rescue => e
+        @logger.warn("Exception while retrieving Paypal Express transaction detail for payment #{kb_payment_id.to_s}, defaulting to cached response: #{e}")
+        paypal_express_transaction.paypal_express_response.to_payment_response
+      end
+    end
+
     def process_refund(kb_account_id, kb_payment_id, amount_in_cents, currency, call_context, options = {})
       paypal_express_transaction = PaypalExpressTransaction.find_candidate_transaction_for_refund(kb_payment_id.to_s, amount_in_cents)
 
@@ -54,16 +67,16 @@ module Killbill::PaypalExpress
       response.to_refund_response
     end
 
-    def get_payment_info(kb_account_id, kb_payment_id, tenant_context, options = {})
-      paypal_express_transaction = PaypalExpressTransaction.from_kb_payment_id(kb_payment_id.to_s)
+    def get_refund_info(kb_account_id, kb_payment_id, tenant_context, options = {})
+      paypal_express_transaction = PaypalExpressTransaction.refund_from_kb_payment_id(kb_payment_id.to_s)
 
       begin
         transaction_id = paypal_express_transaction.paypal_express_txn_id
         response = @gateway.transaction_details transaction_id
-        PaypalExpressResponse.from_response(:transaction_details, kb_payment_id.to_s, response).to_payment_response
+        PaypalExpressResponse.from_response(:transaction_details, kb_payment_id.to_s, response).to_refund_response
       rescue => e
         @logger.warn("Exception while retrieving Paypal Express transaction detail for payment #{kb_payment_id.to_s}, defaulting to cached response: #{e}")
-        paypal_express_transaction.paypal_express_response.to_payment_response
+        paypal_express_transaction.paypal_express_response.to_refund_response
       end
     end
 
@@ -107,10 +120,18 @@ module Killbill::PaypalExpress
       PaypalExpressPaymentMethod.from_kb_payment_method_id(kb_payment_method_id.to_s).to_payment_method_response
     end
 
+    def set_default_payment_method(kb_account_id, kb_payment_method_id, call_context, options = {})
+      # No-op
+    end
+
     def get_payment_methods(kb_account_id, refresh_from_gateway, call_context, options = {})
       PaypalExpressPaymentMethod.from_kb_account_id(kb_account_id.to_s).collect { |pm| pm.to_payment_method_response }
     end
 
+    def reset_payment_methods(kb_account_id, payment_methods)
+      # No-op
+    end
+
     private
 
     def save_response_and_transaction(paypal_express_response, api_call, kb_payment_id=nil, amount_in_cents=0)

data/lib/paypal_express/models/paypal_express_transaction.rb

@@ -7,7 +7,15 @@ module Killbill::PaypalExpress
                     :paypal_express_txn_id
 
     def self.from_kb_payment_id(kb_payment_id)
-      paypal_express_transactions = find_all_by_api_call_and_kb_payment_id(:charge, kb_payment_id)
+      single_transaction_from_kb_payment_id :charge, kb_payment_id
+    end
+
+    def self.refund_from_kb_payment_id(kb_payment_id)
+      single_transaction_from_kb_payment_id :refund, kb_payment_id
+    end
+
+    def self.single_transaction_from_kb_payment_id(api_call, kb_payment_id)
+      paypal_express_transactions = find_all_by_api_call_and_kb_payment_id(api_call, kb_payment_id)
       raise "Unable to find Paypal Express transaction id for payment #{kb_payment_id}" if paypal_express_transactions.empty?
       raise "Killbill payment mapping to multiple Paypal Express transactions for payment #{kb_payment_id}" if paypal_express_transactions.size > 1
       paypal_express_transactions[0]
@@ -30,4 +38,4 @@ module Killbill::PaypalExpress
       paypal_express_transactions.first
     end
   end
-end
+end

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

data/spec/paypal_express/remote/integration_spec.rb

@@ -62,6 +62,11 @@ describe Killbill::PaypalExpress::PaymentPlugin do
     response.test.should be_true
     response.success.should be_true
 
+    # Check we can retrieve the refund
+    refund_response = @plugin.get_refund_info @pm.kb_account_id, kb_payment_id, @call_context
+    refund_response.amount.should == (-1 * amount_in_cents)
+    refund_response.status.should == Killbill::Plugin::Model::PaymentPluginStatus.new(:PROCESSED)
+
     # Try another payment to verify the BAID
     second_amount_in_cents = 9423
     second_kb_payment_id = SecureRandom.uuid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease:
 platform: ruby
 authors: