six_saferpay 2.1.0 → 2.4.0

data/lib/six_saferpay/api/six_transaction/requests/authorize_referenced.rb

@@ -6,6 +6,7 @@ module SixSaferpay
                     :terminal_id,
                     :payment,
                     :transaction_reference,
+                    :authentication,
                     :suppress_dcc
                    )
 
@@ -14,12 +15,14 @@ module SixSaferpay
                      terminal_id: nil,
                      payment:,
                      transaction_reference:,
+                     authentication: nil,
                      suppress_dcc:
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
         @terminal_id = terminal_id || SixSaferpay.config.terminal_id
         @payment = SixSaferpay::Payment.new(payment.to_h) if payment
         @transaction_reference = SixSaferpay::TransactionReference.new(transaction_reference.to_h) if transaction_reference
+        @authentication = SixSaferpay::Authentication.new(authentication.to_h) if authentication
         @suppress_dcc = suppress_dcc
       end
 
@@ -29,6 +32,7 @@ module SixSaferpay
         hash.merge!(terminal_id: @terminal_id) if @terminal_id
         hash.merge!(payment: @payment.to_h) if @payment
         hash.merge!(transaction_reference: @transaction_reference.to_h) if @transaction_reference
+        hash.merge!(authentication: @authentication.to_h) if @authentication
         hash.merge!(suppress_dcc: @suppress_dcc) if !@suppress_dcc.nil?
         hash
       end

data/lib/six_saferpay/api/six_transaction/requests/capture.rb

@@ -7,7 +7,8 @@ module SixSaferpay
                     :amount,
                     :billpay,
                     :pending_notification,
-                    :marketplace
+                    :marketplace,
+                    :mastercard_issuer_installments
                    )
 
 
@@ -16,7 +17,8 @@ module SixSaferpay
                      amount: nil,
                      billpay: nil,
                      pending_notification: nil,
-                     marketplace: nil
+                     marketplace: nil,
+                    mastercard_issuer_installments: nil
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
         @transaction_reference = SixSaferpay::TransactionReference.new(transaction_reference.to_h) if transaction_reference
@@ -24,6 +26,10 @@ module SixSaferpay
         @billpay = SixSaferpay::Billpay.new(billpay.to_h) if billpay
         @pending_notification = SixSaferpay::PendingNotification.new(pending_notification.to_h) if pending_notification
         @marketplace = SixSaferpay::Marketplace.new(marketplace.to_h) if marketplace
+        if mastercard_issuer_installments
+          @mastercard_issuer_installments = SixSaferpay::MastercardIssuerInstallments
+            .new(mastercard_issuer_installments.to_h)
+        end
       end
 
       def to_hash
@@ -34,6 +40,9 @@ module SixSaferpay
         hash.merge!(billpay: @billpay.to_h) if @billpay
         hash.merge!(pending_notification: @pending_notification.to_h) if @pending_notification
         hash.merge!(marketplace: @marketplace.to_h) if @marketplace
+        if @mastercard_issuer_installments
+          hash.merge!(mastercard_issuer_installments: mastercard_issuer_installments.to_h)
+        end
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/api/six_transaction/requests/initialize.rb

@@ -8,6 +8,7 @@ module SixSaferpay
         :terminal_id,
         :payment,
         :payment_means,
+        :authentication,
         :payer,
         :return_urls,
         :styling,
@@ -22,6 +23,7 @@ module SixSaferpay
                      terminal_id: nil,
                      payment:,
                      payment_means: nil,
+                     authentication: nil,
                      payer: nil,
                      return_urls: nil,
                      styling: nil,
@@ -34,6 +36,7 @@ module SixSaferpay
         @terminal_id = terminal_id || SixSaferpay.config.terminal_id
         @payment = SixSaferpay::Payment.new(payment.to_h) if payment
         @payment_means = SixSaferpay::RequestPaymentMeans.new(payment_means.to_h) if payment_means
+        @authentication = SixSaferpay::Authentication.new(authentication.to_h) if authentication
         @payer = SixSaferpay::Payer.new(payer.to_h) if payer
         @return_urls = return_urls || SixSaferpay::ReturnUrls.new()
         @styling = SixSaferpay::Styling.new(styling.to_h) if styling
@@ -49,6 +52,7 @@ module SixSaferpay
         hash.merge!(terminal_id: @terminal_id) if @terminal_id
         hash.merge!(payment: @payment.to_h) if @payment
         hash.merge!(payment_means: @payment_means.to_h) if @payment_means
+        hash.merge!(authentication: @authentication.to_h) if @authentication
         hash.merge!(payer: @payer.to_h) if @payer
         hash.merge!(return_urls: @return_urls.to_h ) if @return_urls
         hash.merge!(styling: @styling.to_h) if @styling

data/lib/six_saferpay/api/six_transaction/responses/authorize_direct_response.rb

@@ -6,7 +6,8 @@ module SixSaferpay
                     :transaction,
                     :payment_means,
                     :payer,
-                    :registration_result
+                    :registration_result,
+                    :mastercard_issuer_installments
                    )
 
 
@@ -14,13 +15,18 @@ module SixSaferpay
                      transaction:,
                      payment_means:,
                      payer: nil,
-                     registration_result: nil
+                     registration_result: nil,
+                     mastercard_issuer_installments: nil
                     )
         @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
         @transaction = SixSaferpay::Transaction.new(transaction.to_h) if transaction
         @payment_means = SixSaferpay::ResponsePaymentMeans.new(payment_means.to_h) if payment_means
         @payer = SixSaferpay::Payer.new(payer.to_h) if payer
         @registration_result = SixSaferpay::RegistrationResult.new(registration_result.to_h) if registration_result
+        if mastercard_issuer_installments
+          @mastercard_issuer_installments = SixSaferpay::MastercardIssuerInstallments
+            .new(mastercard_issuer_installments.to_h)
+        end
       end
 
       def to_hash
@@ -30,6 +36,9 @@ module SixSaferpay
         hash.merge!(payment_means: @payment_means.to_h) if @payment_means
         hash.merge!(payer: @payer.to_h) if @payer
         hash.merge!(registration_result: @registration_result.to_h) if @registration_result
+        if @mastercard_issuer_installments
+          hash.merge!(mastercard_issuer_installments: mastercard_issuer_installments.to_h)
+        end
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/api/six_transaction/responses/authorize_response.rb

@@ -8,7 +8,8 @@ module SixSaferpay
                     :payer,
                     :registration_result,
                     :liability,
-                    :dcc
+                    :dcc,
+                    :mastercard_issuer_installments
                    )
 
 
@@ -18,8 +19,8 @@ module SixSaferpay
                      payer: nil,
                      registration_result: nil,
                      liability: nil,
-                     dcc: nil
-
+                     dcc: nil,
+                     mastercard_issuer_installments: nil
                     )
         @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
         @transaction = SixSaferpay::Transaction.new(transaction.to_h) if transaction
@@ -28,6 +29,10 @@ module SixSaferpay
         @registration_result = SixSaferpay::RegistrationResult.new(registration_result.to_h) if registration_result
         @liability = SixSaferpay::Liability.new(liability.to_h) if liability
         @dcc = SixSaferpay::Dcc.new(dcc.to_h) if dcc
+        if mastercard_issuer_installments
+          @mastercard_issuer_installments = SixSaferpay::MastercardIssuerInstallments
+            .new(mastercard_issuer_installments.to_h)
+        end
       end
 
       def to_hash
@@ -39,6 +44,9 @@ module SixSaferpay
         hash.merge!(registration_result: @registration_result.to_h) if @registration_result
         hash.merge!(liability: @liability.to_h) if @liability
         hash.merge!(dcc: @dcc.to_h) if @dcc
+        if @mastercard_issuer_installments
+          hash.merge!(mastercard_issuer_installments: mastercard_issuer_installments.to_h)
+        end
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/client.rb

@@ -17,17 +17,23 @@ module SixSaferpay
       hash = @response.body
       hash = JSON.parse(hash, symbolize_names: true)
       hash = transform_response_hash(hash)
-      if @response.code == "200"
+      if @response.code == '200'
         @object.response_class.new(hash)
       else
         raise SixSaferpay::Error.new(hash)
       end
     end
 
+    protected
+
+    def header
+      {"Content-Type" => 'application/json'}
+    end
+
     private
 
     def request
-      request = Net::HTTP::Post.new(uri.path, {'Content-Type' => 'application/json'})
+      request = Net::HTTP::Post.new(uri.path, header)
       hash = @object.to_h
       hash = transform_request_hash(hash)
       hash = hash.to_json

data/lib/six_saferpay/clients/secure_pay_gate_api/client.rb

@@ -0,0 +1,23 @@
+module SixSaferpay
+  module SecurePayGateApi
+    class Client < SixSaferpay::Client
+
+      protected
+
+      def header
+        super.merge!(
+          {
+            'Saferpay-ApiVersion' => SixSaferpay::API::VERSION,
+            'Saferpay-RequestId' => request_id()
+          }
+        )
+      end
+
+      private
+
+      def request_id
+        @request_id ||= SecureRandom.uuid
+      end
+    end
+  end
+end

data/lib/six_saferpay/models/address.rb

@@ -8,7 +8,7 @@ module SixSaferpay
                   :gender,
                   :legal_form,
                   :street,
-                  :street_2,
+                  :street2,
                   :zip,
                   :city,
                   :country_subdevision_code,
@@ -25,7 +25,7 @@ module SixSaferpay
                   gender: nil,
                   legal_form: nil,
                   street: nil,
-                  street_2: nil,
+                  street2: nil,
                   zip: nil,
                   city: nil,
                   country_subdevision_code: nil,
@@ -40,7 +40,7 @@ module SixSaferpay
       @gender = gender
       @legal_form = legal_form
       @street = street
-      @street_2 = street_2
+      @street2 = street2
       @zip = zip
       @city = city
       @country_subdevision_code = country_subdevision_code
@@ -58,7 +58,7 @@ module SixSaferpay
       hash.merge!(gender: @gender) if @gender
       hash.merge!(legal_form: @legal_form) if @legal_form
       hash.merge!(street: @street) if @street
-      hash.merge!(street_2: @street_2) if @street_2.present?
+      hash.merge!(street2: @street2) if @street2.present?
       hash.merge!(zip: @zip) if @zip
       hash.merge!(city: @city) if @city
       hash.merge!(country_subdevision_code: @country_subdevision_code) if @country_subdevision_code

data/lib/six_saferpay/models/authentication.rb

@@ -0,0 +1,36 @@
+module SixSaferpay
+  class Authentication
+
+    attr_accessor(
+      :result,
+      :message,
+      :xid,
+      :exemption,
+      :three_ds_challenge
+    )
+
+    def initialize(result: nil, # ATTENTION: This is in some case mandatory
+                   message: nil, # ATTENTION: This is in some case mandatory
+                   xid: nil,
+                   exemption: nil,
+                   three_ds_challenge: nil)
+      @result = result
+      @message = message
+      @xid = xid
+      @exemption = exemption
+      @three_ds_challenge = three_ds_challenge
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(result: @result) if @result
+      hash.merge!(message: @message) if @message
+      hash.merge!(xid: @xid) if @xid
+      hash.merge!(exemption: @exemption) if @exemption
+      hash.merge!(three_ds_challenge: @three_ds_challenge) if @three_ds_challenge
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/authentication_result.rb

@@ -0,0 +1,20 @@
+module SixSaferpay
+  class AuthenticationResult
+
+    attr_accessor :result, :message
+
+    def initialize(result:, message:)
+      @result = result
+      @message = message
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(result: @result)
+      hash.merge!(message: @message)
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/check_result.rb

@@ -2,19 +2,23 @@ module SixSaferpay
   class CheckResult
 
     attr_accessor(:result,
-                  :message
+                  :message,
+                  :authentication
                  )
 
     def initialize(result:,
-                   message: )
+                   message: ,
+                  authentication: nil)
       @result = result
       @message = message
+      @authentication = authentication
     end
 
     def to_hash
       hash = Hash.new
       hash.merge!(result: @result) if @result
       hash.merge!(message: @message) if @message
+      hash.merge!(authentication: @authentication.to_h) if @authentication
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/models/chosen_plan.rb

@@ -0,0 +1,62 @@
+module SixSaferpay
+  class ChosenPlan
+
+    attr_accessor(
+      :minimum_number_of_installments,
+      :maximum_number_of_installments,
+      :interest_rate,
+      :installment_fee,
+      :annual_percentage_rate,
+      :total_amount_due,
+    )
+
+    def initialize(
+      minimum_number_of_installments: ,
+      maximum_number_of_installments: ,
+      interest_rate: nil,
+      installment_fee: nil,
+      annual_percentage_rate: nil,
+      total_amount_due: nil
+    )
+      @minimum_number_of_installments =
+        minimum_number_of_installments
+      @maximum_number_of_installments =
+        maximum_number_of_installments
+      @interest_rate = interest_rate
+      if installment_fee
+        @installment_fee = SixSaferpay::InstallmentFee
+          .new(installment_fee.to_h)
+      end
+      if annual_percentage_rate
+        @annual_percentage_rate = annual_percentage_rate
+      end
+      if total_amount_due
+        @total_amount_due = SixSaferpay::TotalAmountDue
+          .new(total_amount_due.to_h)
+      end
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(minimum_number_of_installments:
+                  @minimum_number_of_installments)
+      hash.merge!(maximum_number_of_installments:
+                  @maximum_number_of_installments)
+      if @interest_rate
+        hash.merge!(interest_rate: @interest_rate)
+      end
+      if @installment_fee
+        hash.merge!(installment_fee: @installment_fee.to_h)
+      end
+      if @annual_percentage_rate
+        hash.merge!(annual_percentage_rate: @annual_percentage_rate)
+      end
+      if @total_amount_due
+        hash.merge!(total_amount_due: @total_amount_due.to_h)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/custom_plan.rb

@@ -0,0 +1,4 @@
+module SixSaferpay
+  class CustomPlan < ChosenPlan
+  end
+end

data/lib/six_saferpay/models/first_installment_amount.rb

@@ -0,0 +1,4 @@
+module SixSaferpay
+  class FirstInstallmentAmount < Amount
+  end
+end

data/lib/six_saferpay/models/ideal.rb

@@ -0,0 +1,18 @@
+module SixSaferpay
+  class Ideal
+
+    attr_accessor(:issuer_id)
+
+    def initialize(issuer_id:)
+      @issuer_id = issuer_id
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(issuer_id: @issuer_id) if @issuer_id
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end