payjpv2 1.0.11 → 1.2.0

data/lib/payjpv2/models/setup_flow_create_request.rb

@@ -27,6 +27,9 @@ module PAYJPv2
     # 支払い方法が今後どのように使用されるかを指定します。指定されていない場合、この値はデフォルトで `off_session` になります。  | 値 | |:---| | **off_session**: 定期課金など、顧客がカートなどの決済フローにいるかどうか不明な場合は `off_session` を使用してください。 | | **on_session**: 顧客がカートなどの決済フローにいる場合にのみ支払い方法を利用する場合は `on_session` を使用してください。 |
     attr_accessor :usage
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     # 説明。
     attr_accessor :description
 
@@ -62,6 +65,7 @@ module PAYJPv2
         :payment_method_options => :payment_method_options,
         :payment_method_types => :payment_method_types,
         :usage => :usage,
+        :redirect_options => :redirect_options,
         :description => :description,
         :metadata => :metadata
       }
@@ -84,6 +88,7 @@ module PAYJPv2
         :payment_method_options => :'SetupFlowPaymentMethodOptionsRequest',
         :payment_method_types => :'Array<String>',
         :usage => :'Usage',
+        :redirect_options => :'RedirectOptionsRequest',
         :description => :'String',
         :metadata => :'Hash<String, MetadataValue>'
       }
@@ -129,6 +134,10 @@ module PAYJPv2
         self.usage = attributes[:usage]
       end
 
+      if attributes.key?(:redirect_options)
+        self.redirect_options = attributes[:redirect_options]
+      end
+
       if attributes.key?(:description)
         self.description = attributes[:description]
       end
@@ -149,6 +158,7 @@ module PAYJPv2
           payment_method_options == o.payment_method_options &&
           payment_method_types == o.payment_method_types &&
           usage == o.usage &&
+          redirect_options == o.redirect_options &&
           description == o.description &&
           metadata == o.metadata
     end
@@ -162,7 +172,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [customer_id, payment_method_options, payment_method_types, usage, description, metadata].hash
+      [customer_id, payment_method_options, payment_method_types, usage, redirect_options, description, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/setup_flow_response.rb

@@ -47,6 +47,9 @@ module PAYJPv2
 
     attr_accessor :return_url
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     attr_accessor :last_setup_error
 
     attr_accessor :cancellation_reason
@@ -95,6 +98,7 @@ module PAYJPv2
         :status => :status,
         :next_action => :next_action,
         :return_url => :return_url,
+        :redirect_options => :redirect_options,
         :last_setup_error => :last_setup_error,
         :cancellation_reason => :cancellation_reason,
         :created_at => :created_at,
@@ -128,6 +132,7 @@ module PAYJPv2
         :status => :'SetupFlowStatus',
         :next_action => :'Hash<String, Object>',
         :return_url => :'String',
+        :redirect_options => :'RedirectOptionsResponse',
         :last_setup_error => :'Hash<String, Object>',
         :cancellation_reason => :'SetupFlowCancellationReason',
         :created_at => :'Time',
@@ -251,6 +256,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?(:last_setup_error)
         if (value = attributes[:last_setup_error]).is_a?(Hash)
           self.last_setup_error = value
@@ -348,6 +359,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] created_at Value to be assigned
     def created_at=(created_at)
@@ -386,6 +407,7 @@ module PAYJPv2
           status == o.status &&
           next_action == o.next_action &&
           return_url == o.return_url &&
+          redirect_options == o.redirect_options &&
           last_setup_error == o.last_setup_error &&
           cancellation_reason == o.cancellation_reason &&
           created_at == o.created_at &&
@@ -401,7 +423,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [object, id, livemode, client_secret, customer_id, description, metadata, payment_method_id, payment_method_options, payment_method_types, status, next_action, return_url, last_setup_error, cancellation_reason, created_at, updated_at].hash
+      [object, id, livemode, client_secret, customer_id, description, metadata, payment_method_id, payment_method_options, payment_method_types, status, next_action, return_url, redirect_options, last_setup_error, cancellation_reason, created_at, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/setup_flow_update_request.rb

@@ -24,6 +24,9 @@ module PAYJPv2
     # この SetupFlow で使用できる支払い方法の種類のリスト。 指定しない場合は、PAY.JP は支払い方法の設定から利用可能な支払い方法を動的に表示します。
     attr_accessor :payment_method_types
 
+    # return_url へリダイレクトする際のオプション
+    attr_accessor :redirect_options
+
     # 説明。
     attr_accessor :description
 
@@ -58,6 +61,7 @@ module PAYJPv2
         :customer_id => :customer_id,
         :payment_method_options => :payment_method_options,
         :payment_method_types => :payment_method_types,
+        :redirect_options => :redirect_options,
         :description => :description,
         :metadata => :metadata
       }
