LitleOnline 8.13.2 → 8.16.0

data/CHANGELOG

@@ -1,5 +1,22 @@
 = LitleOnline CHANGELOG
 
+== Version 8.16.0 (March 29, 2013)
+
+* Feature: Merged pull request #7 from pierre to add external logging support
+* Feature: Add recyling to voidResponse
+* Bugfix: Force the "version" attribute of a LitleOnlineRequest to be the major and minor version of the sdk submitting the transaction instead of using the value from the configuration file
+* Bugfix: Add Connection: close header to reduce the chance of 403s from reaching the ip connection limit
+* Bugfix: Merged pull request #5 from simeonwillbanks to fix a typo in sale when payPalOrderComplete is specified
+
+== Version 8.15.0 (January 31, 2013)
+
+* Feature: Add merchantData to echeck verifications and echeck redeposits
+
+== Version 8.14.0 (January 31, 2013)
+
+* Feature: Temporary storage of card validation num on tokens
+* Feature: Updating card validation numbers on tokens
+
 == Version 8.13.2 (June 28, 2012)
 
 * Feature: Most schema validations are now handled by ruby code and throw errors.

data/CONTRIBUTORS

@@ -0,0 +1,2 @@
+Simeon Willbanks - https://github.com/LitleCo/litle-sdk-for-ruby/pull/5
+Pierre-Alexandre Meyer - https://github.com/LitleCo/litle-sdk-for-ruby/pull/7

data/DESCRIPTION

@@ -1,4 +1,4 @@
-Litle Online Ruby SDK created for version 8.13 of Litle XML online format, see the XSD schema for specific fields that are supported by this format.
+Litle Online Ruby SDK created for version 8.16 of Litle XML online format, see the XSD schema for specific fields that are supported by this format.
 
 This gem contains an application interface in the Ruby programming language created by Litle & Co.
 

data/README.md

@@ -65,6 +65,7 @@ puts "Litle Transaction ID: "+ response.saleResponse.litleTxnId
 
     Message: Valid Format
     Litle Transaction ID: <your-numeric-litle-txn-id>
