jamm 1.7.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571cd55d4f48ad397f8b1b4a3f442bba54e87be8a021c60dc866eaf8893d2f91
-  data.tar.gz: 915b6f10dd15012ba4a7fa05f68c36d653c0cb74b7ae058afa357e4511d4ecdb
+  metadata.gz: b9d9cfa81304a829a1d016ff3a4d2e53fe2b15caf2fa6c4e8513161b16881dff
+  data.tar.gz: 9f1ffda9436127fa5101cbff162f8ac24f52a8b151ade3c7691a39e9144e52aa
 SHA512:
-  metadata.gz: d578007b52e84b6a725fe9935d7948dd5415ae1fbbc1b98ecab895c293efa4f513ff74b5b9a49f004ba171c2b46ac34635f0c1b99b51dbe028468713766f3103
-  data.tar.gz: 5be46a218ea9a5d3cd4fde2cbc7821eb017ca77131a24a58bafcffd02e359db87b627c1ea5714c7ae679a9dd12dd62d6ba8da6254d2af8ec4d58dc19ca2ccbbe
+  metadata.gz: 8af376c181770bbc2fb93c1002ca29493fde1c6cdf4227475a1ce891fd82d83c073774c7296c67e911ae064d55fa8314fb8550d390dbe9b991d56167ca30e95a
+  data.tar.gz: 6c8c4ca5abb8f6b4bcc0d94ab15441bfa1ca572e000a4358072bccf340e8493776c7791b6fcb4d798e0dd647ceac2db9c1937720aebcde971d132825f576328b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jamm (1.7.0)
+    jamm (2.1.0)
       rest-client (~> 2.0)
       typhoeus (~> 1.0, >= 1.0.1)
 

data/lib/jamm/api/api/payment_api.rb

@@ -87,6 +87,74 @@ module Api
       return data, status_code, headers
     end
 
+    # Initiate async off-session payment
+    # Starts asynchronous off-session payment processing and returns request tracking information.
+    # @param body [OffSessionPaymentAsyncRequest] This message represents a request to process an off-session payment asynchronously. It contains the customer ID and the amount to charge.
+    # @param [Hash] opts the optional parameters
+    # @return [OffSessionPaymentAsyncResponse]
+    def async_off_session_payment(body, opts = {})
+      data, _status_code, _headers = async_off_session_payment_with_http_info(body, opts)
+      data
+    end
+
+    # Initiate async off-session payment
+    # Starts asynchronous off-session payment processing and returns request tracking information.
+    # @param body [OffSessionPaymentAsyncRequest] This message represents a request to process an off-session payment asynchronously. It contains the customer ID and the amount to charge.
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(OffSessionPaymentAsyncResponse, Integer, Hash)>] OffSessionPaymentAsyncResponse data, response status code and response headers
+    def async_off_session_payment_with_http_info(body, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PaymentApi.async_off_session_payment ...'
+      end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling PaymentApi.async_off_session_payment"
+      end
+      # resource path
+      local_var_path = '/v1/payments/off-session/async'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'OffSessionPaymentAsyncResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"PaymentApi.async_off_session_payment",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PaymentApi#async_off_session_payment\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Create a contract with initial charge
     # Create a contract with initial charge
     # @param body [CreateContractWithChargeRequest] Request message for creating a new contract with an immediate initial charge. This combines contract creation and charging in a single operation.
@@ -627,6 +695,74 @@ module Api
       return data, status_code, headers
     end
 
+    # Refund a charge
+    # Refunds a charge. If the same-day cancellation window has not passed, cancels the charge directly. Otherwise, creates a bank transfer refund request.
+    # @param body [RefundRequest] Request message for refunding a charge. The refund is always processed asynchronously. The final result is delivered via webhook (&#x60;refund_succeeded&#x60;).
+    # @param [Hash] opts the optional parameters
+    # @return [RefundResponse]
+    def refund(body, opts = {})
+      data, _status_code, _headers = refund_with_http_info(body, opts)
+      data
+    end
+
+    # Refund a charge
+    # Refunds a charge. If the same-day cancellation window has not passed, cancels the charge directly. Otherwise, creates a bank transfer refund request.
+    # @param body [RefundRequest] Request message for refunding a charge. The refund is always processed asynchronously. The final result is delivered via webhook (&#x60;refund_succeeded&#x60;).
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(RefundResponse, Integer, Hash)>] RefundResponse data, response status code and response headers
+    def refund_with_http_info(body, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: PaymentApi.refund ...'
+      end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling PaymentApi.refund"
+      end
+      # resource path
+      local_var_path = '/v1/refund'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'RefundResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"PaymentApi.refund",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: PaymentApi#refund\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Withdraw money from customer immediately, without redirect
     # This call is synchronous. The money will be withdrawn immediately.
     # @param body [WithdrawRequest] This message represents a request to withdraw money from a customer. It contains the customer ID and the amount to withdraw.

data/lib/jamm/api/models/v1_buyer.rb

@@ -22,7 +22,7 @@ module Api
     # A flag whether Jamm to force KYC for the customer.  初回購入時に購入者に対してKYCを強制するかどうかのフラグです。
     attr_accessor :force_kyc
 
-    # Phone number of the customer. You can update this value later through the UpdateCustomer endpoint.  e.g. - 09012345678  Customerの電話番号。 この値は UpdateCustomer エンドポイントを通じて後で更新できます。
+    # Phone number of the customer. You can update this value later through the UpdateCustomer endpoint. Accepts Japanese phone numbers (10-11 digits). Note that only mobile numbers (070/080/090) will be stored; non-mobile numbers are silently ignored.  e.g. - 09012345678 (mobile) - 08012345678 (mobile) - 07012345678 (mobile) - 05012345678 (IP phone, not stored) - 0312345678  (landline, not stored)  Customerの電話番号。 この値は UpdateCustomer エンドポイントを通じて後で更新できます。 携帯電話番号（070/080/090）のみ保存され、それ以外の番号は無視されます。
     attr_accessor :phone
 
     # Name of the customer. You can update this value later through the UpdateCustomer endpoint.  e.g. - John Appleseed - 山田太郎  購入者の氏名。 この値は UpdateCustomer エンドポイントを通じて後で更新できます。

data/lib/jamm/api/models/v1_charge.rb

@@ -22,7 +22,7 @@ module Api
     # Amount of the charge in Japanese Yen. The amount must be the total price of the product/service including tax.  決済金額。日本円で指定してください。 金額は商品/サービスの合計金額 (税込) を指定してください。  @gotags: validate:\"gte=1,lte=500000\"
     attr_accessor :price
 
-    # Description is an arbitrary string for merchant to track the charge. This information is displayed on Merchant Dashboard.  決済の説明。ショップが決済を追跡するための任意の文字列です。  @gotags: validate:\"required\"
+    # Description is an arbitrary string for merchant to track the charge. This information is displayed on Merchant Dashboard.  決済の説明。ショップが決済を追跡するための任意の文字列です。  @gotags: validate:\"required,max=1024\"
     attr_accessor :description
 
     # Arbitrary key-value additional information about the charge. You can see this information in our merchant dashboard.  Chargeに関する任意のキーと値の追加情報。 加盟店ダッシュボードで確認できます。

data/lib/jamm/api/models/v1_charge_error.rb

@@ -0,0 +1,226 @@
+=begin
+#Jamm API
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 1.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.9.0
+
+=end
+
+require 'date'
+require 'time'
+
+module Api
+  # Contains error details for a failed charge.
+  class ChargeError
+    # Jamm defined error code (e.g. \"ERROR_TYPE_PAYMENT_CHARGE_OVER_LIMIT\").
+    attr_accessor :code
+
+    # Human readable error message.
+    attr_accessor :message
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'code' => :'code',
+        :'message' => :'message'
+      }
+    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
+      {
+        :'code' => :'String',
+        :'message' => :'String'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Api::ChargeError` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Api::ChargeError`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:'code')
+        self.code = attributes[:'code']
+      end
+
+      if attributes.key?(:'message')
+        self.message = attributes[:'message']
+      end
+    end
+
+    # 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
+      invalid_properties
+    end
+
+    # 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'
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          code == o.code &&
+          message == o.message
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [code, message].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)
+      return nil unless attributes.is_a?(Hash)
+      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[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          end
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
+      end
+      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 self._deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = Api.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
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          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
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end

data/lib/jamm/api/models/v1_charge_message.rb

@@ -25,24 +25,43 @@ module Api
 
     attr_accessor :merchant_name
 
+    # Original charge amount before discount and before any refund is applied.
     attr_accessor :initial_amount
 
+    # Discount amount deducted from the original charge amount.
     attr_accessor :discount
 
+    # Final charge amount after discount, before any refund is applied.
     attr_accessor :final_amount
 
+    # Total amount refunded for this charge when the charge has been refunded.
     attr_accessor :amount_refunded
 
     attr_accessor :currency
 
+    # Timestamp when the charge or refund outcome was completed.
     attr_accessor :processed_at
 
+    # Jamm fee associated with this refund event (refund uses refund fee; cancel uses 0).
+    attr_accessor :jamm_fee
+
     attr_accessor :created_at
 
     attr_accessor :updated_at
 
+    # Whether the original transaction's Jamm fee was waived (same-day cancel) or not (refund). Values: \"waived\", \"not_waived\".
+    attr_accessor :original_transaction_jamm_fee
+
+    # Consumption tax (10% of the Jamm fee).
+    attr_accessor :consumption_tax
+
     attr_accessor :error
 
+    # External refund identifier (rfd-*) for refund/refund-failed webhooks.
+    attr_accessor :refund_id
+
+    attr_accessor :refund
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -79,9 +98,14 @@ module Api
         :'amount_refunded' => :'amountRefunded',
         :'currency' => :'currency',
         :'processed_at' => :'processedAt',
+        :'jamm_fee' => :'jammFee',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt',
-        :'error' => :'error'
+        :'original_transaction_jamm_fee' => :'originalTransactionJammFee',
+        :'consumption_tax' => :'consumptionTax',
+        :'error' => :'error',
+        :'refund_id' => :'refundId',
+        :'refund' => :'refund'
       }
     end
 