@@ -79,6 +83,7 @@ module PAYJPv2
         :customer_id => :'String',
         :payment_method_options => :'SetupFlowPaymentMethodOptionsRequest',
         :payment_method_types => :'Array<String>',
+        :redirect_options => :'RedirectOptionsRequest',
         :description => :'String',
         :metadata => :'Hash<String, MetadataValue>'
       }
@@ -120,6 +125,10 @@ module PAYJPv2
         end
       end
 
+      if attributes.key?(:redirect_options)
+        self.redirect_options = attributes[:redirect_options]
+      end
+
       if attributes.key?(:description)
         self.description = attributes[:description]
       end
@@ -139,6 +148,7 @@ module PAYJPv2
           customer_id == o.customer_id &&
           payment_method_options == o.payment_method_options &&
           payment_method_types == o.payment_method_types &&
+          redirect_options == o.redirect_options &&
           description == o.description &&
           metadata == o.metadata
     end
@@ -152,7 +162,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [customer_id, payment_method_options, payment_method_types, description, metadata].hash
+      [customer_id, payment_method_options, payment_method_types, redirect_options, description, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/tax_rate_create_request.rb

@@ -33,6 +33,8 @@ module PAYJPv2
     # 説明。管理画面内のみで表示され、顧客には表示されません。
     attr_accessor :description
 
+    attr_accessor :tax_type
+
     # キーバリューの任意のデータを格納できます。20件まで登録可能で、空文字列を指定するとそのキーを削除できます。<a href=\"https://docs.pay.jp/v2/guide/developers/metadata\">詳細はメタデータのドキュメントを参照してください。</a>
     attr_accessor :metadata
 
@@ -67,6 +69,7 @@ module PAYJPv2
         :active => :active,
         :country => :country,
         :description => :description,
+        :tax_type => :tax_type,
         :metadata => :metadata
       }
     end
@@ -90,6 +93,7 @@ module PAYJPv2
         :active => :'Boolean',
         :country => :'Country',
         :description => :'String',
+        :tax_type => :'TaxType',
         :metadata => :'Hash<String, MetadataValue>'
       }
     end
@@ -97,6 +101,7 @@ module PAYJPv2
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :tax_type,
       ])
     end
 
@@ -148,6 +153,10 @@ module PAYJPv2
         self.description = attributes[:description]
       end
 
+      if attributes.key?(:tax_type)
+        self.tax_type = attributes[:tax_type]
+      end
+
       if attributes.key?(:metadata)
         if (value = attributes[:metadata]).is_a?(Hash)
           self.metadata = value
@@ -204,6 +213,7 @@ module PAYJPv2
           active == o.active &&
           country == o.country &&
           description == o.description &&
+          tax_type == o.tax_type &&
           metadata == o.metadata
     end
 
