killbill-paypal-express 5.0.8 → 5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39379155ffce875efacee66b6cf3ac74a7dda64
-  data.tar.gz: 87e0a9a07c49b45572e46aeed182e70637c2878b
+  metadata.gz: eab4c199aba352c1a02eabd9f3b6a4709df3ce06
+  data.tar.gz: fe35eae96c5ceeafab668c82d6e4b680552eb541
 SHA512:
-  metadata.gz: 2655b3de8e9a81449310d5ca999f7c4c651526237aa42dbb4fe1617deba95456c2d48fa892571ffe870d05e25f3fca29f7cf39db105b5156d45bf13a13d170bb
-  data.tar.gz: 963c02b92ab524d87888e3f5baf68504a6530c5a6f12c1eb49a1d4cdffc3db76b44aa1ee73db9df45ff57dcd05e7cf814567503d3db0a2ae11a1796f67b9d0b4
+  metadata.gz: a62c822d00ed245d95495233aa5b5bbe46d581bec418328543967a989cbf47aade0de8a5a85e2dc6274a0b542048c81b497338e76bc52070c8caf08135bb6e65
+  data.tar.gz: c9562765d59370baababb0bf5c6a7c0861b8bb4a8896445844ad35e90aa87dbd3bacb66cf528432e5c43a2f55882778d139d9297e77b911252e9de24b07cdf9a

data/lib/paypal_express/api.rb

@@ -369,6 +369,10 @@ module Killbill #:nodoc:
         else
           options = {}
           add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
+          options[:token] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token) || find_last_token(kb_account_id, context.tenant_id)
+          # Find the payment_processor_id if not provided
+          payment_processor_account_id ||= find_payment_processor_id_from_initial_call(kb_account_id, context.tenant_id, options[:token])
+          options[:payment_processor_account_id] = payment_processor_account_id
 
           # We have a baid on file
           if options[:reference_id]
@@ -385,8 +389,6 @@ module Killbill #:nodoc:
             end
           else
             # One-off payment
-            options[:token] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token) || find_last_token(kb_account_id, context.tenant_id)
-
             # Retrieve payer_id and payer_email
             begin
               payer_info = get_payer_info(options[:token],
@@ -429,10 +431,6 @@ module Killbill #:nodoc:
             end
           end
 
-          # Find the payment_processor_id if not provided
-          payment_processor_account_id ||= find_payment_processor_id_from_initial_call(kb_account_id, context.tenant_id, options[:token])
-          options[:payment_processor_account_id] = payment_processor_account_id
-
           properties = merge_properties(properties, options)
           dispatch_to_gateways(api_call_type, kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, gateway_call_proc, nil, {:payer_id => options[:payer_id]})
         end
@@ -562,6 +560,8 @@ module Killbill #:nodoc:
         unknown_transactions_info = trx_plugin_info.find_all { |t_info_plugin| t_info_plugin.status == :UNDEFINED }
         now = Time.parse(@clock.get_clock.get_utc_now.to_s)
 
+        return false if unknown_transactions_info.empty?
+
         token = trx_plugin_info.map {|plugin_info| find_value_from_properties(plugin_info.properties, 'authorization')}.find {|token| !token.blank?}
         if token.nil?
           logger.warn("Unable to fix UNDEFINED kb_payment_id='#{payment_id}'. Unable to find its token.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement