activemerchant 1.9.3 → 1.9.4

data.tar.gz.sig

@@ -1 +1,2 @@
-���!��?�}N�O�?64����q��}�
3P��~\�@+J��f'J7^[�3����P����%2ǟ�AR΀��'�K��+�idyN~�3�P���V ��"��Mbq3S+�Rˆ.���l��Cy��f/�p�I\5f����χ��>��矶ԩ�L�u�܏8��I��W�M?n3Bw�
+L��
+��1r��Y���

data/CHANGELOG

@@ -1,5 +1,9 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.9.4 (Jan 5, 2011)
+
+* Update Garanti gateway to integrate with new API [Selem Delul]
+
 == Version 1.9.3 (December 17, 2010)
 
 * Fix BBS Netaxept to change transaction type from C (for MOTO: mail order telephone order) to M (for credit card orders) [Soleone]

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

@@ -1,7 +1,7 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class GarantiGateway < Gateway
-      URL = 'https://ccpos.garanti.com.tr/servlet/cc5ApiServer'
+      URL = 'https://sanalposprov.garanti.com.tr/VPServlet'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       self.supported_countries = ['US','TR']
@@ -10,51 +10,76 @@ module ActiveMerchant #:nodoc:
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
 
       # The homepage URL of the gateway
-      self.homepage_url = 'https://sanalposweb.garanti.com.tr/gvpsui/login/LoginStart.jsp'
+      self.homepage_url = 'https://sanalposweb.garanti.com.tr'
 
       # The name of the gateway
       self.display_name = 'Garanti Sanal POS'
 
       self.default_currency = 'TRL'
 
+      self.money_format = :cents
+
       CURRENCY_CODES = {
         'YTL' => 949,
         'TRL' => 949,
+        'TL'  => 949,
         'USD' => 840,
-        'EUR' => 978
+        'EUR' => 978,
+        'GBP' => 826,
+        'JPY' => 392
       }
 
 
       def initialize(options = {})
-        requires!(options, :login, :password, :client_id)
+        requires!(options, :login, :password, :terminal_id, :merchant_id)
         @options = options
         super
       end
 
       def purchase(money, credit_card, options = {})
+        options = options.merge(:gvp_order_type => "sales")
         commit(money, build_sale_request(money, credit_card, options))
       end
 
       def authorize(money, credit_card, options = {})
+        options = options.merge(:gvp_order_type => "preauth")
         commit(money, build_authorize_request(money, credit_card, options))
       end
 
-      def capture(money, reference, options = {})
-        commit(money, build_capture_request(money,reference,options))
+      def capture(money, ref_id, options = {})
+        options = options.merge(:gvp_order_type => "postauth")
+        commit(money, build_capture_request(money, ref_id, options))
       end
 
       private
 
-      def build_xml_request(transaction_type,&block)
-        xml = Builder::XmlMarkup.new
-        xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      def security_data
+        rjusted_terminal_id = @options[:terminal_id].to_s.rjust(9, "0")
+        Digest::SHA1.hexdigest(@options[:password].to_s + rjusted_terminal_id).upcase
+      end
+
+      def generate_hash_data(order_id, terminal_id, credit_card_number, amount, security_data)
+        data = [order_id, terminal_id, credit_card_number, amount, security_data].join
+        Digest::SHA1.hexdigest(data).upcase
+      end
+
+      def build_xml_request(money, credit_card, options, &block)
+        card_number = credit_card.respond_to?(:number) ? credit_card.number : ''
+        hash_data   = generate_hash_data(options[:order_id], @options[:terminal_id], card_number, amount(money), security_data)
+
+        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
 
-        xml.tag! 'CC5Request' do
-          xml.tag! 'Name', @options[:login]
-          xml.tag! 'Password', @options[:password]
-          xml.tag! 'ClientId', @options[:client_id]
-          xml.tag! 'Mode', if test? then 'R' else 'P' end
-          xml.tag! 'Type', transaction_type
+        xml.tag! 'GVPSRequest' do
+          xml.tag! 'Mode', test? ? 'TEST' : 'PROD'
+          xml.tag! 'Version', 'V0.01'
+          xml.tag! 'Terminal' do
+            xml.tag! 'ProvUserID', 'PROVAUT'
+            xml.tag! 'HashData', hash_data
+            xml.tag! 'UserID', @options[:login]
+            xml.tag! 'ID', @options[:terminal_id]
+            xml.tag! 'MerchantID', @options[:merchant_id]
+          end
 
           if block_given?
             yield xml
@@ -65,130 +90,124 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_sale_request(money, credit_card, options)
-        build_xml_request('Auth') do |xml|
-          add_customer_data(xml,options)
-          add_order_data(xml,options)
+        build_xml_request(money, credit_card, options) do |xml|
+          add_customer_data(xml, options)
+          add_order_data(xml, options) do |xml|
+            add_addresses(xml, options)
+          end
           add_credit_card(xml, credit_card)
-          add_addresses(xml, options)
-
-          xml.tag! 'Total', amount(money)
-          xml.tag! 'Currency', currency_code(options[:currency])
+          add_transaction_data(xml, money, options)
 
           xml.target!
         end
       end
 
       def build_authorize_request(money, credit_card, options)
-         build_xml_request('PreAuth') do |xml|
-          add_customer_data(xml,options)
-          add_order_data(xml,options)
+         build_xml_request(money, credit_card, options) do |xml|
+          add_customer_data(xml, options)
+          add_order_data(xml, options)  do |xml|
+            add_addresses(xml, options)
+          end
           add_credit_card(xml, credit_card)
-          add_addresses(xml, options)
-
-          xml.tag! 'Total', amount(money)
-          xml.tag! 'Currency', currency_code(options[:currency])
+          add_transaction_data(xml, money, options)
 
           xml.target!
-
         end
       end
 
-      def build_capture_request(money, reference, options = {})
-        build_xml_request('PostAuth') do |xml|
-          add_customer_data(xml,options)
-          xml.tag! 'OrderId', reference
-          xml.tag! 'Total', amount(money)
-          xml.tag! 'Currency', currency_code(options[:currency])
+      def build_capture_request(money, ref_id, options)
+        options = options.merge(:order_id => ref_id)
+         build_xml_request(money, ref_id, options) do |xml|
+          add_customer_data(xml, options)
+          add_order_data(xml, options)
+          add_transaction_data(xml, money, options)
 
           xml.target!
         end
       end
 
-      def build_void_request(reference, options = {})
-         build_xml_request('Void') do |xml|
-          add_customer_data(xml,options)
-          xml.tag! 'OrderId', reference
-          xml.tag! 'Total', amount(money)
-          xml.tag! 'Currency', currency_code(options[:currency])
-
-          xml.target!
+      def add_customer_data(xml, options)
+        xml.tag! 'Customer' do
+          xml.tag! 'IPAddress', options[:ip] || '1.1.1.1'
+          xml.tag! 'EmailAddress', options[:email]
         end
       end
 
-      def build_credit_request(money, reference, options = {})
-        build_xml_request('Credit') do |xml|
-          add_customer_data(xml,options)
-          xml.tag! 'OrderId', reference
-          xml.tag! 'Total', amount(money)
-          xml.tag! 'Currency', currency_code(options[:currency])
+      def add_order_data(xml, options, &block)
+        xml.tag! 'Order' do
+          xml.tag! 'OrderID', options[:order_id]
+          xml.tag! 'GroupID'
 
-          xml.target!
+          if block_given?
+            yield xml
+          end
         end
       end
 
-      def add_customer_data(xml, options)
-        xml.tag! 'IPAddress', options[:ip_]
-        xml.tag! 'Email', options[:email]
-      end
-
-      def add_order_data(xml,options)
-        xml.tag! 'OrderId', options[:order_id]
-        xml.tag! 'GroupId', nil
-        xml.tag! 'TransId', nil
-      end
-
       def add_credit_card(xml, credit_card)
-        xml.tag! 'Number', credit_card.number
-        xml.tag! 'Expires', [format_exp(credit_card.month),format_exp(credit_card.year)].join('/')
-        xml.tag! 'Cvv2Val', credit_card.verification_value
+        xml.tag! 'Card' do
+          xml.tag! 'Number', credit_card.number
+          xml.tag! 'ExpireDate', [format_exp(credit_card.month), format_exp(credit_card.year)].join
+          xml.tag! 'CVV2', credit_card.verification_value
+        end
       end
 
       def format_exp(value)
         format(value, :two_digits)
       end
 
-      def add_addresses(xml,options)
-        if billing_address = options[:billing_address] || options[:address]
-          xml.tag! 'BillTo' do
-            xml.tag! 'Name', billing_address[:name]
-            xml.tag! 'Street1', billing_address[:address1]
-            xml.tag! 'Street2', billing_address[:address2]
-            xml.tag! 'City', billing_address[:city]
-            xml.tag! 'StateProv', billing_address[:state]
-            xml.tag! 'PostalCode', billing_address[:zip]
-            xml.tag! 'Country', billing_address[:country]
-            xml.tag! 'Company', billing_address[:company]
-            xml.tag! 'TelVoice', billing_address[:phone]
+      def add_addresses(xml, options)
+        xml.tag! 'AddressList' do
+          if billing_address = options[:billing_address] || options[:address]
+            xml.tag! 'Address' do
+              xml.tag! 'Type', 'B'
+              add_address(xml, billing_address)
+            end
           end
-        end
 
-        if shipping_address = options[:shipping_address]
-          xml.tag! 'ShipTo' do
-            xml.tag! 'Name', shipping_address[:name]
-            xml.tag! 'Street1', shipping_address[:address1]
-            xml.tag! 'Street2', shipping_address[:address2]
-            xml.tag! 'City', shipping_address[:city]
-            xml.tag! 'StateProv',shipping_address[:state]
-            xml.tag! 'PostalCode',shipping_address[:zip]
-            xml.tag! 'Country', shipping_address[:country]
-            xml.tag! 'Company', shipping_address[:company]
-            xml.tag! 'TelVoice', shipping_address[:phone]
+          if options[:shipping_address]
+            xml.tag! 'Address' do
+              xml.tag! 'Type', 'S'
+              add_address(xml, options[:shipping_address])
+            end
           end
         end
       end
 
+      def add_address(xml, address)
+        xml.tag! 'Name', address[:name]
+        address_text = address[:address1]
+        address_text << " #{address[:address2]}" if address[:address2]
+        xml.tag! 'Text', address_text
+        xml.tag! 'City', address[:city]
+        xml.tag! 'District', address[:state]
+        xml.tag! 'PostalCode', address[:zip]
+        xml.tag! 'Country', address[:country]
+        xml.tag! 'Company', address[:company]
+        xml.tag! 'PhoneNumber', address[:phone].to_s.gsub(/[^0-9]/, '') if address[:phone]
+      end
+      
+      def add_transaction_data(xml, money, options)
+        xml.tag! 'Transaction' do
+          xml.tag! 'Type', options[:gvp_order_type]
+          xml.tag! 'Amount', amount(money)
+          xml.tag! 'CurrencyCode', currency_code(options[:currency] || currency(money))
+          xml.tag! 'CardholderPresentCode', 0
+        end
+      end
+
       def currency_code(currency)
         CURRENCY_CODES[currency] || CURRENCY_CODES[default_currency]
       end
 
       def commit(money,request)
-        raw_response = ssl_post(URL,"DATA=" + request)
+        raw_response = ssl_post(URL, "data=" + request)
         response = parse(raw_response)
 
         success = success?(response)
 
         Response.new(success,
-                     success ? 'Approved' : 'Declined',
+                     success ? 'Approved' : "Declined (Reason: #{response[:reason_code]} - #{response[:error_msg]})",
                      response,
                      :test => test?,
                      :authorization => response[:order_id])
@@ -213,7 +232,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def success?(response)
-        response[:response] == "Approved"
+        response[:message] == "Approved"
       end
 
     end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: false
   segments: 
   - 1
   - 9
-  - 3
-  version: 1.9.3
+  - 4
+  version: 1.9.4
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -36,7 +36,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2011-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency