activemerchant 1.43.3 → 1.44.0

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

@@ -107,7 +107,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def parse(body)
-        Hash[body.split('&').map{|x| x.split('=').map{|x| CGI.unescape(x)}}]
+        Hash[body.split('&').map{|x| x.split('=').map{|y| CGI.unescape(y)}}]
       end
 
       def commit(action, money, parameters)
@@ -199,14 +199,7 @@ module ActiveMerchant #:nodoc:
         else
           post['UserName']
         end
-        Digest::HMAC.hexdigest(string, @options[:secret], Digest::SHA1)
-      end
-
-      def expdate(creditcard)
-        year  = sprintf("%.4i", creditcard.year)
-        month = sprintf("%.2i", creditcard.month)
-
-        "#{month}#{year[-2..-1]}"
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new(@options[:secret]), @options[:secret], string)
       end
     end
   end

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

@@ -0,0 +1,122 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    class PagoFacilGateway < Gateway
+      self.test_url = 'https://www.pagofacil.net/st/public/Wsrtransaccion/index/format/json?'
+      self.live_url = 'https://www.pagofacil.net/ws/public/Wsrtransaccion/index/format/json?'
+
+      self.supported_countries = ['MX']
+      self.default_currency = 'MXN'
+      self.supported_cardtypes = [:visa, :master, :american_express, :jcb]
+
+      self.homepage_url = 'http://www.pagofacil.net/'
+      self.display_name = 'PagoFacil'
+
+      def initialize(options={})
+        requires!(options, :branch_id, :merchant_id, :service_id)
+        super
+      end
+
+      def purchase(money, credit_card, options={})
+        post = {}
+        add_invoice(post, money, options)
+        add_payment(post, credit_card)
+        add_address(post, options)
+        add_customer_data(post, options)
+        add_merchant_data(post)
+
+        commit(post)
+      end
+
+      private
+
+      def add_customer_data(post, options)
+        post[:email] = options[:email]
+        post[:celular] = options[:cellphone]
+      end
+
+      def add_address(post, options)
+        address = options.fetch(:billing_address, {})
+        post[:calleyNumero] = address[:address1]
+        post[:colonia] = address[:address2]
+        post[:municipio] = address[:city]
+        post[:estado] = address[:state]
+        post[:pais] = address[:country]
+        post[:telefono] = address[:phone]
+        post[:cp] = address[:zip]
+      end
+
+      def add_invoice(post, money, options)
+        post[:monto] = amount(money)
+        post[:idPedido] = options[:order_id]
+        add_currency(post, money, options)
+      end
+
+      def add_currency(post, money, options)
+        currency = options.fetch(:currency, currency(money))
+        unless currency == self.class.default_currency
+          post[:divisa] = currency
+        end
+      end
+
+      def add_payment(post, credit_card)
+        post[:nombre] = credit_card.first_name
+        post[:apellidos] = credit_card.last_name
+        post[:numeroTarjeta] = credit_card.number
+        post[:cvt] = credit_card.verification_value
+        post[:mesExpiracion] = sprintf("%02d", credit_card.month)
+        post[:anyoExpiracion] = credit_card.year.to_s.slice(-2, 2)
+      end
+
+      def add_merchant_data(post)
+        post[:idSucursal] = options.fetch(:branch_id)
+        post[:idUsuario] = options.fetch(:merchant_id)
+        post[:idServicio] = options.fetch(:service_id)
+      end
+
+      def parse(body)
+        JSON.parse(body)["WebServices_Transacciones"]["transaccion"]
+      rescue JSON::ParserError
+        json_error(body)
+      end
+
+      def commit(parameters)
+        url = (test? ? test_url : live_url)
+        response = parse(ssl_post(url, post_data(parameters)))
+        Response.new(
+          success_from(response),
+          message_from(response),
+          response,
+          authorization: authorization_from(response),
+          test: test?
+        )
+      end
+
+      def success_from(response)
+        response["autorizado"] == "1" ||
+          response["autorizado"] == true
+      end
+
+      def message_from(response)
+        response["texto"]
+      end
+
+      def authorization_from(response)
+        response["autorizacion"]
+      end
+
+      def post_data(parameters = {})
+        {
+          method: 'transaccion',
+          data: parameters
+        }.to_query
+      end
+
+      def json_error(response)
+        {
+          "texto" => 'Invalid response received from the PagoFacil API.',
+          "raw_response" => response
+        }
+      end
+    end
+  end
+end

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

@@ -211,7 +211,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
@@ -239,6 +239,8 @@ module ActiveMerchant #:nodoc:
       # YYYYMMDD format and can be used to specify when the first charge will be made.
       # If omitted the first charge will be immediate.
       def recurring(money, payment_source, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         requires!(options, [:periodicity, :monthly, :weekly, :daily], :payments)
 
         periodic_type = case options[:periodicity]
@@ -379,18 +381,6 @@ module ActiveMerchant #:nodoc:
         end
         response
       end
-
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
-        end
-      end
-
     end
   end
 end

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

@@ -64,13 +64,6 @@ module ActiveMerchant #:nodoc:
         post[:cvv2]     = credit_card.verification_value
       end
 
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
       def commit(action, money, parameters)
         response = parse( ssl_post(self.live_url, post_data(action, parameters)) )
 

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

@@ -97,7 +97,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -183,14 +183,6 @@ module ActiveMerchant #:nodoc:
 
         "0000000000#{randkey}"[-10..-1]
       end
-
-      def expdate(credit_card)
-        year  = sprintf("%.4i", credit_card.year)
-        month = sprintf("%.2i", credit_card.month)
-
-        "#{month}#{year[-2..-1]}"
-      end
-
     end
   end
 end

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

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       self.test_url = 'https://test-external.payex.com/'
 
       self.money_format = :cents
-      self.supported_countries = ['SE', 'NO', 'DK']
+      self.supported_countries = ['DK', 'FI', 'NO', 'SE']
       self.supported_cardtypes = [:visa, :master, :american_express, :discover]
       self.homepage_url = 'http://payex.com/'
       self.display_name = 'Payex'

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

@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
 
       def credit(money, funding_source, options = {})
         if funding_source.is_a?(String)
-          deprecated CREDIT_DEPRECATION_MESSAGE
+          ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
           # Perform referenced credit
           refund(money, funding_source, options)
         elsif card_brand(funding_source) == 'check'
@@ -57,6 +57,8 @@ module ActiveMerchant #:nodoc:
       # * <tt>payments</tt> - The term, or number of payments that will be made
       # * <tt>comment</tt> - A comment associated with the profile
       def recurring(money, credit_card, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         options[:name] = credit_card.name if options[:name].blank? && credit_card
         request = build_recurring_request(options[:profile_id] ? :modify : :add, money, options) do |xml|
           add_credit_card(xml, credit_card) if credit_card
@@ -65,11 +67,15 @@ module ActiveMerchant #:nodoc:
       end
 
       def cancel_recurring(profile_id)
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         request = build_recurring_request(:cancel, 0, :profile_id => profile_id)
         commit(request, options.merge(:request_type => :recurring))
       end
 
       def recurring_inquiry(profile_id, options = {})
+        ActiveMerchant.deprecated RECURRING_DEPRECATION_MESSAGE
+
         request = build_recurring_request(:inquiry, nil, options.update( :profile_id => profile_id ))
         commit(request, options.merge(:request_type => :recurring))
       end

data/lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb

@@ -85,7 +85,7 @@ module ActiveMerchant #:nodoc:
             else
               xml.tag! 'Transactions' do
                 xml.tag! 'Transaction', 'CustRef' => options[:customer] do
-                  xml.tag! 'Verbosity', 'MEDIUM'
+                  xml.tag! 'Verbosity', @options[:verbosity] || 'MEDIUM'
                   xml << body
                 end
               end
@@ -184,24 +184,24 @@ module ActiveMerchant #:nodoc:
         {
           "Content-Type" => "text/xml",
           "Content-Length" => content_length.to_s,
-      	  "X-VPS-Client-Timeout" => timeout.to_s,
-      	  "X-VPS-VIT-Integration-Product" => "ActiveMerchant",
-      	  "X-VPS-VIT-Runtime-Version" => RUBY_VERSION,
-      	  "X-VPS-Request-ID" => Utils.generate_unique_id
-    	  }
-    	end
-
-    	def commit(request_body, options  = {})
+          "X-VPS-Client-Timeout" => timeout.to_s,
+          "X-VPS-VIT-Integration-Product" => "ActiveMerchant",
+          "X-VPS-VIT-Runtime-Version" => RUBY_VERSION,
+          "X-VPS-Request-ID" => SecureRandom.hex(16)
+        }
+      end
+
+      def commit(request_body, options  = {})
         request = build_request(request_body, options)
         headers = build_headers(request.size)
 
-    	  response = parse(ssl_post(test? ? self.test_url : self.live_url, request, headers))
+        response = parse(ssl_post(test? ? self.test_url : self.live_url, request, headers))
 
-    	  build_response(response[:result] == "0", response[:message], response,
-    	    :test => test?,
-    	    :authorization => response[:pn_ref] || response[:rp_ref],
-    	    :cvv_result => CVV_CODE[response[:cv_result]],
-    	    :avs_result => { :code => response[:avs_result] }
+        build_response(response[:result] == "0", response[:message], response,
+          :test => test?,
+          :authorization => response[:pn_ref] || response[:rp_ref],
+          :cvv_result => CVV_CODE[response[:cv_result]],
+          :avs_result => { :code => response[:avs_result] }
         )
       end
     end

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

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
       # <em>You will need to call Payflow Support at 1-888-883-9770, choose option #2.  Request that they update your account in "Pandora" under Product Settings >> PayPal Mark and update the Features Bitmap to 1111111111111112.  This is 15 ones and a two.</em>
       #
       # See here[https://www.x.com/message/206214#206214] for the forum discussion (requires login to {x.com}[https://x.com]
-      #     
+      #
       # [<tt>:items</tt>] (opt) Array of Order Line Items hashes. These are shown to the buyer after redirect to PayPal.
       #
       #
@@ -64,7 +64,7 @@ module ActiveMerchant #:nodoc:
     class PayflowExpressGateway < Gateway
       include PayflowCommonAPI
       include PaypalExpressCommon
-      
+
       self.test_redirect_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr'
       self.homepage_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=xpt/merchant/ExpressCheckoutIntro-outside'
       self.display_name = 'PayPal Express Checkout'
@@ -74,48 +74,48 @@ module ActiveMerchant #:nodoc:
         request = build_sale_or_authorization_request('Authorization', money, options)
         commit(request, options)
       end
-      
-      def purchase(money, options = {})        
+
+      def purchase(money, options = {})
         requires!(options, :token, :payer_id)
         request = build_sale_or_authorization_request('Sale', money, options)
         commit(request, options)
       end
-      
+
       def refund(money, identification, options = {})
         request = build_reference_request(:credit, money, identification, options)
         commit(request, options)
-      end        
+      end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
       def setup_authorization(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         request = build_setup_express_sale_or_authorization_request('Authorization', money, options)
         commit(request, options)
       end
-      
+
       def setup_purchase(money, options = {})
         requires!(options, :return_url, :cancel_return_url)
-        
+
         request = build_setup_express_sale_or_authorization_request('Sale', money, options)
         commit(request, options)
       end
-      
+
       def details_for(token)
         request = build_get_express_details_request(token)
         commit(request, options)
       end
-      
+
       private
       def build_get_express_details_request(token)
-        xml = Builder::XmlMarkup.new :indent => 2  
+        xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'GetExpressCheckout' do
           xml.tag! 'Authorization' do
-            xml.tag! 'PayData' do  
+            xml.tag! 'PayData' do
               xml.tag! 'Tender' do
                 xml.tag! 'PayPal' do
                   xml.tag! 'Token', token
@@ -136,8 +136,8 @@ module ActiveMerchant #:nodoc:
         end
         xml.target!
       end
-      
-      def build_sale_or_authorization_request(action, money, options) 
+
+      def build_sale_or_authorization_request(action, money, options)
         xml = Builder::XmlMarkup.new :indent => 2
         xml.tag! 'DoExpressCheckout' do
           xml.tag! action do
@@ -201,8 +201,8 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'Token', options[:token] unless options[:token].blank?
           xml.tag! 'NoShipping', options[:no_shipping] ? '1' : '0'
           xml.tag! 'AddressOverride', options[:address_override] ? '1' : '0'
-          xml.tag! 'ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank? 
-          
+          xml.tag! 'ButtonSource', application_id.to_s.slice(0,32) unless application_id.blank?
+
           # Customization of the payment page
           xml.tag! 'PageStyle', options[:page_style] unless options[:page_style].blank?
           xml.tag! 'HeaderImage', options[:header_image] unless options[:header_image].blank?
@@ -214,7 +214,7 @@ module ActiveMerchant #:nodoc:
           xml.tag! 'ExtData', 'Name' => 'ALLOWNOTE', 'Value' => options[:allow_note]
         end
       end
-      
+
       def build_response(success, message, response, options = {})
         PayflowExpressResponse.new(success, message, response, options)
       end

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

@@ -82,7 +82,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
                                     GI GR HR HU IE IL IM IS IT LI LT LU LV MC MT
                                     NL NO PL PT RO SE SI SK TR VA)
 
-      self.supported_cardtypes = [:visa, :master]
+      self.supported_cardtypes = [:visa, :master, :american_express, :diners_club, :discover, :union_pay, :jcb]
       self.homepage_url = 'https://paymill.com'
       self.display_name = 'PAYMILL'
       self.money_format = :cents
@@ -30,6 +30,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         post[:preauthorization] = preauth(authorization)
         post[:description] = options[:description]
+        post[:source] = 'active_merchant'
         commit(:post, 'transactions', post)
       end
 
@@ -116,6 +117,7 @@ module ActiveMerchant #:nodoc:
         add_amount(post, money, options)
         post[:token] = card_token
         post[:description] = options[:description]
+        post[:source] = 'active_merchant'
         commit(:post, 'transactions', post)
       end
 
@@ -124,6 +126,8 @@ module ActiveMerchant #:nodoc:
 
         add_amount(post, money, options)
         post[:token] = card_token
+        post[:description] = options[:description]
+        post[:source] = 'active_merchant'
         commit(:post, 'preauthorizations', post)
       end
 
@@ -232,6 +236,8 @@ module ActiveMerchant #:nodoc:
 
 
       class ResponseParser
+        attr_reader :raw_response, :parsed, :succeeded, :message, :options
+
         def initialize(raw_response="", options={})
           @raw_response = raw_response
           @options = options
@@ -249,7 +255,6 @@ module ActiveMerchant #:nodoc:
         end
 
         private
-        attr_reader :raw_response, :parsed, :succeeded, :message, :options
 
         def parse_response
           @parsed = JSON.parse(raw_response.sub(/jsonPFunction\(/, '').sub(/\)\z/, ''))