killbill-orbital 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ca1d723442e1b944426f5658554ecf5761ce36
-  data.tar.gz: 27475d69b785ec1300871f4f12df73375a03ff1f
+  metadata.gz: 34aa421fcb4e6b2539700ea5eaff7d3ef5c4b96b
+  data.tar.gz: a1ad089995e310ea08c257b9cffd1ddbe0876e38
 SHA512:
-  metadata.gz: 0fcc71c6114203ec78482a24b9851c532bf972c563b6bcc8b8fa5d5fee99d213de48e4ca9c402399fdb1eaaa88e313dd3e09a195e491b12ccf0388453e2f6ea5
-  data.tar.gz: 61885168ddb76af0da6764fae6c23ee8233504c4a4dc8073763e210a3970946cc56dc98761548ad3963db0f93c76c9b2e03b57367717fce1d5e5253c53f9134f
+  metadata.gz: 0d2bf1c5d2d8cbfc1b006b487e416e6373b9921d75d35fedf1989de4607be8fc47ad1708c457f9ea4226555b558696a414d2da9acb232078ae98c812b8c2d838
+  data.tar.gz: d8bda545780a5b4d7ffe25f8c62fe7fa82c38c4f233af54f5593e81d2f33e1045ee9fe4d5f9aee31dec6842d51dd597e456933630b7038e161cd9fa371e2a11b

data/lib/orbital/api.rb

@@ -148,29 +148,48 @@ module Killbill #:nodoc:
 
       def try_fix_undefined_trxs(plugin_trxs_info, options, context)
         stale = false
+        auth_order_id = find_auth_order_id(plugin_trxs_info)
         plugin_trxs_info.each do |plugin_trx_info|
           next unless should_try_to_fix_trx plugin_trx_info, options
-          stale = true if fix_undefined_trx plugin_trx_info, context, options
+          # Resort to auth order id for scenarios like MarkForCapture where Orbital Order Id is not persisted
+          # when remote call fails.
+          order_id = plugin_trx_info.second_payment_reference_id.nil? ? auth_order_id : plugin_trx_info.second_payment_reference_id
+          stale = true if fix_undefined_trx plugin_trx_info, order_id, context, options
         end
         stale
       end
 
+      def find_auth_order_id(plugin_trxs_info)
+        auth_plugin_info_with_order_id = plugin_trxs_info.find { |info| info.transaction_type == :AUTHORIZE && !info.second_payment_reference_id.nil? }
+        return auth_plugin_info_with_order_id.nil? ? nil : auth_plugin_info_with_order_id.second_payment_reference_id
+      end
+
       def should_try_to_fix_trx(plugin_trx_info, options)
         plugin_trx_info.status == :UNDEFINED && pass_delay_time(plugin_trx_info, options)
       end
 
-      def fix_undefined_trx(plugin_trx_info, context, options)
-        inquiry_response = inquiry(plugin_trx_info, context)
-        update_response_if_needed plugin_trx_info, inquiry_response, options
+      def fix_undefined_trx(plugin_trx_info, order_id, context, options)
+        payment_processor_account_id = find_value_from_properties(plugin_trx_info.properties, 'payment_processor_account_id')
+        trace_number = find_value_from_properties(plugin_trx_info.properties, 'trace_number')
+        return false if trace_number.nil? || order_id.nil? || payment_processor_account_id.nil?
+
+        gateway = lookup_gateway(payment_processor_account_id, context.tenant_id)
+        if plugin_trx_info.transaction_type == :CAPTURE
+          response, amount, currency = retry_capture(plugin_trx_info, order_id, trace_number, context, gateway)
+          update_response_if_needed plugin_trx_info, order_id, response, options, amount, currency
+        else
+          response = inquiry(order_id, trace_number, gateway)
+          update_response_if_needed plugin_trx_info, order_id, response, options
+        end
       end
 
-      def update_response_if_needed(plugin_trx_info, inquiry_response, options)
+      def update_response_if_needed(plugin_trx_info, order_id, inquiry_response, options, amount = nil, currency = nil)
         response_id = find_value_from_properties(plugin_trx_info.properties, 'orbital_response_id')
         response = OrbitalResponse.find_by(:id => response_id)
         updated = false
-        if should_update_response inquiry_response, plugin_trx_info
+        if should_update_response inquiry_response, order_id
           logger.info("Fixing UNDEFINED kb_transaction_id='#{plugin_trx_info.kb_transaction_payment_id}', success='#{inquiry_response.success?}'")
-          response.update_and_create_transaction(inquiry_response)
+          response.update_and_create_transaction(inquiry_response, amount, currency)
           updated = true
         elsif should_cancel_payment plugin_trx_info, options
           @logger.info("Canceling UNDEFINED kb_transaction_id='#{plugin_trx_info.kb_transaction_payment_id}'")
@@ -180,8 +199,8 @@ module Killbill #:nodoc:
         updated
       end
 
-      def should_update_response(inquiry_response, plugin_trx_info)
-        !inquiry_response.nil? && !inquiry_response.params.nil? && inquiry_response.params['order_id'] == plugin_trx_info.second_payment_reference_id
+      def should_update_response(inquiry_response, order_id)
+        !inquiry_response.nil? && !inquiry_response.params.nil? && inquiry_response.params['order_id'] == order_id
       end
 
       def should_cancel_payment(plugin_trx_info, options)
@@ -203,15 +222,23 @@ module Killbill #:nodoc:
         Time.parse(@clock.get_clock.get_utc_now.to_s)
       end
 
-      def inquiry(plugin_trx_info, context)
-        payment_processor_account_id = find_value_from_properties(plugin_trx_info.properties, 'payment_processor_account_id')
-        trace_number = find_value_from_properties(plugin_trx_info.properties, 'trace_number')
-        orbital_order_id = plugin_trx_info.second_payment_reference_id
+      def inquiry(order_id, trace_number, gateway)
+        gateway.inquiry(order_id, trace_number)
+      end
 
-        return nil if trace_number.nil? || orbital_order_id.nil? || payment_processor_account_id.nil?
+      def retry_capture(plugin_trx_info, order_id, trace_number, context, gateway)
+        options = {:trace_number => trace_number, :order_id => order_id}
+        kb_payment = @kb_apis.payment_api.get_payment(plugin_trx_info.kb_payment_id, false, false, [], nil)
+        kb_transaction = kb_payment.transactions.detect {|trx| trx.id == plugin_trx_info.kb_transaction_payment_id}
+        linked_trx = @transaction_model.authorizations_from_kb_payment_id(plugin_trx_info.kb_payment_id, context.tenant_id).last
 
-        gateway = lookup_gateway(payment_processor_account_id, context.tenant_id)
-        gateway.inquiry(orbital_order_id, trace_number)
+        amount = kb_transaction.amount
+        currency = kb_transaction.currency
+        return [gateway.capture(to_cents(amount, currency),
+                               linked_trx.txn_id,
+                               options),
+                amount,
+                currency]
       end
 
       def with_trace_num_and_order_id(properties)

data/lib/orbital/ext/active_merchant/active_merchant.rb

@@ -133,7 +133,7 @@ module ActiveMerchant
 
       # MFC - Mark For Capture or Force capture
       def capture(money, authorization, options = {})
-        commit(build_mark_for_capture_xml(money, authorization, options), :capture)
+        commit(build_mark_for_capture_xml(money, authorization, options), :capture, options[:trace_number])
       end
 
       def credit(money, creditcard, options= {})

data/lib/orbital/models/response.rb

@@ -110,9 +110,9 @@ module Killbill #:nodoc:
         update!(updated_attributes)
       end
 
-      def update_and_create_transaction(gw_response)
+      def update_and_create_transaction(gw_response, amount = nil, currency = nil)
         updated_attributes = {
-            :message => gw_response.message,
+            :message => (gw_response.success? && gw_response.message.nil?) ? "" : gw_response.message,
             :authorization => gw_response.authorization,
             :fraud_review => gw_response.fraud_review?,
             :test => gw_response.test?,
@@ -127,15 +127,15 @@ module Killbill #:nodoc:
         }.merge(OrbitalResponse.orbital_response_params(gw_response))
 
         # Keep original values as much as possible
-        updated_attributes.delete_if { |k, v| v.blank? }
+        updated_attributes.delete_if { |k, v| v.blank? && k != :message}
 
         # Update the response row
         update!(updated_attributes)
 
         # Create the transaction row if needed (cannot have been created before or the state wouldn't have been UNDEFINED)
         if gw_response.success?
-          amount = gw_response.params['amount']
-          currency = gw_response.params['currency']
+          amount = amount.nil? ? gw_response.params['amount'] : amount
+          currency = currency.nil? ? gw_response.params['currency'] : currency
           amount_in_cents = amount.nil? ? nil : ::Monetize.from_numeric(amount.to_f, currency).cents.to_i
           build_orbital_transaction(:kb_account_id => kb_account_id,
                                     :kb_tenant_id => kb_tenant_id,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-orbital
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement