activemerchant 1.58.0 → 1.59.0

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

@@ -12,9 +12,9 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express,
-                                  :diners_club, :discover]
-      self.homepage_url = 'http://www.merchantwarrior.com/'
-      self.display_name = 'MerchantWarrior'
+                                  :diners_club, :discover, :jcb]
+      self.homepage_url = 'https://www.merchantwarrior.com/'
+      self.display_name = 'Merchant Warrior'
 
       self.money_format = :dollars
       self.default_currency = 'AUD'
@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
       def authorize(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
-        add_product(post, options)
+        add_order_id(post, options)
         add_address(post, options)
         add_payment_method(post, payment_method)
         commit('processAuth', post)
@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
       def purchase(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
-        add_product(post, options)
+        add_order_id(post, options)
         add_address(post, options)
         add_payment_method(post, payment_method)
         commit('processCard', post)
@@ -83,10 +83,13 @@ module ActiveMerchant #:nodoc:
         post['customerCity'] = address[:city]
         post['customerAddress'] = address[:address1]
         post['customerPostCode'] = address[:zip]
+		post['customerIP'] = address[:ip]
+		post['customerPhone'] = address[:phone]
+		post['customerEmail'] = address[:email]
       end
 
-      def add_product(post, options)
-        post['transactionProduct'] = truncate(options[:description], 34)
+      def add_order_id(post, options)
+        post['transactionProduct'] = truncate(options[:order_id], 34) || SecureRandom.hex(15)
       end
 
       def add_payment_method(post, payment_method)

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

@@ -12,7 +12,7 @@ module ActiveMerchant #:nodoc:
     # and +refund+ will become mandatory.
     class MercuryGateway < Gateway
       URLS = {
-        :test => 'https://w1.mercurydev.net/ws/ws.asmx',
+        :test => 'https://w1.mercurycert.net/ws/ws.asmx',
         :live => 'https://w1.mercurypay.com/ws/ws.asmx'
       }
 

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

@@ -218,7 +218,7 @@ module ActiveMerchant #:nodoc:
         post[:delim_data]     = "TRUE"
         post[:delim_char]     = ","
         post[:encap_char]     = "$"
-        post[:solution_ID]    = application_id if application_id.present? && application_id != "ActiveMerchant"
+        post[:solution_ID]    = application_id if application_id
 
         request = post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request

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

@@ -53,7 +53,7 @@ module ActiveMerchant #:nodoc:
         post[:crypt_type] = options[:crypt_type] || @options[:crypt_type]
         action = if post[:cavv]
           'cavv_preauth'
-        elsif post[:data_key].blank? 
+        elsif post[:data_key].blank?
           'preauth'
         else
           'res_preauth_cc'
@@ -132,6 +132,13 @@ module ActiveMerchant #:nodoc:
         commit 'refund', crediting_params(authorization, :amount => amount(money))
       end
 
+      def verify(credit_card, options={})
+        MultiResponse.run(:use_first_response) do |r|
+          r.process { authorize(100, credit_card, options) }
+          r.process(:ignore_result) { void(r.authorization, options) }
+        end
+      end
+
       def store(credit_card, options = {})
         post = {}
         post[:pan] = credit_card.number

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

@@ -30,7 +30,7 @@ module ActiveMerchant #:nodoc:
       def purchase(amount, payment_method, options={})
         post = {}
         add_invoice(post, amount, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
       def authorize(amount, payment_method, options={})
         post = {}
         add_invoice(post, amount, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
@@ -59,6 +59,7 @@ module ActiveMerchant #:nodoc:
       def void(authorization, options={})
         post = {}
         add_reference(post, authorization)
+        add_payment_type(post, authorization)
 
         commit("void", post)
       end
@@ -67,6 +68,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, amount, options)
         add_reference(post, authorization)
+        add_payment_type(post, authorization)
 
         commit("refund", post)
       end
@@ -74,7 +76,7 @@ module ActiveMerchant #:nodoc:
       def credit(amount, payment_method, options={})
         post = {}
         add_invoice(post, amount, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
 
         commit("credit", post)
@@ -82,7 +84,7 @@ module ActiveMerchant #:nodoc:
 
       def verify(payment_method, options={})
         post = {}
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
@@ -92,7 +94,7 @@ module ActiveMerchant #:nodoc:
       def store(payment_method, options = {})
         post = {}
         add_invoice(post, nil, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_customer_data(post, options)
         add_merchant_defined_fields(post, options)
 
@@ -125,7 +127,7 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_payment_method(post, payment_method)
+      def add_payment_method(post, payment_method, options)
         if(payment_method.is_a?(String))
           post[:customer_vault_id] = payment_method
         elsif(card_brand(payment_method) == 'check')
@@ -135,7 +137,7 @@ module ActiveMerchant #:nodoc:
           post[:checkaccount] = payment_method.account_number
           post[:account_holder_type] = payment_method.account_holder_type
           post[:account_type] = payment_method.account_type
-          post[:sec_code] = 'WEB'
+          post[:sec_code] = options[:sec_code] || 'WEB'
         else
           post[:payment] = 'creditcard'
           post[:firstname] = payment_method.first_name
@@ -182,7 +184,13 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_reference(post, authorization)
-        post[:transactionid] = authorization
+        transaction_id, _ = split_authorization(authorization)
+        post[:transactionid] = transaction_id
+      end
+
+      def add_payment_type(post, authorization)
+        _, payment_type = split_authorization(authorization)
+        post[:payment] = payment_type if payment_type
       end
 
       def exp_date(payment_method)
@@ -203,13 +211,21 @@ module ActiveMerchant #:nodoc:
           succeeded,
           message_from(succeeded, response),
           response,
-          authorization: response[:transactionid],
+          authorization: authorization_from(response, params[:payment]),
           avs_result: AVSResult.new(code: response[:avsresponse]),
           cvv_result: CVVResult.new(response[:cvvresponse]),
           test: test?
         )
       end
 
+      def authorization_from(response, payment_type)
+        [ response[:transactionid], payment_type ].join("#")
+      end
+
+      def split_authorization(authorization)
+        authorization.split("#")
+      end
+
       def headers
         { "Content-Type"  => "application/x-www-form-urlencoded;charset=UTF-8" }
       end

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

@@ -143,7 +143,7 @@ module ActiveMerchant #:nodoc:
       def headers(options = {})
         {
           "Content-Type" => "application/json",
-          "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
+          "Authorization" => "Basic " + Base64.strict_encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Openpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Openpay-Client-User-Agent" => user_agent
         }

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

@@ -28,6 +28,8 @@ module ActiveMerchant #:nodoc:
     # Company will automatically be affiliated.
 
     class OrbitalGateway < Gateway
+      include Empty
+
       API_VERSION = "5.6"
 
       POST_HEADERS = {
@@ -328,7 +330,7 @@ module ActiveMerchant #:nodoc:
 
       def add_address(xml, creditcard, options)
         if(address = (options[:billing_address] || options[:address]))
-          avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:country].to_s)
+          avs_supported = AVS_SUPPORTED_COUNTRIES.include?(address[:country].to_s) || empty?(address[:country])
 
           if avs_supported
             xml.tag! :AVSzip,      byte_limit(format_address_field(address[:zip]), 10)
@@ -338,9 +340,9 @@ module ActiveMerchant #:nodoc:
             xml.tag! :AVSstate,    byte_limit(format_address_field(address[:state]), 2)
             xml.tag! :AVSphoneNum, (address[:phone] ? address[:phone].scan(/\d/).join.to_s[0..13] : nil)
           end
-          # can't look in billing address?
+
           xml.tag! :AVSname, ((creditcard && creditcard.name) ? creditcard.name[0..29] : nil)
-          xml.tag! :AVScountryCode, (avs_supported ? address[:country] : '')
+          xml.tag! :AVScountryCode, (avs_supported ? (byte_limit(format_address_field(address[:country]), 2)) : '')
 
           # Needs to come after AVScountryCode
           add_destination_address(xml, address) if avs_supported

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

@@ -154,7 +154,7 @@ module ActiveMerchant #:nodoc:
         begin
           raw_response = ssl_request(:get, "#{save_card_url}?#{post_data(post)}", nil, {})
         rescue ResponseError => e
-          return Response.new(false, e.response.body, e.response.body, {})
+          return Response.new(false, e.response.body)
         end
 
         response_for_save_from(raw_response)

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

@@ -26,12 +26,11 @@ module ActiveMerchant #:nodoc:
         'TW' => 'zh_TW'
       }
 
-      CURRENCIES_WITHOUT_FRACTIONS = %w(HUF JPY TWD)
-
       self.test_redirect_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr'
       self.supported_countries = ['US']
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
+      self.currencies_without_fractions = %w(HUF JPY TWD)
 
       def setup_authorization(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
@@ -86,10 +85,6 @@ module ActiveMerchant #:nodoc:
       end
 
       private
-      def non_fractional_currency?(currency)
-        CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s)
-      end
-
       def build_get_details_request(token)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'GetExpressCheckoutDetailsReq', 'xmlns' => PAYPAL_NAMESPACE do

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

@@ -11,7 +11,7 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['IN']
       self.default_currency = 'INR'
-      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :maestro]
 
       self.homepage_url = 'https://www.payu.in/'
       self.display_name = 'PayU India'
@@ -135,7 +135,8 @@ module ActiveMerchant #:nodoc:
         visa: "VISA",
         master: "MAST",
         american_express: "AMEX",
-        diners_club: "DINR"
+        diners_club: "DINR",
+        maestro: "MAES"
       }
 
       def add_payment(post, payment)

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

@@ -29,6 +29,7 @@ module ActiveMerchant #:nodoc:
 
       def purchase(money, payment, options={})
         request = build_xml_request do |xml|
+          add_identification(xml, options)
           add_payment(xml, money, 'sale', options)
           add_account(xml, payment)
           add_customer(xml, payment, options)
@@ -40,7 +41,7 @@ module ActiveMerchant #:nodoc:
 
       def refund(money, authorization, options={})
         request = build_xml_request do |xml|
-          add_identification(xml, authorization)
+          add_identification(xml, options, authorization)
           add_payment(xml, money, 'refund', options)
         end
 
@@ -49,6 +50,7 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, payment, options={})
         request = build_xml_request do |xml|
+          add_identification(xml, options)
           add_payment(xml, money, 'authonly', options)
           add_account(xml, payment)
           add_customer(xml, payment, options)
@@ -60,7 +62,7 @@ module ActiveMerchant #:nodoc:
 
       def capture(money, authorization, options={})
         request = build_xml_request do |xml|
-          add_identification(xml, authorization)
+          add_identification(xml, options, authorization)
           add_payment(xml, money, 'capture', options)
         end
 
@@ -69,7 +71,7 @@ module ActiveMerchant #:nodoc:
 
       def void(authorization, options={})
         request = build_xml_request do |xml|
-          add_identification(xml, authorization)
+          add_identification(xml, options, authorization)
           add_payment(xml, nil, 'void', options)
         end
 
@@ -108,9 +110,10 @@ module ActiveMerchant #:nodoc:
 
       private
 
-      def add_identification(xml, authorization)
+      def add_identification(xml, options, authorization = nil)
         xml.Identification do
-          xml.ReferenceID authorization
+          xml.TransactionID options[:order_id] if options[:order_id]
+          xml.ReferenceID authorization if authorization
         end
       end
 

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

@@ -204,13 +204,7 @@ module ActiveMerchant #:nodoc:
 
         post[:C_address]    = billing_address[:address1]
         post[:C_city]       = billing_address[:city]
-
-        if ['US', 'CA'].include?(billing_address[:country])
-          post[:C_state]    = billing_address[:state]
-        else
-          post[:C_state]    = "Outside of United States"
-        end
-
+        post[:C_state]      = billing_address[:state]
         post[:C_zip]        = billing_address[:zip]
         post[:C_country]    = billing_address[:country]
         post[:C_telephone]  = billing_address[:phone]

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

@@ -390,10 +390,6 @@ module ActiveMerchant #:nodoc:
         post[key] = value if !value.blank? || options[:required]
       end
 
-      def localized_amount(money, currency)
-        amount = amount(money)
-        CURRENCIES_WITHOUT_FRACTIONS.include?(currency.to_s) ? amount.split('.').first : amount
-      end
     end
 
   end

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

@@ -219,11 +219,6 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        if response[:response_code].to_i == DECLINED
-          return CVVResult.messages[ response[:card_code_response_code] ] if CARD_CODE_ERRORS.include?(response[:card_code_response_code])
-          return AVSResult.messages[ response[:avs_result_code] ] if AVS_ERRORS.include?(response[:avs_result_code])
-        end
-
         return response[:response_reason_text].nil? ? '' : response[:response_reason_text][0..-1]
       end
 

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

@@ -100,7 +100,7 @@ module ActiveMerchant #:nodoc:
         post[:delim_data]     = "TRUE"
         post[:delim_char]     = ","
         post[:encap_char]     = "$"
-        post[:solution_ID]    = application_id if application_id.present? && application_id != "ActiveMerchant"
+        post[:solution_ID]    = application_id if application_id
 
         request = post.merge(parameters).collect { |key, value| "x_#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request

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

@@ -4,18 +4,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://api.securionpay.com/'
       self.live_url = 'https://api.securionpay.com/'
 
-      self.supported_countries = ["AF", "AL", "DZ", "AS", "AD", "AO", "AI", "AG", "AR", "AM", "AW", "AU", "AT", "AZ", "BS", "BH", "BD",
-        "BB", "BY", "BE", "BZ", "BJ", "BM", "BT", "BO", "BA", "BW", "BV", "BR", "IO", "BN", "BG", "BF", "BI", "KH", "CM", "CA", "CV",
-        "KY", "CF", "TD", "CL", "CN", "CX", "CC", "CO", "KM", "CG", "CD", "CK", "CR", "CI", "HR", "CU", "CW", "CY", "CZ", "DK", "DJ",
-        "DM", "DO", "EC", "EG", "SV", "GQ", "ER", "EE", "ET", "FK", "FO", "FJ", "FI", "FR", "GF", "PF", "TF", "GA", "GM", "GE", "DE",
-        "GH", "GI", "GR", "GL", "GD", "GP", "GU", "GT", "GG", "GN", "GW", "GY", "HT", "HM", "VA", "HN", "HK", "HU", "IS", "IN", "ID",
-        "IR", "IQ", "IE", "IM", "IL", "IT", "JM", "JP", "JE", "JO", "KZ", "KE", "KI", "KP", "KR", "KV", "KW", "KG", "LA", "LV", "LB",
-        "LS", "LR", "LY", "LI", "LT", "LU", "MO", "MK", "MG", "MW", "MY", "MV", "ML", "MT", "MH", "MQ", "MR", "MU", "YT", "MX", "FM",
-        "MD", "MC", "MN", "ME", "MS", "MA", "MZ", "MM", "NA", "NR", "NP", "NL", "AN", "NC", "NZ", "NI", "NE", "NG", "NU", "NF", "MP",
-        "NO", "OM", "PK", "PW", "PS", "PA", "PG", "PY", "PE", "PH", "PN", "PL", "PT", "PR", "QA", "RE", "RO", "RU", "RW", "BL", "SH",
-        "KN", "LC", "MF", "PM", "VC", "WS", "SM", "ST", "SA", "SN", "RS", "SC", "SL", "SG", "SK", "SI", "SB", "SO", "ZA", "GS", "ES",
-        "LK", "SD", "SR", "SJ", "SZ", "SE", "CH", "SY", "TW", "TJ", "TZ", "TH", "TL", "TG", "TK", "TO", "TT", "TN", "TR", "TM", "TC",
-        "TV", "UG", "UA", "AE", "GB", "US", "UM", "UY", "UZ", "VU", "VE", "VN", "VG", "VI", "WF", "EH", "YE", "ZM", "ZW", "AX"]
+
+      self.supported_countries = %w(AL AD AT BY BE BG HR CY RE DK EE IS FI FR DE GI GR HU IS IE IT LV LI LT LU
+                                    MK MT MD MC NL NO PL PT RO RU MA RS SK SI ES SE CH UA KI CI RS RS ME)
+
       self.default_currency = 'USD'
       self.money_format = :cents
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :diners_club]
@@ -79,6 +71,29 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def store(credit_card, options = {})
+        if options[:customer_id].blank?
+          MultiResponse.run() do |r|
+            #create charge object
+            r.process { authorize(100, credit_card, options) }
+            #create customer and save card
+            r.process { create_customer_add_card(r.authorization, options) }
+            #void the charge
+            r.process(:ignore_result) { void(r.params["metadata"]["chargeId"], options) }
+          end
+        else
+          verify(credit_card, options)
+        end
+      end
+
+      def customer(options = {})
+        if options[:customer_id].blank?
+          return nil
+        else
+          commit("customers/#{CGI.escape(options[:customer_id])}", nil, options, :get)
+        end
+      end
+
       def supports_scrubbing?
         true
       end
@@ -92,8 +107,18 @@ module ActiveMerchant #:nodoc:
 
       private
 
+      def create_customer_add_card(authorization, options)
+        post = {}
+        post[:email] = options[:email]
+        post[:description] = options[:description]
+        post[:card] = authorization
+        post[:metadata] = {}
+        post[:metadata][:chargeId] = authorization
+        commit('customers', post, options)
+      end
+
       def add_customer(post, payment, options)
-        post[:customer] = options[:customer] if options[:customer]
+        post[:customerId] = options[:customer_id] if options[:customer_id]
       end
 
       def add_customer_data(post, options)
@@ -156,8 +181,8 @@ module ActiveMerchant #:nodoc:
         JSON.parse(body)
       end
 
-      def commit(url, parameters = nil, options = {})
-        response = api_request(url, parameters, options)
+      def commit(url, parameters = nil, options = {}, method = nil)
+        response = api_request(url, parameters, options, method)
         success = !response.key?("error")
 
         Response.new(success,
@@ -206,10 +231,14 @@ module ActiveMerchant #:nodoc:
         end.compact.join("&")
       end
 
-      def api_request(endpoint, parameters = nil, options = {})
+      def api_request(endpoint, parameters = nil, options = {}, method = nil)
         raw_response = response = nil
         begin
-          raw_response = ssl_post(self.live_url + endpoint, post_data(parameters), headers(options))
+          if method.blank?
+            raw_response = ssl_post(self.live_url + endpoint, post_data(parameters), headers(options))
+          else
+            raw_response = ssl_request(method, self.live_url + endpoint, post_data(parameters), headers(options))
+          end
           response = parse(raw_response)
         rescue ResponseError => e
           raw_response = e.response.body