activemerchant 1.126.0 → 1.129.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bd1687aa128f1fce724fd39276bdb068552dc55e5dadeeab08a127781d54b31
-  data.tar.gz: 9519db6995b762487012de3fb0e47ef2f89587d26889fb6c2bbc0e1a74a88713
+  metadata.gz: 415c09ab9b38e3503d10b38cd42959b50c131f8b47237f39b36a8da7bc044d82
+  data.tar.gz: 2b2cdd2955bd0ed6e2b808cad4fa31888749ee6cbe91b2a75c563f1cc09429d6
 SHA512:
-  metadata.gz: af5c8f0f3d87e24ab864c880bde2be9374a60ebb47fdb57feafd0e80e790f585a18be65e331d07b2029c8679e1d35fb7f3baa482590da5bb4959828d5e7f5526
-  data.tar.gz: e2584e54260092929898ef7af600eecdb28d9641b7de50519eab20e1ad7929c67aada43ab93166af057e18f1f408fc9c9d45b36c010650d840b187661318f962
+  metadata.gz: 104444c88b66340a16502ae980ae4c2795f25cd8f9d3a78a05d636d55730a462d9ead8a565291774096dd3fa75149961f64ec472d2a74c7499ce6b472ec6de95
+  data.tar.gz: bc738912b2788963721d232e43cf02675cc6a672c7aca913c6bd876fd73b72fd0cd0b7d43e734dca7f5494957e9092e8054d75b788b59ef3a2ca25a917d3d949

data/CHANGELOG

@@ -3,6 +3,244 @@
 
 == HEAD
 
