yoomoney 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8c0d19b753c15f1a35d09005b4802fa18675662c632968f6d2089b217df3c1
-  data.tar.gz: b2a4b06cfc640d396a251baec125b60eeb9ab68328177b169353d8a2ad51e323
+  metadata.gz: 7fc7cc115fd073113e5c5ddd6f74a1dc490e0eb17283cdc0ead7e84fff2c8c28
+  data.tar.gz: 758d082193bdc8e9927eab64242366e627b9f6ab180041d7805ee0ef0ab9ce5b
 SHA512:
-  metadata.gz: 72ec1d4c85653a922dff564453b8163f048254a5cd3759e13694f9af98864202ae650ced15543a21604408baa7f5570aa22c181c08391c47f35a8b9514d05720
-  data.tar.gz: e378220ca735b248a46055d4ca0cd87e99b409f09bfedefc7ff30a6ff74f61ba71f8d2f3d321c2f02b832f53fb9ed62e5a3a60e6f32bf7b035eeaef7863205e5
+  metadata.gz: 5499ebb0a382b81f5e8ac81aa2c4b926e52745dc9f162418f00939eefb0ca71db17dfcf8d7277f22dec6145224eafc61294b011e7f2443d17290124672ec5731
+  data.tar.gz: 43206f99994d0cb058341d71613ba1a935cd62980a5d9004cf0240ae42d065d8df0de61a7cc87e89058748d66b5c2d97ae5b80e2e04b714d4c6ecac2abc8422c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.4.0 (2026-02-19)
+
+Full Changelog: [v0.3.0...v0.4.0](https://github.com/Hexlet/yoomoney-ruby/compare/v0.3.0...v0.4.0)
+
+### Features
+
+* **api:** api update ([c792fd8](https://github.com/Hexlet/yoomoney-ruby/commit/c792fd813fb0c1937753a2deda1c1d763af4081d))
+
 ## 0.3.0 (2026-02-19)
 
 Full Changelog: [v0.2.0...v0.3.0](https://github.com/Hexlet/yoomoney-ruby/compare/v0.2.0...v0.3.0)

data/README.md

@@ -15,7 +15,7 @@ To use this gem, install via Bundler by adding the following to your application
 <!-- x-release-please-start-version -->
 
 ```ruby
-gem "yoomoney", "~> 0.3.0"
+gem "yoomoney", "~> 0.4.0"
 ```
 
 <!-- x-release-please-end -->

data/lib/yoomoney/models/airline.rb

@@ -10,13 +10,13 @@ module Yoomoney
 
       # @!attribute legs
       #
-      #   @return [Array<Yoomoney::Models::AirlineLeg>, nil]
-      optional :legs, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::AirlineLeg] }
+      #   @return [Array<Yoomoney::Models::Airline::Leg>, nil]
+      optional :legs, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::Airline::Leg] }
 
       # @!attribute passengers
       #
-      #   @return [Array<Yoomoney::Models::AirlinePassenger>, nil]
-      optional :passengers, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::AirlinePassenger] }
+      #   @return [Array<Yoomoney::Models::Airline::Passenger>, nil]
+      optional :passengers, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::Airline::Passenger] }
 
       # @!attribute ticket_number
       #
@@ -25,9 +25,53 @@ module Yoomoney
 
       # @!method initialize(booking_reference: nil, legs: nil, passengers: nil, ticket_number: nil)
       #   @param booking_reference [String]
-      #   @param legs [Array<Yoomoney::Models::AirlineLeg>]
-      #   @param passengers [Array<Yoomoney::Models::AirlinePassenger>]
+      #   @param legs [Array<Yoomoney::Models::Airline::Leg>]
+      #   @param passengers [Array<Yoomoney::Models::Airline::Passenger>]
       #   @param ticket_number [String]
+
+      class Leg < Yoomoney::Internal::Type::BaseModel
+        # @!attribute departure_airport
+        #
+        #   @return [String]
+        required :departure_airport, String
+
+        # @!attribute departure_date
+        #
+        #   @return [String]
+        required :departure_date, String
+
+        # @!attribute destination_airport
+        #
+        #   @return [String]
+        required :destination_airport, String
+
+        # @!attribute carrier_code
+        #
+        #   @return [String, nil]
+        optional :carrier_code, String
+
+        # @!method initialize(departure_airport:, departure_date:, destination_airport:, carrier_code: nil)
+        #   @param departure_airport [String]
+        #   @param departure_date [String]
+        #   @param destination_airport [String]
+        #   @param carrier_code [String]
+      end
+
+      class Passenger < Yoomoney::Internal::Type::BaseModel
+        # @!attribute first_name
+        #
+        #   @return [String]
+        required :first_name, String
+
+        # @!attribute last_name
+        #
+        #   @return [String]
+        required :last_name, String
+
+        # @!method initialize(first_name:, last_name:)
+        #   @param first_name [String]
+        #   @param last_name [String]
+      end
     end
   end
 end

data/lib/yoomoney/models/receipt_create_params.rb

@@ -129,7 +129,31 @@ module Yoomoney
       #
       #   @param request_options [Yoomoney::RequestOptions, Hash{Symbol=>Object}]
 
-      class Item < Yoomoney::Models::ReceiptDataItem
+      class Item < Yoomoney::Internal::Type::BaseModel
+        # @!attribute amount
+        #   Сумма.
+        #
+        #   @return [Yoomoney::Models::MonetaryAmount]
+        required :amount, -> { Yoomoney::MonetaryAmount }
+
+        # @!attribute description
+        #   Название товара.
+        #
+        #   @return [String]
+        required :description, String
+
+        # @!attribute quantity
+        #   Количество.
+        #
+        #   @return [Float]
+        required :quantity, Float
+
+        # @!attribute vat_code
+        #   Ставка НДС.
+        #
+        #   @return [Integer]
+        required :vat_code, Integer
+
         # @!attribute additional_payment_subject_props
         #   Дополнительный реквизит предмета расчета.
         #
@@ -141,18 +165,112 @@ module Yoomoney
         #   @return [Symbol, Yoomoney::Models::ReceiptItemAgentType, nil]
         optional :agent_type, enum: -> { Yoomoney::ReceiptItemAgentType }
 
+        # @!attribute country_of_origin_code
+        #
+        #   @return [String, nil]
+        optional :country_of_origin_code, String
+
+        # @!attribute customs_declaration_number
+        #
+        #   @return [String, nil]
+        optional :customs_declaration_number, String
+
+        # @!attribute excise
+        #
+        #   @return [String, nil]
+        optional :excise, String
+
+        # @!attribute mark_code_info
+        #
+        #   @return [Yoomoney::Models::MarkCodeInfo, nil]
+        optional :mark_code_info, -> { Yoomoney::MarkCodeInfo }
+
+        # @!attribute mark_mode
+        #
+        #   @return [String, nil]
+        optional :mark_mode, String
+
+        # @!attribute mark_quantity
+        #
+        #   @return [Yoomoney::Models::MarkQuantity, nil]
+        optional :mark_quantity, -> { Yoomoney::MarkQuantity }
+
+        # @!attribute measure
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemMeasure, nil]
+        optional :measure, enum: -> { Yoomoney::ReceiptItemMeasure }
+
+        # @!attribute payment_mode
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentMode, nil]
+        optional :payment_mode, enum: -> { Yoomoney::ReceiptItemPaymentMode }
+
+        # @!attribute payment_subject
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject, nil]
+        optional :payment_subject, enum: -> { Yoomoney::ReceiptItemPaymentSubject }
+
+        # @!attribute payment_subject_industry_details
+        #
+        #   @return [Array<Yoomoney::Models::IndustryDetails>, nil]
+        optional :payment_subject_industry_details,
+                 -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::IndustryDetails] }
+
+        # @!attribute planned_status
+        #
+        #   @return [Integer, nil]
+        optional :planned_status, Integer
+
+        # @!attribute product_code
+        #
+        #   @return [String, nil]
+        optional :product_code, String
+
         # @!attribute supplier
         #
         #   @return [Yoomoney::Models::ReceiptCreateParams::Item::Supplier, nil]
         optional :supplier, -> { Yoomoney::ReceiptCreateParams::Item::Supplier }
 
-        # @!method initialize(additional_payment_subject_props: nil, agent_type: nil, supplier: nil)
+        # @!method initialize(amount:, description:, quantity:, vat_code:, additional_payment_subject_props: nil, agent_type: nil, country_of_origin_code: nil, customs_declaration_number: nil, excise: nil, mark_code_info: nil, mark_mode: nil, mark_quantity: nil, measure: nil, payment_mode: nil, payment_subject: nil, payment_subject_industry_details: nil, planned_status: nil, product_code: nil, supplier: nil)
+        #   @param amount [Yoomoney::Models::MonetaryAmount] Сумма.
+        #
+        #   @param description [String] Название товара.
+        #
+        #   @param quantity [Float] Количество.
+        #
+        #   @param vat_code [Integer] Ставка НДС.
+        #
         #   @param additional_payment_subject_props [String] Дополнительный реквизит предмета расчета.
         #
         #   @param agent_type [Symbol, Yoomoney::Models::ReceiptItemAgentType]
         #
+        #   @param country_of_origin_code [String]
+        #
+        #   @param customs_declaration_number [String]
+        #
+        #   @param excise [String]
+        #
+        #   @param mark_code_info [Yoomoney::Models::MarkCodeInfo]
+        #
+        #   @param mark_mode [String]
+        #
+        #   @param mark_quantity [Yoomoney::Models::MarkQuantity]
+        #
+        #   @param measure [Symbol, Yoomoney::Models::ReceiptItemMeasure]
+        #
+        #   @param payment_mode [Symbol, Yoomoney::Models::ReceiptItemPaymentMode]
+        #
+        #   @param payment_subject [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject]
+        #
+        #   @param payment_subject_industry_details [Array<Yoomoney::Models::IndustryDetails>]
+        #
+        #   @param planned_status [Integer]
+        #
+        #   @param product_code [String]
+        #
         #   @param supplier [Yoomoney::Models::ReceiptCreateParams::Item::Supplier]
 
+        # @see Yoomoney::Models::ReceiptCreateParams::Item#supplier
         class Supplier < Yoomoney::Models::ReceiptItemSupplier
           # @!attribute inn
           #

data/lib/yoomoney/models/receipt_data.rb

@@ -5,8 +5,8 @@ module Yoomoney
     class ReceiptData < Yoomoney::Internal::Type::BaseModel
       # @!attribute items
       #
-      #   @return [Array<Yoomoney::Models::ReceiptDataItem>]
-      required :items, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::ReceiptDataItem] }
+      #   @return [Array<Yoomoney::Models::ReceiptData::Item>]
+      required :items, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::ReceiptData::Item] }
 
       # @!attribute customer
       #
@@ -39,13 +39,133 @@ module Yoomoney
       optional :timezone, String
 
       # @!method initialize(items:, customer: nil, internet: nil, receipt_industry_details: nil, receipt_operational_details: nil, tax_system_code: nil, timezone: nil)
-      #   @param items [Array<Yoomoney::Models::ReceiptDataItem>]
+      #   @param items [Array<Yoomoney::Models::ReceiptData::Item>]
       #   @param customer [Yoomoney::Models::ReceiptDataCustomer]
       #   @param internet [Boolean]
       #   @param receipt_industry_details [Array<Yoomoney::Models::IndustryDetails>]
       #   @param receipt_operational_details [Yoomoney::Models::OperationalDetails]
       #   @param tax_system_code [Integer]
       #   @param timezone [String]
