activemerchant 1.99.0 → 1.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb76da56e87639a3f9129d70297b78a0edabe9faf2300e682e06e872e019419
-  data.tar.gz: 94cb0693e867b03071fe55a7e71b3cfbaf53a7c340d480f24108948822e9e1e7
+  metadata.gz: 823ed7b22c50e7910c846fe99b621d38589cc4ae2b01825219a344d08dee0024
+  data.tar.gz: 8cc6c8294cb70df4df71e805b7d9b336237540ada7e4867388eba7677ba37641
 SHA512:
-  metadata.gz: aa96ed1337c57fa00d0405ff07a70b9423bac6a26ec69fde450d73bc9cabfc0ae27b75a46faddcdf3e79f2198db8214e8e6c5926468f0acb999bef43fc220a73
-  data.tar.gz: f672640992309d545629a41e4f89d505732d0bb88559648a96935ef01293bcff737de41c8a7b8992993dafdfdb71d29bcbf8b85133c3d9ae5311f7b720b7c9c7
+  metadata.gz: 85b8024522112e07fd028f1331574ce47c4a7e343d8a92906d043f2448f4c656723151202f53de0f49627a4d5815fbda5d7ab81274268dd1cd2decf61b8b69bf
+  data.tar.gz: ce6135c3bd5c0c6985b60083abde4eef4a8bec4fb75c857ddb49a1a10d60608821ccca6337a7928d649b5fef7f847a191658db62004ec225c36b48e7ed9719c7

data/CHANGELOG

@@ -1,6 +1,25 @@
 = ActiveMerchant CHANGELOG
 
 == HEAD
+== Version 1.100.0 (Oct 16, 2019)
+* Stripe: Restore non-auto capture behaviour for card present transactions [PatrickFang] #3258
+* Revert "Revert "Worldpay: Switch to Nokogiri"" [curiousepic] #3373
+* Adyen: Fix `authorise3d` message for refusals [jeremywrowe] #3374
+* Redsys: Set authorization field for 3DS transactions [britth] #3377
+* Adyen: Add capture_delay_hours GSF [therufs] #3376
+* Credorax: Add support for stored credentials [chinhle23] #3375
+* BlueSnap: Add remote tests for Cabal and Naranja [leila-alderman] #3382
+* WorldPay: Add Cabal and Naranja remote tests [leila-alderman] #3378
+* Rubocop: Indentions [nfarve] #3383
+* Worldpay: Handle parse errors gracefully [curiousepic] #3380
+* BluePay: Add ability to pass doc_type in refunds and credits [britth] #3386
+* Stripe Payment Intents: Fix fallback for Store [waaux] #3343
+* Update Securionpay supported countries [hossamhossny] #2472
+* Visanet Peru: Add amount argument to Capture [curiousepic] #3389
+* Rubocop: Layout/MultilineHashBraceLayout [nfarve] #3385
+* CardConnect: Always include additional_data in purchase [therufs] #3387
+* CardConnect: Add user_fields GSF [therufs] #3388
+
 == Version 1.99.0 (Sep 26, 2019)
 * Adyen: Add functionality to set 3DS exemptions via API [britth] #3331
 * Adyen: Send "NA" instead of "N/A" [leila-alderman] #3339

data/README.md

@@ -215,7 +215,7 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [SecureNet](http://www.securenet.com/) - US
 * [SecurePay](http://www.securepay.com/) - US, CA, GB, AU
 * [SecurePayTech](http://www.securepaytech.com/) - NZ
-* [SecurionPay](https://securionpay.com/) - AD, AE, AF, AG, AI, AL, AM, AO, AR, AS, AT, AU, AW, AX, AZ, BA, BB, BD, BE, BF, BG, BH, BI, BJ, BL, BM, BN, BO, BR, BS, BT, BV, BW, BY, BZ, CA, CC, CD, CF, CG, CH, CI, CK, CL, CM, CN, CO, CR, CU, CV, CW, CX, CY, CZ, DE, DJ, DK, DM, DO, DZ, EC, EE, EG, EH, ER, ES, ET, FI, FJ, FK, FM, FO, FR, GA, GB, GD, GE, GF, GG, GH, GI, GL, GM, GN, GP, GQ, GR, GS, GT, GU, GW, GY, HK, HM, HN, HR, HT, HU, ID, IE, IL, IM, IN, IO, IQ, IR, IS, IT, JE, JM, JO, JP, KE, KG, KH, KI, KM, KN, KP, KR, KW, KY, KZ, LA, LB, LC, LI, LK, LR, LS, LT, LU, LV, LY, MA, MC, MD, ME, MF, MG, MH, MK, ML, MM, MN, MO, MP, MQ, MR, MS, MT, MU, MV, MW, MX, MY, MZ, NA, NC, NE, NF, NG, NI, NL, NO, NP, NR, NU, NZ, OM, PA, PE, PF, PG, PH, PK, PL, PM, PN, PR, PS, PT, PW, PY, QA, RE, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG, SH, SI, SJ, SK, SL, SM, SN, SO, SR, ST, SV, SY, SZ, TC, TD, TF, TG, TH, TJ, TK, TL, TM, TN, TO, TR, TT, TV, TW, TZ, UA, UG, UM, US, UY, UZ, VA, VC, VE, VG, VI, VN, VU, WF, WS, YE, YT, ZA, ZM, ZW
+* [SecurionPay](https://securionpay.com/) - AD, BE, BG, CH, CY, CZ, DE, DK, EE, ES, FI, FO, FR, GI, GL, GR, GS, GT, HR, HU, IE, IS, IT, LI, LR, LT, LU, LV, MC, MT, MU, MV, MW, NL, NO, PL, RO, SE, SI
 * [SkipJack](http://www.skipjack.com/) - US, CA
 * [SoEasyPay](http://www.soeasypay.com/) - US, CA, AT, BE, BG, HR, CY, CZ, DK, EE, FI, FR, DE, GR, HU, IE, IT, LV, LT, LU, MT, NL, PL, PT, RO, SK, SI, ES, SE, GB, IS, NO, CH
 * [Spreedly](https://spreedly.com) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
@@ -225,6 +225,7 @@ The [ActiveMerchant Wiki](https://github.com/activemerchant/active_merchant/wiki
 * [Transact Pro](https://www.transactpro.lv/business/online-payments-acceptance) - US
 * [TransFirst](http://www.transfirst.com/) - US
 * [Transnational](http://www.tnbci.com/) - US
+* [Trexle](https://trexle.com) - AD, AE, AT, AU, BD, BE, BG, BN, CA, CH, CY, CZ, DE, DK, EE, EG, ES, FI, FR, GB, GI, GR, HK, HU, ID, IE, IL, IM, IN, IS, IT, JO, KW, LB, LI, LK, LT, LU, LV, MC, MT, MU, MV, MX, MY, NL, NO, NZ, OM, PH, PL, PT, QA, RO, SA, SE, SG, SI, SK, SM, TR, TT, UM, US, VA, VN, ZA
 * [TrustCommerce](http://www.trustcommerce.com/) - US
 * [USA ePay](http://www.usaepay.com/) - US
 * [Vanco Payment Solutions](http://vancopayments.com/) - US

data/lib/active_merchant/billing/avs_result.rb

@@ -88,8 +88,7 @@ module ActiveMerchant
         { 'code' => code,
           'message' => message,
           'street_match' => street_match,
-          'postal_match' => postal_match
-        }
+          'postal_match' => postal_match}
       end
     end
   end

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

@@ -186,6 +186,7 @@ module ActiveMerchant #:nodoc:
         post[:selectedBrand] ||= NETWORK_TOKENIZATION_CARD_SOURCE[payment.source.to_s] if payment.is_a?(NetworkTokenizationCreditCard)
         post[:deliveryDate] = options[:delivery_date] if options[:delivery_date]
         post[:merchantOrderReference] = options[:merchant_order_reference] if options[:merchant_order_reference]
+        post[:captureDelayHours] = options[:capture_delay_hours] if options[:capture_delay_hours]
         post[:additionalData] ||= {}
         post[:additionalData][:overwriteBrand] = normalize(options[:overwrite_brand]) if options[:overwrite_brand]
         post[:additionalData][:customRoutingFlag] = options[:custom_routing_flag] if options[:custom_routing_flag]
@@ -464,7 +465,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(action, response)
-        return authorize_message_from(response) if action.to_s == 'authorise'
+        return authorize_message_from(response) if action.to_s == 'authorise' || action.to_s == 'authorise3d'
         response['response'] || response['message']
       end
 

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

@@ -164,6 +164,7 @@ module ActiveMerchant #:nodoc:
         post[:PAYMENT_ACCOUNT] = ''
         post[:MASTER_ID]  = identification
         post[:TRANS_TYPE] = 'REFUND'
+        post[:DOC_TYPE] = options[:doc_type] if options[:doc_type]
         post[:NAME1] = options[:first_name] || ''
         post[:NAME2] = options[:last_name] if options[:last_name]
         post[:ZIP] = options[:zip] if options[:zip]
@@ -183,6 +184,7 @@ module ActiveMerchant #:nodoc:
         post[:PAYMENT_ACCOUNT] = ''
         add_payment_method(post, payment_object)
         post[:TRANS_TYPE] = 'CREDIT'
+        post[:DOC_TYPE] = options[:doc_type] if options[:doc_type]
 
         post[:NAME1] = options[:first_name] || ''
         post[:NAME2] = options[:last_name] if options[:last_name]

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

@@ -88,6 +88,7 @@ module ActiveMerchant #:nodoc:
           add_address(post, options)
           add_customer_data(post, options)
           add_3DS(post, options)
+          add_additional_data(post, options)
           post[:capture] = 'Y'
           commit('auth', post)
         end
@@ -102,6 +103,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_customer_data(post, options)
         add_3DS(post, options)
+        add_additional_data(post, options)
         commit('auth', post)
       end
 
@@ -236,6 +238,7 @@ module ActiveMerchant #:nodoc:
             updated
           end
         end
+        post[:userfields] = options[:user_fields] if options[:user_fields]
       end
 
       def add_3DS(post, options)

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
         add_3d_secure(post, options)
         add_echo(post, options)
         add_submerchant_id(post, options)
-        add_transaction_type(post, options)
+        add_stored_credential(post, options)
         add_processor(post, options)
 
         commit(:purchase, post)
@@ -149,7 +149,7 @@ module ActiveMerchant #:nodoc:
         add_3d_secure(post, options)
         add_echo(post, options)
         add_submerchant_id(post, options)
-        add_transaction_type(post, options)
+        add_stored_credential(post, options)
         add_processor(post, options)
 
         commit(:authorize, post)
@@ -249,6 +249,22 @@ module ActiveMerchant #:nodoc:
         post[:b3] = format(payment_method.month, :two_digits)
       end
 
+      def add_stored_credential(post, options)
+        add_transaction_type(post, options)
+        # if :transaction_type option is not passed, then check for :stored_credential options
+        return unless (stored_credential = options[:stored_credential]) && options.dig(:transaction_type).nil?
+        if stored_credential[:initiator] == 'merchant'
+          case stored_credential[:reason_type]
+          when 'recurring'
+            stored_credential[:initial_transaction] ? post[:a9] = '1' : post[:a9] = '2'
+          when 'installment', 'unscheduled'
+            post[:a9] = '8'
+          end
+        else
+          post[:a9] = '9'
+        end
+      end
+
       def add_customer_data(post, options)
         post[:d1] = options[:ip] || '127.0.0.1'
         if (billing_address = options[:billing_address])
@@ -281,7 +297,7 @@ module ActiveMerchant #:nodoc:
           browser_info = three_ds_2_options[:browser_info]
           post[:'3ds_initiate'] = options[:three_ds_initiate] || '01'
           post[:'3ds_purchasedate'] = Time.now.utc.strftime('%Y%m%d%I%M%S')
-          post[:'3ds_channel'] = '02'
+          options.dig(:stored_credential, :initiator) == 'merchant' ? post[:'3ds_channel'] = '03' : post[:'3ds_channel'] = '02'
           post[:'3ds_redirect_url'] = three_ds_2_options[:notification_url]
           post[:'3ds_challengewindowsize'] = options[:three_ds_challenge_window_size] || '03'
           post[:'3ds_version'] = options[:three_ds_version] if options[:three_ds_version]

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

@@ -15,20 +15,16 @@ module ActiveMerchant #:nodoc:
 
       ENVELOPE_NAMESPACES = { 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
                               'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/',
-                              'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
-                            }
+                              'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance'}
 
       SEND_AND_COMMIT_ATTRIBUTES = { 'xmlns:n1' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/Request',
-                                     'env:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'
-                                   }
+                                     'env:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'}
 
       SEND_AND_COMMIT_SOURCE_ATTRIBUTES = { 'xmlns:n2' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/encodedTypes',
-                                            'xsi:type' => 'n2:Transaction'
-                                          }
+                                            'xsi:type' => 'n2:Transaction'}
 
       POST_HEADERS = { 'soapAction' => 'http://secure2.e-xact.com/vplug-in/transaction/rpc-enc/SendAndCommit',
-                       'Content-Type' => 'text/xml'
-                     }
+                       'Content-Type' => 'text/xml'}
 
       SUCCESS = 'true'
 

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

@@ -268,7 +268,7 @@ POST
 #{content_type}
 #{date}
 #{uri(action, authorization)}
-EOS
+        EOS
         digest = OpenSSL::Digest.new('sha256')
         key = @options[:secret_api_key]
         "GCS v1HMAC:#{@options[:api_key_id]}:#{Base64.strict_encode64(OpenSSL::HMAC.digest(digest, key, data))}"

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

@@ -214,7 +214,8 @@ module ActiveMerchant #:nodoc:
         xml.instruct!(:xml, encoding: 'UTF-8')
         xml.SOAP :Envelope, {
             'xmlns:SOAP' => 'http://schemas.xmlsoap.org/soap/envelope/',
-            'xmlns:hps' => 'http://Hps.Exchange.PosGateway' } do
+            'xmlns:hps' => 'http://Hps.Exchange.PosGateway'
+        } do
           xml.SOAP :Body do
             xml.hps :PosRequest do
               xml.hps 'Ver1.0'.to_sym do

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

@@ -13,12 +13,10 @@ module ActiveMerchant #:nodoc:
 
       ENV_NAMESPACES = { 'xmlns:xsi'  => 'http://www.w3.org/2001/XMLSchema-instance',
                          'xmlns:xsd'  => 'http://www.w3.org/2001/XMLSchema',
-                         'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/'
-                       }
+                         'xmlns:env' => 'http://schemas.xmlsoap.org/soap/envelope/'}
       ENV_NAMESPACES_V4 = { 'xmlns:xsi'  => 'http://www.w3.org/2001/XMLSchema-instance',
                             'xmlns:xsd'  => 'http://www.w3.org/2001/XMLSchema',
-                            'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
-                          }
+                            'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'}
 
       TX_NAMESPACE = 'http://merchantwarehouse.com/MerchantWARE/Client/TransactionRetail'
       TX_NAMESPACE_V4 = 'http://schemas.merchantwarehouse.com/merchantware/40/Credit/'

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

@@ -136,8 +136,7 @@ module ActiveMerchant #:nodoc:
         requires!(options, :card_number)
 
         post = { :trans_id => identification,
-                 :card_num => options[:card_number]
-               }
+                 :card_num => options[:card_number]}
 
         post[:first_name] = options[:first_name] if options[:first_name]
         post[:last_name] = options[:last_name] if options[:last_name]

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

@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
         post[:order_id] = options[:order_id]
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        add_cof(post, options)
+        add_stored_credential(post, options)
         action = if post[:cavv]
                    'cavv_preauth'
                  elsif post[:data_key].blank?
@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
         post[:order_id] = options[:order_id]
         post[:address] = options[:billing_address] || options[:address]
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
-        add_cof(post, options)
+        add_stored_credential(post, options)
         action = if post[:cavv]
                    'cavv_purchase'
                  elsif post[:data_key].blank?
@@ -208,6 +208,48 @@ module ActiveMerchant #:nodoc:
         post[:payment_information] = options[:payment_information] if options[:payment_information]
       end
 
+      def add_stored_credential(post, options)
+        add_cof(post, options)
+        # if any of :issuer_id, :payment_information, or :payment_indicator is not passed,
+        # then check for :stored credential options
+        return unless (stored_credential = options[:stored_credential]) && !cof_details_present?(options)
+        if stored_credential[:initial_transaction]
+          add_stored_credential_initial(post, options)
+        else
+          add_stored_credential_used(post, options)
+        end
+      end
+
+      def add_stored_credential_initial(post, options)
+        post[:payment_information] ||= '0'
+        post[:issuer_id] ||= ''
+        if options[:stored_credential][:initiator] == 'merchant'
+          case options[:stored_credential][:reason_type]
+          when 'recurring', 'installment'
+            post[:payment_indicator] ||= 'R'
+          when 'unscheduled'
+            post[:payment_indicator] ||= 'C'
+          end
+        else
+          post[:payment_indicator] ||= 'C'
+        end
+      end
+
+      def add_stored_credential_used(post, options)
+        post[:payment_information] ||= '2'
+        post[:issuer_id] = options[:stored_credential][:network_transaction_id] if options[:issuer_id].blank?
+        if options[:stored_credential][:initiator] == 'merchant'
+          case options[:stored_credential][:reason_type]
+          when 'recurring', 'installment'
+            post[:payment_indicator] ||= 'R'
+          when '', 'unscheduled'
+            post[:payment_indicator] ||= 'U'
+          end
+        else
+          post[:payment_indicator] ||= 'Z'
+        end
+      end
+
       # Common params used amongst the +credit+, +void+ and +capture+ methods
       def crediting_params(authorization, options = {})
         {

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

@@ -254,8 +254,7 @@ module ActiveMerchant #:nodoc:
       def schema
         { 'xmlns' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1',
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xsi:schemaLocation' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1'
-        }
+          'xsi:schemaLocation' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1'}
       end
 
       def build_merchant_account(xml)
@@ -323,8 +322,7 @@ module ActiveMerchant #:nodoc:
           'master'          => 'MC',
           'american_express'=> 'AM',
           'discover'        => 'DI',
-          'diners_club'     => 'DC',
-        }[key]
+          'diners_club'     => 'DC', }[key]
       end
 
     end

data/lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb

@@ -35,8 +35,7 @@ module ActiveMerchant #:nodoc:
            'state'      => @params['state'],
            'country'    => @params['country'],
            'zip'        => @params['zip'],
-           'phone'      => phone,
-        }
+           'phone'      => phone, }
       end
     end
   end

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

@@ -473,6 +473,7 @@ module ActiveMerchant #:nodoc:
             params[element.name.downcase.to_sym] = element.text
           end
           message = response_text_3ds(xml, params)
+          options[:authorization] = build_authorization(params)
           success = params.size > 0 && is_success_response?(params[:ds_response])
         elsif code == '0'
           op = xml.xpath('//RETORNOXML/OPERACION')

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

@@ -4,8 +4,8 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://api.securionpay.com/'
       self.live_url = 'https://api.securionpay.com/'
 
-      self.supported_countries = %w(AL AD AT BY BE BG HR CY CZ RE DK EE IS FI FR DE GI GR HU IS IE IT IL LV LI LT LU
-                                    MK MT MD MC NL NO PL PT RO RU MA RS SK SI ES SE CH UA GB KI CI ME)
+      self.supported_countries = %w(AD BE BG CH CY CZ DE DK EE ES FI FO FR GI GL GR GS GT HR HU IE IS IT LI LR LT
+                                    LU LV MC MT MU MV MW NL NO PL RO SE SI)
 
       self.default_currency = 'USD'
       self.money_format = :cents

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

@@ -177,7 +177,8 @@ module ActiveMerchant #:nodoc:
             'xmlns:soapenc' => 'http://schemas.xmlsoap.org/soap/encoding/',
             'xmlns:tns' => 'urn:Interface',
             'xmlns:types' => 'urn:Interface/encodedTypes',
-            'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'}) do
+            'xmlns:soap' => 'http://schemas.xmlsoap.org/soap/envelope/'
+        }) do
           retval.tag!('soap:Body', {'soap:encodingStyle'=>'http://schemas.xmlsoap.org/soap/encoding/'}) do
             retval.tag!("tns:#{request}") do
               retval.tag!("#{request}Request", {'xsi:type'=>"tns:#{request}Request"}) do

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