+== Version 1.129.0 (April 24th, 2023)
+* Adyen: Update selectedBrand mapping for Google Pay [jcreiff] #4763
+* Shift4: Add vendorReference field [jcreiff] #4762
+* Shift4: Add OAuth error [aenand] #4760
+* Stripe PI: Add billing address details to Apple Pay and Google Pay tokenization request [BritneyS] #4761
+* Make gem compatible with Ruby 3+ [pi3r] #4768
+
+== Version 1.128.0 (April 24th, 2023)
+* CheckoutV2: Add support for Shipping Address [nicolas-maalouf-cko] #4755
+* Element: Include Apple Pay - Google pay methods [jherrera] #4647
+* dLocal: Add transaction query API(s) request [almalee24] #4584
+* MercadoPago: Add transaction inquire request [molbrown] #4588
+* Worldpay: Add transaction inquire request [molbrown] #4592
+* Alelo: Adding homologation changes [heavyblade] #4590
+* Adyen: Map standard error codes for `processing_error`, `config_error`, `invalid_amount`, and `incorrect_address` [ajawadmirza] #4593
+* MerchantE: Add support for recurring transactions [naashton] #4594
+* CyberSource: Add support for `discount_management_indicator`, `purchase_tax_amount`, `installment_total_amount`, and `installment_annual_interest_rate` fields. [rachelkirk] #4595
+* Shift4: Remove `customer` from refund and `clerk` from store requests [ajawadmirza] #4596
+* TransFirst Transaction Express: Update xml prefixing to be compatible with Nokogiri 1.13.4 [dsmcclain] #4582
+* Iveri: Adding support for external MPI 3DS2 [heavyblade] #4598
+* Credorax: Pass Network Transaction ID on MIT [jherreraa] #4600
+* iVeri: Remove schema validation on Live requests [curiousepic] #4606
+* Beanstream: Adding Third Party 3DS fields [heavyblade] #4602
+* Borgun: Add support for 3DS preauth [ajawadmirza] #4603
+* Cardstream: Add third party 3ds2 support [sainterman] #4570
+* Accept both formats of Canadian routing numbers [molbrown] #4568
+* DLocal: Add support for `original_order_id` [rachelkirk] #4605
+* CheckoutV2: Add support for `merchant_initiated_transaction_id` [rachelkirk] #4611
+* CardConnect: Add stored credential & pass any valid `ecomind` field [ajawadmirza] #4609
+* Alelo: Trigger access token refresh on 404 [curiousepic] #4614
+* DLocal: Add Network Tokens [gasb150] #4608
+* Redsys: enable NTID generation with zero-value verify [jcreiff] #4615
+* IPG: Add support for passing in `store_id` on transactions [aenand] #4619
+* Adyen: Field support for Level 2 and level 3 information [sainterman] #4617
+* Add alternate alpha2 country code for Kosovo [jcreiff] #4622
+* CyberSource: Add support for several fields [rachelkirk] #4623
+* Reach: adding gateway [cristian] #4618
+* Orbital: integration improvements [molbrown] #4626
+* iVeri: add new url [almalee24] #4630
+* Payeezy: Enable Apple Pay support [naashton] #4631
+* Payeezy: Scrub Cryptogram [naashton] #4633
+* Checkout: Fix for `[:source][:stored]` in stored credentials [marioarranzr] #4629
+* Mundipagg: send authorization_secret_key on all transaction types [edgarv09] #4635
+* CommerceHub: Add new gateway [naashton] #4640
+* CyberSource: Update installment data method [rachelkirk] #4642
+* Element: fix bug with billing address email [jcreiff] #4644
+* Openpay: set URL by merchant country [edgarv09] #4637
+* Alelo: Improving credentials refresh process [heavyblade] #4616
+* Decidir: Add transaction inquire request [almalee24] #4649
+* EBANX: add soft_descriptor field [jcreiff] #4658
+* CommerceHub: Add Apple Pay and Google Pay [gasb150] #4648
+* Global Collect & Alelo: Fixing year dependent failing tests [heavyblade] #4665
+* Moneris: Add Google Pay [sinourain] #4666
+* Global Collect: Add transaction inquire request [almalee24] #4669
+* Stripe PI: Add Level 3 support [almalee24] #4673
+* Braintree: return additional processor response [jcreiff] #4653
+* Payeezy: name from `billing_address` on `purchase` [naashton] #4674
+* Stripe: add reverse_transfer to void transactions [jcreiff] #4668
+* Global Collect: fix bug on transaction inquire request [almalee24] #4676
+* Credorax: Support google pay and apple pay [edgarv09] #4661
+* Plexo: Add support for 5 new credit card brands (passcard, edenred, anda, tarjeta-d, sodexo) [edgarv09] #4652
+* Authorize.net: Google pay token support [sainterman] #4659
+* Credorax: Add support for Network Tokens [jherreraa] #4679
+* Stripe PI: use MultiResponse in create_setup_intent [jcreiff] #4683
+* Credorax: Correct NTID logic for MIT transactions [aenand] #4686
+* Adyen: Add support for `skip_mpi_data` flag [rachelkirk] #4654
+* Add Canadian Institution Numbers [jcreiff] #4687
+* Tns: update test URL [almalee24] #4698
+* TrustCommerce: Update `authorization_from` to handle `store` response [jherreraa] #4691
+* TrustCommerce: Verify feature added [jherreraa] #4692
+* Rapyd: Add customer object to transactions [javierpedrozaing] #4664
+* CybersourceRest: Add new gateway with authorize and purchase [heavyblade] #4690
+* Litle: Add prelive_url option [aenand] #4710
+* CommerceHub: Fixing verify status and prevent tokenization [heavyblade] #4716
+* Payeezy: Update Stored Credentials [almalee24] #4711
+* CheckoutV2: Add store/unstore [gasb150] #4712
+* CybersourceREST - Refund | Credit [sinourain] #4700
+* Braintree - Add Paypal custom fields [yunnydang] #4713
+* BlueSnap - Add descriptor phone number field [yunnydang] #4717
+* Braintree - Update transaction hash to include processor_authorization_code [yunnydang] #4718
+* CyberSourceRest: Add apple pay, google pay [gasb150] #4708
+* CybersourceREST - Void | Verify [sinourain] #4695
+* Credorax: Set default ECI values for token transactions [sainterman] #4693
+* CyberSourceRest: Add ACH Support [edgarv09] #4722
+* CybersourceREST: Add capture request [heavyblade] #4726
+* Paymentez: Add transaction inquire request [aenand] #4729
+* Ebanx: Add transaction inquire request [almalee24] #4725
+* Ebanx: Add support for Elo & Hipercard [almalee24] #4702
+* CheckoutV2: Add Idempotency key support [yunnydang] #4728
+* Adyen: Add support for shopper_statement field for capture [yunnydang] #4736
+* CheckoutV2: Update idempotency_key name [yunnydang] #4737
+* Payeezy: Enable external 3DS [jherreraa] #4715
+* Ebanx: Remove default email [aenand] #4747
+* CyberSourceRest: Add stored credentials support [jherreraa] #4707
+* Payeezy: Add `last_name` for `add_network_tokenization` [naashton] #4743
+* Stripe PI: Tokenize payment method at Stripe for `verify` [aenand] #4748
+* Kushki: Add support for the months and deferred fields [yunnydang] #4752
+* Borgun: Update TrCurrencyExponent for 3DS transactions with `ISK` [aenand] #4751
+* CyberSourceRest: Add gateway specific fields handling [jherreraa] #4746
+* IPG: Improve error handling [heavyblade] #4753
+* Shift4: Handle access token failed calls [heavyblade] #4745
+* Bogus: Add verify functionality [willemk] #4749
+* Litle: Update successful_from method [almalee24] #4765
+
+== Version 1.127.0 (September 20th, 2022)
+* BraintreeBlue: Add venmo profile_id [molbrown] #4512
+* Maestro: Adding missing BIN ranges [bradbroge] #4423
+* Simetrik: Fix integer and float types, update scrub method [rachelkirk] #4405
+* Credorax: Convert country codes for  `recipient_country_code` field [ajawadmirza] #4408
+* BlueSnap: Correctly parse `refund-transaction-id` [dsmcclain] #4411
+* Worldpay: Add level II and level III data [javierpedrozaing] #4393
+* Worldpay: extract `issuer_response_code` and `issuer_response_description` from gateway response [dsmcclain] #4412
+* Vantiv: Support `duplicate` field read from saleResponse.duplicate attr [mashton] #4413
+* Ogone: Add support for 3dsv2 [gasb150] #4410
+* BlueSnap: Add support for stored credentials [ajawadmirza] #4414
+* Monei: Add support for `lang` field [drkjc] #4421
+* Wompi: Redirect `refund` to `void` [drkjc] #4424
+* Rapyd: 3DS Support [naashton] #4422
+* Adyen: Update API version [jherreraa] #4418
+* Ogone: Updated home gateway URL [gasb150] #4419
+* Credorax: Update url gateway and credit cards [javierpedrozaing] #4417
+* Kushki: Pass extra_taxes with USD [therufs] #4426
+* DLocal: fix bug with `X-Idempotency-Key` header [dsmcclain] #4431
+* DLocal: Mark support for additional countries [gasb150] #4427
+* Rapyd: Additional Fields [naashton] #4434
+* Braintree: Return generated client token [BritneyS] #4416
+* Simetrik: Update `audience` field [simetrik-frank] #4433
+* CyberSource: Add bank account payment method support [heavyblade] #4428
+* Rapyd: Zero Dollar Auth [naashton] #4435
+* Rapyd: Scrub ACH [naashton] #4436
+* VisaNet Peru: Update `purchase_number` [rachelkirk] #4437
+* CardConnect:  Add support for 3ds V2 [javierpedrozaing] #4429
+* Rapyd: Support `store` and `unstore` [naashton] #4439
+* Orbital: Update API version to 9.0 [gasb150] #4440
+* Plexo:  Add `meta_data` fields and reorder amount object in response [ajawadmirza] #4441
+* Plexo:  Change field name from `meta_data` to `metadata` [ajawadmirza] #4443
+* Simetrik: Update `vat` to be in cents [simetrik-frank] #4425
+* Cybersource: Handle Amex cryptograms [heavyblade] #4445
+* Rapyd: Pass fields to `refund` and `store` [naashton] #4449
+* VPOS: Allow reuse of encryption key [therufs] #4450
+* Orbital: Add `payment_action_ind` field and refund through credit card to support tandem implementation [ajawadmirza] #4420
+* Airwallex: Send `referrer_data` on setup transactions [drkjc] #4453
+* Adyen and StripPI: Updated error messaging [mbreenlyles] #4454
+* Airwallex: Update `referrer_data` field [drkjc] #4455
+* Simetrik: Update `order_id` and `description` to be top level fields [simetrik-frank] #4451
+* Plexo: Update `ip`, `description`, and `email` fields request format and scrub method to not filter cardholder name and reference id [ajawadmirza] #4457
+* Plexo: Update `verify` implementation and add `verify_amount` field [ajawadmirza] #4462
+* Vanco: Update `purchase` to complete a purchase transaction with an existing session id [BritneyS] #4461
+* Authorize.net: Allow custom verify_amount and validate it [jherreraa] #4464
+* Shift4: Add gateway adapter [ali-hassan] #4415
+* Rapyd: Correctly add `billing_address` [naashton] #4465
+* Credorax: Update processor response messages [jcreiff] #4466
+* Shift4: add `customer_reference`, `destination_postal_code`, `product_descriptors` fields and core refactoring [ajawadmirza] #4469
+* Paypal Express: Add checkout status to response object [mbreenlyles] #4467
+* Shift4: Scrub security code [naashton] #4470
+* Shift4: Update `cardOnFile` transaction requests [ajawadmirza] #4471
+* Plexo: Update `success_from` definition [ajawadmirza] #4468
+* Rapyd: Un-nest the payment urls [naashton] #4472
+* Paypal Express: Correct naming mistake for accessor [mbreenlyles] #4473
+* GlobalCollect: Enable Google Pay and Apple Pay [gasb150] #4388
+* Shift4: $0 auth [naashton] #4474
+* CyberSource: Updatie API version to 1.198 and fix 3DS test [cristian] #4456
+* Shift4: add `store` method, `present` field in card, and to pass amount in cents [ajawadmirza] #4475
+* Shift4: add `3ds2` implementation [ajawadmirza] #4476
+* Shift4: update `success_from` definition to consider response code [ajawadmirza] #4477
+* Rapyd: Customer Object [naashton] #4478
+* Shift4: Verify Endopint Fix [naashton] #4479
+* CheckoutV2: Scrub cryptogram and credit card number [ajawadmirza] #4488
+* CheckoutV2: Add `3ds.status` field to send status of 3DS flow of all 3DS transactions [BritneyS] #4492
+* CheckoutV2: Add `challenge_indicator`, `exemption`, `authorization_type`, `processing_channel_id`, and `capture_type` fields [ajawadmirza] #4482
+* Add `mada` card type and associated BINs; add support for `mada` in CheckoutV2 gateway [dsmcclain] #4486
+* Authorize.net: Refactor custom verify amount handling [jherreraa] #4485
+* EBANX:  Change amount for Colombia [flaaviaa] #4481
+* Worldpay: Update `required_status_message` and `message_from` methods for response. [rachelkirk] #4493
+* CheckoutV2: Add support for transactions through OAuth [ajawadmirza] #4483
+* Vanco: Update unit test to remove remote call to gateway [ajawadmirza] #4497
+* Shift4: remove support for 3ds2 [ajawadmirza] #4503
+* Rapyd: Add support for stored credential [ajawadmirza] #4487
+* MerchantE: Update `store` and add `verify` method [ajawadmirza] #4507
+* Shift4: Add default `numericId`, add `InterfaceVersion`, `InterfaceName`, and `CompanyName` header fields, change date time format and allow merchant time zone [ajawadmirza] #4509
+* BraintreeBlue: Add support for partial capture [aenand] #4515
+* Rapyd: Change key name to `network_transaction_id` [ajawadmirza] #4514
+* CyberSource: Handle unsupported Network Token brands [heavyblade] #4500
+* Ingenico(Global Collect): Add support for `payment_product_id` [rachelkirk] #4521
+* Adyen: Add network transaction id to store call [jcreiff] #4522
+* Worldpay: Add machine cookie to subsequent calls during 3DS challenge [mbreenlyles] #4513*
+* Shift4: Scrub `securityCode` fix [naashton] #4524
+* Credorax: Update `OpCode` for credit transactions [dsmcclain] #4279
+* CheckoutV2: Add `credit` method [ajawadmirza] #4490
+* Stripe Payment Intents: Add `options` for retrieve_setup_intent [aenand] #4529
+* CheckoutV2: Send payment id via `incremental_authorization` field [ajawadmirza] #4518
+* Shift4: Add card `present` field, use previous transaction authorization for capture, and hardcode header values [ajawadmirza] #4528
+* Orbital: Remove `DPANInd` field for RC transactions [ajawadmirza] #4502
+* EBANX: Add Spreedly tag to payment body [flaaviaa] #4527
+* Shift4: Add `expiration_date` field for refund transactions [ajawadmirza] #4532
+* Improve handling of AVS and CVV Results in Multiresponses [gasb150] #4516
+* Airwallex: Add `skip_3ds` field for create payment transactions [ajawadmirza] #4534
+* Shift4: Typo correction for `initial_transaction` [ajawadmirza] #4537
+* Rapyd: Pass Customer ID and fix `add_token` method [naashton] #4538
+* Shift4: If no timezone is sent on transactions, the code uses the hours and minutes as a timezone offset [ali-hassan] #4536
+* Priority: Add support for general credit and updating cvv and zip [priorityspreedly] #4517
+* Worldpay: Update actions for generated message in `required_status_message` method [rachelkirk] #4530
+* Adyen: Modify handling of countryCode for ACH [jcreiff] #4543
+* CardConnect: update api end-point urls [heavyblade] #4541
+* Vantiv(Litle): Add support for `fraudFilterOverride` field [rachelkirk] #4544
+* Stripe: Add shipping address [jcreiff] #4539
+* PayuLatam: Add extra1, extra2, extra3 fields [jcreiff] #4550
+* Paysafe: Add fundingTransaction object [jcreiff] #4552
+* MerchantE: Add tests for `moto_ecommerce_ind` field [ajawadmirza] #4554
+* Plexo: Update `purchase` method, add flags for header fields, add new fields `billing_address`, `identification_type`, `identification_value`, and `cardholder_birthdate` [ajawadmirza] #4540
+* Rapyd: Remove `BR`, `MX`, and `US` from supported countries [ajawadmirza] #4558
+* Stripe Payment Intents: fix bug with billing address email [jcreiff] #4556
+* Shift4: Add customer to `purchase` & `store` and remove transaction from `store` [ajawadmirza] #4557
+* MerchantE: only add `moto_commerce_ind` to request if it is present [ajawadmirza] #4560
+* Add BpPlus card type along with custom validation logic [dsmcclain] #4559
+* PayTrace: Support ACH implementation for new endpoints and request body [ajawadmirza] #4545
+* Rapyd: No force capture for ACH [naashton] #4562
+* Shift4: Applied checks on Shift4 Time/Timezone offset [ali-hassan] #4561
+* Alelo: Add gateway [heavyblade] #4555
+* Wompi: Allow partial refund amount on void_sync [jcreiff] #4535
+* Shift4: Timezone Offset [naashton] #4566
+* MerchantE: `recurring_pmt_num` and `recurring_pmt_count` fields [ali-hassan] #4553
+* Orbital: Add South African Rand to supported currencies [molbrown] #4569
+* Orbital: Fix CardSecValInd [molbrown] #4563
+* Shift4: Add `usage_indicator`, `indicator`, `scheduled_indicator`, and `transaction_id` fields [ajawadmirza] #4564
+* Shift4: Retrieve `access_token` once [naashton] #4572
+* Redsys: Update Base64 encryption handling for secret key [jcreiff] #4565
+* Shift4: refuse `postalCode` when its null [ajawadmirza] #4574
+* Plexo: Update param key to `refund_type` [ajawadmirza] #4575
+* Shift4: Update request params for `verify`, `capture`, and `refund` [ajawadmirza] #4577
+* CyberSource: Add support for `sec_code` [rachelkirk] #4581
+* BraintreeBlue: Correctly vault payment method token for PayPal Checkout with Vault [almalee24] #4579
+* BpPlus: Allow spaces in card number [ajawadmirza] #4585
+* Shift4: Decline referral transactions and parse message for internal server errors [ajawadmirza] #4583
+* Litle: Update homepage_url [gasb150] #4491
+* Priority: Update credential handling [therufs] #4571
+* Shift4: Fix authorization and remove `entryMode` from verify and store transactions [ajawadmirza] #4589
+
 == Version 1.126.0 (April 15th, 2022)
 * Moneris: Add 3DS MPI field support [esmitperez] #4373
 * StripePI: Add ability to change payment_method_type to confirm_intent [aenand] #4300
