smulube-activemerchant 1.7.1 → 1.7.1.3

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

@@ -3,7 +3,7 @@ module ActiveMerchant #:nodoc:
     class PayflowNvpUkGateway < Gateway
       TEST_URL = 'https://pilot-payflowpro.paypal.com'
       LIVE_URL = 'https://payflowpro.paypal.com'
-      
+
       self.class_inheritable_accessor :partner
       self.class_inheritable_accessor :timeout
 
@@ -14,25 +14,25 @@ module ActiveMerchant #:nodoc:
       # subsequent Responses will have a :duplicate parameter set in the params
       # hash.
       self.retry_safe = true
-      
+
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['GB']
-      
+
       # The card types supported by the payment gateway
       self.supported_cardtypes = [:visa, :master, :american_express, :discover, :solo, :switch]
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'https://www.paypal.com/uk/cgi-bin/webscr?cmd=_wp-pro-overview-outside'
-      
+
       # The name of the gateway
       self.display_name = 'PayPal Website Payments Pro (UK) [NVP API]'
-      
+
       self.default_currency = 'GBP'
       self.partner = 'PayPalUk'
       self.money_format = :dollars
       self.timeout = 30
 
-      TRANSACTIONS = { 
+      TRANSACTIONS = {
         :purchase       => "S",
         :authorization  => "A",
         :capture        => "D",
@@ -65,7 +65,7 @@ module ActiveMerchant #:nodoc:
       #
       # The gateway requires that a valid login and password be passed
       # in the +options+ hash.
-      # 
+      #
       # ==== Parameters
       #
       # * <tt>options</tt>
@@ -122,15 +122,15 @@ module ActiveMerchant #:nodoc:
       def authorize(money, creditcard, options = {})
         post = {}
         add_invoice(post, options)
-        add_creditcard(post, creditcard)        
+        add_creditcard(post, creditcard)
         add_currency(post, money, options)
         add_address(post, options[:billing_address] || options[:address])
         add_address(post, options[:shipping_address], "shipto")
         add_customer_data(post, options)
-        
+
         commit(TRANSACTIONS[:authorize], money, post)
       end
-      
+
       # A purchase transaction authorizes and captures in a single hit. We can only
       # do this for transactions where you provide immediate fulfillment of products or services.
       #
@@ -159,15 +159,15 @@ module ActiveMerchant #:nodoc:
       def purchase(money, creditcard, options = {})
         post = {}
         add_invoice(post, options)
-        add_creditcard(post, creditcard)        
+        add_creditcard(post, creditcard)
         add_currency(post, money, options)
-        add_address(post, options[:billing_address] || options[:address])   
+        add_address(post, options[:billing_address] || options[:address])
         add_address(post, options[:shipping_address], "shipto")
         add_customer_data(post, options)
-             
+
         commit(TRANSACTIONS[:purchase], money, post)
-      end                       
-    
+      end
+
       # Captures authorized funds.
       #
       # ==== Parameters
@@ -203,15 +203,15 @@ module ActiveMerchant #:nodoc:
       # * <tt>options</tt> - not currently used
       def credit(money, authorization_or_card, options = {})
         post = {}
-        
+
         if authorization_or_card.is_a?(String)
           # perform a referenced credit
           post[:origid] = authorization
         else
           # perform an unreferenced credit
-          add_creditcard(post, creditcard)        
+          add_creditcard(post, creditcard)
         end
-        
+
         commit(TRANSACTIONS[:credit], money, post)
       end
 
@@ -271,9 +271,9 @@ module ActiveMerchant #:nodoc:
 
         commit(TRANSACTIONS[:recurring], nil, post)
       end
-    
-      private                       
-      
+
+      private
+
       def add_customer_data(post, options)
         post[:email] = options[:email].to_s if options.has_key?(:email)
         post[:custref] = options[:customer].to_s.slice(0,12) if options[:customer]
@@ -283,29 +283,30 @@ module ActiveMerchant #:nodoc:
       # NOTE : If you pass in any of the ship-to address parameters such as SHIPTOCITY or
       # SHIPTOSTATE, you must pass in the complete set (that is, SHIPTOSTREET,
       # SHIPTOCITY, SHIPTOSTATE, SHIPTOCOUNTRY, and SHIPTOZIP).
-      def add_address(post, address, prefix = '')      
+      def add_address(post, address, prefix = '')
         unless address.blank? or address.values.blank?
           post[prefix+"street"]    = address[:address1].to_s
           post[prefix+"city"]      = address[:city].to_s
           post[prefix+"state"]     = address[:state].blank?  ? 'n/a' : address[:state]
           post[prefix+"country"]   = address[:country].to_s
           post[prefix+"zip"]       = address[:zip].to_s.sub(/\s+/,'')
-        end         
+        end
       end
 
       def add_invoice(post, options)
-        post[:invnum] = (options[:invoice] || options[:order_id]).to_s.slice(0,127) if options.has_key?(:invoice) || options.has_key?(:order_id) 
+        post[:invnum] = (options[:invoice] || options[:order_id]).to_s.slice(0,127) if options.has_key?(:invoice) || options.has_key?(:order_id)
       end
-      
-      def add_creditcard(post, creditcard)      
+
+      def add_creditcard(post, creditcard)
         unless creditcard.nil?
           post[:acct] = creditcard.number
           post[:cvv2] = creditcard.verification_value
           post[:expdate] = expdate(creditcard)
-          post[:name] = creditcard.name
+          post[:firstname] = creditcard.first_name
+          post[:lastname] = creditcard.last_name
         end
       end
-      
+
       def add_currency(post, money, options)
         post[:currency] = options[:currency] || currency(money)
       end
@@ -349,9 +350,9 @@ module ActiveMerchant #:nodoc:
           key,val = pair.split(/=/)
           results[key] = val
         end
-        
+
         results
-      end     
+      end
 
       def build_request(parameters, action = nil)
         post = {}
@@ -362,7 +363,7 @@ module ActiveMerchant #:nodoc:
         post[:trxtype] = action if action
         post[:tender] = "C"
         post[:verbosity] = "MEDIUM"
-        
+
         request = post.merge(parameters).sort { |a, b| a[0].to_s <=> b[0].to_s }.map { |pair| "#{pair[0].to_s.upcase}=#{CGI.escape(pair[1].to_s)}" }.join("&") #.map { |kv_pair| "#{kv_pair[0].to_s.upcase}=#{CGI.escape(kv_pair[1].to_s)}" }.join("&")
 
         request
@@ -372,29 +373,30 @@ module ActiveMerchant #:nodoc:
         {
           "Content-Type" => "text/namevalue",
           "Content-Length" => content_length.to_s,
-      	  "X-VPS-Client-Timeout" => timeout.to_s,
-      	  "X-VPS-VIT-Integration-Product" => "ActiveMerchant",
+          "X-VPS-Client-Timeout" => timeout.to_s,
+          "X-VPS-VIT-Integration-Product" => "ActiveMerchant",
           "X-VPS-VIT-Integration-Version" => ActiveMerchant::VERSION,
-      	  "X-VPS-VIT-Runtime-Version" => RUBY_VERSION,
-      	  "X-VPS-Request-ID" => Utils.generate_unique_id
-    	  }
+          "X-VPS-VIT-Runtime-Version" => RUBY_VERSION,
+          "X-VPS-Request-ID" => Utils.generate_unique_id
+        }
       end
-      
+
       def commit(action, money, parameters)
         parameters[:amt]  = amount(money) if money
 
         request = build_request(parameters, action)
+
         headers = build_headers(request.size)
 
-    	  response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, request, headers))
 
-        Response.new(response["RESULT"] == "0", response["RESPMSG"], response, 
+        Response.new(response["RESULT"] == "0", response["RESPMSG"], response,
           :authorization => response["PNREF"],
           :test => test?,
           :cvv_result => response["PROCCVV2"],
           :avs_result => { :code => response["PROCAVS"], :postal_match => response["AVSZIP"], :street_match => response["AVSADDR"] }
         )
-        
+
       end
     end
   end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.7.1"
+  VERSION = "1.7.1.3"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: smulube-activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 101
   prerelease: false
   segments: 
   - 1
   - 7
   - 1
-  version: 1.7.1
+  - 3
+  version: 1.7.1.3
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,7 +37,7 @@ cert_chain:
   RGv1VYD5jSaHiQ==
   -----END CERTIFICATE-----
 
-date: 2010-08-02 00:00:00 +01:00
+date: 2010-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency