bluepay 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 16fe99ad7bb131897c195bd4be3a6bd9098e605c49b0bcaae46a965ce9e6cbe357968888a81bb94ab1c8c2308dbbc3c5e6f1fe00149b48e2661652d08820affc
-  data.tar.gz: 8c31b1b5bb101da007ad018d7d0a00815ea44e0f4b9527781b26fe3a68c87046616944fd7eb5c51d3c919713cf3afb2afc7593767c7eb0eb2f0eb9497803ddf4
-SHA1: 
-  metadata.gz: 59d38c075ef13dfdfabcc957f5dcee2358abf43c
-  data.tar.gz: 67d0f249d522f2edebe463bcd6db16330978b76c
+---
+SHA1:
+  metadata.gz: 7535b98d5bd56bece87ec37a62ec281374bbd032
+  data.tar.gz: 4b461cf8c17e9bc247183298da6021f3e031e69e
+SHA512:
+  metadata.gz: 18cb2fff25162948c844faafa6d43e6c7a862e6985c2e43ad1501d3b16b8426701b6a563a61cbbfce6120dfba8370008e1c3d34c1d6b62addc05024c291aa5b7
+  data.tar.gz: 5471afaf85203866ba10bad7c8ba69afdccf57543bbfbf9da00618d9d1472aa0f644c201eb0c4e253073a037e154b8843b4b9a5c29b85c1556c43b4f4257dbdf

data/Rakefile

@@ -15,7 +15,7 @@ end
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList['test/*/*.rb']
-  t.verbose = true
+  t.verbose = false
 end
 
 # Genereate the RDoc documentation

data/bluepay.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'bluepay'
-  s.version     = '1.0.3'
-  s.date        = '2014-06-17'
-  s.summary     = "BluePay gateway rubygem."
+  s.version     = '1.0.4'
+  s.date        = '2015-11-30'
+  s.summary     = "BluePay gateway rubygem"
   s.description = "This gem is intended to be used along with a BluePay gateway account to process credit card and ACH transactions"
   s.authors     = ["Justin Slingerland"]
   s.email       = 'jslingerland@bluepay.com'

data/lib/api_request.rb