@@ -75,6 +313,9 @@
 * Multiple Gateways: Resolve when/case bug [naashton] #4399
 * Airwallex: Add 3DS MPI support [drkjc] #4395
 * Add Cartes Bancaires card bin ranges [leahriffell] #4398
+* Airwallex: Add support for `original_transaction_id` field [drkjc] #4401
+* Securion Pay: Pass external 3DS data [jherreraa] #4404
+* Airwallex: Update Stored Credentials testing, remove support for `original_transaction_id` field [drkjc] 4407
 
 == Version 1.125.0 (January 20, 2022)
 * Wompi: support gateway [therufs] #4173

data/lib/active_merchant/billing/check.rb

@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
         309 310 315 320 338 340 509 540 608 614 623 809 815 819 828 829 837 839
         865 879 889 899 241 242 248 250 265 275 277 290 294 301 303 307 311 314
         321 323 327 328 330 332 334 335 342 343 346 352 355 361 362 366 370 372
-        376 378 807 853 890
+        376 378 807 853 890 618 842
       )
 
       def name
@@ -60,20 +60,52 @@ module ActiveMerchant #:nodoc:
         false
       end
 
+      def valid_routing_number?
+        digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
+        case digits.size
+        when 9
+          return checksum(digits) == 0 || CAN_INSTITUTION_NUMBERS.include?(routing_number[1..3])
+        when 8
+          return CAN_INSTITUTION_NUMBERS.include?(routing_number[5..7])
+        end
+
+        false
+      end
+
       # Routing numbers may be validated by calculating a checksum and dividing it by 10. The
       # formula is:
       #   (3(d1 + d4 + d7) + 7(d2 + d5 + d8) + 1(d3 + d6 + d9))mod 10 = 0
       # See http://en.wikipedia.org/wiki/Routing_transit_number#Internal_checksums
