six_saferpay 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc4e59b09497c4bd69e43e3c83f144e0b77ed3b5fa3ab3c1a9ece66540f4b07
-  data.tar.gz: 5eb1be3135c3aa1eb253e8d0af0b0b5f9cda983466c5f861e3d4c01d05ad5b8a
+  metadata.gz: ad6ce329906e3637162ceec4bc1f5e4e332053f36c35062d9eb3022b9c5b01b0
+  data.tar.gz: 6aa4715cc53630b12bb69b8ab91300eb02011edf57fa5d856199c3a5474ac531
 SHA512:
-  metadata.gz: 2dc5c3e36ea120537bd0340e8d1b5228b795cadde23f6bdcfc6ab1da0ec5377f4ba85ab6f2cf877bace1e5a40511150b66c7ddb54d6fbb9ec604486ba316eb98
-  data.tar.gz: 20b80970bc27a450d1ecf2fb5569d11a68f0b9ae9e688c6c934d9cfa60c15379efe725d08f1555bbe43a0e76c8c275638ebeb3deaacb963e04ee091ef5481c59
+  metadata.gz: 15ff9f7bcbf264337275e4f2ee73a68d267c4e0e2bcfb0c1eaf58453bb9ae523a502d88a9c222979e04f743ea16614c8b66fe2a255fed9fdd510503f2e7f07e8
+  data.tar.gz: f9381e3c98e9d2ce9021873c19395cb3572c14f49e9c665cfe4dccb724059771f00bfa8b2c66cfbe9c0c1fc32a75111d97e2f0906c3334044a9d5d694b34cf1e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    six_saferpay (2.5.0)
+    six_saferpay (2.6.0)
       activesupport (~> 6.1, >= 6.1.3)
 
 GEM

data/README.md

@@ -6,7 +6,7 @@
 
 ## Current API Version
 
-This gem is compatible with the SIX API version: `1.17`
+This gem is compatible with the SIX API version: `1.18`
 
 ## Installation
 

data/lib/generators/models.rb

@@ -75,7 +75,11 @@ module SixSaferpay
       end
 
       def string?
-        @type == "String"
+        @type.downcase == "string"
+      end
+
+      def boolean?
+        @type.downcase == "boolean"
       end
 
       def to_s

data/lib/generators/templates/fabric.erb

@@ -2,11 +2,9 @@ SpinningWheel.define do
   fabric name: '<%= file_name %>', class_name: 'SixSaferpay::<%= name %>' do
 <%- attributes.each do |attr| -%>
   <%- if attr.string? -%>
-  <%- if attr.mandatory? -%>
     <%= "#{attr.name} { ' ' }" %>
-  <%- else -%>
-    <%= "#{attr.name} { nil }" %>
-  <%- end -%>
+  <%- elsif attr.boolean? -%>
+    <%= "#{attr.name} { true }" %>
   <%- else -%>
     <%= "#{attr.name} { SpinningWheel.create('#{attr.name}') }" %>
   <%- end -%>

data/lib/generators/templates/model.erb

@@ -19,7 +19,7 @@ module SixSaferpay
 <%- end %>
       )
 <%- attributes.each_with_index do |attr, index| -%>
-    <%- if attr.string? -%>
+    <%- if attr.string? || attr.boolean? -%>
       <%= "@#{attr.name} = "-%><%= "#{attr.name}" %>
     <%- else -%>
       <%- %>
@@ -36,11 +36,19 @@ module SixSaferpay
 <%- attributes.each do |attr| -%>
   <%- if attr.string? -%>
     <%- if attr.mandatory? -%>
+      <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
+    <%- else -%>
       <%= "if @#{attr.name}" %>
         <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
       <%= "end" %>
-    <%- else -%>
+    <%- end -%>
+  <%- elsif attr.boolean? -%>
+    <%- if attr.mandatory? -%>
       <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
+    <%- else -%>
+      <%= "if !@#{attr.name}.nil?" %>
+        <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
+      <%= "end" %>
     <%- end -%>
   <%- else -%>
       <%= "if @#{attr.name}" %>

data/lib/generators/templates/spec.erb

@@ -7,7 +7,7 @@ subject { SpinningWheel.create('<%= file_name %>') }
   let(:hash) {
     {
     <%- attributes.each do |attr| -%>
-      <%- if attr.string? -%>
+      <%- if attr.string? || attr.boolean? -%>
         <%= attr.name %>: subject.<%= attr.name %>,
       <%- else -%>
         <%= attr.name %>: subject.<%= attr.name %>.to_h,

data/lib/six_saferpay/api.rb

@@ -1,5 +1,5 @@
 module SixSaferpay
   module API
-    VERSION = '1.17'
+    VERSION = '1.18'
   end
 end

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

@@ -19,7 +19,9 @@ module SixSaferpay
         :billing_address_form,
         :delivery_address_form,
         :card_form,
-        :condition
+        :condition,
+        :order,
+        :risk_factors
       )
 
       def initialize(request_header: nil,
@@ -38,7 +40,9 @@ module SixSaferpay
                      billing_address_form: nil,
                      delivery_address_form: nil,
                      card_form: nil,
-                     condition: nil
+                     condition: nil,
+                     order: nil,
+                     risk_factors: nil
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
         @config_set = config_set
@@ -57,6 +61,8 @@ module SixSaferpay
         @delivery_address_form = SixSaferpay::DeliveryAddressForm.new(delivery_address_form.to_h) if delivery_address_form
         @card_form = SixSaferpay::CardForm.new(card_form.to_h) if card_form
         @condition = condition
+        @order = SixSaferpay::Order.new(order.to_h) if order
+        @risk_factors = SixSaferpay::RiskFactors.new(risk_factors.to_h) if risk_factors
       end
 
       def to_hash
@@ -78,6 +84,8 @@ module SixSaferpay
         hash.merge!(delivery_address_form: @delivery_address_form.to_h) if @delivery_address_form
         hash.merge!(card_form: @card_form.to_h) if @card_form
         hash.merge!(condition: @condition) if @condition
+        hash.merge!(order: @order.to_h) if @order
+        hash.merge!(risk_factors: @risk_factors.to_h) if @risk_factors
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/api/six_secure_pay_gate_offer/requests/create_offer.rb

@@ -6,14 +6,16 @@ module SixSaferpay
                     :expiration_date,
                     :config_set,
                     :payer,
-                    :billing_address_form
+                    :billing_address_form,
+                    :register_alias,
                    )
 
       def initialize(payment: ,
                      expiration_date: ,
                      config_set: nil,
                      payer: ,
-                     billing_address_form: nil
+                     billing_address_form: nil,
+                     register_alias: nil
                     )
 
         @payment = SixSaferpay::Payment.new(payment.to_h) if payment
@@ -22,6 +24,7 @@ module SixSaferpay
         @payer = SixSaferpay::Payer.new(payer.to_h) if payer
         @billing_address_form =
           SixSaferpay::BillingAddressForm.new(billing_address_form) if billing_address_form
+        @register_alias = SixSaferpay::RegisterAlias.new(register_alias.to_h) if register_alias
       end
 
       def to_hash
@@ -31,6 +34,7 @@ module SixSaferpay
         hash.merge!(config_set: @config_set) if @config_set
         hash.merge!(payer: @payer.to_h) if @payer
         hash.merge!(billing_address_form: @billing_address_form.to_h) if @billing_address_form
+        hash.merge!(register_alias: @register_alias.to_h) if @register_alias
         hash
       end
       alias_method :to_h, :to_hash

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

@@ -14,7 +14,9 @@ module SixSaferpay
         :styling,
         :wallet,
         :payment_methods,
-        :card_form
+        :card_form,
+        :order,
+        :risk_factors
         )
 
 
@@ -29,7 +31,9 @@ module SixSaferpay
                      styling: nil,
                      wallet: nil,
                      payment_methods: nil,
-                     card_form: nil
+                     card_form: nil,
+                     order: nil,
+                     risk_factors: nil
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
         @config_set = config_set
@@ -43,6 +47,8 @@ module SixSaferpay
         @wallet = SixSaferpay::Wallet.new(wallet.to_h) if wallet
         @payment_methods = payment_methods
         @card_form = SixSaferpay::CardForm.new(card_form.to_h) if card_form
+        @order = SixSaferpay::Order.new(order.to_h) if order
+        @risk_factors = SixSaferpay::RiskFactors.new(risk_factors.to_h) if risk_factors
       end
 
       def to_hash
@@ -59,6 +65,8 @@ module SixSaferpay
         hash.merge!(wallet: @wallet.to_h) if @wallet
         hash.merge!(payment_methods: @payment_methods) if @payment_methods
         hash.merge!(card_form: @card_form.to_h) if @card_form
+        hash.merge!(order: @order.to_h) if @order
+        hash.merge!(risk_factors: @risk_factors.to_h) if @risk_factors
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/models/items.rb

@@ -0,0 +1,84 @@
+module SixSaferpay
+  class Items
+
+    attr_accessor(
+      :type,
+      :id,
+      :variant_id,
+      :name,
+      :category_name,
+      :description,
+      :quantity,
+      :unit_price,
+      :is_pre_order,
+      :tax_amount,
+      :discount_amount,
+    )
+
+    def initialize(
+      type: nil,
+      id: nil,
+      variant_id: nil,
+      name: nil,
+      category_name: nil,
+      description: nil,
+      quantity: nil,
+      unit_price: nil,
+      is_pre_order: nil,
+      tax_amount: nil,
+      discount_amount: nil
+      )
+      @type = type
+      @id = id
+      @variant_id = variant_id
+      @name = name
+      @category_name = category_name
+      @description = description
+      @quantity = quantity
+      @unit_price = unit_price
+      @is_pre_order = is_pre_order
+      @tax_amount = tax_amount
+      @discount_amount = discount_amount
+    end
+
+    def to_hash
+      hash = Hash.new
+      if @type
+        hash.merge!(type: @type)
+      end
+      if @id
+        hash.merge!(id: @id)
+      end
+      if @variant_id
+        hash.merge!(variant_id: @variant_id)
+      end
+      if @name
+        hash.merge!(name: @name)
+      end
+      if @category_name
+        hash.merge!(category_name: @category_name)
+      end
+      if @description
+        hash.merge!(description: @description)
+      end
+      if @quantity
+        hash.merge!(quantity: @quantity)
+      end
+      if @unit_price
+        hash.merge!(unit_price: @unit_price)
+      end
+      if !@is_pre_order.nil?
+        hash.merge!(is_pre_order: @is_pre_order)
+      end
+      if @tax_amount
+        hash.merge!(tax_amount: @tax_amount)
+      end
+      if @discount_amount
+        hash.merge!(discount_amount: @discount_amount)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/order.rb

@@ -0,0 +1,27 @@
+module SixSaferpay
+  class Order
+
+    attr_accessor(
+      :items,
+    )
+
+    def initialize(
+      items: nil
+      )
+
+      if items
+        @items = SixSaferpay::Items.new(items.to_h)
+      end
+    end
+
+    def to_hash
+      hash = Hash.new
+      if @items
+        hash.merge!(items: @items.to_h)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/payer.rb

@@ -1,7 +1,9 @@
 module SixSaferpay
   class Payer
 
-    attr_accessor(:ip_address,
+    attr_accessor(
+                  :id,
+                  :ip_address,
                   :ip_location,
                   :language_code,
                   :delivery_address,
@@ -9,12 +11,15 @@ module SixSaferpay
                  )
 
 
-    def initialize(ip_address: nil,
+    def initialize(
+                   id: nil,
+                   ip_address: nil,
                    ip_location: nil,
                    language_code: nil,
                    delivery_address: nil,
                    billing_address: nil
                   )
+      @id = id
       @ip_address = ip_address
       @ip_location = ip_location
       @language_code = language_code
@@ -24,6 +29,7 @@ module SixSaferpay
 
     def to_hash
       hash = Hash.new
+      hash.merge!(id: @id) if @id
       hash.merge!(ip_address: @ip_address) if @ip_address
       hash.merge!(ip_location: @ip_location) if @ip_location
       hash.merge!(language_code: @language_code) if @language_code

data/lib/six_saferpay/models/payer_profile.rb

@@ -0,0 +1,105 @@
+module SixSaferpay
+  class PayerProfile
+
+    attr_accessor(
+      :has_account,
+      :has_password,
+      :password_forgotten,
+      :first_name,
+      :last_name,
+      :company,
+      :date_of_birth,
+      :last_login_date,
+      :gender,
+      :creation_date,
+      :password_last_change_date,
+      :email,
+      :secondary_email,
+      :phone,
+    )
+
+    def initialize(
+      has_account: nil,
+      has_password: nil,
+      password_forgotten: nil,
+      first_name: nil,
+      last_name: nil,
+      company: nil,
+      date_of_birth: nil,
+      last_login_date: nil,
+      gender: nil,
+      creation_date: nil,
+      password_last_change_date: nil,
+      email: nil,
+      secondary_email: nil,
+      phone: nil
+      )
+      @has_account = has_account
+      @has_password = has_password
+      @password_forgotten = password_forgotten
+      @first_name = first_name
+      @last_name = last_name
+      @company = company
+      @date_of_birth = date_of_birth
+      @last_login_date = last_login_date
+      @gender = gender
+      @creation_date = creation_date
+      @password_last_change_date = password_last_change_date
+      @email = email
+      @secondary_email = secondary_email
+
+      if phone
+        @phone = SixSaferpay::Phone.new(phone.to_h)
+      end
+    end
+
+    def to_hash
+      hash = Hash.new
+      if !@has_account.nil?
+        hash.merge!(has_account: @has_account)
+      end
+      if !@has_password.nil?
+        hash.merge!(has_password: @has_password)
+      end
+      if !@password_forgotten.nil?
+        hash.merge!(password_forgotten: @password_forgotten)
+      end
+      if @first_name
+        hash.merge!(first_name: @first_name)
+      end
+      if @last_name
+        hash.merge!(last_name: @last_name)
+      end
+      if @company
+        hash.merge!(company: @company)
+      end
+      if @date_of_birth
+        hash.merge!(date_of_birth: @date_of_birth)
+      end
+      if @last_login_date
+        hash.merge!(last_login_date: @last_login_date)
+      end
+      if @gender
+        hash.merge!(gender: @gender)
+      end
+      if @creation_date
+        hash.merge!(creation_date: @creation_date)
+      end
+      if @password_last_change_date
+        hash.merge!(password_last_change_date: @password_last_change_date)
+      end
+      if @email
+        hash.merge!(email: @email)
+      end
+      if @secondary_email
+        hash.merge!(secondary_email: @secondary_email)
+      end
+      if @phone
+        hash.merge!(phone: @phone.to_h)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/phone.rb

@@ -0,0 +1,36 @@
+module SixSaferpay
+  class Phone
+
+    attr_accessor(
+      :main,
+      :mobile,
+      :work,
+    )
+
+    def initialize(
+      main: nil,
+      mobile: nil,
+      work: nil
+      )
+      @main = main
+      @mobile = mobile
+      @work = work
+    end
+
+    def to_hash
+      hash = Hash.new
+      if @main
+        hash.merge!(main: @main)
+      end
+      if @mobile
+        hash.merge!(mobile: @mobile)
+      end
+      if @work
+        hash.merge!(work: @work)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/models/risk_factors.rb

@@ -0,0 +1,39 @@
+module SixSaferpay
+  class RiskFactors
+
+    attr_accessor(
+      :delivery_type,
+      :payer_profile,
+      :is_b2b,
+    )
+
+    def initialize(
+      delivery_type: nil,
+      payer_profile: nil,
+      is_b2b: nil
+      )
+      @delivery_type = delivery_type
+
+      if payer_profile
+        @payer_profile = SixSaferpay::PayerProfile.new(payer_profile.to_h)
+      end
+      @is_b2b = is_b2b
+    end
+
+    def to_hash
+      hash = Hash.new
+      if @delivery_type
+        hash.merge!(delivery_type: @delivery_type)
+      end
+      if @payer_profile
+        hash.merge!(payer_profile: @payer_profile.to_h)
+      end
+      if !@is_b2b.nil?
+        hash.merge!(is_b2b: @is_b2b)
+      end
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/six_saferpay/version.rb

@@ -1,3 +1,3 @@
 module SixSaferpay
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: six_saferpay
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Fadendaten GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -326,19 +326,23 @@ files:
 - lib/six_saferpay/models/installment_fee.rb
 - lib/six_saferpay/models/installment_plans.rb
 - lib/six_saferpay/models/invoice.rb
+- lib/six_saferpay/models/items.rb
 - lib/six_saferpay/models/liability.rb
 - lib/six_saferpay/models/marketplace.rb
 - lib/six_saferpay/models/mastercard_issuer_installments.rb
 - lib/six_saferpay/models/notification.rb
 - lib/six_saferpay/models/options.rb
+- lib/six_saferpay/models/order.rb
 - lib/six_saferpay/models/payee.rb
 - lib/six_saferpay/models/payer.rb
 - lib/six_saferpay/models/payer_amount.rb
+- lib/six_saferpay/models/payer_profile.rb
 - lib/six_saferpay/models/payment.rb
 - lib/six_saferpay/models/payment_means_alias.rb
 - lib/six_saferpay/models/payment_method_options.rb
 - lib/six_saferpay/models/payment_methods_options.rb
 - lib/six_saferpay/models/pending_notification.rb
+- lib/six_saferpay/models/phone.rb
 - lib/six_saferpay/models/processing_data.rb
 - lib/six_saferpay/models/recurring.rb
 - lib/six_saferpay/models/redirect.rb
@@ -354,6 +358,7 @@ files:
 - lib/six_saferpay/models/response_header.rb
 - lib/six_saferpay/models/response_payment_means.rb
 - lib/six_saferpay/models/return_urls.rb
+- lib/six_saferpay/models/risk_factors.rb
 - lib/six_saferpay/models/saferpay_fields.rb
 - lib/six_saferpay/models/six_transaction.rb
 - lib/six_saferpay/models/styling.rb