johnideal-activemerchant 1.4.4 → 1.4.5

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.4.5

data/activemerchant.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activemerchant}
-  s.version = "1.4.4"
+  s.version = "1.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Luetke"]

data/lib/active_merchant/billing/gateways/paymentech_orbital/paymentech_orbital_response.rb

@@ -1,72 +1,83 @@
-module ActiveMerchant
-  module Billing
-    class PaymentechOrbitalResponse
-      cattr_accessor :elements
+class PaymentechOrbitalResponse
+  cattr_accessor :elements
+  attr_reader :doc, :request_type
 
-      self.elements = [ 
-        :industry_type, :message_type, :merchant_id,
-        :terminal_id, :card_brand, :account_num, 
-        :order_id, :tx_ref_num, :tx_ref_idx, :proc_status,
-        :approval_status, :resp_code, :avs_resp_code,
-        :cvv2_resp_code, :auth_code, :status_msg, :resp_msg,
-        :customer_ref_num, :customer_name, :profile_proc_status,
-        :customer_profile_message, :resp_time
-      ]
+  self.elements = [ 
+    :industry_type, :message_type, :merchant_id,
+    :terminal_id, :card_brand, :account_num, 
+    :order_id, :tx_ref_num, :tx_ref_idx, :proc_status,
+    :approval_status, :resp_code, :avs_resp_code,
+    :cvv2_resp_code, :auth_code, :status_msg, :resp_msg,
+    :customer_ref_num, :customer_name, :profile_proc_status,
+    :customer_profile_message, :resp_time, :batch_seq_num
+  ]
 
-      def initialize(doc, options={})
-        @doc = REXML::Document.new(doc)
-        @options = options
-      end
+  def initialize(doc, request_type, options={})
+    @doc = REXML::Document.new(doc)
+    @request_type = request_type
+    @options = options
+  end
+
+  def success?
+    case request_type
+    when "NewOrder"
+      proc_success? && approved?
+    when "Profile"
+      profile_proc_success?
+    when "Reversal", "EndOfDay"
+      proc_success?
+    else
+      false
+    end
+  end
+
+  def proc_success?
+    proc_status == "0"
+  end
+  
+  def profile_proc_success?
+    profile_proc_status == "0"
+  end
 
-      def success?
-        proc_success? && approved?
-      end
+  def approved?
+    approval_status == "1"
+  end
 
-      def proc_success?
-        proc_status == "0"
-      end
+  def authorization
+    approval_status
+  end
 
-      def approved?
-        approval_status == "1"
-      end
+  def test?
+    @options[:test] || false
+  end
 
-      def authorization
-        approval_status
-      end
-      
-      def test?
-        @options[:test] || false
-      end
+  def avs_result
+    @avs_result ||= AVSResult.new({:code => avs_resp_code})
+  end
 
-      def avs_result
-        @avs_result ||= AVSResult.new({:code => avs_resp_code})
-      end
-      
-      def cvv_result
-        @cvv_result ||= CVVResult.new({:code => cvv2_result_code})
-      end
+  def cvv_result
+    @cvv_result ||= CVVResult.new({:code => cvv2_result_code})
+  end
 
-      private
-      def tagify(s)
-        s.to_s.gsub(/\/(.?)/) { 
-          "::#{$1.upcase}" 
-        }.gsub(/(?:^|_)(.)/) { 
-          $1.upcase 
-        }
-      end
+  private
+  def tagify(s)
+    s.to_s.gsub(/\/(.?)/) { 
+      "::#{$1.upcase}" 
+    }.gsub(/(?:^|_)(.)/) { 
+      $1.upcase 
+    }
+  end
 
-      def value_at(sym)
-        node = REXML::XPath.first(@doc, "//#{tagify(sym)}")
-        node ? node.text : nil
-      end
+  def value_at(sym)
+    node = REXML::XPath.first(@doc, "//#{tagify(sym)}")
+    node ? node.text : nil
+  end
 
-      def method_missing(sym, *args, &blk)
-        if self.class.elements.include?(sym)
-          value_at(sym)
-        else
-          super(sym, *args, &blk)
-        end
-      end
+  def method_missing(sym, *args, &blk)
+    if self.class.elements.include?(sym)
+      value_at(sym)
+    else
+      super(sym, *args, &blk)
     end
   end
 end

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

@@ -1,10 +1,18 @@
+require File.dirname(__FILE__) + '/paymentech_orbital/paymentech_orbital_request'
+
+require File.dirname(__FILE__) + '/paymentech_orbital/end_of_day_request'
+require File.dirname(__FILE__) + '/paymentech_orbital/new_order_request'
+require File.dirname(__FILE__) + '/paymentech_orbital/profile_management_request'
+require File.dirname(__FILE__) + '/paymentech_orbital/void_request'
+
 require File.dirname(__FILE__) + '/paymentech_orbital/paymentech_orbital_response'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class PaymentechOrbitalGateway < Gateway
       cattr_accessor :enable_profile_management, :urls,