@@ -216,7 +226,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [display_name, inclusive, percentage, active, country, description, metadata].hash
+      [display_name, inclusive, percentage, active, country, description, tax_type, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/tax_rate_details_response.rb

@@ -39,6 +39,8 @@ module PAYJPv2
 
     attr_accessor :description
 
+    attr_accessor :tax_type
+
     # 作成日時 (UTC, ISO 8601 形式)
     attr_accessor :created_at
 
@@ -82,6 +84,7 @@ module PAYJPv2
         :active => :active,
         :country => :country,
         :description => :description,
+        :tax_type => :tax_type,
         :created_at => :created_at,
         :updated_at => :updated_at,
         :metadata => :metadata
@@ -110,6 +113,7 @@ module PAYJPv2
         :active => :'Boolean',
         :country => :'Country',
         :description => :'String',
+        :tax_type => :'TaxType',
         :created_at => :'Time',
         :updated_at => :'Time',
         :metadata => :'Hash<String, MetadataValue>'
@@ -121,6 +125,7 @@ module PAYJPv2
       Set.new([
         :country,
         :description,
+        :tax_type,
       ])
     end
 
@@ -194,6 +199,12 @@ module PAYJPv2
         self.description = nil
       end
 
+      if attributes.key?(:tax_type)
+        self.tax_type = attributes[:tax_type]
+      else
+        self.tax_type = nil
+      end
+
       if attributes.key?(:created_at)
         self.created_at = attributes[:created_at]
       else
@@ -329,6 +340,7 @@ module PAYJPv2
           active == o.active &&
           country == o.country &&
           description == o.description &&
+          tax_type == o.tax_type &&
           created_at == o.created_at &&
           updated_at == o.updated_at &&
           metadata == o.metadata
@@ -343,7 +355,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [object, id, livemode, display_name, inclusive, percentage, active, country, description, created_at, updated_at, metadata].hash
+      [object, id, livemode, display_name, inclusive, percentage, active, country, description, tax_type, created_at, updated_at, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/tax_rate_update_request.rb

@@ -27,6 +27,8 @@ module PAYJPv2
     # 表示名。顧客に表示されます。
     attr_accessor :display_name
 
+    attr_accessor :tax_type
+
     # キーバリューの任意のデータを格納できます。20件まで登録可能で、空文字列を指定するとそのキーを削除できます。<a href=\"https://docs.pay.jp/v2/guide/developers/metadata\">詳細はメタデータのドキュメントを参照してください。</a>
     attr_accessor :metadata
 
@@ -59,6 +61,7 @@ module PAYJPv2
         :country => :country,
         :description => :description,
         :display_name => :display_name,
+        :tax_type => :tax_type,
         :metadata => :metadata
       }
     end
@@ -80,6 +83,7 @@ module PAYJPv2
         :country => :'Country',
         :description => :'String',
         :display_name => :'String',
+        :tax_type => :'TaxType',
         :metadata => :'Hash<String, MetadataValue>'
       }
     end
@@ -87,6 +91,7 @@ module PAYJPv2
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :tax_type,
       ])
     end
 
@@ -122,6 +127,10 @@ module PAYJPv2
         self.display_name = attributes[:display_name]
       end
 
+      if attributes.key?(:tax_type)
+        self.tax_type = attributes[:tax_type]
+      end
+
       if attributes.key?(:metadata)
         if (value = attributes[:metadata]).is_a?(Hash)
           self.metadata = value
@@ -138,6 +147,7 @@ module PAYJPv2
           country == o.country &&
           description == o.description &&
           display_name == o.display_name &&
+          tax_type == o.tax_type &&
           metadata == o.metadata
     end
 
@@ -150,7 +160,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [active, country, description, display_name, metadata].hash
+      [active, country, description, display_name, tax_type, metadata].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/tax_type.rb

@@ -0,0 +1,39 @@
+=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 TaxType
+    JCT = "jct".freeze
+
+    def self.all_vars
+      @all_vars ||= [JCT].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)
+      new.build_from_hash(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 TaxType.all_vars.include?(value)
+      raise "Invalid ENUM value #{value} for class #TaxType"
+    end
+  end
+end

data/lib/payjpv2/version.rb

@@ -11,5 +11,5 @@ Generator version: 7.14.0
 =end
 
 module PAYJPv2
-  VERSION = '1.0.11'
+  VERSION = '1.2.0'
 end

data/lib/payjpv2.rb

@@ -106,15 +106,19 @@ require 'payjpv2/models/payment_transaction_list_response'
 require 'payjpv2/models/payment_transaction_response'
 require 'payjpv2/models/payment_transaction_type'
 require 'payjpv2/models/price_create_request'
+require 'payjpv2/models/price_data_request'
 require 'payjpv2/models/price_details_response'
 require 'payjpv2/models/price_list_response'
 require 'payjpv2/models/price_type'
 require 'payjpv2/models/price_update_request'
 require 'payjpv2/models/product_create_request'
+require 'payjpv2/models/product_data_request'
 require 'payjpv2/models/product_deleted_response'
 require 'payjpv2/models/product_details_response'
 require 'payjpv2/models/product_list_response'
 require 'payjpv2/models/product_update_request'
+require 'payjpv2/models/redirect_options_request'
+require 'payjpv2/models/redirect_options_response'
 require 'payjpv2/models/setup_flow_cancel_request'
 require 'payjpv2/models/setup_flow_cancellation_reason'
 require 'payjpv2/models/setup_flow_create_request'
@@ -135,6 +139,7 @@ require 'payjpv2/models/tax_rate_create_request'
 require 'payjpv2/models/tax_rate_details_response'
 require 'payjpv2/models/tax_rate_list_response'
 require 'payjpv2/models/tax_rate_update_request'
+require 'payjpv2/models/tax_type'
 require 'payjpv2/models/term_list_response'
 require 'payjpv2/models/term_response'
 require 'payjpv2/models/usage'

data/spec/api/checkout_sessions_api_spec.rb

@@ -65,6 +65,39 @@ describe 'CheckoutSessionsApi' do
     end
   end
 
+  # unit tests for expire_checkout_session
+  # Expire Checkout Session
+  # @param checkout_session_id 
+  # @param [Hash] opts the optional parameters
+  # @return [CheckoutSessionDetailsResponse]
+  describe 'expire_checkout_session test' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+
+    describe 'with mocked api_client' do
+      let(:mock_data) { double('data') }
+      let(:mock_status) { 200 }
+      let(:mock_headers) { { 'Content-Type' => 'application/json' } }
+
+      before do
+        @api_instance.api_client.config.client_side_validation = false
+        allow(@api_instance.api_client).to receive(:call_api)
+          .and_return([mock_data, mock_status, mock_headers])
+      end
+
+      it 'returns data only by default' do
+        result = @api_instance.expire_checkout_session(nil)
+        expect(result).to eq(mock_data)
+      end
+
+      it 'returns [data, status, headers] with include_http_info: true' do
+        result = @api_instance.expire_checkout_session(nil, include_http_info: true)
+        expect(result).to eq([mock_data, mock_status, mock_headers])
+      end
+    end
+  end
+
   # unit tests for get_all_checkout_session_line_items
   # Get All Checkout Session Line Items
   # @param checkout_session_id 

data/spec/models/checkout_session_create_request_spec.rb

@@ -81,6 +81,12 @@ describe PAYJPv2::CheckoutSessionCreateRequest do
     end
   end
 
+  describe 'test attribute "redirect_options"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "currency"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/checkout_session_details_response_spec.rb

@@ -157,6 +157,12 @@ describe PAYJPv2::CheckoutSessionDetailsResponse do
     end
   end
 
+  describe 'test attribute "redirect_options"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "url"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/line_item_request_spec.rb

@@ -33,6 +33,12 @@ describe PAYJPv2::LineItemRequest do
     end
   end
 
+  describe 'test attribute "price_data"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "quantity"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/payment_flow_create_request_spec.rb

@@ -81,6 +81,12 @@ describe PAYJPv2::PaymentFlowCreateRequest do
     end
   end
 
+  describe 'test attribute "redirect_options"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "description"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/payment_flow_response_spec.rb

@@ -127,6 +127,12 @@ describe PAYJPv2::PaymentFlowResponse do
     end
   end
 
+  describe 'test attribute "redirect_options"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "capture_method"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/payment_flow_update_request_spec.rb

@@ -63,6 +63,12 @@ describe PAYJPv2::PaymentFlowUpdateRequest do
     end
   end
 
+  describe 'test attribute "redirect_options"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "description"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/price_data_request_spec.rb

@@ -0,0 +1,54 @@
+=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 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PAYJPv2::PriceDataRequest
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PAYJPv2::PriceDataRequest do
+  let(:instance) { PAYJPv2::PriceDataRequest.new }
+
+  describe 'test an instance of PriceDataRequest' do
+    it 'should create an instance of PriceDataRequest' do
+      # uncomment below to test the instance creation
+      #expect(instance).to be_instance_of(PAYJPv2::PriceDataRequest)
+    end
+  end
+
+  describe 'test attribute "currency"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "unit_amount"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "product_id"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "product_data"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+end

data/spec/models/product_data_request_spec.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 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PAYJPv2::ProductDataRequest
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PAYJPv2::ProductDataRequest do
+  let(:instance) { PAYJPv2::ProductDataRequest.new }
+
+  describe 'test an instance of ProductDataRequest' do
+    it 'should create an instance of ProductDataRequest' do
+      # uncomment below to test the instance creation
+      #expect(instance).to be_instance_of(PAYJPv2::ProductDataRequest)
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "description"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+end