killbill-paypal-express 5.0.13 → 5.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54f8a08d21c46e77b8f4bc4a33e2080d97057d41
-  data.tar.gz: e6faa116b3e5e1ac45f03d6724cdef59f6f55344
+  metadata.gz: 3f986a90b244426935eaf2dc513c48f6a27c6b8f
+  data.tar.gz: 348e81e5bdef89834a83b811c96521e42ae70ed2
 SHA512:
-  metadata.gz: e9e7263c70a43baa8f56ef151f32b24d8891e8263e82907519119157a9cc590e4178a196fca82f96300b3da509806b73e1b2cb6a27bc38d7dcfe7e096a69dc74
-  data.tar.gz: 0d84744e2c50defa9a42f4df2858ac1c75a25aa62fbc1afeb20ca6fecc2591168ac39de33d2b71c3ba50fc80cdae565839340d153369c05716eab9e0623b0b13
+  metadata.gz: d9af7a1ceb33f2154b1747b9f0104d53c4b42dc802a43827e621224cd9a4140e430b75232a7e35610908747b70f6e85384e7e9f8484be2e78a53fe829982adb5
+  data.tar.gz: f62ec07a6d4350c2bcadfcdb855f0006fb61428079c818a3b8706eb787b74f9db30bbfadb0279a6c7467609a23d08037dc3b90559d2160eacac80e98295a6846

data/lib/paypal_express/api.rb

@@ -620,15 +620,19 @@ module Killbill #:nodoc:
       end
 
       def get_raw_payment_info(kb_payment_id, context)
-        ignored_api_calls = [:details_for]
         responses = @response_model.from_kb_payment_id(@transaction_model, kb_payment_id, context.tenant_id)
+        details_for_response = responses.select {|r| r.api_call.to_sym == :details_for}.last
+        details_for_plugin_info = details_for_response.nil? ? nil : details_for_response.to_transaction_info_plugin
+
         responses = responses.reject do |response|
-          ignored_api_calls.include?(response.api_call.to_sym)
+          response == details_for_response
         end
         t_info_plugins = responses.collect do |response|
           response.to_transaction_info_plugin(response.send("#{@identifier}_transaction"))
         end
 
+        merge_selected_properties_from_details_call(t_info_plugins, details_for_plugin_info, [:payerEmail])
+
         # Completed purchases/authorizations will have two rows in the responses table (one for api_call 'build_form_descriptor', one for api_call 'purchase/authorize')
         # Other transaction types don't support the :PENDING state
         target_transaction_types = [:PURCHASE, :AUTHORIZE]
@@ -638,6 +642,24 @@ module Killbill #:nodoc:
         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]
       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?
+            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)
+                else
+                  matched_trx_plugin_info.properties.detect {|mp| mp.key.to_s == p.to_s} .value = p_value
+                end
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

metadata

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