killbill-paypal-express 5.0.14 → 5.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f986a90b244426935eaf2dc513c48f6a27c6b8f
-  data.tar.gz: 348e81e5bdef89834a83b811c96521e42ae70ed2
+  metadata.gz: 94d76dc9e50ed47e45f0d06f190f34779df7a42e
+  data.tar.gz: cbf2a9ded0e14f69741e1a78e82d30d532234be5
 SHA512:
-  metadata.gz: d9af7a1ceb33f2154b1747b9f0104d53c4b42dc802a43827e621224cd9a4140e430b75232a7e35610908747b70f6e85384e7e9f8484be2e78a53fe829982adb5
-  data.tar.gz: f62ec07a6d4350c2bcadfcdb855f0006fb61428079c818a3b8706eb787b74f9db30bbfadb0279a6c7467609a23d08037dc3b90559d2160eacac80e98295a6846
+  metadata.gz: bfae427c8064df1985796fbbfeb71d89458ec295f616a2dbce13126237619b0a6eaf0b557482241e0ad9164aa76baeeb890b2435b343175fe3a1938e0f0d0955
+  data.tar.gz: da9ce852cbc8139824b15a19318948600edb7921f5047b42b9130e229f8a51b124783c37b13492d6199ec2485488f1bc5b558e4647ddb7e60ec9eae131d9887f

data/lib/paypal_express/api.rb

@@ -382,22 +382,9 @@ module Killbill #:nodoc:
           # 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
+          options[:payer_id] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :payer_id)
 
-          # We have a baid on file
-          if options[:reference_id]
-            if is_authorize
-              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
-                # Can't use default implementation: the purchase signature is for one-off payments only
-                gateway.authorize_reference_transaction(amount_in_cents, options)
-              end
-            else
-              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
-                # Can't use default implementation: the purchase signature is for one-off payments only
-                gateway.reference_transaction(amount_in_cents, options)
-              end
-            end
-          else
-            # One-off payment
+          if options.has_key?(:token)
             # Retrieve payer_id and payer_email
             begin
               payer_info = get_payer_info(options[:token],
@@ -423,12 +410,27 @@ module Killbill #:nodoc:
                                                 :message                      => { :payment_plugin_status => :CANCELED, :exception_class => e.class.to_s, :exception_message => e.message }.to_json)
               return response.to_transaction_info_plugin(nil)
             end
-            options[:payer_id] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :payer_id)
             if options[:payer_id].nil?
               options[:payer_id] = payer_info.payer_id
             end
             options[:payer_email] = payer_info.payer_email
+          end
 
+          # We have a baid on file
+          if options[:reference_id]
+            if is_authorize
+              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                # Can't use default implementation: the purchase signature is for one-off payments only
+                gateway.authorize_reference_transaction(amount_in_cents, options)
+              end
+            else
+              gateway_call_proc = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
+                # Can't use default implementation: the purchase signature is for one-off payments only
+                gateway.reference_transaction(amount_in_cents, options)
+              end
+            end
+          else
+            # One-off payment
             if is_authorize
               gateway_call_proc  = Proc.new do |gateway, linked_transaction, payment_source, amount_in_cents, options|
                 gateway.authorize(amount_in_cents, options)
@@ -640,20 +642,20 @@ module Killbill #:nodoc:
 
         # Filter out the pending transaction if there is already a response tied with the same transaction but indicating a final state
         t_info_plugins_without_pending = t_info_plugins.reject { |t_info_plugin| target_transaction_types.include?(t_info_plugin.transaction_type) && t_info_plugin.status == :PENDING }
-        [with_only_pending_trx ? t_info_plugins : t_info_plugins_without_pending, t_info_plugins, with_only_pending_trx]
+        result = [with_only_pending_trx ? t_info_plugins : t_info_plugins_without_pending, t_info_plugins, with_only_pending_trx]
+        result
       end
 
       def merge_selected_properties_from_details_call(plugin_infos, to_merge_plugin_info, merge_properties)
         unless to_merge_plugin_info.nil?
-          matched_trx_plugin_info = plugin_infos.detect {|info| info.kb_transaction_payment_id == to_merge_plugin_info.kb_transaction_payment_id}
-          unless matched_trx_plugin_info.nil?
+          plugin_infos.each do |trx_plugin_info|
             merge_properties.each do |p|
               p_value = find_value_from_properties(to_merge_plugin_info.properties, p)
               unless p_value.blank?
-                if matched_trx_plugin_info.properties.detect {|mp| mp.key.to_s == p.to_s}.nil?
-                  matched_trx_plugin_info.properties << create_plugin_property(p.to_s, p_value)
+                if trx_plugin_info.properties.detect {|mp| mp.key.to_s == p.to_s}.nil?
+                  trx_plugin_info.properties << create_plugin_property(p.to_s, p_value)
                 else
-                  matched_trx_plugin_info.properties.detect {|mp| mp.key.to_s == p.to_s} .value = p_value
+                  trx_plugin_info.properties.detect {|mp| mp.key.to_s == p.to_s} .value = p_value
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 5.0.14
+  version: 5.0.15
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement