killbill-cybersource 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ecb47153e68552f7be2f25bd3ffc4111bc6a7f
-  data.tar.gz: ca291457d76c358fea6d8238b2e979c9c92fb0b8
+  metadata.gz: 4a0f66b1be2e4f95e93428e32d1a61b6ca8207f0
+  data.tar.gz: 888dcf081e39d5e6d13e0044b78ea9afc0f870a0
 SHA512:
-  metadata.gz: e9ad96018675914664388cd51df27e1a382cd5d4ffc42ffbcfd253a1d3b2eee1a53a51b1b237f56c17a0a5994dcfb67a7fa721d59588be91e46cb1e8b9fdbe04
-  data.tar.gz: d88052cde5079e698e1fb69834475d310e520279f4570fc821770215d8e4258bfef98039da37fd03b22e066083a6ee1cfc43e29149538454f3a1adbd03ffe53c
+  metadata.gz: 372d6cc47136c1a1247b4d39d9beef29a6890d8d8e6c44f5cd4bf46f406bee3b9a6122790908bd9fb7eec0fa7253c35d36aff24a199564a4833c545ea36f762b
+  data.tar.gz: 1dd86f782606fa561fb0f0a9eca82ae34d31507aefd1d8b5002b5502c71c1145975c7d2a69185b3bd1ca55377fcf841a6df0b1bc5f660dd97ec29cad60cc11e4

data/lib/cybersource/api.rb

@@ -32,6 +32,7 @@ module Killbill #:nodoc:
 
         add_required_options(kb_account_id, properties, options, context)
         add_merchant_descriptor(:AUTHORIZE, properties, options)
