activemerchant 1.38.1 → 1.39.0

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

@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
             params['TestMode'] != "false"
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
         

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

@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge
+          def acknowledge(authcode = nil)
             payload = raw
 
             response = ssl_post(EPaymentPlans.notification_confirmation_url, payload)

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

@@ -45,7 +45,7 @@ module ActiveMerchant #:nodoc:
             @options[:credential2]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             security_key == generate_signature(:notify)
           end
 

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

@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
             end
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
           

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

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
         self.application_id = 'ActiveMerchant'
 
         def initialize(order, account, options = {})
-          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :transaction_type])
+          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name, :transaction_type, :authcode])
           @fields          = {}
           @raw_html_fields = []
           @test            = options[:test]

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

@@ -79,7 +79,7 @@ module ActiveMerchant #:nodoc:
             Base64.encode64(Digest::SHA1.digest(generate_signature_string)).strip
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             security_key == generate_signature
           end
         end

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

@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
             Base64.encode64(Digest::SHA1.digest(generate_signature_string)).gsub(/\n/, '')
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             security_key == generate_signature
           end
         end

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

@@ -29,7 +29,7 @@ module ActiveMerchant #:nodoc:
             "PAID"
           end
 
-          def acknowledge(authcode)
+          def acknowledge(authcode = nil)
             return_authcode = [params["pmt_action"], params["pmt_version"], params["pmt_id"], params["pmt_reference"], params["pmt_amount"], params["pmt_currency"], params["pmt_sellercosts"], params["pmt_paymentmethod"], params["pmt_escrow"], authcode].join("&")
             (Digest::MD5.hexdigest(return_authcode + "&").upcase == params["pmt_hash"])
           end

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

@@ -118,7 +118,7 @@ module ActiveMerchant #:nodoc:
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge
+          def acknowledge(authcode = nil)
             fields = [merchant_id, item_id, Digest::MD5.hexdigest(secret).upcase, merchant_amount, merchant_currency, status_code].join
             md5sig == Digest::MD5.hexdigest(fields).upcase
           end

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

@@ -74,7 +74,7 @@ module ActiveMerchant #:nodoc:
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge
+          def acknowledge(authcode = nil)
              payload =  raw
 
              response = ssl_post(Nochex.notification_confirmation_url, payload, 

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

@@ -23,7 +23,7 @@ module ActiveMerchant #:nodoc:
             @options[:secret]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             (security_key == generate_signature)
           end
         end

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

@@ -116,7 +116,7 @@ module ActiveMerchant #:nodoc:
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge
+          def acknowledge(authcode = nil)
             if params[PayFast.signature_parameter_name] == generate_signature(:notify)
               response = ssl_post(PayFast.validate_service_url, notify_signature_string,
                 'Content-Type' => "application/x-www-form-urlencoded",

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

@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
             params["ACCT"]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
         end

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

@@ -158,7 +158,7 @@ module ActiveMerchant #:nodoc:
           #     else
           #       ... log possible hacking attempt ...
           #     end
-          def acknowledge
+          def acknowledge(authcode = nil)
             payload =  raw
 
             response = ssl_post(Paypal.service_url + '?cmd=_notify-validate', payload,

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

@@ -5,6 +5,7 @@ module ActiveMerchant #:nodoc:
         class Notification < ActiveMerchant::Billing::Integrations::Notification
           SUCCESS = '00'
           FAIL = '99'
+          PENDING = '02'
 
           def complete?
             status == 'Completed'
@@ -15,10 +16,20 @@ module ActiveMerchant #:nodoc:
           end
 
           def status
-            params['result'][0..1] == SUCCESS ? 'Completed' : 'Failed'
+            status_code = params['result'][0..1]
+            case status_code
+            when SUCCESS
+              'Completed'
+            when FAIL
+              'Failed'
+            when PENDING
+              'Pending'
+            else
+              raise "Unknown status code"
+            end
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             true
           end
         end

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

@@ -143,7 +143,7 @@ module ActiveMerchant #:nodoc:
             @message || params['error']
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             checksum_ok?
           end
 

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

@@ -0,0 +1,19 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module PayuInPaisa
+
+        class Helper < PayuIn::Helper
+          mapping :service_provider, 'service_provider'
+
+          def initialize(order, account, options = {})
+            super order, account, options
+            self.service_provider = 'payu_paisa'
+            self.user_defined = { :var2 => order }
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module PayuInPaisa
+        class Notification < PayuIn::Notification
+          def item_id
+            params['udf2']
+          end
+
+          def checksum_ok?
+            fields = user_defined.reverse.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

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

@@ -0,0 +1,16 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module PayuInPaisa
+
+        class Return < PayuIn::Return
+          def initialize(query_string, options = {})
+            super query_string, options
+            @notification = Notification.new(query_string, options)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module ActiveMerchant
+  module Billing
+    module Integrations
+      module PayuInPaisa
+
+        autoload :Return, 'active_merchant/billing/integrations/payu_in_paisa/return.rb'
+        autoload :Helper, 'active_merchant/billing/integrations/payu_in_paisa/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/payu_in_paisa/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
+      end
+    end
+  end
+end

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

@@ -90,7 +90,7 @@ module ActiveMerchant #:nodoc:
             @options[:path]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             signature == Platron.generate_signature(params, path, secret)
           end
 

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

@@ -23,7 +23,7 @@ module ActiveMerchant #:nodoc:
           end
 
           # was the notification a validly formed request?
-          def acknowledge
+          def acknowledge(authcode = nil)
             @valid == '1'
           end
 

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
           def initialize(order, account, options = {})
             md5secret options.delete(:credential2)
             super
-            add_field('protocol', '6')
+            add_field('protocol', '7')
             add_field('msgtype', 'authorize')
             add_field('language', 'da')
             add_field('autocapture', 0)
@@ -37,10 +37,26 @@ module ActiveMerchant #:nodoc:
           end
 
           MD5_CHECK_FIELDS = [
-            :protocol, :msgtype, :merchant, :language, :ordernumber,
-            :amount, :currency, :continueurl, :cancelurl, :callbackurl,
-            :autocapture, :cardtypelock, :description, :ipaddress, :testmode,
-            :deadline, :cardhash
+            :protocol,
+            :msgtype,
+            :merchant,
+            :language,
+            :ordernumber,
+            :amount,
+            :currency,
+            :continueurl,
+            :cancelurl,
+            :callbackurl,
+            :autocapture,
+            :autofee,
+            :cardtypelock,
+            :description,
+            :group,
+            :testmode,
+            :splitpayment,
+            :forcemobile,
+            :deadline,
+            :cardhash
           ]
 
           mapping :protocol, 'protocol'
@@ -55,11 +71,17 @@ module ActiveMerchant #:nodoc:
           mapping :notify_url, 'callbackurl'
 
           mapping :autocapture, 'autocapture'
+          mapping :autofee, 'autofee'
           mapping :cardtypelock, 'cardtypelock'
 
-          mapping :description, 'description'
           mapping :ipaddress, 'ipaddress'
+
+          mapping :description, 'description'
+          mapping :group, 'group'
           mapping :testmode, 'testmode'
+
+          mapping :splitpayment, 'splitpayment'
+          mapping :forcemobile, 'forcemobile'
           mapping :deadline, 'deadline'
           mapping :cardhash, 'cardhash'
 

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

@@ -101,7 +101,7 @@ module ActiveMerchant #:nodoc:
 
           # Quickpay doesn't do acknowledgements of callback notifications
           # Instead it uses and MD5 hash of all parameters
-          def acknowledge
+          def acknowledge(authcode = nil)
             generate_md5check == params['md5check']
           end
 

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

@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
           alias_method :gross, :recipient_amount
           alias_method :currency, :recipient_currency
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             string = [
               eshop_id,
               order_id,

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

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
             [gross, item_id]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             security_key == generate_signature
           end
 

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

@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
           end
 
           # Checks against MD5 Hash
-          def acknowledge
+          def acknowledge(authcode = nil)
             return false if security_key.blank?
 
             Digest::MD5.hexdigest("#{secret}#{params['sid']}#{transaction_id}#{gross}").upcase == security_key.upcase

data/lib/active_merchant/billing/integrations/valitor/response_fields.rb

@@ -87,7 +87,7 @@ module ActiveMerchant #:nodoc:
             @options[:credential2]
           end
           
-          def acknowledge
+          def acknowledge(authcode = nil)
             password ? Digest::MD5.hexdigest("#{password}#{order}") == params['RafraenUndirskriftSvar'] : true
           end
         end

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

@@ -41,7 +41,7 @@ module ActiveMerchant #:nodoc:
           end
           
           # Acknowldges the payment. If the authcodes match, returns true.
-          def acknowledge(authcode)
+          def acknowledge(authcode = nil)
             return_authcode = [params["ORDER_NUMBER"], params["TIMESTAMP"], params["PAID"], params["METHOD"], authcode].join("|")
             Digest::MD5.hexdigest(return_authcode).upcase == params["RETURN_AUTHCODE"]
           end

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

@@ -37,7 +37,7 @@ module ActiveMerchant #:nodoc:
             @options[:secret]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             (security_key == generate_signature(:notify))
           end
 

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

@@ -33,7 +33,7 @@ module ActiveMerchant #:nodoc:
             @options[:secret]
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             (security_key == generate_signature)
           end
 

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

@@ -106,7 +106,7 @@ module ActiveMerchant #:nodoc:
             return avs_value_to_symbol(params['AVS'][3].chr)
           end
 
-          def acknowledge
+          def acknowledge(authcode = nil)
             return true
           end
           

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.38.1"
+  VERSION = "1.39.0"
 end

data/lib/support/gateway_support.rb

@@ -5,14 +5,14 @@ require 'active_merchant'
 
 class GatewaySupport #:nodoc:
   ACTIONS = [:purchase, :authorize, :capture, :void, :credit, :recurring]
-  
+
   include ActiveMerchant::Billing
 
   attr_reader :gateways
-  
+
   def initialize
     Dir[File.expand_path(File.dirname(__FILE__) + '/../active_merchant/billing/gateways/*.rb')].each do |f|
-      filename = File.basename(f, '.rb') 
+      filename = File.basename(f, '.rb')
       gateway_name = filename + '_gateway'
       begin
         gateway_class = ('ActiveMerchant::Billing::' + gateway_name.camelize).constantize
@@ -23,18 +23,18 @@ class GatewaySupport #:nodoc:
     @gateways = Gateway.implementations.sort_by(&:name)
     @gateways.delete(ActiveMerchant::Billing::BogusGateway)
   end
-  
+
   def each_gateway
     @gateways.each{|g| yield g }
   end
-  
+
   def features
     width = 15
-    
+
     print "Name".center(width + 20)
     ACTIONS.each{|f| print "#{f.to_s.capitalize.center(width)}" }
     puts
-    
+
     each_gateway do |g|
       print "#{g.display_name.ljust(width + 20)}"
       ACTIONS.each do |f|
@@ -43,19 +43,25 @@ class GatewaySupport #:nodoc:
       puts
     end
   end
-  
+
   def to_rdoc
     each_gateway do |g|
       puts "* {#{g.display_name}}[#{g.homepage_url}] - #{g.supported_countries.join(', ')}"
     end
   end
-  
+
   def to_textile
     each_gateway do |g|
       puts %/ * "#{g.display_name}":#{g.homepage_url} [#{g.supported_countries.join(', ')}]/
     end
   end
-  
+
+  def to_markdown
+    each_gateway do |g|
+      puts %/* [#{g.display_name}](#{g.homepage_url}) - #{g.supported_countries.join(', ')}/
+    end
+  end
+
   def to_s
     each_gateway do |g|
       puts "#{g.display_name} - #{g.homepage_url} [#{g.supported_countries.join(', ')}]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.38.1
+  version: 1.39.0
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,6 +139,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,6 +150,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +263,7 @@ files:
 - lib/active_merchant/billing/gateways/banwire.rb
 - lib/active_merchant/billing/gateways/barclays_epdq.rb
 - lib/active_merchant/billing/gateways/barclays_epdq_extra_plus.rb
+- lib/active_merchant/billing/gateways/be2bill.rb
 - lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb
 - lib/active_merchant/billing/gateways/beanstream.rb
 - lib/active_merchant/billing/gateways/beanstream_interac.rb
@@ -313,6 +320,7 @@ files:
 - lib/active_merchant/billing/gateways/modern_payments_cim.rb
 - lib/active_merchant/billing/gateways/moneris.rb
 - lib/active_merchant/billing/gateways/moneris_us.rb
+- lib/active_merchant/billing/gateways/money_movers.rb
 - lib/active_merchant/billing/gateways/nab_transact.rb
 - lib/active_merchant/billing/gateways/net_registry.rb
 - lib/active_merchant/billing/gateways/netaxept.rb
@@ -393,6 +401,9 @@ files:
 - lib/active_merchant/billing/integrations/authorize_net_sim/helper.rb
 - lib/active_merchant/billing/integrations/authorize_net_sim/notification.rb
 - lib/active_merchant/billing/integrations/authorize_net_sim.rb
+- lib/active_merchant/billing/integrations/bit_pay/helper.rb
+- lib/active_merchant/billing/integrations/bit_pay/notification.rb
+- lib/active_merchant/billing/integrations/bit_pay.rb
 - lib/active_merchant/billing/integrations/bogus/helper.rb
 - lib/active_merchant/billing/integrations/bogus/notification.rb
 - lib/active_merchant/billing/integrations/bogus/return.rb
@@ -401,6 +412,10 @@ files:
 - lib/active_merchant/billing/integrations/chronopay/notification.rb
 - lib/active_merchant/billing/integrations/chronopay/return.rb
 - lib/active_merchant/billing/integrations/chronopay.rb
+- lib/active_merchant/billing/integrations/citrus/helper.rb
+- lib/active_merchant/billing/integrations/citrus/notification.rb
+- lib/active_merchant/billing/integrations/citrus/return.rb
+- lib/active_merchant/billing/integrations/citrus.rb
 - lib/active_merchant/billing/integrations/direc_pay/helper.rb
 - lib/active_merchant/billing/integrations/direc_pay/notification.rb
 - lib/active_merchant/billing/integrations/direc_pay/return.rb
@@ -485,6 +500,10 @@ files:
 - lib/active_merchant/billing/integrations/payu_in/notification.rb
 - lib/active_merchant/billing/integrations/payu_in/return.rb
 - lib/active_merchant/billing/integrations/payu_in.rb
+- lib/active_merchant/billing/integrations/payu_in_paisa/helper.rb
+- lib/active_merchant/billing/integrations/payu_in_paisa/notification.rb
+- lib/active_merchant/billing/integrations/payu_in_paisa/return.rb
+- lib/active_merchant/billing/integrations/payu_in_paisa.rb
 - lib/active_merchant/billing/integrations/platron/helper.rb
 - lib/active_merchant/billing/integrations/platron/notification.rb
 - lib/active_merchant/billing/integrations/platron.rb
@@ -542,7 +561,8 @@ files:
 - lib/support/outbound_hosts.rb
 - lib/support/ssl_verify.rb
 homepage: http://activemerchant.org/
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

metadata.gz.sig

@@ -1 +1,2 @@
-A��Pa�|����7�N[�+x2��L����0C�I��`k��(.(�M��MUX1l@d�Ǟ$���,��k����N)��A$&�{��!�[��Й�]|Z���h<v��~j�C�vyʹC�;ʪ��ӷ��jd�ǽ%U�f2(̧�L����:�pKgzҥ?J��`�����\]u���6R��v3B����
-�wXL:��3n������EY��!�}����Nm.Ȉ.�Q�,_{Ϗ�4�o	RẾO��u;s���3jΥ!&ӌG���
+/u�N�qy�?u-��A/�@;������.�+���P��7��o�`��5�T�N\�СN^�
g�|,����Rl�%cN�/;J+�={�l�c䘭+~[�<$��?��
$��� L�
+�h��m��b1B� =	�YqC��˯l�+\|��4iV���@���̢�c�!