activemerchant 1.116.0 → 1.121.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32d76816ad9cdc73be63181629990b876d69e62e84c324b0cf0b240bb4fab42
-  data.tar.gz: 8c4263133c364d786f480ac146e174765ac1a5b5c462680c17f4f104af9f0d49
+  metadata.gz: d8bbedca7a5cfd13a87cfcfc7dd7b2eb59a73e6407e5e4df0d0247e9c7e70e0c
+  data.tar.gz: 8ca081c01c837adae8a76bdc357c28753cd899cae9b4467b1c390048c4a2794f
 SHA512:
-  metadata.gz: 167eff38aa013365fab6ff2ba49cee58b15b8b5aa7f604f2c58d0040fac2fe931a4550c3fe594df618326630138ef63265767f2270f3ae6838642a26694fb921
-  data.tar.gz: 23a60e19999c1ce903bfc35503eac491d5cff0de0b59ab8dfe99e67f2f0d4b31380ef3826926c70cc60303c348bfa9377e642ed420f58d519a1ec779521516db
+  metadata.gz: 2115a9d6a83597cef54510ce37cb4f3fbf7afecfc9c3662462c554b16e221fec07c1b6ffd622d2f103daf6b2eea7b03899b7a705d04118579833e1c548bb82ed
+  data.tar.gz: 2c8c426554798d1f91ece60ea4de4013ba79283a0f2171c4e54976d2c561ad9e0f74ade0ca3af144f24596151ba82910f83ab42bf6c943acca32d97f366e8517

data/CHANGELOG

@@ -2,8 +2,154 @@
 
 == HEAD
 
+
+== Version 1.121 (June 8th, 2021)
+* Braintree: Lift restriction on gem version to allow for backwards compatibility [naashton] #3993
+* Payment Express/Windcave: Send amount on verify calls [cdmackeyfree] #3995
+* Orbital: Use billing_address name as fallback [curiousepic] #3966
+* vPOS: handle shop_process_id correctly [therufs] #3996
+* Checkout v2: Support metadata field [saschakala] #3992
+* Adyen: Support networkTxReference field [naashton] #3997
+* Paypal Express: Enable PayPal express reference transaction request to send merchant session id [janees-e] #3994
+
+== Version 1.120.0 (May 28th, 2021)
+* Braintree: Bump required braintree gem version to 3.0.1
+* Stripe PI: ensure `setup_future_sage` and `off_session` work when using SetupIntents.
+* Orbital: Update commit to accept retry_logic in params [jessiagee] #3890
+* Orbital: Update remote 3DS tests [jessiagee] #3892
+* Mercado Pago: support Creditel card type [therufs] #3893
+* Payeezy: Update error mapping [meagabeth] #3896
+* HPS: Add support for stored_credential [cdmackeyfree] #3894
+* Orbital: Ensure payment_detail sends for ECP [jessiagee] #3899
+* Payeezy: Update `error_code_from` method [meagabeth] #3900
+* Worldpay: Add support for `statementNarrative` field [meagabeth] #3901
+* Mercado Pago: Give ability to pass capture option in authorize txn field [naashton] #3897
+* Orbital: Ensure correct fields sent in refund [jessiagee] #3903
+* WorldPay: remove some defaults in billing address [carrigan] #3902
+* Adyen: Support for General Credit [naashton] #3904
+* Worldpay: reintroduce address1 and city defaults [carrigan] #3905
+* Stripe: ensure potentially nested data is scrubbed #3907
+* Stripe PI: Send Validate on Payment Method Attach [tatsianaclifton] #3909
+* Adyen: Update handling of authorization returned from gateway [meagabeth] #3910
+* Update gateway templates for Rubocop compliance [therufs] #3912 #3895
+* Orbital: Send AVSname for all eCheck transactions [jessiagee] #3911
+* Litle: update support of customerId field [cdmackeyfree] #3913
+* Payment Express: fix signature for `verify` [therufs] #3914
+* Forte: Send xdata fields [dsmcclain] #3915
+* PaywayDotCom: Add New Gateway [DanAtPayway] #3898
+* Orbital: Remove unnecessary requirements [jessiagee] #3917
+* SafeCharge (Nuvei): Add network tokenization support [DStoyanoff] #3847
+* Stripe PI: Enhance testing of SetupIntents API #3908
+* SafeCharge (Nuvei): Fix NT related bug [jimilpatel24] #3921
+* Worldpay: Only override cardholdername for 3ds tests [curiousepic] #3918
+* Orbital: Add support for general credit [meagabeth] #3922
+* Banco Sabadell: Ensure sca_exemption field is used #3923
+* Redsys: Refactor XML character escape logic #3925
+* HPS: Strip zip codes of non-alphanumeric characters [dsmcclain] #3926
+* Orbital: $0 PreNote using authorize for eCheck force_capture [jessiagee] #3927
+* Worldpay: synchronous response changes [naashton] #3928
+* PaywayDotCom: Add more thorough scrubbing [tatsianaclifton] #3929
+* Remove CONTRIBUTING.md and update README.md to reflect new repository wiki [dsmcclain] #3930
+* Qvalent: Add customer_reference_number [fredo-] #3931
+* Orbital: Add 'ND' ECPActionCode to $0 Prenote Check [jessiagee] #3935
+* Checkout: Add support for stored_credential [meagabeth] #3934
+* Credorax: Add support for 3ds_reqchallengeind [dsmcclain] #3936
+* Adyen: cancelOrRefund endpoint when passed as option [naashton] #3937
+* Qvalent: Add customer reference number FIX [fredo-] #3939
+* Orbital: Pass line_items in capture [jessiagee] #3941
+* BraintreeBlue: Add support for $0 auth verification [meagabeth] #3944
+* JCB: Add additional BIN ranges [dsmcclain] #3946
+* vPOS: Support new gateway type [therufs] #3906
+* Braintree: Add support for AVS and CVV results in $0 credit card verification transactions [meagabeth] #3951
+* Braintree: Return cvv_code and avs_code in response [meagabeth] #3952
+* vPOS: Stringify values [therufs] #3954
+* Payeezy: Send level2 fields [dsmcclain] #3953
+* Credorax: adjust logic for sending 3ds shipping address fields [dsmcclain] #3959
+* Orbital: Ensure ECP always sends AVSName [jessiagee] #3963
+* Orbital: Add middle name to EWSMiddleName for ECP [jessiagee] #3962
+* Support Canadian Bank Accounts [naashton] #3964
+* Windcave/Payment Express: Add support for AvsAction and EnableAVSData fields [meagabeth] #3967
+* CyberSource: Update XML tag for merchantDefinedData [meagabeth] #3969
+* Elavon: Send ssl_vendor_id field [dsmcclain] #3972
+* Credorax: Add support for `echo` field [meagabeth] #3973
+* Worldpay: support cancelOrRefund via options [therufs] #3975
+* Payeezy: support general credit [cdmackeyfree] #3977
+* Ripley and Hipercard: Add BIN ranges [naashton] #3978
+* Adyen: Default card holder name for credit cards [shasum] #3980
+* PaywayDotCom: make `source_id` a required field [dsmcclain] # 3981
+* Qvalent: remove `pem_password` from required credentials [dsmcclain] #3982
+* Authorize.net: Fix stored credentials [tatsianaclifton] #3971
+* CyberSource: Add support for multiple new fields [dsmcclain] #3984
+* CASHNet: Update gateway adapter [dsmcclain] #3986
+* Elavon: Send `ssl_vendor_id` field via options on gateway initialization [dsmcclain] #3989
+
+== Version 1.119.0 (February 9th, 2021)
+* Payment Express: support verify/validate [therufs] #3874
+* GlobalCollect: Truncate address fields [meagabeth] #3878
+* Litle: Truncate address fields [meagabeth] #3877
+* Netbanx: Add-customer-information(name,email,IP)-to-a-transaction [rockyhakjoong] #3754
+* Netbanx: Adjust the avs and cvv return code in shopify [rockyhakjoong] #3833
+* Decidir: Improve error mapping [meagabeth] #3875
+* Worldpay: support `skip_capture` [therufs] #3879
+* Redsys: Add new response code text [britth] #3880
+* Orbital: Update ECP details to use payment source [jessiagee] #3881
+* Alelo: Add additional BIN ranges [meagabeth] #3882
+* HPS: Update Add support for general credit [naashton] #3885
+* Elavon: Fix issue with encoding data sent in the request [naashton] #3865
+* Orbital: Update ECP to use EWS verification [jessiagee] #3886
+* Eway: Add 3ds field when do direct payment [GavinSun9527] #3860
+* Support Creditel cardtype [therufs] #3883
+* Elavon: Remove ampersand char from fields [naashton] #3891
+
+== Version 1.118.0 (January 22nd, 2021)
+* Worldpay: Add support for challengeWindowSize [carrigan] #3823
+* Adyen: Update capitalization on subMerchantId field [cdmackeyfree] #3824
+* Maestro and Elo: Update BIN ranges [meagabeth] #3822
+* HPS: Truncate invoice numbers that are too long [curiousepic] #3825
+* Pass network_transaction_id attribute in Response [therufs] #3815
+* Elavon: support standardized stored credentials [therufs] #3816
+* Decidir: update fraud_detection field [cdmackeyfree] #3829
+* Paymentez: Add Olimpica cardtype [meagabeth] #3831
+* SafeCharge: 3DS external MPI data refinements [curiousepic] #3821
+* Credorax: Add support for 3DS Adviser [meagabeth] #3834
+* Adyen: Support subMerchant data [mymir][therufs] #3835
+* Decidir: add device_unique_identifier to card data [cdmackeyfree] #3839
+* BraintreeBlue: add support for account_type field [jimilpatel24] #3840
+* Redsys: Add support for stored_credential [meagabeth] #3844
+* Redsys: add_payment method solution [meagabeth] #3845
+* Stripe Payment Intents: Add support for error_on_requires_action option [tatsianaclifton] #3846
+* Add 3DS 2.0 values to paypal [nebdil] #3285
+* Redsys: Update Mpi Fields [tatsianaclifton] #3855
+* Paypal: Update AuthStatus3ds MPI field [curiousepic] #3857
+* Orbital: Update 3DS support for Mastercard [meagabeth] #3850
+* Payeezy: Support standardized stored credentials [therufs] #3861
+* CyberSource: Update `billing_address` override [meagabeth] #3862
+* Paymentez: Add 3DS MPI field support [carrigan] #3856
+* BlueSnap: Add support `fraud-session-id` field [meagabeth] #3863
+* BlueSnap: Update handling of `transaction-fraud-info` fields [meagabeth] #3866
+* Payeezy: Allow no stored credential transaction id [therufs] #3868
+* Orbital: eCheck processing added [ajawadmirza] #3870
+* FirsdataE4V27: Fixes some apple pay transaction issues [pi3r] #3872
+
+== Version 1.117.0 (November 13th)
+* Checkout V2: Pass attempt_n3d along with 3ds enabled [naashton] #3805
+* GlobalCollect: Add support for Third-party 3DS2 data [molbrown] #3801
+* Authorize.net: Pass stored credentials [therufs] #3804
+* Authorize.net: Don't pass isFirstRecurringPayment [therufs] #3805
+* Litle: Add support for general credit transactions [naashton] #3807
+* Redsys: Add 3DS2 Integration Support [esmitperez] #3794
+* Cybersource: Use firstname/lastname from address instead of the payment method [pi3r] #3798
+* Add MPI functionality for SafeCharge gateway [daniel] #3809
+* SafeCharge: Standardize MPI fields [curiousepic] #3809
+* Credorax: Adds AMEX to supported cards and adds 1A error code [LinTrieu] #3792
+* Stripe PI: Pass external 3DS auth data [curiousepic] #3811
+* Credorax: Allow 3DS1 normalized pass-through, ease version matching [britth] #3812
+* Redsys: Redsys: Harden 3DS v1/v2 check for External MPI [esmitperez] #3814
+* Add card types for Stripe, Worldpay, Checkout.com [LinTrieu] #3810
+* ActiveMerchant::Billing::Response: Include `network_transaction_id` attribute [therufs] #3815
+
 == Version 1.116.0 (October 28th)