@@ -0,0 +1,125 @@
+class BluePay
+  
+  # Turns a hash into a nvp style string
+  def uri_query(param_hash)
+    array = []
+    param_hash.each_pair {|key, val| array << (URI.escape(key) + "=" + URI.escape(val))}
+    array.join("&")
+  end
+
+  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH
+  def calc_tps
+    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(
+        @SECRET_KEY + 
+        @ACCOUNT_ID + 
+        (@PARAM_HASH["TRANSACTION_TYPE"] || '') + 
+        @PARAM_HASH["AMOUNT"] + 
+        (@PARAM_HASH["REBILLING"] || '') + 
+        (@PARAM_HASH["REB_FIRST_DATE"] || '') + 
+        (@PARAM_HASH["REB_EXPR"] || '') + 
+        (@PARAM_HASH["REB_CYCLES"] || '') + 
+        (@PARAM_HASH["REB_AMOUNT"] || '') + 
+        (@PARAM_HASH["RRNO"] || '') + 
+        @PARAM_HASH["MODE"]
+      )
+  end
+
+  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH for rebadmin API
+  def calc_rebill_tps
+    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(
+      @SECRET_KEY + 
+      @ACCOUNT_ID +
+      @PARAM_HASH["TRANS_TYPE"] + 
+      @PARAM_HASH["REBILL_ID"]
+    )
+  end
+
+  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH for bpdailyreport2 API
+  def calc_report_tps
+    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(
+      @SECRET_KEY + 
+      @ACCOUNT_ID + 
+      @PARAM_HASH["REPORT_START_DATE"] + 
+      @PARAM_HASH["REPORT_END_DATE"]
+      )
+  end
+
+  # Calculates TAMPER_PROOF_SEAL to be used with Trans Notify API 
+  def self.calc_trans_notify_tps(secret_key, trans_id, trans_status, trans_type, amount, batch_id, batch_status, total_count, total_amount, batch_upload_id, rebill_id, rebill_amount, rebill_status)
+    Digest::MD5.hexdigest(
+      secret_key + 
+      trans_id + 
+      trans_status + 
+      trans_type + 
+      amount + 
+      batch_id + 
+      batch_status + 
+      total_count + 
+      total_amount + 
+      batch_upload_id + 
+      rebill_id + 
+      rebill_amount + 
+      rebill_status
+    )
+  end
+
+ # sends HTTPS POST to BluePay gateway for processing
+  def process
+    ua = Net::HTTP.new(SERVER, 443)
+    ua.use_ssl = true
+    if File.directory?(RootCA)
+      ua.ca_path = RootCA
+      ua.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      ua.verify_depth = 3
+    else
+      puts "Invalid CA certificates directory. Exiting..."
+      exit
+    end
+    begin
+    	@PARAM_HASH["REMOTE_IP"] = request.env['REMOTE_ADDR']
+      rescue Exception
+    end
+    # Generate the query string and headers
+    
+    # Chooses which API to make request to
+    case @api
+    when "bpdailyreport2"
+      calc_report_tps
+      path = "/interfaces/bpdailyreport2"
+      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&" + uri_query(@PARAM_HASH)
+    when "stq"
+      calc_report_tps
+      path = "/interfaces/stq"
+      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&" + uri_query(@PARAM_HASH)
+    when "bp10emu"
+      calc_tps
+      path = "/interfaces/bp10emu"
+      query = "MERCHANT=#{@ACCOUNT_ID}&" + uri_query(@PARAM_HASH)
+      # puts "****"; puts uri_query(@PARAM_HASH).inspect
+    when "bp20rebadmin"
+      calc_rebill_tps
+      path = "/interfaces/bp20rebadmin"
+      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&" + uri_query(@PARAM_HASH)
+    end
+    queryheaders = {
+      'User-Agent' => 'BluePay Ruby Library/1.0.4',
+      'Content-Type' => 'application/x-www-form-urlencoded'
+    }
+    # Response version to be returned
+    @PARAM_HASH["VERSION"] = '3'
+    # Post parameters to BluePay gateway
+    headers, body = ua.post(path, query, queryheaders)
+    # Split the response into the response hash.
+    @RESPONSE_HASH = {}
+    if path == "/interfaces/bp10emu"
+      response = headers["Location"].split("?")[1]
+    else
+      response = headers.body
+    end
+    response.split("&").each do |pair| 
+      (key, val) = pair.split("=")
+      val = "" if val == nil
+      @RESPONSE_HASH[URI.unescape(key)] = URI.unescape(val) 
+    end
+  end
+end

data/lib/api_response.rb

