killbill-orbital 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79c94a1e5cf3ddacf63444b693a0b576353b3c7b
-  data.tar.gz: ccf210b4dd5e6e76047552eccfc00898ac27bc82
+  metadata.gz: cec1cf6adeb886d2e658647977c87cc258505954
+  data.tar.gz: a0f94ccdb83a09e44bafd3546f0c19aed32a256f
 SHA512:
-  metadata.gz: 0bfef0b4ec28065a2b8dba0acd47a8c2e8491cb85b2920dcb602c4c2e3d3356ed64a7f9a964aebeb04277a97569f3950ad6c3904d5ae68fd13c5fea0592dc823
-  data.tar.gz: 754d60b264e0d33e0dc58abcc4f76e8c316c3ce43bdcd602e709f1877a034983e12a78876e311e46b624e3f9c2468ce27ccbdab679d3a8b4abd9686d6f328650
+  metadata.gz: 36f2b52df194d8469e5c4957b2bded12f6d4d8a5dd7c67d3fe8d7ef03452163d8b4bd78a2bc6945381ce1211fa45f8f3bbe50366bee739a04d14b649dbef6448
+  data.tar.gz: 19170d1876ada2aa6d01ac59cf19682329bf1860518d4f4048625864856b32ec9a32318adb4dcf8b6fec8b5b2607309839f850c42fb33d867e147f6555eb2360

data/lib/orbital/api.rb

@@ -1,6 +1,8 @@
 module Killbill #:nodoc:
   module Orbital #:nodoc:
     class PaymentPlugin < ::Killbill::Plugin::ActiveMerchant::PaymentPlugin
+      FIVE_MINUTES_AGO = (5 * 60)
+      ONE_HOUR_AGO = (1 * 3600)
 
       def initialize
         gateway_builder = Proc.new do |config|
@@ -30,7 +32,7 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, with_trace_num_and_order_id(properties))
       end
 
       def capture_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
@@ -43,7 +45,7 @@ module Killbill #:nodoc:
           options[:prior_auth_id] = last_auth_response.params_auth_code
           purchase_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, hash_to_properties(options), context)
         else
-          super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+          super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, with_trace_num_and_order_id(properties))
         end
       end
 
@@ -52,7 +54,7 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, with_trace_num_and_order_id(properties))
       end
 
       def void_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
@@ -60,7 +62,7 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, properties, context, with_trace_num_and_order_id(properties))
       end
 
       def credit_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
@@ -68,7 +70,7 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, with_trace_num_and_order_id(properties))
       end
 
       def refund_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
@@ -76,15 +78,15 @@ module Killbill #:nodoc:
         options = {}
 
         properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
+        super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context, with_trace_num_and_order_id(properties))
       end
 
       def get_payment_info(kb_account_id, kb_payment_id, properties, context)
-        # Pass extra parameters for the gateway here
-        options = {}
+        options = properties_to_hash(properties)
 
-        properties = merge_properties(properties, options)
-        super(kb_account_id, kb_payment_id, properties, context)
+        plugin_trxs_info = super(kb_account_id, kb_payment_id, properties, context)
+        return super(kb_account_id, kb_payment_id, properties, context) if try_fix_undefined_trxs(plugin_trxs_info, options, context)
+        plugin_trxs_info
       end
 
       def search_payments(search_key, offset, limit, properties, context)
@@ -142,6 +144,82 @@ module Killbill #:nodoc:
       def reset_payment_methods(kb_account_id, payment_methods, properties, context)
         super
       end
+
+      private
+
+      def try_fix_undefined_trxs(plugin_trxs_info, options, context)
+        stale = false
+        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
+        end
+        stale
+      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
+      end
+
+      def update_response_if_needed(plugin_trx_info, inquiry_response, options)
+        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
+          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)
+          updated = true
+        elsif should_cancel_payment plugin_trx_info, options
+          @logger.info("Canceling UNDEFINED kb_transaction_id='#{plugin_trx_info.kb_transaction_payment_id}'")
+          response.cancel
+          updated = true
+        end
+        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
+      end
+
+      def should_cancel_payment(plugin_trx_info, options)
+        threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :cancel_threshold) || ONE_HOUR_AGO).to_i
+        delay_since_trx(plugin_trx_info) >= threshold
+      end
+
+      def pass_delay_time(plugin_trx_info, options)
+        janitor_delay_threshold = (Killbill::Plugin::ActiveMerchant::Utils.normalized(options, :janitor_delay_threshold) || FIVE_MINUTES_AGO).to_i
+        delay_since_trx(plugin_trx_info) >= janitor_delay_threshold
+      end
+
+      def delay_since_trx(plugin_trx_info)
+        delay_since_transaction = now - plugin_trx_info.created_date
+        delay_since_transaction < 0 ? 0 : delay_since_transaction
+      end
+
+      def now
+        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
+
+        return nil if trace_number.nil? || orbital_order_id.nil? || payment_processor_account_id.nil?
+
+        gateway = lookup_gateway(payment_processor_account_id, context.tenant_id)
+        gateway.inquiry(orbital_order_id, trace_number)
+      end
+
+      def with_trace_num_and_order_id(properties)
+        {:params_trace_number => find_value_from_properties(properties, :trace_number),
+         :params_order_id => find_value_from_properties(properties, :order_id)}.delete_if{|_, value| value.blank?}
+      end
+
     end
   end
 end

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

@@ -42,7 +42,7 @@ module ActiveMerchant
                                      'Content-Type' => 'application/PTI70')
         headers['X-Request-Id'] = x_r_id unless x_r_id.blank?
         headers.merge!('Trace-number' => trace_number.to_s,
-                       'Merchant-Id' => @options[:merchant_id]) if @options[:retry_logic] && trace_number
+                       'Merchant-Id' => @options[:merchant_id]) if trace_number
         request = lambda { |url| parse(ssl_post(url, order, headers)) }
 
         # Failover URL will be attempted in the event of a connection error
@@ -59,7 +59,7 @@ module ActiveMerchant
                          :authorization => authorization_string(response[:tx_ref_num], response[:order_id]),
                          :test => self.test?,
                          :avs_result => OrbitalGateway::AVSResult.new(response[:avs_resp_code]),
-                         :cvv_result => OrbitalGateway::CVVResult.new(response[:cvv2_resp_code])
+                         :cvv_result => OrbitalGateway::CVVResult.new(response[:cvv2_resp_code]),
                      })
       end
 
@@ -139,6 +139,24 @@ module ActiveMerchant
         commit(order, :credit, options[:trace_number])
       end
 
+      def inquiry(order_id, retry_num)
+        query = build_inquiry_request(order_id, retry_num, options)
+        commit(query, :inquiry, options[:trace_number])
+      end
+
+      def build_inquiry_request(order_id, retry_num, options)
+        xml = xml_envelope
+        xml.tag! :Request do
+          xml.tag! :Inquiry do
+            add_xml_credentials(xml)
+            add_bin_merchant_and_terminal(xml, options)
+            xml.tag! :OrderID, order_id
+            xml.tag! :InquiryRetryNumber, retry_num
+          end
+        end
+        xml.target!
+      end
+
       def build_new_order_xml_with_cc(operation, money, creditcard, options)
         build_new_order_xml(operation, money, options.merge(:creditcard=>creditcard)) do |xml|
           add_creditcard(xml, creditcard, options)

data/lib/orbital/models/response.rb

@@ -88,6 +88,69 @@ module Killbill #:nodoc:
         params_order_id
       end
 
+      def cancel
+        begin
+          error_details = JSON.parse(message)
+          original_message = nil
+        rescue
+          error_details = {}
+          original_message = message
+        end
+        error_details['original_message'] = original_message unless original_message.blank?
+        error_details['payment_plugin_status'] = 'CANCELED'
+
+        updated_attributes = {
+            :message => error_details.to_json,
+            :success => false,
+            :updated_at => Time.now.utc
+        }
+
+        # Update the response row
+        update!(updated_attributes)
+      end
+
+      def update_and_create_transaction(gw_response)
+        updated_attributes = {
+            :message => gw_response.message,
+            :authorization => gw_response.authorization,
+            :fraud_review => gw_response.fraud_review?,
+            :test => gw_response.test?,
+            :avs_result_code => gw_response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? gw_response.avs_result.code : gw_response.avs_result['code'],
+            :avs_result_message => gw_response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? gw_response.avs_result.message : gw_response.avs_result['message'],
+            :avs_result_street_match => gw_response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? gw_response.avs_result.street_match : gw_response.avs_result['street_match'],
+            :avs_result_postal_match => gw_response.avs_result.kind_of?(::ActiveMerchant::Billing::AVSResult) ? gw_response.avs_result.postal_match : gw_response.avs_result['postal_match'],
+            :cvv_result_code => gw_response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? gw_response.cvv_result.code : gw_response.cvv_result['code'],
+            :cvv_result_message => gw_response.cvv_result.kind_of?(::ActiveMerchant::Billing::CVVResult) ? gw_response.cvv_result.message : gw_response.cvv_result['message'],
+            :success => gw_response.success?,
+            :updated_at => Time.now.utc
+        }.merge(OrbitalResponse.orbital_response_params(gw_response))
+
+        # Keep original values as much as possible
+        updated_attributes.delete_if { |k, v| v.blank? }
+
+        # 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_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,
+                                    :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,
+                                    :transaction_type => transaction_type,
+                                    :payment_processor_account_id => payment_processor_account_id,
+                                    :txn_id => txn_id,
+                                    :created_at => updated_at,
+                                    :updated_at => updated_at).save!
+        end
+      end
+
       def self.auth_responses_from_kb_payment_id(kb_payment_id, kb_tenant_id)
         where(:kb_payment_id => kb_payment_id, :kb_tenant_id => kb_tenant_id, :api_call => 'authorize').order(:created_at)
       end
@@ -99,8 +162,8 @@ module Killbill #:nodoc:
       def to_transaction_info_plugin(transaction=nil)
         t_info_plugin = super(transaction)
         t_info_plugin.properties << create_plugin_property('processorResponse', params_host_resp_code)
-
-        t_info_plugin.status = :CANCELED if t_info_plugin.status == :UNDEFINED
+        t_info_plugin.properties << create_plugin_property('orbital_response_id', id)
+        t_info_plugin.properties << create_plugin_property('trace_number', params_trace_number)
         t_info_plugin
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-orbital
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement