activemerchant 1.42.6 → 1.90.0

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

@@ -1,70 +1,67 @@
-require File.dirname(__FILE__) + '/payflow/payflow_common_api'
-require File.dirname(__FILE__) + '/payflow/payflow_express_response'
-require File.dirname(__FILE__) + '/paypal_express_common'
+require 'active_merchant/billing/gateways/payflow/payflow_common_api'
+require 'active_merchant/billing/gateways/payflow/payflow_express_response'
+require 'active_merchant/billing/gateways/paypal_express_common'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-      # ==General Parameters
-      # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
-      # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.
-      #
-      # This information was gleaned from a mix of:
-      # * PayFlow documentation
-      #   * for key value pairs: {Express Checkout for Payflow Pro (PDF)}[https://cms.paypal.com/cms_content/US/en_US/files/developer/PFP_ExpressCheckout_PP.pdf]
-      #   * XMLPay: {Payflow Pro XMLPay Developer's Guide (PDF)}[https://cms.paypal.com/cms_content/US/en_US/files/developer/PP_PayflowPro_XMLPay_Guide.pdf]
-      # * previous ActiveMerchant code
-      # * trial & error
-      #
-      # The following parameters are currently supported.
-      # [<tt>:ip</tt>] (opt) Customer IP Address
-      # [<tt>:order_id</tt>] (opt) An order or invoice number. This will be passed through to the Payflow backend at manager.paypal.com, and show up as "Supplier Reference #"
-      # [<tt>:description</tt>] (opt) Order description, shown to buyer (after redirected to PayPal). If Order Line Items are used (see below), then the description is suppressed. This will not be passed through to the Payflow backend.
-      # [<tt>:billing_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
-      # [<tt>:shipping_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
-      # [<tt>:currency</tt>] (req) Currency of transaction, will be set to USD by default for PayFlow Express if not specified
-      # [<tt>:email</tt>] (opt) Email of buyer; used to pre-fill PayPal login screen
-      # [<tt>:payer_id</tt>] (opt) Unique PayPal buyer account identification number, as returned by details_for request
-      # [<tt>:token</tt>] (req for #authorize & #purchase) Token returned by setup transaction
-      # [<tt>:no_shipping</tt>] (opt) Boolean for whether or not to display shipping address to buyer
-      # [<tt>:address_override</tt>] (opt) Boolean. If true, display shipping address passed by parameters, rather than shipping address on file with PayPal
-      # [<tt>:allow_note</tt>] (opt) Boolean for permitting buyer to add note during checkout. Note contents can be retrieved with details_for transaction
-      # [<tt>:return_url</tt>] (req) URL to which the buyer’s browser is returned after choosing to pay.
-      # [<tt>:cancel_return_url</tt>] (req) URL to which the buyer is returned if the buyer cancels the order.
-      # [<tt>:notify_url</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:comment</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment1
-      # [<tt>:comment2</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment2
-      # [<tt>:discount</tt>] (opt) Total discounts in cents
-      #
-      # ==Line Items
-      # Support for order line items is available, but has to be enabled on the PayFlow backend. This is what I was told by Todd Sieber at Technical Support:
-      #
-      # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
-      #
-      # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
-      #     
-      # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
-      #
-      #
-      #
-      #                   The following keys are supported for line items:
-      #                   [<tt>:name</tt>] Name of line item
-      #                   [<tt>:description</tt>] Description of line item
-      #                   [<tt>:amount</tt>] Line Item Amount in Cents (as Integer)
-      #                   [<tt>:quantity</tt>] Line Item Quantity (default to 1 if left blank)
-      #
-      # ====Customization of Payment Page
-      # [<tt>:page_style</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:header_image</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # ====Additional options for old Checkout Experience, being phased out in 2010 and 2011
-      # [<tt>:header_background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-      # [<tt>:header_border_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
-
+    # ==General Parameters
+    # The following parameters are supported for #setup_authorization, #setup_purchase, #authorize and #purchase transactions. I've read
+    # in the docs that they recommend you pass the exact same parameters to both setup and authorize/purchase.
+    #
+    # This information was gleaned from a mix of:
+    # * {PayFlow documentation}[https://developer.paypal.com/docs/classic/payflow/integration-guide/]
+    # * previous ActiveMerchant code
+    # * trial & error
+    #
+    # The following parameters are currently supported.
+    # [<tt>:ip</tt>] (opt) Customer IP Address
+    # [<tt>:order_id</tt>] (opt) An order or invoice number. This will be passed through to the Payflow backend at manager.paypal.com, and show up as "Supplier Reference #"
+    # [<tt>:description</tt>] (opt) Order description, shown to buyer (after redirected to PayPal). If Order Line Items are used (see below), then the description is suppressed. This will not be passed through to the Payflow backend.
+    # [<tt>:billing_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+    # [<tt>:shipping_address</tt>] (opt) See ActiveMerchant::Billing::Gateway for details
+    # [<tt>:currency</tt>] (req) Currency of transaction, will be set to USD by default for PayFlow Express if not specified
+    # [<tt>:email</tt>] (opt) Email of buyer; used to pre-fill PayPal login screen
+    # [<tt>:payer_id</tt>] (opt) Unique PayPal buyer account identification number, as returned by details_for request
+    # [<tt>:token</tt>] (req for #authorize & #purchase) Token returned by setup transaction
+    # [<tt>:no_shipping</tt>] (opt) Boolean for whether or not to display shipping address to buyer
+    # [<tt>:address_override</tt>] (opt) Boolean. If true, display shipping address passed by parameters, rather than shipping address on file with PayPal
+    # [<tt>:allow_note</tt>] (opt) Boolean for permitting buyer to add note during checkout. Note contents can be retrieved with details_for transaction
+    # [<tt>:return_url</tt>] (req) URL to which the buyer’s browser is returned after choosing to pay.
+    # [<tt>:cancel_return_url</tt>] (req) URL to which the buyer is returned if the buyer cancels the order.
+    # [<tt>:notify_url</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:comment</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment1
+    # [<tt>:comment2</tt>] (opt) Comment field which will be reported to Payflow backend (at manager.paypal.com) as Comment2
+    # [<tt>:discount</tt>] (opt) Total discounts in cents
+    #
+    # ==Line Items
+    # Support for order line items is available, but has to be enabled on the PayFlow backend. This is what I was told by Todd Sieber at Technical Support:
+    #
+    # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
+    #
+    # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
+    #
+    # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
+    #
+    #
+    #
+    #                   The following keys are supported for line items:
+    #                   [<tt>:name</tt>] Name of line item
+    #                   [<tt>:description</tt>] Description of line item
+    #                   [<tt>:amount</tt>] Line Item Amount in Cents (as Integer)
+    #                   [<tt>:quantity</tt>] Line Item Quantity (default to 1 if left blank)
+    #
+    # ====Customization of Payment Page
+    # [<tt>:page_style</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:header_image</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # ====Additional options for old Checkout Experience, being phased out in 2010 and 2011
+    # [<tt>:header_background_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
+    # [<tt>:header_border_color</tt>] (opt) Your URL for receiving Instant Payment Notification (IPN) about this transaction.
 
     class PayflowExpressGateway < Gateway
       include PayflowCommonAPI
       include PaypalExpressCommon
-      
+
       self.test_redirect_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr'
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
@@ -74,48 +71,49 @@ module ActiveMerchant #:nodoc:
         request = build_sale_or_authorization_request('Authorization', money, options)
         commit(request, options)
       end
-      
-      def purchase(money, options = {})        
+
+      def purchase(money, options = {})
         requires!(options, :token, :payer_id)
         request = build_sale_or_authorization_request('Sale', money, options)
         commit(request, options)
       end
-      
+
       def refund(money, identification, options = {})
         request = build_reference_request(:credit, money, identification, options)
         commit(request, options)
-      end        
+      end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
       def setup_authorization(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         request = build_setup_express_sale_or_authorization_request('Authorization', money, options)
         commit(request, options)
       end
-      
+
       def setup_purchase(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         request = build_setup_express_sale_or_authorization_request('Sale', money, options)
         commit(request, options)
       end
-      
+
       def details_for(token)
         request = build_get_express_details_request(token)
         commit(request, options)
       end
-      
+
       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  
+            xml.tag! 'PayData' do
               xml.tag! 'Tender' do
                 xml.tag! 'PayPal' do
                   xml.tag! 'Token', token
@@ -136,8 +134,8 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
-      def build_sale_or_authorization_request(action, money, options) 
+
+      def build_sale_or_authorization_request(action, money, options)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoExpressCheckout' do
           xml.tag! action do
@@ -178,11 +176,10 @@ module ActiveMerchant #:nodoc:
             end
             if items.any?
               xml.tag! 'ExtData', 'Name' => 'CURRENCY', 'Value' => options[:currency] || currency(money)
-              xml.tag! 'ExtData', 'Name' => "ITEMAMT", 'Value' => amount(options[:subtotal] || money)
+              xml.tag! 'ExtData', 'Name' => 'ITEMAMT', 'Value' => amount(options[:subtotal] || money)
             end
             xml.tag! 'DiscountAmt', amount(options[:discount]) if options[:discount]
             xml.tag! 'TotalAmt', amount(money), 'Currency' => options[:currency] || currency(money)
-
           end
 
           xml.tag! 'Tender' do
@@ -192,7 +189,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_paypal_details(xml, options)
-         xml.tag! 'PayPal' do
+        xml.tag! 'PayPal' do
           xml.tag! 'EMail', options[:email] unless options[:email].blank?
           xml.tag! 'ReturnURL', options[:return_url] unless options[:return_url].blank?
           xml.tag! 'CancelURL', options[:cancel_return_url] unless options[:cancel_return_url].blank?
@@ -201,8 +198,8 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Token', options[:token] unless options[:token].blank?
           xml.tag! 'NoShipping', options[:no_shipping] ? '1' : '0'
           xml.tag! 'AddressOverride', options[:address_override] ? '1' : '0'
-          xml.tag! 'ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank? 
-          
+          xml.tag! 'ButtonSource', application_id.to_s.slice(0, 32) unless application_id.blank?
+
           # Customization of the payment page
           xml.tag! 'PageStyle', options[:page_style] unless options[:page_style].blank?
           xml.tag! 'HeaderImage', options[:header_image] unless options[:header_image].blank?
@@ -214,11 +211,10 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExtData', 'Name' => 'ALLOWNOTE', 'Value' => options[:allow_note]
         end
       end
-      
+
       def build_response(success, message, response, options = {})
         PayflowExpressResponse.new(success, message, response, options)
       end
     end
   end
 end
-

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

@@ -1,15 +1,14 @@
-require File.dirname(__FILE__) + '/payflow_express'
+require 'active_merchant/billing/gateways/payflow_express'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PayflowExpressUkGateway < PayflowExpressGateway
       self.default_currency = 'GBP'
       self.partner = 'PayPalUk'
-      
+
       self.supported_countries = ['GB']
       self.homepage_url = 'https://www.paypal.com/uk/cgi-bin/webscr?cmd=_additional-payment-overview-outside'
       self.display_name = 'PayPal Express Checkout (UK)'
     end
   end
 end
-

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

@@ -1,21 +1,20 @@
-require File.dirname(__FILE__) + '/payflow'
-require File.dirname(__FILE__) + '/payflow_express_uk' 
+require 'active_merchant/billing/gateways/payflow'
+require 'active_merchant/billing/gateways/payflow_express_uk'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PayflowUkGateway < PayflowGateway
       self.default_currency = 'GBP'
       self.partner = 'PayPalUk'
-      
+
       def express
         @express ||= PayflowExpressUkGateway.new(@options)
       end
-      
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :solo, :switch]
+
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['GB']
       self.homepage_url = 'https://www.paypal.com/uk/webapps/mpp/pro'
       self.display_name = 'PayPal Payments Pro (UK)'
     end
   end
 end
-

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

@@ -2,7 +2,6 @@ require 'rexml/document'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
-
     # In NZ DPS supports ANZ, Westpac, National Bank, ASB and BNZ.
     # In Australia DPS supports ANZ, NAB, Westpac, CBA, St George and Bank of South Australia.
     # The Maybank in Malaysia is supported and the Citibank for Singapore.
@@ -16,12 +15,13 @@ module ActiveMerchant #:nodoc:
       # However, regular accounts with DPS only support VISA and Mastercard
       self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb ]
 
-      self.supported_countries = %w[ AU CA DE ES FR GB HK IE MY NL NZ SG US ZA ]
+      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.live_url = self.test_url = 'https://sec.paymentexpress.com/pxpost.aspx'
+      self.live_url = 'https://sec.paymentexpress.com/pxpost.aspx'
+      self.test_url = 'https://uat.paymentexpress.com/pxpost.aspx'
 
       APPROVED = '1'
 
@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -122,6 +122,18 @@ module ActiveMerchant #:nodoc:
         commit(:validate, request)
       end
 
+      def supports_scrubbing
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<PostPassword>).+(</PostPassword>)), '\1[FILTERED]\2').
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]\2').
+          gsub(%r((<CardNumber>)\d+(</CardNumber>)), '\1[FILTERED]\2').
+          gsub(%r((<Cvc2>)\d+(</Cvc2>)), '\1[FILTERED]\2')
+      end
+
       private
 
       def use_custom_payment_token?
@@ -157,73 +169,68 @@ module ActiveMerchant #:nodoc:
       def build_token_request(credit_card, options)
         result = new_transaction
         add_credit_card(result, credit_card)
-        add_amount(result, 100, options) #need to make an auth request for $1
+        add_amount(result, 100, options) # need to make an auth request for $1
         add_token_request(result, options)
         add_optional_elements(result, options)
         result
       end
 
       def add_credentials(xml)
-        xml.add_element("PostUsername").text = @options[:login]
-        xml.add_element("PostPassword").text = @options[:password]
+        xml.add_element('PostUsername').text = @options[:login]
+        xml.add_element('PostPassword').text = @options[:password]
       end
 
       def add_reference(xml, identification)
-        xml.add_element("DpsTxnRef").text = identification
+        xml.add_element('DpsTxnRef').text = identification
       end
 
       def add_credit_card(xml, credit_card)
-        xml.add_element("CardHolderName").text = credit_card.name
-        xml.add_element("CardNumber").text = credit_card.number
-        xml.add_element("DateExpiry").text = format_date(credit_card.month, credit_card.year)
+        xml.add_element('CardHolderName').text = credit_card.name
+        xml.add_element('CardNumber').text = credit_card.number
+        xml.add_element('DateExpiry').text = format_date(credit_card.month, credit_card.year)
 
         if credit_card.verification_value?
-          xml.add_element("Cvc2").text = credit_card.verification_value
-          xml.add_element("Cvc2Presence").text = "1"
-        end
-
-        if requires_start_date_or_issue_number?(credit_card)
-          xml.add_element("DateStart").text = format_date(credit_card.start_month, credit_card.start_year) unless credit_card.start_month.blank? || credit_card.start_year.blank?
-          xml.add_element("IssueNumber").text = credit_card.issue_number unless credit_card.issue_number.blank?
+          xml.add_element('Cvc2').text = credit_card.verification_value
+          xml.add_element('Cvc2Presence').text = '1'
         end
       end
 
       def add_billing_token(xml, token)
         if use_custom_payment_token?
-          xml.add_element("BillingId").text = token
+          xml.add_element('BillingId').text = token
         else
-          xml.add_element("DpsBillingId").text = token
+          xml.add_element('DpsBillingId').text = token
         end
       end
 
       def add_token_request(xml, options)
-        xml.add_element("BillingId").text = options[:billing_id] if options[:billing_id]
-        xml.add_element("EnableAddBillCard").text = 1
+        xml.add_element('BillingId').text = options[:billing_id] if options[:billing_id]
+        xml.add_element('EnableAddBillCard').text = 1
       end
 
       def add_amount(xml, money, options)
-        xml.add_element("Amount").text = amount(money)
-        xml.add_element("InputCurrency").text = options[:currency] || currency(money)
+        xml.add_element('Amount').text = amount(money)
+        xml.add_element('InputCurrency').text = options[:currency] || currency(money)
       end
 
       def add_transaction_type(xml, action)
-        xml.add_element("TxnType").text = TRANSACTIONS[action]
+        xml.add_element('TxnType').text = TRANSACTIONS[action]
       end
 
       def add_invoice(xml, options)
-        xml.add_element("TxnId").text = options[:order_id].to_s.slice(0, 16) unless options[:order_id].blank?
-        xml.add_element("MerchantReference").text = options[:description].to_s.slice(0, 50) unless options[:description].blank?
+        xml.add_element('TxnId').text = options[:order_id].to_s.slice(0, 16) unless options[:order_id].blank?
+        xml.add_element('MerchantReference').text = options[:description].to_s.slice(0, 50) unless options[:description].blank?
       end
 
       def add_address_verification_data(xml, options)
         address = options[:billing_address] || options[:address]
         return if address.nil?
 
-        xml.add_element("EnableAvsData").text = 1
-        xml.add_element("AvsAction").text = 1
+        xml.add_element('EnableAvsData').text = 1
+        xml.add_element('AvsAction').text = 1
 
-        xml.add_element("AvsStreetAddress").text = address[:address1]
-        xml.add_element("AvsPostCode").text = address[:zip]
+        xml.add_element('AvsStreetAddress').text = address[:address1]
+        xml.add_element('AvsPostCode').text = address[:zip]
       end
 
       # The options hash may contain optional data which will be passed
@@ -264,16 +271,16 @@ module ActiveMerchant #:nodoc:
       # +purchase+, +authorize+, +capture+, +refund+, +store+
       def add_optional_elements(xml, options)
         if client_type = normalized_client_type(options[:client_type])
-          xml.add_element("ClientType").text = client_type
+          xml.add_element('ClientType').text = client_type
         end
 
-        xml.add_element("TxnData1").text = options[:txn_data1].to_s.slice(0,255) unless options[:txn_data1].blank?
-        xml.add_element("TxnData2").text = options[:txn_data2].to_s.slice(0,255) unless options[:txn_data2].blank?
-        xml.add_element("TxnData3").text = options[:txn_data3].to_s.slice(0,255) unless options[:txn_data3].blank?
+        xml.add_element('TxnData1').text = options[:txn_data1].to_s.slice(0, 255) unless options[:txn_data1].blank?
+        xml.add_element('TxnData2').text = options[:txn_data2].to_s.slice(0, 255) unless options[:txn_data2].blank?
+        xml.add_element('TxnData3').text = options[:txn_data3].to_s.slice(0, 255) unless options[:txn_data3].blank?
       end
 
       def new_transaction
-        REXML::Document.new.add_element("Txn")
+        REXML::Document.new.add_element('Txn')
       end
 
       # Take in the request and post it to DPS
@@ -281,8 +288,10 @@ module ActiveMerchant #:nodoc:
         add_credentials(request)
         add_transaction_type(request, action)
 
+        url = test? ? self.test_url : self.live_url
+
         # Parse the XML response
-        response = parse( ssl_post(self.live_url, request.to_s) )
+        response = parse(ssl_post(url, request.to_s))
 
         # Return a response
         PaymentExpressResponse.new(response[:success] == APPROVED, message_from(response), response,
@@ -331,13 +340,13 @@ module ActiveMerchant #:nodoc:
 
       def normalized_client_type(client_type_from_options)
         case client_type_from_options.to_s.downcase
-          when 'web'        then "Web"
-          when 'ivr'        then "IVR"
-          when 'moto'       then "MOTO"
-          when 'unattended' then "Unattended"
-          when 'internet'   then "Internet"
-          when 'recurring'  then "Recurring"
-          else nil
+        when 'web'        then 'Web'
+        when 'ivr'        then 'IVR'
+        when 'moto'       then 'MOTO'
+        when 'unattended' then 'Unattended'
+        when 'internet'   then 'Internet'
+        when 'recurring'  then 'Recurring'
+        else nil
         end
       end
     end
@@ -346,7 +355,7 @@ module ActiveMerchant #:nodoc:
       # add a method to response so we can easily get the token
       # for Validate transactions
       def token
-        @params["billing_id"] || @params["dps_billing_id"]
+        @params['billing_id'] || @params['dps_billing_id']
       end
     end
   end