activemerchant 1.42.6 → 1.90.0

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

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB',
         'IS', 'NO', 'CH'
       ]
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :solo, :diners_club]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :maestro, :jcb, :diners_club]
       self.homepage_url = 'http://www.soeasypay.com/'
       self.display_name = 'SoEasyPay'
 
@@ -114,7 +114,7 @@ module ActiveMerchant #:nodoc:
       def fill_cardholder(soap, card, options)
         ch_info = options[:billing_address] || options[:address]
 
-        soap.tag!('customerIP',options[:ip].to_s)
+        soap.tag!('customerIP', options[:ip].to_s)
         name = card.name || ch_info[:name]
         soap.tag!('cardHolderName', name.to_s)
         address = ch_info[:address1] || ''
@@ -135,7 +135,7 @@ module ActiveMerchant #:nodoc:
       def fill_card(soap, card)
         soap.tag!('cardNumber', card.number.to_s)
         soap.tag!('cardSecurityCode', card.verification_value.to_s)
-        soap.tag!('cardExpireMonth', card.month.to_s.rjust(2, "0"))
+        soap.tag!('cardExpireMonth', card.month.to_s.rjust(2, '0'))
         soap.tag!('cardExpireYear', card.year.to_s)
       end
 
@@ -157,15 +157,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(soap_action, soap, options)
-        headers = {"SOAPAction" => "\"urn:Interface##{soap_action}\"",
-                   "Content-Type" => "text/xml; charset=utf-8"}
+        headers = {'SOAPAction' => "\"urn:Interface##{soap_action}\"",
+                   'Content-Type' => 'text/xml; charset=utf-8'}
         response_string = ssl_post(test? ? self.test_url : self.live_url, soap, headers)
         response = parse(response_string, soap_action)
         return Response.new(response['errorcode'] == '000',
-                            response['errormessage'],
-                            response,
-                            :test => test?,
-                            :authorization => response['transaction_id'])
+          response['errormessage'],
+          response,
+          :test => test?,
+          :authorization => response['transaction_id'])
       end
 
       def build_soap(request)

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

@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
           purchase_with_token(money, payment_method, options)
         else
           MultiResponse.run do |r|
-            r.process { save_card(false, payment_method, options) }
+            r.process { save_card(options[:store], payment_method, options) }
             r.process { purchase_with_token(money, r.authorization, options) }
           end
         end
@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
           authorize_with_token(money, payment_method, options)
         else
           MultiResponse.run do |r|
-            r.process { save_card(false, payment_method, options) }
+            r.process { save_card(options[:store], payment_method, options) }
             r.process { authorize_with_token(money, r.authorization, options) }
           end
         end
@@ -88,6 +88,23 @@ module ActiveMerchant #:nodoc:
         commit("transactions/#{authorization}/void.xml", '')
       end
 
+      # Public: Determine whether a credit card is chargeable card and available for purchases.
+      #
+      # payment_method - The CreditCard or the Spreedly payment method token.
+      # options        - A hash of options:
+      #                  :store - Retain the payment method if the verify
+      #                           succeeds.  Defaults to false.  (optional)
+      def verify(payment_method, options = {})
+        if payment_method.is_a?(String)
+          verify_with_token(payment_method, options)
+        else
+          MultiResponse.run do |r|
+            r.process { save_card(options[:store], payment_method, options) }
+            r.process { verify_with_token(r.authorization, options) }
+          end
+        end
+      end
+
       # Public: Store a credit card in the Spreedly vault and retain it.
       #
       # credit_card    - The CreditCard to store
@@ -106,15 +123,35 @@ module ActiveMerchant #:nodoc:
         commit("payment_methods/#{authorization}/redact.xml", '', :put)
       end
 
+      # Public: Get the transaction with the given token.
+      def find(transaction_token)
+        commit("transactions/#{transaction_token}.xml", nil, :get)
+      end
+
+      alias_method :status, :find
+
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((Authorization: Basic )\w+), '\1[FILTERED]').
+          gsub(%r((<number>).+(</number>)), '\1[FILTERED]\2').
+          gsub(%r((<verification_value>).+(</verification_value>)), '\1[FILTERED]\2').
+          gsub(%r((<payment_method_token>).+(</payment_method_token>)), '\1[FILTERED]\2')
+      end
+
       private
+
       def save_card(retain, credit_card, options)
         request = build_xml_request('payment_method') do |doc|
           add_credit_card(doc, credit_card, options)
-          add_data(doc, options)
+          add_extra_options(:data, doc, options)
           doc.retained(true) if retain
         end
 
-        commit("payment_methods.xml", request, :post, :payment_method_token)
+        commit('payment_methods.xml', request, :post, :payment_method_token)
       end
 
       def purchase_with_token(money, payment_method_token, options)
@@ -127,18 +164,32 @@ module ActiveMerchant #:nodoc:
         commit("gateways/#{@options[:gateway_token]}/authorize.xml", request)
       end
 
+      def verify_with_token(payment_method_token, options)
+        request = build_xml_request('transaction') do |doc|
+          add_invoice(doc, nil, options)
+          doc.payment_method_token(payment_method_token)
+          doc.retain_on_success(true) if options[:store]
+          add_extra_options(:gateway_specific_fields, doc, options)
+        end
+
+        commit("gateways/#{@options[:gateway_token]}/verify.xml", request)
+      end
+
       def auth_purchase_request(money, payment_method_token, options)
         build_xml_request('transaction') do |doc|
           add_invoice(doc, money, options)
+          add_extra_options(:gateway_specific_fields, doc, options)
           doc.payment_method_token(payment_method_token)
           doc.retain_on_success(true) if options[:store]
         end
       end
 
       def add_invoice(doc, money, options)
-        doc.amount amount(money)
+        doc.amount amount(money) unless money.nil?
         doc.currency_code(options[:currency] || currency(money) || default_currency)
         doc.order_id(options[:order_id])
+        doc.ip(options[:ip]) if options[:ip]
+        doc.description(options[:description]) if options[:description]
       end
 
       def add_credit_card(doc, credit_card, options)
@@ -159,17 +210,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      def add_data(doc, options)
-        doc.data do
-          data_to_doc(doc, options[:data])
+      def add_extra_options(type, doc, options)
+        doc.send(type) do
+          extra_options_to_doc(doc, options[type])
         end
       end
 
-      def data_to_doc(doc, value)
+      def extra_options_to_doc(doc, value)
         return doc.text value unless value.kind_of? Hash
         value.each do |k, v|
           doc.send(k) do
-            data_to_doc(doc, v)
+            extra_options_to_doc(doc, v)
           end
         end
       end
@@ -179,7 +230,7 @@ module ActiveMerchant #:nodoc:
 
         doc = Nokogiri::XML(xml)
         doc.root.xpath('*').each do |node|
-          if (node.elements.empty?)
+          if node.elements.empty?
             response[node.name.downcase.to_sym] = node.text
           else
             node.elements.each do |childnode|
@@ -239,4 +290,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-