payjpv2 1.1.0 → 1.3.0

data/lib/payjpv2/models/customer_creation.rb

@@ -26,15 +26,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if CustomerCreation.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #CustomerCreation"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/display_preference_request.rb

@@ -60,7 +60,7 @@ module PAYJPv2
     # Attribute type mapping.
     def self.openapi_types
       {
-        :preference => :'String'
+        :preference => :'PaymentMethodConfigurationPreference'
       }
     end
 
@@ -93,13 +93,13 @@ module PAYJPv2
       end
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] preference Object to be assigned
+    # Custom attribute writer method with validation
+    # @param [Object] preference Value to be assigned
     def preference=(preference)
-      validator = EnumAttributeValidator.new('String', ["none", "off", "on"])
-      unless validator.valid?(preference)
-        raise ArgumentError, "invalid value for \"preference\", must be one of #{validator.allowable_values}."
+      if preference.nil?
+        raise ArgumentError, 'preference cannot be nil'
       end
+
       @preference = preference
     end
 

data/lib/payjpv2/models/line_item_request.rb

@@ -110,6 +110,20 @@ module PAYJPv2
       @quantity = quantity
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] tax_rates Value to be assigned
+    def tax_rates=(tax_rates)
+      if tax_rates.nil?
+        raise ArgumentError, 'tax_rates cannot be nil'
+      end
+
+      if tax_rates.length > 1
+        raise ArgumentError, 'invalid value for "tax_rates", number of items must be less than or equal to 1.'
+      end
+
+      @tax_rates = tax_rates
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)

data/lib/payjpv2/models/locale.rb

@@ -26,15 +26,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if Locale.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #Locale"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/payment_dispute_reason.rb

@@ -39,15 +39,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if PaymentDisputeReason.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #PaymentDisputeReason"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/payment_dispute_status.rb

@@ -32,15 +32,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if PaymentDisputeStatus.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #PaymentDisputeStatus"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/payment_flow_cancel_request.rb

@@ -60,7 +60,7 @@ module PAYJPv2
     # Attribute type mapping.
     def self.openapi_types
       {
-        :cancellation_reason => :'String'
+        :cancellation_reason => :'PaymentFlowCancellationReason'
       }
     end
 
@@ -91,16 +91,6 @@ module PAYJPv2
       end
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] cancellation_reason Object to be assigned
-    def cancellation_reason=(cancellation_reason)
-      validator = EnumAttributeValidator.new('String', ["duplicate", "fraudulent", "requested_by_customer", "abandoned"])
-      unless validator.valid?(cancellation_reason)
-        raise ArgumentError, "invalid value for \"cancellation_reason\", must be one of #{validator.allowable_values}."
-      end
-      @cancellation_reason = cancellation_reason
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)

data/lib/payjpv2/models/payment_flow_cancellation_reason.rb

@@ -32,15 +32,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if PaymentFlowCancellationReason.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #PaymentFlowCancellationReason"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/payment_flow_create_request.rb

@@ -42,6 +42,9 @@ module PAYJPv2
     # 顧客が支払いを完了後かキャンセルした後にリダイレクトされる URL。アプリにリダイレクトしたい場合は URI Scheme を指定できます。confirm=true の場合のみ指定できます。
     attr_accessor :return_url
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     # オブジェクトにセットする任意の文字列。
     attr_accessor :description
 
@@ -82,6 +85,7 @@ module PAYJPv2
         :capture_method => :capture_method,
         :confirm => :confirm,
         :return_url => :return_url,
+        :redirect_options => :redirect_options,
         :description => :description,
         :metadata => :metadata
       }
@@ -109,6 +113,7 @@ module PAYJPv2
         :capture_method => :'CaptureMethod',
         :confirm => :'Boolean',
         :return_url => :'String',
+        :redirect_options => :'RedirectOptionsRequest',
         :description => :'String',
         :metadata => :'Hash<String, MetadataValue>'
       }
@@ -180,6 +185,10 @@ module PAYJPv2
         self.return_url = attributes[:return_url]
       end
 
+      if attributes.key?(:redirect_options)
+        self.redirect_options = attributes[:redirect_options]
+      end
+
       if attributes.key?(:description)
         self.description = attributes[:description]
       end
@@ -233,6 +242,7 @@ module PAYJPv2
           capture_method == o.capture_method &&
           confirm == o.confirm &&
           return_url == o.return_url &&
+          redirect_options == o.redirect_options &&
           description == o.description &&
           metadata == o.metadata
     end
@@ -246,7 +256,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [amount, customer_id, payment_method_id, payment_method_options, payment_method_types, currency, capture_method, confirm, return_url, description, metadata].hash
+      [amount, customer_id, payment_method_id, payment_method_options, payment_method_types, currency, capture_method, confirm, return_url, redirect_options, description, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/payment_flow_payment_method_options_card_request.rb

@@ -64,8 +64,8 @@ module PAYJPv2
     # Attribute type mapping.
     def self.openapi_types
       {
-        :request_extended_authorization => :'String',
-        :request_three_d_secure => :'String'
+        :request_extended_authorization => :'RequestExtendedAuthorization',
+        :request_three_d_secure => :'RequestThreeDSecure'
       }
     end
 
@@ -100,26 +100,6 @@ module PAYJPv2
       end
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] request_extended_authorization Object to be assigned
-    def request_extended_authorization=(request_extended_authorization)
-      validator = EnumAttributeValidator.new('String', ["if_available", "must_extend", "never"])
-      unless validator.valid?(request_extended_authorization)
-        raise ArgumentError, "invalid value for \"request_extended_authorization\", must be one of #{validator.allowable_values}."
-      end
-      @request_extended_authorization = request_extended_authorization
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] request_three_d_secure Object to be assigned
-    def request_three_d_secure=(request_three_d_secure)
-      validator = EnumAttributeValidator.new('String', ["any", "automatic"])
-      unless validator.valid?(request_three_d_secure)
-        raise ArgumentError, "invalid value for \"request_three_d_secure\", must be one of #{validator.allowable_values}."
-      end
-      @request_three_d_secure = request_three_d_secure
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)

data/lib/payjpv2/models/payment_flow_response.rb

@@ -54,6 +54,9 @@ module PAYJPv2
 
     attr_accessor :return_url
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     # 支払いの確定方法  | 値 | |:---| | **automatic**: (デフォルト) 顧客が支払いを承認すると、自動的に確定させます。 | | **manual**: 顧客が支払いを承認すると一旦確定を保留し、後で Capture API を使用して確定します。（すべての支払い方法がこれをサポートしているわけではありません）。 |
     attr_accessor :capture_method
 
@@ -115,6 +118,7 @@ module PAYJPv2
         :status => :status,
         :next_action => :next_action,
         :return_url => :return_url,
+        :redirect_options => :redirect_options,
         :capture_method => :capture_method,
         :last_payment_error => :last_payment_error,
         :cancellation_reason => :cancellation_reason,
@@ -155,6 +159,7 @@ module PAYJPv2
         :status => :'PaymentFlowStatus',
         :next_action => :'Hash<String, Object>',
         :return_url => :'String',
+        :redirect_options => :'RedirectOptionsResponse',
         :capture_method => :'CaptureMethod',
         :last_payment_error => :'Hash<String, Object>',
         :cancellation_reason => :'PaymentFlowCancellationReason',
@@ -302,6 +307,12 @@ module PAYJPv2
         self.return_url = nil
       end
 
+      if attributes.key?(:redirect_options)
+        self.redirect_options = attributes[:redirect_options]
+      else
+        self.redirect_options = nil
+      end
+
       if attributes.key?(:capture_method)
         self.capture_method = attributes[:capture_method]
       else
@@ -433,6 +444,16 @@ module PAYJPv2
       @status = status
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] redirect_options Value to be assigned
+    def redirect_options=(redirect_options)
+      if redirect_options.nil?
+        raise ArgumentError, 'redirect_options cannot be nil'
+      end
+
+      @redirect_options = redirect_options
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] capture_method Value to be assigned
     def capture_method=(capture_method)
@@ -494,6 +515,7 @@ module PAYJPv2
           status == o.status &&
           next_action == o.next_action &&
           return_url == o.return_url &&
+          redirect_options == o.redirect_options &&
           capture_method == o.capture_method &&
           last_payment_error == o.last_payment_error &&
           cancellation_reason == o.cancellation_reason &&
@@ -513,7 +535,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [object, id, livemode, amount, currency, amount_capturable, amount_received, client_secret, customer_id, description, payment_method_id, payment_method_options, payment_method_types, status, next_action, return_url, capture_method, last_payment_error, cancellation_reason, canceled_at, expired_at, metadata, created_at, updated_at].hash
+      [object, id, livemode, amount, currency, amount_capturable, amount_received, client_secret, customer_id, description, payment_method_id, payment_method_options, payment_method_types, status, next_action, return_url, redirect_options, capture_method, last_payment_error, cancellation_reason, canceled_at, expired_at, metadata, created_at, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/payment_flow_status.rb

@@ -31,15 +31,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if PaymentFlowStatus.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #PaymentFlowStatus"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end

data/lib/payjpv2/models/payment_flow_update_request.rb

@@ -33,6 +33,9 @@ module PAYJPv2
     # 顧客が支払いを完了後かキャンセルした後にリダイレクトされる URL。アプリにリダイレクトしたい場合は URI Scheme を指定できます。
     attr_accessor :return_url
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     # オブジェクトにセットする任意の文字列。
     attr_accessor :description
 
@@ -48,6 +51,7 @@ module PAYJPv2
         :payment_method_options => :payment_method_options,
         :payment_method_types => :payment_method_types,
         :return_url => :return_url,
+        :redirect_options => :redirect_options,
         :description => :description,
         :metadata => :metadata
       }
@@ -72,6 +76,7 @@ module PAYJPv2
         :payment_method_options => :'PaymentFlowPaymentMethodOptionsRequest',
         :payment_method_types => :'Array<PaymentMethodTypes>',
         :return_url => :'String',
+        :redirect_options => :'RedirectOptionsRequest',
         :description => :'String',
         :metadata => :'Hash<String, MetadataValue>'
       }
@@ -125,6 +130,10 @@ module PAYJPv2
         self.return_url = attributes[:return_url]
       end
 
+      if attributes.key?(:redirect_options)
+        self.redirect_options = attributes[:redirect_options]
+      end
+
       if attributes.key?(:description)
         self.description = attributes[:description]
       end
@@ -165,6 +174,7 @@ module PAYJPv2
           payment_method_options == o.payment_method_options &&
           payment_method_types == o.payment_method_types &&
           return_url == o.return_url &&
+          redirect_options == o.redirect_options &&
           description == o.description &&
           metadata == o.metadata
     end
@@ -178,7 +188,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [amount, customer_id, payment_method_id, payment_method_options, payment_method_types, return_url, description, metadata].hash
+      [amount, customer_id, payment_method_id, payment_method_options, payment_method_types, return_url, redirect_options, description, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/payment_method_card_details_response.rb

@@ -18,7 +18,6 @@ module PAYJPv2
     # カードの下4桁
     attr_accessor :last4
 
-    # カードのブランド
     attr_accessor :brand
 
     # カードの有効期限（月）
@@ -32,6 +31,30 @@ module PAYJPv2
 
     attr_accessor :country
 
+    attr_accessor :funding
+
+    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
       {
@@ -40,7 +63,8 @@ module PAYJPv2
         :exp_month => :exp_month,
         :exp_year => :exp_year,
         :fingerprint => :fingerprint,
-        :country => :country
+        :country => :country,
+        :funding => :funding
       }
     end
 
@@ -58,18 +82,20 @@ module PAYJPv2
     def self.openapi_types
       {
         :last4 => :'String',
-        :brand => :'String',
+        :brand => :'CardBrand',
         :exp_month => :'Integer',
         :exp_year => :'Integer',
         :fingerprint => :'String',
-        :country => :'String'
+        :country => :'String',
+        :funding => :'CardFunding'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :country
+        :country,
+        :funding
       ])
     end
 
@@ -124,6 +150,12 @@ module PAYJPv2
       else
         self.country = nil
       end
+
+      if attributes.key?(:funding)
+        self.funding = attributes[:funding]
+      else
+        self.funding = nil
+      end
     end
 
     # Custom attribute writer method with validation
@@ -186,7 +218,8 @@ module PAYJPv2
           exp_month == o.exp_month &&
           exp_year == o.exp_year &&
           fingerprint == o.fingerprint &&
-          country == o.country
+          country == o.country &&
+          funding == o.funding
     end
 
     # @see the `==` method
@@ -198,7 +231,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [last4, brand, exp_month, exp_year, fingerprint, country].hash
+      [last4, brand, exp_month, exp_year, fingerprint, country, funding].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/payment_method_configuration_display_preference.rb

@@ -64,8 +64,8 @@ module PAYJPv2
     # Attribute type mapping.
     def self.openapi_types
       {
-        :preference => :'String',
-        :value => :'String'
+        :preference => :'PaymentMethodConfigurationPreference',
+        :value => :'PaymentMethodConfigurationValue'
       }
     end
 
@@ -100,26 +100,6 @@ module PAYJPv2
       end
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] preference Object to be assigned
-    def preference=(preference)
-      validator = EnumAttributeValidator.new('String', ["none", "off", "on"])
-      unless validator.valid?(preference)
-        raise ArgumentError, "invalid value for \"preference\", must be one of #{validator.allowable_values}."
-      end
-      @preference = preference
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] value Object to be assigned
-    def value=(value)
-      validator = EnumAttributeValidator.new('String', ["off", "on"])
-      unless validator.valid?(value)
-        raise ArgumentError, "invalid value for \"value\", must be one of #{validator.allowable_values}."
-      end
-      @value = value
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)

data/lib/payjpv2/models/payment_method_configuration_preference.rb

@@ -0,0 +1,42 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PAYJPv2
+  class PaymentMethodConfigurationPreference
+    ON = "on".freeze
+    OFF = "off".freeze
+    NONE = "none".freeze
+
+    def self.all_vars
+      @all_vars ||= [ON, OFF, NONE].freeze
+    end
+
+    # Builds the enum from string
+    # @param [String] The enum value in the form of the string
+    # @return [String] The enum value
+    def self.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
+    end
+
+    # Builds the enum from string
+    # @param [String] The enum value in the form of the string
+    # @return [String] The enum value
+    def build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
+    end
+  end
+end

data/lib/payjpv2/models/payment_method_configuration_value.rb

@@ -0,0 +1,41 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PAYJPv2
+  class PaymentMethodConfigurationValue
+    ON = "on".freeze
+    OFF = "off".freeze
+
+    def self.all_vars
+      @all_vars ||= [ON, OFF].freeze
+    end
+
+    # Builds the enum from string
+    # @param [String] The enum value in the form of the string
+    # @return [String] The enum value
+    def self.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
+    end
+
+    # Builds the enum from string
+    # @param [String] The enum value in the form of the string
+    # @return [String] The enum value
+    def build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
+    end
+  end
+end

data/lib/payjpv2/models/payment_method_types.rb

@@ -27,15 +27,16 @@ module PAYJPv2
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def self.build_from_hash(value)
-      new.build_from_hash(value)
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      return value if PaymentMethodTypes.all_vars.include?(value)
-      raise "Invalid ENUM value #{value} for class #PaymentMethodTypes"
+      # Return unknown values as-is so that enum values added on the API side do not break older clients
+      value
     end
   end
 end