six_saferpay 0.1.10 → 1.0.0

data/lib/six_saferpay/models/error.rb

@@ -0,0 +1,28 @@
+module SixSaferpay
+  class RegistrationError
+
+    attr_accessor(:success,
+                  :fd_alias,
+                  :error
+                 )
+
+
+    def initialize(success:,
+                   fd_alias: nil,
+                   error: nil)
+
+      binding.pry
+      @success = success
+      @fd_alias = SixSaferpay::RegistrationAlias.new(fd_alias.to_h) if fd_alias
+      @error = SixSaferpay::RegistrationError.new(error.to_h) if error
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(sucess: @sucess) if @success
+      hash.merge!(fd_alias: @fd_alias.to_h) if @fd_alias
+      hash.merge!(error: @error.to_h) if @error
+    end
+
+  end
+end

data/lib/six_saferpay/models/fee_refund.rb

@@ -1,4 +1,4 @@
 module SixSaferpay
-  class SixRefund < SixSaferpay::Amount
+  class SixSaferpay::FeeRefund < SixSaferpay::Amount
   end
 end

data/lib/six_saferpay/models/fraud_free.rb

@@ -4,29 +4,29 @@ module SixSaferpay
     attr_accessor(:id,
                   :liability_shift,
                   :score,
-                  :investigationpoints,
+                  :investigation_points,
                   :error_message
                  )
 
     def initialize(id: ,
                    liability_shift: ,
                    score: ,
-                   investigationpoints: nil,
+                   investigation_points: nil,
                    error_message: nil
                   )
       @id = id
       @liability_shift = liability_shift
       @score = score
-      @investigationpoints = investigationpoints
+      @investigation_points = investigation_points
       @error_message = error_message
     end
 
     def to_hash
       hash = Hash.new
       hash.merge!(id: @id) if @id
-      hash.merge!(liability_shift: @liability_shift) if @liability_shift
+      hash.merge!(liability_shift: @liability_shift) if !@liability_shift.nil?
       hash.merge!(score: @score) if @score
-      hash.merge!(investigationpoints: @investigationpoints) if @investigationpoints
+      hash.merge!(investigation_points: @investigation_points) if @investigation_points
       hash.merge!(error_message: @error_message) if @error_message
       hash
     end

data/lib/six_saferpay/models/installment.rb

@@ -9,7 +9,7 @@ module SixSaferpay
 
     def to_hash
       hash = Hash.new
-      hash.merge!(initial: @initial)
+      hash.merge!(initial: @initial) if !@initial.nil?
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/models/invoice.rb

@@ -10,11 +10,11 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(payee: @payee.to_h) if @payee
-      body.merge!(reason_for_transfer: @reason_for_transfer) if @reason_for_transfer
-      body.merge!(due_date: @due_date) if @due_date
-      body
+      hash = Hash.new
+      hash.merge!(payee: @payee.to_h) if @payee
+      hash.merge!(reason_for_transfer: @reason_for_transfer) if @reason_for_transfer
+      hash.merge!(due_date: @due_date) if @due_date
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/liability.rb

@@ -19,12 +19,12 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(liability_shift: @liability_shift)
-      body.merge!(liable_entity: @liable_entity)
-      body.merge!(three_ds: @three_ds.to_h) if @three_ds
-      body.merge!(fraud_free: @fraud_free.to_h) if @fraud_free
-      body
+      hash = Hash.new
+      hash.merge!(liability_shift: @liability_shift)
+      hash.merge!(liable_entity: @liable_entity)
+      hash.merge!(three_ds: @three_ds.to_h) if @three_ds
+      hash.merge!(fraud_free: @fraud_free.to_h) if @fraud_free
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/options.rb

@@ -9,7 +9,7 @@ module SixSaferpay
 
     def to_hash
       hash = Hash.new
-      hash.merge!(pre_auth: @pre_auth) if @pre_auth
+      hash.merge!(pre_auth: @pre_auth) if !@pre_auth.nil?
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/models/payee.rb

@@ -1,23 +1,4 @@
 module SixSaferpay
-  class Payee
-
-    attr_accessor(:iban, :holder_name, :bic, :bank_name)
-
-    def initialize(iban:, holder_name: nil, bic: nil, bank_name: nil)
-      @iban = iban
-      @holder_name = holder_name
-      @bic = bic
-      @bank_name = bank_name
-    end
-
-    def to_hash
-      body = Hash.new
-      body.merge!(IBAN: @iban)
-      body.merge!(holder_name: @holder_name) if @holder_name
-      body.merge!(BIC: @bic) if @bic
-      body.merge!(bank_name: @bank_name) if @bank_name
-      body
-    end
-    alias_method :to_h, :to_hash
+  class Payee < SixSaferpay::BankAccount
   end
 end

data/lib/six_saferpay/models/payment.rb

@@ -24,7 +24,7 @@ module SixSaferpay
       @payer_note = payer_note
       @mandate_id = mandate_id
       @options = SixSaferpay::Options.new(options.to_h) if options
-      @recurring = SixSaferpay.new(recurring.to_h) if recurring
+      @recurring = SixSaferpay::Recurring.new(recurring.to_h) if recurring
       @installment = SixSaferpay::Installment.new(installment.to_h) if installment
     end
 

data/lib/six_saferpay/models/{alias.rb → payment_means_alias.rb}

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class PaymentMeans
+  class PaymentMeansAlias
 
     attr_accessor(:id,
                   :verification_code
@@ -13,10 +13,10 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(Id: @id)
-      body.merge!(VerificationCode: @verification_code) if @verification_code
-      body
+      hash = Hash.new
+      hash.merge!(id: @id) if @id
+      hash.merge!(verification_code: @verification_code) if @verification_code
+      hash
     end
     alias_method :to_h, :to_hash
   end

data/lib/six_saferpay/models/payment_methods_options.rb

@@ -4,7 +4,7 @@ module SixSaferpay
     attr_accessor(:alipay)
 
     def initialize(alipay: nil)
-      @alipay = SixSaferpay::Alias.new(alipay.to_h) if alipay
+      @alipay = SixSaferpay::Alipay.new(alipay.to_h) if alipay
     end
 
     def to_hash

data/lib/six_saferpay/models/redirect.rb

@@ -0,0 +1,22 @@
+module SixSaferpay
+  class Redirect
+    attr_accessor(:redirect_url,
+                  :payment_means_required
+                 )
+
+    def initialize(redirect_url:,
+                   payment_means_required: )
+      @redirect_url = redirect_url
+      @payment_means_required = payment_means_required
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(redirect_url: @redirect_url) if @redirect_url
+      hash.merge!(payment_means_required: @payment_means_required) if !@payment_means_required.nil?
+      hash
+    end
+    alias_method :to_h, :to_hash
+  end
+
+end

data/lib/six_saferpay/models/register_alias.rb

@@ -1,6 +1,5 @@
 module SixSaferpay
   class RegisterAlias
-
     attr_accessor(:id_generator, :id, :lifetime)
 
     def initialize(id_generator:, id: nil, lifetime: nil)
@@ -11,7 +10,7 @@ module SixSaferpay
 
     def to_hash
       hash = Hash.new
-      hash.merge!(id_generator: @id_generator)
+      hash.merge!(id_generator: @id_generator) if @id_generator
       hash.merge!(id: @id) if @id
       hash.merge!(lifetime: @lifetime) if @lifetime
       hash
@@ -20,4 +19,3 @@ module SixSaferpay
 
   end
 end
-

data/lib/six_saferpay/models/registration_alias.rb

@@ -0,0 +1,23 @@
+module SixSaferpay
+  class RegistrationAlias
+
+    attr_accessor(:id,
+                  :lifetime
+                 )
+
+    def initialize(id:,
+                   lifetime: nil
+                  )
+      @id = id
+      @lifetime = lifetime
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(id: @id) if @id
+      hash.merge!(lifetime: @lifetime) if @lifetime
+      hash
+    end
+    alias_method :to_h, :to_hash
+  end
+end

data/lib/six_saferpay/models/registration_error.rb

@@ -0,0 +1,25 @@
+module SixSaferpay
+  class RegistrationError
+
+    attr_accessor(:error_name,
+                  :error_message
+                 )
+
+
+    def initialize(error_name: nil,
+                   error_message: nil)
+
+      @error_name = error_name
+      @error_message = error_message
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(error_name: @error_name) if @error_name
+      hash.merge!(error_message: @error_message) if @error_message
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/registration_result.rb

@@ -2,26 +2,28 @@ module SixSaferpay
   class RegistrationResult
 
     attr_accessor(:success,
-                  :alias,
+                  :fd_alias,
                   :error
                  )
 
 
     def initialize(success:,
-                   alias: nil,
+                   fd_alias: nil,
                    error: nil)
 
       @success = success
-      @alias = SixSaferpay::Alias.new(__alias__.to_h) if __alias__
-      @error = SixSaferpay::Error.new(error.to_h) if error
+      @fd_alias = SixSaferpay::RegistrationAlias.new(fd_alias.to_h) if fd_alias
+      @error = SixSaferpay::RegistrationError.new(error.to_h) if error
     end
 
     def to_hash
       hash = Hash.new
-      hash.merge!(sucess: @sucess) if @success
-      hash.merge!(alias: @alias.to_h) if @alias
+      hash.merge!(success: @success) if !@success.nil?
+      hash.merge!(fd_alias: @fd_alias.to_h) if @fd_alias
       hash.merge!(error: @error.to_h) if @error
+      hash
     end
+    alias_method :to_h, :to_hash
 
   end
 end

data/lib/six_saferpay/models/request_card.rb

@@ -0,0 +1,36 @@
+module SixSaferpay
+  class RequestCard
+
+    attr_accessor(:number,
+                  :exp_year,
+                  :exp_month,
+                  :holder_name,
+                  :verification_code
+                 )
+
+    def initialize(number:,
+                  exp_year:,
+                  exp_month:,
+                  holder_name: nil,
+                  verification_code: nil
+                  )
+      @number = number
+      @exp_year = exp_year
+      @exp_month = exp_month
+      @holder_name = holder_name
+      @verification_code = verification_code
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(number: @number)
+      hash.merge!(exp_year: @exp_year)
+      hash.merge!(exp_month: @exp_month)
+      hash.merge!(holder_name: @holder_name) if @holder_name
+      hash.merge!(verification_code: @verification_code) if @verification_code
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/request_header.rb

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class RequestHeader < Model
+  class RequestHeader
 
     attr_accessor :spec_version,
       :customer_id,
@@ -7,20 +7,24 @@ module SixSaferpay
       :retry_indicator,
       :client_info
 
-    def initialize(client_info: nil)
-      @spec_version = SixSaferpay::API::VERSION
-      @customer_id = SixSaferpay.config.customer_id
-      @request_id = SecureRandom.uuid
-      @retry_indicator = 0
+    def initialize(spec_version: nil,
+                   customer_id: nil,
+                   request_id: nil,
+                   retry_indicator: nil,
+                   client_info: nil)
+      @spec_version = spec_version || SixSaferpay::API::VERSION
+      @customer_id = customer_id || SixSaferpay.config.customer_id
+      @request_id = request_id || SecureRandom.uuid
+      @retry_indicator = retry_indicator || 0
       @client_info = SixSaferpay::ClientInfo.new(client_info.to_h) if client_info
     end
 
     def to_hash
       hash = Hash.new
-      hash.merge!(spec_version: @spec_version)
-      hash.merge!(customer_id: @customer_id)
-      hash.merge!(request_id: @request_id)
-      hash.merge!(retry_indicator: @retry_indicator)
+      hash.merge!(spec_version: @spec_version) if @spec_version
+      hash.merge!(customer_id: @customer_id) if @customer_id
+      hash.merge!(request_id: @request_id) if @request_id
+      hash.merge!(retry_indicator: @retry_indicator) if @retry_indicator
       hash.merge!(client_info: @client_info.to_h) if @client_info
       hash
     end

data/lib/six_saferpay/models/request_payment_means.rb

@@ -0,0 +1,29 @@
+module SixSaferpay
+  class RequestPaymentMeans
+
+    attr_accessor(:card,
+                  :bank_account,
+                  :fd_alias
+                 )
+
+    def initialize(card: nil,
+                   bank_account: nil,
+                   fd_alias: nil
+                  )
+      @card = SixSaferpay::RequestCard.new(card.to_h) if card
+      @bank_account = SixSaferpay::BankAccount.new(bank_account.to_h) if bank_account
+      @fd_alias = SixSaferpay::PaymentMeansAlias.new(fd_alias.to_h) if fd_alias
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(card: @card.to_h) if @card
+      hash.merge!(bank_account: @bank_account.to_h) if @bank_account
+      hash.merge!(fd_alias: @fd_alias.to_h) if @fd_alias
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end
+

data/lib/six_saferpay/models/response_card.rb

@@ -0,0 +1,48 @@
+module SixSaferpay
+  class ResponseCard
+
+    attr_accessor(:masked_number,
+                  :exp_year,
+                  :exp_month,
+                  :holder_name,
+                  :holder_segment,
+                  :country_code,
+                  :hash_value
+                  # :verification_code
+                 )
+
+    def initialize(masked_number:,
+                  exp_year:,
+                  exp_month:,
+                  holder_name: nil,
+                  holder_segment: nil,
+                  country_code: nil,
+                  hash_value: nil
+                  # verification_code: nil
+                  )
+      @masked_number = masked_number
+      @exp_year = exp_year
+      @exp_month = exp_month
+      @holder_name = holder_name
+      @holder_segment = holder_segment
+      @country_code = country_code
+      @hash_value = hash_value
+      # @verification_code = verification_code
+    end
+
+    def to_hash
+      hash = Hash.new
+      hash.merge!(masked_number: @masked_number)
+      hash.merge!(exp_year: @exp_year)
+      hash.merge!(exp_month: @exp_month)
+      hash.merge!(holder_name: @holder_name) if @holder_name
+      hash.merge!(holder_segment: @holder_segment) if @holder_segment
+      hash.merge!(country_code: @country_code) if @country_code
+      hash.merge!(hash_value: @hash_value) if @hash_value
+      # hash.merge!(verification_code: @verification_code) if @verification_code
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/response_header.rb

@@ -9,10 +9,10 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(request_id: @request_id)
-      body.merge!(spec_version: @spec_version)
-      body
+      hash = Hash.new
+      hash.merge!(request_id: @request_id)
+      hash.merge!(spec_version: @spec_version)
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/{payment_means.rb → response_payment_means.rb}

@@ -1,5 +1,5 @@
 module SixSaferpay
-  class PaymentMeans
+  class ResponsePaymentMeans
 
     attr_accessor(:brand,
                   :display_text,
@@ -19,20 +19,20 @@ module SixSaferpay
       @brand = SixSaferpay::Brand.new(brand.to_h) if brand
       @display_text = display_text
       @wallet = wallet
-      @card = SixSaferpay::Card.new(card.to_h) if card
-      @bank_account = bank_account
+      @card = SixSaferpay::ResponseCard.new(card.to_h) if card
+      @bank_account = SixSaferpay::BankAccount.new(bank_account.to_h) if bank_account
       @twint = SixSaferpay::Twint.new(twint.to_h) if twint
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(brand: @brand.to_h)
-      body.merge!(display_text: @display_text)
-      body.merge!(wallet: @wallet) if @wallet
-      body.merge!(card: @card.to_h) if @card
-      body.merge!(bank_account: @bank_account) if @bank_account
-      body.merge!(twint: @twint.to_h) if @twint
-      body
+      hash = Hash.new
+      hash.merge!(brand: @brand.to_h)
+      hash.merge!(display_text: @display_text)
+      hash.merge!(wallet: @wallet) if @wallet
+      hash.merge!(card: @card.to_h) if @card
+      hash.merge!(bank_account: @bank_account.to_h) if @bank_account
+      hash.merge!(twint: @twint.to_h) if @twint
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/return_urls.rb

@@ -1,20 +1,20 @@
 module SixSaferpay
   class ReturnUrls
 
-    attr_accessor :success, :fail, :abort
+    attr_accessor :success, :fd_fail, :fd_abort
 
-    def initialize(success: nil, fail: nil, abort: nil)
+    def initialize(success: nil, fd_fail: nil, fd_abort: nil)
       @success = success || SixSaferpay.config.success_url
-      @fail = fail || SixSaferpay.config.fail_url
-      @abort = abort
+      @fd_fail = fd_fail || SixSaferpay.config.fail_url
+      @fd_abort = fd_abort
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(success: @success)
-      body.merge!(fail: @fail)
-      body.merge!(abort: @abort) if @abort
-      body
+      hash = Hash.new
+      hash.merge!(success: @success) if @success
+      hash.merge!(fd_fail: @fd_fail) if @fd_fail
+      hash.merge!(fd_abort: @fd_abort) if @fd_abort
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/styling.rb

@@ -12,7 +12,7 @@ module SixSaferpay
     def to_hash
       hash = Hash.new
       hash.merge!(css_url: @css_url) if @css_url
-      hash.merge!(content_security_enabled: @content_security_enabled) if @content_security_enabled
+      hash.merge!(content_security_enabled: @content_security_enabled) if !@content_security_enabled.nil?
       hash.merge!(theme: @theme) if @theme
       hash
     end

data/lib/six_saferpay/models/three_ds.rb

@@ -16,11 +16,12 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(authenticated: @authenticated)
-      body.merge!(liability_shift: @liability_shift)
-      body.merge!(xid: @xid) if @xid
-      body.merge!(verification_value: @verification_value) if @verification_value
+      hash = Hash.new
+      hash.merge!(authenticated: @authenticated) if !@authenticated.nil?
+      hash.merge!(liability_shift: @liability_shift) if !@liability_shift.nil?
+      hash.merge!(xid: @xid) if @xid
+      hash.merge!(verification_value: @verification_value) if @verification_value
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/transaction.rb

@@ -47,21 +47,21 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(type: @type)
-      body.merge!(status: @status)
-      body.merge!(id: @id)
-      body.merge!(capture_id: @capture_id) if @capture_id
-      body.merge!(date: @date)
-      body.merge!(amount: @amount.to_h)
-      body.merge!(order_id: @order_id) if @order_id
-      body.merge!(acquirer_name: @acquirer_name) if @acquirer_name
-      body.merge!(acquirer_reference: @acquirer_reference) if @acquirer_reference
-      body.merge!(six_transaction_reference: @six_transaction_reference)
-      body.merge!(approval_code: @approval_code) if @approval_code
-      body.merge!(direct_debit: @direct_debit.to_h) if @direct_debit
-      body.merge!(invoice: @invoice.to_h) if @invoice
-      body
+      hash = Hash.new
+      hash.merge!(type: @type)
+      hash.merge!(status: @status)
+      hash.merge!(id: @id)
+      hash.merge!(capture_id: @capture_id) if @capture_id
+      hash.merge!(date: @date)
+      hash.merge!(amount: @amount.to_h)
+      hash.merge!(order_id: @order_id) if @order_id
+      hash.merge!(acquirer_name: @acquirer_name) if @acquirer_name
+      hash.merge!(acquirer_reference: @acquirer_reference) if @acquirer_reference
+      hash.merge!(six_transaction_reference: @six_transaction_reference)
+      hash.merge!(approval_code: @approval_code) if @approval_code
+      hash.merge!(direct_debit: @direct_debit.to_h) if @direct_debit
+      hash.merge!(invoice: @invoice.to_h) if @invoice
+      hash
     end
     alias_method :to_h, :to_hash
 

data/lib/six_saferpay/models/twint.rb

@@ -8,9 +8,9 @@ module SixSaferpay
     end
 
     def to_hash
-      body = Hash.new
-      body.merge!(certificate_expiration_date: @certificate_expiration_date)
-      body
+      hash = Hash.new
+      hash.merge!(certificate_expiration_date: @certificate_expiration_date)
+      hash
     end
     alias_method :to_h, :to_hash