killbill-cybersource 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0b374a0672d53db036f9f39c45d663c5478b71
-  data.tar.gz: f7244811da2b9e5c2dae307c84e919b3886a1692
+  metadata.gz: 22ecf08a7f2ff826bafa069133f1d044170cb077
+  data.tar.gz: 2457ce1293de9ec7514ae3514dbfb343ca39c57b
 SHA512:
-  metadata.gz: 23bd9c1612dfa4bc4c2af62fb090865a64ab1e8ef2acbd8bb7d6ad9ead71da4b22814c0fe08cabf1b50a362d9e25528909fe475a696924477e124fc8c30d14a3
-  data.tar.gz: 3989c693a1c021c9ec0186638bbaeb78154c007884be21b5a237281948cb5f49016b5c15ab93ac9f6f988d3f28cb60af84eb99cd764393f6d3edcbf2b92e609d
+  metadata.gz: 56b71059a29ea785f014928806da3052719b0baf6b23757fa77030688e2b710fd2d60f23e74f12e167a33b3136225e3297fc8d06d038bd1c3a47b099648a9666
+  data.tar.gz: b7b87dfbd068f45166fed9e222851e6835d63cf66e0e68db32754f4317e2c6ae120dbc1084c295417f6863745a6275bfcc6c4e92a4560a464e1913a63f4c2617

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    killbill-cybersource (4.0.3)
+    killbill-cybersource (4.0.4)
       actionpack (~> 4.1.0)
       actionview (~> 4.1.0)
       activemerchant (~> 1.48.0)

data/NEWS

@@ -1,3 +1,6 @@
+4.0.4
+    Fix $1 verification when external_key_as_order_id is set
+
 4.0.3
     Add support for business rules on Apple Pay
     You can now specify commerce_indicator as a plugin property to override the commerceIndicator value

data/VERSION

@@ -1 +1 @@
-4.0.3
+4.0.4

data/lib/cybersource/api.rb

@@ -274,7 +274,7 @@ module Killbill #:nodoc:
         logger.info "Skipping gateway call for existing kb_transaction_id='#{kb_transaction.id}', merchant_reference_code='#{merchant_reference_code}'"
         options[:skip_gw] = true
       rescue => e
-        logger.warn "Error checking for duplicate payment for merchant_reference_code='#{merchant_reference_code}'\n#{e.backtrace.join("\n")}"
+        logger.warn "Error checking for duplicate payment for merchant_reference_code='#{merchant_reference_code}': #{e.message}\n#{e.backtrace.join("\n")}"
       end
 
       # Duplicate check
@@ -319,7 +319,7 @@ module Killbill #:nodoc:
         return nil if on_demand_config.nil?
         CyberSourceOnDemand.new(on_demand_config, logger)
       rescue => e
-        @logger.warn("Unexpected exception while looking-up reporting API for kb_tenant_id='#{context.tenant_id}'\n#{e.backtrace.join("\n")}")
+        @logger.warn("Unexpected exception while looking-up reporting API for kb_tenant_id='#{context.tenant_id}': #{e.message}\n#{e.backtrace.join("\n")}")
         nil
       end
 
@@ -333,16 +333,18 @@ module Killbill #:nodoc:
           new_auth_response = authorize_payment(kb_account_id, kb_payment_id, kb_payment_transaction_id, kb_payment_method_id, amount, currency, properties, context)
         rescue => e
           # Note: state might be broken here (potentially two responses with the same kb_payment_transaction_id)
-          @logger.warn("Unexpected exception while forcing validation for kb_payment_id='#{kb_payment_id}', kb_payment_transaction_id='#{kb_payment_transaction_id}'\n#{e.backtrace.join("\n")}")
+          @logger.warn("Unexpected exception while forcing validation for kb_payment_id='#{kb_payment_id}', kb_payment_transaction_id='#{kb_payment_transaction_id}': #{e.message}\n#{e.backtrace.join("\n")}")
           return auth_response
         end
 
         # Void it right away on success (make sure we didn't skip the gateway call too)
         if new_auth_response.status == :PROCESSED && !new_auth_response.first_payment_reference_id.blank?
+          # The transaction id here is bogus, since it doesn't exist in Kill Bill
+          void_properties = merge_properties(properties, { :external_key_as_order_id => false })
           begin
-            void_payment(kb_account_id, kb_payment_id, SecureRandom.uuid, kb_payment_method_id, properties, context)
+            void_payment(kb_account_id, kb_payment_id, SecureRandom.uuid, kb_payment_method_id, void_properties, context)
           rescue => e
-            @logger.warn("Unexpected exception while voiding forced validation for kb_payment_id='#{kb_payment_id}', kb_payment_transaction_id='#{kb_payment_transaction_id}'\n#{e.backtrace.join("\n")}")
+            @logger.warn("Unexpected exception while voiding forced validation for kb_payment_id='#{kb_payment_id}', kb_payment_transaction_id='#{kb_payment_transaction_id}': #{e.message}\n#{e.backtrace.join("\n")}")
           end
         end
 

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>org.kill-bill.billing.plugin.ruby</groupId>
     <artifactId>cybersource-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
     <name>cybersource-plugin</name>
     <url>http://github.com/killbill/killbill-cybersource-plugin</url>
     <description>Plugin for accessing Cybersource as a payment gateway</description>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-cybersource
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Kill Bill core team