@@ -104,9 +128,14 @@ module Api
         :'amount_refunded' => :'Integer',
         :'currency' => :'String',
         :'processed_at' => :'String',
+        :'jamm_fee' => :'Integer',
         :'created_at' => :'String',
         :'updated_at' => :'String',
-        :'error' => :'Apiv1Error'
+        :'original_transaction_jamm_fee' => :'String',
+        :'consumption_tax' => :'Integer',
+        :'error' => :'Apiv1Error',
+        :'refund_id' => :'String',
+        :'refund' => :'RefundInfo'
       }
     end
 
@@ -177,6 +206,10 @@ module Api
         self.processed_at = attributes[:'processed_at']
       end
 
+      if attributes.key?(:'jamm_fee')
+        self.jamm_fee = attributes[:'jamm_fee']
+      end
+
       if attributes.key?(:'created_at')
         self.created_at = attributes[:'created_at']
       end
@@ -185,9 +218,25 @@ module Api
         self.updated_at = attributes[:'updated_at']
       end
 
+      if attributes.key?(:'original_transaction_jamm_fee')
+        self.original_transaction_jamm_fee = attributes[:'original_transaction_jamm_fee']
+      end
+
+      if attributes.key?(:'consumption_tax')
+        self.consumption_tax = attributes[:'consumption_tax']
+      end
+
       if attributes.key?(:'error')
         self.error = attributes[:'error']
       end
+
+      if attributes.key?(:'refund_id')
+        self.refund_id = attributes[:'refund_id']
+      end
+
+      if attributes.key?(:'refund')
+        self.refund = attributes[:'refund']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -221,9 +270,14 @@ module Api
           amount_refunded == o.amount_refunded &&
           currency == o.currency &&
           processed_at == o.processed_at &&
+          jamm_fee == o.jamm_fee &&
           created_at == o.created_at &&
           updated_at == o.updated_at &&
-          error == o.error
+          original_transaction_jamm_fee == o.original_transaction_jamm_fee &&
+          consumption_tax == o.consumption_tax &&
+          error == o.error &&
+          refund_id == o.refund_id &&
+          refund == o.refund
     end
 
     # @see the `==` method
@@ -235,7 +289,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, customer, status, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, processed_at, created_at, updated_at, error].hash
+      [id, customer, status, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, processed_at, jamm_fee, created_at, updated_at, original_transaction_jamm_fee, consumption_tax, error, refund_id, refund].hash
     end
 
     # Builds the object from hash

data/lib/jamm/api/models/v1_charge_message_status.rb

@@ -21,9 +21,10 @@ module Api
     WAITING_EKYC = "STATUS_WAITING_EKYC".freeze
     BLOCKING = "STATUS_BLOCKING".freeze
     CANCELLED = "STATUS_CANCELLED".freeze
+    REFUNDED = "STATUS_REFUNDED".freeze
 
     def self.all_vars
-      @all_vars ||= [UNSPECIFIED, SUCCESS, FAILURE, WAITING_EKYC, BLOCKING, CANCELLED].freeze
+      @all_vars ||= [UNSPECIFIED, SUCCESS, FAILURE, WAITING_EKYC, BLOCKING, CANCELLED, REFUNDED].freeze
     end
 
     # Builds the enum from string

data/lib/jamm/api/models/v1_charge_result.rb

@@ -48,6 +48,32 @@ module Api
 
     attr_accessor :processed_at
 
+    attr_accessor :charge_status
+
+    attr_accessor :error
+
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -65,7 +91,9 @@ module Api
         :'metadata' => :'metadata',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt',
-        :'processed_at' => :'processedAt'
+        :'processed_at' => :'processedAt',
+        :'charge_status' => :'chargeStatus',
+        :'error' => :'error'
       }
     end
 
@@ -91,7 +119,9 @@ module Api
         :'metadata' => :'Hash<String, String>',
         :'created_at' => :'Time',
         :'updated_at' => :'Time',
-        :'processed_at' => :'Time'
+        :'processed_at' => :'Time',
+        :'charge_status' => :'ChargeStatus',
+        :'error' => :'ChargeError'
       }
     end
 
@@ -177,6 +207,16 @@ module Api
       if attributes.key?(:'processed_at')
         self.processed_at = attributes[:'processed_at']
       end
+
+      if attributes.key?(:'charge_status')
+        self.charge_status = attributes[:'charge_status']
+      else
+        self.charge_status = 'CHARGE_STATUS_UNSPECIFIED'
+      end
+
+      if attributes.key?(:'error')
+        self.error = attributes[:'error']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -213,7 +253,9 @@ module Api
           metadata == o.metadata &&
           created_at == o.created_at &&
           updated_at == o.updated_at &&
-          processed_at == o.processed_at
+          processed_at == o.processed_at &&
+          charge_status == o.charge_status &&
+          error == o.error
     end
 
     # @see the `==` method
@@ -225,7 +267,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [charge_id, paid, reason, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, token_id, metadata, created_at, updated_at, processed_at].hash
+      [charge_id, paid, reason, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, token_id, metadata, created_at, updated_at, processed_at, charge_status, error].hash
     end
 
     # Builds the object from hash