offsite_payments 2.7.21 → 2.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d3af9b6ea7b963a53bba9b38c1c0495aa8a676a5d15a081fff92461ea7848c
-  data.tar.gz: d68bbaabd36c6e31f4ccdd9c77245dfb8adc1596dd9e8b71ba2042f1de010760
+  metadata.gz: 7d6f15a62a3d0c2744b89d969b27b4211d3308edd81175447fd2c9609c191787
+  data.tar.gz: cb1dff98006362f1f80fb9d9957dff0e049d6a401658f4544c112f538de1c5ee
 SHA512:
-  metadata.gz: 57c6f0dda0656e8a528eec91ff862d7580c2603559011d0ee2ddc7fbb437244ef2c3ee111fcf2b7a35ca34c68235a85debc77f33477b5bdb7b07beaa3b759db6
-  data.tar.gz: 50b50027b8cd16ed325e3e12692f775d615d32f6caa187882e89dfedb10cbdc63c4170278e8ae20ddd5e5ea056c1feaa85292efe4290bb4066204d25825b68d5
+  metadata.gz: 572f3afcfb7d6d22cbf0097d778996d727091e831a534f1e1f9f6e7a2063cac9091588026ffb9430664138c906fadba86b4d52d7a6499bb7cdcc576d8ab22c3f
+  data.tar.gz: e0701df36a24581fa8530529f017e3eb550c4e76abab0ca74265637e5cf57109d6094c661f0fa7f92f29876b7388594d6ac744f980608f1193133b3bb75ac516

data/README.md

@@ -1,5 +1,5 @@
 # Offsite Payments
-[![Build Status](https://travis-ci.org/activemerchant/offsite_payments.svg?branch=master)](https://travis-ci.org/activemerchant/offsite_payments)
+[![Build Status](https://github.com/activemerchant/offsite_payments/workflows/CI/badge.svg?branch=master)](https://github.com/activemerchant/offsite_payments/actions?query=workflow%3ACI)
 [![Code Climate](https://codeclimate.com/github/activemerchant/offsite_payments/badges/gpa.svg)](https://codeclimate.com/github/activemerchant/offsite_payments)
 
 Offsite Payments is an extraction from the ecommerce system [Shopify](http://www.shopify.com). Shopify's requirements for a simple and unified API to handle dozens of different offsite payment pages (often called hosted payment pages) with very different exposed APIs was the chief principle in designing the library.
@@ -78,6 +78,7 @@ one.
 * [PayDollar](http://www.paydollar.com)
 * [Paysbuy](https://www.paysbuy.com/) - TH
 * [Platron](https://www.platron.ru/) - RU
+* [QuickPay](http://quickpay.net/dk/) - AT, DE, DK, EE, LT, LV, FO, NL, NO, SE, UK
 * [RBK Money](https://rbkmoney.ru/) - RU
 * [Robokassa](http://robokassa.ru/) - RU
 * [SagePay Form](http://www.sagepay.com/products_services/sage_pay_go/integration/form)

data/lib/offsite_payments.rb

@@ -40,5 +40,5 @@ module OffsitePayments
     self.mode == :test
   end
 
-  CURRENCIES_WITHOUT_FRACTIONS = [ 'BIF', 'BYR', 'CLP', 'CVE', 'DJF', 'GNF', 'HUF', 'ISK', 'JPY', 'KMF', 'KRW', 'PYG', 'RWF', 'TWD', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF' ]
+  CURRENCIES_WITHOUT_FRACTIONS = [ 'BIF', 'BYR', 'CLP', 'CVE', 'DJF', 'GNF', 'ISK', 'JPY', 'KMF', 'KRW', 'PYG', 'RWF', 'TWD', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF' ]
 end

data/lib/offsite_payments/integrations/a1agregator.rb

@@ -93,14 +93,6 @@ module OffsitePayments #:nodoc:
           params['type']
         end
 
-        def partner_income
-          params['partner_income']
-        end
-
-        def system_income
-          params['system_income']
-        end
-
         # Additional notification request params:
         # tid
         # name

data/lib/offsite_payments/integrations/bit_pay.rb

@@ -41,7 +41,7 @@ module OffsitePayments #:nodoc:
           add_field('fullNotifications', true)
           add_field('transactionSpeed', 'high')
           add_field('token', account)
-       end
+        end
 
         mapping :amount, 'price'
         mapping :order, 'orderID'

data/lib/offsite_payments/integrations/citrus.rb

@@ -119,7 +119,7 @@ module OffsitePayments
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(gross), currency)
+          Money.from_amount(BigDecimal(gross), currency)
         end
 
         def transaction_id
@@ -202,7 +202,7 @@ module OffsitePayments
         end
 
         def status( order_id, order_amount )
-          if @notification.invoice_ok?( order_id ) && @notification.amount_ok?( BigDecimal.new(order_amount) )
+          if @notification.invoice_ok?( order_id ) && @notification.amount_ok?(BigDecimal(order_amount))
             @notification.status
           else
             'Mismatch'

data/lib/offsite_payments/integrations/direc_pay.rb

@@ -320,7 +320,7 @@ module OffsitePayments #:nodoc:
           data = ActiveUtils::PostData.new
           data[:requestparams] = parameters.join('|')
 
-          response = ssl_get("#{url}?#{data.to_post_data}")
+          ssl_get("#{url}?#{data.to_post_data}")
         end
 
         def test?

data/lib/offsite_payments/integrations/easy_pay.rb

@@ -101,7 +101,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(gross), currency)
+          Money.from_amount(BigDecimal(gross), currency)
         end
 
         def item_id

data/lib/offsite_payments/integrations/epay.rb

@@ -125,7 +125,7 @@ module OffsitePayments #:nodoc:
           return false
         end
 
-        %w(txnid orderid currency date time hash fraud payercountry issuercountry txnfee subscriptionid paymenttype cardno).each do |attr|
+        %w(txnid orderid date time hash fraud payercountry issuercountry txnfee subscriptionid paymenttype cardno).each do |attr|
           define_method(attr) do
             params[attr]
           end
@@ -138,7 +138,7 @@ module OffsitePayments #:nodoc:
         def generate_md5string
           md5string = String.new
           for line in @raw.split('&')
-            key, value = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
+            key, _ = *line.scan( %r{^([A-Za-z0-9_.]+)\=(.*)$} ).flatten
             md5string += params[key] if key != 'hash'
           end
           return md5string + @options[:credential3]

data/lib/offsite_payments/integrations/gestpay.rb

@@ -4,7 +4,7 @@ module OffsitePayments #:nodoc:
   module Integrations #:nodoc:
     module Gestpay
       mattr_accessor :service_url
-      self.service_url = 'https://ecomm.sella.it/gestpay/pagam.asp'
+      self.service_url = 'https://ecomm.sella.it/pagam/pagam.aspx'
 
       def self.notification(post, options = {})
         Notification.new(post)
@@ -189,7 +189,7 @@ module OffsitePayments #:nodoc:
           response = ssl_get(Gestpay.service_url, decryption_query_string(shop_login, encrypted_string))
           encoded_response = parse_response(response)
           parse_delimited_string(encoded_response, DELIMITER, true)
-        rescue GestpayEncryptionResponseError => e
+        rescue GestpayEncryptionResponseError
           { 'PAY1_TRANSACTIONRESULT' => 'Error' }
         end
 

data/lib/offsite_payments/integrations/liqpay.rb

@@ -80,7 +80,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(gross), currency)
+          Money.from_amount(BigDecimal(gross), currency)
         end
 
         def item_id
@@ -156,7 +156,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          BigDecimal.new(gross)
+          BigDecimal(gross)
         end
 
         def item_id

data/lib/offsite_payments/integrations/mollie_ideal.rb

@@ -133,7 +133,7 @@ module OffsitePayments #:nodoc:
         end
 
         def gross_cents
-          (BigDecimal.new(@params['amount'], 2) * 100).to_i
+          (BigDecimal(@params['amount'], 2) * 100).to_i
         end
 
         def status

data/lib/offsite_payments/integrations/mollie_mistercash.rb

@@ -100,7 +100,7 @@ module OffsitePayments #:nodoc:
         end
 
         def gross_cents
-          (BigDecimal.new(@params['amount'], 2) * 100).to_i
+          (BigDecimal(@params['amount'], 2) * 100).to_i
         end
 
         def status

data/lib/offsite_payments/integrations/pag_seguro.rb

@@ -111,7 +111,7 @@ module OffsitePayments #:nodoc:
           check_for_errors(response, xml)
 
           extract_token(xml)
-        rescue Timeout::Error, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+        rescue Timeout::Error, Errno::ECONNRESET, Errno::ETIMEDOUT
           raise ActionViewHelperError, "Erro ao conectar-se ao PagSeguro. Por favor, tente novamente."
         end
 

data/lib/offsite_payments/integrations/paxum.rb

@@ -34,9 +34,9 @@ module OffsitePayments #:nodoc:
 
       module Common
         def generate_signature_string
-          @raw_post.slice!(0) if @raw_post.starts_with?("&")
+          @raw_post.slice!(0) if @raw_post.start_with?("&")
           @raw_post = CGI.unescape(@raw_post)
-          @raw_post = "&#{@raw_post}" unless @raw_post.starts_with?("&")
+          @raw_post = "&#{@raw_post}" unless @raw_post.start_with?("&")
           arr = @raw_post.split('&')
           arr.delete(arr.last)
           data = arr.join('&')

data/lib/offsite_payments/integrations/pay_fast.rb

@@ -212,7 +212,7 @@ module OffsitePayments #:nodoc:
 
         # The net amount credited to the receiver's account.
         def amount
-          Money.from_amount(BigDecimal.new(params['amount_net']), currency)
+          Money.from_amount(BigDecimal(params['amount_net']), currency)
         end
 
         # The name of the item being charged for.

data/lib/offsite_payments/integrations/payflow_link.rb

@@ -138,10 +138,6 @@ module OffsitePayments #:nodoc:
           nil
         end
 
-        def status
-          params['RESPMSG']
-        end
-
         # Id of this transaction (paypal number)
         def transaction_id
           params['PNREF']

data/lib/offsite_payments/integrations/paytm.rb

@@ -136,7 +136,7 @@ module OffsitePayments #:nodoc:
 
         # Order amount should be equal to gross
         def amount_ok?(order_amount)
-          BigDecimal.new(original_gross) == order_amount
+          BigDecimal(original_gross) == order_amount
         end
 
         # Status of transaction return from the Paytm. List of possible values:
@@ -245,7 +245,7 @@ module OffsitePayments #:nodoc:
         end
 
         def status(order_id, order_amount)
-          if @notification.invoice_ok?(order_id) && @notification.amount_ok?(BigDecimal.new(order_amount))
+          if @notification.invoice_ok?(order_id) && @notification.amount_ok?(BigDecimal(order_amount))
             @notification.status
           else
             'Mismatch'

data/lib/offsite_payments/integrations/payu_in.rb

@@ -116,9 +116,9 @@ module OffsitePayments #:nodoc:
         end
 
         # Order amount should be equal to gross - discount
-        def amount_ok?( order_amount, order_discount = BigDecimal.new( '0.0' ) )
+        def amount_ok?( order_amount, order_discount = BigDecimal( '0.0' ) )
           parsed_discount = discount.nil? ? 0.to_d : discount.to_d
-          BigDecimal.new( original_gross ) == order_amount && parsed_discount == order_discount
+          BigDecimal( original_gross ) == order_amount && parsed_discount == order_discount
         end
 
         # Status of transaction return from the PayU. List of possible values:
@@ -258,7 +258,7 @@ module OffsitePayments #:nodoc:
         end
 
         def status( order_id, order_amount )
-          if @notification.invoice_ok?( order_id ) && @notification.amount_ok?( BigDecimal.new(order_amount) )
+          if @notification.invoice_ok?( order_id ) && @notification.amount_ok?( BigDecimal(order_amount) )
             @notification.status
           else
             'Mismatch'

data/lib/offsite_payments/integrations/platron.rb

@@ -120,7 +120,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(params['pg_amount']), currency)
+          Money.from_amount(BigDecimal(params['pg_amount']), currency)
         end
 
         def secret

data/lib/offsite_payments/integrations/quickpay.rb

@@ -2,7 +2,7 @@ module OffsitePayments #:nodoc:
   module Integrations #:nodoc:
     module Quickpay
       mattr_accessor :service_url
-      self.service_url = 'https://secure.quickpay.dk/form/'
+      self.service_url = 'https://legacy-proxy.quickpay.net/form/'
 
       def self.notification(post, options = {})
         Notification.new(post, options)

data/lib/offsite_payments/integrations/quickpay_v10.rb

@@ -0,0 +1,173 @@
+require 'openssl'
+
+module OffsitePayments #:nodoc:
+  module Integrations #:nodoc:
+    module QuickpayV10
+      mattr_accessor :service_url
+      self.service_url = 'https://payment.quickpay.net'
+
+      def self.notification(post, options = {})
+        Notification.new(post)
+      end
+
+      def self.return(post, options = {})
+        Return.new(post, options)
+      end
+
+      # credential2: Payment window API key
+      class Helper < OffsitePayments::Helper
+        def initialize(order, account, options = {})
+          payment_window_api_key options.delete(:credential2)
+          super
+          add_field('version', 'v10')
+          add_field('type', 'payment')
+          add_field('language', 'da')
+          add_field('autocapture', 0)
+          add_field('order_id', format_order_number(order))
+        end
+
+        def payment_window_api_key(value)
+          @payment_window_api_key = value
+        end
+
+        def form_fields
+          @fields.merge('checksum' => generate_checksum)
+        end
+        
+        def flatten_params(obj, result = {}, path = [])
+          case obj
+          when Hash
+            obj.each do |k, v|
+              flatten_params(v, result, [*path, k])
+            end
+          when Array
+            obj.each_with_index do |v, i|
+              flatten_params(v, result, [*path, i])
+            end
+          else
+            result[path.map{|p| "[#{p}]"}.join.to_sym] = obj
+          end
+          result
+        end
+
+        def generate_checksum
+          flattened_params = flatten_params(@fields)
+          values = flattened_params.sort.map { |_, value| value }
+          base = values.join(' ')
+          OpenSSL::HMAC.hexdigest('sha256', @payment_window_api_key, base)
+        end
+
+        # Limited to 20 digits max
+        def format_order_number(number)
+          number.to_s.gsub(/[^\w]/, '').rjust(4, "0")[0...20]
+        end
+
+        mapping :version, 'version'
+        mapping :type, 'type'
+        mapping :account, 'merchant_id'
+        mapping :language, 'language'
+        mapping :amount, 'amount'
+        mapping :currency, 'currency'
+
+        mapping :return_url, 'continueurl'
+        mapping :cancel_return_url, 'cancelurl'
+        mapping :notify_url, 'callbackurl'
+
+        mapping :autocapture, 'autocapture'
+        mapping :autofee, 'autofee'
+
+        mapping :description, 'description'
+        mapping :payment_methods, 'payment_methods'
+        mapping :acquirer, 'acquirer'
+        mapping :branding_id, 'branding_id'
+        mapping :google_analytics_tracking_id, 'google_analytics_tracking_id'
+        mapping :google_analytics_client_id, 'google_analytics_client_id'
+        mapping :variables, 'variables'
+        mapping :text_on_statement, 'text_on_statement'
+        mapping :customer_email, 'customer_email'
+
+        mapping :splitpayment, 'splitpayment'
+        mapping :forcemobile, 'forcemobile'
+        mapping :deadline, 'deadline'
+        mapping :cardhash, 'cardhash'
+
+        mapping :invoice_address, {}
+        mapping :billing_address, {}
+      end
+      
+      # credential3: private key
+      # checksum_header: QuickPay-Checksum-Sha256 request header value
+      class Notification < OffsitePayments::Notification
+        # http://tech.quickpay.net/appendixes/errors/
+        def complete?
+          status == '20000'
+        end
+
+        def item_id
+          params['order_id']
+        end
+
+        def transaction_id
+          params['id']
+        end
+
+        def received_at
+          Time.iso8601(params['created_at'])
+        end
+
+        def gross
+          "%.2f" % (gross_cents / 100.0)
+        end
+
+        def gross_cents
+          last_operation['amount']
+        end
+        
+        def last_operation
+          params['operations'].last
+        end
+
+        def status
+          last_operation['qp_status_code'] if last_operation
+        end
+
+        # Provide access to raw fields from quickpay
+        %w(
+          accepted
+          test_mode
+          branding_id
+          variables
+          acquirer
+          operations
+          metadata
+          balance
+          currency
+        ).each do |attr|
+          define_method(attr) do
+            params[attr]
+          end
+        end
+        
+        def generate_checksum
+          OpenSSL::HMAC.hexdigest('sha256', @options[:credential3], @raw)
+        end
+        
+        def checksum_header
+          @options[:checksum_header]
+        end
+
+        # Quickpay doesn't do acknowledgements of callback notifications
+        # Instead it provides a SHA256 checksum header
+        def acknowledge(authcode = nil)
+          generate_checksum == checksum_header
+        end
+
+        # Take the posted data and move the relevant data into a hash
+        def parse(post)
+          @raw = post.to_s
+          @params = JSON.parse(post)
+        end
+      end
+    end
+  end
+end

data/lib/offsite_payments/integrations/realex_offsite.rb

@@ -141,6 +141,256 @@ module OffsitePayments #:nodoc:
           'WY' => 'Wyoming'
         }
 
+        COUNTRY_PHONE_NUMBERS = {
+          'AD' => { :code => '376', :length => [6, 7, 8, 9] },
+          'AE' => { :code => '971', :length => [7, 8, 9] },
+          'AF' => { :code => '93', :length => [8, 9] },
+          'AG' => { :code => '1', :length => [10] },
+          'AI' => { :code => '1', :length => [10] },
+          'AL' => { :code => '355', :length => [7, 8, 9] },
+          'AM' => { :code => '374', :length => [8] },
+          'AO' => { :code => '244', :length => [9] },
+          'AQ' => { :code => '672', :length => [] },
+          'AR' => { :code => '54', :length => [8, 9] },
+          'AS' => { :code => '1', :length => [10] },
+          'AT' => { :code => '43', :length => [7, 8, 9, 10, 11, 12, 13] },
+          'AU' => { :code => '61', :length => [9] },
+          'AW' => { :code => '297', :length => [7] },
+          'AX' => { :code => '358', :length => [] },
+          'AZ' => { :code => '994', :length => [8, 9] },
+          'BA' => { :code => '387', :length => [8] },
+          'BB' => { :code => '1', :length => [10] },
+          'BD' => { :code => '880', :length => [10] },
+          'BE' => { :code => '32', :length => [8, 9] },
+          'BF' => { :code => '226', :length => [8] },
+          'BG' => { :code => '359', :length => [8, 9, 10] },
+          'BH' => { :code => '973', :length => [8] },
+          'BI' => { :code => '257', :length => [8] },
+          'BJ' => { :code => '229', :length => [8] },
+          'BL' => { :code => '590', :length => [] },
+          'BM' => { :code => '1', :length => [10] },
+          'BN' => { :code => '673', :length => [7] },
+          'BO' => { :code => '591', :length => [8] },
+          'BQ' => { :code => '599', :length => [7] },
+          'BR' => { :code => '55', :length => [10, 11] },
+          'BS' => { :code => '1', :length => [10] },
+          'BT' => { :code => '975', :length => [7, 8] },
+          'BV' => { :code => '47', :length => [] },
+          'BW' => { :code => '267', :length => [7] },
+          'BY' => { :code => '375', :length => [9] },
+          'BZ' => { :code => '501', :length => [7] },
+          'CA' => { :code => '1', :length => [10] },
+          'CC' => { :code => '61', :length => [9] },
+          'CD' => { :code => '243', :length => [8] },
+          'CF' => { :code => '236', :length => [8] },
+          'CG' => { :code => '242', :length => [7] },
+          'CH' => { :code => '41', :length => [9, 10] },
+          'CI' => { :code => '225', :length => [8] },
+          'CK' => { :code => '682', :length => [5] },
+          'CL' => { :code => '56', :length => [8, 9] },
+          'CM' => { :code => '237', :length => [8] },
+          'CN' => { :code => '86', :length => [7, 8, 9, 10, 11] },
+          'CO' => { :code => '57', :length => [9, 10] },
+          'CR' => { :code => '506', :length => [8] },
+          'CU' => { :code => '53', :length => [8] },
+          'CV' => { :code => '238', :length => [7] },
+          'CW' => { :code => '599', :length => [7] },
+          'CX' => { :code => '61', :length => [] },
+          'CY' => { :code => '357', :length => [8] },
+          'CZ' => { :code => '420', :length => [9] },
+          'DE' => { :code => '49', :length => [6, 7, 8, 9, 10, 11] },
+          'DJ' => { :code => '253', :length => [6] },
+          'DK' => { :code => '45', :length => [8] },
+          'DM' => { :code => '1', :length => [10] },
+          'DO' => { :code => '1', :length => [10] },
+          'DZ' => { :code => '213', :length => [8] },
+          'EC' => { :code => '593', :length => [8, 9] },
+          'EE' => { :code => '372', :length => [7, 8] },
+          'EG' => { :code => '20', :length => [9] },
+          'EH' => { :code => '212', :length => [] },
+          'ER' => { :code => '291', :length => [7] },
+          'ES' => { :code => '34', :length => [9] },
+          'ET' => { :code => '251', :length => [9] },
+          'FI' => { :code => '358', :length => [9] },
+          'FJ' => { :code => '679', :length => [7] },
+          'FK' => { :code => '500', :length => [5] },
+          'FM' => { :code => '691', :length => [7] },
+          'FO' => { :code => '298', :length => [6] },
+          'FR' => { :code => '33', :length => [9, 10] },
+          'GA' => { :code => '241', :length => [6, 7, 8] },
+          'GB' => { :code => '44', :length => [10, 11] },
+          'GD' => { :code => '1', :length => [10] },
+          'GE' => { :code => '995', :length => [9] },
+          'GF' => { :code => '594', :length => [10] },
+          'GG' => { :code => '44', :length => [] },
+          'GH' => { :code => '233', :length => [5, 6, 7, 8] },
+          'GI' => { :code => '350', :length => [8] },
+          'GL' => { :code => '299', :length => [6] },
+          'GM' => { :code => '220', :length => [7] },
+          'GN' => { :code => '224', :length => [8] },
+          'GP' => { :code => '590', :length => [10] },
+          'GQ' => { :code => '240', :length => [6] },
+          'GR' => { :code => '30', :length => [10] },
+          'GS' => { :code => '500', :length => [] },
+          'GT' => { :code => '502', :length => [8] },
+          'GU' => { :code => '1', :length => [10] },
+          'GW' => { :code => '245', :length => [7] },
+          'GY' => { :code => '592', :length => [6, 7] },
+          'HK' => { :code => '852', :length => [8] },
+          'HN' => { :code => '504', :length => [7, 8] },
+          'HR' => { :code => '385', :length => [8] },
+          'HT' => { :code => '509', :length => [8] },
+          'HU' => { :code => '36', :length => [8, 9] },
+          'ID' => { :code => '62', :length => [8, 9, 10, 11] },
+          'IE' => { :code => '353', :length => [9] },
+          'IL' => { :code => '972', :length => [7, 8, 9] },
+          'IM' => { :code => '44', :length => [] },
+          'IN' => { :code => '91', :length => [10] },
+          'IO' => { :code => '246', :length => [] },
+          'IQ' => { :code => '964', :length => [8, 9, 10] },
+          'IR' => { :code => '98', :length => [10] },
+          'IS' => { :code => '354', :length => [7, 8, 9] },
+          'IT' => { :code => '39', :length => [9, 11] },
+          'JE' => { :code => '44', :length => [] },
+          'JM' => { :code => '1', :length => [10] },
+          'JO' => { :code => '962', :length => [8, 9] },
+          'JP' => { :code => '81', :length => [9, 10] },
+          'KE' => { :code => '254', :length => [9] },
+          'KG' => { :code => '996', :length => [9] },
+          'KH' => { :code => '855', :length => [8] },
+          'KI' => { :code => '686', :length => [5] },
+          'KM' => { :code => '269', :length => [7] },
+          'KN' => { :code => '1', :length => [10] },
+          'KP' => { :code => '850', :length => [8, 9] },
+          'KR' => { :code => '82', :length => [8, 9] },
+          'KW' => { :code => '965', :length => [7] },
+          'KY' => { :code => '1', :length => [10] },
+          'KZ' => { :code => '7', :length => [10] },
+          'LA' => { :code => '856', :length => [8] },
+          'LB' => { :code => '961', :length => [8] },
+          'LC' => { :code => '1', :length => [10] },
+          'LI' => { :code => '423', :length => [7] },
+          'LK' => { :code => '94', :length => [10] },
+          'LR' => { :code => '231', :length => [6, 7, 8] },
+          'LS' => { :code => '266', :length => [8] },
+          'LT' => { :code => '370', :length => [8] },
+          'LU' => { :code => '352', :length => [9] },
+          'LV' => { :code => '371', :length => [8] },
+          'LY' => { :code => '218', :length => [8, 9] },
+          'MA' => { :code => '212', :length => [8] },
+          'MC' => { :code => '377', :length => [8, 9] },
+          'MD' => { :code => '373', :length => [8] },
+          'ME' => { :code => '382', :length => [8] },
+          'MF' => { :code => '590', :length => [] },
+          'MG' => { :code => '261', :length => [9] },
+          'MH' => { :code => '692', :length => [7] },
+          'MK' => { :code => '389', :length => [7, 8] },
+          'ML' => { :code => '223', :length => [8] },
+          'MM' => { :code => '95', :length => [7, 8] },
+          'MN' => { :code => '976', :length => [7, 8, 9, 10] },
+          'MO' => { :code => '853', :length => [8] },
+          'MP' => { :code => '1', :length => [10] },
+          'MQ' => { :code => '596', :length => [10] },
+          'MR' => { :code => '222', :length => [7] },
+          'MS' => { :code => '1', :length => [10] },
+          'MT' => { :code => '356', :length => [8] },
+          'MU' => { :code => '230', :length => [7] },
+          'MV' => { :code => '960', :length => [7] },
+          'MW' => { :code => '265', :length => [8] },
+          'MX' => { :code => '52', :length => [8, 9, 10] },
+          'MY' => { :code => '60', :length => [9, 10] },
+          'MZ' => { :code => '258', :length => [8, 9] },
+          'NA' => { :code => '264', :length => [6, 7] },
+          'NC' => { :code => '687', :length => [6] },
+          'NE' => { :code => '227', :length => [8] },
+          'NF' => { :code => '672', :length => [6] },
+          'NG' => { :code => '234', :length => [7, 8] },
+          'NI' => { :code => '505', :length => [8] },
+          'NL' => { :code => '31', :length => [9] },
+          'NO' => { :code => '47', :length => [8] },
+          'NP' => { :code => '977', :length => [7, 8] },
+          'NR' => { :code => '674', :length => [7] },
+          'NU' => { :code => '683', :length => [4] },
+          'NZ' => { :code => '64', :length => [8, 9] },
+          'OM' => { :code => '968', :length => [8] },
+          'PA' => { :code => '507', :length => [7] },
+          'PE' => { :code => '51', :length => [8, 9] },
+          'PF' => { :code => '689', :length => [6] },
+          'PG' => { :code => '675', :length => [7] },
+          'PH' => { :code => '63', :length => [8, 9, 10] },
+          'PK' => { :code => '92', :length => [9, 10] },
+          'PL' => { :code => '48', :length => [9] },
+          'PM' => { :code => '508', :length => [6] },
+          'PN' => { :code => '64', :length => [9] },
+          'PR' => { :code => '1', :length => [10] },
+          'PS' => { :code => '970', :length => [8] },
+          'PT' => { :code => '351', :length => [9] },
+          'PW' => { :code => '680', :length => [7] },
+          'PY' => { :code => '595', :length => [9] },
+          'QA' => { :code => '974', :length => [7] },
+          'RE' => { :code => '262', :length => [10] },
+          'RO' => { :code => '40', :length => [9] },
+          'RS' => { :code => '381', :length => [9] },
+          'RU' => { :code => '7', :length => [10] },
+          'RW' => { :code => '250', :length => [8, 9] },
+          'SA' => { :code => '966', :length => [8, 9] },
+          'SB' => { :code => '677', :length => [5] },
+          'SC' => { :code => '248', :length => [6] },
+          'SD' => { :code => '249', :length => [9] },
+          'SE' => { :code => '46', :length => [9] },
+          'SG' => { :code => '65', :length => [8, 9] },
+          'SH' => { :code => '290', :length => [4] },
+          'SI' => { :code => '386', :length => [8] },
+          'SJ' => { :code => '47', :length => [8] },
+          'SK' => { :code => '421', :length => [9] },
+          'SL' => { :code => '232', :length => [8] },
+          'SM' => { :code => '378', :length => [9, 10, 11, 12] },
+          'SN' => { :code => '221', :length => [7] },
+          'SO' => { :code => '252', :length => [7, 8] },
+          'SR' => { :code => '597', :length => [6] },
+          'SS' => { :code => '211', :length => [9] },
+          'ST' => { :code => '239', :length => [6, 7] },
+          'SV' => { :code => '503', :length => [8] },
+          'SX' => { :code => '1', :length => [10] },
+          'SY' => { :code => '963', :length => [7, 8] },
+          'SZ' => { :code => '268', :length => [7] },
+          'TC' => { :code => '1', :length => [10] },
+          'TD' => { :code => '235', :length => [7] },
+          'TF' => { :code => '262', :length => [] },
+          'TG' => { :code => '228', :length => [7] },
+          'TH' => { :code => '66', :length => [9, 10] },
+          'TJ' => { :code => '992', :length => [9] },
+          'TK' => { :code => '690', :length => [4] },
+          'TL' => { :code => '670', :length => [7] },
+          'TM' => { :code => '993', :length => [8] },
+          'TN' => { :code => '216', :length => [8] },
+          'TO' => { :code => '676', :length => [5, 6, 7] },
+          'TR' => { :code => '90', :length => [10] },
+          'TT' => { :code => '1', :length => [10] },
+          'TV' => { :code => '688', :length => [5] },
+          'TW' => { :code => '886', :length => [7, 8] },
+          'TZ' => { :code => '255', :length => [9] },
+          'UA' => { :code => '380', :length => [8, 9] },
+          'UG' => { :code => '256', :length => [9] },
+          'UM' => { :code => '1', :length => [] },
+          'US' => { :code => '1', :length => [10] },
+          'UY' => { :code => '598', :length => [7, 8] },
+          'UZ' => { :code => '998', :length => [9] },
+          'VA' => { :code => '39', :length => [9] },
+          'VC' => { :code => '1', :length => [10] },
+          'VE' => { :code => '58', :length => [10] },
+          'VG' => { :code => '1', :length => [10] },
+          'VI' => { :code => '1', :length => [10] },
+          'VN' => { :code => '84', :length => [7, 8, 9, 10] },
+          'VU' => { :code => '678', :length => [5, 6, 7] },
+          'WF' => { :code => '681', :length => [6] },
+          'WS' => { :code => '685', :length => [6, 7] },
+          'YE' => { :code => '967', :length => [7, 8, 9] },
+          'YT' => { :code => '262', :length => [7] },
+          'ZA' => { :code => '27', :length => [9] },
+          'ZM' => { :code => '260', :length => [9] },
+          'ZW' => { :code => '263', :length => [8, 9, 10, 11] }       
+        }
 
         def create_signature(fields, secret)
           data = fields.join('.')
@@ -171,27 +421,70 @@ module OffsitePayments #:nodoc:
           value.scan(/\d+/).join('')
         end
 
+        # This method is used for generating the "BILLING_CODE" field,
+        # which is only needed for US, CA and GB.
+        # This field is generated by concatenating the zip field and
+        # the first line of address with a pipe(|) between them
+        # if the country is GB, we remove the non-numeric characters
         def extract_avs_code(params={})
-          [extract_digits(params[:zip]), extract_digits(params[:address1])].join('|')
+          country_code = lookup_country_code(params[:country], :alpha2)
+          return unless params[:zip] && params[:address1] && ['US', 'CA', 'GB'].include?(country_code)
+          code = [params[:zip], params[:address1]]
+          code = code.collect{|p| extract_digits(p) } if params[:country] == 'GB'
+          code = code.reject{|p| p.empty? }.join('|')
+          # Since this field accepts only a few characters, we remove the ones that are not accepted,
+          # and trim the white spaces
+          code = code.gsub(/[^a-z0-9_\-| ]+/i, '').strip
         end
 
         def extract_address_match_indicator(value)
           value ? 'TRUE' : 'FALSE'
         end
 
+        def adjust_phone_number_length(country_calling_code, phone_number)
+          country_calling_code[0...3] + '|' + phone_number[0...15]
+        end
+
         # The home phone number provided by the Cardholder. Should be In format:
         # of 'CountryCallingCode|Number' for example, '1|123456789'.
-        def format_phone_number(phone_number)
+        def format_phone_number(phone_number, country_code)
           return nil if phone_number.nil?
 
-          clean_number = phone_number.gsub(/\D/, '')
+          country_number = COUNTRY_PHONE_NUMBERS[country_code] || { :code => '0', :length => [] }
 
-          return phone_number if clean_number.length < 10
+          # Remove non-digit characters
+          processed_number = phone_number.gsub(/\D/, '')
+          return '0|0' if [[], ['0']].include? processed_number.chars.uniq
 
-          country_code = clean_number[0, clean_number.length - 9]
-          number = clean_number[clean_number.length - 9, clean_number.length]
+          # Allow Italy and Ivory Coast to have leading zero, as they use it as a part of some phone numbers
+          if ['IT', 'CI'].include?(country_code) && /\A0[1-9]\d*/.match(processed_number)
+            return adjust_phone_number_length(country_number[:code], processed_number)
+          end
 
-          "#{country_code}|#{number}"
+          return '0|0' if processed_number == country_number[:code]
+          
+          # Remove leading zero(s)
+          processed_number = processed_number.gsub(/\A0*/, '')
+
+          # Check if the potential Singapore calling code is not the local prefix
+          if country_code == 'SG' &&
+            processed_number.start_with?(country_number[:code]) &&
+            country_number[:length].include?(processed_number.length)
+          then
+            return adjust_phone_number_length(country_number[:code], processed_number)
+          end
+
+          # Remove country calling code from the processed number and try to fix trivial mistakes
+          if processed_number.start_with?(country_number[:code]) ||
+            (!(country_number[:length].include?(processed_number.length)) &&
+            country_number[:length].include?(processed_number.length - country_number[:code].length) &&
+            (country_number[:code].chars.sort == processed_number[0...country_number[:code].length].chars.sort))
+          then
+            processed_number = processed_number[country_number[:code].length..-1]
+          end
+
+          # Limit returned string to 3 characters + | + 15 characters
+          adjust_phone_number_length(country_number[:code], processed_number)
         end
 
         def lookup_state_code(country_code, state)
@@ -213,6 +506,48 @@ module OffsitePayments #:nodoc:
                    add_field("HPP_SHIPPING_#{k.split('HPP_BILLING_')[1]}", v)
                  end
         end
+
+        # Validations
+        def get_pattern(key)
+          case key
+            when 'HPP_CUSTOMER_EMAIL' then /^([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,24})*$/
+            when 'HPP_CUSTOMER_PHONENUMBER_MOBILE' then /^([0-9 +]){1,3}(\|){0,1}([0-9 +]){1,15}$/
+            when 'HPP_BILLING_STREET1', 'HPP_SHIPPING_STREET1', 'HPP_BILLING_STREET2', 'HPP_SHIPPING_STREET2' then /^[ÀÁÂÃÂÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåªæçèéêëìíîïðñòóôõöº÷ø¤ùúûüýþÿ~L~N~Z~\~^~_¥a-zA-Z0-9.'";\s,\+\-£\/@!\?%\*:$#\[\]|=\\&amp;\u0152\u0153\u017D\u0161\u017E\u0178\u20AC]{1,50}$/
+            when 'HPP_BILLING_CITY', 'HPP_SHIPPING_CITY' then /^[ÀÁÂÃÂÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåªæçèéêëìíîïðñòóôõöº÷ø¤ùúûüýþÿ~L~N~Z~\~^~_¥a-zA-Z0-9.'";\s,\+\-£\/@!\?%\*:$#\[\]|=\\&amp;\u0152\u0153\u017D\u0161\u017E\u0178\u20AC]{1,40}$/
+            when 'HPP_BILLING_COUNTRY', 'HPP_SHIPPING_COUNTRY' then /^([0-9])*$/
+            when 'HPP_BILLING_POSTALCODE', 'HPP_SHIPPING_POSTALCODE' then /^[a-zA-Z0-9\-\s]{1,16}$/
+            when 'HPP_BILLING_STATE', 'HPP_SHIPPING_STATE' then /^([A-Z])*$/
+          end
+        end
+
+        def get_message(key)
+          case key
+            when 'HPP_CUSTOMER_EMAIL' then 'Invalid E-mail address.'
+            when 'HPP_CUSTOMER_PHONENUMBER_MOBILE' then 'Invalid Telephone. The selected payment method only allows numbers, spaces or punctuation (+, |), and no more than 19 characters.'
+            when 'HPP_BILLING_STREET1', 'HPP_SHIPPING_STREET1', 'HPP_BILLING_STREET2', 'HPP_SHIPPING_STREET2' then 'Invalid Street address. The selected payment method only allows letters, numbers, spaces or punctuation, and no more than 50 characters per line.'
+            when 'HPP_BILLING_CITY', 'HPP_SHIPPING_CITY' then 'Invalid City. The selected payment method only allows letters, numbers, spaces or punctuation, and no more than 40 characters.'
+            when 'HPP_BILLING_COUNTRY', 'HPP_SHIPPING_COUNTRY' then 'Invalid Country code.'
+            when 'HPP_BILLING_POSTALCODE', 'HPP_SHIPPING_POSTALCODE' then 'Invalid Zip/Postal Code. The selected payment method only allows letters, numbers, spaces or punctuation, and no more than 16 characters.'
+            when 'HPP_BILLING_STATE', 'HPP_SHIPPING_STATE' then 'Invalid State.'
+          end
+        end
+
+        def validate(key, value)
+          pattern = get_pattern(key)
+
+          return value unless pattern.present?
+
+          if value =~pattern
+            return value
+          else
+            raise ArgumentError, get_message(key)
+          end
+        end
+
+        def add_field(name, value)
+          return if name.blank? || value.blank?
+          @fields[name.to_s] = validate(name.to_s, value.to_s)
+        end
       end
 
       class Helper < OffsitePayments::Helper
@@ -254,32 +589,63 @@ module OffsitePayments #:nodoc:
         def billing_address(params={})
           country = params[:country]
           country_code = lookup_country_code(country, :alpha2)
+          avs_code = extract_avs_code(params)
+          params[:state] = lookup_state_code(country_code, params[:state])
+
           super
 
-          add_field(mappings[:billing_address][:zip], extract_avs_code(params))
           add_field(mappings[:billing_address][:country], lookup_country_code(country))
+          add_field(mappings[:billing_address][:code], avs_code)
+
+          unless ['US', 'CA'].include?(country_code)
+            # HPP_BILLING_STATE is required only for US and CA, otherwise is deleted
+            @fields.delete_if do |k, _|
+              k == 'HPP_BILLING_STATE'
+            end
+          end
+
+          unless ['US', 'CA', 'GB'].include?(country_code)
+            # BILLING_CODE is required only for US, CA and GB, otherwise is nil,
+            # therefore the field is deleted for the other countries
+            @fields.delete_if do |k, _|
+              k == 'BILLING_CODE'
+            end
+          end
 
-          if ['US', 'CA'].include?(country_code) && params[:state].length > 2
-            add_field(mappings[:billing_address][:state], lookup_state_code(country_code, params[:state]))
+          if @fields[mappings[:customer][:phone]]
+            add_field(mappings[:customer][:phone], format_phone_number(@phone_number, country_code))
           end
         end
 
         def shipping_address(params={})
           country = params[:country]
           country_code = lookup_country_code(country, :alpha2)
+          params[:state] = lookup_state_code(country_code, params[:state])
+
           super
 
-          add_field(mappings[:shipping_address][:zip], extract_avs_code(params))
-          add_field(mappings[:shipping_address][:country], lookup_country_code(params[:country]))
+          add_field(mappings[:shipping_address][:country], lookup_country_code(country))
+          # the mapping for 'SHIPPING_CODE' field, which has the same value as the 'HPP_SHIPPING_POSTALCODE'
+          add_field(mappings[:shipping_address][:code], params[:zip])
+
+          unless ['US', 'CA'].include?(country_code)
+            # HPP_SHIPPING_STATE is required only for US and CA, otherwise is deleted
+            @fields.delete_if do |k, _|
+              k == 'HPP_SHIPPING_STATE'
+            end
+          end
 
-          if ['US', 'CA'].include?(country_code) && params[:state].length > 2
-            add_field(mappings[:shipping_address][:state], lookup_state_code(country_code, params[:state]))
+          if @fields[mappings[:customer][:phone]]&.[](0..1) == '0|'
+            add_field(mappings[:customer][:phone], format_phone_number(@phone_number, country_code))
           end
         end
 
         def customer(params={})
+          country = @fields[mappings[:billing_address][:country]]
+          @phone_number = params[:phone]
+          params[:phone] = format_phone_number(@phone_number, lookup_country_code(country, :alpha2))
+
           super
-          add_field(mappings[:customer][:phone], format_phone_number(params[:phone]))
         end
 
         def addresses_match(address_match = nil)
@@ -339,7 +705,8 @@ module OffsitePayments #:nodoc:
                                    :address2 =>   'HPP_SHIPPING_STREET2',
                                    :address3 =>   'HPP_SHIPPING_STREET3',
                                    :city =>       'HPP_SHIPPING_CITY',
-                                   :state =>      'HPP_SHIPPING_STATE'
+                                   :state =>      'HPP_SHIPPING_STATE',
+                                   :code =>       'SHIPPING_CODE'
 
         mapping :billing_address,  :zip =>        'HPP_BILLING_POSTALCODE',
                                    :country =>    'HPP_BILLING_COUNTRY',
@@ -347,7 +714,8 @@ module OffsitePayments #:nodoc:
                                    :address2 =>   'HPP_BILLING_STREET2',
                                    :address3 =>   'HPP_BILLING_STREET3',
                                    :city =>       'HPP_BILLING_CITY',
-                                   :state =>      'HPP_BILLING_STATE'
+                                   :state =>      'HPP_BILLING_STATE',
+                                   :code =>       'BILLING_CODE'
 
         mapping :addresses_match,  'HPP_ADDRESS_MATCH_INDICATOR'
         mapping :comment, 'COMMENT2'
@@ -424,10 +792,6 @@ module OffsitePayments #:nodoc:
           params['MESSAGE']
         end
 
-        def pasref
-          params['PASREF']
-        end
-
         def authcode
           params['AUTHCODE']
         end

data/lib/offsite_payments/integrations/sage_pay_form.rb

@@ -72,6 +72,7 @@ module OffsitePayments #:nodoc:
         attr_reader :identifier
 
         def initialize(order, account, options={})
+          @shipping_address_set = nil
           super
           @identifier = rand(0..99999).to_s.rjust(5, '0')
           add_field 'VendorTxCode', "#{order}-#{@identifier}"

data/lib/offsite_payments/integrations/universal.rb

@@ -22,7 +22,6 @@ module OffsitePayments #:nodoc:
           'CVE' => 0,
           'DJF' => 0,
           'GNF' => 0,
-          'HUF' => 0,
           'ISK' => 0,
           'JPY' => 0,
           'KMF' => 0,

data/lib/offsite_payments/integrations/web_pay.rb

@@ -150,7 +150,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(gross), currency)
+          Money.from_amount(BigDecimal(gross), currency)
         end
 
         def item_id

data/lib/offsite_payments/integrations/webmoney.rb

@@ -83,7 +83,7 @@ module OffsitePayments #:nodoc:
         end
 
         def amount
-          Money.from_amount(BigDecimal.new(gross), currency)
+          Money.from_amount(BigDecimal(gross), currency)
         end
 
         def key_present?

data/lib/offsite_payments/version.rb

@@ -1,3 +1,3 @@
 module OffsitePayments
-  VERSION = "2.7.21"
+  VERSION = "2.7.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offsite_payments
 version: !ruby/object:Gem::Version
-  version: 2.7.21
+  version: 2.7.28
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -257,6 +257,7 @@ files:
 - lib/offsite_payments/integrations/platron.rb
 - lib/offsite_payments/integrations/pxpay.rb
 - lib/offsite_payments/integrations/quickpay.rb
+- lib/offsite_payments/integrations/quickpay_v10.rb
 - lib/offsite_payments/integrations/rbkmoney.rb
 - lib/offsite_payments/integrations/realex_offsite.rb
 - lib/offsite_payments/integrations/robokassa.rb
@@ -275,7 +276,8 @@ files:
 homepage: https://github.com/activemerchant/offsite_payments
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: "\n    In order to use `offsite_payments` gem, you need to either
   install or add to your Gemfile\n    one of the two options for Money gem:\n      -
   `gem 'money'`\n      - `gem 'shopify-money', require: 'money'`\n\n    Regardless