@@ -0,0 +1,150 @@
+class BluePay
+  def get_response
+    @RESPONSE_HASH
+  end
+
+  # Returns true if response status is approved and not a duplicate, else returns false
+  def successful_response?
+    self.get_status == "APPROVED" && self.get_message != "DUPLICATE"
+  end
+
+  # Returns E for Error, 1 for Approved, 0 for Decline
+  def get_status
+    @RESPONSE_HASH['Result']
+  end
+
+  # Returns the human-readable response from Bluepay.
+  # Or a nasty error.
+  def get_message
+    m = @RESPONSE_HASH['MESSAGE']
+    if m == nil or m == ""
+      "ERROR - NO MESSAGE FROM BLUEPAY"
+    else
+      m
+    end
+  end
+
+  # Returns the single-character AVS response from the 
+  # Card Issuing Bank
+  def get_avs_code
+    @RESPONSE_HASH['AVS']
+  end
+
+  # Same as avs_code, but for CVV2
+  def get_cvv2_code
+    @RESPONSE_HASH['CVV2']
+  end
+
+  # In the case of an approved transaction, contains the
+  # 6-character authorization code from the processing network.
+  # In the case of a decline or error, the contents may be junk.
+  def get_auth_code
+    @RESPONSE_HASH['AUTH_CODE']
+  end
+
+  # The all-important transaction ID.
+  def get_trans_id
+    @RESPONSE_HASH['RRNO']
+  end
+
+  # If you set up a rebilling, this'll get its ID.
+  def get_rebill_id
+    @RESPONSE_HASH['REBID']
+  end
+
+  # Masked credit card or ACH account
+  def get_masked_account
+    @RESPONSE_HASH['PAYMENT_ACCOUNT']
+  end
+
+  # Card type used in transaction
+  def get_card_type
+    @RESPONSE_HASH['CARD_TYPE']
+  end
+
+  # Bank account used in transaction
+  def get_bank_name
+    @RESPONSE_HASH['BANK_NAME']
+  end
+
+  # Rebill ID from bprebadmin API
+  def get_reb_id
+    @RESPONSE_HASH['rebill_id']
+  end
+
+  # Template ID of rebilling
+  def get_template_id
+    @RESPONSE_HASH['template_id']
+  end
+
+  # Status of rebilling
+  def get_rebill_status
+    @RESPONSE_HASH['status']
+  end
+
+  # Creation date of rebilling
+  def get_creation_date
+    @RESPONSE_HASH['creation_date']
+  end
+  
+  # Next date that the rebilling is set to fire off on
+  def get_next_date
+    @RESPONSE_HASH['next_date']
+  end
+
+  # Last date that the rebilling fired off on
+  def get_last_date
+    @RESPONSE_HASH['last_date']
+  end
+
+  # Rebilling expression
+  def get_sched_expression
+    @RESPONSE_HASH['sched_expr']
+  end
+  
+  # Number of cycles remaining on rebilling
+  def get_cycles_remaining
+    @RESPONSE_HASH['cycles_remain']
+  end
+
+  # Amount to charge when rebilling fires off
+  def get_rebill_amount
+    @RESPONSE_HASH['reb_amount']
+  end
+
+  # Next amount to charge when rebilling fires off
+  def get_next_amount
+    @RESPONSE_HASH['next_amount']
+  end
+ 
+  # Transaction ID used with stq API
+  def get_id
+    @RESPONSE_HASH['id']
+  end 
+
+  # First name associated with the transaction
+  def get_name1
+    @RESPONSE_HASH['name1']
+  end
+ 
+  # Last name associated with the transaction
+  def get_name2
+    @RESPONSE_HASH['name2']
+  end
+  
+  # Payment type associated with the transaction
+  def get_payment_type
+    @RESPONSE_HASH['payment_type']
+  end
+
+  # Transaction type associated with the transaction
+  def get_trans_type
+    @RESPONSE_HASH['trans_type']
+  end
+  
+  # Amount associated with the transaction
+  def get_amount
+    @RESPONSE_HASH['amount']
+  end
+
+end

data/lib/bluepay.rb

@@ -1,31 +1,30 @@
-#!/usr/bin/ruby
 require "net/http"
 require "net/https"
 require "uri"
 require "digest/md5"
 
+# Files
+require_relative "api_request"
+require_relative "api_response"
+
 class BluePay
   SERVER = "secure.bluepay.com"
   # Make sure this is the correct path to your CA certificates directory
-  RootCA = "/etc/ssl/certs"
-
-  def initialize(account,key,mode='TEST')
-    @ACCOUNT_ID = account
-    @SECRET_KEY = key
-    @PARAM_HASH = { 'MODE' => mode }
-    @RETURN_HASH = Hash.new()
-  end
+  # For testing purposes, this gem comes with a CA bundle.
+  RootCA = "."
 
-  def set_param(key, val)
-    @PARAM_HASH[key] = val
+  def initialize(params = {})
+    @ACCOUNT_ID = params[:account_id]
+    @SECRET_KEY = params[:secret_key]
+    @PARAM_HASH = {'MODE' => params[:mode]}
   end
 
   # Set up a credit card payment.
-  def set_cc_information(account, expire, cvv='')
+  def set_cc_information(params={})
     @PARAM_HASH['PAYMENT_TYPE'] = 'CREDIT'
-    @PARAM_HASH['CC_NUM'] = account
-    @PARAM_HASH['CC_EXPIRES'] = expire
-    @PARAM_HASH['CVCVV2'] = cvv
+    @PARAM_HASH['CC_NUM'] = params[:cc_number] || ''
+    @PARAM_HASH['CC_EXPIRES'] = params[:cc_expiration] || ''
+    @PARAM_HASH['CVCVV2'] = params[:cvv2] || ''
   end
 
   # Set up an ACH transaction.  Expects:
@@ -33,49 +32,44 @@ class BluePay
   # routing: Bank routing number
   # account: Customer's checking or savings account number
   # doc_type: WEB, TEL, ARC, etc -- see docs.  Optional.
-  # REMEMBER: Ach requires some other fields,
-  # such as address and phone 
-  def set_ach_information(routing, account, acc_type, doc_type='')
+  def set_ach_information(params = {})
     @PARAM_HASH['PAYMENT_TYPE'] = 'ACH'
