activemerchant 1.38.0 → 1.79.2

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     # ==== USA ePay Advanced SOAP Interface
     #
-    # This class encapuslates USA ePay's Advanced SOAP Interface. The Advanced Soap Interface allows
+    # This class encapsulates USA ePay's Advanced SOAP Interface. The Advanced Soap Interface allows
     # standard transactions, storing customer information, and recurring billing. Storing sensitive
     # information on USA ePay's servers can help with PCI DSS compliance, since customer and card data
     # do not need to be stored locally.
@@ -77,12 +77,14 @@ module ActiveMerchant #:nodoc:
       self.homepage_url = 'http://www.usaepay.com/'
       self.display_name = 'USA ePay Advanced SOAP Interface'
 
-      CUSTOMER_OPTIONS = {
+      CUSTOMER_PROFILE_OPTIONS = {
         :id => [:string, 'CustomerID'], # merchant assigned number
         :notes => [:string, 'Notes'],
         :data => [:string, 'CustomData'],
-        :url => [:string, 'URL'],
-        # Recurring Billing
+        :url => [:string, 'URL']
+      } #:nodoc:
+
+      CUSTOMER_RECURRING_BILLING_OPTIONS = {
         :enabled => [:boolean, 'Enabled'],
         :schedule => [:string, 'Schedule'],
         :number_left => [:integer, 'NumLeft'],
@@ -92,18 +94,24 @@ module ActiveMerchant #:nodoc:
         :user => [:string, 'User'],
         :source => [:string, 'Source'],
         :send_receipt => [:boolean, 'SendReceipt'],
-        :receipt_note => [:string, 'ReceiptNote'],
-        # Point of Sale
+        :receipt_note => [:string, 'ReceiptNote']
+      } #:nodoc:
+
+      CUSTOMER_POINT_OF_SALE_OPTIONS = {
         :price_tier => [:string, 'PriceTier'],
         :tax_class => [:string, 'TaxClass'],
         :lookup_code => [:string, 'LookupCode']
       } #:nodoc:
 
-      ADDRESS_OPTIONS = {
+      CUSTOMER_OPTIONS = [
+        CUSTOMER_PROFILE_OPTIONS,
+        CUSTOMER_RECURRING_BILLING_OPTIONS,
+        CUSTOMER_POINT_OF_SALE_OPTIONS
+      ].inject(:merge) #:nodoc:
+
+      COMMON_ADDRESS_OPTIONS = {
         :first_name => [:string, 'FirstName'],
         :last_name => [:string, 'LastName'],
-        :address1 => [:string, 'Street'],
-        :address2 => [:string, 'Street2'],
         :city => [:string, 'City'],
         :state => [:string, 'State'],
         :zip => [:string, 'Zip'],
@@ -114,6 +122,32 @@ module ActiveMerchant #:nodoc:
         :company => [:string, 'Company']
       } #:nodoc:
 
+      ADDRESS_OPTIONS = [
+        COMMON_ADDRESS_OPTIONS,
+        {
+          :address1 => [:string, 'Street'],
+          :address2 => [:string, 'Street2'],
+        }
+      ].inject(:merge) #:nodoc
+
+      CUSTOMER_UPDATE_DATA_FIELDS = [
+        CUSTOMER_PROFILE_OPTIONS,
+        CUSTOMER_RECURRING_BILLING_OPTIONS,
+        COMMON_ADDRESS_OPTIONS,
+        {
+          :address1 => [:string, 'Address'],
+          :address2 => [:string, 'Address2'],
+        },
+        {
+          :card_number => [:string, 'CardNumber'],
+          :card_exp => [:string, 'CardExp'],
+          :account => [:string, 'Account'],
+          :routing => [:string, 'Routing'],
+          :check_format => [:string, 'CheckFormat'],
+          :record_type => [:string, 'RecordType'],
+        }
+      ].inject(:merge) #:nodoc
+
       CUSTOMER_TRANSACTION_REQUEST_OPTIONS = {
         :command => [:string, 'Command'],
         :ignore_duplicate => [:boolean, 'IgnoreDuplicate'],
@@ -124,7 +158,8 @@ module ActiveMerchant #:nodoc:
         :merchant_receipt => [:boolean, 'MerchReceipt'],
         :merchant_email => [:boolean, 'MerchReceiptEmail'],
         :merchant_template => [:boolean, 'MerchReceiptName'],
-        :verification_value => [:boolean, 'isRecurring'],
+        :recurring => [:boolean, 'isRecurring'],
+        :verification_value => [:string, 'CardCode'],
         :software => [:string, 'Software']
       } #:nodoc:
 
@@ -179,7 +214,6 @@ module ActiveMerchant #:nodoc:
       } #:nodoc:
 
       CHECK_DATA_OPTIONS = {
-        :check_number => [:integer, 'CheckNumber'],
         :drivers_license => [:string, 'DriversLicense'],
         :drivers_license_state => [:string, 'DriversLicenseState'],
         :record_type => [:string, 'RecordType'],
@@ -292,7 +326,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options={})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -339,9 +373,10 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Update a customer by replacing all of the customer details..
+      # Update a customer by replacing all of the customer details.
       #
-      # Use quickUpdateCustomer to just update a few attributes.
+      # ==== Required
+      # * <tt>:customer_number</tt> -- customer to update
       #
       # ==== Options
       #  * Same as add_customer
@@ -353,9 +388,58 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
+      # Update a customer by replacing only the provided fields.
+      #
+      # ==== Required
+      # * <tt>:customer_number</tt> -- customer to update
+      # * <tt>:update_data</tt> -- FieldValue array of fields to retrieve
+      #   * <tt>:first_name</tt>
+      #   * <tt>:last_name</tt>
+      #   * <tt>:id</tt>
+      #   * <tt>:company</tt>
+      #   * <tt>:address</tt>
+      #   * <tt>:address2</tt>
+      #   * <tt>:city</tt>
+      #   * <tt>:state</tt>
+      #   * <tt>:zip</tt>
+      #   * <tt>:country</tt>
+      #   * <tt>:phone</tt>
+      #   * <tt>:fax</tt>
+      #   * <tt>:email</tt>
+      #   * <tt>:url</tt>
+      #   * <tt>:receipt_note</tt>
+      #   * <tt>:send_receipt</tt>
+      #   * <tt>:notes</tt>
+      #   * <tt>:description</tt>
+      #   * <tt>:order_id</tt>
+      #   * <tt>:enabled</tt>
+      #   * <tt>:schedule</tt>
+      #   * <tt>:next</tt>
+      #   * <tt>:num_left</tt>
+      #   * <tt>:amount</tt>
+      #   * <tt>:custom_data</tt>
+      #   * <tt>:source</tt>
+      #   * <tt>:user</tt>
+      #   * <tt>:card_number</tt>
+      #   * <tt>:card_exp</tt>
+      #   * <tt>:account</tt>
+      #   * <tt>:routing</tt>
+      #   * <tt>:check_format</tt> or <tt>:record_type</tt>
+      #
+      # ==== Response
+      # * <tt>#message</tt> -- boolean; Returns true if successful. Exception thrown all failures.
+      #
+      def quick_update_customer(options={})
+        requires! options, :customer_number
+        requires! options, :update_data
+
+        request = build_request(__method__, options)
+        commit(__method__, request)
+      end
+
       # Enable a customer for recurring billing.
       #
-      # Note: Customer does not need to have all recurring paramerters to succeed.
+      # Note: Customer does not need to have all recurring parameters to succeed.
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -402,7 +486,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Retrive all of the payment methods belonging to a customer
+      # Retrieve all of the payment methods belonging to a customer
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -417,7 +501,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Retrive one of the payment methods belonging to a customer
+      # Retrieve one of the payment methods belonging to a customer
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -454,7 +538,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Delete one the payment methods beloning to a customer
+      # Delete one the payment methods belonging to a customer
       #
       # ==== Required
       # * <tt>:customer_number</tt>
@@ -543,11 +627,11 @@ module ActiveMerchant #:nodoc:
       # will be returned in the response.
       #
       # ==== Options
-      # * <tt>:method</tt> -- credit_card or check
+      # * <tt>:payment_method</tt> -- credit_card or check
       # * <tt>:command</tt> -- sale, credit, void, creditvoid, authonly, capture, postauth, check, checkcredit; defaults to sale; only required for run_transaction when other than sale
       # * <tt>:reference_number</tt> -- for the original transaction; obtained by sale or authonly
       # * <tt>:authorization_code</tt> -- required for postauth; obtained offline
-      # * <tt>:ignore_duplicate</tt> -- set +true+ if you want to override the duplicate tranaction handling
+      # * <tt>:ignore_duplicate</tt> -- set +true+ if you want to override the duplicate transaction handling
       # * <tt>:account_holder</tt> -- name of account holder
       # * <tt>:customer_id</tt> -- merchant assigned id
       # * <tt>:customer_receipt</tt> -- set +true+ to email receipt to billing email address
@@ -680,7 +764,7 @@ module ActiveMerchant #:nodoc:
         commit(__method__, request)
       end
 
-      # Override transaction flagged for mananager approval.
+      # Override transaction flagged for manager approval.
       #
       # Note: Checks only!
       #
@@ -954,8 +1038,8 @@ module ActiveMerchant #:nodoc:
           'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
           'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
           'xmlns:SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/',
-          'SOAP-ENV:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/' do |soap|
-          soap.tag! "SOAP-ENV:Body" do |soap|
+          'SOAP-ENV:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/' do
+          soap.tag! "SOAP-ENV:Body" do
             send("build_#{action}", soap, options)
           end
         end
@@ -971,9 +1055,9 @@ module ActiveMerchant #:nodoc:
       def build_token(soap, options)
         seed = SecureRandom.base64(32)
         hash = Digest::SHA1.hexdigest("#{@options[:login]}#{seed}#{@options[:password].to_s.strip}")
-        soap.Token 'xsi:type' => 'ns1:ueSecurityToken' do |soap|
+        soap.Token 'xsi:type' => 'ns1:ueSecurityToken' do
           build_tag soap, :string, 'ClientIP', options[:client_ip]
-          soap.PinHash 'xsi:type' => 'ns1:ueHash' do |soap|
+          soap.PinHash 'xsi:type' => 'ns1:ueHash' do
             build_tag soap, :string, "HashValue", hash
             build_tag soap, :string, "Seed", seed
             build_tag soap, :string, "Type", 'sha1'
@@ -985,7 +1069,7 @@ module ActiveMerchant #:nodoc:
       # Customer ======================================================
 
       def build_add_customer(soap, options)
-        soap.tag! "ns1:addCustomer" do |soap|
+        soap.tag! "ns1:addCustomer" do
           build_token soap, options
           build_customer_data soap, options
           build_tag soap, :double, 'Amount', amount(options[:amount])
@@ -995,7 +1079,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_customer(soap, options, type, add_customer_data=false)
-        soap.tag! "ns1:#{type}" do |soap|
+        soap.tag! "ns1:#{type}" do
           build_token soap, options
           build_tag soap, :integer, 'CustNum', options[:customer_number]
           build_customer_data soap, options if add_customer_data
@@ -1018,8 +1102,16 @@ module ActiveMerchant #:nodoc:
         build_customer(soap, options, 'deleteCustomer')
       end
 
+      def build_quick_update_customer(soap, options)
+        soap.tag! "ns1:quickUpdateCustomer" do
+          build_token soap, options
+          build_tag soap, :integer, 'CustNum', options[:customer_number]
+          build_field_value_array soap, "UpdateData", "FieldValue", options[:update_data], CUSTOMER_UPDATE_DATA_FIELDS
+        end
+      end
+
       def build_add_customer_payment_method(soap, options)
-        soap.tag! "ns1:addCustomerPaymentMethod" do |soap|
+        soap.tag! "ns1:addCustomerPaymentMethod" do
           build_token soap, options
           build_tag soap, :integer, 'CustNum', options[:customer_number]
           build_customer_payment_methods soap, options
@@ -1029,7 +1121,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_get_customer_payment_method(soap, options)
-        soap.tag! 'ns1:getCustomerPaymentMethod' do |soap|
+        soap.tag! 'ns1:getCustomerPaymentMethod' do
           build_token soap, options
           build_tag soap, :integer, 'CustNum', options[:customer_number]
           build_tag soap, :integer, 'MethodID', options[:method_id]
@@ -1041,7 +1133,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_update_customer_payment_method(soap, options)
-        soap.tag! 'ns1:updateCustomerPaymentMethod' do |soap|
+        soap.tag! 'ns1:updateCustomerPaymentMethod' do
           build_token soap, options
           build_customer_payment_methods soap, options
           build_tag soap, :boolean, 'Verify', options[:verify]
@@ -1049,7 +1141,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_delete_customer_payment_method(soap, options)
-        soap.tag! "ns1:deleteCustomerPaymentMethod" do |soap|
+        soap.tag! "ns1:deleteCustomerPaymentMethod" do
           build_token soap, options
           build_tag soap, :integer, 'Custnum', options[:customer_number]
           build_tag soap, :integer, 'PaymentMethodID', options[:method_id]
@@ -1057,7 +1149,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_run_customer_transaction(soap, options)
-        soap.tag! "ns1:runCustomerTransaction" do |soap|
+        soap.tag! "ns1:runCustomerTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'CustNum', options[:customer_number]
           build_tag soap, :integer, 'PaymentMethodID', options[:method_id] || 0
@@ -1068,56 +1160,56 @@ module ActiveMerchant #:nodoc:
       # Transactions ==================================================
 
       def build_run_transaction(soap, options)
-        soap.tag! 'ns1:runTransaction' do |soap|
+        soap.tag! 'ns1:runTransaction' do
           build_token soap, options
           build_transaction_request_object soap, options, 'Parameters'
         end
       end
 
       def build_run_sale(soap, options)
-        soap.tag! 'ns1:runSale' do |soap|
+        soap.tag! 'ns1:runSale' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_run_auth_only(soap, options)
-        soap.tag! 'ns1:runAuthOnly' do |soap|
+        soap.tag! 'ns1:runAuthOnly' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_run_credit(soap, options)
-        soap.tag! 'ns1:runCredit' do |soap|
+        soap.tag! 'ns1:runCredit' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_run_check_sale(soap, options)
-        soap.tag! 'ns1:runCheckSale' do |soap|
+        soap.tag! 'ns1:runCheckSale' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_run_check_credit(soap, options)
-        soap.tag! 'ns1:runCheckCredit' do |soap|
+        soap.tag! 'ns1:runCheckCredit' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_post_auth(soap, options)
-        soap.tag! 'ns1:postAuth' do |soap|
+        soap.tag! 'ns1:postAuth' do
           build_token soap, options
           build_transaction_request_object soap, options
         end
       end
 
       def build_run_quick_sale(soap, options)
-        soap.tag! 'ns1:runQuickSale' do |soap|
+        soap.tag! 'ns1:runQuickSale' do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
           build_transaction_detail soap, options
@@ -1126,7 +1218,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_run_quick_credit(soap, options)
-        soap.tag! 'ns1:runQuickCredit' do |soap|
+        soap.tag! 'ns1:runQuickCredit' do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
           build_transaction_detail soap, options
@@ -1134,21 +1226,21 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_get_transaction(soap, options)
-        soap.tag! "ns1:getTransaction" do |soap|
+        soap.tag! "ns1:getTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
         end
       end
 
       def build_get_transaction_status(soap, options)
-        soap.tag! "ns1:getTransactionStatus" do |soap|
+        soap.tag! "ns1:getTransactionStatus" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
         end
       end
 
       def build_get_transaction_custom(soap, options)
-        soap.tag! "ns1:getTransactionCustom" do |soap|
+        soap.tag! "ns1:getTransactionCustom" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
           build_transaction_field_array soap, options
@@ -1156,29 +1248,29 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_get_check_trace(soap, options)
-        soap.tag! "ns1:getCheckTrace" do |soap|
+        soap.tag! "ns1:getCheckTrace" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
         end
       end
 
       def build_capture_transaction(soap, options)
-        soap.tag! "ns1:captureTransaction" do |soap|
+        soap.tag! "ns1:captureTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
-          build_tag soap, :double, 'RefNum', amount(options[:amount])
+          build_tag soap, :double, 'Amount', amount(options[:amount])
         end
       end
 
       def build_void_transaction(soap, options)
-        soap.tag! "ns1:voidTransaction" do |soap|
+        soap.tag! "ns1:voidTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
         end
       end
 
       def build_refund_transaction(soap, options)
-        soap.tag! "ns1:refundTransaction" do |soap|
+        soap.tag! "ns1:refundTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
           build_tag soap, :integer, 'Amount', amount(options[:amount])
@@ -1186,7 +1278,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_override_transaction(soap, options)
-        soap.tag! "ns1:overrideTransaction" do |soap|
+        soap.tag! "ns1:overrideTransaction" do
           build_token soap, options
           build_tag soap, :integer, 'RefNum', options[:reference_number]
           build_tag soap, :string, 'Reason', options[:reason]
@@ -1196,7 +1288,7 @@ module ActiveMerchant #:nodoc:
       # Account =======================================================
 
       def build_get_account_details(soap, options)
-        soap.tag! "ns1:getAccountDetails" do |soap|
+        soap.tag! "ns1:getAccountDetails" do
           build_token soap, options
         end
       end
@@ -1218,7 +1310,7 @@ module ActiveMerchant #:nodoc:
         if options[:payment_methods]
           length = options[:payment_methods].length
           soap.PaymentMethods 'SOAP-ENC:arrayType' => "ns1:PaymentMethod[#{length}]",
-            'xsi:type' =>"ns1:PaymentMethodArray" do |soap|
+            'xsi:type' =>"ns1:PaymentMethodArray" do
             build_customer_payment_methods soap, options
           end
         end
@@ -1244,16 +1336,18 @@ module ActiveMerchant #:nodoc:
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::CreditCard)
           build_tag soap, :string, 'CardNumber', payment_method[:method].number
           build_tag soap, :string, 'CardExpiration',
-            "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year}"
+            "#{"%02d" % payment_method[:method].month}#{payment_method[:method].year.to_s[-2..-1]}"
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
           end
           build_tag soap, :string, 'CardCode', payment_method[:method].verification_value
         when payment_method[:method].kind_of?(ActiveMerchant::Billing::Check)
-          build_tag soap, :string, 'Account', payment_method[:method].number
+          build_tag soap, :string, 'Account', payment_method[:method].account_number
           build_tag soap, :string, 'Routing', payment_method[:method].routing_number
-          build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize
+          unless payment_method[:method].account_type.nil?
+            build_tag soap, :string, 'AccountType', payment_method[:method].account_type.capitalize
+          end
           build_tag soap, :string, 'DriversLicense', options[:drivers_license]
           build_tag soap, :string, 'DriversLicenseState', options[:drivers_license_state]
           build_tag soap, :string, 'RecordType', options[:record_type]
@@ -1263,7 +1357,7 @@ module ActiveMerchant #:nodoc:
       def build_customer_payment_methods(soap, options)
         payment_methods, tag_name = extract_methods_and_tag(options)
         payment_methods.each do |payment_method|
-          soap.tag! tag_name, 'xsi:type' => "ns1:PaymentMethod" do |soap|
+          soap.tag! tag_name, 'xsi:type' => "ns1:PaymentMethod" do
             build_tag soap, :integer, 'MethodID', payment_method[:method_id]
             build_tag soap, :string, 'MethodType', payment_method[:type]
             build_tag soap, :string, 'MethodName', payment_method[:name]
@@ -1274,7 +1368,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_customer_transaction(soap, options)
-        soap.Parameters 'xsi:type' => "ns1:CustomerTransactionRequest" do |soap|
+        soap.Parameters 'xsi:type' => "ns1:CustomerTransactionRequest" do
           build_transaction_detail soap, options
           CUSTOMER_TRANSACTION_REQUEST_OPTIONS.each do |k,v|
             build_tag soap, v[0], v[1], options[k]
@@ -1287,7 +1381,7 @@ module ActiveMerchant #:nodoc:
       # Transaction Helpers ===========================================
 
       def build_transaction_request_object(soap, options, name='Params')
-        soap.tag! name, 'xsi:type' => "ns1:TransactionRequestObject" do |soap|
+        soap.tag! name, 'xsi:type' => "ns1:TransactionRequestObject" do
           TRANSACTION_REQUEST_OBJECT_OPTIONS.each do |k,v|
             build_tag soap, v[0], v[1], options[k]
           end
@@ -1310,7 +1404,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_transaction_detail(soap, options)
-        soap.Details 'xsi:type' => "ns1:TransactionDetail" do |soap|
+        soap.Details 'xsi:type' => "ns1:TransactionDetail" do
           TRANSACTION_DETAIL_OPTIONS.each do |k,v|
             build_tag soap, v[0], v[1], options[k]
           end
@@ -1321,10 +1415,9 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_credit_card_data(soap, options)
-        soap.CreditCardData 'xsi:type' => "ns1:CreditCardData" do |soap|
+        soap.CreditCardData 'xsi:type' => "ns1:CreditCardData" do
           build_tag soap, :string, 'CardNumber', options[:payment_method].number
-          build_tag soap, :string, 'CardExpiration',
-            "#{"%02d" % options[:payment_method].month}#{options[:payment_method].year}"
+          build_tag soap, :string, 'CardExpiration', build_card_expiration(options)
           if options[:billing_address]
             build_tag soap, :string, 'AvsStreet', options[:billing_address][:address1]
             build_tag soap, :string, 'AvsZip', options[:billing_address][:zip]
@@ -1337,8 +1430,17 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def build_card_expiration(options)
+        month = options[:payment_method].month
+        year  = options[:payment_method].year
+        unless month.nil? || year.nil?
+          "#{"%02d" % month}#{year.to_s[-2..-1]}"
+        end
+      end
+
       def build_check_data(soap, options)
-        soap.CheckData 'xsi:type' => "ns1:CheckData" do |soap|
+        soap.CheckData 'xsi:type' => "ns1:CheckData" do
+          build_tag soap, :integer, 'CheckNumber', options[:payment_method].number
           build_tag soap, :string, 'Account', options[:payment_method].account_number
           build_tag soap, :string, 'Routing', options[:payment_method].routing_number
           build_tag soap, :string, 'AccountType', options[:payment_method].account_type.capitalize
@@ -1350,7 +1452,7 @@ module ActiveMerchant #:nodoc:
 
       def build_recurring_billing(soap, options)
         if options[:recurring]
-          soap.RecurringBilling 'xsi:type' => "ns1:RecurringBilling" do |soap|
+          soap.RecurringBilling 'xsi:type' => "ns1:RecurringBilling" do
             build_tag soap, :double, 'Amount', amount(options[:recurring][:amount])
             build_tag soap, :string, 'Next', options[:recurring][:next].strftime("%Y-%m-%d") if options[:recurring][:next]
             build_tag soap, :string, 'Expire', options[:recurring][:expire].strftime("%Y-%m-%d") if options[:recurring][:expire]
@@ -1362,7 +1464,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_transaction_field_array(soap, options)
-        soap.Fields 'SOAP-ENC:arryType' => "xsd:string[#{options[:fields].length}]", 'xsi:type' => 'ns1:stringArray' do |soap|
+        soap.Fields 'SOAP-ENC:arryType' => "xsd:string[#{options[:fields].length}]", 'xsi:type' => 'ns1:stringArray' do
           options[:fields].each do |field|
             build_tag soap, :string, 'item', field
           end
@@ -1374,8 +1476,7 @@ module ActiveMerchant #:nodoc:
       def build_billing_address(soap, options)
         if options[:billing_address]
           if options[:billing_address][:name]
-            name = options[:billing_address][:name].split(nil,2) # divide name
-            options[:billing_address][:first_name], options[:billing_address][:last_name] = name[0], name[1]
+            options[:billing_address][:first_name], options[:billing_address][:last_name] = split_names(options[:billing_address][:name])
           end
           soap.BillingAddress 'xsi:type' => "ns1:Address" do
             ADDRESS_OPTIONS.each do |k,v|
@@ -1388,8 +1489,7 @@ module ActiveMerchant #:nodoc:
       def build_shipping_address(soap, options)
         if options[:shipping_address]
           if options[:shipping_address][:name]
-            name = options[:shipping_address][:name].split(nil,2) # divide name
-            options[:shipping_address][:first_name], options[:shipping_address][:last_name] = name[0], name[1]
+            options[:shipping_address][:first_name], options[:shipping_address][:last_name] = split_names(options[:shipping_address][:name])
           end
           soap.ShippingAddress 'xsi:type' => "ns1:Address" do
             ADDRESS_OPTIONS.each do |k,v|
@@ -1399,6 +1499,21 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def build_field_value_array(soap, tag_name, type, custom_data, fields)
+        soap.tag! tag_name, 'SOAP-ENC:arryType' => "xsd:#{type}[#{options.length}]", 'xsi:type' => "ns1:#{type}Array" do
+          custom_data.each do |k, v|
+            build_field_value soap, fields[k][1], v, fields[k][0] if fields.keys.include? k
+          end
+        end
+      end
+
+      def build_field_value(soap, field, value, value_type)
+        soap.FieldValue 'xsi:type' => 'ns1:FieldValue' do
+          build_tag soap, :string, 'Field', field
+          build_tag soap, value_type, 'Value', value
+        end
+      end
+
       def build_line_items(soap, options) # TODO
       end
 
@@ -1416,7 +1531,7 @@ module ActiveMerchant #:nodoc:
           soap = error.response.body
         end
 
-        response = build_response(action, soap)
+        build_response(action, soap)
       end
 
       def build_response(action, soap)
@@ -1424,9 +1539,12 @@ module ActiveMerchant #:nodoc:
 
         response_params.merge!('soap_response' => soap) if @options[:soap_response]
 
-        response = Response.new(
-          success, message, response_params,
-          :test => test?, :authorization => authorization,
+        Response.new(
+          success,
+          message,
+          response_params,
+          :test => test?,
+          :authorization => authorization,
           :avs_result => avs_from(avs),
           :cvv_result => cvv
         )
@@ -1461,7 +1579,8 @@ module ActiveMerchant #:nodoc:
           when :get_customer_payment_methods
             p['item']
           when :get_transaction_custom
-            p['item'].inject({}) { |map, field| map[field['field']] = field['value']; map }
+            items = p['item'].kind_of?(Array) ? p['item'] : [p['item']]
+            items.inject({}) { |hash, item| hash[item['field']] = item['value']; hash }
           else
             p
           end
@@ -1498,4 +1617,3 @@ module ActiveMerchant #:nodoc:
     end
   end
 end
-