-      def valid_routing_number?
+      def checksum(digits)
+        ((3 * (digits[0] + digits[3] + digits[6])) +
+        (7 * (digits[1] + digits[4] + digits[7])) +
+        (digits[2] + digits[5] + digits[8])) % 10
+      end
+
+      # Always return MICR-formatted routing number for Canadian routing numbers, US routing numbers unchanged
+      def micr_format_routing_number
         digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
-        if digits.size == 9
-          checksum = ((3 * (digits[0] + digits[3] + digits[6])) +
-            (7 * (digits[1] + digits[4] + digits[7])) +
-            (digits[2] + digits[5] + digits[8])) % 10
+        case digits.size
+        when 9
+          if checksum(digits) == 0
+            return routing_number
+          else
+            return routing_number[4..8] + routing_number[1..3]
+          end
+        when 8
+          return routing_number
+        end
+      end
 
-          return checksum == 0 || CAN_INSTITUTION_NUMBERS.include?(routing_number[1..3])
+      # Always return electronic-formatted routing number for Canadian routing numbers, US routing numbers unchanged
+      def electronic_format_routing_number
+        digits = routing_number.to_s.split('').map(&:to_i).select { |d| (0..9).cover?(d) }
+        case digits.size
+        when 9
+          return routing_number
+        when 8
+          return '0' + routing_number[5..7] + routing_number[0..4]
         end
