activemerchant 1.16.0 → 1.17.0

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

@@ -0,0 +1,270 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class OptimalPaymentGateway < Gateway
+      TEST_URL = 'https://webservices.test.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
+      LIVE_URL = 'https://webservices.optimalpayments.com/creditcardWS/CreditCardServlet/v1'
+
+      # The countries the gateway supports merchants from as 2 digit ISO country codes
+      self.supported_countries = ['CA', 'US', 'GB']
+
+      # The card types supported by the payment gateway
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club, :solo] # :switch?
+
+      # The homepage URL of the gateway
+      self.homepage_url = 'http://www.optimalpayments.com/'
+
+      # The name of the gateway
+      self.display_name = 'Optimal Payments'
+
+      def initialize(options = {})
+        #requires!(options, :login, :password)
+        @options = options
+        super
+      end
+
+      def authorize(money, card_or_auth, options = {})
+        parse_card_or_auth(card_or_auth, options)
+        commit("cc#{@stored_data}Authorize", money, options)
+      end
+      alias stored_authorize authorize # back-compat
+
+      def purchase(money, card_or_auth, options = {})
+        parse_card_or_auth(card_or_auth, options)
+        commit("cc#{@stored_data}Purchase", money, options)
+      end
+      alias stored_purchase purchase # back-compat
+
+      def refund(money, authorization, options = {})
+        options[:confirmationNumber] = authorization
+        commit('ccCredit', money, options)
+      end
+
+      def void(authorization, options = {})
+        options[:confirmationNumber] = authorization
+        commit('ccAuthorizeReversal', nil, options)
+      end
+
+      def capture(money, authorization, options = {})
+        options[:confirmationNumber] = authorization
+        commit('ccSettlement', money, options)
+      end
+
+    private
+
+      def parse_card_or_auth(card_or_auth, options)
+        if card_or_auth.respond_to?(:number)
+          @credit_card = card_or_auth
+          @stored_data = ""
+        else
+          options[:confirmationNumber] = card_or_auth
+          @stored_data = "StoredData"
+        end
+      end
+
+      def parse(body)
+        REXML::Document.new(body || '')
+      end
+
+      def commit(action, money, post)
+        post[:order_id] ||= 'order_id'
+
+        xml = case action
+        when 'ccAuthorize', 'ccPurchase', 'ccVerification'
+          cc_auth_request(money, post)
+        when 'ccCredit', 'ccSettlement'
+          cc_post_auth_request(money, post)
+        when 'ccStoredDataAuthorize', 'ccStoredDataPurchase'
+          cc_stored_data_request(money, post)
+        when 'ccAuthorizeReversal'
+          cc_auth_reversal_request(post)
+        #when 'ccCancelSettle', 'ccCancelCredit', 'ccCancelPayment'
+        #  cc_cancel_request(money, post)
+        #when 'ccPayment'
+        #  cc_payment_request(money, post)
+        #when 'ccAuthenticate'
+        #  cc_authenticate_request(money, post)
+        else
+          raise 'Unknown Action'
+        end
+        txnRequest = URI.encode(xml)
+        response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, "txnMode=#{action}&txnRequest=#{txnRequest}"))
+
+        Response.new(successful?(response), message_from(response), hash_from_xml(response),
+          :test          => test?,
+          :authorization => authorization_from(response)
+        )
+      end
+
+      def successful?(response)
+        REXML::XPath.first(response, '//decision').text == 'ACCEPTED' rescue false
+      end
+
+      def message_from(response)
+        REXML::XPath.each(response, '//detail') do |detail|
+          if detail.is_a?(REXML::Element) && detail.elements['tag'].text == 'InternalResponseDescription'
+            return detail.elements['value'].text
+          end
+        end
+        nil
+      end
+
+      def authorization_from(response)
+        REXML::XPath.first(response, '//confirmationNumber').text rescue nil
+      end
+
+      def hash_from_xml(response)
+        hsh = {}
+        %w(confirmationNumber authCode
+           decision code description
+           actionCode avsResponse cvdResponse
+           txnTime duplicateFound
+        ).each do |tag|
+          node = REXML::XPath.first(response, "//#{tag}")
+          hsh[tag] = node.text if node
+        end
+        REXML::XPath.each(response, '//detail') do |detail|
+          next unless detail.is_a?(REXML::Element)
+          tag = detail.elements['tag'].text
+          value = detail.elements['value'].text
+          hsh[tag] = value
+        end
+        hsh
+      end
+
+      def xml_document(root_tag)
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.tag!(root_tag, schema) do
+          yield xml
+        end
+        xml.target!
+      end
+
+      def cc_auth_request(money, opts)
+        xml_document('ccAuthRequestV1') do |xml|
+          build_merchant_account(xml, @options)
+          xml.merchantRefNum opts[:order_id]
+          xml.amount(money/100.0)
+          build_card(xml, opts)
+          build_billing_details(xml, opts)
+        end
+      end
+
+      def cc_auth_reversal_request(opts)
+        xml_document('ccAuthReversalRequestV1') do |xml|
+          build_merchant_account(xml, @options)
+          xml.confirmationNumber opts[:confirmationNumber]
+          xml.merchantRefNum opts[:order_id]
+        end
+      end
+
+      def cc_post_auth_request(money, opts)
+        xml_document('ccPostAuthRequestV1') do |xml|
+          build_merchant_account(xml, @options)
+          xml.confirmationNumber opts[:confirmationNumber]
+          xml.merchantRefNum opts[:order_id]
+          xml.amount(money/100.0)
+        end
+      end
+
+      def cc_stored_data_request(money, opts)
+        xml_document('ccStoredDataRequestV1') do |xml|
+          build_merchant_account(xml, @options)
+          xml.merchantRefNum opts[:order_id]
+          xml.confirmationNumber opts[:confirmationNumber]
+          xml.amount(money/100.0)
+        end
+      end
+
+      # untested
+      #
+      # def cc_cancel_request(opts)
+      #   xml_document('ccCancelRequestV1') do |xml|
+      #     build_merchant_account(xml, @options)
+      #     xml.confirmationNumber opts[:confirmationNumber]
+      #   end
+      # end
+      #
+      # def cc_payment_request(money, opts)
+      #   xml_document('ccPaymentRequestV1') do |xml|
+      #     build_merchant_account(xml, @options)
+      #     xml.merchantRefNum opts[:order_id]
+      #     xml.amount(money/100.0)
+      #     build_card(xml, opts)
+      #     build_billing_details(xml, opts)
+      #   end
+      # end
+      #
+      # def cc_authenticate_request(opts)
+      #   xml_document('ccAuthenticateRequestV1') do |xml|
+      #     build_merchant_account(xml, @options)
+      #     xml.confirmationNumber opts[:confirmationNumber]
+      #     xml.paymentResponse 'myPaymentResponse'
+      #   end
+      # end
+
+      def schema
+        { 'xmlns' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1',
+          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+          'xsi:schemaLocation' => 'http://www.optimalpayments.com/creditcard/xmlschema/v1'
+        }
+      end
+
+      def build_merchant_account(xml, opts)
+        xml.tag! 'merchantAccount' do
+          xml.tag! 'accountNum' , opts[:account]
+          xml.tag! 'storeID'    , opts[:login]
+          xml.tag! 'storePwd'   , opts[:password]
+        end
+      end
+
+      def build_card(xml, opts)
+        xml.tag! 'card' do
+          xml.tag! 'cardNum'      , @credit_card.number
+          xml.tag! 'cardExpiry' do
+            xml.tag! 'month'      , @credit_card.month
+            xml.tag! 'year'       , @credit_card.year
+          end
+          if type = card_type(@credit_card.type)
+            xml.tag! 'cardType'     , type
+          end
+          if @credit_card.verification_value
+            xml.tag! 'cvdIndicator' , '1' # Value Provided
+            xml.tag! 'cvd'          , @credit_card.verification_value
+          end
+        end
+      end
+
+      def build_billing_details(xml, opts)
+        xml.tag! 'billingDetails' do
+          addr = opts[:billing_address]
+          xml.tag! 'cardPayMethod', 'WEB'
+          if addr[:name]
+            xml.tag! 'firstName', CGI.escape(addr[:name].split(' ').first) # TODO: parse properly
+            xml.tag! 'lastName' , CGI.escape(addr[:name].split(' ').last )
+          end
+          xml.tag! 'street' , CGI.escape(addr[:address1]) if addr[:address1] && !addr[:address1].empty?
+          xml.tag! 'street2', CGI.escape(addr[:address2]) if addr[:address2] && !addr[:address2].empty?
+          xml.tag! 'city'   , CGI.escape(addr[:city]    ) if addr[:city]     && !addr[:city].empty?
+          xml.tag! 'state'  , CGI.escape(addr[:state]   ) if addr[:state]    && !addr[:state].empty?
+          xml.tag! 'country', CGI.escape(addr[:country] ) if addr[:country]  && !addr[:country].empty?
+          xml.tag! 'zip'    , CGI.escape(addr[:zip]     ) # this one's actually required
+          xml.tag! 'phone'  , CGI.escape(addr[:phone]   ) if addr[:phone]    && !addr[:phone].empty?
+          #xml.tag! 'email'        , ''
+        end
+      end
+
+      def card_type(key)
+        { 'visa'            => 'VI',
+          'master'          => 'MC',
+          'american_express'=> 'AM',
+          'discover'        => 'DI',
+          'diners_club'     => 'DC',
+          #'switch'          => '',
+          'solo'            => 'SO'
+        }[key]
+      end
+
+    end
+  end
+end
+

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

@@ -80,8 +80,8 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         unless options[:ip_authentication] == true
           requires!(options, :login, :password, :merchant_id)
-          @options = options
         end
+        @options = options
         super
       end
       
@@ -167,6 +167,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! :CurrencyCode, currency_code(currency)
         xml.tag! :CurrencyExponent, '2' # Will need updating to support currencies such as the Yen.
         
+        xml.tag! :CardSecValInd, 1 if creditcard.verification_value? && %w( visa discover ).include?(creditcard.type)
         xml.tag! :CardSecVal,  creditcard.verification_value if creditcard.verification_value?
       end
       
@@ -223,11 +224,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def success?(response)
-        if response[:message_type] == "R"
+        if response[:message_type].nil? || response[:message_type] == "R"
           response[:proc_status] == SUCCESS
         else
           response[:proc_status] == SUCCESS &&
-          response[:resp_code] == APPROVED 
+            response[:resp_code] == APPROVED
         end
       end
       
@@ -247,7 +248,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! :NewOrder do
             xml.tag! :OrbitalConnectionUsername, @options[:login] unless ip_authentication?
             xml.tag! :OrbitalConnectionPassword, @options[:password] unless ip_authentication?
-            xml.tag! :IndustryType, "EC" # E-Commerce transaction 
+            xml.tag! :IndustryType, parameters[:industry_type] || "EC"
             xml.tag! :MessageType, action
             xml.tag! :BIN, '000002' # PNS Tampa
             xml.tag! :MerchantID, @options[:merchant_id]
@@ -289,7 +290,6 @@ module ActiveMerchant #:nodoc:
       end
       
       def build_void_request_xml(money, authorization, parameters = {})
-        requires!(parameters, :transaction_index)
         tx_ref_num, order_id = authorization.split(';')
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.instruct!(:xml, :version => '1.0', :encoding => 'UTF-8')

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

@@ -63,10 +63,13 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :login, :password)
         
+        headers = {'X-PP-AUTHORIZATION' => options.delete(:auth_signature), 'X-PAYPAL-MESSAGE-PROTOCOL' => 'SOAP11'} if options[:auth_signature]
         @options = {
           :pem => pem_file,
-          :signature => signature
+          :signature => signature,
+          :headers => headers || {}
         }.update(options)
+
         
         if @options[:pem].blank? && @options[:signature].blank?
           raise ArgumentError, "An API Certificate or API Signature is required to make requests to PayPal" 
@@ -280,7 +283,7 @@ module ActiveMerchant #:nodoc:
         xml.instruct!
         xml.tag! 'env:Envelope', ENVELOPE_NAMESPACES do
           xml.tag! 'env:Header' do
-            add_credentials(xml)
+            add_credentials(xml) unless @options[:headers] && @options[:headers]['X-PP-AUTHORIZATION']
           end
           
           xml.tag! 'env:Body' do
@@ -320,7 +323,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def commit(action, request)
-        response = parse(action, ssl_post(endpoint_url, build_request(request)))
+        response = parse(action, ssl_post(endpoint_url, build_request(request), @options[:headers]))
        
         build_response(successful?(response), message_from(response), response,
     	    :test => test?,

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

@@ -80,6 +80,8 @@ module ActiveMerchant #:nodoc:
                 xml.tag! 'n2:ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank?
                 xml.tag! 'n2:InvoiceID', options[:order_id]
                 xml.tag! 'n2:OrderDescription', options[:description]
+
+                add_items_xml(xml, options, currency_code) if options[:items]
               end
             end
           end
@@ -115,25 +117,13 @@ module ActiveMerchant #:nodoc:
                 xml.tag! 'n2:OrderDescription', options[:description]
                 xml.tag! 'n2:InvoiceID', options[:order_id]
 
-                if options[:items]
-                  options[:items].each do |item|
-                    xml.tag! 'n2:PaymentDetailsItem' do
-                      xml.tag! 'n2:Name', item[:name]
-                      xml.tag! 'n2:Number', item[:number]
-                      xml.tag! 'n2:Quantity', item[:quantity]
-                      if item[:amount]
-                        xml.tag! 'n2:Amount', localized_amount(item[:amount], currency_code), 'currencyID' => currency_code
-                      end
-                      xml.tag! 'n2:Description', item[:description]
-                      xml.tag! 'n2:ItemURL', item[:url]
-                    end
-                  end
-                end
+                add_items_xml(xml, options, currency_code) if options[:items]
+
+                add_address(xml, 'n2:ShipToAddress', options[:shipping_address] || options[:address])
 
                 xml.tag! 'n2:PaymentAction', action
               end
 
-              add_address(xml, 'n2:Address', options[:shipping_address] || options[:address])
               xml.tag! 'n2:AddressOverride', options[:address_override] ? '1' : '0'
               xml.tag! 'n2:NoShipping', options[:no_shipping] ? '1' : '0'
               xml.tag! 'n2:ReturnURL', options[:return_url]
@@ -172,6 +162,23 @@ module ActiveMerchant #:nodoc:
       def build_response(success, message, response, options = {})
         PaypalExpressResponse.new(success, message, response, options)
       end
+
+      private
+
+      def add_items_xml(xml, options, currency_code)
+        options[:items].each do |item|
+          xml.tag! 'n2:PaymentDetailsItem' do
+            xml.tag! 'n2:Name', item[:name]
+            xml.tag! 'n2:Number', item[:number]
+            xml.tag! 'n2:Quantity', item[:quantity]
+            if item[:amount]
+              xml.tag! 'n2:Amount', localized_amount(item[:amount], currency_code), 'currencyID' => currency_code
+            end
+            xml.tag! 'n2:Description', item[:description]
+            xml.tag! 'n2:ItemURL', item[:url]
+          end
+        end
+      end
     end
   end
 end

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

@@ -8,30 +8,91 @@ module ActiveMerchant #:nodoc:
 
       self.default_currency = 'DKK'
       self.money_format = :cents
-      self.supported_cardtypes = [ :dankort, :forbrugsforeningen, :visa, :master, :american_express, :diners_club, :jcb, :maestro ]
+      self.supported_cardtypes = [:dankort, :forbrugsforeningen, :visa, :master, :american_express, :diners_club, :jcb, :maestro]
       self.supported_countries = ['DK', 'SE']
       self.homepage_url = 'http://quickpay.dk/'
       self.display_name = 'Quickpay'
 
-      PROTOCOL = 3
-
       MD5_CHECK_FIELDS = {
-        :authorize => [:protocol, :msgtype, :merchant, :ordernumber, :amount, :currency, :autocapture, :cardnumber, :expirationdate, :cvd, :cardtypelock, :testmode],
-        :capture   => [:protocol, :msgtype, :merchant, :amount, :transaction],
-        :cancel    => [:protocol, :msgtype, :merchant, :transaction],
-        :refund    => [:protocol, :msgtype, :merchant, :amount, :transaction],
-        :subscribe => [:protocol, :msgtype, :merchant, :ordernumber, :cardnumber, :expirationdate, :cvd, :cardtypelock, :description, :testmode],
-        :recurring => [:protocol, :msgtype, :merchant, :ordernumber, :amount, :currency, :autocapture, :transaction],
-        :status    => [:protocol, :msgtype, :merchant, :transaction],
-        :chstatus  => [:protocol, :msgtype, :merchant],
+        3 => {
+          :authorize => %w(protocol msgtype merchant ordernumber amount
+                           currency autocapture cardnumber expirationdate
+                           cvd cardtypelock testmode),
+
+          :capture   => %w(protocol msgtype merchant amount transaction),
+
+          :cancel    => %w(protocol msgtype merchant transaction),
+
+          :refund    => %w(protocol msgtype merchant amount transaction),
+
+          :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
+                           expirationdate cvd cardtypelock description testmode),
+
+          :recurring => %w(protocol msgtype merchant ordernumber amount
+                           currency autocapture transaction),
+
+          :status    => %w(protocol msgtype merchant transaction),
+
+          :chstatus  => %w(protocol msgtype merchant)
+        },
+
+        4 => {
+          :authorize => %w(protocol msgtype merchant ordernumber amount
+                           currency autocapture cardnumber expirationdate cvd
+                           cardtypelock testmode fraud_remote_addr
+                           fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :capture   => %w(protocol msgtype merchant amount transaction
+                           fraud_remote_addr fraud_http_accept
+                           fraud_http_accept_language fraud_http_accept_encoding
+                           fraud_http_accept_charset fraud_http_referer
+                           fraud_http_user_agent apikey),
+
+          :cancel    => %w(protocol msgtype merchant transaction fraud_remote_addr
+                           fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :refund    => %w(protocol msgtype merchant amount transaction
+                           fraud_remote_addr fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :subscribe => %w(protocol msgtype merchant ordernumber cardnumber
+                           expirationdate cvd cardtypelock description testmode
+                           fraud_remote_addr fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :recurring => %w(protocol msgtype merchant ordernumber amount currency
+                           autocapture transaction fraud_remote_addr fraud_http_accept
+                           fraud_http_accept_language fraud_http_accept_encoding
+                           fraud_http_accept_charset fraud_http_referer
+                           fraud_http_user_agent apikey),
+
+          :status    => %w(protocol msgtype merchant transaction fraud_remote_addr
+                           fraud_http_accept fraud_http_accept_language
+                           fraud_http_accept_encoding fraud_http_accept_charset
+                           fraud_http_referer fraud_http_user_agent apikey),
+
+          :chstatus  => %w(protocol msgtype merchant fraud_remote_addr fraud_http_accept
+                           fraud_http_accept_language fraud_http_accept_encoding
+                           fraud_http_accept_charset fraud_http_referer
+                           fraud_http_user_agent apikey)
+        }
       }
 
       APPROVED = '000'
 
       # The login is the QuickpayId
-      # The password is the md5checkword from the Quickpay admin interface
+      # The password is the md5checkword from the Quickpay manager
+      # To use the API-key from the Quickpay manager, specify :api-key
+      # Using the API-key, requires that you use version 4. Specify :version => 4 in options.
       def initialize(options = {})
         requires!(options, :login, :password)
+        @protocol = options.delete(:version) || 3 # default to protocol version 3
         @options = options
         super
       end
@@ -43,6 +104,7 @@ module ActiveMerchant #:nodoc:
         add_invoice(post, options)
         add_creditcard_or_reference(post, credit_card_or_reference, options)
         add_autocapture(post, false)
+        add_fraud_parameters(post, options)
         add_testmode(post)
 
         commit(recurring_or_authorize(credit_card_or_reference), post)
@@ -54,6 +116,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         add_creditcard_or_reference(post, credit_card_or_reference, options)
         add_invoice(post, options)
+        add_fraud_parameters(post, options)
         add_autocapture(post, true)
 
         commit(recurring_or_authorize(credit_card_or_reference), post)
@@ -64,6 +127,7 @@ module ActiveMerchant #:nodoc:
 
         add_reference(post, authorization)
         add_amount_without_currency(post, money)
+        add_fraud_parameters(post, options)
 
         commit(:capture, post)
       end
@@ -72,6 +136,7 @@ module ActiveMerchant #:nodoc:
         post = {}
 
         add_reference(post, identification)
+        add_fraud_parameters(post, options)
 
         commit(:cancel, post)
       end
@@ -81,6 +146,7 @@ module ActiveMerchant #:nodoc:
 
         add_amount_without_currency(post, money)
         add_reference(post, identification)
+        add_fraud_parameters(post, options)
 
         commit(:refund, post)
       end
@@ -96,6 +162,7 @@ module ActiveMerchant #:nodoc:
         add_creditcard(post, creditcard, options)
         add_invoice(post, options)
         add_description(post, options)
+        add_fraud_parameters(post, options)
         add_testmode(post)
 
         commit(:subscribe, post)
@@ -150,6 +217,18 @@ module ActiveMerchant #:nodoc:
       def add_testmode(post)
         post[:testmode] = test? ? '1' : '0'
       end
+      
+      def add_fraud_parameters(post, options)
+        if @protocol == 4
+          post[:fraud_remote_addr] = options[:fraud_remote_addr] if options[:fraud_remote_addr]
+          post[:fraud_http_accept] = options[:fraud_http_accept] if options[:fraud_http_accept]
+          post[:fraud_http_accept_language] = options[:fraud_http_accept_language] if options[:fraud_http_accept_language]
+          post[:fraud_http_accept_encoding] = options[:fraud_http_accept_encoding] if options[:fraud_http_accept_encoding]
+          post[:fraud_http_accept_charset] = options[:fraud_http_accept_charset] if options[:fraud_http_accept_charset]
+          post[:fraud_http_referer] = options[:fraud_http_referer] if options[:fraud_http_referer]
+          post[:fraud_http_user_agent] = options[:fraud_http_user_agent] if options[:fraud_http_user_agent]
+        end
+      end
 
       def commit(action, params)
         response = parse(ssl_post(URL, post_data(action, params)))
@@ -177,27 +256,22 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        case response[:qpstat]
-        when '008'   # Error in request data
-          response[:qpstatmsg].to_s
-          #.scan(/[A-Z][a-z0-9 \/]+/).to_sentence
-        else
-          response[:qpstatmsg].to_s
-        end
+        response[:qpstatmsg].to_s
       end
 
       def post_data(action, params = {})
-        params[:protocol] = PROTOCOL
+        params[:protocol] = @protocol
         params[:msgtype]  = action.to_s
         params[:merchant] = @options[:login]
+        params[:apikey] = @options[:apikey] if @options[:apikey]
         params[:md5check] = generate_check_hash(action, params)
 
         params.collect { |key, value| "#{key}=#{CGI.escape(value.to_s)}" }.join("&")
       end
 
       def generate_check_hash(action, params)
-        string = MD5_CHECK_FIELDS[action].collect do |key|
-          params[key]
+        string = MD5_CHECK_FIELDS[@protocol][action].collect do |key|
+          params[key.to_sym]
         end.join('')
 
         # Add the md5checkword