@@ -87,11 +87,8 @@ module ActiveMerchant #:nodoc:
           end
           r.process do
             post = create_post_for_auth_or_purchase(money, payment, options)
-            if emv_payment?(payment)
-              add_application_fee(post, options)
-            else
-              post[:capture] = 'false'
-            end
+            add_application_fee(post, options) if emv_payment?(payment)
+            post[:capture] = 'false'
             commit(:post, 'charges', post, options)
           end
         end.responses.last
@@ -127,14 +124,17 @@ module ActiveMerchant #:nodoc:
         post = {}
 
         if emv_tc_response = options.delete(:icc_data)
-          post[:card] = { emv_approval_data: emv_tc_response }
-          commit(:post, "charges/#{CGI.escape(authorization)}", post, options)
+          # update the charge with emv data if card present
+          update = {}
+          update[:card] = { emv_approval_data: emv_tc_response }
+          commit(:post, "charges/#{CGI.escape(authorization)}", update, options)
         else
           add_application_fee(post, options)
           add_amount(post, money, options)
           add_exchange_rate(post, options)
-          commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
         end
+
+        commit(:post, "charges/#{CGI.escape(authorization)}/capture", post, options)
       end
 
       def void(identification, options = {})

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

@@ -134,7 +134,7 @@ module ActiveMerchant #:nodoc:
           end
           commit(:post, "payment_methods/#{params[:payment_method]}/attach", { customer: customer_id }, options)
         else
-          super(payment, options)
+          super(payment_method, options)
         end
       end
 

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

@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
       def purchase(amount, payment_method, options={})
         MultiResponse.run() do |r|
           r.process { authorize(amount, payment_method, options) }
-          r.process { capture(r.authorization, options) }
+          r.process { capture(amount, r.authorization, options) }
         end
       end
 
@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
         commit('authorize', params, options)
       end
 
-      def capture(authorization, options={})
+      def capture(amount, authorization, options={})
         params = {}
         options[:id_unico] = split_authorization(authorization)[1]
         add_auth_order_id(params, authorization, options)

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

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class WorldpayGateway < Gateway
@@ -455,23 +457,28 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(action, xml)
-        parse_element({:action => action}, REXML::Document.new(xml))
+        xml = xml.strip.gsub(/\&/, '&amp;')
+        doc = Nokogiri::XML(xml, &:strict)
+        doc.remove_namespaces!
+        resp_params = {:action => action}
+
+        parse_elements(doc.root, resp_params)
+        resp_params
       end
 
-      def parse_element(raw, node)
+      def parse_elements(node, response)
         node_name = node.name.underscore
         node.attributes.each do |k, v|
-          raw["#{node_name}_#{k.underscore}".to_sym] = v
+          response["#{node_name}_#{k.underscore}".to_sym] = v.value
         end