-        false
       end
     end
   end

data/lib/active_merchant/billing/credit_card.rb

@@ -32,6 +32,12 @@ module ActiveMerchant #:nodoc:
     # * Olimpica
     # * Creditel
     # * Confiable
+    # * Mada
+    # * BpPlus
+    # * Passcard
+    # * Edenred
+    # * Anda
+    # * Creditos directos (Tarjeta D)
     #
     # 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
@@ -61,6 +67,8 @@ module ActiveMerchant #:nodoc:
     class CreditCard < Model
       include CreditCardMethods
 
+      BRANDS_WITH_SPACES_IN_NUMBER = %w(bp_plus)
+
       class << self
         # Inherited, but can be overridden w/o changing parent's value
         attr_accessor :require_verification_value
@@ -76,7 +84,7 @@ module ActiveMerchant #:nodoc:
       attr_reader :number
 
       def number=(value)
-        @number = (empty?(value) ? value : value.to_s.gsub(/[^\d]/, ''))
+        @number = (empty?(value) ? value : filter_number(value))
       end
 
       # Returns or sets the expiry month for the card.
@@ -116,6 +124,12 @@ module ActiveMerchant #:nodoc:
       # * +'olimpica'+
       # * +'creditel'+
       # * +'confiable'+
+      # * +'mada'+
+      # * +'bp_plus'+
+      # * +'passcard'+
+      # * +'edenred'+
+      # * +'anda'+
+      # * +'tarjeta-d'+
       #
       # Or, if you wish to test your implementation, +'bogus'+.
       #
