citypay_api_client 1.0.3 → 1.1.2

data/lib/citypay_api_client/models/charge_request.rb

@@ -1,49 +1,58 @@
 =begin
 #CityPay Payment API
 
-# This CityPay API is a HTTP RESTful payment API used for direct server to server transactional processing. It provides a number of payment mechanisms including: Internet, MOTO, Continuous Authority transaction processing, 3-D Secure decision handling using RFA Secure, Authorisation, Refunding, Pre-Authorisation, Cancellation/Voids and Completion processing. The API is also capable of tokinsed payments using Card Holder Accounts.  ## Compliance and Security <aside class=\"notice\">   Before we begin a reminder that your application will need to adhere to PCI-DSS standards to operate safely   and to meet requirements set out by Visa and MasterCard and the PCI Security Standards Council including: </aside>  * Data must be collected using TLS version 1.2 using [strong cryptography](#enabled-tls-ciphers). We will not accept calls to our API at   lower grade encryption levels. We regularly scan our TLS endpoints for vulnerabilities and perform TLS assessments   as part of our compliance program. * The application must not store sensitive card holder data (CHD) such as the card security code (CSC) or   primary access number (PAN) * The application must not display the full card number on receipts, it is recommended to mask the PAN   and show the last 4 digits. The API will return this for you for ease of receipt creation * If you are developing a website, you will be required to perform regular scans on the network where you host the   application to meet your compliance obligations * You will be required to be PCI Compliant and the application must adhere to the security standard. Further information   is available from [https://www.pcisecuritystandards.org/](https://www.pcisecuritystandards.org/) * The API verifies that the request is for a valid account and originates from a trusted source using the remote IP   address. Our application firewalls analyse data that may be an attempt to break a large number of security common   security vulnerabilities. 
+# This CityPay API is an HTTP RESTful payment API used for direct server to server transactional processing. It provides a number of payment mechanisms including: Internet, MOTO, Continuous Authority transaction processing, 3-D Secure decision handling using RFA Secure, Authorisation, Refunding, Pre-Authorisation, Cancellation/Voids and Completion processing. The API is also capable of tokenized payments using cardholder Accounts.  ## Compliance and Security Your application will need to adhere to PCI-DSS standards to operate safely and to meet requirements set out by  Visa and MasterCard and the PCI Security Standards Council. These include  * Data must be collected using TLS version 1.2 using [strong cryptography](https://citypay.github.io/api-docs/payment-api/#enabled-tls-ciphers). We will not accept calls to our API at   lower grade encryption levels. We regularly scan our TLS endpoints for vulnerabilities and perform TLS assessments   as part of our compliance program. * The application must not store sensitive cardholder data (CHD) such as the card security code (CSC) or   primary access number (PAN) * The application must not display the full card number on receipts, it is recommended to mask the PAN   and show the last 4 digits. The API will return this for you for ease of receipt creation * If you are developing a website, you will be required to perform regular scans on the network where you host the   application to meet your compliance obligations * You will be required to be PCI Compliant and the application must adhere to the security standard. Further information   is available from [https://www.pcisecuritystandards.org/](https://www.pcisecuritystandards.org/) * The API verifies that the request is for a valid account and originates from a trusted source using the remote IP   address. Our application firewalls analyse data that may be an attempt to break a large number of security common   security vulnerabilities. 
 
 Contact: support@citypay.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
+OpenAPI Generator version: 7.2.0
 
 =end
 
 require 'date'
+require 'time'
 
 module CityPayApiClient
   class ChargeRequest
-    # The amount to authorise in the lowest unit of currency with a variable length to a maximum of 12 digits. No decimal points are to be included and no divisional characters such as 1,024. The amount should be the total amount required for the transaction. For example with GBP £1,021.95 the amount value is 102195. 
+    # The amount to authorise in the lowest unit of currency with a variable length to a maximum of 12 digits.  No decimal points are to be included and no divisional characters such as 1,024.  The amount should be the total amount required for the transaction.  For example with GBP £1,021.95 the amount value is 102195. 
     attr_accessor :amount
 
-    # A policy value which determines whether an AVS postcode policy is enforced or bypassed.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.  `1` for an enforced policy. Transactions that are enforced will be rejected if the AVS postcode numeric value does not match.  `2` to bypass. Transactions that are bypassed will be allowed through even if the postcode did not match.  `3` to ignore. Transactions that are ignored will bypass the result and not send postcode details for authorisation. 
+    # A policy value which determines whether an AVS postcode policy is enforced or bypassed.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.   `1` for an enforced policy. Transactions that are enforced will be rejected if the AVS postcode numeric value does not match.   `2` to bypass. Transactions that are bypassed will be allowed through even if the postcode did not match.   `3` to ignore. Transactions that are ignored will bypass the result and not send postcode details for authorisation. 
     attr_accessor :avs_postcode_policy
 
-    # The Card Security Code (CSC) (also known as CV2/CVV2) is normally found on the back of the card (American Express has it on the front). The value helps to identify posession of the card as it is not available within the chip or magnetic swipe.  When forwarding the CSC, please ensure the value is a string as some values start with 0 and this will be stripped out by any integer parsing.  The CSC number aids fraud prevention in Mail Order and Internet payments.   Business rules are available on your account to identify whether to accept or decline transactions based on mismatched results of the CSC.  The Payment Card Industry (PCI) requires that at no stage of a transaction should the CSC be stored. This applies to all entities handling card data. It should also not be used in any hashing process. CityPay do not store the value and have no method of retrieving the value once the transaction has been processed. For this reason, duplicate checking is unable to determine the CSC in its duplication check algorithm. 
+    # Merchant-initiated transactions (MITs) are payments you trigger, where the cardholder has previously consented to you carrying out such payments. These may be scheduled (such as recurring payments and installments) or unscheduled (like account top-ups triggered by balance thresholds and no-show charges).  Scheduled --- These are regular payments using stored card details, like installments or a monthly subscription fee.  - `I` Instalment - A single purchase of goods or services billed to a cardholder in multiple transactions, over a period of time agreed by the cardholder and you.  - `R` Recurring - Transactions processed at fixed, regular intervals not to exceed one year between transactions, representing an agreement between a cardholder and you to purchase goods or services provided over a period of time.  Unscheduled --- These are payments using stored card details that do not occur on a regular schedule, like top-ups for a digital wallet triggered by the balance falling below a certain threshold.  - `A` Reauthorisation - a purchase made after the original purchase. A common scenario is delayed/split shipments.  - `C` Unscheduled Payment - A transaction using a stored credential for a fixed or variable amount that does not occur on a scheduled or regularly occurring transaction date. This includes account top-ups triggered by balance thresholds.  - `D` Delayed Charge - A delayed charge is typically used in hotel, cruise lines and vehicle rental environments to perform a supplemental account charge after original services are rendered.  - `L` Incremental - An incremental authorisation is typically found in hotel and car rental environments, where the cardholder has agreed to pay for any service incurred during the duration of the contract. An incremental authorisation is where you need to seek authorisation of further funds in addition to what you have originally requested. A common scenario is additional services charged to the contract, such as extending a stay in a hotel.  - `S` Resubmission - When the original purchase occurred, but you were not able to get authorisation at the time the goods or services were provided. It should be only used where the goods or services have already been provided, but the authorisation request is declined for insufficient funds.  - `X` No-show - A no-show is a transaction where you are enabled to charge for services which the cardholder entered into an agreement to purchase, but the cardholder did not meet the terms of the agreement. 
+    attr_accessor :cardholder_agreement
+
+    # The Card Security Code (CSC) (also known as CV2/CVV2) is normally found on the back of the card (American Express has it on the front). The value helps to identify posession of the card as it is not available within the chip or magnetic swipe.  When forwarding the CSC, please ensure the value is a string as some values start with 0 and this will be stripped out by any integer parsing.  The CSC number aids fraud prevention in Mail Order and Internet payments.  Business rules are available on your account to identify whether to accept or decline transactions based on mismatched results of the CSC.  The Payment Card Industry (PCI) requires that at no stage of a transaction should the CSC be stored.  This applies to all entities handling card data.  It should also not be used in any hashing process.  CityPay do not store the value and have no method of retrieving the value once the transaction has been processed. For this reason, duplicate checking is unable to determine the CSC in its duplication check algorithm. 
     attr_accessor :csc
 
