activemerchant 1.100.0 → 1.133.0

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

@@ -10,41 +10,45 @@ module ActiveMerchant #:nodoc:
 
       self.supported_countries = ['US']
       self.default_currency = 'USD'
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       self.homepage_url = 'https://www.forte.net'
       self.display_name = 'Forte'
 
-      def initialize(options={})
+      def initialize(options = {})
         requires!(options, :api_key, :secret, :location_id, :account_id)
         super
       end
 
-      def purchase(money, payment_method, options={})
+      def purchase(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
+        add_service_fee(post, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
+        add_xdata(post, options)
         post[:action] = 'sale'
 
         commit(:post, post)
       end
 
-      def authorize(money, payment_method, options={})
+      def authorize(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
+        add_service_fee(post, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         add_shipping_address(post, options)
+        add_xdata(post, options)
         post[:action] = 'authorize'
 
         commit(:post, post)
       end
 
-      def capture(money, authorization, options={})
+      def capture(money, authorization, options = {})
         post = {}
         post[:transaction_id] = transaction_id_from(authorization)
         post[:authorization_code] = authorization_code_from(authorization) || ''
@@ -53,18 +57,18 @@ module ActiveMerchant #:nodoc:
         commit(:put, post)
       end
 
-      def credit(money, payment_method, options={})
+      def credit(money, payment_method, options = {})
         post = {}
         add_amount(post, money, options)
         add_invoice(post, options)
-        add_payment_method(post, payment_method)
+        add_payment_method(post, payment_method, options)
         add_billing_address(post, payment_method, options)
         post[:action] = 'disburse'
 
         commit(:post, post)
       end
 
-      def refund(money, authorization, options={})
+      def refund(money, authorization, options = {})
         post = {}
         add_amount(post, money, options)
         post[:original_transaction_id] = transaction_id_from(authorization)
@@ -74,7 +78,7 @@ module ActiveMerchant #:nodoc:
         commit(:post, post)
       end
 
-      def void(authorization, options={})
+      def void(authorization, options = {})
         post = {}
         post[:transaction_id] = transaction_id_from(authorization)
         post[:authorization_code] = authorization_code_from(authorization)
@@ -83,7 +87,7 @@ module ActiveMerchant #:nodoc:
         commit(:put, post)
       end
 
-      def verify(credit_card, options={})
+      def verify(credit_card, options = {})
         MultiResponse.run(:use_first_response) do |r|
           r.process { authorize(100, credit_card, options) }
           r.process(:ignore_result) { void(r.authorization, options) }
@@ -116,6 +120,20 @@ module ActiveMerchant #:nodoc:
         post[:authorization_amount] = amount(money)
       end
 
+      def add_service_fee(post, options)
+        post[:service_fee_amount] = options[:service_fee_amount] if options[:service_fee_amount]
+      end
+
+      def add_xdata(post, options)
+        post[:xdata] = {}
+        if xdata = options[:xdata]
+          (1..9).each do |n|
+            field = "xdata_#{n}".to_sym
+            post[:xdata][field] = xdata[field] if xdata[field]
+          end
+        end
+      end
+
       def add_billing_address(post, payment, options)
         post[:billing_address] = {}
         if address = options[:billing_address] || options[:address]
@@ -130,17 +148,14 @@ module ActiveMerchant #:nodoc:
           post[:billing_address][:physical_address][:locality] = address[:city] if address[:city]
         end
 
-        if empty?(post[:billing_address][:first_name]) && payment.first_name
-          post[:billing_address][:first_name] = payment.first_name
-        end
+        post[:billing_address][:first_name] = payment.first_name if empty?(post[:billing_address][:first_name]) && payment.first_name
 
-        if empty?(post[:billing_address][:last_name]) && payment.last_name
-          post[:billing_address][:last_name] = payment.last_name
-        end
+        post[:billing_address][:last_name] = payment.last_name if empty?(post[:billing_address][:last_name]) && payment.last_name
       end
 
       def add_shipping_address(post, options)
         return unless options[:shipping_address]
+
         address = options[:shipping_address]
 
         post[:shipping_address] = {}
@@ -154,21 +169,22 @@ module ActiveMerchant #:nodoc:
         post[:shipping_address][:physical_address][:locality] = address[:city] if address[:city]
       end
 
-      def add_payment_method(post, payment_method)
+      def add_payment_method(post, payment_method, options)
         if payment_method.respond_to?(:brand)
           add_credit_card(post, payment_method)
         else
-          add_echeck(post, payment_method)
+          add_echeck(post, payment_method, options)
         end
       end
 
-      def add_echeck(post, payment)
+      def add_echeck(post, payment, options)
         post[:echeck] = {}
         post[:echeck][:account_holder] = payment.name
         post[:echeck][:account_number] = payment.account_number
         post[:echeck][:routing_number] = payment.routing_number
         post[:echeck][:account_type] = payment.account_type
         post[:echeck][:check_number] = payment.number
+        post[:echeck][:sec_code] = options[:sec_code] || 'PPD'
       end
 
       def add_credit_card(post, payment)
@@ -262,7 +278,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def transaction_id_from(authorization)
-        transaction_id, _, original_auth_transaction_id, _= split_authorization(authorization)
+        transaction_id, _, original_auth_transaction_id, = split_authorization(authorization)
         original_auth_transaction_id.present? ? original_auth_transaction_id : transaction_id
       end
     end

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

@@ -5,10 +5,10 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://sanalposprovtest.garanti.com.tr/VPServlet'
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
-      self.supported_countries = ['US', 'TR']
+      self.supported_countries = %w[US TR]
 
       # The card types supported by the payment gateway
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = %i[visa master american_express discover]
 
       # The homepage URL of the gateway
       self.homepage_url = 'https://sanalposweb.garanti.com.tr'
@@ -36,17 +36,17 @@ module ActiveMerchant #:nodoc:
       end
 
       def purchase(money, credit_card, options = {})
-        options = options.merge(:gvp_order_type => 'sales')
+        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')
+        options = options.merge(gvp_order_type: 'preauth')
         commit(money, build_authorize_request(money, credit_card, options))
       end
 
       def capture(money, ref_id, options = {})
-        options = options.merge(:gvp_order_type => 'postauth')
+        options = options.merge(gvp_order_type: 'postauth')
         commit(money, build_capture_request(money, ref_id, options))
       end
 
@@ -66,8 +66,8 @@ module ActiveMerchant #:nodoc:
         card_number = credit_card.respond_to?(:number) ? credit_card.number : ''
         hash_data   = generate_hash_data(format_order_id(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 = Builder::XmlMarkup.new(indent: 2)
+        xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
 
         xml.tag! 'GVPSRequest' do
           xml.tag! 'Mode', test? ? 'TEST' : 'PROD'
@@ -104,7 +104,7 @@ module ActiveMerchant #:nodoc:
       def build_authorize_request(money, credit_card, options)
         build_xml_request(money, credit_card, options) do |xml|
           add_customer_data(xml, options)
-          add_order_data(xml, options)  do
+          add_order_data(xml, options) do
             add_addresses(xml, options)
           end
           add_credit_card(xml, credit_card)
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_capture_request(money, ref_id, options)
-        options = options.merge(:order_id => ref_id)
+        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)
@@ -137,9 +137,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'OrderID', format_order_id(options[:order_id])
           xml.tag! 'GroupID'
 
-          if block_given?
-            yield xml
-          end
+          yield xml if block_given?
         end
       end
 
@@ -224,8 +222,8 @@ module ActiveMerchant #:nodoc:
         Response.new(success,
           success ? 'Approved' : "Declined (Reason: #{response[:reason_code]} - #{response[:error_msg]} - #{response[:sys_err_msg]})",
           response,
-          :test => test?,
-          :authorization => response[:order_id])
+          test: test?,
+          authorization: response[:order_id])
       end
 
       def parse(body)
@@ -253,7 +251,6 @@ module ActiveMerchant #:nodoc:
       def strip_invalid_xml_chars(xml)
         xml.gsub(/&(?!(?:[a-z]+|#[0-9]+|x[a-zA-Z0-9]+);)/, '&')
       end
-
     end
   end
 end