activemerchant 1.73.0 → 1.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82e5954024edb63baed3b663bb1dee80db73f320
-  data.tar.gz: 8c6113aa891504bd482096bcd1f0de9f0d44209a
+  metadata.gz: 9058f19bf43858097b6bbd6a911b01a62aafa568
+  data.tar.gz: 5fc5302b4559796e838bc675a5b03ce61c42aa11
 SHA512:
-  metadata.gz: b7bb0c7735d7e7f1d2b12952e13c22a770704a9c468f2d4c0f0c155f284b4d9565833276eb93fbeea4ff15539d41e5987f0dda381198787a13920c0857cd868a
-  data.tar.gz: 6cb69f41e85f93e904ed140e54c0739eda87cbaf0b550506ac9dee21b1bc96b599ef4b417e06f23cffeff7a085a4e373283f70a346e713a62c882b8d21e1a7d3
+  metadata.gz: 792627ab57f85f7d6036a94ad5192e4fa0bc266154bde86f9a0f643ec35a8637c874749a758ff55c34b6069476829fc62b1df17ba59ae749a0e204545e88e503
+  data.tar.gz: 9c382d5af0c5c9794c1091b5706c264fd2317b84ea5a9cc6940f599b7981d45d012692f9af77ab5fc8e342035c8340acfbcd6f49cbc10ada944d2c4019bd7dd6

data/CHANGELOG

@@ -2,6 +2,27 @@
 
 == HEAD
 
+== Version 1.74.0 (October 24, 2017)
+* Adyen: Update list of supported countries [dtykocki] #2600
+* Authorize.net CIM: Handle multiple error messages [amandapuff] #2537
+* Barclaycard Smartpay: Pass street and house_number fields, in addition to standard address [deedeelavinder] #2603
+* Barclaycard Smartpay: Use authorization pspReference for refunds [davidsantoso] #2599
+* Beanstream: Pass email fields without address [curiousepic] #2615
+* Beanstream: Support recurringPayment for auth, capture, and purchase transactions [dtykocki] #2617
+* Borgun: Add support for USD transactions [dtykocki] #2602
+* Borgun: Include currency code from split authorization for voids [dtykocki] #2605
+* Checkout V2: Expose AVS and CVV results for purchases [dtykocki] #2619
+* Credorax: Update response codes [curiousepic] #2595
+* CyberSource: Support 3DSecure requests [curiousepic] #2624
+* Ebanx: Pass person_type and name for stored cards [curiousepic] #2621
+* Ebanx: Support Store and person_type option [curiousepic] #2604
+* Elavon: Update endpoint URLs [curiousepic] #2608
+* Netbanx: Fix basic auth by sending the account_number and api_key [anotherjosmith] #2616
+* Payeezy: Adds support for store [deedeelavinder] #2591
+* PayU Latam: Set payment_country gateway attribute [curiousepic] #2611
+* Redsys: Support the DKK currency type [bpollack] #2618
+* WePay: Only send ip and device for non-recurring transactions [dtykocki] #2597
+
 == Version 1.73.0 (September 28, 2017)
 * Adyen: Use original authorization pspReference on Refunds [lyverovski] #2589
 * Braintree Blue: Explicitly require braintree-ruby version 2.78 [anotherjosmith]
@@ -1777,7 +1798,7 @@ value [jduff]
 * Support default Return class for all Integrations that don't use returns [Soleone]
 * Add support for passing additional options when creating a Notification to all Integrations [Soleone]
 * Update BraintreeBlue#refund to have consistent method signature [Jonathan Rudenberg]
-* Add rails/init.rb for gem campatability in Rails [Rūdolfs Ošiņš]
+* Add rails/init.rb for gem campatability in Rails [R?dolfs O?i??]
 * Fix Paypal Express response parser [Jonathan Rudenberg]
 * Braintree/Transax: Add tax field [wisq]
 
@@ -2093,7 +2114,7 @@ value [jduff]
 * Update Secure Pay Au to meet specs for MessageInfo elements [cody]
 * Add support for the Australian Secure Pay payment gateway [cody]
 * Allow LinkPoint cancellations for recurring billing. [yanagimoto.shin]
-* Add support for Åland Islands to the country list [cody]
+* Add support for ?land Islands to the country list [cody]
 
 == Version 1.3.1 (January 28, 2008)
 

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://pal-test.adyen.com/pal/servlet/Payment/v18'
       self.live_url = 'https://pal-live.adyen.com/pal/servlet/Payment/v18'
 
-      self.supported_countries = ['AD','AE','AF','AG','AI','AL','AM','AO','AQ','AR','AS','AT','AU','AW','AX','AZ','BA','BB','BD','BE','BF','BG','BH','BI','BJ','BL','BM','BN','BO','BQ','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','SS','ST','SV','SX','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']
+      self.supported_countries = ['AT','AU','BE','BG','BR','CH','CY','CZ','DE','DK','EE','ES','FI','FR','GB','GI','GR','HK','HU','IE','IS','IT','LI','LT','LU','LV','MC','MT','MX','NL','NO','PL','PT','RO','SE','SG','SK','SI','US']
       self.default_currency = 'USD'
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb, :dankort, :maestro,  :discover]
 

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

@@ -858,7 +858,9 @@ module ActiveMerchant #:nodoc:
 
         response_params = parse(action, xml)
 
-        message = response_params['messages']['message']['text']
+        message_element= response_params["messages"]["message"]
+        first_error = message_element.is_a?(Array) ? message_element.first : message_element
+        message = first_error['text']
         test_mode = @options[:test_requests] || message =~ /Test Mode/
         success = response_params['messages']['result_code'] == 'Ok'
         response_params['direct_response'] = parse_direct_response(response_params['direct_response']) if response_params['direct_response']
@@ -867,7 +869,7 @@ module ActiveMerchant #:nodoc:
         response_options = {}
         response_options[:test] = test_mode
         response_options[:authorization] = transaction_id || response_params['customer_profile_id'] || (response_params['profile'] ? response_params['profile']['customer_profile_id'] : nil)
-        response_options[:error_code] = response_params['messages']['message']['code'] unless success
+        response_options[:error_code] = first_error['code'] unless success
 
         Response.new(success, message, response_params, response_options)
       end

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

@@ -33,15 +33,8 @@ module ActiveMerchant #:nodoc:
         post = payment_request(money, options)
         post[:amount] = amount_hash(money, options[:currency])
         post[:card] = credit_card_hash(creditcard)
-
-        if address = (options[:billing_address] || options[:address])
-          post[:billingAddress] = address_hash(address)
-        end
-
-        if options[:shipping_address]
-          post[:deliveryAddress] = address_hash(options[:shipping_address])
-        end
-
+        post[:billingAddress] = billing_address_hash(options) if options[:billing_address]
+        post[:deliveryAddress] = shipping_address_hash(options) if options[:shipping_address]
         commit('authorise', post)
       end
 
@@ -139,7 +132,7 @@ module ActiveMerchant #:nodoc:
           response,
           test: test?,
           avs_result: AVSResult.new(:code => parse_avs_code(response)),
-          authorization: response['recurringDetailReference'] || response['pspReference']
+          authorization: response['recurringDetailReference'] || authorization_from(post, response)
         )
 
       rescue ResponseError => e
@@ -158,6 +151,13 @@ module ActiveMerchant #:nodoc:
         raise
       end
 
+      def authorization_from(parameters, response)
+        authorization = [parameters[:originalReference], response['pspReference']].compact
+
+        return nil if authorization.empty?
+        return authorization.join("#")
+      end
+
       def parse_avs_code(response)
         AVS_MAPPING[response["avsResult"][0..1].strip] if response["avsResult"]
       end
@@ -223,17 +223,41 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def address_hash(address)
-        full_address = "#{address[:address1]} #{address[:address2]}" if address
-        street = address[:street] if address[:street]
-        house = address[:houseNumberOrName] ? address[:houseNumberOrName] : full_address.split(/\s+/).keep_if { |x| x =~ /\d/ }.join(' ')
+      def billing_address_hash(options)
+        address = options[:address] || options[:billing_address] if options[:address] || options[:billing_address]
+        street = options[:street] || parse_street(address)
+        house = options[:house_number] || parse_house_number(address)
+
+        create_address_hash(address, house, street)
+      end
+
+      def shipping_address_hash(options)
+        address = options[:shipping_address]
+        street = options[:shipping_street] || parse_street(address)
+        house = options[:shipping_house_number] || parse_house_number(address)
 
+        create_address_hash(address, house, street)
+      end
+
+      def parse_street(address)
+        address_to_parse = "#{address[:address1]} #{address[:address2]}"
+        street = address[:street] || address_to_parse.split(/\s+/).keep_if { |x| x !~ /\d/ }.join(' ')
+        street.empty? ? "Not Provided" : street
+      end
+
+      def parse_house_number(address)
+        address_to_parse = "#{address[:address1]} #{address[:address2]}"
+        house = address[:houseNumberOrName] || address_to_parse.split(/\s+/).keep_if { |x| x =~ /\d/ }.join(' ')
+        house.empty? ? "Not Provided" : house
+      end
+
+      def create_address_hash(address, house, street)
         hash = {}
+        hash[:houseNumberOrName] = house
+        hash[:street]            = street
         hash[:city]              = address[:city] if address[:city]
-        hash[:street]            = street || full_address.split(/\s+/).keep_if { |x| x !~ /\d/ }.join(' ')
-        hash[:houseNumberOrName] = house.empty? ? "Not Provided" : house
-        hash[:postalCode]        = address[:zip] if address[:zip]
         hash[:stateOrProvince]   = address[:state] if address[:state]
+        hash[:postalCode]        = address[:zip] if address[:zip]
         hash[:country]           = address[:country] if address[:country]
         hash
       end
@@ -259,10 +283,14 @@ module ActiveMerchant #:nodoc:
       def modification_request(reference, options)
         hash = {}
         hash[:merchantAccount]    = @options[:merchant]
-        hash[:originalReference]  = reference if reference
+        hash[:originalReference]  = psp_reference_from(reference)
         hash.keep_if { |_, v| v }
       end
 
+      def psp_reference_from(authorization)
+        authorization.nil? ? nil : authorization.split("#").first
+      end
+
       def payment_request(money, options)
         hash = {}
         hash[:merchantAccount]  = @options[:merchant]

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

@@ -75,6 +75,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_transaction_type(post, :authorization)
         add_customer_ip(post, options)
+        add_recurring_payment(post, options)
         commit(post)
       end
 
@@ -86,6 +87,7 @@ module ActiveMerchant #:nodoc:
         add_address(post, options)
         add_transaction_type(post, purchase_action(source))
         add_customer_ip(post, options)
+        add_recurring_payment(post, options)
         commit(post)
       end
 

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -138,7 +138,7 @@ module ActiveMerchant #:nodoc:
 
         # The homepage URL of the gateway
         base.homepage_url = 'http://www.beanstream.com/'
-        base.live_url = 'https://www.beanstream.com/scripts/process_transaction.asp'
+        base.live_url = 'https://api.na.bambora.com/scripts/process_transaction.asp'
 
         # The name of the gateway
         base.display_name = 'Beanstream.com'
@@ -161,6 +161,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money)
         add_reference(post, reference)
         add_transaction_type(post, :capture)
+        add_recurring_payment(post, options)
         commit(post)
       end
 
@@ -221,11 +222,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_address(post, options)
+        post[:ordEmailAddress]  = options[:email] if options[:email]
+        post[:shipEmailAddress] = options[:shipping_email] || options[:email] if options[:email]
+
         prepare_address_for_non_american_countries(options)
 
         if billing_address = options[:billing_address] || options[:address]
           post[:ordName]          = billing_address[:name]
-          post[:ordEmailAddress]  = options[:email]
           post[:ordPhoneNumber]   = billing_address[:phone]
           post[:ordAddress1]      = billing_address[:address1]
           post[:ordAddress2]      = billing_address[:address2]
@@ -234,9 +237,9 @@ module ActiveMerchant #:nodoc:
           post[:ordPostalCode]    = billing_address[:zip]
           post[:ordCountry]       = billing_address[:country]
         end
+
         if shipping_address = options[:shipping_address]
           post[:shipName]         = shipping_address[:name]
-          post[:shipEmailAddress] = options[:email]
           post[:shipPhoneNumber]  = shipping_address[:phone]
           post[:shipAddress1]     = shipping_address[:address1]
           post[:shipAddress2]     = shipping_address[:address2]
@@ -263,6 +266,10 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_recurring_payment(post, options)
+        post[:recurringPayment] = true if options[:recurring].to_s == 'true'
+      end
+
       def add_invoice(post, options)
         post[:trnOrderNumber]   = options[:order_id]
         post[:trnComments]      = options[:description]
@@ -465,4 +472,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-

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

@@ -26,7 +26,6 @@ module ActiveMerchant #:nodoc:
         post[:TransType] = '1'
         add_invoice(post, money, options)
         add_payment_method(post, payment)
-
         commit('sale', post)
       end
 
@@ -35,7 +34,6 @@ module ActiveMerchant #:nodoc:
         post[:TransType] = '5'
         add_invoice(post, money, options)
         add_payment_method(post, payment)
-
         commit('authonly', post)
       end
 
@@ -57,9 +55,10 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options={})
         post = {}
-        # TransType and TrAmount must match original values from auth or purchase.
-        _, _, _, _, _, transtype, tramount = split_authorization(authorization)
+        # TransType, TrAmount, and currency must match original values from auth or purchase.
+        _, _, _, _, _, transtype, tramount, currency = split_authorization(authorization)
         post[:TransType] = transtype
+        options[:currency] = options[:currency] || CURRENCY_CODES.key(currency)
         add_invoice(post, tramount.to_i, options)
         add_reference(post, authorization)
         commit('void', post)
@@ -80,6 +79,7 @@ module ActiveMerchant #:nodoc:
       CURRENCY_CODES = Hash.new{|h,k| raise ArgumentError.new("Unsupported currency for HDFC: #{k}")}
       CURRENCY_CODES["ISK"] = "352"
       CURRENCY_CODES["EUR"] = "978"
+      CURRENCY_CODES["USD"] = "840"
 
       def add_invoice(post, money, options)
         post[:TrAmount] = amount(money)
@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, authorization)
-        dateandtime, batch, transaction, rrn, authcode, _, _ = split_authorization(authorization)
+        dateandtime, batch, transaction, rrn, authcode, _, _, _ = split_authorization(authorization)
         post[:DateAndTime] = dateandtime
         post[:Batch] = batch
         post[:Transaction] = transaction
@@ -166,13 +166,14 @@ module ActiveMerchant #:nodoc:
           response[:rrn],
           response[:authcode],
           response[:transtype],
-          response[:tramount]
+          response[:tramount],
+          response[:trcurrency]
         ].join("|")
       end
 
       def split_authorization(authorization)
-        dateandtime, batch, transaction, rrn, authcode, transtype, tramount = authorization.split("|")
-        [dateandtime, batch, transaction, rrn, authcode, transtype, tramount]
+        dateandtime, batch, transaction, rrn, authcode, transtype, tramount, currency = authorization.split("|")
+        [dateandtime, batch, transaction, rrn, authcode, transtype, tramount, currency]
       end
 
       def headers

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

@@ -17,10 +17,24 @@ module ActiveMerchant #:nodoc:
       end
 
       def purchase(amount, payment_method, options={})
-        MultiResponse.run do |r|
+        multi = MultiResponse.run do |r|
           r.process { authorize(amount, payment_method, options) }
           r.process { capture(amount, r.authorization, options) }
         end
+
+        merged_params = multi.responses.map { |r| r.params }.reduce({}, :merge)
+        succeeded = success_from(merged_params)
+
+        Response.new(
+          succeeded,
+          message_from(succeeded, merged_params),
+          merged_params,
+          authorization: authorization_from(merged_params),
+          avs_result: avs_result(:purchase, succeeded, merged_params),
+          cvv_result: cvv_result(:purchase, succeeded, merged_params),
+          error_code: error_code_from(succeeded, merged_params),
+          test: test?
+        )
       end
 
       def authorize(amount, payment_method, options={})
@@ -98,8 +112,8 @@ module ActiveMerchant #:nodoc:
         address = options[:billing_address]
         if(address && post[:card])
           post[:card][:billingDetails] = {}
-          post[:card][:billingDetails][:address1] = address[:address1]
-          post[:card][:billingDetails][:address2] = address[:address2]
+          post[:card][:billingDetails][:addressLine1] = address[:address1]
+          post[:card][:billingDetails][:addressLine2] = address[:address2]
           post[:card][:billingDetails][:city] = address[:city]
           post[:card][:billingDetails][:state] = address[:state]
           post[:card][:billingDetails][:country] = address[:country]
@@ -125,8 +139,8 @@ module ActiveMerchant #:nodoc:
           authorization: authorization_from(response),
           error_code: error_code_from(succeeded, response),
           test: test?,
-          avs_result: avs_result(action, response),
-          cvv_result: cvv_result(action, response))
+          avs_result: avs_result(action, succeeded, response),
+          cvv_result: cvv_result(action, succeeded, response))
       end
 
       def headers
@@ -148,12 +162,20 @@ module ActiveMerchant #:nodoc:
         test? ? test_url : live_url
       end
 
-      def avs_result(action, response)
-        action == :purchase ? AVSResult.new(code: response["card"]["avsCheck"]) : nil
+      def avs_result(action, succeeded, response)
+        if succeeded
+          action == :purchase ? AVSResult.new(code: response["card"]["avsCheck"]) : nil
+        else
+          nil
+        end
       end
 
-      def cvv_result(action, response)
-        action == :purchase ? CVVResult.new(response["card"]["cvvCheck"]) : nil
+      def cvv_result(action, succeeded, response)
+        if succeeded
+          action == :purchase ? CVVResult.new(response["card"]["cvvCheck"]) : nil
+        else
+          nil
+        end
       end
 
       def parse(body)

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

@@ -30,71 +30,87 @@ module ActiveMerchant #:nodoc:
         "03" => "Invalid merchant",
         "04" => "Pick up card",
         "05" => "Do not Honour",
-        "06" => "Invalid Transaction for Terminal",
+        "06" => "Error",
         "07" => "Pick up card special condition",
-        "08" => "Time-Out",
-        "09" => "No Original",
+        "08" => "Honour with identification",
+        "09" => "Request in progress",
         "10" => "Approved for partial amount",
-        "11" => "Partial Approval",
-        "12" => "Invalid transaction card / issuer / acquirer",
+        "11" => "Approved (VIP)",
+        "12" => "Invalid transaction",
         "13" => "Invalid amount",
         "14" => "Invalid card number",
-        "17" => "Invalid Capture date (terminal business date)",
-        "19" => "System Error; Re-enter transaction",
-        "20" => "No From Account",
-        "21" => "No To Account",
-        "22" => "No Checking Account",
-        "23" => "No Saving Account",
-        "24" => "No Credit Account",
+        "15" => "No such issuer",
+        "16" => "Approved, update track 3",
+        "17" => "Customer cancellation",
+        "18" => "Customer dispute",
+        "19" => "Re-enter transaction",
+        "20" => "Invalid response",
+        "21" => "No action taken",
+        "22" => "Suspected malfunction",
+        "23" => "Unacceptable transaction fee",
+        "24" => "File update not supported by receiver",
+        "25" => "No such record",
+        "26" => "Duplicate record update, old record replaced",
+        "27" => "File update field edit error",
+        "28" => "File locked out while update",
+        "29" => "File update error, contact acquirer",
         "30" => "Format error",
-        "34" => "Implausible card data",
+        "31" => "Issuer signed-off",
+        "32" => "Completed partially",
+        "33" => "Pick-up, expired card",
+        "34" => "Suspect Fraud",
+        "35" => "Pick-up, card acceptor contact acquirer",
+        "36" => "Pick up, card restricted",
+        "37" => "Pick up, call acquirer security",
+        "38" => "Pick up, Allowable PIN tries exceeded",
         "39" => "Transaction Not Allowed",
+        "40" => "Requested function not supported",
         "41" => "Lost Card, Pickup",
-        "42" => "Special Pickup",
-        "43" => "Hot Card, Pickup (if possible)",
-        "44" => "Pickup Card",
+        "42" => "No universal account",
+        "43" => "Pick up, stolen card",
+        "44" => "No investment account",
+        "50" => "Do not renew",
         "51" => "Not sufficient funds",
         "52" => "No checking Account",
         "53" => "No savings account",
         "54" => "Expired card",
         "55" => "Pin incorrect",
+        "56" => "No card record",
         "57" => "Transaction not allowed for cardholder",
         "58" => "Transaction not allowed for merchant",
         "59" => "Suspected Fraud",
+        "60" => "Card acceptor contact acquirer",
         "61" => "Exceeds withdrawal amount limit",
         "62" => "Restricted card",
-        "63" => "MAC Key Error",
+        "63" => "Security violation",
+        "64" => "Wrong original amount",
         "65" => "Activity count limit exceeded",
-        "66" => "Exceeds Acquirer Limit",
-        "67" => "Retain Card; no reason specified",
-        "68" => "Response received too late",
+        "66" => "Call acquirers security department",
+        "67" => "Card to be picked up at ATM",
+        "68" => "Response received too late.",
+        "70" => "Invalid transaction; contact card issuer",
+        "71" => "Decline PIN not changed",
         "75" => "Pin tries exceeded",
-        "76" => "Invalid Account",
-        "77" => "Issuer Does Not Participate In The Service",
-        "78" => "Function Not Available",
-        "79" => "Key Validation Error",
-        "80" => "Approval for Purchase Amount Only",
-        "81" => "Unable to Verify PIN",
+        "76" => "Wrong PIN, number of PIN tries exceeded",
+        "77" => "Wrong Reference No.",
+        "78" => "Record Not Found",
+        "79" => "Already reversed",
+        "80" => "Network error",
+        "81" => "Foreign network error / PIN cryptographic error",
         "82" => "Time out at issuer system",
-        "83" => "Not declined (Valid for all zero amount transactions)",
-        "84" => "Invalid Life Cycle of transaction",
-        "85" => "Not declined",
+        "83" => "Transaction failed",
+        "84" => "Pre-authorization timed out",
+        "85" => "No reason to decline",
         "86" => "Cannot verify pin",
         "87" => "Purchase amount only, no cashback allowed",
         "88" => "MAC sync Error",
-        "89" => "Security Violation",
+        "89" => "Authentication failure",
         "91" => "Issuer not available",
         "92" => "Unable to route at acquirer Module",
-        "93" => "Transaction cannot be completed",
-        "94" => "Duplicate transaction",
-        "95" => "Contact Acquirer",
+        "93" => "Cannot be completed, violation of law",
+        "94" => "Duplicate Transmission",
+        "95" => "Reconcile error / Auth Not found",
         "96" => "System malfunction",
-        "97" => "No Funds Transfer",
-        "98" => "Duplicate Reversal",
-        "99" => "Duplicate Transaction",
-        "N3" => "Cash Service Not Available",
-        "N4" => "Cash Back Request Exceeds Issuer Limit",
-        "N7" => "N7 (visa), Decline CVV2 failure",
         "R0" => "Stop Payment Order",
         "R1" => "Revocation of Authorisation Order",
         "R3" => "Revocation of all Authorisations Order"

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

@@ -258,6 +258,7 @@ module ActiveMerchant #:nodoc:
         add_decision_manager_fields(xml, options)
         add_mdd_fields(xml, options)
         add_auth_service(xml, creditcard_or_reference, options)
+        xml.tag! 'payerAuthEnrollService', {'run' => 'true'} if options[:payer_auth_enroll_service]
         add_payment_network_token(xml) if network_tokenization?(creditcard_or_reference)
         add_business_rules_data(xml, creditcard_or_reference, options)
         xml.target!
@@ -294,6 +295,7 @@ module ActiveMerchant #:nodoc:
           add_check_service(xml)
         else
           add_purchase_service(xml, payment_method_or_reference, options)
+          xml.tag! 'payerAuthEnrollService', {'run' => 'true'} if options[:payer_auth_enroll_service]
           add_payment_network_token(xml) if network_tokenization?(payment_method_or_reference)
           add_business_rules_data(xml, payment_method_or_reference, options) unless options[:pinless_debit_card]
         end

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

@@ -24,7 +24,8 @@ module ActiveMerchant #:nodoc:
         authorize: "direct",
         capture: "capture",
         refund: "refund",
-        void: "cancel"
+        void: "cancel",
+        store: "token"
       }
 
       HTTP_METHOD = {
@@ -32,7 +33,8 @@ module ActiveMerchant #:nodoc:
         authorize: :post,
         capture: :get,
         refund: :post,
-        void: :get
+        void: :get,
+        store: :post
       }
 
       def initialize(options={})
@@ -46,9 +48,10 @@ module ActiveMerchant #:nodoc:
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_payment(post, payment)
+        add_card_or_token(post, payment)
         add_address(post, options)
-        add_customer_responsible_person(post, payment, options) if post[:payment][:country] == 'BR'
+        add_customer_responsible_person(post, payment, options)
+
         commit(:purchase, post)
       end
 
@@ -58,9 +61,9 @@ module ActiveMerchant #:nodoc:
         add_operation(post)
         add_invoice(post, money, options)
         add_customer_data(post, payment, options)
-        add_payment(post, payment)
+        add_card_or_token(post, payment)
         add_address(post, options)
-        add_customer_responsible_person(post, payment, options) if post[:payment][:country] == 'BR'
+        add_customer_responsible_person(post, payment, options)
         post[:payment][:creditcard][:auto_capture] = false
 
         commit(:authorize, post)
@@ -94,6 +97,15 @@ module ActiveMerchant #:nodoc:
         commit(:void, post)
       end
 
+      def store(credit_card, options={})
+        post = {}
+        add_integration_key(post)
+        add_payment_details(post, credit_card)
+        post[:country] = customer_country(options)
+
+        commit(:store, post)
+      end
+
       def verify(credit_card, options={})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
@@ -127,17 +139,20 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, payment, options)
-        post[:payment][:name] = payment.name
+        post[:payment][:name] = customer_name(payment, options)
         post[:payment][:email] = options[:email] || "unspecified@example.com"
         post[:payment][:document] = options[:document]
         post[:payment][:birth_date] = options[:birth_date] if options[:birth_date]
       end
 
-      def add_customer_responsible_person(post, payment,  options)
-        post[:payment][:responsible] = {}
-        post[:payment][:responsible][:name] = payment.name
-        post[:payment][:responsible][:document] = options[:document]
-        post[:payment][:responsible][:birth_date] = options[:birth_date] if options[:birth_date]
+      def add_customer_responsible_person(post, payment, options)
+        post[:payment][:person_type] = options[:person_type] if options[:person_type]
+        if options[:person_type] && options[:person_type].downcase == 'business'
+          post[:payment][:responsible] = {}
+          post[:payment][:responsible][:name] = customer_name(payment, options)
+          post[:payment][:responsible][:document] = options[:document] if options[:document]
+          post[:payment][:responsible][:birth_date] = options[:birth_date] if options[:birth_date]
+        end
       end
 
       def add_address(post, options)
@@ -147,7 +162,7 @@ module ActiveMerchant #:nodoc:
           post[:payment][:city] = address[:city]
           post[:payment][:state] = address[:state]
           post[:payment][:zipcode] = address[:zip]
-          post[:payment][:country] = address[:country]
+          post[:payment][:country] = address[:country].downcase
           post[:payment][:phone_number] = address[:phone]
         end
       end
@@ -159,14 +174,30 @@ module ActiveMerchant #:nodoc:
         post[:payment][:instalments] = options[:instalments] || 1
       end
 
-      def add_payment(post, payment)
-        post[:payment][:payment_type_code] = CARD_BRAND[payment.brand.to_sym]
-        post[:payment][:creditcard] = {
-          card_number: payment.number,
-          card_name: payment.name,
-          card_due_date: "#{payment.month}/#{payment.year}",
-          card_cvv: payment.verification_value
-        }
+      def add_card_or_token(post, payment)
+        if payment.is_a?(String)
+          payment, brand = payment.split("|")
+        end
+        post[:payment][:payment_type_code] = payment.is_a?(String) ? brand : CARD_BRAND[payment.brand.to_sym]
+        post[:payment][:creditcard] = payment_details(payment)
+      end
+
+      def add_payment_details(post, payment)
+        post[:payment_type_code] = CARD_BRAND[payment.brand.to_sym]
+        post[:creditcard] = payment_details(payment)
+      end
+
+      def payment_details(payment)
+        if payment.is_a?(String)
+          { token: payment }
+        else
+          {
+            card_number: payment.number,
+            card_name: payment.name,
+            card_due_date: "#{payment.month}/#{payment.year}",
+            card_cvv: payment.verification_value
+          }
+        end
       end
 
       def parse(body)
@@ -183,7 +214,7 @@ module ActiveMerchant #:nodoc:
           success,
           message_from(response),
           response,
-          authorization: authorization_from(response),
+          authorization: authorization_from(action, parameters, response),
           test: test?,
           error_code: error_code_from(response, success)
         )
@@ -196,6 +227,8 @@ module ActiveMerchant #:nodoc:
           response.try(:[], "payment").try(:[], "status") == "PE"
         elsif action == :void
           response.try(:[], "payment").try(:[], "status") == "CA"
+        elsif action == :store
+          response.try(:[], "status") == "SUCCESS"
         else
           false
         end
@@ -206,8 +239,12 @@ module ActiveMerchant #:nodoc:
         response.try(:[], "payment").try(:[], "transaction_status").try(:[], "description")
       end
 
-      def authorization_from(response)
-        response.try(:[], "payment").try(:[], "hash")
+      def authorization_from(action, parameters, response)
+        if action == :store
+          response.try(:[], "token") + "|" + CARD_BRAND[parameters[:payment_type_code].to_sym]
+        else
+          response.try(:[], "payment").try(:[], "hash")
+        end
       end
 
       def post_data(action, parameters = {})
@@ -239,6 +276,21 @@ module ActiveMerchant #:nodoc:
           response.try(:[], "payment").try(:[], "transaction_status").try(:[], "code")
         end
       end
+
+      def customer_country(options)
+        if country = options[:country] || (options[:billing_address][:country] if options[:billing_address])
+          country.downcase
+        end
+      end
+
+      def customer_name(payment, options)
+        address_name = options[:billing_address][:name] if options[:billing_address] && options[:billing_address][:name]
+        if payment.is_a?(String)
+          address_name || "Not Provided"
+        else
+          payment.name
+        end
+      end
     end
   end
 end

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

@@ -7,8 +7,8 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_url, :live_url, :delimiter, :actions
 
-      self.test_url = 'https://demo.myvirtualmerchant.com/VirtualMerchantDemo/process.do'
-      self.live_url = 'https://www.myvirtualmerchant.com/VirtualMerchant/process.do'
+      self.test_url = 'https://api.demo.convergepay.com/VirtualMerchantDemo/process.do'
+      self.live_url = 'https://api.convergepay.com/VirtualMerchant/process.do'
 
       self.display_name = 'Elavon MyVirtualMerchant'
       self.supported_countries = %w(US CA PR DE IE NO PL LU BE NL)

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

@@ -241,11 +241,15 @@ module ActiveMerchant #:nodoc:
         {
           'Accept'        => 'application/json',
           'Content-type'  => 'application/json',
-          'Authorization' => "Basic #{Base64.strict_encode64(@options[:api_key].to_s).strip}",
+          'Authorization' => "Basic #{basic_auth}",
           'User-Agent'    => "Netbanx-Paysafe v1.0/ActiveMerchant #{ActiveMerchant::VERSION}"
         }
       end
 
+      def basic_auth
+        Base64.strict_encode64("#{@options[:account_number]}:#{@options[:api_key]}")
+      end
+
       def error_code_from(response)
         unless success_from(response)
           case response['errorCode']

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

@@ -3,9 +3,9 @@ module ActiveMerchant
     class PayeezyGateway < Gateway
       class_attribute :integration_url
 
-      self.test_url = 'https://api-cert.payeezy.com/v1/transactions'
-      self.integration_url = 'https://api-cat.payeezy.com/v1/transactions'
-      self.live_url = 'https://api.payeezy.com/v1/transactions'
+      self.test_url = 'https://api-cert.payeezy.com/v1'
+      self.integration_url = 'https://api-cat.payeezy.com/v1'
+      self.live_url = 'https://api.payeezy.com/v1'
 
       self.default_currency = 'USD'
       self.money_format = :cents
@@ -31,7 +31,7 @@ module ActiveMerchant
       end
 
       def purchase(amount, payment_method, options = {})
-        params = {transaction_type: 'purchase'}
+        params = payment_method.is_a?(String) ? { transaction_type: 'recurring' } : { transaction_type: 'purchase' }
 
         add_invoice(params, options)
         add_payment_method(params, payment_method, options)
@@ -73,6 +73,14 @@ module ActiveMerchant
         commit(params, options)
       end
 
+      def store(payment_method, options = {})
+        params = {}
+
+        add_creditcard_for_tokenization(params, payment_method, options)
+
+        commit(params, options)
+      end
+
       def void(authorization, options = {})
         params = {transaction_type: 'void'}
 
@@ -119,27 +127,34 @@ module ActiveMerchant
         params[:method] = method
       end
 
+      def add_creditcard_for_tokenization(params, payment_method, options)
+        params[:apikey] = @options[:apikey]
+        params[:js_security_key] = options[:js_security_key]
+        params[:ta_token] = options[:ta_token]
+        params[:callback] = 'Payeezy.callback'
+        params[:type] = 'FDToken'
+        card = add_card_data(payment_method)
+        params['credit_card.type'] = card[:type]
+        params['credit_card.cardholder_name'] = card[:cardholder_name]
+        params['credit_card.card_number'] = card[:card_number]
+        params['credit_card.exp_date'] = card[:exp_date]
+        params['credit_card.cvv'] = card[:cvv]
+      end
+
+      def is_store_action?(params)
+        params[:ta_token].present?
+      end
+
       def add_payment_method(params, payment_method, options)
         if payment_method.is_a? Check
           add_echeck(params, payment_method, options)
+        elsif payment_method.is_a? String
+          add_token(params, payment_method, options)
         else
           add_creditcard(params, payment_method)
         end
       end
 
-      def add_creditcard(params, creditcard)
-        credit_card = {}
-
-        credit_card[:type] = CREDIT_CARD_BRAND[creditcard.brand]
-        credit_card[:cardholder_name] = creditcard.name
-        credit_card[:card_number] = creditcard.number
-        credit_card[:exp_date] = "#{format(creditcard.month, :two_digits)}#{format(creditcard.year, :two_digits)}"
-        credit_card[:cvv] = creditcard.verification_value if creditcard.verification_value?
-
-        params[:method] = 'credit_card'
-        params[:credit_card] = credit_card
-      end
-
       def add_echeck(params, echeck, options)
         tele_check = {}
 
@@ -156,6 +171,44 @@ module ActiveMerchant
         params[:tele_check] = tele_check
       end
 
+      def add_token(params, payment_method, options)
+        token = {}
+        token[:token_type] = 'FDToken'
+
+        type, cardholder_name, exp_date, card_number = payment_method.split('|')
+
+        token[:token_data] = {}
+        token[:token_data][:type] = type
+        token[:token_data][:cardholder_name] = cardholder_name
+        token[:token_data][:value] = card_number
+        token[:token_data][:exp_date] = exp_date
+        token[:token_data][:cvv] = options[:cvv] if options[:cvv]
+
+        params[:method] = 'token'
+        params[:token] = token
+      end
+
+      def add_creditcard(params, creditcard)
+        credit_card = add_card_data(creditcard)
+
+        params[:method] = 'credit_card'
+        params[:credit_card] = credit_card
+      end
+
+      def add_card_data(payment_method)
+        card = {}
+        card[:type] = CREDIT_CARD_BRAND[payment_method.brand]
+        card[:cardholder_name] = payment_method.name
+        card[:card_number] = payment_method.number
+        card[:exp_date] = format_exp_date(payment_method.month, payment_method.year)
+        card[:cvv] = payment_method.verification_value if payment_method.verification_value?
+        card
+      end
+
+      def format_exp_date(month, year)
+        "#{format(month, :two_digits)}#{format(year, :two_digits)}"
+      end
+
       def add_address(params, options)
         address = options[:billing_address]
         return unless address
@@ -180,25 +233,18 @@ module ActiveMerchant
       end
 
       def commit(params, options)
-        url = if options[:integration]
-          integration_url
-        elsif test?
-          test_url
-        else
-          live_url
-        end
+        url = base_url(options) + endpoint(params)
 
         if transaction_id = params.delete(:transaction_id)
           url = "#{url}/#{transaction_id}"
         end
 
         begin
-          body = params.to_json
-          response = parse(ssl_post(url, body, headers(body)))
+          response = api_request(url, params)
         rescue ResponseError => e
           response = response_error(e.response.body)
         rescue JSON::ParserError
-          response = json_error(raw_response)
+          response = json_error(e.response.body)
         end
 
         Response.new(
@@ -213,17 +259,34 @@ module ActiveMerchant
         )
       end
 
-      def success_from(response)
-        response['transaction_status'] == 'approved'
+      def base_url(options)
+        if options[:integration]
+          integration_url
+        elsif test?
+          test_url
+        else
+          live_url
+        end
       end
 
-      def authorization_from(params, response)
-        [
-          response['transaction_id'],
-          response['transaction_tag'],
-          params[:method],
-          (response['amount'] && response['amount'].to_i)
-        ].join('|')
+      def endpoint(params)
+        is_store_action?(params) ? '/securitytokens' : '/transactions'
+      end
+
+      def api_request(url, params)
+        if is_store_action?(params)
+          callback = ssl_request(:get, "#{url}?#{post_data(params)}", nil, {})
+          payload = callback[/{(?:\n|.)*}/]
+          parse(payload)
+        else
+          body = params.to_json
+          parse(ssl_post(url, body, headers(body)))
+        end
+      end
+
+      def post_data(params)
+        return nil unless params
+        params.reject { |k, v| v.blank? }.collect { |k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join("&")
       end
 
       def generate_hmac(nonce, current_timestamp, payload)
@@ -256,19 +319,55 @@ module ActiveMerchant
         response['Error'].to_h['messages'].to_a.map { |e| e['code'] }.join(', ')
       end
 
+      def success_from(response)
+        if response['transaction_status']
+          response['transaction_status'] == 'approved'
+        elsif response['results']
+          response['results']['status'] == 'success'
+        else
+          false
+        end
+      end
+
       def handle_message(response, success)
-        if success
+        if success && response['status'].present?
+          'Token successfully created.'
+        elsif success
           "#{response['gateway_message']} - #{response['bank_message']}"
         elsif %w(401 403).include?(response['code'])
           response['message']
         elsif response.key?('Error')
           response['Error']['messages'].first['description']
+        elsif response.key?('results')
+          response['results']['Error']['messages'].first['description']
         elsif response.key?('error')
           response['error']
         elsif response.key?('fault')
           response['fault'].to_h['faultstring']
         else
-          response['bank_message']
+          response['bank_message'] || 'Failure to successfully create token.'
+        end
+      end
+
+      def authorization_from(params, response)
+        if is_store_action?(params)
+          if success_from(response)
+            [
+              response['results']['token']['type'],
+              response['results']['token']['cardholder_name'],
+              response['results']['token']['exp_date'],
+              response['results']['token']['value']
+            ].join('|')
+          else
+            nil
+          end
+        else
+          [
+            response['transaction_id'],
+            response['transaction_tag'],
+            params[:method],
+            (response['amount'] && response['amount'].to_i)
+          ].join('|')
         end
       end
 

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

@@ -31,6 +31,7 @@ module ActiveMerchant #:nodoc:
       def initialize(options={})
         requires!(options, :merchant_id, :account_id, :api_login, :api_key)
         super
+        @options[:payment_country] ||= options[:payment_country] if options[:payment_country]
       end
 
       def purchase(amount, payment_method, options={})
@@ -138,7 +139,7 @@ module ActiveMerchant #:nodoc:
 
       def add_transaction_elements(post, type, options)
         transaction = {}
-        transaction[:paymentCountry] = options[:payment_country] || (options[:billing_address][:country] if options[:billing_address])
+        transaction[:paymentCountry] = @options[:payment_country] || (options[:billing_address][:country] if options[:billing_address])
         transaction[:type] = type
         transaction[:ipAddress] = options[:ip] if options[:ip]
         transaction[:userAgent] = options[:user_agent] if options[:user_agent]

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

@@ -59,6 +59,7 @@ module ActiveMerchant #:nodoc:
         "COP" => '170',
         "CRC" => '188',
         "CZK" => '203',
+        "DKK" => '208',
         "DOP" => '214',
         "EUR" => '978',
         "GBP" => '826',

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

@@ -84,8 +84,6 @@ module ActiveMerchant #:nodoc:
         post[:cvv] = creditcard.verification_value unless options[:recurring]
         post[:expiration_month] = creditcard.month
         post[:expiration_year] = creditcard.year
-        post[:original_ip] = options[:ip] if options[:ip]
-        post[:original_device] = options[:device_fingerprint] if options[:device_fingerprint]
 
         if(billing_address = (options[:billing_address] || options[:address]))
           post[:address] = {}
@@ -100,6 +98,8 @@ module ActiveMerchant #:nodoc:
           post[:client_secret] = @options[:client_secret]
           commit('/credit_card/transfer', post, options)
         else
+          post[:original_device] = options[:device_fingerprint] if options[:device_fingerprint]
+          post[:original_ip] = options[:ip] if options[:ip]
           commit('/credit_card/create', post, options)
         end
       end

data/lib/active_merchant/connection.rb

@@ -49,7 +49,7 @@ module ActiveMerchant
     end
 
     def request(method, body, headers = {})
-      request_start = Time.now.to_f
+      request_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       retry_exceptions(:max_retries => max_retries, :logger => logger, :tag => tag) do
         begin
@@ -89,7 +89,7 @@ module ActiveMerchant
       end
 
     ensure
-      info "connection_request_total_time=%.4fs" % [Time.now.to_f - request_start], tag
+      info "connection_request_total_time=%.4fs" % [Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start], tag
     end
 
     private

data/lib/active_merchant/network_connection_retries.rb

@@ -42,19 +42,19 @@ module ActiveMerchant
       request_start = nil
 
       begin
-        request_start = Time.now.to_f
+        request_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         result = yield
-        log_with_retry_details(options[:logger], initial_retries-retries + 1, Time.now.to_f - request_start, "success", options[:tag])
+        log_with_retry_details(options[:logger], initial_retries-retries + 1, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, "success", options[:tag])
         result
       rescue ActiveMerchant::RetriableConnectionError => e
         retries -= 1
 
-        log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
+        log_with_retry_details(options[:logger], initial_retries-retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
         retry unless retries.zero?
         raise ActiveMerchant::ConnectionError.new(e.message, e)
       rescue ActiveMerchant::ConnectionError, ActiveMerchant::InvalidResponseError => e
         retries -= 1
-        log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
+        log_with_retry_details(options[:logger], initial_retries-retries, Process.clock_gettime(Process::CLOCK_MONOTONIC) - request_start, e.message, options[:tag])
         retry if (options[:retry_safe] || retry_safe) && !retries.zero?
         raise
       end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.73.0"
+  VERSION = "1.74.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.73.0
+  version: 1.74.0
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.