activemerchant 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,5 +1,7 @@
 # CHANGELOG
 # ---
+# * Add support for OrderDescription, Payer, and InvoiceID fields in PaypalGateway [cody]
+#
 # * Add support for crediting to PayPal [cody, Haig]
 #
 # * Add discover to list of supported card types for Authorize.net

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

@@ -35,8 +35,9 @@ module ActiveMerchant #:nodoc:
       
       private
       def build_sale_or_authorization_request(action, money, credit_card, options)
+        shipping_address = options[:shipping_address] || options[:address]
+       
         xml = Builder::XmlMarkup.new :indent => 2
-        
         xml.tag! 'DoDirectPaymentReq', 'xmlns' => 'urn:ebay:api:PayPalAPI' do
           xml.tag! 'DoDirectPaymentRequest', 'xmlns:n2' => 'urn:ebay:apis:eBLBaseComponents' do
             xml.tag! 'n2:Version', '2.0'
@@ -45,8 +46,12 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:PaymentDetails' do
                 xml.tag! 'n2:OrderTotal', amount(money), 'currencyID' => currency(money)
                 xml.tag! 'n2:NotifyURL', options[:notify_url]
+                xml.tag! 'n2:OrderDescription', options[:description]
+                xml.tag! 'n2:InvoiceID', options[:order_id]
+                
+                add_address(xml, 'n2:ShipToAddress', shipping_address)
               end
-              add_credit_card(xml, credit_card, options[:billing_address] || options[:address])
+              add_credit_card(xml, credit_card, options[:billing_address] || shipping_address, options)
               xml.tag! 'n2:IPAddress', options[:ip]
             end
           end
@@ -55,7 +60,7 @@ module ActiveMerchant #:nodoc:
         xml.target!        
       end
       
-      def add_credit_card(xml, credit_card, address)
+      def add_credit_card(xml, credit_card, address, options)
         xml.tag! 'n2:CreditCard' do
           xml.tag! 'n2:CreditCardType', credit_card_type(credit_card.type)
           xml.tag! 'n2:CreditCardNumber', credit_card.number
@@ -68,7 +73,9 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:FirstName', credit_card.first_name
               xml.tag! 'n2:LastName', credit_card.last_name
             end
-            add_address(xml, address)
+            
+            xml.tag! 'n2:Payer', options[:email]
+            add_address(xml, 'n2:Address', address)
           end
         end
       end

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

@@ -184,9 +184,9 @@ module ActiveMerchant #:nodoc:
         end
       end
       
-      def add_address(xml, address)
+      def add_address(xml, element, address)
         return if address.nil?
-        xml.tag! 'n2:Address' do
+        xml.tag! element do
           xml.tag! 'n2:Name', address[:name]
           xml.tag! 'n2:Street1', address[:address1]
           xml.tag! 'n2:Street2', address[:address2]

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

@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:PaymentAction', action
               xml.tag! 'n2:OrderTotal', amount(money), 'currencyID' => currency(money)
               xml.tag! 'n2:MaxAmount', amount(options[:max_amount]), 'currencyID' => currency(options[:max_amount]) if options[:max_amount]
-              add_address(xml, options[:billing_address] || options[:address])
+              add_address(xml, 'n2:Address', options[:billing_address] || options[:address])
               #xml.tag! 'n2:AddressOverride', 1
               #xml.tag! 'n2:NoShipping', 1
               xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2007-02-21 00:00:00 -05:00
+  version: 1.0.2
+date: 2007-02-22 00:00:00 -05:00
 summary: Framework and tools for dealing with credit card transactions.
 require_paths: 
 - lib
@@ -25,6 +25,28 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApjb2R5
+  ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMDcwMjIyMTcyMTI3WhcNMDgwMjIyMTcyMTI3WjBBMRMwEQYDVQQDDApj
+  b2R5ZmF1c2VyMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6T4Iqt5iWvAlU
+  iXI6L8UO0URQhIC65X/gJ9hL/x4lwSl/ckVm/R/bPrJGmifT+YooFv824N3y/TIX
+  25o/lZtRj1TUZJK4OCb0aVzosQVxBHSe6rLmxO8cItNTMOM9wn3thaITFrTa1DOQ
+  O3wqEjvW2L6VMozVfK1MfjL9IGgy0rCnl+2g4Gh4jDDpkLfnMG5CWI6cTCf3C1ye
+  ytOpWgi0XpOEy8nQWcFmt/KCQ/kFfzBo4QxqJi54b80842EyvzWT9OB7Oew/CXZG
+  F2yIHtiYxonz6N09vvSzq4CvEuisoUFLKZnktndxMEBKwJU3XeSHAbuS7ix40OKO
+  WKuI54fHAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBR9QQpefI3oDCAxiqJW/3Gg6jI6qjANBgkqhkiG9w0BAQUFAAOCAQEAs0lX26O+
+  HpyMp7WL+SgZuM8k76AjfOHuKajl2GEn3S8pWYGpsa0xu07HtehJhKLiavrfUYeE
+  qlFtyYMUyOh6/1S2vfkH6VqjX7mWjoi7XKHW/99fkMS40B5SbN+ypAUst+6c5R84
+  w390mjtLHpdDE6WQYhS6bFvBN53vK6jG3DLyCJc0K9uMQ7gdHWoxq7RnG92ncQpT
+  ThpRA+fky5Xt2Q63YJDnJpkYAz79QIama1enSnd4jslKzSl89JS2luq/zioPe/Us
+  hbyalWR1+HrhgPoSPq7nk+s2FQUBJ9UZFK1lgMzho/4fZgzJwbu+cO8SNuaLS/bj
+  hPaSTyVU0yCSnw==
+  -----END CERTIFICATE-----
+
 post_install_message: 
 authors: 
 - Tobias Luetke