-* Remove Braintree specific version dependency [pi3r] #38000
+* Remove Braintree specific version dependency [pi3r] #3800
 
 == Version 1.115.0 (October 27th)
 * Checkout v2: $0 Auth on gateway [jessiagee] #3762
@@ -46,6 +192,7 @@
 * Checkout V2: Support for attempt_n3d 3DS field [naashton] #3790
 * Elavon: Strip ampersands [therufs] #3795
 * Paybox: Add support for 3DS 1.0 values [jcpaybox] #3335
+* Decidir: Add additional fraud_detection options [cdmackeyfree] #3812
 
 == Version 1.114.0
 * BlueSnap: Add address1,address2,phone,shipping_* support #3749

data/README.md

@@ -1,5 +1,5 @@
 # Active Merchant
-[![Build Status](https://travis-ci.org/activemerchant/active_merchant.svg?branch=master)](https://travis-ci.org/activemerchant/active_merchant)
+[![Build Status](https://github.com/activemerchant/active_merchant/workflows/CI/badge.svg?branch=master)](https://github.com/activemerchant/active_merchant/actions?query=workflow%3ACI)
 [![Code Climate](https://codeclimate.com/github/activemerchant/active_merchant.svg)](https://codeclimate.com/github/activemerchant/active_merchant)
 
 Active Merchant is an extraction from the ecommerce system [Shopify](http://www.shopify.com).
@@ -17,7 +17,7 @@ from an ever-growing set of contributors.
 See [GettingStarted.md](GettingStarted.md) if you want to learn more about using Active Merchant in your
 applications.
 
-If you'd like to contribute to Active Merchant, please start with our [contribution guide](CONTRIBUTING.md).
+If you'd like to contribute to Active Merchant, please start with our [Contribution Guide](https://github.com/activemerchant/active_merchant/wiki/Contributing).
 
 ## Installation
 
@@ -81,6 +81,8 @@ if credit_card.validate.empty?
 end
 ```
 
+## Contributing
+
 For more in-depth documentation and tutorials, see [GettingStarted.md](GettingStarted.md) and the
 [API documentation](http://www.rubydoc.info/github/activemerchant/active_merchant/).
 

data/lib/active_merchant/billing/check.rb

@@ -13,6 +13,14 @@ module ActiveMerchant #:nodoc:
       # Used for Canadian bank accounts
       attr_accessor :institution_number, :transit_number
 
+      # Canadian Institution Numbers
+      # Found here: https://en.wikipedia.org/wiki/Routing_number_(Canada)
+      INSTITUTION_NUMBERS = %w(
+        001 002 003 004	006 010 016 030 039 117 127 177 219 245 260 269 270 308
+        309 310 315 320	338 340 509 540 608 614 623 809 815 819 828 829 837 839
+        865 879 889 899
+      )
+
       def name
         @name ||= "#{first_name} #{last_name}".strip
       end
@@ -67,6 +75,8 @@ module ActiveMerchant #:nodoc:
           else
             false
           end
+        when 8
+          true if INSTITUTION_NUMBERS.include?(routing_number[0..2].to_s)
         else
           false
         end

data/lib/active_merchant/billing/credit_card.rb

@@ -24,6 +24,7 @@ module ActiveMerchant #:nodoc:
     # * Naranja
     # * UnionPay
     # * Alia
+    # * Olimpica
     #
     # For testing purposes, use the 'bogus' credit card brand. This skips the vast majority of
     # validations, allowing you to focus on your core concerns until you're ready to be more concerned
@@ -100,6 +101,8 @@ module ActiveMerchant #:nodoc:
       # * +'naranja'+
       # * +'union_pay'+
       # * +'alia'+
+      # * +'olimpica'+
+      # * +'creditel'+
       #
       # Or, if you wish to test your implementation, +'bogus'+.
       #

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
         'american_express'   => ->(num) { num =~ /^3[47]\d{13}$/ },
         'naranja'            => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), NARANJA_RANGES) },
         'diners_club'        => ->(num) { num =~ /^3(0[0-5]|[68]\d)\d{11,16}$/ },
-        'jcb'                => ->(num) { num =~ /^35(28|29|[3-8]\d)\d{12}$/ },
+        'jcb'                => ->(num) { num =~ /^(35(28|29|[3-8]\d)\d{12}|308800\d{10})$/ },
         'dankort'            => ->(num) { num =~ /^5019\d{12}$/ },
         'maestro'            => lambda { |num|
           (12..19).cover?(num&.size) && (
@@ -30,7 +30,9 @@ module ActiveMerchant #:nodoc:
             in_bin_range?(num.slice(0, 6), CARNET_RANGES) ||
             CARNET_BINS.any? { |bin| num.slice(0, bin.size) == bin }
           )
-        }
+        },
+        'olimpica' => ->(num) { num =~ /^636853\d{10}$/ },
+        'creditel' => ->(num) { num =~ /^601933\d{10}$/ }
       }
 
       # http://www.barclaycard.co.uk/business/files/bin_rules.pdf
@@ -69,14 +71,66 @@ module ActiveMerchant #:nodoc:
       MASTERCARD_RANGES = [
         (222100..272099),
         (510000..559999),
+        [605272],
+        [606282],
+        [637095],
+        [637568],
+        (637599..637600),
+        [637609],
       ]
 
       MAESTRO_BINS = Set.new(
-        %w[500033 581149]
+        %w[ 500057
+            501018 501043 501045 501047 501049 501051 501072 501075 501087 501089 501095
+            501500
+            501879 502113 502301 503175
+            503645 503670
+            504310 504338 504363 504533 504587 504620 504639 504656 504738 504781 504910
+            507001 507002 507004 507082 507090
+            560014 560565 561033
+            572402 572610 572626
+            576904
+            578614
+            581149
+            585274 585697
+            586509
+            588729 588792
+            589244 589407 589471 589605 589633 589647 589671
+            590043 590206 590263 590265 590278 590361 590362 590379 590393 590590
+            591235 591420 591481 591620 591770 591948 591994
+            592024 592161 592184 592186 592201 592384 592393 592528 592566 592704 592735 592879 592884
+            593074 593264 593272 593355 593496 593556 593589 593666 593709 593825 593963 593994
+            594184 594409 594468 594475 594581 594665 594691 594710 594874 594968
+            595355 595364 595532 595547 595561 595568 595743 595929
+            596245 596289 596399 596405 596590 596608 596645 596646 596791 596808 596815 596846
+            597077 597094 597143 597370 597410 597765 597855 597862
+            598053 598054 598395 598585 598793 598794 598815 598835 598838 598880 598889
+            599000 599069 599089 599148 599191 599310 599741 599742 599867
+            601070
+            604983
+            606126
+            636380 636422 636502 636639
+            637046 637756
+            639130 639229
+            690032]
       )
 
       # https://www.mastercard.us/content/dam/mccom/global/documents/mastercard-rules.pdf, page 73
       MAESTRO_RANGES = [
+        (500032..500033),
+        (501015..501016),
+        (501020..501021),
+        (501023..501029),
+        (501038..501041),
+        (501053..501058),
+        (501060..501063),
+        (501066..501067),
+        (501080..501083),
+        (501091..501092),
+        (501104..501105),
+        (501107..501108),
+        (501104..501105),
+        (501107..501108),
         (561200..561269),
         (561271..561299),
         (561320..561356),
@@ -101,14 +155,14 @@ module ActiveMerchant #:nodoc:
 
       # https://dev.elo.com.br/apis/tabela-de-bins, download csv from left sidebar
       ELO_RANGES = [
-        506707..506708, 506715..506715, 506718..506722, 506724..506724, 506726..506736, 506739..506739, 506741..506743,
-        506745..506747, 506753..506753, 506774..506776, 506778..506778, 509000..509001, 509003..509003, 509007..509007,
-        509020..509022, 509035..509035, 509039..509042, 509045..509045, 509048..509048, 509051..509071, 509073..509074,
-        509077..509080, 509084..509089, 509091..509094, 509098..509098, 509100..509100, 509104..509104, 509106..509109,
-        509257..509257, 627780..627780, 636368..636368, 650031..650033, 650035..650045, 650047..650047, 650406..650410,
-        650434..650436, 650439..650439, 650485..650504, 650506..650530, 650577..650580, 650582..650591, 650721..650727,
-        650901..650922, 650928..650928, 650938..650939, 650946..650948, 650954..650955, 650962..650963, 650967..650967,
-        650971..650971, 651652..651667, 651675..651678, 655000..655010, 655012..655015, 655051..655052, 655056..655057
+        506707..506708, 506715..506715, 506717..506722, 506724..506736, 506739..506743,
+        506745..506747, 506753..506753, 506774..506778, 509000..509007, 509009..509014,
+        509020..509030, 509035..509042, 509044..509089, 509091..509101, 509104..509807,
+        509831..509877, 509897..509900, 509918..509964, 509971..509986, 509995..509999,
+        627780..627780, 636368..636368, 650031..650033, 650035..650051, 650057..650081,
+        650406..650439, 650485..650504, 650506..650538, 650552..650598, 650720..650727,
+        650901..650922, 650928..650928, 650938..650939, 650946..650978, 651652..651704,
+        655000..655019, 655021..655057
       ]
 
       # Alelo provides BIN ranges by e-mailing them out periodically.
@@ -120,8 +174,9 @@ module ActiveMerchant #:nodoc:
         402588..402588, 404347..404347, 405876..405876, 405882..405882, 405884..405884,
         405886..405886, 430471..430471, 438061..438061, 438064..438064, 470063..470066,
         496067..496067, 506699..506704, 506706..506706, 506713..506714, 506716..506716,
-        506749..506750, 506752..506752, 506754..506756, 506758..506762, 506764..506767,
-        506770..506771, 509015..509019, 509880..509882, 509884..509885, 509987..509992
+        506749..506750, 506752..506752, 506754..506756, 506758..506767, 506770..506771,
+        506773..506773, 509015..509019, 509880..509882, 509884..509885, 509887..509887,
+        509987..509992
       ]
 
       CABAL_RANGES = [
@@ -149,7 +204,7 @@ module ActiveMerchant #:nodoc:
       def self.in_bin_range?(number, ranges)
         bin = number.to_i
         ranges.any? do |range|
-          range.cover?(bin)
+          range.include?(bin)
         end
       end
 
@@ -298,6 +353,8 @@ module ActiveMerchant #:nodoc:
           case brand
           when 'naranja'
             valid_naranja_algo?(numbers)
+          when 'creditel'
+            valid_creditel_algo?(numbers)
           when 'alia'
             true
           else
@@ -352,7 +409,7 @@ module ActiveMerchant #:nodoc:
           sum % 10 == 0
         end
 
-        # Checks the validity of a card number by use of Naranja's specific algorithm.
+        # Checks the validity of a card number by use of specific algorithms
         def valid_naranja_algo?(numbers) #:nodoc:
           num_array = numbers.to_s.chars.map(&:to_i)
           multipliers = [4, 3, 2, 7, 6, 5, 4, 3, 2, 7, 6, 5, 4, 3, 2]
@@ -361,6 +418,14 @@ module ActiveMerchant #:nodoc:
           final_num = intermediate > 9 ? 0 : intermediate
           final_num == num_array[15]
         end
+
+        def valid_creditel_algo?(numbers) #:nodoc:
+          num_array = numbers.to_s.chars.map(&:to_i)
+          multipliers = [5, 4, 3, 2, 1, 9, 8, 7, 6, 5, 4, 3, 2, 1, 9]
+          num_sum = num_array[0..14].zip(multipliers).map { |a, b| a * b }.reduce(:+)
+          final_num = num_sum % 10
+          final_num == num_array[15]
+        end
       end
     end
   end

data/lib/active_merchant/billing/gateways/adyen.rb

@@ -78,10 +78,19 @@ module ActiveMerchant #:nodoc:
         commit('refund', post, options)
       end
 
+      def credit(money, payment, options = {})
+        post = init_post(options)
+        add_invoice(post, money, options)
+        add_payment(post, payment, options)
+        add_shopper_reference(post, options)
+        commit('refundWithData', post, options)
+      end
+
       def void(authorization, options = {})
         post = init_post(options)
+        endpoint = options[:cancel_or_refund] ? 'cancelOrRefund' : 'cancel'
         add_reference(post, authorization, options)
-        commit('cancel', post, options)
+        commit(endpoint, post, options)
       end
 
       def adjust(money, authorization, options = {})
@@ -227,7 +236,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_merchant_data(post, options)
-        post[:additionalData][:subMerchantId] = options[:sub_merchant_id] if options[:sub_merchant_id]
+        post[:additionalData][:subMerchantID] = options[:sub_merchant_id] if options[:sub_merchant_id]
         post[:additionalData][:subMerchantName] = options[:sub_merchant_name] if options[:sub_merchant_name]
         post[:additionalData][:subMerchantStreet] = options[:sub_merchant_street] if options[:sub_merchant_street]
         post[:additionalData][:subMerchantCity] = options[:sub_merchant_city] if options[:sub_merchant_city]
@@ -235,8 +244,8 @@ module ActiveMerchant #:nodoc:
         post[:additionalData][:subMerchantPostalCode] = options[:sub_merchant_postal_code] if options[:sub_merchant_postal_code]
         post[:additionalData][:subMerchantCountry] = options[:sub_merchant_country] if options[:sub_merchant_country]
         post[:additionalData][:subMerchantTaxId] = options[:sub_merchant_tax_id] if options[:sub_merchant_tax_id]
-        post[:additionalData][:subMerchantId] = options[:sub_merchant_id] if options[:sub_merchant_id]
         post[:additionalData][:subMerchantMCC] = options[:sub_merchant_mcc] if options[:sub_merchant_mcc]
+        post[:additionalData] = post[:additionalData].merge(options[:sub_merchant_data]) if options[:sub_merchant_data]
       end
 
       def add_risk_data(post, options)
@@ -374,7 +383,7 @@ module ActiveMerchant #:nodoc:
         }
 
         card.delete_if { |_k, v| v.blank? }
-        card[:holderName] ||= 'Not Provided' if credit_card.is_a?(NetworkTokenizationCreditCard)
+        card[:holderName] ||= 'Not Provided'
         requires!(card, :expiryMonth, :expiryYear, :holderName, :number)
         post[:card] = card
       end
@@ -388,10 +397,15 @@ module ActiveMerchant #:nodoc:
       def add_reference(post, authorization, options = {})
         _, psp_reference, = authorization.split('#')
         post[:originalReference] = single_reference(authorization) || psp_reference
+        post[:networkTxReference] = options[:network_transaction_id] if options[:network_transaction_id]
       end
 
       def add_original_reference(post, authorization, options = {})
-        original_psp_reference, = authorization.split('#')
+        if authorization.start_with?('#')
+          _, original_psp_reference, = authorization.split('#')
+        else
+          original_psp_reference, = authorization.split('#')
+        end
         post[:originalReference] = single_reference(authorization) || original_psp_reference
       end
 
@@ -498,6 +512,7 @@ module ActiveMerchant #:nodoc:
           raw_response = e.response.body
           response = parse(raw_response)
         end
+
         success = success_from(action, response, options)
         Response.new(
           success,
@@ -506,6 +521,7 @@ module ActiveMerchant #:nodoc:
           authorization: authorization_from(action, parameters, response),
           test: test?,
           error_code: success ? nil : error_code_from(response),
+          network_transaction_id: network_transaction_id_from(response),
           avs_result: AVSResult.new(code: avs_code_from(response)),
           cvv_result: CVVResult.new(cvv_result_from(response))
         )
@@ -552,11 +568,10 @@ module ActiveMerchant #:nodoc:
           response['refusalReason'] = 'Received unexpected 3DS authentication response. Use the execute_threed and/or threed_dynamic options to initiate a proper 3DS flow.'
           return false
         end
-
         case action.to_s
         when 'authorise', 'authorise3d'
           %w[Authorised Received RedirectShopper].include?(response['resultCode'])
-        when 'capture', 'refund', 'cancel'
+        when 'capture', 'refund', 'cancel', 'cancelOrRefund'
           response['response'] == "[#{action}-received]"
         when 'adjustAuthorisation'
           response['response'] == 'Authorised' || response['response'] == '[adjustAuthorisation-received]'
@@ -564,6 +579,8 @@ module ActiveMerchant #:nodoc:
           response['result'] == 'Success'
         when 'disable'
           response['response'] == '[detail-successfully-disabled]'
+        when 'refundWithData'
+          response['resultCode'] == 'Received'
         else
           false
         end
@@ -572,7 +589,7 @@ module ActiveMerchant #:nodoc:
       def message_from(action, response)
         return authorize_message_from(response) if %w(authorise authorise3d authorise3ds2).include?(action.to_s)
 
-        response['response'] || response['message'] || response['result']
+        response['response'] || response['message'] || response['result'] || response['resultCode']
       end
 
       def authorize_message_from(response)
@@ -607,6 +624,10 @@ module ActiveMerchant #:nodoc:
         STANDARD_ERROR_CODE_MAPPING[response['errorCode']]
       end
 
+      def network_transaction_id_from(response)
+        response.dig('additionalData', 'networkTxReference')
+      end
+
       def add_browser_info(browser_info, post)
         return unless browser_info