-                     :currency_code, :currency_exponent
+                     :currency_code, :currency_exponent,
+                     :headers
       
       self.urls = {
         :test => [
@@ -39,128 +47,77 @@ module ActiveMerchant #:nodoc:
       # Enable profile management?
       self.enable_profile_management = true
       
+      # Headers
+      self.headers = {
+        "MIME-Version" => "1.0",
+        "Content-Type" => "Application/PTI46",
+        "Content-transfer-encoding" => "text",
+        "Request-number" => "1",
+        "Document-type" => "Request"
+      }
+      
       def initialize(options = {})
         requires!(options, :login, :password, :merchant_id, :bin, :terminal_id)
-        @options = options
+        @options = options.merge({
+          :currency_code => self.class.currency_code, 
+          :currency_exponent => self.class.currency_exponent
+        })
         super
       end
-      
-      [:login, :password, :merchant_id, 
-       :bin, :terminal_id].each do |attr|
-        define_method(:"#{attr}") do
-          @options[:"#{attr}"]
-        end
-      end
-      
-      def authorize(money, creditcard, options = {})
-        request = build_request("NewOrder", money, options) do |xml|
-          add_credentials(xml, "A")
-          add_credit_card(xml, credit_card)
-          add_billing_address(xml, options[:billing_address]) if options[:billing_address]
-          add_profile_management(xml, options[:customer_ref_num]) if enable_profile_management?
-        end
+
+      def authorize(money, credit_card=nil, options = {})
+        request = NewOrderRequest.new("A", money, credit_card, options.merge(@options))
 
         commit('authonly', request)
       end
 
       def purchase(money, credit_card=nil, options = {})
-        request = build_request("NewOrder", money, options) do |xml|
-          add_credentials(xml, "AC")
-          add_credit_card(xml, credit_card)
-          add_billing_address(xml, options[:billing_address]) if options[:billing_address]
-          add_profile_management(xml, options[:customer_ref_num]) if enable_profile_management?
-        end
+        request = NewOrderRequest.new("AC", money, credit_card, options.merge(@options))
 
         commit('sale', request)
       end
+      
+      def refund(money, credit_card=nil, options={})
+        request = NewOrderRequest.new("R", money, credit_card, options.merge(@options))
 
-      def capture(money, authorization, options = {})
-        commit('capture', money, post)
+        commit('refund', request)
       end
 
-      private
-      def build_request(request_type, money, options)
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        
-        xml.instruct!(:xml, :version => '1.0', :encoding => 'UTF-8')
-        xml.tag! "Request" do
-          xml.tag! request_type do
-            yield xml if block_given?
-
-            xml.tag! "OrderID", options[:order_id]
-            xml.tag! "Amount", money
-          end
-        end
-
-        xml.target!
-      end
-      
-      def add_credentials(xml, message_type)
-        xml.tag! "OrbitalConnectionUsername", login
-        xml.tag! "OrbitalConnectionPassword", password
-        xml.tag! "IndustryType", "EC"
-        xml.tag! "MessageType", message_type
-        xml.tag! "BIN", bin
-        xml.tag! "MerchantID", merchant_id
-        xml.tag! "TerminalID", terminal_id
-      end
-      
-      def add_credit_card(xml, credit_card=nil)
-        if credit_card
-          xml.tag! "CardBrand", card_brand(credit_card)
-          xml.tag! "AccountNum", credit_card.number
-          xml.tag! "Exp", "#{credit_card.month}#{credit_card.year}"
-          add_currency(xml)
-          xml.tag! "CardSecVal", credit_card.verification_value
-        else
-          xml.tag! "AccountNum", nil
-          add_currency(xml)
-        end
-      end
-      
-      def add_currency(xml)
-        xml.tag! "CurrencyCode", self.class.currency_code
-        xml.tag! "CurrencyExponent", self.class.currency_exponent
+      def profile(action, credit_card=nil, options={})
+        request = ProfileManagementRequest.new(action, credit_card, options.merge(@options))
+
+        commit("profile-#{action}", request)
       end
       
-      def add_billing_address(xml, address)
-        xml.tag! "AVSzip", address[:zip]
-        xml.tag! "AVSaddress1", address[:address1]
-        xml.tag! "AVSaddress2", address[:address2]
-        xml.tag! "AVScity", address[:city]
-        xml.tag! "AVSstate", address[:state]
-        xml.tag! "AVSphoneNum" , address[:phone]
-        xml.tag! "AVSname", address[:name]
-        xml.tag! "AVScountryCode", address[:country]
+      def void(tx_ref_num, tx_ref_idx, money=nil, options={})
+        request = VoidRequest.new(tx_ref_num, tx_ref_idx, money, options.merge(@options))
+
+        commit('void', request)
       end
-      
-      def add_profile_management(xml, customer_ref_num=nil)
-        if customer_ref_num
-          xml.tag! "CustomerRefNum", customer_ref_num
-        else
-          xml.tag! "CustomerProfileFromOrderInd", "A"
-          xml.tag! "CustomerProfileOrderOverrideInd", "NO"
-        end
+
+      def end_of_day(options={})
+        request = EndOfDayRequest.new(options.merge(@options))
+
+        commit('end of day', request)
       end
-      
+
+      private
       def commit(action, request)
-        resp = ssl_post(endpoint_url, request, {
-          "MIME-Version" => "1.0",
-          "Content-Type" => "Application/PTI46",
-          "Content-transfer-encoding" => "text",
-          "Request-number" => "1",
-          "Document-type" => "Request"
-        })
+        resp = ssl_post(endpoint_url, request.to_xml, headers)
 
-        @response ||= PaymentechOrbitalResponse.new(resp, {
+        @response ||= PaymentechOrbitalResponse.new(resp, request.request_type, {
           :test => test?
         })
       end
-      
+
+      def headers
+        self.class.headers
+      end
+
       def endpoint_url
         self.class.urls[Base.gateway_mode][0]
       end
-      
+
       def enable_profile_management?
         self.class.enable_profile_management
       end

data/lib/active_merchant/lib/connection.rb

@@ -64,7 +64,6 @@ module ActiveMerchant
               http.get(endpoint.request_uri, headers)
             when :post
               debug body
-              puts RUBY_184_POST_HEADERS.merge(headers).inspect
               http.post(endpoint.request_uri, body, RUBY_184_POST_HEADERS.merge(headers))
             else
               raise ArgumentError, "Unsupported request method #{method.to_s.upcase}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnideal-activemerchant
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors: 
 - Tobias Luetke