activemerchant 1.2.1 → 1.3.0

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

@@ -123,8 +123,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:cpp-header-border-color', options[:header_border_color] unless options[:header_border_color].blank?
               xml.tag! 'n2:cpp-payflow-color', options[:background_color] unless options[:background_color].blank?
               
-              # This should be set to the same locale as the shop
-              # localeCode          - String
+              xml.tag! 'n2:LocaleCode', options[:locale] unless options[:locale].blank?
             end
           end
         end

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

@@ -93,10 +93,6 @@ module ActiveMerchant
       SUCCESS_CODES = [ 'pending', 'success' ]
       FAILURE_CODES = [ 'badcard', 'fraud' ]
      
-      # URL
-      attr_reader :response
-      attr_reader :options
-      
       self.default_currency = 'USD'
       self.supported_countries = ['US']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
@@ -174,20 +170,16 @@ module ActiveMerchant
       
       private                                 
       def commit(action, post)
-        if result = test_result_from_cc_number(post[:card_number])
-          return result
-        end
-                   
-        data = ssl_post(URL, post_data(action, post))
-           
-        @response = parse(data)
+        response = parse( ssl_post(URL, post_data(action, post)) )
         
-        success = SUCCESS_CODES.include?(@response[:finalstatus])
-        message = success ? 'Success' : message_from(@response)
+        success = SUCCESS_CODES.include?(response[:finalstatus])
+        message = success ? 'Success' : message_from(response)
             
-        Response.new(success, message, @response, 
+        Response.new(success, message, response, 
           :test => test?, 
-          :authorization => @response[:orderid]
+          :authorization => response[:orderid],
+          :avs_result => { :code => response[:avs_code] },
+          :cvv_result => response[:cvvresp]
         )
       end
                                                

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

@@ -32,12 +32,13 @@ module ActiveMerchant #:nodoc:
       
       ELECTRON = /^(424519|42496[23]|450875|48440[6-8]|4844[1-5][1-5]|4917[3-5][0-9]|491880)\d{10}(\d{3})?$/
       
-      POST_HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded' }
-
-      attr_reader :url
-      attr_reader :response
-      attr_reader :options
-
+      AVS_CVV_CODE = {
+        "NOTPROVIDED" => nil, 
+        "NOTCHECKED" => 'X',
+        "MATCHED" => 'Y',
+        "NOTMATCHED" => 'N'
+      }
+    
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :solo, :maestro, :diners_club]
       self.supported_countries = ['GB']
       self.default_currency = 'GBP'
@@ -212,29 +213,27 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, parameters)
-        if result = test_result_from_cc_number(parameters[:CardNumber])
-          return result
-        end
-        
-        data = ssl_post(build_endpoint_url(action), post_data(action, parameters), POST_HEADERS)
-         
-        @response = parse(data)
+        response = parse( ssl_post(url_for(action), post_data(action, parameters)) )
           
-        success = @response["Status"] == APPROVED
-        message = message_from(@response)
-        
-        authorization = [ parameters[:VendorTxCode],
-                          @response["VPSTxId"],
-                          @response["TxAuthNo"],
-                          @response["SecurityKey"] ].compact.join(";")
-
-        Response.new(success, message, @response,
+        Response.new(response["Status"] == APPROVED, message_from(response), response,
           :test => test?,
-          :authorization => authorization
+          :authorization => authorization_from(response, parameters),
+          :avs_result => { 
+            :street_match => AVS_CVV_CODE[ response["AddressResult"] ],
+            :postal_match => AVS_CVV_CODE[ response["PostCodeResult"] ],
+          },
+          :cvv_result => AVS_CVV_CODE[ response["CV2Result"] ]
         )
       end
       
-      def build_endpoint_url(action)
+      def authorization_from(response, params)
+         [ params[:VendorTxCode],
+           response["VPSTxId"],
+           response["TxAuthNo"],
+           response["SecurityKey"] ].compact.join(";")
+      end
+      
+      def url_for(action)
         simulate ? build_simulator_url(action) : build_url(action)
       end
       
@@ -248,7 +247,7 @@ module ActiveMerchant #:nodoc:
         "#{SIMULATOR_URL}/#{endpoint}"
       end
 
-      def message_from(results)
+      def message_from(response)
         if response["Status"] == APPROVED
           return 'Success'
         else

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

@@ -9,7 +9,7 @@
 #  
 #  twenty = 2000
 #  gateway = PsigateGateway.new(
-#    :store_id => 'teststore',
+#    :login => 'teststore',
 #    :password => 'psigate1234'
 #  )
 #  
@@ -20,16 +20,18 @@
 #    :first_name => 'Longbob',
 #    :last_name => 'Longsen'
 #  )
-#  response = @gateway.authorize(twenty, creditcard, {:order_id =>  1234,
+#  response = @gateway.authorize(twenty, creditcard,
+#     :order_id =>  1234,
 #     :billing_address => {
-#  	  :address1 => '123 fairweather Lane',
-#  	  :address2 => 'Apt B',
-#  	  :city => 'New York',
-#  	  :state => 'NY',
-#  	  :country => 'U.S.A.',
-#  	  :zip => '10010'},
+#  	    :address1 => '123 fairweather Lane',
+#  	    :address2 => 'Apt B',
+#  	    :city => 'New York',
+#  	    :state => 'NY',
+#  	    :country => 'U.S.A.',
+#  	    :zip => '10010'
+#    },
 #    :email => 'jack@yahoo.com'
-#    })
+#  )
 
 require 'rexml/document'
 
@@ -37,12 +39,6 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
 
     class PsigateGateway < Gateway
-     
-      # URL
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-
       TEST_URL  = 'https://dev.psigate.com:7989/Messenger/XMLMessenger'
       LIVE_URL  = 'https://secure.psigate.com:7934/Messenger/XMLMessenger'
       
@@ -50,18 +46,13 @@ module ActiveMerchant #:nodoc:
       self.supported_countries = ['CA']
       self.homepage_url = 'http://www.psigate.com/'
       self.display_name = 'Psigate'
-      
+   
+      SUCCESS_MESSAGE = 'Success'
+      FAILURE_MESSAGE = 'The transaction was declined'
       
       def initialize(options = {})
         requires!(options, :login, :password)
-      
-        options[:store_id] ||= options[:login]
-      
-        # these are the defaults for the psigate test server
-        @options = {
-          :store_id   => "teststore",
-          :password   => "testpass",          
-        }.update(options)                           
+        @options = options                          
         super      
       end      
     
@@ -95,49 +86,21 @@ module ActiveMerchant #:nodoc:
       private                       
     
       def commit(money, creditcard, options = {}) 
-        parameters = parameters(money, creditcard, options)                                
-        
-        if result = test_result_from_cc_number(parameters[:CardNumber])
-          return result
-        end
-        
-        url = test? ? TEST_URL : LIVE_URL
-        
-        data = ssl_post(url, post_data(parameters))
-        @response = parse(data)
-        success = (@response[:approved] == "APPROVED")
-        message = message_form(@response)
-        Response.new(success, message, @response, :test => test?, :authorization => response[:orderid])
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, post_data(money, creditcard, options)))
+
+        Response.new(successful?(response), message_from(response), response, 
+          :test => test?, 
+          :authorization => response[:orderid],
+          :avs_result => { :code => response[:avsresult] },
+          :cvv_result => response[:cardidresult]
+        )
+      end
+      
+      def successful?(response)
+        response[:approved] == "APPROVED"
       end
                                                
-      # Parse psigate response xml into a convinient hash
       def parse(xml)
-        #  <?xml version="1.0" encoding="UTF-8"?>
-        #  <Result>
-        #  <TransTime>Tue Jun 27 22:19:58 EDT 2006</TransTime>
-        #  <OrderID>1004</OrderID>
-        #  <TransactionType>POSTAUTH</TransactionType>
-        #  <Approved>APPROVED</Approved>
-        #  <ReturnCode>Y:123456:0abcdef:M:X:NNN</ReturnCode>
-        #  <ErrMsg></ErrMsg>
-        #  <TaxTotal>0.00</TaxTotal>
-        #  <ShipTotal>0.00</ShipTotal>
-        #  <SubTotal>20.00</SubTotal>
-        #  <FullTotal>20.00</FullTotal>
-        #  <PaymentType>CC</PaymentType>
-        #  <CardNumber>......1111</CardNumber>
-        #  <TransRefNumber>1bd6f76ad1a25804</TransRefNumber>
-        #  <CardIDResult>M</CardIDResult>
-        #  <AVSResult>X</AVSResult>
-        #  <CardAuthNumber>123456</CardAuthNumber>
-        #  <CardRefNumber>0abcdef</CardRefNumber>
-        #  <CardType>VISA</CardType>
-        #  <IPResult>NNN</IPResult>
-        #  <IPCountry>UN</IPCountry>
-        #  <IPRegion>UNKNOWN</IPRegion>
-        #  <IPCity>UNKNOWN</IPCity>
-        #  </Result>   
-
         response = {:message => "Global Error Receipt", :complete => false}
 
         xml = REXML::Document.new(xml)          
@@ -150,12 +113,12 @@ module ActiveMerchant #:nodoc:
         response
       end     
 
-      def post_data(parameters = {})
+      def post_data(money, creditcard, options)
         xml = REXML::Document.new
         xml << REXML::XMLDecl.new
         root  = xml.add_element("Order")
         
-        for key, value in parameters
+        for key, value in parameters(money, creditcard, options)
           root.add_element(key.to_s).text = value if value
         end    
 
@@ -167,7 +130,7 @@ module ActiveMerchant #:nodoc:
       def parameters(money, creditcard, options = {})  
         params = {
           # General order paramters
-          :StoreID => @options[:store_id],
+          :StoreID => @options[:login],
           :Passphrase => @options[:password],
           :TestResult => options[:test_result],
           :OrderID => options[:order_id],
@@ -213,7 +176,7 @@ module ActiveMerchant #:nodoc:
           params[:Bcompany]     = address[:company]  unless address[:company].blank?
         end
         
-        if address = options[:shipping_address] || options[:address]                   
+        if address = options[:shipping_address]
           params[:Sname]        = address[:name] || creditcard.name 
           params[:Saddress1]    = address[:address1] unless address[:address1].blank?
           params[:Saddress2]    = address[:address2] unless address[:address2].blank?
@@ -227,11 +190,11 @@ module ActiveMerchant #:nodoc:
         return params
       end
       
-      def message_form(response)
+      def message_from(response)
         if response[:approved] == "APPROVED"
-          return 'Success'
+          return SUCCESS_MESSAGE
         else
-          return 'Unspecified error' if response[:errmsg].blank?
+          return FAILURE_MESSAGE if response[:errmsg].blank?
           return response[:errmsg].gsub(/[^\w]/, ' ').split.join(" ").capitalize
         end
       end

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

@@ -14,8 +14,6 @@ module ActiveMerchant
     #    directly to the gateway then the appropriate cardholder present or not present message 
     #    type should be used rather than the ‘E’ equivalent.
     #   -The CV2 / AVS policies are set up with the account settings when signing up for an account
-    #   
-    #
     class PslCardGateway < Gateway
       self.money_format = :cents
       self.default_currency = 'GBP'
@@ -37,10 +35,6 @@ module ActiveMerchant
       # the test account when testing...
       URL = 'https://pslcard3.paymentsolutionsltd.com/secure/transact.asp?'
       
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-      
       # eCommerce sale transaction, details keyed by merchant or cardholder
       MESSAGE_TYPE = 'ESALE_KEYED' 
       
@@ -70,6 +64,24 @@ module ActiveMerchant
       #taken.
       NOMINAL_AMOUNT = 101
       
+      AVS_CODE = {
+        "ALL MATCH"	=> 'Y',
+        "SECURITY CODE MATCH ONLY" => 'N',
+        "ADDRESS MATCH ONLY" => 'Y',
+        "NO DATA MATCHES"	=> 'N',
+        "DATA NOT CHECKED"	=> 'R',
+        "SECURITY CHECKS NOT SUPPORTED"	=> 'X'
+      }
+      
+      CVV_CODE = {
+        "ALL MATCH"	=> 'M',
+        "SECURITY CODE MATCH ONLY" => 'M',
+        "ADDRESS MATCH ONLY" => 'N',
+        "NO DATA MATCHES"	=> 'N',
+        "DATA NOT CHECKED"	=> 'P',
+        "SECURITY CHECKS NOT SUPPORTED"	=> 'X'
+      }
+      
       # Create a new PslCardGateway
       # 
       # The gateway requires that a valid :login be passed in the options hash
@@ -251,20 +263,13 @@ module ActiveMerchant
       #   - ActiveMerchant::Billing::Response object
       #
       def commit(request)
-        if result = test_result_from_cc_number(request[:CardNumber])
-          return result
-        end
-        
-        result = ssl_post(URL, post_data(request))
-        
-        @response = parse(result)
-        
-        success = @response[:ResponseCode] == APPROVED
-        message = @response[:Message]
+        response = parse( ssl_post(URL, post_data(request)) )
         
-        Response.new(success, message, @response, 
-            :test => test?, 
-            :authorization => @response[:CrossReference]
+        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]] }
         )
       end
       

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

@@ -5,11 +5,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class QuickpayGateway < Gateway
       URL = 'https://secure.quickpay.dk/transaction.php'
-      
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-    
+
       self.default_currency = 'DKK'  
       self.money_format = :cents
       self.supported_cardtypes = [ :dankort, :forbrugsforeningen, :visa, :master, :american_express, :diners_club, :jcb, :maestro ]
@@ -18,7 +14,7 @@ module ActiveMerchant #:nodoc:
       self.display_name = 'Quickpay'
       
       TRANSACTIONS = {
-        :authorization          => '1100',
+        :authorization => '1100',
         :capture       => '1220',
         :void          => '1420',
         :credit        => 'credit'
@@ -63,10 +59,6 @@ module ActiveMerchant #:nodoc:
       end
       
       def purchase(money, creditcard, options = {})
-        if result = test_result_from_cc_number(creditcard.number)
-          return result
-        end
-        
         auth = authorize(money, creditcard, options)
         auth.success? ? capture(money, auth.authorization) : auth
       end                       
@@ -120,23 +112,17 @@ module ActiveMerchant #:nodoc:
       end
       
       def commit(action, params)
+        response = parse(ssl_post(URL, post_data(action, params)))
         
-        if result = test_result_from_cc_number(params[:cardnumber])
-          return result
-        end
-        
-        data = ssl_post URL, post_data(action, params)
-
-        @response = parse(data)
-        
-        success = @response[:qpstat] == APPROVED
-        message = message_from(@response)
-        
-        Response.new(success, message, @response, 
-            :test => test?, 
-            :authorization => @response[:transaction]
+        Response.new(successful?(response), message_from(response), response, 
+          :test => test?, 
+          :authorization => response[:transaction]
         )
       end
+      
+      def successful?(response)
+        response[:qpstat] == APPROVED
+      end
 
       def parse(data)
         response = {}

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

@@ -42,10 +42,6 @@ module ActiveMerchant
       BANK_ERROR = REALEX_ERROR  = "Gateway is in maintenance. Please try again later."
       ERROR = CLIENT_DEACTIVATED = "Gateway Error"
       
-      attr_reader :url 
-      attr_reader :response
-      attr_reader :options
-
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
@@ -60,21 +56,13 @@ module ActiveMerchant
       end     
       
       private           
-      def commit(request)
-        if result = test_result_from_cc_number(parse_credit_card_number(request))
-          return result
-        end
-        
-        data = ssl_post(URL, request)
-        
-        @response = parse(data)
+      def commit(request)        
+        response = parse(ssl_post(URL, request))
 
-        success = @response[:result] == "00"
-        test = response[:message] =~ /\[ test system \]/
-        
-        Response.new(success, message_from(@response), @response,
-          :test => test,
-          :authorization => @response[:authcode]
+        Response.new(response[:result] == "00", message_from(response), response,
+          :test => response[:message] =~ /\[ test system \]/,
+          :authorization => response[:authcode],
+          :cvv_result => response[:cvnresult]
         )      
       end
 
@@ -137,7 +125,7 @@ module ActiveMerchant
           end
           
           billing_address = options[:billing_address] || options[:address] || {}
-          shipping_address = options[:shipping_address] || billing_address
+          shipping_address = options[:shipping_address] || {}
           
           xml.tag! 'tssinfo' do
             xml.tag! 'address', 'type' => 'billing' do