-    @PARAM_HASH['ACH_ROUTING'] = routing
-    @PARAM_HASH['ACH_ACCOUNT'] = account
-    @PARAM_HASH['ACH_ACCOUNT_TYPE'] = acc_type
-    @PARAM_HASH['DOC_TYPE'] = doc_type
+    @PARAM_HASH['ACH_ROUTING'] = params[:ach_routing]
+    @PARAM_HASH['ACH_ACCOUNT'] = params[:ach_account]
+    @PARAM_HASH['ACH_ACCOUNT_TYPE'] = params[:ach_account_type]
+    @PARAM_HASH['DOC_TYPE'] = params[:doc_type] || ''
   end
 
   # Set up a sale
-  def sale(amount, trans_id='')
+  def sale(params = {})
     @PARAM_HASH['TRANSACTION_TYPE'] = 'SALE'
-    @PARAM_HASH['AMOUNT'] = amount
-    @PARAM_HASH['RRNO'] = trans_id
+    @PARAM_HASH['AMOUNT'] = params[:amount]
+    @PARAM_HASH['RRNO'] = params[:trans_id] || ''
+    @api = "bp10emu"
   end
 
   # Set up an Auth
-  def auth(amount, trans_id='')
+  def auth(params ={})
     @PARAM_HASH['TRANSACTION_TYPE'] = 'AUTH'
-    @PARAM_HASH['AMOUNT'] = amount
-    @PARAM_HASH['RRNO'] = trans_id
+    @PARAM_HASH['AMOUNT'] = params[:amount]
+    @PARAM_HASH['RRNO'] = params[:trans_id] || ''
+    @api = "bp10emu"
   end
   
-  # Credit
-  def credit(amount, trans_id='')
-    @PARAM_HASH['TRANSACTION_TYPE'] = 'CREDIT'
-	@PARAM_HASH['AMOUNT'] = amount
-    @PARAM_HASH['RRNO'] = trans_id
-  end
-
   # Capture an Auth
   def capture(trans_id, amount='')
     @PARAM_HASH['TRANSACTION_TYPE'] = 'CAPTURE'
     @PARAM_HASH['AMOUNT'] = amount
     @PARAM_HASH['RRNO'] = trans_id
+    @api = "bp10emu"
   end
 
   # Refund
-  def refund(trans_id, amount='')
+  def refund(params = {})
     @PARAM_HASH['TRANSACTION_TYPE'] = 'REFUND'
-    @PARAM_HASH['RRNO'] = trans_id
-    @PARAM_HASH['AMOUNT'] = amount
+    @PARAM_HASH['RRNO'] = params[:trans_id]
+    @PARAM_HASH['AMOUNT'] = params[:amount] || ''
+    @api = "bp10emu"
   end
 
   # Void
@@ -83,94 +77,99 @@ class BluePay
     @PARAM_HASH['TRANSACTION_TYPE'] = 'VOID'
     @PARAM_HASH['AMOUNT'] = ''
     @PARAM_HASH['RRNO'] = trans_id
+    @api = "bp10emu"
   end
 
   # Sets customer information for the transaction
-  def set_customer_information(name1, name2, addr1, city, state, zip, addr2='', country='')
-    @PARAM_HASH['NAME1'] = name1
-    @PARAM_HASH['NAME2'] = name2
-    @PARAM_HASH['ADDR1'] = addr1
-    @PARAM_HASH['CITY'] = city
-    @PARAM_HASH['STATE'] = state
-    @PARAM_HASH['ZIPCODE'] = zip
-    @PARAM_HASH['ADDR2'] = addr2
-    @PARAM_HASH['COUNTRY'] = country
+  def set_customer_information(params={})
+    @PARAM_HASH['NAME1'] = params[:first_name]
+    @PARAM_HASH['NAME2'] = params[:last_name]
+    @PARAM_HASH['ADDR1'] = params[:address1]
+    @PARAM_HASH['ADDR2'] = params[:address2]
+    @PARAM_HASH['CITY'] = params[:city]
+    @PARAM_HASH['STATE'] = params[:state]
+    @PARAM_HASH['ZIPCODE'] = params[:zip_code]
+    @PARAM_HASH['COUNTRY'] = params[:country]
+    @PARAM_HASH['PHONE'] = params[:phone]
+    @PARAM_HASH['EMAIL'] = params[:email]
   end
 
-  # Set customer phone #
-  def set_phone(phone)
-    @PARAM_HASH['PHONE'] = phone
+  # Set customer Phone
+  def phone=(number)
+    @PARAM_HASH['PHONE'] = number
   end
 
   # Set customer E-mail address
-  def set_email(email)
+  def email=(email)
     @PARAM_HASH['EMAIL'] = email
   end
 
   # Set MEMO field
-  def set_memo(memo)
+  def memo=(memo)
     @PARAM_HASH['COMMENT'] = memo
   end
 
   # Set CUSTOM_ID field
-  def set_custom_id1(custom_id1)
+  def custom_id1=(custom_id1)
     @PARAM_HASH['CUSTOM_ID'] = custom_id1
   end
 
   # Set CUSTOM_ID2 field
-  def set_custom_id2(custom_id2)
+  def custom_id2=(custom_id2)
     @PARAM_HASH['CUSTOM_ID2'] = custom_id2
   end
 
   # Set INVOICE_ID field
-  def set_invoice_id(invoice_id)
+  def invoice_id=(invoice_id)
     @PARAM_HASH['INVOICE_ID'] = invoice_id
   end
 
   # Set ORDER_ID field
-  def set_order_id(order_id)
+  def order_id=(order_id)
     @PARAM_HASH['ORDER_ID'] = order_id
   end
 
   # Set AMOUNT_TIP field
-  def set_amount_tip(amount_tip)
+  def amount_tip=(amount_tip)
     @PARAM_HASH['AMOUNT_TIP'] = amount_tip
   end
 
   # Set AMOUNT_TAX field
-  def set_amount_tax(amount_tax)
+  def amount_tax=(amount_tax)
     @PARAM_HASH['AMOUNT_TAX'] = amount_tax
   end
 
   # Set AMOUNT_FOOD field
-  def set_amount_food(amount_food)
+  def amount_food=(amount_food)
     @PARAM_HASH['AMOUNT_FOOD'] = amount_food
   end
 
   # Set AMOUNT_MISC field
-  def set_amount_misc(amount_misc)
+  def amount_misc=(amount_misc)
     @PARAM_HASH['AMOUNT_MISC'] = amount_misc
   end
 
   # Set fields for a recurring payment
-  def add_recurring_fields(rebill_first_date, rebill_expr, reb_cycles, reb_amount)
+  def set_recurring_payment(params = {})
     @PARAM_HASH['REBILLING'] = '1'
-    @PARAM_HASH['REB_FIRST_DATE'] = rebill_first_date
-    @PARAM_HASH['REB_EXPR'] = rebill_expr
-    @PARAM_HASH['REB_CYCLES'] = reb_cycles
-    @PARAM_HASH['REB_AMOUNT'] = reb_amount
+    @PARAM_HASH['REB_FIRST_DATE'] = params[:reb_first_date]
+    @PARAM_HASH['REB_EXPR'] = params[:reb_expr]
+    @PARAM_HASH['REB_CYCLES'] = params[:reb_cycles]
+    @PARAM_HASH['REB_AMOUNT'] = params[:reb_amount]
+    # @api = "bp10emu"
   end
 
   # Set fields to do an update on an existing rebilling cycle
-  def update_rebilling_cycle(rebill_id, rebill_next_date, rebill_expr, rebill_cycles, rebill_amount,
-    rebill_next_amount)
+  def update_rebill(params = {})
     @PARAM_HASH['TRANS_TYPE'] = "SET"
-    @PARAM_HASH['REBILL_ID'] = rebill_id
-    @PARAM_HASH['NEXT_DATE'] = rebill_next_date
-    @PARAM_HASH['REB_EXPR'] = rebill_expr
-    @PARAM_HASH['REB_CYCLES'] = rebill_cycles
-    @PARAM_HASH['REB_AMOUNT'] = rebill_amount
-    @PARAM_HASH['NEXT_AMOUNT'] = rebill_next_amount
+    @PARAM_HASH['REBILL_ID'] = params[:rebill_id]
+    @PARAM_HASH['NEXT_DATE'] = params[:next_date] || ''
+    @PARAM_HASH['REB_EXPR'] = params[:reb_expr] || ''
+    @PARAM_HASH['REB_CYCLES'] = params[:reb_cycles] || ''
+    @PARAM_HASH['REB_AMOUNT'] = params[:reb_amount] || ''
+    @PARAM_HASH['NEXT_AMOUNT'] = params[:next_amount] || ''
+    @PARAM_HASH["TEMPLATE_ID"] = params[:template_id] || ''
+    @api = "bp20rebadmin"
   end
 
   # Set fields to cancel an existing rebilling cycle
