killbill-paypal-express 5.0.12 → 5.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662ab636b3f13b408a24cc890c312fecb44891b3
-  data.tar.gz: b63ab021a6c01b74f901270d2860e74f805a6896
+  metadata.gz: 54f8a08d21c46e77b8f4bc4a33e2080d97057d41
+  data.tar.gz: e6faa116b3e5e1ac45f03d6724cdef59f6f55344
 SHA512:
-  metadata.gz: 29f527bc1e09bea7be85fbd94c796207ad5e7efc63958ce1038e49653f4e7bf1af34df19532011c6a380116eda2fcd6e45521bde75b60016451825489126e355
-  data.tar.gz: e9508bae17347d501a2ce0bc620a0eae0d095a32f5e5488410c2b3d5d683277f442fef4f83b980148e73e18cf43b5b54f7f05983644baf1c59771c66d1e3328a
+  metadata.gz: e9e7263c70a43baa8f56ef151f32b24d8891e8263e82907519119157a9cc590e4178a196fca82f96300b3da509806b73e1b2cb6a27bc38d7dcfe7e096a69dc74
+  data.tar.gz: 0d84744e2c50defa9a42f4df2858ac1c75a25aa62fbc1afeb20ca6fecc2591168ac39de33d2b71c3ba50fc80cdae565839340d153369c05716eab9e0623b0b13

data/lib/paypal_express/api.rb

@@ -301,16 +301,21 @@ module Killbill #:nodoc:
         response
       end
 
-      def add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
+      def add_default_options(kb_payment_transaction_id, options)
+        options[:payment_type] ||= 'Any'
+        options[:invoice_id]   ||= kb_payment_transaction_id
+        options[:ip]           ||= @ip
+      end
+
+      def add_payment_method_options(kb_account_id, kb_payment_method_id, context, options, properties_hash)
+        options[:token] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token) || find_last_token(kb_account_id, context.tenant_id)
+        options[:reference_id] = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :baid)
+
         payment_method = @payment_method_model.from_kb_payment_method_id(kb_payment_method_id, context.tenant_id)
 
         options[:payer_id]     ||= payment_method.paypal_express_payer_id.presence
         options[:token]        ||= payment_method.paypal_express_token.presence
         options[:reference_id] ||= payment_method.token.presence # baid
-
-        options[:payment_type] ||= 'Any'
-        options[:invoice_id]   ||= kb_payment_transaction_id
-        options[:ip]           ||= @ip
       end
 
       def initiate_express_checkout(kb_account_id, amount, currency, properties, context)
@@ -371,7 +376,8 @@ module Killbill #:nodoc:
           transaction
         else
           options = {}
-          add_required_options(kb_payment_transaction_id, kb_payment_method_id, context, options)
+          add_default_options(kb_payment_transaction_id, options)
+          add_payment_method_options(kb_account_id, kb_payment_method_id, context, options, properties_hash)
           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])

metadata

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