-        if node.has_elements?
-          raw[node_name.to_sym] = true unless node.name.blank?
-          node.elements.each { |e| parse_element(raw, e) }
-        elsif node.children.count > 1
-          raw[node_name.to_sym] = node.children.join(' ').strip
+        if node.elements.empty?
+          response[node_name.to_sym] = node.text unless node.text.blank?
         else
-          raw[node_name.to_sym] = node.text unless node.text.nil?
+          response[node_name.to_sym] = true unless node.name.blank?
+          node.elements.each do |childnode|
+            parse_elements(childnode, response)
+          end
         end
-        raw
       end
 
       def headers(options)
@@ -506,6 +513,8 @@ module ActiveMerchant #:nodoc:
           :avs_result => AVSResult.new(code: AVS_CODE_MAP[raw[:avs_result_code_description]]),
           :cvv_result => CVVResult.new(CVC_CODE_MAP[raw[:cvc_result_code_description]])
         )
+      rescue Nokogiri::SyntaxError
+        unparsable_response(xml)
       rescue ActiveMerchant::ResponseError => e
         if e.response.code.to_s == '401'
           return Response.new(false, 'Invalid credentials', {}, :test => test?)
@@ -518,6 +527,12 @@ module ActiveMerchant #:nodoc:
         test? ? self.test_url : self.live_url
       end
 
+      def unparsable_response(raw_response)
+        message = 'Unparsable response received from Worldpay. Please contact Worldpay if you continue to receive this message.'
+        message += " (The raw response returned by the API was: #{raw_response.inspect})"
+        return Response.new(false, message)
+      end
+
       # Override the regular handle response so we can access the headers
       # Set-Cookie value is needed for 3DS transactions
       def handle_response(response)

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = '1.99.0'
+  VERSION = '1.100.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 1.100.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport