activemerchant 1.105.0 → 1.107.4

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

@@ -17,8 +17,8 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = %w[AU FJ GB HK IE MY NZ PG SG US]
 
-      self.homepage_url = 'http://www.paymentexpress.com/'
-      self.display_name = 'PaymentExpress'
+      self.homepage_url = 'https://www.windcave.com/'
+      self.display_name = 'Windcave (formerly PaymentExpress)'
 
       self.live_url = 'https://sec.paymentexpress.com/pxpost.aspx'
       self.test_url = 'https://uat.paymentexpress.com/pxpost.aspx'
@@ -26,11 +26,11 @@ module ActiveMerchant #:nodoc:
       APPROVED = '1'
 
       TRANSACTIONS = {
-        :purchase       => 'Purchase',
-        :credit         => 'Refund',
-        :authorization  => 'Auth',
-        :capture        => 'Complete',
-        :validate       => 'Validate'
+        purchase: 'Purchase',
+        credit: 'Refund',
+        authorization: 'Auth',
+        capture: 'Complete',
+        validate: 'Validate'
       }
 
       # We require the DPS gateway username and password when the object is created.
@@ -302,8 +302,8 @@ module ActiveMerchant #:nodoc:
 
         # Return a response
         PaymentExpressResponse.new(response[:success] == APPROVED, message_from(response), response,
-          :test => response[:test_mode] == '1',
-          :authorization => authorization_from(action, response)
+          test: response[:test_mode] == '1',
+          authorization: authorization_from(action, response)
         )
       end
 

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

@@ -112,8 +112,8 @@ module ActiveMerchant #:nodoc:
       def response_from(raw_response)
         parsed = JSON.parse(raw_response)
         options = {
-          :authorization => authorization_from(parsed),
-          :test => (parsed['mode'] == 'test'),
+          authorization: authorization_from(parsed),
+          test: (parsed['mode'] == 'test'),
         }
 
         succeeded = (parsed['data'] == []) || (parsed['data']['response_code'].to_i == 20000)
@@ -181,7 +181,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def response_for_save_from(raw_response)
-        options = { :test => test? }
+        options = { test: test? }
 
         parser = ResponseParser.new(raw_response, options)
         parser.generate_response

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

@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         billing_address = options[:billing_address] || options[:address]
         currency_code = options[:currency] || currency(money)
 
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! transaction_type + 'Req', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! transaction_type + 'Request', 'xmlns:n2' => EBAY_NAMESPACE do
             xml.tag! 'n2:Version', API_VERSION

data/lib/active_merchant/billing/gateways/paypal/paypal_common_api.rb

@@ -586,11 +586,11 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:OrderTotal', localized_amount(money, currency_code), 'currencyID' => currency_code
 
           # All of the values must be included together and add up to the order total
-          if [:subtotal, :shipping, :handling, :tax].all?{ |o| options[o].present?}
-            xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal].to_i, currency_code), 'currencyID' => currency_code
-            xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping].to_i, currency_code),'currencyID' => currency_code
-            xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling].to_i, currency_code),'currencyID' => currency_code
-            xml.tag! 'n2:TaxTotal', localized_amount(options[:tax].to_i, currency_code), 'currencyID' => currency_code
+          if [:subtotal, :shipping, :handling, :tax].all?{ |o| options[o].present? }
+            xml.tag! 'n2:ItemTotal', localized_amount(options[:subtotal], currency_code), 'currencyID' => currency_code
+            xml.tag! 'n2:ShippingTotal', localized_amount(options[:shipping], currency_code),'currencyID' => currency_code
+            xml.tag! 'n2:HandlingTotal', localized_amount(options[:handling], currency_code),'currencyID' => currency_code
+            xml.tag! 'n2:TaxTotal', localized_amount(options[:tax], currency_code), 'currencyID' => currency_code
           end
 
           xml.tag! 'n2:InsuranceTotal', localized_amount(options[:insurance_total], currency_code),'currencyID' => currency_code unless options[:insurance_total].blank?

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

@@ -17,7 +17,7 @@ module ActiveMerchant
       end
 
       def redirect_url_for(token, options = {})
-        options = {:review => true, :mobile => false}.update(options)
+        options = {review: true, mobile: false}.update(options)
 
         cmd  = options[:mobile] ? '_express-checkout-mobile' : '_express-checkout'
         url  = "#{redirect_url}?cmd=#{cmd}&token=#{token}"

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

@@ -116,11 +116,11 @@ module ActiveMerchant #:nodoc:
         message = message_from(response)
         test_mode = (test? || message =~ /TESTMODE/)
         Response.new(success?(response), message, response,
-          :test => test_mode,
-          :authorization => response['transactionid'],
-          :fraud_review => fraud_review?(response),
-          :avs_result => { :code => response['avsresponse'] },
-          :cvv_result => response['cvvresponse']
+          test: test_mode,
+          authorization: response['transactionid'],
+          fraud_review: fraud_review?(response),
+          avs_result: { code: response['avsresponse'] },
+          cvv_result: response['cvvresponse']
         )
       end
 

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

@@ -178,8 +178,8 @@ module ActiveMerchant #:nodoc:
         message  = message_from(response)
 
         PaystationResponse.new(success?(response), message, response,
-          :test          => (response[:tm]&.casecmp('t')&.zero?),
-          :authorization => response[:paystation_transaction_id]
+          test: (response[:tm]&.casecmp('t')&.zero?),
+          authorization: response[:paystation_transaction_id]
         )
       end
 

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

@@ -347,8 +347,8 @@ module ActiveMerchant #:nodoc:
 
       def headers
         {
-          'Content-Type'  => 'application/json',
-          'Accept'  => 'application/json'
+          'Content-Type' => 'application/json',
+          'Accept' => 'application/json'
         }
       end
 
@@ -441,7 +441,7 @@ module ActiveMerchant #:nodoc:
           false,
           message_from('', false, response),
           response,
-          :test => test?
+          test: test?
         )
       end
 

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

@@ -17,7 +17,7 @@ module ActiveMerchant
         '3' => 'Rejected'
       }
 
-      RESPONSE_CODES= {
+      RESPONSE_CODES = {
         '00' => 'Completed Successfully',
         '01' => 'Refer to card issuer',
         '03' => 'Invalid merchant',
@@ -74,13 +74,13 @@ module ActiveMerchant
         'QZ' => 'Zero value transaction'
       }
 
-      TRANSACTIONS  = {
-        :authorize  => 'preauth',
-        :purchase   => 'capture',
-        :capture    => 'captureWithoutAuth',
-        :status     => 'query',
-        :refund     => 'refund',
-        :store      => 'registerAccount'
+      TRANSACTIONS = {
+        authorize: 'preauth',
+        purchase: 'capture',
+        capture: 'captureWithoutAuth',
+        status: 'query',
+        refund: 'refund',
+        store: 'registerAccount'
       }
 
       def initialize(options={})
@@ -193,15 +193,15 @@ module ActiveMerchant
         success = (params[:summary_code] ? (params[:summary_code] == '0') : (params[:response_code] == '00'))
 
         Response.new(success, message, params,
-          :test => (@options[:merchant].to_s == 'TEST'),
-          :authorization => post[:order_number]
+          test: (@options[:merchant].to_s == 'TEST'),
+          authorization: post[:order_number]
         )
       rescue ActiveMerchant::ResponseError => e
         raise unless e.response.code == '403'
 
-        return Response.new(false, 'Invalid credentials', {}, :test => test?)
+        return Response.new(false, 'Invalid credentials', {}, test: test?)
       rescue ActiveMerchant::ClientCertificateError
-        return Response.new(false, 'Invalid certificate', {}, :test => test?)
+        return Response.new(false, 'Invalid certificate', {}, test: test?)
       end
     end
   end

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

@@ -47,7 +47,7 @@ module ActiveMerchant #:nodoc:
 
       # Refund a transaction
       def refund(money, token, options = {})
-        commit(:post, "charges/#{CGI.escape(token)}/refunds", { :amount => amount(money) }, options)
+        commit(:post, "charges/#{CGI.escape(token)}/refunds", { amount: amount(money) }, options)
       end
 
       # Authorize an amount on a credit card. Once authorized, you can later
@@ -61,7 +61,7 @@ module ActiveMerchant #:nodoc:
       # Captures a previously authorized charge. Capturing only part of the original
       # authorization is currently not supported.
       def capture(money, token, options = {})
-        commit(:put, "charges/#{CGI.escape(token)}/capture", { :amount => amount(money) }, options)
+        commit(:put, "charges/#{CGI.escape(token)}/capture", { amount: amount(money) }, options)
       end
 
       # Updates the credit card for the customer.
@@ -107,11 +107,11 @@ module ActiveMerchant #:nodoc:
 
         post[:card] ||= {}
         post[:card].merge!(
-          :address_line1 => address[:address1],
-          :address_city => address[:city],
-          :address_postcode => address[:zip],
-          :address_state => address[:state],
-          :address_country => address[:country]
+          address_line1: address[:address1],
+          address_city: address[:city],
+          address_postcode: address[:zip],
+          address_state: address[:state],
+          address_country: address[:country]
         )
       end
 
@@ -131,11 +131,11 @@ module ActiveMerchant #:nodoc:
           post[:card] ||= {}
 
           post[:card].merge!(
-            :number => creditcard.number,
-            :expiry_month => creditcard.month,
-            :expiry_year => creditcard.year,
-            :cvc => creditcard.verification_value,
-            :name => creditcard.name
+            number: creditcard.number,
+            expiry_month: creditcard.month,
+            expiry_year: creditcard.year,
+            cvc: creditcard.verification_value,
+            name: creditcard.name
           )
         elsif creditcard.kind_of?(String)
           if creditcard =~ /^card_/
@@ -194,8 +194,8 @@ module ActiveMerchant #:nodoc:
           true,
           response['status_message'],
           body,
-          :authorization => token(response),
-          :test => test?
+          authorization: token(response),
+          test: test?
         )
       end
 
@@ -204,8 +204,8 @@ module ActiveMerchant #:nodoc:
           false,
           body['error_description'],
           body,
-          :authorization => nil,
-          :test => test?
+          authorization: nil,
+          test: test?
         )
       end
 

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

@@ -80,12 +80,12 @@ module ActiveMerchant
       }
 
       TRANSACTIONS = {
-        :authorization => 'auth',
-        :purchase => 'auth',
-        :capture => 'mark',
-        :void => 'void',
-        :refund => 'return',
-        :credit => 'newreturn'
+        authorization: 'auth',
+        purchase: 'auth',
+        capture: 'mark',
+        void: 'void',
+        refund: 'return',
+        credit: 'newreturn'
       }
 
       SUCCESS_CODES = ['pending', 'success']
@@ -179,10 +179,10 @@ module ActiveMerchant
         message = success ? 'Success' : message_from(response)
 
         Response.new(success, message, response,
-          :test => test?,
-          :authorization => response[:orderid],
-          :avs_result => { :code => response[:avs_code] },
-          :cvv_result => response[:cvvresp]
+          test: test?,
+          authorization: response[:orderid],
+          avs_result: { code: response[:avs_code] },
+          cvv_result: response[:cvvresp]
         )
       end
 

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

@@ -103,10 +103,10 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url, post_data(money, creditcard, options)))
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => build_authorization(response),
-          :avs_result => { :code => response[:avsresult] },
-          :cvv_result => response[:cardidresult]
+          test: test?,
+          authorization: build_authorization(response),
+          avs_result: { code: response[:avsresult] },
+          cvv_result: response[:cardidresult]
         )
       end
 
@@ -119,7 +119,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(xml)
-        response = {:message => 'Global Error Receipt', :complete => false}
+        response = {message: 'Global Error Receipt', complete: false}
 
         xml = REXML::Document.new(xml)
         xml.elements.each('//Result/*') do |node|
@@ -144,26 +144,26 @@ module ActiveMerchant #:nodoc:
       def parameters(money, creditcard, options = {})
         params = {
           # General order parameters
-          :StoreID => @options[:login],
-          :Passphrase => @options[:password],
-          :TestResult => options[:test_result],
-          :OrderID => options[:order_id],
-          :UserID => options[:user_id],
-          :Phone => options[:phone],
-          :Fax => options[:fax],
-          :Email => options[:email],
-          :TransRefNumber => options[:trans_ref_number],
+          StoreID: @options[:login],
+          Passphrase: @options[:password],
+          TestResult: options[:test_result],
+          OrderID: options[:order_id],
+          UserID: options[:user_id],
+          Phone: options[:phone],
+          Fax: options[:fax],
+          Email: options[:email],
+          TransRefNumber: options[:trans_ref_number],
 
           # Credit Card parameters
-          :PaymentType => 'CC',
-          :CardAction => options[:CardAction],
+          PaymentType: 'CC',
+          CardAction: options[:CardAction],
 
           # Financial parameters
-          :CustomerIP => options[:ip],
-          :SubTotal => amount(money),
-          :Tax1 => options[:tax1],
-          :Tax2 => options[:tax2],
-          :ShippingTotal => options[:shipping_total],
+          CustomerIP: options[:ip],
+          SubTotal: amount(money),
+          Tax1: options[:tax1],
+          Tax2: options[:tax2],
+          ShippingTotal: options[:shipping_total],
         }
 
         if creditcard
@@ -172,11 +172,11 @@ module ActiveMerchant #:nodoc:
           card_id_code = (creditcard.verification_value.blank? ? nil : '1')
 
           params.update(
-            :CardNumber => creditcard.number,
-            :CardExpMonth => exp_month,
-            :CardExpYear => exp_year,
-            :CardIDCode => card_id_code,
-            :CardIDNumber => creditcard.verification_value
+            CardNumber: creditcard.number,
+            CardExpMonth: exp_month,
+            CardExpYear: exp_year,
+            CardIDCode: card_id_code,
+            CardIDNumber: creditcard.verification_value
           )
         end
 

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

@@ -260,10 +260,10 @@ module ActiveMerchant
         response = parse(ssl_post(self.live_url, post_data(request)))
 
         Response.new(response[:ResponseCode] == APPROVED, response[:Message], response,
-          :test => test?,
-          :authorization => response[:CrossReference],
-          :cvv_result => CVV_CODE[response[:AVSCV2Check]],
-          :avs_result => { :code => AVS_CODE[response[:AVSCV2Check]] }
+          test: test?,
+          authorization: response[:CrossReference],
+          cvv_result: CVV_CODE[response[:AVSCV2Check]],
+          avs_result: { code: AVS_CODE[response[:AVSCV2Check]] }
         )
       end
 

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

@@ -15,12 +15,12 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['US']
 
       TYPES = {
-        :authorize => 'CustomerCreditCardAuth',
-        :capture   => 'CustomerCreditCardCapture',
-        :purchase  => 'CustomerCreditCardCharge',
-        :refund    => 'CustomerCreditCardTxnVoidOrRefund',
-        :void      => 'CustomerCreditCardTxnVoid',
-        :query     => 'MerchantAccountQuery',
+        authorize: 'CustomerCreditCardAuth',
+        capture: 'CustomerCreditCardCapture',
+        purchase: 'CustomerCreditCardCharge',
+        refund: 'CustomerCreditCardTxnVoidOrRefund',
+        void: 'CustomerCreditCardTxnVoid',
+        query: 'MerchantAccountQuery',
       }
 
       # Creates a new QbmsGateway
@@ -51,7 +51,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>options</tt> -- A hash of optional parameters.
       #
       def authorize(money, creditcard, options = {})
-        commit(:authorize, money, options.merge(:credit_card => creditcard))
+        commit(:authorize, money, options.merge(credit_card: creditcard))
       end
 
       # Perform a purchase, which is essentially an authorization and capture in a single operation.
@@ -63,7 +63,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>options</tt> -- A hash of optional parameters.
       #
       def purchase(money, creditcard, options = {})
-        commit(:purchase, money, options.merge(:credit_card => creditcard))
+        commit(:purchase, money, options.merge(credit_card: creditcard))
       end
 
       # Captures the funds from an authorized transaction.
@@ -74,7 +74,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>authorization</tt> -- The authorization returned from the previous authorize request.
       #
       def capture(money, authorization, options = {})
-        commit(:capture, money, options.merge(:transaction_id => authorization))
+        commit(:capture, money, options.merge(transaction_id: authorization))
       end
 
       # Void a previous transaction
@@ -84,7 +84,7 @@ module ActiveMerchant #:nodoc:
       # * <tt>authorization</tt> - The authorization returned from the previous authorize request.
       #
       def void(authorization, options = {})
-        commit(:void, nil, options.merge(:transaction_id => authorization))
+        commit(:void, nil, options.merge(transaction_id: authorization))
       end
 
       # Credit an account.
@@ -105,7 +105,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, identification, options = {})
-        commit(:refund, money, options.merge(:transaction_id => identification))
+        commit(:refund, money, options.merge(transaction_id: identification))
       end
 
       # Query the merchant account status
@@ -143,11 +143,11 @@ module ActiveMerchant #:nodoc:
         message = (response[:status_message] || '').strip
 
         Response.new(success?(response), message, response,
-          :test          => test?,
-          :authorization => response[:credit_card_trans_id],
-          :fraud_review  => fraud_review?(response),
-          :avs_result    => { :code => avs_result(response) },
-          :cvv_result    => cvv_result(response)
+          test: test?,
+          authorization: response[:credit_card_trans_id],
+          fraud_review: fraud_review?(response),
+          avs_result: { code: avs_result(response) },
+          cvv_result: cvv_result(response)
         )
       end
 
@@ -167,16 +167,16 @@ module ActiveMerchant #:nodoc:
 
         if status_code != 0
           return {
-            :status_code    => status_code,
-            :status_message => signon.attributes['statusMessage'],
+            status_code: status_code,
+            status_message: signon.attributes['statusMessage'],
           }
         end
 
         response = REXML::XPath.first(xml, "//QBMSXMLMsgsRs/#{type}Rs")
 
         results = {
-          :status_code    => response.attributes['statusCode'].to_i,
-          :status_message => response.attributes['statusMessage'],
+          status_code: response.attributes['statusCode'].to_i,
+          status_message: response.attributes['statusMessage'],
         }
 
         response.elements.each do |e|
@@ -195,10 +195,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_request(type, money, parameters = {})
-        xml = Builder::XmlMarkup.new(:indent => 0)
+        xml = Builder::XmlMarkup.new(indent: 0)
 
-        xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
-        xml.instruct!(:qbmsxml, :version => API_VERSION)
+        xml.instruct!(:xml, version: '1.0', encoding: 'utf-8')
+        xml.instruct!(:qbmsxml, version: API_VERSION)
 
         xml.tag!('QBMSXML') do
           xml.tag!('SignonMsgsRq') do