+
+      class Item < Yoomoney::Internal::Type::BaseModel
+        # @!attribute amount
+        #   Сумма.
+        #
+        #   @return [Yoomoney::Models::MonetaryAmount]
+        required :amount, -> { Yoomoney::MonetaryAmount }
+
+        # @!attribute description
+        #   Название товара.
+        #
+        #   @return [String]
+        required :description, String
+
+        # @!attribute quantity
+        #   Количество.
+        #
+        #   @return [Float]
+        required :quantity, Float
+
+        # @!attribute vat_code
+        #   Ставка НДС.
+        #
+        #   @return [Integer]
+        required :vat_code, Integer
+
+        # @!attribute country_of_origin_code
+        #
+        #   @return [String, nil]
+        optional :country_of_origin_code, String
+
+        # @!attribute customs_declaration_number
+        #
+        #   @return [String, nil]
+        optional :customs_declaration_number, String
+
+        # @!attribute excise
+        #
+        #   @return [String, nil]
+        optional :excise, String
+
+        # @!attribute mark_code_info
+        #
+        #   @return [Yoomoney::Models::MarkCodeInfo, nil]
+        optional :mark_code_info, -> { Yoomoney::MarkCodeInfo }
+
+        # @!attribute mark_mode
+        #
+        #   @return [String, nil]
+        optional :mark_mode, String
+
+        # @!attribute mark_quantity
+        #
+        #   @return [Yoomoney::Models::MarkQuantity, nil]
+        optional :mark_quantity, -> { Yoomoney::MarkQuantity }
+
+        # @!attribute measure
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemMeasure, nil]
+        optional :measure, enum: -> { Yoomoney::ReceiptItemMeasure }
+
+        # @!attribute payment_mode
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentMode, nil]
+        optional :payment_mode, enum: -> { Yoomoney::ReceiptItemPaymentMode }
+
+        # @!attribute payment_subject
+        #
+        #   @return [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject, nil]
+        optional :payment_subject, enum: -> { Yoomoney::ReceiptItemPaymentSubject }
+
+        # @!attribute payment_subject_industry_details
+        #
+        #   @return [Array<Yoomoney::Models::IndustryDetails>, nil]
+        optional :payment_subject_industry_details,
+                 -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::IndustryDetails] }
+
+        # @!attribute planned_status
+        #
+        #   @return [Integer, nil]
+        optional :planned_status, Integer
+
+        # @!attribute product_code
+        #
+        #   @return [String, nil]
+        optional :product_code, String
+
+        # @!method initialize(amount:, description:, quantity:, vat_code:, country_of_origin_code: nil, customs_declaration_number: nil, excise: nil, mark_code_info: nil, mark_mode: nil, mark_quantity: nil, measure: nil, payment_mode: nil, payment_subject: nil, payment_subject_industry_details: nil, planned_status: nil, product_code: nil)
+        #   @param amount [Yoomoney::Models::MonetaryAmount] Сумма.
+        #
+        #   @param description [String] Название товара.
+        #
+        #   @param quantity [Float] Количество.
+        #
+        #   @param vat_code [Integer] Ставка НДС.
+        #
+        #   @param country_of_origin_code [String]
+        #
+        #   @param customs_declaration_number [String]
+        #
+        #   @param excise [String]
+        #
+        #   @param mark_code_info [Yoomoney::Models::MarkCodeInfo]
+        #
+        #   @param mark_mode [String]
+        #
+        #   @param mark_quantity [Yoomoney::Models::MarkQuantity]
+        #
+        #   @param measure [Symbol, Yoomoney::Models::ReceiptItemMeasure]
+        #
+        #   @param payment_mode [Symbol, Yoomoney::Models::ReceiptItemPaymentMode]
+        #
+        #   @param payment_subject [Symbol, Yoomoney::Models::ReceiptItemPaymentSubject]
+        #
+        #   @param payment_subject_industry_details [Array<Yoomoney::Models::IndustryDetails>]
+        #
+        #   @param planned_status [Integer]
+        #
+        #   @param product_code [String]
+      end
     end
   end
 end

data/lib/yoomoney/models.rb

@@ -41,10 +41,6 @@ module Yoomoney
 
   Airline = Yoomoney::Models::Airline
 
-  AirlineLeg = Yoomoney::Models::AirlineLeg
-
-  AirlinePassenger = Yoomoney::Models::AirlinePassenger
-
   B2bSberbankCalculatedVatData = Yoomoney::Models::B2bSberbankCalculatedVatData
 
   B2bSberbankMixedVatData = Yoomoney::Models::B2bSberbankMixedVatData
@@ -175,8 +171,6 @@ module Yoomoney
 
   ReceiptDataCustomer = Yoomoney::Models::ReceiptDataCustomer
 
-  ReceiptDataItem = Yoomoney::Models::ReceiptDataItem
-
   ReceiptItemAgentType = Yoomoney::Models::ReceiptItemAgentType
 
   ReceiptItemMeasure = Yoomoney::Models::ReceiptItemMeasure

data/lib/yoomoney/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yoomoney
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/yoomoney.rb

@@ -64,11 +64,8 @@ require_relative "yoomoney/models/confirmation_data"
 require_relative "yoomoney/models/payout_destination"
 require_relative "yoomoney/models/payout_destination_data"
 require_relative "yoomoney/models/receipt_item_supplier"
-require_relative "yoomoney/models/receipt_data_item"
 require_relative "yoomoney/models/refund_method"
 require_relative "yoomoney/models/airline"
-require_relative "yoomoney/models/airline_leg"
-require_relative "yoomoney/models/airline_passenger"
 require_relative "yoomoney/models/b2b_sberbank_calculated_vat_data"
 require_relative "yoomoney/models/b2b_sberbank_mixed_vat_data"
 require_relative "yoomoney/models/b2b_sberbank_untaxed_vat_data"

data/rbi/yoomoney/models/airline.rbi

@@ -12,17 +12,17 @@ module Yoomoney
       sig { params(booking_reference: String).void }
       attr_writer :booking_reference
 
-      sig { returns(T.nilable(T::Array[Yoomoney::AirlineLeg])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::Airline::Leg])) }
       attr_reader :legs
 
-      sig { params(legs: T::Array[Yoomoney::AirlineLeg::OrHash]).void }
+      sig { params(legs: T::Array[Yoomoney::Airline::Leg::OrHash]).void }
       attr_writer :legs
 
-      sig { returns(T.nilable(T::Array[Yoomoney::AirlinePassenger])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::Airline::Passenger])) }
       attr_reader :passengers
 
       sig do
-        params(passengers: T::Array[Yoomoney::AirlinePassenger::OrHash]).void
+        params(passengers: T::Array[Yoomoney::Airline::Passenger::OrHash]).void
       end
       attr_writer :passengers
 
@@ -35,8 +35,8 @@ module Yoomoney
       sig do
         params(
           booking_reference: String,
-          legs: T::Array[Yoomoney::AirlineLeg::OrHash],
-          passengers: T::Array[Yoomoney::AirlinePassenger::OrHash],
+          legs: T::Array[Yoomoney::Airline::Leg::OrHash],
+          passengers: T::Array[Yoomoney::Airline::Passenger::OrHash],
           ticket_number: String
         ).returns(T.attached_class)
       end
@@ -52,14 +52,90 @@ module Yoomoney
         override.returns(
           {
             booking_reference: String,
-            legs: T::Array[Yoomoney::AirlineLeg],
-            passengers: T::Array[Yoomoney::AirlinePassenger],
+            legs: T::Array[Yoomoney::Airline::Leg],
+            passengers: T::Array[Yoomoney::Airline::Passenger],
             ticket_number: String
           }
         )
       end
       def to_hash
       end
+
+      class Leg < Yoomoney::Internal::Type::BaseModel
+        OrHash =
+          T.type_alias do
+            T.any(Yoomoney::Airline::Leg, Yoomoney::Internal::AnyHash)
+          end
+
+        sig { returns(String) }
+        attr_accessor :departure_airport
+
+        sig { returns(String) }
+        attr_accessor :departure_date
+
+        sig { returns(String) }
+        attr_accessor :destination_airport
+
+        sig { returns(T.nilable(String)) }
+        attr_reader :carrier_code
+
+        sig { params(carrier_code: String).void }
+        attr_writer :carrier_code
+
+        sig do
+          params(
+            departure_airport: String,
+            departure_date: String,
+            destination_airport: String,
+            carrier_code: String
+          ).returns(T.attached_class)
+        end
+        def self.new(
+          departure_airport:,
+          departure_date:,
+          destination_airport:,
+          carrier_code: nil
+        )
+        end
+
+        sig do
+          override.returns(
+            {
+              departure_airport: String,
+              departure_date: String,
+              destination_airport: String,
+              carrier_code: String
+            }
+          )
+        end
+        def to_hash
+        end
+      end
+
+      class Passenger < Yoomoney::Internal::Type::BaseModel
+        OrHash =
+          T.type_alias do
+            T.any(Yoomoney::Airline::Passenger, Yoomoney::Internal::AnyHash)
+          end
+
+        sig { returns(String) }
+        attr_accessor :first_name
+
+        sig { returns(String) }
+        attr_accessor :last_name
+
+        sig do
+          params(first_name: String, last_name: String).returns(
+            T.attached_class
+          )
+        end
+        def self.new(first_name:, last_name:)
+        end
+
+        sig { override.returns({ first_name: String, last_name: String }) }
+        def to_hash
+        end
+      end
     end
   end
 end