-
+ 
+More examples can be found here [Ruby Gists](https://gist.github.com/gists/search?q=Litle+Ruby+SDK&page=1)
 
 Please contact Lilte & Co. with any further questions.   You can reach us at sdksupport@litle.com.

data/Rakefile

@@ -30,11 +30,11 @@ require 'rake/clean'
 spec = Gem::Specification.new do |s|
   FileUtils.rm_rf('pkg')
   s.name = "LitleOnline"
-  s.summary = "Ruby SDK produced by Litle & Co. for online transaction processing using Litle XML format v8.13"
+  s.summary = "Ruby SDK produced by Litle & Co. for online transaction processing using Litle XML format v8.16"
   s.description = File.read(File.join(File.dirname(__FILE__), 'DESCRIPTION'))
   s.requirements =
   [ 'Contact sdksupport@litle.com for more information' ]
-  s.version = "8.13.2"
+  s.version = "8.16.0"
   s.author = "Litle & Co"
   s.email = "sdksupport@litle.com"
   s.homepage = "http://www.litle.com/developers"

data/SETUP.md

@@ -40,8 +40,7 @@ Sample configuration file contents
 ```
 user: test_user
 password: test_password
-version: 8.13
-url: https://precert.litle.com/vap/communicator/online
+url: https://www.testlitle.com/vap/communicator/online
 proxy_addr: yourproxyserver
 proxy_port: 8080
 ```

data/bin/Setup.rb

@@ -44,7 +44,6 @@ class Setup
       f.puts "currency_merchant_map:"
       f.puts "  DEFAULT: " + gets
       f.puts "default_report_group: 'Default Report Group'"
-      f.puts	"version: '8.13'"
       puts "Please choose Litle url from the following list (example: 'cert') or directly input another URL: \nsandbox => https://www.testlitle.com/sandbox/communicator/online \ncert => https://cert.litle.com/vap/communicator/online \nprecert => https://precert.litle.com/vap/communicator/online \nproduction1 => https://payments.litle.com/vap/communicator/online \nproduction2 => https://payments2.litle.com/vap/communicator/online"
       f.puts "url: " + Setup.choice(gets)
       puts "Please input the proxy address, if no proxy hit enter key: "

data/lib/Communications.rb

@@ -49,12 +49,9 @@ module LitleOnline
         https.ca_file = File.join(File.dirname(__FILE__), "cacert.pem")
       end
       https.start { |http|
-        response = http.request_post(url.path, post_data.to_s, {'Content-type'=>'text/xml'})
+        response = http.request_post(url.path, post_data.to_s, {'Content-Type'=>'text/xml','Connection'=>'close'})
         response_xml = response
       }
-      
-      
-  
   
       # validate response, only an HTTP 200 will work, redirects are not followed
       case response_xml

data/lib/Configuration.rb

@@ -30,6 +30,11 @@ require 'yaml'
 #
 module LitleOnline
   class Configuration
+    class << self
+      # External logger, if specified
+      attr_accessor :logger
+    end
+
     def config
       begin
         if !(ENV['LITLE_CONFIG_DIR'].nil?)

data/lib/LitleOnline.rb

@@ -28,7 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 # Defines the Gem
 #
 require 'rubygems'
-#require 'xmlsimple'
 require 'net/http'
 require 'xml-object'
 require 'yaml'

data/lib/LitleOnlineRequest.rb

@@ -36,601 +36,282 @@ module LitleOnline
       #load configuration data
       @config_hash = Configuration.new.config
     end
-  
-    def authorization(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      authorization = Authorization.new
-      authorization.reportGroup = get_report_group(hash_in)
-      authorization.transactionId = hash_in['id']
-      authorization.customerId = hash_in['customerId']
-      
-      authorization.litleTxnId = hash_in['litleTxnId']
-      authorization.orderId = hash_in['orderId']
-      authorization.amount = hash_in['amount']
-      authorization.orderSource = hash_in['orderSource']
-      authorization.customerInfo = CustomerInfo.from_hash(hash_in)
-      authorization.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      authorization.shipToAddress = Contact.from_hash(hash_in,'shipToAddress')
-      authorization.card = Card.from_hash(hash_in)
-      authorization.paypal = PayPal.from_hash(hash_in,'paypal')
-      authorization.token = CardToken.from_hash(hash_in,'token')
-      authorization.paypage = CardPaypage.from_hash(hash_in,'paypage')
-      authorization.billMeLaterRequest = BillMeLaterRequest.from_hash(hash_in)
-      authorization.cardholderAuthentication = FraudCheck.from_hash(hash_in)
-      authorization.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      authorization.pos = Pos.from_hash(hash_in)
-      authorization.customBilling = CustomBilling.from_hash(hash_in)
-      authorization.taxType = hash_in['taxType']
-      authorization.enhancedData = EnhancedData.from_hash(hash_in)
-      authorization.amexAggregatorData = AmexAggregatorData.from_hash(hash_in)
-      authorization.allowPartialAuth = hash_in['allowPartialAuth']
-      authorization.healthcareIIAS = HealthcareIIAS.from_hash(hash_in)
-      authorization.filtering = Filtering.from_hash(hash_in)
-      authorization.merchantData = MerchantData.from_hash(hash_in)
-      authorization.recyclingRequest = RecyclingRequest.from_hash(hash_in)
-      authorization.fraudFilterOverride = hash_in['fraudFilterOverride']
-      
-      request.authorization = authorization
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def authorization(options)
+      transaction = Authorization.new
+      add_transaction_info(transaction, options)
+
+      commit(transaction, :authorization, options)
     end
-  
-    def sale(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      sale = Sale.new
-      sale.reportGroup = get_report_group(hash_in)
-      sale.transactionId = hash_in['id']
-      sale.customerId = hash_in['customerId']
-      
-      sale.litleTxnId = hash_in['litleTxnId']
-      sale.orderId = hash_in['orderId']
-      sale.amount = hash_in['amount']
-      sale.orderSource = hash_in['orderSource']
-      sale.customerInfo = CustomerInfo.from_hash(hash_in)
-      sale.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      sale.shipToAddress = Contact.from_hash(hash_in,'shipToAddress')
-      sale.card = Card.from_hash(hash_in)
-      sale.paypal = PayPal.from_hash(hash_in,'paypal')
-      sale.token = CardToken.from_hash(hash_in,'token')
-      sale.paypage = CardPaypage.from_hash(hash_in,'paypage')
-      sale.billMeLaterRequest = BillMeLaterRequest.from_hash(hash_in)
-      sale.fraudCheck = FraudCheck.from_hash(hash_in,'fraudCheck')
-      sale.cardholderAuthentication = FraudCheck.from_hash(hash_in,'cardholderAuthentication')
-      sale.customBilling = CustomBilling.from_hash(hash_in)
-      sale.taxType = hash_in['taxType']
-      sale.enhancedData = EnhancedData.from_hash(hash_in)
-      sale.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      sale.pos = Pos.from_hash(hash_in)
-      sale.payPalOrderComplete = hash_in['paPpalOrderComplete']
-      sale.payPalNotes = hash_in['payPalNotes']
-      sale.amexAggregatorData = AmexAggregatorData.from_hash(hash_in)
-      sale.allowPartialAuth = hash_in['allowPartialAuth']
-      sale.healthcareIIAS = HealthcareIIAS.from_hash(hash_in)
-      sale.filtering = Filtering.from_hash(hash_in)
-      sale.merchantData = MerchantData.from_hash(hash_in)
-      sale.recyclingRequest = RecyclingRequest.from_hash(hash_in)
-      sale.fraudFilterOverride = hash_in['fraudFilterOverride']
-      
-      request.sale = sale
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def sale(options)
+      transaction = Sale.new
+      add_transaction_info(transaction, options)
+
+      transaction.fraudCheck          = FraudCheck.from_hash(options,'fraudCheck')
+      transaction.payPalOrderComplete = options['payPalOrderComplete']
+      transaction.payPalNotes         = options['payPalNotes']
+
+      commit(transaction, :sale, options)
     end
-  
-    def auth_reversal(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      auth_reversal = AuthReversal.new
-      auth_reversal.reportGroup = get_report_group(hash_in)
-      auth_reversal.transactionId = hash_in['id']
-      auth_reversal.customerId = hash_in['customerId']
-        
-      auth_reversal.litleTxnId = hash_in['litleTxnId']
-      auth_reversal.amount = hash_in['amount']
-      auth_reversal.payPalNotes = hash_in['payPalNotes']
-      auth_reversal.actionReason = hash_in['actionReason']
-  
-      request.authReversal = auth_reversal
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def auth_reversal(options)
+      transaction = AuthReversal.new
+
+      transaction.litleTxnId    = options['litleTxnId']
+      transaction.amount        = options['amount']
+      transaction.payPalNotes   = options['payPalNotes']
+      transaction.actionReason  = options['actionReason']
+
+      commit(transaction, :authReversal, options)
     end
-  
-    def credit(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      credit = Credit.new
-      credit.reportGroup = get_report_group(hash_in)
-      credit.transactionId = hash_in['id']
-      credit.customerId = hash_in['customerId']
-        
-      credit.litleTxnId = hash_in['litleTxnId']
-      credit.orderId = hash_in['orderId']
-      credit.amount = hash_in['amount']
-      credit.orderSource = hash_in['orderSource']
-      credit.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      credit.card = Card.from_hash(hash_in)
-      credit.paypal = CreditPayPal.from_hash(hash_in,'paypal')
-      credit.token = CardToken.from_hash(hash_in,'token')
-      credit.paypage = CardPaypage.from_hash(hash_in,'paypage')
-      credit.customBilling = CustomBilling.from_hash(hash_in)
-      credit.taxType = hash_in['taxType']
-      credit.billMeLaterRequest = BillMeLaterRequest.from_hash(hash_in)
-      credit.enhancedData = EnhancedData.from_hash(hash_in)
-      credit.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      credit.pos = Pos.from_hash(hash_in)
-      credit.amexAggregatorData = AmexAggregatorData.from_hash(hash_in)
-      credit.payPalNotes = hash_in['payPalNotes']
-      credit.actionReason = hash_in['actionReason']
-  
-      request.credit = credit
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def credit(options)
+      transaction = Credit.new
+      add_order_info(transaction, options)
+
+      transaction.litleTxnId          = options['litleTxnId']
+      transaction.customBilling       = CustomBilling.from_hash(options)
+      transaction.billMeLaterRequest  = BillMeLaterRequest.from_hash(options)
+      transaction.payPalNotes         = options['payPalNotes']
+      transaction.actionReason        = options['actionReason']
+      transaction.paypal              = CreditPayPal.from_hash(options,'paypal')
+
+      commit(transaction, :credit, options)
     end
-  
-    def register_token_request(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      token_request = RegisterTokenRequest.new
-      token_request.reportGroup = get_report_group(hash_in)
-      token_request.transactionId = hash_in['id']
-      token_request.customerId = hash_in['customerId']
-  
-      token_request.orderId = hash_in['orderId']
-      token_request.accountNumber = hash_in['accountNumber']
-      token_request.echeckForToken = EcheckForToken.from_hash(hash_in)
-      token_request.paypageRegistrationId = hash_in['paypageRegistrationId']
-      
-      request.registerTokenRequest = token_request
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def register_token_request(options)
+      transaction = RegisterTokenRequest.new
+
+      transaction.orderId               = options['orderId']
+      transaction.accountNumber         = options['accountNumber']
+      transaction.echeckForToken        = EcheckForToken.from_hash(options)
+      transaction.paypageRegistrationId = options['paypageRegistrationId']
+
+      commit(transaction, :registerTokenRequest, options)
     end
-  
-    def force_capture(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      force_capture = ForceCapture.new
-      force_capture.reportGroup = get_report_group(hash_in)
-      force_capture.transactionId = hash_in['id']
-      force_capture.customerId = hash_in['customerId']
-  
-      force_capture.orderId = hash_in['orderId']
-      force_capture.amount = hash_in['amount']
-      force_capture.orderSource = hash_in['orderSource']
-      force_capture.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      force_capture.card = Card.from_hash(hash_in)
-      force_capture.token = CardToken.from_hash(hash_in,'token')
-      force_capture.paypage = CardPaypage.from_hash(hash_in,'paypage')
-      force_capture.customBilling = CustomBilling.from_hash(hash_in)
-      force_capture.taxType = hash_in['taxType']
-      force_capture.enhancedData = EnhancedData.from_hash(hash_in)
-      force_capture.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      force_capture.pos = Pos.from_hash(hash_in)
-      force_capture.amexAggregatorData = AmexAggregatorData.from_hash(hash_in)
-  
-      request.forceCapture = force_capture
+    
+    def update_card_validation_num_on_token(options)
+   	  transaction = UpdateCardValidationNumOnToken.new
+    	
+      transaction.orderId               = options['orderId']
+      transaction.litleToken            = options['litleToken']
+      transaction.cardValidationNum     = options['cardValidationNum']
       
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
+      SchemaValidation.validate_length(transaction.litleToken, true, 13, 25, "updateCardValidationNumOnToken", "litleToken")
+      SchemaValidation.validate_length(transaction.cardValidationNum, true, 1, 4, "updateCardValidationNumOnToken", "cardValidationNum")
       
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)    
+      commit(transaction, :updateCardValidationNumOnToken, options)
     end
-  
-    def capture(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      capture = Capture.new
-      capture.reportGroup = get_report_group(hash_in)
-      capture.transactionId = hash_in['id']
-      capture.customerId = hash_in['customerId']
-  
-      capture.partial = hash_in['partial']
-      capture.litleTxnId = hash_in['litleTxnId']
-      capture.amount = hash_in['amount']
-      capture.enhancedData = EnhancedData.from_hash(hash_in)
-      capture.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      capture.payPalOrderComplete = hash_in['payPalOrderComplete']
-      capture.payPalNotes = hash_in['payPalNotes']
-  
-      request.captureTxn = capture
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)    
+
+    def force_capture(options)
+      transaction = ForceCapture.new
+      transaction.customBilling = CustomBilling.from_hash(options)
+
+      add_order_info(transaction, options)
+
+      commit(transaction, :forceCapture, options)
     end
-  
-    def capture_given_auth(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      capture_given_auth = CaptureGivenAuth.new
-      capture_given_auth.reportGroup = get_report_group(hash_in)
-      capture_given_auth.transactionId = hash_in['id']
-      capture_given_auth.customerId = hash_in['customerId']
-  
-      capture_given_auth.orderId = hash_in['orderId']
-      capture_given_auth.authInformation = AuthInformation.from_hash(hash_in)
-      capture_given_auth.amount = hash_in['amount']
-      capture_given_auth.orderSource = hash_in['orderSource']
-      capture_given_auth.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      capture_given_auth.shipToAddress = Contact.from_hash(hash_in,'shipToAddress')
-      capture_given_auth.card = Card.from_hash(hash_in)
-      capture_given_auth.token = CardToken.from_hash(hash_in,'token')
-      capture_given_auth.paypage = CardPaypage.from_hash(hash_in,'paypage')
-      capture_given_auth.customBilling = CustomBilling.from_hash(hash_in)
-      capture_given_auth.taxType = hash_in['taxType']
-      capture_given_auth.billMeLaterRequest = BillMeLaterRequest.from_hash(hash_in)
-      capture_given_auth.enhancedData = EnhancedData.from_hash(hash_in)
-      capture_given_auth.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-      capture_given_auth.pos = Pos.from_hash(hash_in)
-      capture_given_auth.amexAggregatorData = AmexAggregatorData.from_hash(hash_in)
-  
-      request.captureGivenAuth = capture_given_auth
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)    
+
+    def capture(options)
+      transaction = Capture.new
+
+      transaction.partial                 = options['partial']
+      transaction.litleTxnId              = options['litleTxnId']
+      transaction.amount                  = options['amount']
+      transaction.enhancedData            = EnhancedData.from_hash(options)
+      transaction.processingInstructions  = ProcessingInstructions.from_hash(options)
+      transaction.payPalOrderComplete     = options['payPalOrderComplete']
+      transaction.payPalNotes             = options['payPalNotes']
+
+      commit(transaction, :captureTxn, options)
     end
-  
-    def echeck_redeposit(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      echeck_redeposit = EcheckRedeposit.new
-      echeck_redeposit.reportGroup = get_report_group(hash_in)
-      echeck_redeposit.transactionId = hash_in['id']
-      echeck_redeposit.customerId = hash_in['customerId']
-  
-      echeck_redeposit.litleTxnId = hash_in['litleTxnId']
-      echeck_redeposit.echeck = Echeck.from_hash(hash_in)
-      echeck_redeposit.echeckToken = EcheckToken.from_hash(hash_in)
-  
-      request.echeckRedeposit = echeck_redeposit
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)    
+
+    def capture_given_auth(options)
+      transaction = CaptureGivenAuth.new
+      add_order_info(transaction, options)
+
+      transaction.authInformation    = AuthInformation.from_hash(options)
+      transaction.shipToAddress      = Contact.from_hash(options,'shipToAddress')
+      transaction.customBilling      = CustomBilling.from_hash(options)
+      transaction.billMeLaterRequest = BillMeLaterRequest.from_hash(options)
+
+      commit(transaction, :captureGivenAuth, options)
     end
-  
-    def echeck_sale(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      echeck_sale = EcheckSale.new
-      echeck_sale.reportGroup = get_report_group(hash_in)
-      echeck_sale.transactionId = hash_in['id']
-      echeck_sale.customerId = hash_in['customerId']
-  
-      echeck_sale.litleTxnId = hash_in['litleTxnId']
-      echeck_sale.orderId = hash_in['orderId']
-      echeck_sale.verify = hash_in['verify']
-      echeck_sale.amount = hash_in['amount']
-      echeck_sale.orderSource = hash_in['orderSource']
-      echeck_sale.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      echeck_sale.shipToAddress = Contact.from_hash(hash_in,'shipToAddress')
-      echeck_sale.echeck = Echeck.from_hash(hash_in)
-      echeck_sale.echeckToken = EcheckToken.from_hash(hash_in)
-      echeck_sale.customBilling = CustomBilling.from_hash(hash_in)
-  
-      request.echeckSale = echeck_sale
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def void(options)
+      transaction = Void.new
+
+      transaction.litleTxnId             = options['litleTxnId']
+      transaction.processingInstructions = ProcessingInstructions.from_hash(options)
+
+      commit(transaction, :void, options)
     end
-  
-    def echeck_credit(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      echeck_credit = EcheckCredit.new
-      echeck_credit.reportGroup = get_report_group(hash_in)
-      echeck_credit.transactionId = hash_in['id']
-      echeck_credit.customerId = hash_in['customerId']
-  
-      echeck_credit.litleTxnId = hash_in['litleTxnId']
-      echeck_credit.orderId = hash_in['orderId']
-      echeck_credit.amount = hash_in['amount']
-      echeck_credit.orderSource = hash_in['orderSource']
-      echeck_credit.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      echeck_credit.echeck = Echeck.from_hash(hash_in)
-      echeck_credit.echeckToken = EcheckToken.from_hash(hash_in)
-      echeck_credit.customBilling = CustomBilling.from_hash(hash_in)
-  
-      request.echeckCredit = echeck_credit
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
+
+    def echeck_redeposit(options)
+      transaction = EcheckRedeposit.new
+      add_echeck(transaction, options)
+
+      transaction.litleTxnId = options['litleTxnId']
+      transaction.merchantData              = MerchantData.from_hash(options)
+
+      commit(transaction, :echeckRedeposit, options)
+    end
+
+    def echeck_sale(options)
+      transaction = EcheckSale.new
+      add_echeck(transaction, options)
+      add_echeck_order_info(transaction, options)
+
+      transaction.verify        = options['verify']
+      transaction.shipToAddress = Contact.from_hash(options,'shipToAddress')
+      transaction.customBilling = CustomBilling.from_hash(options)
+
+      commit(transaction, :echeckSale, options)
+    end
+
+    def echeck_credit(options)
+      transaction = EcheckCredit.new
+      transaction.customBilling = CustomBilling.from_hash(options)
+
+      add_echeck_order_info(transaction, options)
+      add_echeck(transaction, options)
+
       begin
-        xml = request.save_to_xml.to_s
+        commit(transaction, :echeckCredit, options)
       rescue XML::MappingError => e
         puts e
         response = LitleOnlineResponse.new
-        response.message = "The content of element 'echeckCredit' is not complete" 
+        response.message = "The content of element 'echeckCredit' is not complete"
         return response
       end
-      LitleXmlMapper.request(xml, @config_hash)
     end
-  
-    def echeck_verification(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      echeck_verification = EcheckVerification.new
-      echeck_verification.reportGroup = get_report_group(hash_in)
-      echeck_verification.transactionId = hash_in['id']
-      echeck_verification.customerId = hash_in['customerId']
-  
-      echeck_verification.litleTxnId = hash_in['litleTxnId']
-      echeck_verification.orderId = hash_in['orderId']
-      echeck_verification.amount = hash_in['amount']
-      echeck_verification.orderSource = hash_in['orderSource']
-      echeck_verification.billToAddress = Contact.from_hash(hash_in,'billToAddress')
-      echeck_verification.echeck = Echeck.from_hash(hash_in)
-      echeck_verification.echeckToken = EcheckToken.from_hash(hash_in)
-  
-      request.echeckVerification = echeck_verification
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
+
+    def echeck_verification(options)
+      transaction = EcheckVerification.new
+
+      add_echeck_order_info(transaction, options)
+      add_echeck(transaction, options)
+      transaction.merchantData              = MerchantData.from_hash(options)
       
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+      commit(transaction, :echeckVerification, options)
     end
-  
-    def void(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
-      request = OnlineRequest.new
-      void = Void.new
-      void.reportGroup = get_report_group(hash_in)
-      void.transactionId = hash_in['id']
-      void.customerId = hash_in['customerId']
-  
-      void.litleTxnId = hash_in['litleTxnId']
-      void.processingInstructions = ProcessingInstructions.from_hash(hash_in)
-  
-      request.void = void
-      
-      authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
-      xml = request.save_to_xml.to_s
-      LitleXmlMapper.request(xml, @config_hash)
+
+    def echeck_void(options)
+      transaction = EcheckVoid.new
+      transaction.litleTxnId = options['litleTxnId']
+
+      commit(transaction, :echeckVoid, options)
     end
-    
-    def echeck_void(hash_in)
-      @config_hash['proxy_addr'] = hash_in['proxy_addr'].nil? ? @config_hash['proxy_addr'] : hash_in['proxy_addr']
-      @config_hash['proxy_port'] = hash_in['proxy_port'].nil? ? @config_hash['proxy_port'] : hash_in['proxy_port']
-      @config_hash['url'] = hash_in['url'].nil? ? @config_hash['url'] : hash_in['url']
-  
+
+    private
+
+    def add_account_info(transaction, options)
+      transaction.reportGroup   = get_report_group(options)
+      transaction.transactionId = options['id']
+      transaction.customerId    = options['customerId']
+    end
+
+    def add_transaction_info(transaction, options)
+      transaction.litleTxnId                = options['litleTxnId']
+      transaction.customerInfo              = CustomerInfo.from_hash(options)
+      transaction.shipToAddress             = Contact.from_hash(options,'shipToAddress')
+      transaction.billMeLaterRequest        = BillMeLaterRequest.from_hash(options)
+      transaction.cardholderAuthentication  = FraudCheck.from_hash(options)
+      transaction.allowPartialAuth          = options['allowPartialAuth']
+      transaction.healthcareIIAS            = HealthcareIIAS.from_hash(options)
+      transaction.filtering                 = Filtering.from_hash(options)
+      transaction.merchantData              = MerchantData.from_hash(options)
+      transaction.recyclingRequest          = RecyclingRequest.from_hash(options)
+      transaction.fraudFilterOverride       = options['fraudFilterOverride']
+      transaction.customBilling             = CustomBilling.from_hash(options)
+      transaction.paypal                    = PayPal.from_hash(options,'paypal')
+
+      add_order_info(transaction, options)
+    end
+
+    def add_order_info(transaction, options)
+      transaction.amount                  = options['amount']
+      transaction.orderId                 = options['orderId']
+      transaction.orderSource             = options['orderSource']
+      transaction.taxType                 = options['taxType']
+      transaction.billToAddress           = Contact.from_hash(options,'billToAddress')
+      transaction.enhancedData            = EnhancedData.from_hash(options)
+      transaction.processingInstructions  = ProcessingInstructions.from_hash(options)
+      transaction.pos                     = Pos.from_hash(options)
+      transaction.amexAggregatorData      = AmexAggregatorData.from_hash(options)
+      transaction.card                    = Card.from_hash(options)
+      transaction.token                   = CardToken.from_hash(options,'token')
+      transaction.paypage                 = CardPaypage.from_hash(options,'paypage')
+    end
+
+    def add_echeck_order_info(transaction, options)
+      transaction.litleTxnId    = options['litleTxnId']
+      transaction.orderId       = options['orderId']
+      transaction.amount        = options['amount']
+      transaction.orderSource   = options['orderSource']
+      transaction.billToAddress = Contact.from_hash(options,'billToAddress')
+    end
+
+    def add_echeck(transaction, options)
+      transaction.echeck      = Echeck.from_hash(options)
+      transaction.echeckToken = EcheckToken.from_hash(options)
+    end
+
+    def build_request(options)
       request = OnlineRequest.new
-      void = EcheckVoid.new
-      void.reportGroup = get_report_group(hash_in)
-      void.transactionId = hash_in['id']
-      void.customerId = hash_in['customerId']
-  
-      void.litleTxnId = hash_in['litleTxnId']
-  
-      request.echeckVoid = void
-      
+
       authentication = Authentication.new
-      authentication.user = get_user(hash_in)
-      authentication.password = get_password(hash_in)
-      request.authentication = authentication
-      
-      request.merchantId = get_merchant_id(hash_in)
-      request.version = get_version(hash_in)
-      request.xmlns = "http://www.litle.com/schema"
-      request.merchantSdk = get_merchant_sdk(hash_in)
-  
+      authentication.user     = get_config(:user, options)
+      authentication.password = get_config(:password, options)
+
+      request.authentication  = authentication
+      request.merchantId      = get_merchant_id(options)
+      request.version         = '8.16'
+      request.loggedInUser    = get_logged_in_user(options)
+      request.xmlns           = "http://www.litle.com/schema"
+      request.merchantSdk     = get_merchant_sdk(options)
+
+      request
+    end
+
+    def commit(transaction, type, options)
+      configure_connection(options)
+
+      request = build_request(options)
+
+      add_account_info(transaction, options)
+      request.send(:"#{type}=", transaction)
+
       xml = request.save_to_xml.to_s
       LitleXmlMapper.request(xml, @config_hash)
     end
 
-  
-    private
-  
-    def get_merchant_id(hash_in)
-      if (hash_in['merchantId'] == nil)
-        return @config_hash['currency_merchant_map']['DEFAULT']
-      else
-        return hash_in['merchantId']
-      end
+    def configure_connection(options={})
+      @config_hash['proxy_addr'] = options['proxy_addr'] unless options['proxy_addr'].nil?
+      @config_hash['proxy_port'] = options['proxy_port'] unless options['proxy_port'].nil?
+      @config_hash['url']        = options['url']        unless options['url'].nil?
     end
-    
-    def get_version(hash_in)
-      if (hash_in['version'] == nil)
-        return @config_hash['version']
-      else
-        return hash_in['version']
-      end
+
+    def get_merchant_id(options)
+      options['merchantId'] || @config_hash['currency_merchant_map']['DEFAULT']
     end
-    
-    def get_merchant_sdk(hash_in)
-      if(!hash_in['merchantSdk'])
-        return 'Ruby;8.13.2'
-      else
-        return hash_in['merchantSdk']
-      end    
+
+    def get_merchant_sdk(options)
+      options['merchantSdk'] || 'Ruby;8.16.0'
     end
-  
-    def get_report_group(hash_in)
-      if (!hash_in['reportGroup'])
-        return @config_hash['default_report_group']
-      else
-        return hash_in['reportGroup']
-      end
+
+    def get_report_group(options)
+      options['reportGroup'] || @config_hash['default_report_group']
     end
-    
-    def get_user(hash_in)
-      if (hash_in['user'] == nil)
-        return @config_hash['user']
-      else
-        return hash_in['user']
-      end
+
+    def get_config(field, options)
+      options[field.to_s] == nil ? @config_hash[field.to_s] : options[field.to_s]
     end
     
-    def get_password(hash_in)
-      if (hash_in['password'] == nil)
-        return @config_hash['password']
-      else
-        return hash_in['password']
-      end
+    def get_logged_in_user(options)
+      options['loggedInUser'] || nil
     end
   end
-end
+end