@@ -337,8 +351,21 @@ module ActiveMerchant #:nodoc:
         icc_data.present?
       end
 
+      def allow_spaces_in_card?(number = nil)
+        BRANDS_WITH_SPACES_IN_NUMBER.include?(self.class.brand?(self.number || number))
+      end
+
       private
 
+      def filter_number(value)
+        regex = if allow_spaces_in_card?(value)
+                  /[^\d ]/
+                else
+                  /[^\d]/
+                end
+        value.to_s.gsub(regex, '')
+      end
+
       def validate_essential_attributes #:nodoc:
         errors = []
 

data/lib/active_merchant/billing/credit_card_methods.rb

@@ -8,6 +8,7 @@ module ActiveMerchant #:nodoc:
         'visa'               => ->(num) { num =~ /^4\d{12}(\d{3})?(\d{3})?$/ },
         'master'             => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), MASTERCARD_RANGES) },
         'elo'                => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), ELO_RANGES) },
+        'cabal'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 8), CABAL_RANGES) },
         'alelo'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), ALELO_RANGES) },
         'discover'           => ->(num) { num =~ /^(6011|65\d{2}|64[4-9]\d)\d{12,15}$/ },
         'american_express'   => ->(num) { num =~ /^3[47]\d{13}$/ },
@@ -23,10 +24,9 @@ module ActiveMerchant #:nodoc:
         },
         'maestro_no_luhn'    => ->(num) { num =~ /^(501080|501081|501082)\d{6,13}$/ },
         'forbrugsforeningen' => ->(num) { num =~ /^600722\d{10}$/ },
-        'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818)\d{10}$/ },
+        'sodexo'             => ->(num) { num =~ /^(606071|603389|606070|606069|606068|600818|505864|505865)\d{10}$/ },
         'alia'               => ->(num) { num =~ /^(504997|505878|601030|601073|505874)\d{10}$/ },
         'vr'                 => ->(num) { num =~ /^(627416|637036)\d{10}$/ },
-        'cabal'              => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 8), CABAL_RANGES) },
         'unionpay'           => ->(num) { (16..19).cover?(num&.size) && in_bin_range?(num.slice(0, 8), UNIONPAY_RANGES) },
         'carnet'             => lambda { |num|
           num&.size == 16 && (
@@ -39,9 +39,18 @@ module ActiveMerchant #:nodoc:
         'creditel' => ->(num) { num =~ /^601933\d{10}$/ },
         'confiable' => ->(num) { num =~ /^560718\d{10}$/ },
         'synchrony' => ->(num) { num =~ /^700600\d{10}$/ },
-        'routex' => ->(num) { num =~ /^(700676|700678)\d{13}$/ }
+        'routex' => ->(num) { num =~ /^(700676|700678)\d{13}$/ },
+        'mada' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), MADA_RANGES) },
+        'bp_plus' => ->(num) { num =~ /^(7050\d\s\d{9}\s\d{3}$|705\d\s\d{8}\s\d{5}$)/ },
+        'passcard' => ->(num) { num =~ /^628026\d{10}$/ },
+        'edenred' => ->(num) { num =~ /^637483\d{10}$/ },
+        'anda' => ->(num) { num =~ /^603199\d{10}$/ },
+        'tarjeta-d' => ->(num) { num =~ /^601828\d{10}$/ },
+        'hipercard' => ->(num) { num&.size == 16 && in_bin_range?(num.slice(0, 6), HIPERCARD_RANGES) }
       }
 
+      SODEXO_NO_LUHN = ->(num) { num =~ /^(505864|505865)\d{10}$/ }
+
       # http://www.barclaycard.co.uk/business/files/bin_rules.pdf
       ELECTRON_RANGES = [
         [400115],
@@ -101,8 +110,8 @@ module ActiveMerchant #:nodoc:
         %w[ 500057
             501018 501043 501045 501047 501049 501051 501072 501075 501083 501087 501089 501095
             501500
-            501879 502113 502301 503175
-            503645 503670
+            501879 502113 502120 502121 502301
+            503175 503337 503645 503670
             504310 504338 504363 504533 504587 504620 504639 504656 504738 504781 504910
             507001 507002 507004 507082 507090
             560014 560565 561033
@@ -113,7 +122,7 @@ module ActiveMerchant #:nodoc:
             585274 585697
             586509
             588729 588792
-            589244 589407 589471 589605 589633 589647 589671
+            589244 589407 589471 589605 589633 589647 589671 589916
             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
@@ -124,12 +133,16 @@ module ActiveMerchant #:nodoc:
             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 601638
+            601070 601452 601628 601638
+            602648
+            603326 603450 603689
             604983
             606126
-            636380 636422 636502 636639
-            637046 637756
-            639130 639229
+            608710
+            627339 627453 627454 627973
+            636117 636380 636422 636502 636639
+            637046 637529 637568 637600 637756
+            639130 639229 639350
             690032]
       )
 
@@ -181,10 +194,10 @@ module ActiveMerchant #:nodoc:
         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
+        627780..627780, 636297..636298, 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.
@@ -204,7 +217,15 @@ module ActiveMerchant #:nodoc:
       CABAL_RANGES = [
         60420100..60440099,
         58965700..58965799,
-        60352200..60352299
+        60352200..60352299,
+        65027200..65027299,
+        65008700..65008700
+      ]
+
+      MADA_RANGES = [
+        504300..504300, 506968..506968, 508160..508160, 585265..585265, 588848..588848,
+        588850..588850, 588982..588983, 589005..589005, 589206..589206, 604906..604906,
+        605141..605141, 636120..636120, 968201..968209, 968211..968211
       ]
 
       NARANJA_RANGES = [
@@ -221,6 +242,11 @@ module ActiveMerchant #:nodoc:
         3528..3589, 3088..3094, 3096..3102, 3112..3120, 3158..3159, 3337..3349
       ]
 
+      HIPERCARD_RANGES = [
+        384100..384100, 384140..384140, 384160..384160, 606282..606282, 637095..637095,
+        637568..637568, 637599..637599, 637609..637609, 637612..637612
+      ]
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -295,7 +321,7 @@ module ActiveMerchant #:nodoc:
         def valid_number?(number)
           valid_test_mode_card_number?(number) ||
             valid_card_number_length?(number) &&
-              valid_card_number_characters?(number) &&
+              valid_card_number_characters?(brand?(number), number) &&
               valid_by_algorithm?(brand?(number), number)
         end
 
@@ -362,8 +388,9 @@ module ActiveMerchant #:nodoc:
           number.length >= 12
         end
 
-        def valid_card_number_characters?(number) #:nodoc:
+        def valid_card_number_characters?(brand, number) #:nodoc:
           return false if number.nil?
+          return number =~ /\A[0-9 ]+\Z/ if brand == 'bp_plus'
 
           !number.match(/\D/)
         end
@@ -373,20 +400,28 @@ module ActiveMerchant #:nodoc:
             %w[1 2 3 success failure error].include?(number)
         end
 
+        def sodexo_no_luhn?(numbers)
+          SODEXO_NO_LUHN.call(numbers)
+        end
+
         def valid_by_algorithm?(brand, numbers) #:nodoc:
           case brand
           when 'naranja'
             valid_naranja_algo?(numbers)
           when 'creditel'
             valid_creditel_algo?(numbers)
-          when 'alia', 'confiable', 'maestro_no_luhn'
+          when 'alia', 'confiable', 'maestro_no_luhn', 'anda', 'tarjeta-d', 'hipercard'
             true
+          when 'sodexo'
+            sodexo_no_luhn?(numbers) ? true : valid_luhn?(numbers)
+          when 'bp_plus', 'passcard', 'edenred'
+            valid_luhn_non_zero_check_digit?(numbers)
           else
             valid_luhn?(numbers)
           end
         end
 
-        ODD_LUHN_VALUE = {
+        BYTES_TO_DIGITS = {
           48 => 0,
           49 => 1,
           50 => 2,
@@ -400,7 +435,7 @@ module ActiveMerchant #:nodoc:
           nil => 0
         }.freeze
 
-        EVEN_LUHN_VALUE = {
+        BYTES_TO_DIGITS_DOUBLED = {
           48 => 0, # 0 * 2
           49 => 2, # 1 * 2
           50 => 4, # 2 * 2
@@ -420,19 +455,40 @@ module ActiveMerchant #:nodoc:
           sum = 0
 
           odd = true
-          numbers.reverse.bytes.each do |number|
+          numbers.reverse.bytes.each do |bytes|
             if odd
               odd = false
-              sum += ODD_LUHN_VALUE[number]
+              sum += BYTES_TO_DIGITS[bytes]
             else
               odd = true
-              sum += EVEN_LUHN_VALUE[number]
+              sum += BYTES_TO_DIGITS_DOUBLED[bytes]
             end
           end
 
           sum % 10 == 0
         end
 
+        def valid_luhn_with_check_digit?(numbers, check_digit)
+          sum = 0
+
+          doubler = true
+
+          numbers.reverse.bytes.each do |bytes|
+            doubler ? sum += BYTES_TO_DIGITS_DOUBLED[bytes] : sum += BYTES_TO_DIGITS[bytes]
+            doubler = !doubler
+          end
+
+          (10 - (sum % 10)) % 10 == check_digit.to_i
+        end
+
+        def valid_luhn_non_zero_check_digit?(numbers)
+          return valid_luhn?(numbers.delete(' ')) if numbers[5] == ' '
+
+          check_digit = numbers[-1]
+          luhn_payload = numbers.delete(' ').chop
+          valid_luhn_with_check_digit?(luhn_payload, check_digit)
+        end
+
         # 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)