activemerchant 1.43.3 → 1.44.0

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

@@ -7,12 +7,12 @@ module ActiveMerchant #:nodoc:
     class PaypalGateway < Gateway
       include PaypalCommonAPI
       include PaypalRecurringApi
-      
+
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.supported_countries = ['US']
       self.homepage_url = 'https://www.paypal.com/us/webapps/mpp/paypal-payments-pro'
       self.display_name = 'PayPal Payments Pro (US)'
-      
+
       def authorize(money, credit_card_or_referenced_id, options = {})
         requires!(options, :ip)
         commit define_transaction_type(credit_card_or_referenced_id), build_sale_or_authorization_request('Authorization', money, credit_card_or_referenced_id, options)
@@ -22,13 +22,24 @@ module ActiveMerchant #:nodoc:
         requires!(options, :ip)
         commit define_transaction_type(credit_card_or_referenced_id), build_sale_or_authorization_request('Sale', money, credit_card_or_referenced_id, options)
       end
-      
+
+      def verify(credit_card, options = {})
+        if %w(visa master).include?(credit_card.brand)
+          authorize(0, credit_card, options)
+        else
+          MultiResponse.run(:use_first_response) do |r|
+            r.process { authorize(100, credit_card, options) }
+            r.process(:ignore_result) { void(r.authorization, options) }
+          end
+        end
+      end
+
       def express
         @express ||= PaypalExpressGateway.new(@options)
       end
-      
+
       private
-      
+
       def define_transaction_type(transaction_arg)
         if transaction_arg.is_a?(String)
           return 'DoReferenceTransaction'
@@ -36,14 +47,14 @@ module ActiveMerchant #:nodoc:
           return 'DoDirectPayment'
         end
       end
-      
+
       def build_sale_or_authorization_request(action, money, credit_card_or_referenced_id, options)
         transaction_type = define_transaction_type(credit_card_or_referenced_id)
         reference_id = credit_card_or_referenced_id if transaction_type == "DoReferenceTransaction"
-        
+
         billing_address = options[:billing_address] || options[:address]
         currency_code = options[:currency] || currency(money)
-       
+
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! transaction_type + 'Req', 'xmlns' => PAYPAL_NAMESPACE do
           xml.tag! transaction_type + 'Request', 'xmlns:n2' => EBAY_NAMESPACE do
@@ -58,9 +69,9 @@ module ActiveMerchant #:nodoc:
           end
         end
 
-        xml.target!        
+        xml.target!
       end
-      
+
       def add_credit_card(xml, credit_card, address, options)
         xml.tag! 'n2:CreditCard' do
           xml.tag! 'n2:CreditCardType', credit_card_type(card_brand(credit_card))
@@ -68,19 +79,19 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'n2:ExpMonth', format(credit_card.month, :two_digits)
           xml.tag! 'n2:ExpYear', format(credit_card.year, :four_digits)
           xml.tag! 'n2:CVV2', credit_card.verification_value
-          
+
           if [ 'switch', 'solo' ].include?(card_brand(credit_card).to_s)
             xml.tag! 'n2:StartMonth', format(credit_card.start_month, :two_digits) unless credit_card.start_month.blank?
             xml.tag! 'n2:StartYear', format(credit_card.start_year, :four_digits) unless credit_card.start_year.blank?
             xml.tag! 'n2:IssueNumber', format(credit_card.issue_number, :two_digits) unless credit_card.issue_number.blank?
           end
-          
+
           xml.tag! 'n2:CardOwner' do
             xml.tag! 'n2:PayerName' do
               xml.tag! 'n2:FirstName', credit_card.first_name
               xml.tag! 'n2:LastName', credit_card.last_name
             end
-            
+
             xml.tag! 'n2:Payer', options[:email]
             add_address(xml, 'n2:Address', address)
           end
@@ -97,7 +108,7 @@ module ActiveMerchant #:nodoc:
         when 'solo'             then 'Solo'
         end
       end
-      
+
       def build_response(success, message, response, options = {})
          Response.new(success, message, response, options)
       end

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

@@ -122,7 +122,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated Gateway::CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 

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

@@ -23,8 +23,10 @@ module ActiveMerchant #:nodoc:
       # * <tt>:cycles</tt> -- Limit to certain # of cycles (OPTIONAL)
       # * <tt>:start_date</tt> -- When does the charging starts (REQUIRED)
       # * <tt>:description</tt> -- The description to appear in the profile (REQUIRED)
-      
+
       def recurring(amount, credit_card, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         options[:credit_card] = credit_card
         options[:amount] = amount
         requires!(options, :description, :start_date, :period, :frequency, :amount)
@@ -34,7 +36,7 @@ module ActiveMerchant #:nodoc:
       # Update a recurring payment's details.
       #
       # This transaction updates an existing Recurring Billing Profile
-      # and the subscription must have already been created previously 
+      # and the subscription must have already been created previously
       # by calling +recurring()+. The ability to change certain
       # details about a recurring payment is dependent on transaction history
       # and the type of plan you're subscribed with paypal. Web Payment Pro
@@ -49,6 +51,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>:profile_id</tt> -- A string containing the <tt>:profile_id</tt>
       # of the recurring payment already in place for a given credit card. (REQUIRED)
       def update_recurring(options={})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         requires!(options, :profile_id)
         opts = options.dup
         commit 'UpdateRecurringPaymentsProfile', build_change_profile_request(opts.delete(:profile_id), opts)
@@ -65,6 +69,8 @@ module ActiveMerchant #:nodoc:
       # recurring payment already in place for a given credit card. (REQUIRED)
       # * <tt>options</tt> -- A hash with extra info ('note' for ex.)
       def cancel_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Cancel', options)
       end
@@ -76,6 +82,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def status_recurring(profile_id)
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'GetRecurringPaymentsProfileDetails', build_get_profile_details_request(profile_id)
       end
@@ -87,6 +95,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def suspend_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Suspend', options)
       end
@@ -98,6 +108,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def reactivate_recurring(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
 commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(profile_id, 'Reactivate', options)
       end
@@ -109,6 +121,8 @@ commit 'ManageRecurringPaymentsProfileStatus', build_manage_profile_request(prof
       # * <tt>profile_id</tt> -- A string containing the +profile_id+ of the
       # recurring payment already in place for a given credit card. (REQUIRED)
       def bill_outstanding_amount(profile_id, options = {})
+        ActiveMerchant.deprecated Gateway::RECURRING_DEPRECATION_MESSAGE
+
         raise_error_if_blank('profile_id', profile_id)
         commit 'BillOutstandingAmount', build_bill_outstanding_amount(profile_id, options)
       end

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

@@ -11,9 +11,10 @@ module ActiveMerchant #:nodoc:
       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"
+        options[:review] ||= false
+        super
       end
 
       # GATEWAY.setup_purchase(100,

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

@@ -67,6 +67,10 @@ module ActiveMerchant #:nodoc:
         commit 'BAUpdate', build_cancel_billing_agreement_request(token)
       end
 
+      def agreement_details(reference_id, options = {})
+        commit 'BAUpdate', build_details_billing_agreement_request(reference_id)
+      end
+
       def authorize_reference_transaction(money, options = {})
         requires!(options, :reference_id, :payment_type, :invoice_id, :description, :ip)
 
@@ -127,12 +131,14 @@ module ActiveMerchant #:nodoc:
               if options[:max_amount]
                 xml.tag! 'n2:MaxAmount', localized_amount(options[:max_amount], currency_code), 'currencyID' => currency_code
               end
+              xml.tag! 'n2:ReqBillingAddress', options[:req_billing_address] ? '1' : '0'
               xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
               xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
               xml.tag! 'n2:LocaleCode', locale_code(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-logo-image', options[:logo_image] unless options[:logo_image].blank?
               xml.tag! 'n2:cpp-header-image', options[:header_image] unless options[:header_image].blank?
               xml.tag! 'n2:cpp-header-border-color', options[:header_border_color] unless options[:header_border_color].blank?
               xml.tag! 'n2:cpp-header-back-color', options[:header_background_color] unless options[:header_background_color].blank?
@@ -154,6 +160,13 @@ module ActiveMerchant #:nodoc:
               if !options[:allow_note].nil?
                 xml.tag! 'n2:AllowNote', options[:allow_note] ? '1' : '0'
               end
+
+              if options[:funding_sources]
+                xml.tag! 'n2:FundingSourceDetails' do
+                  xml.tag! 'n2:UserSelectedFundingSource', options[:funding_sources][:source]
+                end
+              end
+
               xml.tag! 'n2:CallbackURL', options[:callback_url] unless options[:callback_url].blank?
 
               add_payment_details(xml, money, currency_code, options)
@@ -205,6 +218,18 @@ module ActiveMerchant #:nodoc:
         xml.target!
       end
 
+      def build_details_billing_agreement_request(reference_id)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag! 'BillAgreementUpdateReq', 'xmlns' => PAYPAL_NAMESPACE do
+          xml.tag! 'BAUpdateRequest', 'xmlns:n2' => EBAY_NAMESPACE do
+            xml.tag! 'n2:Version', API_VERSION
+            xml.tag! 'ReferenceID', reference_id
+          end
+        end
+
+        xml.target!
+      end
+
       def build_reference_transaction_request(action, money, options)
         currency_code = options[:currency] || currency(money)
 

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

@@ -155,16 +155,9 @@ module ActiveMerchant #:nodoc:
         post[:password]       = @options[:password]
         post[:type]           = action
 
-        request = post.merge(parameters).collect { |key, value| "#{key}=#{URI.escape(value.to_s)}" }.join("&")
+        request = post.merge(parameters).collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
         request
       end
-
-      def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
     end
   end
 end

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

@@ -28,8 +28,9 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, options)
         add_creditcard(post, creditcard)
         add_address(post, creditcard, options)
+        add_capture(post, options)
 
-        commit('charges', post, options)
+        commit(:post, 'charges', post, options)
       end
 
       # Create a customer and associated credit card. The token that is returned
@@ -40,17 +41,42 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard)
         add_customer_data(post, options)
         add_address(post, creditcard, options)
-        commit('customers', post, options)
+        commit(:post, 'customers', post, options)
       end
 
       # Refund a transaction, note that the money attribute is ignored at the
       # moment as the API does not support partial refunds. The parameter is
       # kept for compatibility reasons
       def refund(money, token, options = {})
-        commit("charges/#{CGI.escape(token)}/refunds", { :amount => amount(money) }, options)
+        commit(:post, "charges/#{CGI.escape(token)}/refunds", { :amount => amount(money) }, options)
+      end
+
+      # Authorize an amount on a credit card. Once authorized, you can later
+      # capture this charge using the charge token that is returned.
+      def authorize(money, creditcard, options = {})
+        options[:capture] = false
+
+        purchase(money, creditcard, options)
+      end
+
+      # Captures a previously authorized charge. Capturing a certin amount of the original
+      # authorization is currently not supported.
+      def capture(money, token, options = {})
+        commit(:put, "charges/#{CGI.escape(token)}/capture", {}, options)
+      end
+
+      # Updates the credit card for the customer.
+      def update(token, creditcard, options = {})
+        post = {}
+
+        add_creditcard(post, creditcard)
+        add_customer_data(post, options)
+        add_address(post, creditcard, options)
+        commit(:put, "customers/#{CGI.escape(token)}", post, options)
       end
 
       private
+
       def add_amount(post, money, options)
         post[:amount] = amount(money)
         post[:currency] = (options[:currency] || currency(money))
@@ -58,8 +84,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        post[:email] = options[:email]
-        post[:ip_address] = options[:ip]
+        post[:email] = options[:email] if options[:email]
+        post[:ip_address] = options[:ip] if options[:ip]
       end
 
       def add_address(post, creditcard, options)
@@ -81,6 +107,12 @@ module ActiveMerchant #:nodoc:
         post[:description] = options[:description] || "Active Merchant Purchase"
       end
 
+      def add_capture(post, options)
+        capture = options[:capture]
+
+        post[:capture] = capture == false ? false : true
+      end
+
       def add_creditcard(post, creditcard)
         if creditcard.respond_to?(:number)
           post[:card] ||= {}
@@ -112,11 +144,11 @@ module ActiveMerchant #:nodoc:
         result
       end
 
-      def commit(action, params, options)
+      def commit(method, action, params, options)
         url = "#{test? ? test_url : live_url}/#{action}"
 
         begin
-          body = parse(ssl_post(url, post_data(params), headers(options)))
+          body = parse(ssl_request(method, url, post_data(params), headers(options)))
         rescue ResponseError => e
           body = parse(e.response.body)
         end

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

@@ -153,7 +153,7 @@ module ActiveMerchant
         add_amount(post, money, options)
 
         if identification_or_creditcard.is_a?(String)
-          deprecated CREDIT_DEPRECATION_MESSAGE
+          ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
           refund(money, identification_or_creditcard, options)
         else
           add_creditcard(post, identification_or_creditcard)
@@ -268,17 +268,6 @@ module ActiveMerchant
         post[:currency] = options[:currency] || currency(money)
       end
 
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
-      end
-
       def message_from(results)
         PAYMENT_GATEWAY_RESPONSES[results[:resp_code]]
       end

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

@@ -70,7 +70,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
@@ -203,17 +203,6 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
-      end
-
       def split_authorization(authorization)
         order_id, trans_ref_number = authorization.split(';')
         [order_id, trans_ref_number]

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

@@ -100,7 +100,7 @@ module ActiveMerchant #:nodoc:
       #
       #
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options = {})
       end
 

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

@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -241,7 +241,7 @@ module ActiveMerchant #:nodoc:
               parse_element(reply, node)
             end
           end
-        rescue Exception => e
+        rescue Exception
           reply[:request_status] = 'Failure'
           reply[:request_message] = "Failure: There was a problem parsing the response XML"
         end