@@ -178,12 +177,14 @@ class BluePay
     @PARAM_HASH["TRANS_TYPE"] = "SET"
     @PARAM_HASH["STATUS"] = "stopped"
     @PARAM_HASH["REBILL_ID"] = rebill_id
+    @api = "bp20rebadmin"
   end
 
   # Set fields to get the status of an existing rebilling cycle
   def get_rebilling_cycle_status(rebill_id)
     @PARAM_HASH["TRANS_TYPE"] = "GET"
     @PARAM_HASH["REBILL_ID"] = rebill_id
+    @api = "bp20rebadmin"
   end
 
   # Updates an existing rebilling cycle's payment information.   
@@ -192,35 +193,34 @@ class BluePay
   end
 
   # Gets a report on all transactions within a specified date range
-  def get_transaction_report(report_start, report_end, subaccounts_searched, do_not_escape = '', errors = '')
+  def get_transaction_report(params = {})
     @PARAM_HASH["QUERY_BY_SETTLEMENT"] = '0'
-    @PARAM_HASH["REPORT_START_DATE"] = report_start
-    @PARAM_HASH["REPORT_END_DATE"] = report_end
-    @PARAM_HASH["QUERY_BY_HIERARCHY"] = subaccounts_searched
-    @PARAM_HASH["DO_NOT_ESCAPE"] = do_not_escape
-    @PARAM_HASH["EXCLUDE_ERRORS"] = errors
+    @PARAM_HASH["REPORT_START_DATE"] = params[:report_start_date]
+    @PARAM_HASH["REPORT_END_DATE"] = params[:report_end_date]
+    @PARAM_HASH["QUERY_BY_HIERARCHY"] = params[:query_by_hierarchy]
+    @PARAM_HASH["DO_NOT_ESCAPE"] = params[:do_not_escape] || ''
+    @PARAM_HASH["EXCLUDE_ERRORS"] = params[:exclude_errors] || ''
+    @api = "bpdailyreport2"
   end
 
   # Gets a report on all settled transactions within a specified date range
-  def get_settled_transaction_report(report_start, report_end, subaccounts_searched, do_not_escape = '', errors = '')
+  def get_settled_transaction_report(params = {})
     @PARAM_HASH["QUERY_BY_SETTLEMENT"] = '1'
-    @PARAM_HASH["REPORT_START_DATE"] = report_start
-    @PARAM_HASH["REPORT_END_DATE"] = report_end
-    @PARAM_HASH["QUERY_BY_HIERARCHY"] = subaccounts_searched
-    @PARAM_HASH["DO_NOT_ESCAPE"] = do_not_escape
-    @PARAM_HASH["EXCLUDE_ERRORS"] = errors
+    @PARAM_HASH["REPORT_START_DATE"] = params[:report_start_date]
+    @PARAM_HASH["REPORT_END_DATE"] = params[:report_end_date]
+    @PARAM_HASH["QUERY_BY_HIERARCHY"] = params[:query_by_hierarchy]
+    @PARAM_HASH["DO_NOT_ESCAPE"] = params[:do_not_escape] || ''
+    @PARAM_HASH["EXCLUDE_ERRORS"] = params[:exclude_errors] || ''
+    @api = "bpdailyreport2"
   end
 
   # Gets data on a specific transaction
-  def get_single_trans_query(report_start, report_end, errors = "")
-    @PARAM_HASH["REPORT_START_DATE"] = report_start
-    @PARAM_HASH["REPORT_END_DATE"] = report_end
-    @PARAM_HASH["EXCLUDE_ERRORS"] = errors
-  end
-
-  # Queries by a specific Transaction ID. To be used with get_single_trans_query
-  def query_by_transaction_id(trans_id)
-    @PARAM_HASH["id"] = trans_id;
+  def get_single_transaction_query(params = {})
+    @PARAM_HASH["REPORT_START_DATE"] = params[:report_start_date]
+    @PARAM_HASH["REPORT_END_DATE"] = params[:report_end_date]
+    @PARAM_HASH["id"] = params[:transaction_id]
+    @PARAM_HASH["EXCLUDE_ERRORS"] = params[:exclude_errors] || ''
+    @api = "stq"    
   end
 
   # Queries by a specific Payment Type. To be used with get_single_trans_query
@@ -247,242 +247,4 @@ class BluePay
   def query_by_name2(name2) 
     @PARAM_HASH["name2"] = name2
   end
-
-  # Turns a hash into a nvp style string
-  def uri_query(h)
-    a = Array.new()
-    h.each_pair {|key, val| a.push(URI.escape(key) + "=" + URI.escape(val)) }
-    return a.join("&")
-  end
-
-  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH
-  def calc_tps()
-    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(@SECRET_KEY + @ACCOUNT_ID +
-      (@PARAM_HASH["TRANSACTION_TYPE"] || '') + @PARAM_HASH["AMOUNT"] + (@PARAM_HASH["REBILLING"] || '') +
-      (@PARAM_HASH["REB_FIRST_DATE"] || '') + (@PARAM_HASH["REB_EXPR"] || '') + (@PARAM_HASH["REB_CYCLES"] || '') +
-      (@PARAM_HASH["REB_AMOUNT"] || '') + (@PARAM_HASH["RRNO"] || '') + @PARAM_HASH["MODE"])
-  end
-
-  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH for rebadmin API
-  def calc_rebill_tps()
-    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(@SECRET_KEY + @ACCOUNT_ID +
-      @PARAM_HASH["TRANS_TYPE"] + @PARAM_HASH["REBILL_ID"])
-  end
-
-  # Sets TAMPER_PROOF_SEAL in @PARAM_HASH for bpdailyreport2 API
-  def calc_report_tps()
-    @PARAM_HASH["TAMPER_PROOF_SEAL"] = Digest::MD5.hexdigest(@SECRET_KEY + @ACCOUNT_ID + 
-      @PARAM_HASH["REPORT_START_DATE"] + @PARAM_HASH["REPORT_END_DATE"])
-  end
-
-  # Calculates TAMPER_PROOF_SEAL to be used with Trans Notify API 
-  def self.calc_trans_notify_tps(secret_key, trans_id, trans_status, trans_type, amount, batch_id, batch_status,
-    total_count, total_amount, batch_upload_id, rebill_id, rebill_amount, rebill_status)
-    return Digest::MD5.hexdigest(@SECRET_KEY + trans_id + trans_status + transtype + 
-      amount + batch_id + batch_status + total_count + total_amount + batch_upload_id + rebill_id + rebill_amount + rebill_status)
-  end
-
-  # sends HTTPS POST to BluePay gateway for processing
-  def process()
-    ua = Net::HTTP.new(SERVER, 443)
-    ua.use_ssl = true
-    if File.directory? RootCA
-      ua.ca_path = RootCA
-      ua.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      ua.verify_depth = 3
-    else
-      puts "Invalid CA certificates directory. Exiting..."
-      exit
-    end
-    begin
-    	@PARAM_HASH["REMOTE_IP"] = request.env['REMOTE_ADDR']
-    rescue Exception
-    end
-    # Generate the query string and headers
-    if (@PARAM_HASH.has_key?("QUERY_BY_HIERARCHY"))
-      calc_report_tps()
-      path = "/interfaces/bpdailyreport2"
-      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&"
-      query += uri_query(@PARAM_HASH)
-    elsif (@PARAM_HASH.has_key?("REPORT_START_DATE"))
-      calc_report_tps()
-      path = "/interfaces/stq"
-      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&"
-      query += uri_query(@PARAM_HASH)
-    elsif (@PARAM_HASH["TRANS_TYPE"] != "SET" and @PARAM_HASH["TRANS_TYPE"] != "GET")
-      calc_tps()
-      path = "/interfaces/bp10emu"
-      query = "MERCHANT=#{@ACCOUNT_ID}&"
-      query += uri_query(@PARAM_HASH)
-    else
-      calc_rebill_tps()
-      path = "/interfaces/bp20rebadmin"
-      query = "ACCOUNT_ID=#{@ACCOUNT_ID}&"
-      query += uri_query(@PARAM_HASH)
-    end
-
-    queryheaders = {
-      'User-Agent' => 'Bluepay Ruby Client',
-      'Content-Type' => 'application/x-www-form-urlencoded'
-    }
-    @PARAM_HASH["VERSION"] = '3'
-    # Post parameters to BluePay gateway
-    headers, body = ua.post(path, query, queryheaders)
-    # Split the response into the response hash.
-    @RESPONSE_HASH = {}
-    if path == "/interfaces/bp10emu"
-      response = headers["Location"].split("?")[1]
-    else
-      response = headers.body
-    end
-    response.split("&").each { |pair| 
-    (key, val) = pair.split("=")
-    val = "" if(val == nil)
-    @RESPONSE_HASH[URI.unescape(key)] = URI.unescape(val) 
-    }
-  end
-
-  def get_response()
-    return @RESPONSE_HASH
-  end
-
-  # Returns E for Error, 1 for Approved, 0 for Decline
-  def get_status()
-    return @RESPONSE_HASH['Result']
-  end
-
-  # Returns the human-readable response from Bluepay.
-  # Or a nasty error.
-  def get_message()
-    m = @RESPONSE_HASH['MESSAGE']
-    if (m == nil or m == "")
-      return "ERROR - NO MESSAGE FROM BLUEPAY"
-    end
-    return m
-  end
-
-  # Returns the single-character AVS response from the 
-  # Card Issuing Bank
-  def get_avs_code()
-    return @RESPONSE_HASH['AVS']
-  end
-
-  # Same as avs_code, but for CVV2
-
-  def get_cvv2_code()
-    return @RESPONSE_HASH['CVV2']
-  end
-
-  # In the case of an approved transaction, contains the
-  # 6-character authorization code from the processing network.
-  # In the case of a decline or error, the contents may be junk.
-  def get_auth_code()
-    return @RESPONSE_HASH['AUTH_CODE']
-  end
-
-  # The all-important transaction ID.
-  def get_trans_id()
-    return @RESPONSE_HASH['RRNO']
-  end
-
-  # If you set up a rebilling, this'll get its ID.
-  def get_rebill_id()
-    return @RESPONSE_HASH['REBID']
-  end
-
-  # Masked credit card or ACH account
-  def get_masked_account()
-    return @RESPONSE_HASH['PAYMENT_ACCOUNT']
-  end
-
-  # Card type used in transaction
-  def get_card_type()
-    return @RESPONSE_HASH['CARD_TYPE']
-  end
-
-  # Bank account used in transaction
-  def get_bank_name()
-    return @RESPONSE_HASH['BANK_NAME']
-  end
-
-  # Rebill ID from bprebadmin API
-  def get_reb_id()
-    return @RESPONSE_HASH['rebill_id']
-  end
-
-  # Template ID of rebilling
-  def get_template_id()
-    return @RESPONSE_HASH['template_id']
-  end
-
-  # Status of rebilling
-  def get_rebill_status()
-    return @RESPONSE_HASH['status']
-  end
-
-  # Creation date of rebilling
-  def get_creation_date()
-    return @RESPONSE_HASH['creation_date']
-  end
-  
-  # Next date that the rebilling is set to fire off on
-  def get_next_date()
-      return @RESPONSE_HASH['next_date']
-  end
-
-  # Last date that the rebilling fired off on
-  def get_last_date()
-    return @RESPONSE_HASH['last_date']
-  end
-
-  # Rebilling expression
-  def get_sched_expression()
-    return @RESPONSE_HASH['sched_expr']
-  end
-  
-  # Number of cycles remaining on rebilling
-  def get_cycles_remaining()
-    return @RESPONSE_HASH['cycles_remain']
-  end
-
-  # Amount to charge when rebilling fires off
-  def get_rebill_amount()
-    return @RESPONSE_HASH['reb_amount']
-  end
-
-  # Next amount to charge when rebilling fires off
-  def get_next_amount()
-    return @RESPONSE_HASH['next_amount']
-  end
- 
-  # Transaction ID used with stq API
-  def get_id()
-    return @RESPONSE_HASH['id']
-  end 
-
-  # First name associated with the transaction
-  def get_name1()
-    return @RESPONSE_HASH['name1']
-  end
- 
-  # Last name associated with the transaction
-  def get_name2()
-    return @RESPONSE_HASH['name2']
-  end
-  
-  # Payment type associated with the transaction
-  def get_payment_type()
-    return @RESPONSE_HASH['payment_type']
-  end
-
-  # Transaction type associated with the transaction
-  def get_trans_type()
-    return @RESPONSE_HASH['trans_type']
-  end
-  
-  # Amount associated with the transaction
-  def get_amount()
-    return @RESPONSE_HASH['amount']
-  end
-
 end