+        add_reconciliation_id(properties, options)
 
         properties = merge_properties(properties, options)
         auth_response = super(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
@@ -54,6 +55,7 @@ module Killbill #:nodoc:
 
         add_required_options(kb_account_id, properties, options, context)
         add_merchant_descriptor(:CAPTURE, properties, options)
+        add_reconciliation_id(properties, 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)
@@ -84,6 +86,7 @@ module Killbill #:nodoc:
         options = {}
 
         add_required_options(kb_account_id, properties, options, context)
+        add_reconciliation_id(properties, 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)
@@ -389,6 +392,11 @@ module Killbill #:nodoc:
         options[:merchant_descriptor] = merchant_descriptor_hash
       end
 
+      def add_reconciliation_id(properties, options)
+        reconciliation_id = find_value_from_properties(properties, 'reconciliation_id')
+        options[:reconciliation_id] = reconciliation_id if reconciliation_id.present?
+      end
+
       def get_report_api(options, context)
         return nil if options[:skip_gw] || options[:bypass_duplicate_check]
         cybersource_config = config(context.tenant_id)[:cybersource]

data/lib/cybersource/ext/active_merchant/active_merchant.rb

@@ -4,6 +4,7 @@ module ActiveMerchant
     KB_PLUGIN_VERSION = Gem.loaded_specs['killbill-cybersource'].version.version rescue nil
 
     class CyberSourceGateway
+      # The payload definitions: https://ics2wstest.ic3.com/commerce/1.x/transactionProcessor/CyberSourceTransaction_1.109.xsd
 
       def self.x_request_id
         # See KillbillMDCInsertingServletFilter
@@ -38,6 +39,7 @@ module ActiveMerchant
           xml.tag! 'ccAuthService', {'run' => 'true'} do
             # Let CyberSource figure it out otherwise (internet is the default unless tokens are used)
             xml.tag!("commerceIndicator", options[:commerce_indicator]) unless options[:commerce_indicator].blank?
+            add_reconciliation_id(xml, options)
           end
         end
       end
@@ -55,6 +57,7 @@ module ActiveMerchant
               xml.tag!("cavv", payment_method.payment_cryptogram)
               xml.tag!("commerceIndicator", options[:commerce_indicator] || (is_android_pay(payment_method, options) ? 'internet' : 'vbv'))
               xml.tag!("xid", payment_method.payment_cryptogram)
+              add_reconciliation_id(xml, options)
             end
           when :master
             xml.tag! 'ucaf' do
@@ -63,6 +66,7 @@ module ActiveMerchant
             end
             xml.tag! 'ccAuthService', {'run' => 'true'} do
               xml.tag!("commerceIndicator", options[:commerce_indicator] || "spa")
+              add_reconciliation_id(xml, options)
             end
           when :american_express
             cryptogram = Base64.decode64(payment_method.payment_cryptogram)
@@ -72,10 +76,49 @@ module ActiveMerchant
               if cryptogram.size == 40
                 xml.tag!("xid", Base64.encode64(cryptogram[20...40]))
               end
+              add_reconciliation_id(xml, options)
             end
         end
       end
 
+      def build_capture_request(money, authorization, options)
+        order_id, request_id, request_token = authorization.split(";")
+        options[:order_id] = order_id
+
+        xml = Builder::XmlMarkup.new :indent => 2
+        add_purchase_data(xml, money, true, options)
+        add_capture_service(xml, request_id, request_token, options)
+        add_business_rules_data(xml, authorization, options)
+        xml.target!
+      end
+
+      def add_capture_service(xml, request_id, request_token, options = {})
+        xml.tag! 'ccCaptureService', {'run' => 'true'} do
+          xml.tag! 'authRequestID', request_id
+          add_reconciliation_id(xml, options) # the order is important
+          xml.tag! 'authRequestToken', request_token
+        end
+      end
+
+      def build_refund_request(money, identification, options)
+        order_id, request_id, request_token = identification.split(";")
+        options[:order_id] = order_id
+
+        xml = Builder::XmlMarkup.new :indent => 2
+        add_purchase_data(xml, money, true, options)
+        add_credit_service(xml, request_id, request_token, options)
+
+        xml.target!
+      end
+
+      def add_credit_service(xml, request_id = nil, request_token = nil, options = {})
+        xml.tag! 'ccCreditService', {'run' => 'true'} do
+          xml.tag! 'captureRequestID', request_id if request_id
+          add_reconciliation_id(xml, options)
+          xml.tag! 'captureRequestToken', request_token if request_token
+        end
+      end
+
       # Changes:
       #  * http://apps.cybersource.com/library/documentation/dev_guides/Android_Pay_SO_API/html/wwhelp/wwhimpl/js/html/wwhelp.htm#href=ch_soAPI.html
       #  * add paymentSolution tag to support Android Pay
@@ -132,6 +175,7 @@ module ActiveMerchant
             response.delete(k)
           end
         end
+        response[:reconciliation_id] = options[:reconciliation_id] if options[:reconciliation_id].present?
 
         success = response[:decision] == 'ACCEPT'
         authorization = success ? [options[:order_id], response[:requestID], response[:requestToken]].compact.join(';') : nil
@@ -203,6 +247,11 @@ module ActiveMerchant
         end
       end
 
+      def add_reconciliation_id(xml, options)
+        return unless options[:reconciliation_id].present?
+        xml.tag! 'reconciliationID', options[:reconciliation_id]
+      end
+
       def parse_element(reply, node)
         if node.has_elements?
           node.elements.each { |e| parse_element(reply, e) }

data/lib/cybersource/models/response.rb

@@ -37,7 +37,7 @@ module Killbill #:nodoc:
             :params_cv_code => extract(response, 'cvCode'),
             :params_authorized_date_time => extract(response, 'authorizedDateTime'),
             :params_processor_response => extract(response, 'processorResponse'),
-            :params_reconciliation_id => extract(response, 'reconciliationID'),
+            :params_reconciliation_id => extract(response, 'reconciliationID') || extract(response, 'reconciliation_id'), # when failure, use passed-in reconciliation id
             :params_subscription_id => extract(response, 'subscriptionID'),
         }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement