yetanothernguyen-activemerchant 1.16.0 → 1.21.0

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

@@ -4,30 +4,33 @@ module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class SecurePayAuGateway < Gateway
       API_VERSION = 'xml-4.2'
-      
+      PERIODIC_API_VERSION = 'spxml-3.0'
+
       TEST_URL = 'https://www.securepay.com.au/test/payment'
       LIVE_URL = 'https://www.securepay.com.au/xmlapi/payment'
-      
+      TEST_PERIODIC_URL = "https://test.securepay.com.au/xmlapi/periodic"
+      LIVE_PERIODIC_URL = "https://api.securepay.com.au/xmlapi/periodic"
+
       self.supported_countries = ['AU']
       self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :jcb]
-      
+
       # The homepage URL of the gateway
       self.homepage_url = 'http://securepay.com.au'
-      
+
       # The name of the gateway
       self.display_name = 'SecurePay'
-      
+
       class_attribute :request_timeout
       self.request_timeout = 60
-      
+
       self.money_format = :cents
       self.default_currency = 'AUD'
-      
+
       # 0 Standard Payment
-      # 4 Refund 
-      # 6 Client Reversal (Void) 
-      # 10 Preauthorise 
-      # 11 Preauth Complete (Advice)        
+      # 4 Refund
+      # 6 Client Reversal (Void)
+      # 10 Preauthorise
+      # 11 Preauth Complete (Advice)
       TRANSACTIONS = {
         :purchase => 0,
         :authorization => 10,
@@ -35,33 +38,50 @@ module ActiveMerchant #:nodoc:
         :void => 6,
         :refund => 4
       }
-      
+
+      PERIODIC_ACTIONS = {
+        :add_triggered    => "add",
+        :remove_triggered => "delete",
+        :trigger          => "trigger"
+      }
+
+      PERIODIC_TYPES = {
+        :add_triggered    => 4,
+        :remove_triggered => nil,
+        :trigger          => nil
+      }
+
       SUCCESS_CODES = [ '00', '08', '11', '16', '77' ]
-      
+
       def initialize(options = {})
         requires!(options, :login, :password)
         @options = options
         super
       end
-      
+
       def test?
         @options[:test] || super
       end
-      
-      def purchase(money, credit_card, options = {})
-        requires!(options, :order_id)
-        commit :purchase, build_purchase_request(money, credit_card, options)
-      end                       
-    
+
+      def purchase(money, credit_card_or_stored_id, options = {})
+        if credit_card_or_stored_id.is_a?(ActiveMerchant::Billing::CreditCard)
+          requires!(options, :order_id)
+          commit :purchase, build_purchase_request(money, credit_card_or_stored_id, options)
+        else
+          options[:billing_id] = credit_card_or_stored_id.to_s
+          commit_periodic(build_periodic_item(:trigger, money, nil, options))
+        end
+      end
+
       def authorize(money, credit_card, options = {})
         requires!(options, :order_id)
         commit :authorization, build_purchase_request(money, credit_card, options)
       end
-      
+
       def capture(money, reference, options = {})
         commit :capture, build_reference_request(money, reference)
       end
-      
+
       def refund(money, reference, options = {})
         commit :refund, build_reference_request(money, reference)
       end
@@ -74,54 +94,64 @@ module ActiveMerchant #:nodoc:
       def void(reference, options = {})
         commit :void, build_reference_request(nil, reference)
       end
-      
+
+      def store(creditcard, options = {})
+        requires!(options, :billing_id, :amount)
+        commit_periodic(build_periodic_item(:add_triggered, options[:amount], creditcard, options))
+      end
+
+      def unstore(identification, options = {})
+        options[:billing_id] = identification
+        commit_periodic(build_periodic_item(:remove_triggered, options[:amount], nil, options))
+      end
+
       private
-      
+
       def build_purchase_request(money, credit_card, options)
         xml = Builder::XmlMarkup.new
-        
+
         xml.tag! 'amount', amount(money)
-        xml.tag! 'currency', options[:currency] || currency(money)              
+        xml.tag! 'currency', options[:currency] || currency(money)
         xml.tag! 'purchaseOrderNo', options[:order_id].to_s.gsub(/[ ']/, '')
-        
+
         xml.tag! 'CreditCardInfo' do
           xml.tag! 'cardNumber', credit_card.number
           xml.tag! 'expiryDate', expdate(credit_card)
           xml.tag! 'cvv', credit_card.verification_value if credit_card.verification_value?
         end
-        
+
         xml.target!
       end
-      
+
       def build_reference_request(money, reference)
         xml = Builder::XmlMarkup.new
-        
+
         transaction_id, order_id, preauth_id, original_amount = reference.split("*")
         xml.tag! 'amount', (money ? amount(money) : original_amount)
         xml.tag! 'currency', options[:currency] || currency(money)
         xml.tag! 'txnID', transaction_id
         xml.tag! 'purchaseOrderNo', order_id
         xml.tag! 'preauthID', preauth_id
-        
+
         xml.target!
       end
-      
+
       def build_request(action, body)
         xml = Builder::XmlMarkup.new
         xml.instruct!
         xml.tag! 'SecurePayMessage' do
           xml.tag! 'MessageInfo' do
-            xml.tag! 'messageID', Utils.generate_unique_id.slice(0, 30)
+            xml.tag! 'messageID', ActiveMerchant::Utils.generate_unique_id.slice(0, 30)
             xml.tag! 'messageTimestamp', generate_timestamp
             xml.tag! 'timeoutValue', request_timeout
             xml.tag! 'apiVersion', API_VERSION
           end
-          
+
           xml.tag! 'MerchantInfo' do
             xml.tag! 'merchantID', @options[:login]
             xml.tag! 'password', @options[:password]
           end
-          
+
           xml.tag! 'RequestType', 'Payment'
           xml.tag! 'Payment' do
             xml.tag! 'TxnList', "count" => 1 do
@@ -133,40 +163,98 @@ module ActiveMerchant #:nodoc:
             end
           end
         end
-        
+
         xml.target!
       end
-         
+
       def commit(action, request)
         response = parse(ssl_post(test? ? TEST_URL : LIVE_URL, build_request(action, request)))
-        
-        Response.new(success?(response), message_from(response), response, 
-          :test => test?, 
+
+        Response.new(success?(response), message_from(response), response,
+          :test => test?,
+          :authorization => authorization_from(response)
+        )
+      end
+
+      def build_periodic_item(action, money, credit_card, options)
+        xml = Builder::XmlMarkup.new
+
+        xml.tag! 'actionType', PERIODIC_ACTIONS[action]
+        xml.tag! 'clientID', options[:billing_id].to_s
+
+        if credit_card
+          xml.tag! 'CreditCardInfo' do
+            xml.tag! 'cardNumber', credit_card.number
+            xml.tag! 'expiryDate', expdate(credit_card)
+            xml.tag! 'cvv', credit_card.verification_value if credit_card.verification_value?
+          end
+        end
+        xml.tag! 'amount', amount(money)
+        xml.tag! 'periodicType', PERIODIC_TYPES[action] if PERIODIC_TYPES[action]
+
+        xml.target!
+      end
+
+      def build_periodic_request(body)
+        xml = Builder::XmlMarkup.new
+        xml.instruct!
+        xml.tag! 'SecurePayMessage' do
+          xml.tag! 'MessageInfo' do
+            xml.tag! 'messageID', ActiveMerchant::Utils.generate_unique_id.slice(0, 30)
+            xml.tag! 'messageTimestamp', generate_timestamp
+            xml.tag! 'timeoutValue', request_timeout
+            xml.tag! 'apiVersion', PERIODIC_API_VERSION
+          end
+
+          xml.tag! 'MerchantInfo' do
+            xml.tag! 'merchantID', @options[:login]
+            xml.tag! 'password', @options[:password]
+          end
+
+          xml.tag! 'RequestType', 'Periodic'
+          xml.tag! 'Periodic' do
+            xml.tag! 'PeriodicList', "count" => 1 do
+              xml.tag! 'PeriodicItem', "ID" => 1 do
+                xml << body
+              end
+            end
+          end
+        end
+        xml.target!
+      end
+
+      def commit_periodic(request)
+        my_request = build_periodic_request(request)
+        #puts my_request
+        response = parse(ssl_post(test? ? TEST_PERIODIC_URL : LIVE_PERIODIC_URL, my_request))
+
+        Response.new(success?(response), message_from(response), response,
+          :test => test?,
           :authorization => authorization_from(response)
         )
       end
-      
+
       def success?(response)
         SUCCESS_CODES.include?(response[:response_code])
       end
-      
+
       def authorization_from(response)
         [response[:txn_id], response[:purchase_order_no], response[:preauth_id], response[:amount]].join('*')
       end
-          
+
       def message_from(response)
         response[:response_text] || response[:status_description]
       end
-      
+
       def expdate(credit_card)
         "#{format(credit_card.month, :two_digits)}/#{format(credit_card.year, :two_digits)}"
       end
-      
+
       def parse(body)
         xml = REXML::Document.new(body)
 
         response = {}
-        
+
         xml.root.elements.to_a.each do |node|
           parse_element(response, node)
         end
@@ -181,13 +269,12 @@ module ActiveMerchant #:nodoc:
           response[node.name.underscore.to_sym] = node.text
         end
       end
-      
+
       # YYYYDDMMHHNNSSKKK000sOOO
       def generate_timestamp
         time = Time.now.utc
         time.strftime("%Y%d%m%H%M%S#{time.usec}+000")
-      end  
+      end
     end
   end
 end
-

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

@@ -55,7 +55,7 @@ module ActiveMerchant #:nodoc:
         post[:CardHolderName] = creditcard.name
         
         if creditcard.verification_value?
-          post[:EnableCSC] = 1
+          post[:EnableCSC] = true
           post[:CSC] = creditcard.verification_value
         end
 

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

@@ -20,7 +20,7 @@ module ActiveMerchant #:nodoc:
       
       SUCCESS_MESSAGE = 'The transaction was successful.'
       
-      MONETARY_CHANGE_STATUSES = ['AUTHORIZE', 'AUTHORIZE ADDITIONAL', 'CREDIT', 'SPLITSETTLE']
+      MONETARY_CHANGE_STATUSES = ['SETTLE', 'AUTHORIZE', 'AUTHORIZE ADDITIONAL', 'CREDIT', 'SPLITSETTLE']
 
       CARD_CODE_ERRORS = %w( N S "" )
 
@@ -236,7 +236,7 @@ module ActiveMerchant #:nodoc:
         commit(:change_status, nil, post)
       end
 
-      def credit(money, identification, options = {})
+      def refund(money, identification, options = {})
         post = {}
         add_status_action(post, 'CREDIT')
         add_forced_settlement(post, options)
@@ -244,6 +244,11 @@ module ActiveMerchant #:nodoc:
         commit(:change_status, money, post)
       end
 
+      def credit(money, identification, options = {})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, options)
+      end
+
       def status(order_id)
         commit(:get_status, nil, :szOrderNumber => order_id)
       end

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

@@ -35,50 +35,74 @@ module ActiveMerchant #:nodoc:
         super
       end
 
+      # To create a charge on a card or a token, call
+      #
+      #   purchase(money, card_hash_or_token, { ... })
+      #
+      # To create a charge on a customer, call
+      #
+      #   purchase(money, nil, { :customer => id, ... })
       def purchase(money, creditcard, options = {})
         post = {}
 
         add_amount(post, money, options)
         add_creditcard(post, creditcard, options)
         add_customer(post, options)
-        add_customer_data(post, options)
+        post[:description] = options[:description] || options[:email]
         add_flags(post, options)
 
+        meta = generate_meta(options)
+
         raise ArgumentError.new("Customer or Credit Card required.") if !post[:card] && !post[:customer]
 
-        commit('charges', post)
+        commit(:post, 'charges', post, meta)
       end
 
       def authorize(money, creditcard, options = {})
-        purchase(money, creditcard, options.merge(:uncaptured => true))
+        raise "Stripe does not support separate authorization and capture"
       end
 
       def capture(money, identification, options = {})
-        commit("charges/#{CGI.escape(identification)}/capture", {})
+        raise "Stripe does not support separate authorization and capture"
       end
 
-      def void(identification, options={})
-        commit("charges/#{CGI.escape(identification)}/refund", {})
+      def void(identification, options = {})
+        commit(:post, "charges/#{CGI.escape(identification)}/refund", {})
       end
 
       def refund(money, identification, options = {})
+        meta = generate_meta(options)
         post = {}
 
         post[:amount] = amount(money) if money
 
-        commit("charges/#{CGI.escape(identification)}/refund", post)
+        commit(:post, "charges/#{CGI.escape(identification)}/refund", post, meta)
       end
 
-      def store(creditcard, options={})
+      def store(creditcard, options = {})
         post = {}
         add_creditcard(post, creditcard, options)
-        add_customer_data(post, options)
+        post[:description] = options[:description]
+        post[:email] = options[:email]
 
-        if options[:customer]
-          commit("customers/#{CGI.escape(options[:customer])}", post)
+        meta = generate_meta(options)
+        path = if options[:customer]
+          "customers/#{CGI.escape(options[:customer])}"
         else
-          commit('customers', post)
+          'customers'
         end
+
+        commit(:post, path, post, meta)
+      end
+
+      def update(customer_id, creditcard, options = {})
+        options = options.merge(:customer => customer_id)
+        store(creditcard, options)
+      end
+
+      def unstore(customer_id, options = {})
+        meta = generate_meta(options)
+        commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, meta)
       end
 
       private
@@ -89,7 +113,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def add_customer_data(post, options)
-        post[:description] = options[:email] || options[:description]
+        post[:description] = options[:description]
+        post[:email] = options[:email]
       end
 
       def add_address(post, options)
@@ -132,6 +157,8 @@ module ActiveMerchant #:nodoc:
       end
 
       def post_data(params)
+        return nil unless params
+
         params.map do |key, value|
           next if value.blank?
           if value.is_a?(Hash)
@@ -146,7 +173,11 @@ module ActiveMerchant #:nodoc:
         end.compact.join("&")
       end
 
-      def headers
+      def generate_meta(options)
+        {:ip => options[:ip]}
+      end
+
+      def headers(meta={})
         @@ua ||= JSON.dump({
           :bindings_version => ActiveMerchant::VERSION,
           :lang => 'ruby',
@@ -157,17 +188,18 @@ module ActiveMerchant #:nodoc:
         })
 
         {
-          "Authorization" => "Basic " + ActiveSupport::Base64.encode64(@api_key.to_s + ":").strip,
+          "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
-          "X-Stripe-Client-User-Agent" => @@ua
+          "X-Stripe-Client-User-Agent" => @@ua,
+          "X-Stripe-Client-User-Metadata" => meta.to_json
         }
       end
 
-      def commit(url, parameters, method=:post)
+      def commit(method, url, parameters=nil, meta={})
         raw_response = response = nil
         success = false
         begin
-          raw_response = ssl_request(method, LIVE_URL + url, post_data(parameters), headers)
+          raw_response = ssl_request(method, LIVE_URL + url, post_data(parameters), headers(meta))
           response = parse(raw_response)
           success = !response.key?("error")
         rescue ResponseError => e
@@ -177,7 +209,7 @@ module ActiveMerchant #:nodoc:
           response = json_error(raw_response)
         end
 
-        card = response["card"] || {}
+        card = response["card"] || response["active_card"] || {}
         avs_code = AVS_CODE_TRANSLATOR["line1: #{card["address_line1_check"]}, zip: #{card["address_zip_check"]}"]
         cvc_code = CVC_CODE_TRANSLATOR[card["cvc_check"]]
         Response.new(success,