activemerchant 1.32.1 → 1.33.0

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

@@ -283,14 +283,19 @@ module ActiveMerchant #:nodoc:
         void_transaction(options.merge!(:reference_number => identification))
       end
 
-      # Credit a previous transaction.
+      # Refund a previous transaction.
       #
       # Note: See run_transaction for additional options.
       #
-      def credit(money, identification, options={})
+      def refund(money, identification, options={})
         refund_transaction(options.merge!(:amount => money, :reference_number => identification))
       end
 
+      def credit(money, identification, options={})
+        deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, options)
+      end
+
       # Customer ======================================================
 
       # Add a customer.
@@ -1334,7 +1339,7 @@ module ActiveMerchant #:nodoc:
 
       def build_check_data(soap, options)
         soap.CheckData 'xsi:type' => "ns1:CheckData" do |soap|
-          build_tag soap, :string, 'Account', options[:payment_method].number
+          build_tag soap, :string, 'Account', options[:payment_method].account_number
           build_tag soap, :string, 'Routing', options[:payment_method].routing_number
           build_tag soap, :string, 'AccountType', options[:payment_method].account_type.capitalize
           CHECK_DATA_OPTIONS.each do |k,v|

data/lib/active_merchant/billing/integrations/direc_pay.rb

@@ -10,7 +10,7 @@ module ActiveMerchant #:nodoc:
         mattr_accessor :production_url, :test_url
         
         self.production_url = "https://www.timesofmoney.com/direcpay/secure/dpMerchantTransaction.jsp"
-        self.test_url       = "https://test.timesofmoney.com/direcpay/secure/dpMerchantTransaction.jsp"
+        self.test_url       = "https://test.direcpay.com/direcpay/secure/dpMerchantTransaction.jsp"
 
         def self.service_url
           mode = ActiveMerchant::Billing::Base.integration_mode

data/lib/active_merchant/billing/integrations/direc_pay/status.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
         class Status
           include PostsData
                     
-          STATUS_TEST_URL = 'https://test.timesofmoney.com/direcpay/secure/dpPullMerchAtrnDtls.jsp'
+          STATUS_TEST_URL = 'https://test.direcpay.com/direcpay/secure/dpMerchantTransaction.jsp'
           STATUS_LIVE_URL = 'https://www.timesofmoney.com/direcpay/secure/dpPullMerchAtrnDtls.jsp'
           
           attr_reader :account, :options

data/lib/active_merchant/billing/integrations/dwolla.rb

@@ -1,28 +1,21 @@
-# All mappings in helper.rb are required fields to be sent to Dwolla.
-# :account = 'Dwolla Id of merchant'
-# :credential1 = 'key from Dwolla Application'
-# :credential2 = 'secret from Dwolla Application'
-# :redirect_url = 'can be different that what is specified on Dwolla Application creation'
-# :return_url = 'can be different that what is specified on Dwolla Application creation'
-# :order_id = must be unique for each transaction
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
-      module Dwolla 
+      module Dwolla
         autoload :Return, 'active_merchant/billing/integrations/dwolla/return.rb'
         autoload :Helper, 'active_merchant/billing/integrations/dwolla/helper.rb'
         autoload :Notification, 'active_merchant/billing/integrations/dwolla/notification.rb'
-       
+        autoload :Common, 'active_merchant/billing/integrations/dwolla/common.rb'
+
         mattr_accessor :service_url
         self.service_url = 'https://www.dwolla.com/payment/pay'
 
         def self.notification(post, options={})
-          Notification.new(post)
+          Notification.new(post, options)
         end
 
         def self.return(query_string, options={})
-          Return.new(query_string)
+          Return.new(query_string, options)
         end
       end
     end

data/lib/active_merchant/billing/integrations/dwolla/common.rb

@@ -0,0 +1,21 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Dwolla
+        module Common
+          def verify_signature(checkoutId, amount, notification_signature, secret)
+            if secret.nil?
+              raise ArgumentError, "You need to provide the Application secret as the option :credential3 to verify that the notification originated from Dwolla"
+            end
+
+            expected_signature = Digest::SHA1.hexdigest(secret + ('%s&%.2f' % [checkoutId, amount]))
+
+            if notification_signature != expected_signature
+              raise StandardError, "Dwolla signature verification failed."
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/dwolla/helper.rb

@@ -1,29 +1,38 @@
+require 'digest/sha1'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Dwolla
         class Helper < ActiveMerchant::Billing::Integrations::Helper
-
           def initialize(order, account, options = {})
             super
             add_field('name', 'Store Purchase')
 
             if ActiveMerchant::Billing::Base.integration_mode == :test || options[:test]
               add_field('test', 'true')
-            end 
+            end
+
+            timestamp = Time.now.to_i.to_s
+            add_field('timestamp', timestamp)
+            add_field('allowFundingSources', 'true')
+
+            key = options[:credential2].to_s
+            secret = options[:credential3].to_s
+            orderid = order.to_s
+            signature = Digest::SHA1.hexdigest(secret + "#{key}&#{timestamp}&#{orderid}")
+            add_field('signature', signature)
           end
-          
-          # Replace with the real mapping
+
           mapping :account, 'destinationid'
           mapping :credential2, 'key'
-          mapping :credential3, 'secret'
           mapping :notify_url, 'callback'
           mapping :return_url, 'redirect'
           mapping :description, 'description'
           mapping :amount, 'amount'
           mapping :tax, 'tax'
           mapping :shipping, 'shipping'
-          mapping :order, 'orderid'          
+          mapping :order, 'orderid'
         end
       end
     end

data/lib/active_merchant/billing/integrations/dwolla/notification.rb

@@ -1,12 +1,15 @@
 require 'net/http'
+require 'digest/sha1'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
       module Dwolla
         class Notification < ActiveMerchant::Billing::Integrations::Notification
+          include Common
+
           def complete?
-            status == "Completed"
+            (status == "Completed")
           end
 
           def status
@@ -30,22 +33,24 @@ module ActiveMerchant #:nodoc:
           end
 
           def error
-            params['Message']
+            params['Error']
           end
 
-          # Was this a test transaction?
           def test?
             params['TestMode']
           end
 
-          def acknowledge      
+          def acknowledge
             true
           end
- private
-          # Take the posted data and move the relevant data into a hash
+
+          private
+
           def parse(post)
             @raw = post.to_s
             json_post = JSON.parse(post)
+            verify_signature(json_post['CheckoutId'], json_post['Amount'], json_post['Signature'], @options[:credential3])
+
             params.merge!(json_post)
           end
         end

data/lib/active_merchant/billing/integrations/dwolla/return.rb

@@ -3,9 +3,17 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Dwolla
         class Return < ActiveMerchant::Billing::Integrations::Return
+          include Common
+
+          def initialize(data, options)
+            params = parse(data)
+            verify_signature(params['checkoutId'], params['amount'], params['signature'], options[:credential3])
+
+            super
+          end
 
           def success?
-            self.error.nil? && self.callback_success?
+            (self.error.nil? && self.callback_success?)
           end
 
           def error
@@ -17,7 +25,7 @@ module ActiveMerchant #:nodoc:
           end
 
           def checkout_id
-            params['checkoutid']
+            params['checkoutId']
           end
 
           def transaction
@@ -29,9 +37,9 @@ module ActiveMerchant #:nodoc:
           end
 
           def callback_success?
-            params['postback'] != "failure"
+            (params['postback'] != "failure")
           end
-	      end
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/notification.rb

@@ -4,10 +4,15 @@ module ActiveMerchant #:nodoc:
       class Notification
         attr_accessor :params
         attr_accessor :raw
-        
-        # set this to an array in the subclass, to specify which IPs are allowed to send requests
+
+        # set this to an array in the subclass, to specify which IPs are allowed
+        # to send requests
         class_attribute :production_ips
 
+        # * *Args*    :
+        #   - +doc+ ->     raw post string
+        #   - +options+ -> custom options which individual implementations can
+        #                  utilize
         def initialize(post, options = {})
           @options = options
           empty!
@@ -27,19 +32,19 @@ module ActiveMerchant #:nodoc:
           (gross.to_f * 100.0).round
         end
 
-        # This combines the gross and currency and returns a proper Money object. 
+        # This combines the gross and currency and returns a proper Money object.
         # this requires the money library located at http://dist.leetsoft.com/api/money
         def amount
           return Money.new(gross_cents, currency) rescue ArgumentError
           return Money.new(gross_cents) # maybe you have an own money object which doesn't take a currency?
         end
 
-        # reset the notification. 
+        # reset the notification.
         def empty!
           @params  = Hash.new
-          @raw     = ""      
+          @raw     = ""
         end
-        
+
         # Check if the request comes from an official IP
         def valid_sender?(ip)
           return true if ActiveMerchant::Billing::Base.integration_mode == :test || production_ips.blank?
@@ -49,13 +54,13 @@ module ActiveMerchant #:nodoc:
         def test?
           false
         end
-        
+
         private
 
         # Take the posted data and move the relevant data into a hash
         def parse(post)
           @raw = post.to_s
-          for line in @raw.split('&')    
+          for line in @raw.split('&')
             key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
             params[key] = CGI.unescape(value)
           end

data/lib/active_merchant/billing/integrations/payflow_link/helper.rb

@@ -35,7 +35,7 @@ module ActiveMerchant #:nodoc:
           mapping :customer, { :first_name => 'first_name', :last_name => 'last_name' }
 
           def description(value)
-            add_field('description', "#{value}".delete("#"))
+            add_field('description', normalize("#{value}").delete("#"))
           end
 
           def customer(params = {})
@@ -97,6 +97,18 @@ module ActiveMerchant #:nodoc:
 
             [response['SECURETOKEN'], response['SECURETOKENID']] if response['RESPMSG'] && response['RESPMSG'].downcase == "approved"
           end
+
+          def normalize(text)
+            return unless text
+
+            if ActiveSupport::Inflector.method(:transliterate).arity == -2
+              ActiveSupport::Inflector.transliterate(text,'')
+            elsif RUBY_VERSION >= '1.9'
+              text.gsub(/[^\x00-\x7F]+/, '')
+            else
+              ActiveSupport::Inflector.transliterate(text).to_s
+            end
+          end
         end
       end
     end

data/lib/active_merchant/billing/integrations/payu_in.rb

@@ -0,0 +1,43 @@
+require 'digest/sha2'
+require 'bigdecimal'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayuIn
+        autoload :Return, 'active_merchant/billing/integrations/payu_in/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/payu_in/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/payu_in/notification.rb'
+
+        mattr_accessor :test_url
+        mattr_accessor :production_url
+
+        self.test_url = 'https://test.payu.in/_payment.php'
+        self.production_url = 'https://secure.payu.in/_payment.php'
+
+        def self.service_url
+          ActiveMerchant::Billing::Base.integration_mode == :production ? self.production_url : self.test_url
+        end
+
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end
+
+        def self.return(post, options = {})
+          Return.new(post, options)
+        end
+
+        def self.checksum(merchant_id, secret_key, *payload_items )
+          options = payload_items.pop if Hash === payload_items.last
+          options ||= {}
+          payload = if options[:reverse] then
+            payload_items.dup.push( merchant_id || "" ).unshift( secret_key || "" ).collect{ |x| x.to_s }.join("|")
+          else
+            payload_items.dup.unshift( merchant_id || "" ).push( secret_key || "" ).collect{ |x| x.to_s }.join("|")
+          end
+          Digest::SHA512.hexdigest( payload )
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/payu_in/helper.rb

@@ -0,0 +1,74 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayuIn
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+
+          mapping :amount, 'amount'
+          mapping :account, 'key'
+          mapping :order, 'txnid'
+          mapping :credential2, 'productinfo'
+
+          mapping :customer, :first_name => 'firstname',
+            :last_name  => 'lastname',
+            :email => 'email',
+            :phone => 'phone'
+
+          mapping :billing_address, :city => 'city',
+            :address1 => 'address1',
+            :address2 => 'address2',
+            :state => 'state',
+            :zip => 'zip',
+            :country => 'country'
+
+          # Which tab you want to be open default on PayU
+          # CC (CreditCard) or NB (NetBanking)
+          mapping :mode, 'pg'
+
+          mapping :notify_url, 'notify_url'
+          mapping :return_url, ['surl', 'furl']
+          mapping :cancel_return_url, 'curl'
+          mapping :checksum, 'hash'
+
+          mapping :user_defined, { :var1 => 'udf1',
+            :var2 => 'udf2',
+            :var3 => 'udf3',
+            :var4 => 'udf4',
+            :var5 => 'udf5',
+            :var6 => 'udf6',
+            :var7 => 'udf7',
+            :var8 => 'udf8',
+            :var9 => 'udf9',
+            :var10 => 'udf10'
+          }
+
+          def initialize(order, account, options = {})
+            super
+            self.pg = 'CC'
+          end
+
+          def form_fields
+            @fields.merge(mappings[:checksum] => generate_checksum)
+          end
+
+          def generate_checksum(  options = {} )
+            checksum_fields = [ :order, :amount, :credential2, { :customer => [ :first_name, :email ] },
+              { :user_defined => [ :var1, :var2, :var3, :var4, :var5, :var6, :var7, :var8, :var9, :var10 ] } ]
+            checksum_payload_items = checksum_fields.inject( [] ) do | items, field |
+              if Hash === field then
+                key = field.keys.first
+                field[key].inject( items ){ |s,x| items.push( @fields[ mappings[key][x] ] ) }
+              else
+                items.push( @fields[ mappings[field] ] )
+              end
+            end
+            checksum_payload_items.push( options )
+            PayuIn.checksum(@fields["key"], @fields["productinfo"], *checksum_payload_items )
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/payu_in/notification.rb

@@ -0,0 +1,167 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayuIn
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+
+          def initialize(post, options = {})
+            super(post, options)
+            @merchant_id = options[:credential1]
+            @secret_key = options[:credential2]
+          end
+
+          def complete?
+            status == "success"
+          end
+
+          # Status of the transaction. List of possible values:
+          # <tt>invalid</tt>:: transaction id is not present
+          # <tt>tampered</tt>:: transaction data has been tampered
+          # <tt>success</tt>:: transaction successful
+          # <tt>pending</tt>:: transaction is pending for some approval
+          # <tt>failure</tt>:: transaction failure
+          def status
+            @status ||= if checksum_ok?
+              if transaction_id.blank?
+                'invalid'
+              else
+                transaction_status.downcase
+              end
+            else
+              'tampered'
+            end
+          end
+
+          def invoice_ok?( order_id )
+            order_id.to_s == invoice.to_s
+          end
+
+          # Order amount should be equal to gross - discount
+          def amount_ok?( order_amount, order_discount = BigDecimal.new( '0.0' ) )
+            BigDecimal.new( gross ) == order_amount && BigDecimal.new( discount ) == order_discount
+          end
+
+          # Status of transaction return from the PayU. List of possible values:
+          # <tt>SUCCESS</tt>::
+          # <tt>PENDING</tt>::
+          # <tt>FAILURE</tt>::
+          def transaction_status
+            params['status']
+          end
+
+          # ID of this transaction (PayU.in number)
+          def transaction_id
+            params['mihpayid']
+          end
+
+          # Mode of Payment
+          #
+          # 'CC' for credit-card
+          # 'NB' for net-banking
+          # 'CD' for cheque or DD
+          # 'CO' for Cash Pickup
+          def type
+            params['mode']
+          end
+
+          # What currency have we been dealing with
+          def currency
+            'INR'
+          end
+
+          def item_id
+            params['txnid']
+          end
+
+          # This is the invoice which you passed to PayU.in
+          def invoice
+            params['txnid']
+          end
+
+          # Merchant Id provided by the PayU.in
+          def account
+            params['key']
+          end
+
+          # original amount send by merchant
+          def gross
+            params['amount']
+          end
+
+          # This is discount given to user - based on promotion set by merchants.
+          def discount
+            params['discount']
+          end
+
+          # Description offer for what PayU given the offer to user - based on promotion set by merchants.
+          def offer_description
+            params['offer']
+          end
+
+          # Information about the product as send by merchant
+          def product_info
+            params['productinfo']
+          end
+
+          # Email of the customer
+          def customer_email
+            params['email']
+          end
+
+          # Phone of the customer
+          def customer_phone
+            params['phone']
+          end
+
+          # Firstname of the customer
+          def customer_first_name
+            params['firstname']
+          end
+
+          # Lastname of the customer
+          def customer_last_name
+            params['lastname']
+          end
+
+          # Full address of the customer
+          def customer_address
+            { :address1 => params['address1'], :address2 => params['address2'],
+              :city => params['city'], :state => params['state'],
+              :country => params['country'], :zipcode => params['zipcode'] }
+          end
+
+          def user_defined
+            return @user_defined if @user_defined
+            @user_defined = []
+            10.times{ |i| @user_defined.push( params[ "udf#{i+1}" ] ) }
+            @user_defined
+          end
+
+          def checksum
+            params['hash']
+          end
+
+          def message
+            @message || params['error']
+          end
+
+          def acknowledge
+            checksum_ok?
+          end
+
+          def checksum_ok?
+            fields = user_defined.dup.push( customer_email, customer_first_name, product_info, gross, invoice, :reverse => true )
+            fields.unshift( transaction_status )
+            unless PayuIn.checksum(@merchant_id, @secret_key, *fields ) == checksum
+              @message = 'Return checksum not matching the data provided'
+              return false
+            end
+            true
+          end
+
+        end
+      end
+    end
+  end
+end
+