-    # A policy value which determines whether a CSC policy is enforced or bypassed.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.  `1` for an enforced policy. Transactions that are enforced will be rejected if the CSC value does not match.  `2` to bypass. Transactions that are bypassed will be allowed through even if the CSC did not match.  `3` to ignore. Transactions that are ignored will bypass the result and not send the CSC details for authorisation. 
+    # A policy value which determines whether a CSC policy is enforced or bypassed.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.   `1` for an enforced policy. Transactions that are enforced will be rejected if the CSC value does not match.   `2` to bypass. Transactions that are bypassed will be allowed through even if the CSC did not match.   `3` to ignore. Transactions that are ignored will bypass the result and not send the CSC details for authorisation. 
     attr_accessor :csc_policy
 
     # The processing currency for the transaction. Will default to the merchant account currency.
     attr_accessor :currency
 
-    # A policy value which determines whether a duplication policy is enforced or bypassed. A duplication check has a window of time set against your account within which it can action. If a previous transaction with matching values occurred within the window, any subsequent transaction will result in a T001 result.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.  `1` for an enforced policy. Transactions that are enforced will be checked for duplication within the duplication window.  `2` to bypass. Transactions that are bypassed will not be checked for duplication within the duplication window.  `3` to ignore. Transactions that are ignored will have the same affect as bypass. 
+    # A policy value which determines whether a duplication policy is enforced or bypassed. A duplication check has a window of time set against your account within which it can action. If a previous transaction with matching values occurred within the window, any subsequent transaction will result in a T001 result.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.   `1` for an enforced policy. Transactions that are enforced will be checked for duplication within the duplication window.   `2` to bypass. Transactions that are bypassed will not be checked for duplication within the duplication window.   `3` to ignore. Transactions that are ignored will have the same affect as bypass. 
     attr_accessor :duplicate_policy
 
-    # The identifier of the transaction to process. The value should be a valid reference and may be used to perform  post processing actions and to aid in reconciliation of transactions.  The value should be a valid printable string with ASCII character ranges from 32 to 127.  The identifier is recommended to be distinct for each transaction such as a [random unique identifier](https://en.wikipedia.org/wiki/Universally_unique_identifier) this will aid in ensuring each transaction is identifiable.  When transactions are processed they are also checked for duplicate requests. Changing the identifier on a subsequent request will ensure that a transaction is considered as different. 
+    # The identifier of the transaction to process. The value should be a valid reference and may be used to perform  post processing actions and to aid in reconciliation of transactions.  The value should be a valid printable string with ASCII character ranges from 0x32 to 0x127.  The identifier is recommended to be distinct for each transaction such as a [random unique identifier](https://en.wikipedia.org/wiki/Universally_unique_identifier) this will aid in ensuring each transaction is identifiable.  When transactions are processed they are also checked for duplicate requests. Changing the identifier on a subsequent request will ensure that a transaction is considered as different. 
     attr_accessor :identifier
 
-    # A policy value which determines whether an AVS address policy is enforced, bypassed or ignored.   Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.  `1` for an enforced policy. Transactions that are enforced will be rejected if the AVS address numeric value does not match.  `2` to bypass. Transactions that are bypassed will be allowed through even if the address did not match.  `3` to ignore. Transactions that are ignored will bypass the result and not send address numeric details for authorisation. 
+    # Transactions charged using the API are defined as:  **Cardholder Initiated**: A _cardholder initiated transaction_ (CIT) is where the cardholder selects the card for use for a purchase using previously stored details. An example would be a customer buying an item from your website after being present with their saved card details at checkout.  **Merchant Intiated**: A _merchant initiated transaction_ (MIT) is an authorisation initiated where you as the  merchant submit a cardholders previously stored details without the cardholder's participation. An example would  be a subscription to a membership scheme to debit their card monthly.  MITs have different reasons such as reauthorisation, delayed, unscheduled, incremental, recurring, instalment, no-show or resubmission.  The following values apply   - `M` - specifies that the transaction is initiated by the merchant   - `C` - specifies that the transaction is initiated by the cardholder  Where transactions are merchant initiated, a valid cardholder agreement must be defined. 
+    attr_accessor :initiation
+
+    # A policy value which determines whether an AVS address policy is enforced, bypassed or ignored.  Values are  `0` for the default policy (default value if not supplied). Your default values are determined by your account manager on setup of the account.   `1` for an enforced policy. Transactions that are enforced will be rejected if the AVS address numeric value does not match.   `2` to bypass. Transactions that are bypassed will be allowed through even if the address did not match.   `3` to ignore. Transactions that are ignored will bypass the result and not send address numeric details for authorisation. 
     attr_accessor :match_avsa
 
     # Identifies the merchant account to perform processing for.
     attr_accessor :merchantid
 
-    # An optional reference value for the calling client such as a version number i.e.
-    attr_accessor :sdk
+    # A \"tag\" is a label that you can attach to a payment authorization. Tags can help you group transactions together based on certain criteria, like a work job or a ticket number. They can also assist in filtering transactions when you're generating reports.  Multiple Tags You can add more than one tag to a transaction by separating them with commas.  Limitations There is a maximum limit of 3 tags that can be added to a single transaction. Each tag can be no longer than 20 characters and alphanumeric with no spaces.  Example: Let's say you're a software company and you have different teams working on various projects. When a team makes a purchase or incurs an expense, they can tag the transaction with the project name, the team name, and the type of expense.  Project Name: Project_X Team Name: Team_A Type of Expense: Hardware So, the tag for a transaction might look like: Project_X,Team_A,Hardware  This way, when you're looking at your financial reports, you can easily filter transactions based on these tags to see how much each project or team is spending on different types of expenses. 
+    attr_accessor :tag
 
-    # A tokenised form of a card that belongs to a card holder's account and that has been previously registered. The token is time based and will only be active for a short duration. The value is therefore designed not to be stored remotely for future  use.  Tokens will start with ct and are resiliently tamper proof using HMacSHA-256. No sensitive card data is stored internally within the token.  Each card will contain a different token and the value may be different on any retrieval call.  The value can be presented for payment as a selection value to an end user in a web application. 
+    attr_accessor :threedsecure
+
+    # A tokenised form of a card that belongs to a card holder's account and that has been previously registered. The token is time based and will only be active for a short duration. The value is therefore designed not to be stored remotely for future use.   Tokens will start with ct and are resiliently tamper proof using HMacSHA-256. No sensitive card data is stored internally within the token.   Each card will contain a different token and the value may be different on any retrieval call.   The value can be presented for payment as a selection value to an end user in a web application. 
     attr_accessor :token
 
     # Further information that can be added to the transaction will display in reporting. Can be used for flexible values such as operator id.
@@ -57,33 +66,44 @@ module CityPayApiClient
       {
         :'amount' => :'amount',
         :'avs_postcode_policy' => :'avs_postcode_policy',
+        :'cardholder_agreement' => :'cardholder_agreement',
         :'csc' => :'csc',
         :'csc_policy' => :'csc_policy',
         :'currency' => :'currency',
         :'duplicate_policy' => :'duplicate_policy',
         :'identifier' => :'identifier',
+        :'initiation' => :'initiation',
         :'match_avsa' => :'match_avsa',
         :'merchantid' => :'merchantid',
-        :'sdk' => :'sdk',
+        :'tag' => :'tag',
+        :'threedsecure' => :'threedsecure',
         :'token' => :'token',
         :'trans_info' => :'trans_info',
         :'trans_type' => :'trans_type'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
         :'amount' => :'Integer',
         :'avs_postcode_policy' => :'String',
+        :'cardholder_agreement' => :'String',
         :'csc' => :'String',
         :'csc_policy' => :'String',
         :'currency' => :'String',
         :'duplicate_policy' => :'String',
         :'identifier' => :'String',
+        :'initiation' => :'String',
         :'match_avsa' => :'String',
         :'merchantid' => :'Integer',
-        :'sdk' => :'String',
+        :'tag' => :'String',
+        :'threedsecure' => :'ThreeDSecure',
         :'token' => :'String',
         :'trans_info' => :'String',
         :'trans_type' => :'String'
@@ -113,12 +133,18 @@ module CityPayApiClient
 
       if attributes.key?(:'amount')
         self.amount = attributes[:'amount']
+      else
+        self.amount = nil
       end
 
       if attributes.key?(:'avs_postcode_policy')
         self.avs_postcode_policy = attributes[:'avs_postcode_policy']
       end
 
+      if attributes.key?(:'cardholder_agreement')
+        self.cardholder_agreement = attributes[:'cardholder_agreement']
+      end
+
       if attributes.key?(:'csc')
         self.csc = attributes[:'csc']
       end
@@ -137,6 +163,12 @@ module CityPayApiClient
 
       if attributes.key?(:'identifier')
         self.identifier = attributes[:'identifier']
+      else
+        self.identifier = nil
+      end
+
+      if attributes.key?(:'initiation')
+        self.initiation = attributes[:'initiation']
       end
 
       if attributes.key?(:'match_avsa')
@@ -145,16 +177,22 @@ module CityPayApiClient
 
       if attributes.key?(:'merchantid')
         self.merchantid = attributes[:'merchantid']
+      else
+        self.merchantid = nil
       end
 
-      if attributes.key?(:'sdk')
-        self.sdk = attributes[:'sdk']
-      else
-        self.sdk = CityPayApiClient::FULL_VERSION
+      if attributes.key?(:'tag')
+        self.tag = attributes[:'tag']
+      end
+
+      if attributes.key?(:'threedsecure')
+        self.threedsecure = attributes[:'threedsecure']
       end
 
       if attributes.key?(:'token')
         self.token = attributes[:'token']
+      else
+        self.token = nil
       end
 
       if attributes.key?(:'trans_info')
@@ -169,11 +207,16 @@ module CityPayApiClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @amount.nil?
         invalid_properties.push('invalid value for "amount", amount cannot be nil.')
       end
 
+      if !@cardholder_agreement.nil? && @cardholder_agreement.to_s.length > 1
+        invalid_properties.push('invalid value for "cardholder_agreement", the character length must be smaller than or equal to 1.')
+      end
+
       if !@csc.nil? && @csc.to_s.length > 4
         invalid_properties.push('invalid value for "csc", the character length must be smaller than or equal to 4.')
       end
@@ -202,6 +245,10 @@ module CityPayApiClient
         invalid_properties.push('invalid value for "identifier", the character length must be great than or equal to 4.')
       end
 
+      if !@initiation.nil? && @initiation.to_s.length > 1
+        invalid_properties.push('invalid value for "initiation", the character length must be smaller than or equal to 1.')
+      end
+
       if @merchantid.nil?
         invalid_properties.push('invalid value for "merchantid", merchantid cannot be nil.')
       end
@@ -224,7 +271,9 @@ module CityPayApiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @amount.nil?
+      return false if !@cardholder_agreement.nil? && @cardholder_agreement.to_s.length > 1
       return false if !@csc.nil? && @csc.to_s.length > 4
       return false if !@csc.nil? && @csc.to_s.length < 3
       return false if !@currency.nil? && @currency.to_s.length > 3
@@ -232,6 +281,7 @@ module CityPayApiClient
       return false if @identifier.nil?
       return false if @identifier.to_s.length > 50
       return false if @identifier.to_s.length < 4
+      return false if !@initiation.nil? && @initiation.to_s.length > 1
       return false if @merchantid.nil?
       return false if @token.nil?
       return false if !@trans_info.nil? && @trans_info.to_s.length > 50
@@ -239,14 +289,42 @@ module CityPayApiClient
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] amount Value to be assigned
+    def amount=(amount)
+      if amount.nil?
+        fail ArgumentError, 'amount cannot be nil'
+      end
+
+      @amount = amount
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] cardholder_agreement Value to be assigned
+    def cardholder_agreement=(cardholder_agreement)
+      if cardholder_agreement.nil?
+        fail ArgumentError, 'cardholder_agreement cannot be nil'
+      end
+
+      if cardholder_agreement.to_s.length > 1
+        fail ArgumentError, 'invalid value for "cardholder_agreement", the character length must be smaller than or equal to 1.'
+      end
+
+      @cardholder_agreement = cardholder_agreement
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] csc Value to be assigned
     def csc=(csc)
-      if !csc.nil? && csc.to_s.length > 4
+      if csc.nil?
+        fail ArgumentError, 'csc cannot be nil'
+      end
+
+      if csc.to_s.length > 4
         fail ArgumentError, 'invalid value for "csc", the character length must be smaller than or equal to 4.'
       end
 
-      if !csc.nil? && csc.to_s.length < 3
+      if csc.to_s.length < 3
         fail ArgumentError, 'invalid value for "csc", the character length must be great than or equal to 3.'
       end
 
@@ -256,11 +334,15 @@ module CityPayApiClient
     # Custom attribute writer method with validation
     # @param [Object] currency Value to be assigned
     def currency=(currency)
-      if !currency.nil? && currency.to_s.length > 3
+      if currency.nil?
+        fail ArgumentError, 'currency cannot be nil'
+      end
+
+      if currency.to_s.length > 3
         fail ArgumentError, 'invalid value for "currency", the character length must be smaller than or equal to 3.'
       end
 
-      if !currency.nil? && currency.to_s.length < 3
+      if currency.to_s.length < 3
         fail ArgumentError, 'invalid value for "currency", the character length must be great than or equal to 3.'
       end
 
@@ -285,10 +367,28 @@ module CityPayApiClient
       @identifier = identifier
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] initiation Value to be assigned
+    def initiation=(initiation)
+      if initiation.nil?
+        fail ArgumentError, 'initiation cannot be nil'
+      end
+
+      if initiation.to_s.length > 1
+        fail ArgumentError, 'invalid value for "initiation", the character length must be smaller than or equal to 1.'
+      end
+
+      @initiation = initiation
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] trans_info Value to be assigned
     def trans_info=(trans_info)
-      if !trans_info.nil? && trans_info.to_s.length > 50
+      if trans_info.nil?
+        fail ArgumentError, 'trans_info cannot be nil'
+      end
+
+      if trans_info.to_s.length > 50
         fail ArgumentError, 'invalid value for "trans_info", the character length must be smaller than or equal to 50.'
       end
 
@@ -298,7 +398,11 @@ module CityPayApiClient
     # Custom attribute writer method with validation
     # @param [Object] trans_type Value to be assigned
     def trans_type=(trans_type)
-      if !trans_type.nil? && trans_type.to_s.length > 1
+      if trans_type.nil?
+        fail ArgumentError, 'trans_type cannot be nil'
+      end
+
+      if trans_type.to_s.length > 1
         fail ArgumentError, 'invalid value for "trans_type", the character length must be smaller than or equal to 1.'
       end
 
@@ -312,14 +416,17 @@ module CityPayApiClient
       self.class == o.class &&
           amount == o.amount &&
           avs_postcode_policy == o.avs_postcode_policy &&
+          cardholder_agreement == o.cardholder_agreement &&
           csc == o.csc &&
           csc_policy == o.csc_policy &&
           currency == o.currency &&
           duplicate_policy == o.duplicate_policy &&
           identifier == o.identifier &&
+          initiation == o.initiation &&
           match_avsa == o.match_avsa &&
           merchantid == o.merchantid &&
-          sdk == o.sdk &&
+          tag == o.tag &&
+          threedsecure == o.threedsecure &&
           token == o.token &&
           trans_info == o.trans_info &&
           trans_type == o.trans_type
@@ -334,44 +441,40 @@ module CityPayApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [amount, avs_postcode_policy, csc, csc_policy, currency, duplicate_policy, identifier, match_avsa, merchantid, sdk, token, trans_info, trans_type].hash
+      [amount, avs_postcode_policy, cardholder_agreement, csc, csc_policy, currency, duplicate_policy, identifier, initiation, match_avsa, merchantid, tag, threedsecure, token, trans_info, trans_type].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -401,7 +504,9 @@ module CityPayApiClient
           end
         end
       else # model
-        CityPayApiClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = CityPayApiClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -427,7 +532,7 @@ module CityPayApiClient
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -450,5 +555,7 @@ module CityPayApiClient
         value
       end
     end
+
   end
+
 end