activemerchant 1.105.0 → 1.107.4

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

@@ -122,14 +122,14 @@ module ActiveMerchant #:nodoc:
         test_mode = test? || message =~ /TESTMODE/
 
         Response.new(success?(response), message, response,
-          :test => test_mode,
-          :authorization => response['TrackingNumber'],
-          :fraud_review => fraud_review?(response),
-          :avs_result => {
-            :postal_match => AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
-            :street_match => AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
+          test: test_mode,
+          authorization: response['TrackingNumber'],
+          fraud_review: fraud_review?(response),
+          avs_result: {
+            postal_match: AVS_POSTAL_CODES[response['AVSPostalResponseCode']],
+            street_match: AVS_ADDRESS_CODES[response['AVSAddressResponseCode']]
           },
-          :cvv_result => CVV2_CODES[response['CVV2ResponseCode']]
+          cvv_result: CVV2_CODES[response['CVV2ResponseCode']]
         )
       end
 

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

@@ -208,8 +208,8 @@ module ActiveMerchant #:nodoc:
           message_from(response),
           response,
           authorization: response['transaction_id'],
-          :avs_result => AVSResult.new(code: response['avs_response']),
-          :cvv_result => CVVResult.new(response['cvv2_response']),
+          avs_result: AVSResult.new(code: response['avs_response']),
+          cvv_result: CVVResult.new(response['cvv2_response']),
           test: test?
         )
       rescue JSON::ParserError

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

@@ -201,7 +201,7 @@ module ActiveMerchant #:nodoc:
         xml = Builder::XmlMarkup.new
         xml.instruct!
 
-        xml.tag! 'protocol', :ver => API_VERSION, :pgid => (test? ? TEST_ID : @options[:login]), :pwd => @options[:password] do |protocol|
+        xml.tag! 'protocol', ver: API_VERSION, pgid: (test? ? TEST_ID : @options[:login]), pwd: @options[:password] do |protocol|
           money         = options.delete(:money)
           authorization = options.delete(:authorization)
           creditcard    = options.delete(:creditcard)
@@ -222,29 +222,29 @@ module ActiveMerchant #:nodoc:
 
       def build_authorization(xml, money, creditcard, options={})
         xml.tag! 'authtx', {
-          :cref  => options[:order_id],
-          :cname => creditcard.name,
-          :cc    => creditcard.number,
-          :exp   => "#{format(creditcard.month, :two_digits)}#{format(creditcard.year, :four_digits)}",
-          :budp  => 0,
-          :amt   => amount(money),
-          :cur   => (options[:currency] || currency(money)),
-          :cvv   => creditcard.verification_value,
-          :email => options[:email],
-          :ip    => options[:ip]
+          cref: options[:order_id],
+          cname: creditcard.name,
+          cc: creditcard.number,
+          exp: "#{format(creditcard.month, :two_digits)}#{format(creditcard.year, :four_digits)}",
+          budp: 0,
+          amt: amount(money),
+          cur: (options[:currency] || currency(money)),
+          cvv: creditcard.verification_value,
+          email: options[:email],
+          ip: options[:ip]
         }
       end
 
       def build_capture(xml, money, authorization, options={})
         xml.tag! 'settletx', {
-          :tid => authorization
+          tid: authorization
         }
       end
 
       def build_refund(xml, money, authorization, options={})
         xml.tag! 'refundtx', {
-          :tid => authorization,
-          :amt => amount(money)
+          tid: authorization,
+          amt: amount(money)
         }
       end
 
@@ -265,8 +265,8 @@ module ActiveMerchant #:nodoc:
       def commit(action, request, authorization = nil)
         response = parse(action, ssl_post(self.live_url, request))
         Response.new(successful?(response), message_from(response), response,
-          :test           => test?,
-          :authorization  => authorization || response[:tid]
+          test: test?,
+          authorization: authorization || response[:tid]
         )
       end
 

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

@@ -165,7 +165,7 @@ module ActiveMerchant #:nodoc:
       # transaction_id that can be used later to postauthorize (capture) the funds.
       def authorize(money, payment_source, options = {})
         parameters = {
-          :transaction_amount => amount(money),
+          transaction_amount: amount(money),
         }
 
         add_payment_source(parameters, payment_source)
@@ -178,7 +178,7 @@ module ActiveMerchant #:nodoc:
       # Execute authorization and capture in a single step.
       def purchase(money, payment_source, options = {})
         parameters = {
-          :transaction_amount => amount(money),
+          transaction_amount: amount(money),
         }
 
         add_payment_source(parameters, payment_source)
@@ -191,8 +191,8 @@ module ActiveMerchant #:nodoc:
       # Retrieve funds that have been previously authorized with _authorization_
       def capture(money, authorization, options = {})
         parameters = {
-          :transaction_id => authorization,
-          :posture => 'capture'
+          transaction_id: authorization,
+          posture: 'capture'
         }
 
         add_optional_fields(parameters, options)
@@ -203,8 +203,8 @@ module ActiveMerchant #:nodoc:
       # _authorization_ should be the transaction id of the transaction we are returning.
       def refund(money, authorization, options = {})
         parameters = {
-          :transaction_amount => amount(money),
-          :transaction_id => authorization
+          transaction_amount: amount(money),
+          transaction_id: authorization
         }
 
         commit('CREDIT', parameters)
@@ -219,8 +219,8 @@ module ActiveMerchant #:nodoc:
       # through the batch process.
       def void(authorization, options = {})
         parameters = {
-          :transaction_id => authorization,
-          :posture => 'void'
+          transaction_id: authorization,
+          posture: 'void'
         }
 
         add_optional_fields(parameters, options)
@@ -263,12 +263,12 @@ module ActiveMerchant #:nodoc:
         end
 
         parameters = {
-          :transaction_amount => amount(money),
-          :schedule_periodic_type => periodic_type,
-          :schedule_create => 'true',
-          :schedule_limit => options[:payments].to_i > 1 ? options[:payments] : 1,
-          :schedule_periodic_number => 1,
-          :schedule_start => start_date
+          transaction_amount: amount(money),
+          schedule_periodic_type: periodic_type,
+          schedule_create: 'true',
+          schedule_limit: options[:payments].to_i > 1 ? options[:payments] : 1,
+          schedule_periodic_number: 1,
+          schedule_start: start_date
         }
 
         add_payment_source(parameters, payment_source)
@@ -338,8 +338,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test?,
-          :authorization => response[:transaction_id] || parameters[:transaction_id]
+          test: test?,
+          authorization: response[:transaction_id] || parameters[:transaction_id]
         )
       end
 

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

@@ -21,6 +21,7 @@ module ActiveMerchant #:nodoc:
         post = {}
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method)
+        add_address(post, options)
 
         commit('purchase', post)
       end
@@ -30,6 +31,7 @@ module ActiveMerchant #:nodoc:
         post[:status] = 'HOLD'
         add_invoice(post, amount, options)
         add_payment_method(post, payment_method)
+        add_address(post, options)
 
         commit('authorize', post)
       end
@@ -110,6 +112,20 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def add_address(post, options)
+        if address = options[:billing_address]
+          post[:billingFirstName] = address[:first_name] if address[:first_name]
+          post[:billingLastName] = address[:last_name] if address[:last_name]
+          post[:billingCompanyName] = address[:company] if address[:company]
+          post[:billingPhone] = address[:phone_number] if address[:phone_number]
+          post[:billingAddress] = address[:address1] if address[:address1]
+          post[:billingCity] = address[:city] if address[:city]
+          post[:billingState] = address[:state] if address[:state]
+          post[:billingCountry] = address[:country] if address[:country]
+          post[:billingZip] = address[:zip] if address[:zip]
+        end
+      end
+
       def commit(action, params)
         response =
           begin
@@ -141,8 +157,8 @@ module ActiveMerchant #:nodoc:
         {
           'Authorization' => 'Basic ' + Base64.encode64("#{@options[:api_login]}:#{@options[:api_password]}").strip,
           'Content-Type'  => 'application/x-www-form-urlencoded;charset=UTF-8',
-          'Accept'  => 'application/json',
-          'X-PJ-Application-Key'  => @options[:api_key].to_s
+          'Accept' => 'application/json',
+          'X-PJ-Application-Key' => @options[:api_key].to_s
         }
       end
 

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

@@ -8,10 +8,10 @@ module ActiveMerchant #:nodoc:
       # Currently Authorization and Capture is not implemented because
       # capturing requires the original credit card information
       TRANSACTIONS = {
-        :purchase       => 'PURCHASE',
-        :authorization  => 'AUTHORISE',
-        :capture        => 'ADVICE',
-        :credit         => 'REFUND'
+        purchase: 'PURCHASE',
+        authorization: 'AUTHORISE',
+        capture: 'ADVICE',
+        credit: 'REFUND'
       }
 
       SUCCESS = 'Accepted'
@@ -69,8 +69,8 @@ module ActiveMerchant #:nodoc:
         response = parse(ssl_post(self.live_url, post_data(action, parameters)))
 
         Response.new(successful?(response), message_from(response), response,
-          :test => test_response?(response),
-          :authorization => authorization_from(response)
+          test: test_response?(response),
+          authorization: authorization_from(response)
         )
       end
 

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

@@ -12,30 +12,30 @@ module ActiveMerchant #:nodoc:
 
       # Transactions hash
       TRANSACTIONS = {
-        :authorization => '00001',
-        :capture => '00002',
-        :purchase => '00003',
-        :unreferenced_credit => '00004',
-        :void => '00005',
-        :refund => '00014'
+        authorization: '00001',
+        capture: '00002',
+        purchase: '00003',
+        unreferenced_credit: '00004',
+        void: '00005',
+        refund: '00014'
       }
 
       CURRENCY_CODES = {
-        'AUD'=> '036',
-        'CAD'=> '124',
-        'CZK'=> '203',
-        'DKK'=> '208',
-        'HKD'=> '344',
-        'ICK'=> '352',
-        'JPY'=> '392',
-        'NOK'=> '578',
-        'SGD'=> '702',
-        'SEK'=> '752',
-        'CHF'=> '756',
-        'GBP'=> '826',
-        'USD'=> '840',
-        'EUR'=> '978',
-        'XPF'=> '953'
+        'AUD' => '036',
+        'CAD' => '124',
+        'CZK' => '203',
+        'DKK' => '208',
+        'HKD' => '344',
+        'ICK' => '352',
+        'JPY' => '392',
+        'NOK' => '578',
+        'SGD' => '702',
+        'SEK' => '752',
+        'CHF' => '756',
+        'GBP' => '826',
+        'USD' => '840',
+        'EUR' => '978',
+        'XPF' => '953'
       }
 
       SUCCESS_CODES = ['00000']
@@ -95,7 +95,7 @@ module ActiveMerchant #:nodoc:
 
       def void(identification, options = {})
         requires!(options, :order_id, :amount)
-        post ={}
+        post = {}
         add_invoice(post, options)
         add_reference(post, identification)
         add_amount(post, options[:amount], options)
@@ -156,11 +156,11 @@ module ActiveMerchant #:nodoc:
         Response.new(
           success?(response),
           message_from(response),
-          response.merge(:timestamp => parameters[:dateq]),
-          :test => test?,
-          :authorization => response[:numappel].to_s + response[:numtrans].to_s,
-          :fraud_review => false,
-          :sent_params => parameters.delete_if { |key, value| ['porteur', 'dateval', 'cvv'].include?(key.to_s) }
+          response.merge(timestamp: parameters[:dateq]),
+          test: test?,
+          authorization: response[:numappel].to_s + response[:numtrans].to_s,
+          fraud_review: false,
+          sent_params: parameters.delete_if { |key, value| ['porteur', 'dateval', 'cvv'].include?(key.to_s) }
         )
       end
 
@@ -178,15 +178,15 @@ module ActiveMerchant #:nodoc:
 
       def post_data(action, parameters = {})
         parameters.update(
-          :version => API_VERSION,
-          :type => TRANSACTIONS[action.to_sym],
-          :dateq => Time.now.strftime('%d%m%Y%H%M%S'),
-          :numquestion => unique_id(parameters[:order_id]),
-          :site => @options[:login].to_s[0, 7],
-          :rang => @options[:rang] || @options[:login].to_s[7..-1],
-          :cle => @options[:password],
-          :pays => '',
-          :archivage => parameters[:order_id]
+          version: API_VERSION,
+          type: TRANSACTIONS[action.to_sym],
+          dateq: Time.now.strftime('%d%m%Y%H%M%S'),
+          numquestion: unique_id(parameters[:order_id]),
+          site: @options[:login].to_s[0, 7],
+          rang: @options[:rang] || @options[:login].to_s[7..-1],
+          cle: @options[:password],
+          pays: '',
+          archivage: parameters[:order_id]
         )
 
         parameters.collect { |key, value| "#{key.to_s.upcase}=#{CGI.escape(value.to_s)}" }.join('&')

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

@@ -80,21 +80,21 @@ module ActiveMerchant #:nodoc:
         request = build_recurring_request(options[:profile_id] ? :modify : :add, money, options) do |xml|
           add_credit_card(xml, credit_card, options) if credit_card
         end
-        commit(request, options.merge(:request_type => :recurring))
+        commit(request, options.merge(request_type: :recurring))
       end
 
       def cancel_recurring(profile_id)
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        request = build_recurring_request(:cancel, 0, :profile_id => profile_id)
-        commit(request, options.merge(:request_type => :recurring))
+        request = build_recurring_request(:cancel, 0, profile_id: profile_id)
+        commit(request, options.merge(request_type: :recurring))
       end
 
       def recurring_inquiry(profile_id, options = {})
         ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
 
-        request = build_recurring_request(:inquiry, nil, options.update(:profile_id => profile_id))
-        commit(request, options.merge(:request_type => :recurring))
+        request = build_recurring_request(:inquiry, nil, options.update(profile_id: profile_id))
+        commit(request, options.merge(request_type: :recurring))
       end
 
       def express
@@ -136,7 +136,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'Description', options[:description] unless options[:description].blank?
               xml.tag! 'OrderDesc', options[:order_desc] unless options[:order_desc].blank?
               xml.tag! 'Comment', options[:comment] unless options[:comment].blank?
-              xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
+              xml.tag!('ExtData', 'Name' => 'COMMENT2', 'Value' => options[:comment2]) unless options[:comment2].blank?
               xml.tag! 'TaxAmt', options[:taxamt] unless options[:taxamt].blank?
               xml.tag! 'FreightAmt', options[:freightamt] unless options[:freightamt].blank?
               xml.tag! 'DutyAmt', options[:dutyamt] unless options[:dutyamt].blank?
@@ -169,7 +169,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'OrderDesc', options[:order_desc] unless options[:order_desc].blank?
               # Comment and Comment2 will show up in manager.paypal.com as Comment1 and Comment2
               xml.tag! 'Comment', options[:comment] unless options[:comment].blank?
-              xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
+              xml.tag!('ExtData', 'Name' => 'COMMENT2', 'Value' => options[:comment2]) unless options[:comment2].blank?
               xml.tag! 'TaxAmt', options[:taxamt] unless options[:taxamt].blank?
               xml.tag! 'FreightAmt', options[:freightamt] unless options[:freightamt].blank?
               xml.tag! 'DutyAmt', options[:dutyamt] unless options[:dutyamt].blank?

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

@@ -37,20 +37,20 @@ module ActiveMerchant #:nodoc:
       XMLNS = 'http://www.paypal.com/XMLPay'
 
       CARD_MAPPING = {
-        :visa => 'Visa',
-        :master => 'MasterCard',
-        :discover => 'Discover',
-        :american_express => 'Amex',
-        :jcb => 'JCB',
-        :diners_club => 'DinersClub',
+        visa: 'Visa',
+        master: 'MasterCard',
+        discover: 'Discover',
+        american_express: 'Amex',
+        jcb: 'JCB',
+        diners_club: 'DinersClub',
       }
 
       TRANSACTIONS = {
-        :purchase       => 'Sale',
-        :authorization  => 'Authorization',
-        :capture        => 'Capture',
-        :void           => 'Void',
-        :credit         => 'Credit'
+        purchase: 'Sale',
+        authorization: 'Authorization',
+        capture: 'Capture',
+        void: 'Void',
+        credit: 'Credit'
       }
 
       CVV_CODE = {
@@ -117,7 +117,7 @@ module ActiveMerchant #:nodoc:
               xml.tag!('TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money))
               xml.tag!('Description', options[:description]) unless options[:description].blank?
               xml.tag!('Comment', options[:comment]) unless options[:comment].blank?
-              xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].blank?
+              xml.tag!('ExtData', 'Name' => 'COMMENT2', 'Value' => options[:comment2]) unless options[:comment2].blank?
               xml.tag!(
                 'ExtData',
                 'Name' => 'CAPTURECOMPLETE',

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

@@ -110,7 +110,7 @@ module ActiveMerchant #:nodoc:
       private
 
       def build_get_express_details_request(token)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'GetExpressCheckout' do
           xml.tag! 'Authorization' do
             xml.tag! 'PayData' do
@@ -126,7 +126,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_setup_express_sale_or_authorization_request(action, money, options = {})
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'SetExpressCheckout' do
           xml.tag! action do
             add_pay_data xml, money, options
@@ -136,7 +136,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_sale_or_authorization_request(action, money, options)
-        xml = Builder::XmlMarkup.new :indent => 2
+        xml = Builder::XmlMarkup.new indent: 2
         xml.tag! 'DoExpressCheckout' do
           xml.tag! action do
             add_pay_data xml, money, options
@@ -155,7 +155,7 @@ module ActiveMerchant #:nodoc:
             # Comment, Comment2 should make it to the backend at manager.paypal.com, as with Payflow credit card transactions
             # but that doesn't seem to work (yet?). See: https://www.x.com/thread/51908?tstart=0
             xml.tag! 'Comment', options[:comment] unless options[:comment].nil?
-            xml.tag!('ExtData', 'Name'=> 'COMMENT2', 'Value'=> options[:comment2]) unless options[:comment2].nil?
+            xml.tag!('ExtData', 'Name' => 'COMMENT2', 'Value' => options[:comment2]) unless options[:comment2].nil?
 
             billing_address = options[:billing_address] || options[:address]
             add_address(xml, 'BillTo', billing_address, options) if billing_address