activemerchant 1.42.2 → 1.42.3

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

@@ -5,88 +5,22 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Ipay88
         class Return < ActiveMerchant::Billing::Integrations::Return
-          include ActiveMerchant::PostsData
 
-          def account
-            params["MerchantCode"]
-          end
-
-          def payment
-            params["PaymentId"].to_i
-          end
-
-          def order
-            params["RefNo"]
-          end
-
-          def amount
-            params["Amount"]
-          end
-
-          def currency
-            params["Currency"]
-          end
-
-          def remark
-            params["Remark"]
-          end
-
-          def transaction
-            params["TransId"]
-          end
-
-          def auth_code
-            params["AuthCode"]
-          end
-
-          def status
-            params["Status"]
-          end
-
-          def error
-            params["ErrDesc"]
-          end
-
-          def signature
-            params["Signature"]
-          end
-
-          def secure?
-            self.generated_signature == self.signature
+          def initialize(query_string, options = {})
+            super
+            @notification = Notification.new(query_string, options)
           end
 
           def success?
-            self.secure? && self.requery == "00" && self.status == "1"
-          end
-
-          protected
-
-          def generated_signature
-            Helper.sign(self.sig_components)
-          end
-
-          def sig_components
-            components = [@options[:credential2]]
-            [:account, :payment, :order, :amount_in_cents, :currency, :status].each do |i|
-              components << self.send(i)
-            end
-            components.join
+            params["Status"] == "1"
           end
 
-          def requery
-            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" }
+          def cancelled?
+            params["ErrDesc"] == 'Customer Cancel Transaction'
           end
 
-          private
-
-          def parameterize(params)
-            params.reject { |k, v| v.blank? }.keys.sort.collect { |key| "#{key}=#{CGI.escape(params[key].to_s)}" }.join("&")
-          end
-
-          def amount_in_cents
-            @amount_in_cents ||= (self.amount || "").gsub(/[.,]/, "")
+          def message
+            params["ErrDesc"]
           end
         end
       end

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

@@ -73,7 +73,7 @@ module ActiveMerchant #:nodoc:
             params['amount_gross']
           end
 
-          # The total in fees which was deducated from the amount.
+          # The total in fees which was deducted from the amount.
           def fee
             params['amount_fee']
           end

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

@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
             if params.has_key?(:phone)
               phone = params.delete(:phone).to_s
           
-              # Whipe all non digits
+              # Wipe all non digits
               phone.gsub!(/\D+/, '')
               
               if ['US', 'CA'].include?(country_code) && phone =~ /(\d{3})(\d{3})(\d{4})$/

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

@@ -27,15 +27,8 @@ module ActiveMerchant #:nodoc:
           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 )
+        def self.checksum(merchant_id, secret_key, payload_items )
+          Digest::SHA512.hexdigest([merchant_id, *payload_items, secret_key].join("|"))
         end
       end
     end

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

@@ -4,10 +4,13 @@ module ActiveMerchant #:nodoc:
       module PayuIn
         class Helper < ActiveMerchant::Billing::Integrations::Helper
 
+          CHECKSUM_FIELDS = [ 'txnid', 'amount', 'productinfo', 'firstname', 'email', 'udf1', 'udf2', 'udf3', 'udf4',
+                              'udf5', 'udf6', 'udf7', 'udf8', 'udf9', 'udf10']
+
           mapping :amount, 'amount'
           mapping :account, 'key'
           mapping :order, 'txnid'
-          mapping :credential2, 'productinfo'
+          mapping :description, 'productinfo'
 
           mapping :customer, :first_name => 'firstname',
             :last_name  => 'lastname',
@@ -44,26 +47,25 @@ module ActiveMerchant #:nodoc:
 
           def initialize(order, account, options = {})
             super
+            @options = options
             self.pg = 'CC'
           end
 
           def form_fields
+            sanitize_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
+          def generate_checksum
+            checksum_payload_items = CHECKSUM_FIELDS.map { |field| @fields[field] }
+
+            PayuIn.checksum(@fields["key"], @options[:credential2], checksum_payload_items )
+          end
+
+          def sanitize_fields
+            ['address1', 'address2', 'city', 'state', 'country', 'productinfo', 'email', 'phone'].each do |field|
+              @fields[field].gsub!(/[^a-zA-Z0-9\-_@\/\s.]/, '') if @fields[field]
             end
-            checksum_payload_items.push( options )
-            PayuIn.checksum(@fields["key"], @fields["productinfo"], *checksum_payload_items )
           end
 
         end

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

@@ -15,18 +15,10 @@ module ActiveMerchant #:nodoc:
           end
 
           def status
-            @status ||= if checksum_ok?
-              if transaction_id.blank?
-                'Invalid'
-              else
-                case transaction_status.downcase
-                when 'success' then 'Completed'
-                when 'failure' then 'Failed'
-                when 'pending' then 'Pending'
-                end
-              end
-            else
-              'Tampered'
+            case transaction_status.downcase
+            when 'success' then 'Completed'
+            when 'failure' then 'Failed'
+            when 'pending' then 'Pending'
             end
           end
 
@@ -36,7 +28,7 @@ module ActiveMerchant #:nodoc:
 
           # 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
+            BigDecimal.new( gross ) == order_amount && BigDecimal.new( discount.to_s ) == order_discount
           end
 
           # Status of transaction return from the PayU. List of possible values:
@@ -129,10 +121,7 @@ module ActiveMerchant #:nodoc:
           end
 
           def user_defined
-            return @user_defined if @user_defined
-            @user_defined = []
-            10.times{ |i| @user_defined.push( params[ "udf#{i+1}" ] ) }
-            @user_defined
+            @user_defined ||= 10.times.map { |i| params["udf#{i + 1}"] }
           end
 
           def checksum
@@ -148,9 +137,9 @@ module ActiveMerchant #:nodoc:
           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
+            checksum_fields = [transaction_status, *user_defined.reverse, customer_email, customer_first_name, product_info, gross, invoice]
+
+            unless Digest::SHA512.hexdigest([@secret_key, *checksum_fields, @merchant_id].join("|")) == checksum
               @message = 'Return checksum not matching the data provided'
               return false
             end

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

@@ -7,7 +7,7 @@ module ActiveMerchant
           mapping :service_provider, 'service_provider'
 
           def initialize(order, account, options = {})
-            super order, account, options
+            super
             self.service_provider = 'payu_paisa'
             self.user_defined = { :var2 => order }
           end

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

@@ -6,16 +6,6 @@ module ActiveMerchant
           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

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

@@ -5,7 +5,7 @@ module ActiveMerchant
 
         class Return < PayuIn::Return
           def initialize(query_string, options = {})
-            super query_string, options
+            super
             @notification = Notification.new(query_string, options)
           end
         end

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

@@ -56,7 +56,7 @@ module ActiveMerchant #:nodoc:
           end
 
           # Uses Pass Through Product Parameters to pass in lineitems.
-          # (must mark tanigble sales as shipped to settle the transaction)
+          # (must mark tangible sales as shipped to settle the transaction)
           def line_item(params = {})
             add_field('mode', '2CO')
             (max_existing_line_item_id = form_fields.keys.map do |key|

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

@@ -50,7 +50,7 @@ module ActiveMerchant #:nodoc:
             requires!(options, :amount, :description)
             options.assert_valid_keys([:description, :quantity, :amount, :discount])
 
-            add_field("Vara_#{id}_Verd", format_amount(options[:amount]))
+            add_field("Vara_#{id}_Verd", format_amount(options[:amount], @fields[mappings[:currency]]))
             add_field("Vara_#{id}_Fjoldi", options[:quantity] || "1")
             
             add_field("Vara_#{id}_Lysing", options[:description]) if options[:description]
@@ -76,8 +76,8 @@ module ActiveMerchant #:nodoc:
             @fields.merge('RafraenUndirskrift' => signature)
           end
           
-          def format_amount(amount)
-            amount.to_f.round
+          def format_amount(amount, currency)
+            Gateway::CURRENCIES_WITHOUT_FRACTIONS.include?(currency) ? amount.to_f.round : sprintf("%.2f", amount)
           end
         end
       end

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

@@ -36,7 +36,7 @@ module ActiveMerchant #:nodoc:
           end
           
           def gross
-            "%0.2f" % params['Upphaed'].to_s
+            "%0.2f" % params['Upphaed'].to_s.sub(',', '.')
           end
           
           def card_type
@@ -94,4 +94,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

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

@@ -40,7 +40,7 @@ module ActiveMerchant #:nodoc:
             end
           end
           
-          # Acknowldges the payment. If the authcodes match, returns true.
+          # Acknowledges the payment. If the authcodes match, returns true.
           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"]

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

@@ -7,7 +7,7 @@
  * The Plugin is provided by WDCEE free of charge for it's customers and must be used for the purpose of WDCEE's payment platform
  * integration only. It explicitly is not part of the general contract between WDCEE and it's customer. The plugin has successfully been tested
  * under specific circumstances which are defined as the shopsystem's standard configuration (vendor's delivery state). The Customer is
- * responsible for testing the plugin's functionality before putting it into production enviroment.
+ * responsible for testing the plugin's functionality before putting it into production environment.
  * The customer uses the plugin at own risk. WDCEE does not guarantee it's full functionality neither does WDCEE assume liability for any
  * disadvantage related to the use of this plugin. By installing the plugin into the shopsystem the customer agrees to the terms of use.
  * Please do not use this plugin if you do not agree to the terms of use!

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

@@ -58,7 +58,7 @@ module ActiveMerchant #:nodoc:
           end
           
           # Support for a MD5 hash of selected fields to prevent tampering
-          # For futher information read the tech note at the address below: 
+          # For further information read the tech note at the address below:
           # http://support.worldpay.com/kb/integration_guides/junior/integration/help/tech_notes/sjig_tn_009.html
           def encrypt(secret, fields = [:amount, :currency, :account, :order])
             signature_fields = fields.collect{ |field| mappings[field] }
@@ -98,4 +98,4 @@ module ActiveMerchant #:nodoc:
       end
     end
   end
-end
+end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.42.2"
+  VERSION = "1.42.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
-  version: 1.42.2
+  version: 1.42.3
 platform: ruby
 authors:
 - Tobias Luetke
@@ -38,7 +38,7 @@ cert_chain:
   U1BPVm5oYkZKM3ZTWFkxdWxQL1I2WFc5dm53CjZra1FpMmZIaFUyMHVnTXpw
   ODgxRWl4citUakMwUnZVZXJMRzdnPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
   LS0tLQo=
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -318,6 +318,7 @@ files:
 - lib/active_merchant/billing/gateways/pay_junction.rb
 - lib/active_merchant/billing/gateways/pay_secure.rb
 - lib/active_merchant/billing/gateways/paybox_direct.rb
+- lib/active_merchant/billing/gateways/payex.rb
 - lib/active_merchant/billing/gateways/payflow/payflow_common_api.rb
 - lib/active_merchant/billing/gateways/payflow/payflow_express_response.rb
 - lib/active_merchant/billing/gateways/payflow/payflow_response.rb
@@ -335,6 +336,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal_digital_goods.rb
 - lib/active_merchant/billing/gateways/paypal_express.rb
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
+- lib/active_merchant/billing/gateways/payscout.rb
 - lib/active_merchant/billing/gateways/paystation.rb
 - lib/active_merchant/billing/gateways/payway.rb
 - lib/active_merchant/billing/gateways/pin.rb
@@ -359,6 +361,7 @@ files:
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/smart_ps.rb
+- lib/active_merchant/billing/gateways/so_easy_pay.rb
 - lib/active_merchant/billing/gateways/spreedly_core.rb
 - lib/active_merchant/billing/gateways/stripe.rb
 - lib/active_merchant/billing/gateways/swipe_checkout.rb
@@ -442,6 +445,7 @@ files:
 - lib/active_merchant/billing/integrations/hi_trust/return.rb
 - lib/active_merchant/billing/integrations/hi_trust.rb
 - lib/active_merchant/billing/integrations/ipay88/helper.rb
+- lib/active_merchant/billing/integrations/ipay88/notification.rb
 - lib/active_merchant/billing/integrations/ipay88/return.rb
 - lib/active_merchant/billing/integrations/ipay88.rb
 - lib/active_merchant/billing/integrations/liqpay/helper.rb
@@ -569,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activemerchant
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Framework and tools for dealing with credit card transactions.