yetanothernguyen-activemerchant 1.16.0 → 1.21.0

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

@@ -0,0 +1,120 @@
+require "digest/sha1"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          include RequiresParameters
+
+          # Currencies supported
+          #   MYR (Malaysian Ringgit - for all payment methods except China Union Pay and PayPal)
+          #   USD (US Dollar - only for PayPal)
+          #   CNY (Yuan Renminbi - only for China Union Pay)
+          SUPPORTED_CURRENCIES = %w[MYR USD CNY]
+
+          # Languages supported
+          #   ISO-8859-1 (English)
+          #   UTF-8      (Unicode)
+          #   GB2312     (Chinese Simplified)
+          #   GD18030    (Chinese Simplified)
+          #   BIG5       (Chinese Traditional)
+          SUPPORTED_LANGS      = %w[ISO-8859-1 UTF-8 GB2312 GD18030 BIG5]
+
+          # Payment methods supported
+          #   8  (Alliance Online Transfer)
+          #   10 (AmBank)
+          #   21 (China Union Pay)
+          #   20 (CIMB Click)
+          #   2  (Credit Card MYR)
+          #   16 (FPX)
+          #   15 (Hong Leong Bank Transfer)
+          #   6  (Maybank2u.com)
+          #   23 (MEPS Cash)
+          #   17 (Mobile Money)
+          #   33 (PayPal)
+          #   14 (RHB)
+          PAYMENT_METHODS      = %w[8 10 21 20 2 16 15 6 23 17 33 14]
+
+          attr_reader :amount_in_cents
+
+          def initialize(order, account, options = {})
+            requires!(options, :amount, :currency)
+            @amount_in_cents = options[:amount]
+            super
+            add_field mappings[:signature], signature
+          end
+
+          def amount=(money)
+            cents = money.respond_to?(:cents) ? money.cents : money
+            if money.is_a?(String) or cents.to_i < 0
+              raise ArgumentError, "money amount must be either a Money object or a positive integer in cents."
+            end
+            add_field mappings[:amount], sprintf("%.2f", cents.to_f/100)
+          end
+
+          def currency(symbol)
+            raise ArgumentError, "unsupported currency" unless SUPPORTED_CURRENCIES.include?(symbol)
+            add_field mappings[:currency], symbol
+          end
+
+          def language(lang)
+            raise ArgumentError, "unsupported language" unless SUPPORTED_LANGS.include?(lang)
+            add_field mappings[:language], lang
+          end
+
+          def payment(pay_method)
+            raise ArgumentError, "unsupported payment method" unless PAYMENT_METHODS.include?(pay_method.to_s)
+            add_field mappings[:payment], pay_method
+          end
+
+          # Generate a Base64-encoded SHA1 given a string
+          def self.sign(str)
+            [Digest::SHA1.digest(str)].pack("m").chomp
+          end
+
+          def signature
+            self.class.sign(self.sig_components)
+          end
+
+          # MerchantCode (required)
+          mapping :account,     "MerchantCode"
+          # Amount (required)
+          mapping :amount,      "Amount"
+          # Currency (required)
+          mapping :currency,    "Currency"
+          # RefNo (required)
+          mapping :order,       "RefNo"
+          # ProdDesc (required)
+          mapping :description, "ProdDesc"
+          # UserName (required)
+          # UserEmail (required)
+          # UserContact (required)
+          mapping :customer, :name  => "UserName",
+                             :email => "UserEmail",
+                             :phone => "UserContact"
+          # Remark
+          mapping :remark,      "Remark"
+          # Lang
+          mapping :language,    "Lang"
+          # PaymentId
+          mapping :payment,     "PaymentId"
+          # ResponseURL
+          mapping :return_url,  "ResponseURL"
+          # Signature
+          mapping :signature,   "Signature"
+
+          protected
+          def sig_components #:nodoc:
+            components  = [Ipay88.merchant_key]
+            components << fields[mappings[:account]]
+            components << fields[mappings[:order]]
+            components << amount_in_cents
+            components << fields[mappings[:currency]]
+            components.join
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,121 @@
+require "digest/sha1"
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        class Return < ActiveMerchant::Billing::Integrations::Return
+          include ActiveMerchant::PostsData
+
+          # Merchant Code assigned by iPay88
+          def account
+            params["MerchantCode"]
+          end
+
+          # The payment method
+          def payment
+            params["PaymentId"].to_i
+          end
+
+          # Unique merchant transaction number
+          def order
+            params["RefNo"]
+          end
+
+          # The payment with two decimals
+          def amount
+            params["Amount"]
+          end
+
+          # The currency. List of possible values:
+          # <tt>MYR</tt>::
+          # <tt>USD</tt>::
+          # <tt>CNY</tt>::
+          def currency
+            params["Currency"]
+          end
+
+          # Merchant remark
+          def remark
+            params["Remark"]
+          end
+
+          # Transaction ID from iPay88
+          def transaction
+            params["TransId"]
+          end
+
+          # Bank's approval code
+          def auth_code
+            params["AuthCode"]
+          end
+
+          # Payment status. List of possible values:
+          # <tt>1</tt>:: Success
+          # <tt>0</tt>:: Fail
+          def status
+            params["Status"]
+          end
+
+          # The error description. List of possible values:
+          # <tt>Duplicate reference number</tt>::
+          # <tt>Invalid merchant</tt>::
+          # <tt>Invalid parameters</tt>::
+          # <tt>Overlimit per transaction</tt>::
+          # <tt>Payment not allowed</tt>::
+          # <tt>Permission not allow</tt>::
+          # <tt>Signature not match</tt>::
+          # <tt>Status not approved</tt>::
+          def error
+            params["ErrDesc"]
+          end
+
+          # The hash signature
+          def signature
+            params["Signature"]
+          end
+
+          # Convenience method to check if the request is secure by
+          # checking the incoming signature against our own generated
+          # signature
+          def secure?
+            self.generated_signature == self.signature
+          end
+
+          # Was the transaction successful?
+          def success?
+            self.secure? && self.requery == "00" && self.status == "1"
+          end
+
+          protected
+          def generated_signature #:nodoc:
+            Helper.sign(self.sig_components)
+          end
+
+          def sig_components #:nodoc:
+            components = [Ipay88.merchant_key]
+            [:account, :payment, :order, :amount_in_cents, :currency, :status].each do |i|
+              components << self.send(i)
+            end
+            components.join
+          end
+
+          def requery #:nodoc:
+            data   = { "MerchantCode" => self.account, "RefNo" => self.order, "Amount" => self.amount }
+            params = parameterize(data)
+            ssl_post Ipay88.service_url, params, { "Content-Length" => params.size.to_s, "User-Agent" => "Active Merchant -- http://activemerchant.org" }
+          end
+
+          private
+          def parameterize(params) #:nodoc:
+            params.reject { |k, v| v.blank? }.keys.sort.collect { |key| "#{key}=#{CGI.escape(params[key].to_s)}" }.join("&")
+          end
+
+          def amount_in_cents #:nodoc:
+            @amount_in_cents ||= (self.amount || "").gsub(/[.,]/, "")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Ipay88
+        autoload :Return,       "active_merchant/billing/integrations/ipay88/return.rb"
+        autoload :Helper,       "active_merchant/billing/integrations/ipay88/helper.rb"
+        autoload :Notification, "active_merchant/billing/integrations/ipay88/notification.rb"
+
+        mattr_accessor :merch_key
+
+        # The merchant key provided to you by iPay88.
+        def self.merchant_key
+          self.merch_key
+        end
+
+        # Set the merchant key (in a Rails initializer, for example)
+        #
+        #   ActiveMerchant::Billing::Integrations::Ipay88.merchant_key = "foo"
+        #
+        def self.merchant_key=(key)
+          self.merch_key = key
+        end
+
+        # The requery URL upon returning from iPay88
+        def self.service_url
+          "https://www.mobile88.com/epayment/enquiry.asp"
+        end
+
+        # The URL to POST your payment form to
+        def self.entry_url
+          "https://www.mobile88.com/epayment/entry.asp"
+        end
+
+        def self.return(query_string)
+          Return.new(query_string)
+        end
+      end
+    end
+  end
+end

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

@@ -68,7 +68,7 @@ module ActiveMerchant #:nodoc:
         
        
         mattr_accessor :service_url
-        self.service_url = 'https://www.nochex.com/nochex.dll/checkout'
+        self.service_url = 'https://secure.nochex.com'
 
         mattr_accessor :notification_confirmation_url
         self.notification_confirmation_url = 'https://www.nochex.com/nochex.dll/apc/apc'

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

@@ -0,0 +1,100 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayflowLink
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          include PostsData
+
+          def initialize(order, account, options = {})
+            super
+            add_field('login', account)
+            add_field('echodata', 'True')
+            add_field('user2', self.test?)
+            add_field('invoice', order)
+            add_field('vendor', account)
+            add_field('user', options[:credential4] || account)
+            add_field('trxtype', options[:transaction_type] || 'S')
+          end
+
+          mapping :account, 'login'
+          mapping :credential2, 'pwd'
+          mapping :credential3, 'partner'
+          mapping :order, 'user1'
+          mapping :description, 'description'
+
+          mapping :amount, 'amt'
+
+
+          mapping :billing_address,  :city    => 'city',
+                                     :address => 'address',
+                                     :state   => 'state',
+                                     :zip     => 'zip',
+                                     :country => 'country',
+                                     :phone   => 'phone',
+                                     :name    => 'name'
+
+          mapping :customer, :name => 'name'
+
+          def customer(params = {})
+            add_field(mappings[:customer][:name], [params.delete(:first_name), params.delete(:last_name)].compact.join(' '))
+          end
+
+          def billing_address(params = {})
+            # Get the country code in the correct format
+            # Use what we were given if we can't find anything
+            country_code = lookup_country_code(params.delete(:country))
+            add_field(mappings[:billing_address][:country], country_code)
+
+            add_field(mappings[:billing_address][:address], [params.delete(:address1), params.delete(:address2)].compact.join(' '))
+
+            province_code = params.delete(:state)
+            add_field(mappings[:billing_address][:state], province_code.blank? ? 'N/A' : province_code.upcase)
+
+            # Everything else
+            params.each do |k, v|
+              field = mappings[:billing_address][k]
+              add_field(field, v) unless field.nil?
+            end
+          end
+
+          def form_fields
+            token, token_id = request_secure_token
+
+            {"securetoken" => token, "securetokenid" => token_id, "mode" => test? ? "test" : "live"}
+          end
+
+          private
+
+          def secure_token_id
+            @secure_token_id ||= Utils.generate_unique_id
+          end
+
+          def secure_token_url
+            test? ? "https://pilot-payflowpro.paypal.com" : "https://payflowpro.paypal.com"
+          end
+
+          def request_secure_token
+            @fields["securetokenid"] = secure_token_id
+            @fields["createsecuretoken"] = "Y"
+
+            fields = @fields.collect {|key, value| "#{key}[#{value.length}]=#{value}" }.join("&")
+
+            response = ssl_post(secure_token_url, fields)
+
+            parse_response(response)
+          end
+
+          def parse_response(response)
+            response = response.split("&").inject({}) do |hash, param|
+              key, value = param.split("=")
+              hash[key] = value
+              hash
+            end
+
+            [response['SECURETOKEN'], response['SECURETOKENID']] if response['RESPMSG'] && response['RESPMSG'].downcase == "approved"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayflowLink
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          
+          # Was the transaction complete?
+          def complete?
+            status == "Completed"
+          end
+
+          # When was this payment received by the client. 
+          # sometimes it can happen that we get the notification much later. 
+          # One possible scenario is that our web application was down. In this case paypal tries several 
+          # times an hour to inform us about the notification
+          def received_at
+            DateTime.parse(params['TRANSTIME']) if params['TRANSTIME']
+          rescue ArgumentError
+            nil
+          end
+
+          def status
+            params['RESPMSG']
+          end
+
+          # Id of this transaction (paypal number)
+          def transaction_id
+            params['PNREF']
+          end
+
+          # What type of transaction are we dealing with? 
+          def type
+            params['TYPE']
+          end
+
+          # the money amount we received in X.2 decimal.
+          def gross
+            params['AMT']
+          end
+
+          # What currency have we been dealing with
+          def currency
+            nil
+          end
+
+          def status
+            params['RESULT'] == '0' ? 'Completed' : 'Failed'
+          end
+
+          # This is the item number which we submitted to paypal 
+          def item_id
+            params['USER1']
+          end
+
+          # This is the invoice which you passed to paypal 
+          def invoice
+            params['INVNUM']
+          end   
+
+          # Was this a test transaction?
+          def test?
+            params['USER2'] == 'true'
+          end
+          
+          def account
+            params["ACCT"]
+          end
+
+          def acknowledge
+            true
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module PayflowLink
+        autoload :Helper, 'active_merchant/billing/integrations/payflow_link/helper.rb'
+        autoload :Notification, 'active_merchant/billing/integrations/payflow_link/notification.rb'
+
+        mattr_accessor :service_url
+        self.service_url = 'https://payflowlink.paypal.com'
+
+        def self.notification(post, options = {})
+          Notification.new(post)
+        end
+
+        def self.return(query_string, options = {})
+          ActiveMerchant::Billing::Integrations::Return.new(query_string)
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/sage_pay_form/encryption.rb

@@ -4,11 +4,11 @@ module ActiveMerchant #:nodoc:
       module SagePayForm
         module Encryption
           def sage_encrypt(plaintext, key)
-            ActiveSupport::Base64.encode64s(sage_encrypt_xor(plaintext, key))
+            Base64.strict_encode64(sage_encrypt_xor(plaintext, key))
           end
 
           def sage_decrypt(ciphertext, key)
-            sage_encrypt_xor(ActiveSupport::Base64.decode64(ciphertext), key)
+            sage_encrypt_xor(Base64.decode64(ciphertext), key)
           end
           
           def sage_encrypt_salt(min, max)
@@ -21,8 +21,8 @@ module ActiveMerchant #:nodoc:
           def sage_encrypt_xor(data, key)
             raise 'No key provided' if key.blank?
             
-            key *= (data.length.to_f / key.length.to_f).ceil
-            key = key[0, data.length]
+            key *= (data.bytesize.to_f / key.bytesize.to_f).ceil
+            key = key[0, data.bytesize]
 
             data.bytes.zip(key.bytes).map { |b1, b2| (b1 ^ b2).chr }.join
           end

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

@@ -41,17 +41,33 @@ module ActiveMerchant #:nodoc:
           mapping :return_url, 'SuccessURL'
           mapping :description, 'Description'
 
+          def shipping_address(params = {})
+            @shipping_address_set = true unless params.empty?
+
+            params.each do |k, v|
+              field = mappings[:shipping_address][k]
+              add_field(field, v) unless field.nil?
+            end
+          end
+
+          def map_billing_address_to_shipping_address
+            %w(City Address1 Address2 State PostCode Country).each do |field|
+              fields["Delivery#{field}"] = fields["Billing#{field}"]
+            end
+          end
+
           def form_fields
+            map_billing_address_to_shipping_address unless @shipping_address_set
+
             fields['DeliveryFirstnames'] ||= fields['BillingFirstnames']
             fields['DeliverySurname']    ||= fields['BillingSurname']
-            
+
             fields['FailureURL'] ||= fields['SuccessURL']
 
             crypt_skip = ['Vendor', 'EncryptKey', 'SendEmail']
             crypt_skip << 'BillingState'  unless fields['BillingCountry']  == 'US'
             crypt_skip << 'DeliveryState' unless fields['DeliveryCountry'] == 'US'
             crypt_skip << 'CustomerEMail' unless fields['SendEmail']
-            
             key = fields['EncryptKey']
             @crypt ||= create_crypt_field(fields.except(*crypt_skip), key)
             

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

@@ -1,4 +1,3 @@
-
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     module Integrations #:nodoc:
@@ -8,7 +7,7 @@ module ActiveMerchant #:nodoc:
         autoload 'Notification', File.dirname(__FILE__) + '/two_checkout/notification'
        
         mattr_accessor :service_url
-        self.service_url = 'https://www.2checkout.com/2co/buyer/purchase'
+        self.service_url = 'https://www.2checkout.com/checkout/purchase'
 
         def self.notification(post, options = {})
           Notification.new(post)

data/lib/active_merchant/railtie.rb

@@ -1,9 +1,9 @@
 module ActiveMerchant
-	class Railtie < Rails::Railtie
-		initializer 'activemerchant.initialize' do
-			ActiveSupport.on_load(:action_view) do
-				include ActiveMerchant::Billing::Integrations::ActionViewHelper
-			end
-		end
-	end
+  class Railtie < Rails::Railtie
+    initializer 'activemerchant.initialize' do
+      ActiveSupport.on_load(:action_view) do
+        include ActiveMerchant::Billing::Integrations::ActionViewHelper
+      end
+    end
+  end
 end

data/lib/active_merchant/railtie.rb.orig

@@ -0,0 +1,19 @@
+module ActiveMerchant
+<<<<<<< HEAD
+  class Railtie < Rails::Railtie
+    initializer 'activemerchant.initialize' do
+      ActiveSupport.on_load(:action_view) do
+        include ActiveMerchant::Billing::Integrations::ActionViewHelper
+      end
+    end
+  end
+=======
+	class Railtie < Rails::Railtie
+		initializer 'activemerchant.initialize' do
+			ActiveSupport.on_load(:action_view) do
+				include ActiveMerchant::Billing::Integrations::ActionViewHelper
+			end
+		end
+	end
+>>>>>>> Use Railtie to include view helpers in Rails 3
+end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.16.0"
+  VERSION = "1.21.0"
 end

data/lib/active_merchant.rb

@@ -20,33 +20,46 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-                    
-$:.unshift File.dirname(__FILE__)
 
 require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/conversions'
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/object/conversions'
+require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/delegating_attributes'
 require 'active_support/core_ext/module/attribute_accessors'
-require 'active_support/core_ext/kernel/requires'
-require 'active_support/base64'
-require 'active_support/secure_random'
 
+begin
+  require 'active_support/base64'
+
+  unless defined?(Base64)
+    Base64 = ActiveSupport::Base64
+  end
+
+  unless Base64.respond_to?(:strict_encode64)
+    def Base64.strict_encode64(v)
+      ActiveSupport::Base64.encode64s(v)
+    end
+  end
+rescue LoadError
+  require 'base64'
+end
+
+require 'securerandom'
 require 'builder'
 require 'cgi'
 require 'rexml/document'
 
-require 'active_merchant/common'
+require 'active_utils'
 require 'active_merchant/billing'
 require 'active_merchant/version'
 
-require 'active_merchant/railtie' if defined?(::Rails)
-
 module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:    
+  module Billing #:nodoc:
     autoload :Integrations, 'active_merchant/billing/integrations'
   end
 end
+
+require 'active_merchant/railtie' if defined?(Rails) && ActiveSupport::VERSION::MAJOR >= 3