killbill-paypal-express 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139032a64440a821aa18d1c0318b2dc5e4ea11ae
-  data.tar.gz: 8fbea55f5942536f77a62844ca37c7587f79c0a4
+  metadata.gz: 676182610bc34593c024ec51d56c21085579e736
+  data.tar.gz: cbdb8f6786bdf4b0fb11447816895e239418028c
 SHA512:
-  metadata.gz: 720423a7ebac4b0c91159520b3b8ba213418c9624ed8ccf012bc5dd801347b5423ea425879a8120c83ffd866782c45cef721c5103412021b0d370523529f2929
-  data.tar.gz: c1c34495e9987498d6c9fc6d6e3f9c34bedcbb4a518632a5df45c6b71e03c8f52ced690c2e05f761e0d128826e728fd2f8a848047d1e53074262a8357023ef04
+  metadata.gz: 07ae4a47b367ee2957abb5dfa7f037c5890c1d854c9c2235b42d81d5eecdd1f885d70daa5008495290ef0f106f3aa1a996460a4e101fdb35bc41756cdb2939b6
+  data.tar.gz: 5259169b6b2c5e65279c74c608ebd9f07e971a6e3a69e6bd617a253b18daf3cc26628404ca8bd4083f61f1ae5f1be1c199feec20a6b38271a71097b720335055

data/lib/paypal_express/api.rb

@@ -2,8 +2,9 @@ module Killbill #:nodoc:
   module PaypalExpress #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
 
-      THREE_HOURS_AGO = (3*3600)
-      FIVE_MINUTES_AGO = 300
+      UNKNOWN_TRX_CANCEL_PERIOD = 3600
+      PENDING_TRX_CANCEL_PERIOD = (3*3600)
+      UNKNOWN_TRX_DELAY_FIX_PERIOD = 300
 
       def initialize
         gateway_builder = Proc.new do |config|
@@ -348,7 +349,7 @@ module Killbill #:nodoc:
         if ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :from_hpp)
           token = ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token)
           message = {:payment_plugin_status => :PENDING,
-                     :token_expiration_period => ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token_expiration_period) || THREE_HOURS_AGO.to_s}
+                     :token_expiration_period => ::Killbill::Plugin::ActiveMerchant::Utils.normalized(properties_hash, :token_expiration_period) || PENDING_TRX_CANCEL_PERIOD.to_s}
           response = @response_model.create(:api_call                     => :build_form_descriptor,
                                             :kb_account_id                => kb_account_id,
                                             :kb_payment_id                => kb_payment_id,
@@ -446,9 +447,9 @@ module Killbill #:nodoc:
         response = PaypalExpressResponse.find_by(:id => paypal_response_id)
         begin
           message_details = JSON.parse response.message
-          expiration_period = (message_details['token_expiration_period'] || THREE_HOURS_AGO).to_i
+          expiration_period = (message_details['token_expiration_period'] || PENDING_TRX_CANCEL_PERIOD).to_i
         rescue
-          expiration_period = THREE_HOURS_AGO.to_i
+          expiration_period = PENDING_TRX_CANCEL_PERIOD.to_i
         end
         now = Time.parse(@clock.get_clock.get_utc_now.to_s)
         (now - transaction_plugin_info.created_date) >= expiration_period
@@ -574,7 +575,7 @@ module Killbill #:nodoc:
           delay_since_transaction = 0 if delay_since_transaction < 0
 
           # Do nothing before the delayed checking time
-          janitor_delay_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :janitor_delay_threshold) || FIVE_MINUTES_AGO).to_i
+          janitor_delay_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :janitor_delay_threshold) || UNKNOWN_TRX_DELAY_FIX_PERIOD).to_i
           next unless delay_since_transaction >= janitor_delay_threshold
 
           paypal_response_id = find_value_from_properties(unknown_trx_info.properties, 'paypalExpressResponseId')
@@ -587,7 +588,7 @@ module Killbill #:nodoc:
           fixed = false
           begin
             gateway  = lookup_gateway(payment_processor_account_id, context.tenant_id)
-            fixed    = @private_api.fix_unknown_transaction(response, unknown_trx_info, gateway, kb_account_id, context.tenant_id)
+            fixed    = @private_api.fix_unknown_transaction(response, unknown_trx_info, gateway)
             logger.info("Unable to fix UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}' (not found in PayPal)") unless fixed
           rescue => e
             logger.warn("Unable to fix UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}': #{e.message}\n#{e.backtrace.join("\n")}")
@@ -595,7 +596,7 @@ module Killbill #:nodoc:
 
           if !fixed
             # hard expiration limit
-            janitor_cancellation_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || THREE_HOURS_AGO).to_i
+            janitor_cancellation_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || UNKNOWN_TRX_CANCEL_PERIOD).to_i
             if delay_since_transaction >= janitor_cancellation_threshold
               response.transition_to_plugin_failure
               logger.info("Expire UNDEFINED kb_transaction_id='#{unknown_trx_info.kb_transaction_payment_id}' to CANCELED")

data/lib/paypal_express/models/response.rb

@@ -176,7 +176,7 @@ module Killbill #:nodoc:
         update!(updated_attributes)
       end
 
-      def transition_to_success(transaction_id, trx_plugin_info)
+      def transition_to_success(transaction_id, amount, currency)
         begin
           new_message = JSON.parse(message)
           original_message = nil
@@ -198,11 +198,17 @@ module Killbill #:nodoc:
         # Update the response row
         update!(updated_attributes)
 
+        amount_in_cents = nil
+        unless amount.nil?
+          amount_in_cents = Monetize.from_numeric(amount.to_f, currency).cents.to_i
+          # Paypal search api returns a negative amount in case of successful refund
+          amount_in_cents = -amount_in_cents if amount_in_cents < 0
+        end
         # Create the transaction row if needed (cannot have been created before or the state wouldn't have been UNDEFINED)
         build_paypal_express_transaction(:kb_account_id => kb_account_id,
                                          :kb_tenant_id => kb_tenant_id,
-                                         :amount_in_cents => trx_plugin_info.amount,
-                                         :currency => trx_plugin_info.currency,
+                                         :amount_in_cents => amount_in_cents,
+                                         :currency => currency,
                                          :api_call => api_call,
                                          :kb_payment_id => kb_payment_id,
                                          :kb_payment_transaction_id => kb_payment_transaction_id,

data/lib/paypal_express/private_api.rb

@@ -49,17 +49,15 @@ module Killbill #:nodoc:
         kb_account_ids.map {|id| kb_apis.account_user_api.get_account_by_id(id, context).external_key }
       end
 
-      def fix_unknown_transaction(plugin_response, trx_plugin_info, gateway, kb_account_id, kb_tenant_id)
-        status, transaction_id, type = search_transaction(trx_plugin_info.created_date - ONE_HOUR_AGO,
-                                                          trx_plugin_info.amount,
-                                                          trx_plugin_info.currency,
-                                                          gateway,
-                                                          trx_plugin_info.kb_transaction_payment_id)
+      def fix_unknown_transaction(plugin_response, trx_plugin_info, gateway)
+        status, transaction_id, type, amount, currency = search_transaction(trx_plugin_info.created_date - ONE_HOUR_AGO,
+                                                                            gateway,
+                                                                            trx_plugin_info.kb_transaction_payment_id)
         return false if status.blank? || transaction_id.blank? || type.blank?
 
         if type == STATUS[trx_plugin_info.transaction_type][:type] &&
            status == STATUS[trx_plugin_info.transaction_type][:success_status]
-          plugin_response.transition_to_success transaction_id, trx_plugin_info
+          plugin_response.transition_to_success transaction_id, amount, currency
           logger.info("Fixed UNDEFINED kb_transaction_id='#{trx_plugin_info.kb_transaction_payment_id}' to PROCESSED")
           return true
         end
@@ -67,10 +65,10 @@ module Killbill #:nodoc:
         false
       end
 
-      def search_transaction(start_time, amount, currency, gateway, kb_payment_transaction_id)
-        options = {:start_date => start_time, :invoice_id => kb_payment_transaction_id, :amount => amount, :currency => currency}
+      def search_transaction(start_time, gateway, kb_payment_transaction_id)
+        options = {:start_date => start_time, :invoice_id => kb_payment_transaction_id}
         response = gateway.transaction_search options
-        [response.params['status'], response.authorization, response.params['type']]
+        [response.params['status'], response.authorization, response.params['type'], response.params['gross_amount'], response.params['gross_amount_currency_id']]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement