activemerchant 1.20.4 → 1.21.0

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

@@ -94,6 +94,10 @@ module ActiveMerchant #:nodoc:
               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! '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?
+              xml.tag! 'DiscountAmt', options[:discountamt] unless options[:discountamt].blank?
 
               billing_address = options[:billing_address] || options[:address]
               add_address(xml, 'BillTo', billing_address, options) if billing_address
@@ -122,6 +126,10 @@ module ActiveMerchant #:nodoc:
               # 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! '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?
+              xml.tag! 'DiscountAmt', options[:discountamt] unless options[:discountamt].blank?
 
               billing_address = options[:billing_address] || options[:address]
               add_address(xml, 'BillTo', billing_address, options) if billing_address
@@ -161,8 +169,8 @@ module ActiveMerchant #:nodoc:
       end
       
       def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
+        year  = sprintf("%.4i", creditcard.year.to_s.sub(/^0+/, ''))
+        month = sprintf("%.2i", creditcard.month.to_s.sub(/^0+/, ''))
 
         "#{year}#{month}"
       end

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

@@ -126,6 +126,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'EMail', options[:email] unless options[:email].blank?
           xml.tag! 'Phone', address[:phone] unless address[:phone].blank?
           xml.tag! 'CustCode', options[:customer] if !options[:customer].blank? && tag == 'BillTo'
+          xml.tag! 'PONum', options[:po_number] if !options[:po_number].blank? && tag == 'BillTo'
           
           xml.tag! 'Address' do
             xml.tag! 'Street', address[:address1] unless address[:address1].blank?

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

@@ -8,7 +8,7 @@ module ActiveMerchant #:nodoc:
         base.cattr_accessor :signature
       end
       
-      API_VERSION = '62.0'
+      API_VERSION = '72'
       
       URLS = {
         :test => { :certificate => 'https://api.sandbox.paypal.com/2.0/',

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

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/paypal/paypal_common_api'
+require File.dirname(__FILE__) + '/paypal/paypal_express_response'
+require File.dirname(__FILE__) + '/paypal_express_common'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class PaypalDigitalGoodsGateway < PaypalExpressGateway
+      self.test_redirect_url = 'https://www.sandbox.paypal.com/incontext'
+      self.live_redirect_url = 'https://www.paypal.com/incontext'
+
+      self.supported_countries = %w(AU CA CN FI GB ID IN IT MY NO NZ PH PL SE SG TH VN)
+      self.homepage_url = 'https://www.x.com/community/ppx/xspaces/digital_goods'
+      self.display_name = 'PayPal Express Checkout for Digital Goods'
+      
+      def redirect_url_for(token, options = {})
+        "#{redirect_url}?token=#{token}&useraction=commit"
+      end
+
+      # GATEWAY.setup_purchase(100,
+      #  :ip                => "127.0.0.1",
+      #  :description       => "Test Title",
+      #  :return_url        => "http://return.url",
+      #  :cancel_return_url => "http://cancel.url",
+      #  :items             => [ { :name => "Charge",
+      #                            :number => "1",
+      #                            :quantity => "1",
+      #                            :amount   => 100,
+      #                            :description => "Description",
+      #                            :category => "Digital" } ] )
+      def build_setup_request(action, money, options)
+        requires!(options, :items)
+        raise ArgumentError, "Must include at least 1 Item" unless options[:items].length > 0
+        options[:items].each do |item|
+          requires!(item, :name, :number, :quantity, :amount, :description, :category)
+          raise ArgumentError, "Each of the items must have the category 'Digital'" unless item[:category] == 'Digital'
+        end
+
+        super
+      end
+
+    end
+  end
+end

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

@@ -41,6 +41,12 @@ module ActiveMerchant #:nodoc:
         commit 'DoExpressCheckoutPayment', build_sale_or_authorization_request('Sale', money, options)
       end
 
+      def reference_transaction(money, options = {})
+        requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
+
+        commit 'DoReferenceTransaction', build_reference_transaction_request('Sale', money, options)
+      end
+
       private
       def build_get_details_request(token)
         xml = Builder::XmlMarkup.new :indent => 2
@@ -106,6 +112,7 @@ module ActiveMerchant #:nodoc:
               xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
               xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
               xml.tag! 'n2:LocaleCode', options[:locale] unless options[:locale].blank?
+              xml.tag! 'n2:BrandName', options[:brand_name] unless options[:brand_name].blank?
               # Customization of the payment page
               xml.tag! 'n2:PageStyle', options[:page_style] unless options[:page_style].blank?
               xml.tag! 'n2:cpp-header-image', options[:header_image] unless options[:header_image].blank?
@@ -149,6 +156,7 @@ module ActiveMerchant #:nodoc:
                 add_items_xml(xml, options, currency_code) if options[:items]
 
                 xml.tag! 'n2:PaymentAction', action
+                xml.tag! 'n2:Custom', options[:custom] unless options[:custom].blank?
               end
 
               if options[:shipping_options]
@@ -170,6 +178,32 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
       
+      def build_reference_transaction_request(action, money, options)
+        currency_code = options[:currency] || currency(money)
+
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'DoReferenceTransactionReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'DoReferenceTransactionRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'n2:DoReferenceTransactionRequestDetails' do
+              xml.tag! 'n2:ReferenceID', options[:reference_id]
+              xml.tag! 'n2:PaymentAction', action
+              xml.tag! 'n2:PaymentType', options[:payment_type] || 'Any'
+              xml.tag! 'n2:PaymentDetails' do
+                xml.tag! 'n2:OrderTotal', amount(money).to_f.zero? ? localized_amount(100, currency_code) : localized_amount(money, currency_code), 'currencyID' => currency_code
+                xml.tag! 'n2:OrderDescription', options[:description]
+                xml.tag! 'n2:InvoiceID', options[:invoice_id]
+                xml.tag! 'n2:ButtonSource', 'ActiveMerchant'
+                xml.tag! 'n2:NotifyURL', ''
+              end
+              xml.tag! 'n2:IPAddress', options[:ip]
+            end
+          end
+        end
+
+        xml.target!
+      end
+
       def build_response(success, message, response, options = {})
         PaypalExpressResponse.new(success, message, response, options)
       end
@@ -187,9 +221,10 @@ module ActiveMerchant #:nodoc:
             end
             xml.tag! 'n2:Description', item[:description]
             xml.tag! 'n2:ItemURL', item[:url]
+            xml.tag! 'n2:ItemCategory', item[:category] if item[:category]
           end
         end
       end
     end
   end
-end
+end

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

@@ -2,8 +2,13 @@ module ActiveMerchant
   module Billing
     module PaypalExpressCommon
       def self.included(base)
-        base.cattr_accessor :test_redirect_url
-        base.cattr_accessor :live_redirect_url
+        if base.respond_to?(:class_attribute)
+          base.class_attribute :test_redirect_url
+          base.class_attribute :live_redirect_url
+        else
+          base.class_inheritable_accessor :test_redirect_url
+          base.class_inheritable_accessor :live_redirect_url
+        end
         base.live_redirect_url = 'https://www.paypal.com/cgibin/webscr'
       end
       
@@ -22,4 +27,4 @@ module ActiveMerchant
       end
     end
   end
-end
+end

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

@@ -215,6 +215,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_testmode(post)
+        return if post[:transaction].present? 
         post[:testmode] = test? ? '1' : '0'
       end
       

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

@@ -76,6 +76,7 @@ module ActiveMerchant #:nodoc:
           :zip          => address[:zip],
           :sandbox      => test?
         })
+        result.retain if options[:retain] && result.is_sensitive_data_valid && result.payment_method_token
 
         Response.new(result.is_sensitive_data_valid,
                      message_from_result(result),

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

@@ -4,30 +4,33 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SecurePayAuGateway < Gateway
       API_VERSION = 'xml-4.2'
-      
+      PERIODIC_API_VERSION = 'spxml-3.0'
+
       TEST_URL = 'https://www.securepay.com.au/test/payment'
       LIVE_URL = 'https://www.securepay.com.au/xmlapi/payment'
-      
+      TEST_PERIODIC_URL = "https://test.securepay.com.au/xmlapi/periodic"
+      LIVE_PERIODIC_URL = "https://api.securepay.com.au/xmlapi/periodic"
+
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'http://securepay.com.au'
-      
+
       # The name of the gateway
       self.display_name = 'SecurePay'
-      
+
       class_attribute :request_timeout
       self.request_timeout = 60
-      
+
       self.money_format = :cents
       self.default_currency = 'AUD'
-      
+
       # 0 Standard Payment
-      # 4 Refund 
-      # 6 Client Reversal (Void) 
-      # 10 Preauthorise 
-      # 11 Preauth Complete (Advice)        
+      # 4 Refund
+      # 6 Client Reversal (Void)
+      # 10 Preauthorise
+      # 11 Preauth Complete (Advice)
       TRANSACTIONS = {
         :purchase => 0,
         :authorization => 10,
@@ -35,33 +38,50 @@ module ActiveMerchant #:nodoc:
         :void => 6,
         :refund => 4
       }
-      
+
+      PERIODIC_ACTIONS = {
+        :add_triggered    => "add",
+        :remove_triggered => "delete",
+        :trigger          => "trigger"
+      }
+
+      PERIODIC_TYPES = {
+        :add_triggered    => 4,
+        :remove_triggered => nil,
+        :trigger          => nil
+      }
+
       SUCCESS_CODES = [ '00', '08', '11', '16', '77' ]
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
         super
       end
-      
+
       def test?
         @options[:test] || super
       end
-      
-      def purchase(money, credit_card, options = {})
-        requires!(options, :order_id)
-        commit :purchase, build_purchase_request(money, credit_card, options)
-      end                       
-    
+
+      def purchase(money, credit_card_or_stored_id, options = {})
+        if credit_card_or_stored_id.is_a?(ActiveMerchant::Billing::CreditCard)
+          requires!(options, :order_id)
+          commit :purchase, build_purchase_request(money, credit_card_or_stored_id, options)
+        else
+          options[:billing_id] = credit_card_or_stored_id.to_s
+          commit_periodic(build_periodic_item(:trigger, money, nil, options))
+        end
+      end
+
       def authorize(money, credit_card, options = {})
         requires!(options, :order_id)
         commit :authorization, build_purchase_request(money, credit_card, options)
       end
-      
+
       def capture(money, reference, options = {})
         commit :capture, build_reference_request(money, reference)
       end
-      
+
       def refund(money, reference, options = {})
         commit :refund, build_reference_request(money, reference)
       end
@@ -74,54 +94,64 @@ module ActiveMerchant #:nodoc:
       def void(reference, options = {})
         commit :void, build_reference_request(nil, reference)
       end
-      
+
+      def store(creditcard, options = {})
+        requires!(options, :billing_id, :amount)
+        commit_periodic(build_periodic_item(:add_triggered, options[:amount], creditcard, options))
+      end
+
+      def unstore(identification, options = {})
+        options[:billing_id] = identification
+        commit_periodic(build_periodic_item(:remove_triggered, options[:amount], nil, options))
+      end
+
       private
-      
+
       def build_purchase_request(money, credit_card, options)
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'amount', amount(money)
-        xml.tag! 'currency', options[:currency] || currency(money)              
+        xml.tag! 'currency', options[:currency] || currency(money)
         xml.tag! 'purchaseOrderNo', options[:order_id].to_s.gsub(/[ ']/, '')
-        
+
         xml.tag! 'CreditCardInfo' do
           xml.tag! 'cardNumber', credit_card.number
           xml.tag! 'expiryDate', expdate(credit_card)
           xml.tag! 'cvv', credit_card.verification_value if credit_card.verification_value?
         end
-        
+
         xml.target!
       end
-      
+
       def build_reference_request(money, reference)
         xml = Builder::XmlMarkup.new
-        
+
         transaction_id, order_id, preauth_id, original_amount = reference.split("*")
         xml.tag! 'amount', (money ? amount(money) : original_amount)
         xml.tag! 'currency', options[:currency] || currency(money)
         xml.tag! 'txnID', transaction_id
         xml.tag! 'purchaseOrderNo', order_id
         xml.tag! 'preauthID', preauth_id
-        
+
         xml.target!
       end
-      
+
       def build_request(action, body)
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.tag! 'SecurePayMessage' do
           xml.tag! 'MessageInfo' do
-            xml.tag! 'messageID', Utils.generate_unique_id.slice(0, 30)
+            xml.tag! 'messageID', ActiveMerchant::Utils.generate_unique_id.slice(0, 30)
             xml.tag! 'messageTimestamp', generate_timestamp
             xml.tag! 'timeoutValue', request_timeout
             xml.tag! 'apiVersion', API_VERSION
           end
-          
+
           xml.tag! 'MerchantInfo' do
             xml.tag! 'merchantID', @options[:login]
             xml.tag! 'password', @options[:password]
           end
-          
+
           xml.tag! 'RequestType', 'Payment'
           xml.tag! 'Payment' do
             xml.tag! 'TxnList', "count" => 1 do
@@ -133,40 +163,98 @@ module ActiveMerchant #:nodoc:
             end
           end
         end
-        
+
         xml.target!
       end
-         
+
       def commit(action, request)
         response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, build_request(action, request)))
-        
-        Response.new(success?(response), message_from(response), response, 
-          :test => test?, 
+
+        Response.new(success?(response), message_from(response), response,
+          :test => test?,
+          :authorization => authorization_from(response)
+        )
+      end
+
+      def build_periodic_item(action, money, credit_card, options)
+        xml = Builder::XmlMarkup.new
+
+        xml.tag! 'actionType', PERIODIC_ACTIONS[action]
+        xml.tag! 'clientID', options[:billing_id].to_s
+
+        if credit_card
+          xml.tag! 'CreditCardInfo' do
+            xml.tag! 'cardNumber', credit_card.number
+            xml.tag! 'expiryDate', expdate(credit_card)
+            xml.tag! 'cvv', credit_card.verification_value if credit_card.verification_value?
+          end
+        end
+        xml.tag! 'amount', amount(money)
+        xml.tag! 'periodicType', PERIODIC_TYPES[action] if PERIODIC_TYPES[action]
+
+        xml.target!
+      end
+
+      def build_periodic_request(body)
+        xml = Builder::XmlMarkup.new
+        xml.instruct!
+        xml.tag! 'SecurePayMessage' do
+          xml.tag! 'MessageInfo' do
+            xml.tag! 'messageID', ActiveMerchant::Utils.generate_unique_id.slice(0, 30)
+            xml.tag! 'messageTimestamp', generate_timestamp
+            xml.tag! 'timeoutValue', request_timeout
+            xml.tag! 'apiVersion', PERIODIC_API_VERSION
+          end
+
+          xml.tag! 'MerchantInfo' do
+            xml.tag! 'merchantID', @options[:login]
+            xml.tag! 'password', @options[:password]
+          end
+
+          xml.tag! 'RequestType', 'Periodic'
+          xml.tag! 'Periodic' do
+            xml.tag! 'PeriodicList', "count" => 1 do
+              xml.tag! 'PeriodicItem', "ID" => 1 do
+                xml << body
+              end
+            end
+          end
+        end
+        xml.target!
+      end
+
+      def commit_periodic(request)
+        my_request = build_periodic_request(request)
+        #puts my_request
+        response = parse(ssl_post(test? ? TEST_PERIODIC_URL : LIVE_PERIODIC_URL, my_request))
+
+        Response.new(success?(response), message_from(response), response,
+          :test => test?,
           :authorization => authorization_from(response)
         )
       end
-      
+
       def success?(response)
         SUCCESS_CODES.include?(response[:response_code])
       end
-      
+
       def authorization_from(response)
         [response[:txn_id], response[:purchase_order_no], response[:preauth_id], response[:amount]].join('*')
       end
-          
+
       def message_from(response)
         response[:response_text] || response[:status_description]
       end
-      
+
       def expdate(credit_card)
         "#{format(credit_card.month, :two_digits)}/#{format(credit_card.year, :two_digits)}"
       end
-      
+
       def parse(body)
         xml = REXML::Document.new(body)
 
         response = {}
-        
+
         xml.root.elements.to_a.each do |node|
           parse_element(response, node)
         end
@@ -181,13 +269,12 @@ module ActiveMerchant #:nodoc:
           response[node.name.underscore.to_sym] = node.text
         end
       end
-      
+
       # YYYYDDMMHHNNSSKKK000sOOO
       def generate_timestamp
         time = Time.now.utc
         time.strftime("%Y%d%m%H%M%S#{time.usec}+000")
-      end  
+      end
     end
   end
 end
-