yoomoney 0.1.0 → 0.3.0

data/lib/yoomoney/models/receipt_data_item.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module Yoomoney
+  module Models
+    class ReceiptDataItem < 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

data/lib/yoomoney/models/refund.rb

@@ -145,32 +145,15 @@ module Yoomoney
         # @!attribute refund_settlements
         #   Данные о распределении денег.
         #
-        #   @return [Array<Yoomoney::Models::Refund::Deal::RefundSettlement>]
-        required :refund_settlements,
-                 -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::Refund::Deal::RefundSettlement] }
+        #   @return [Array<Yoomoney::Models::SettlementRefundItem>]
+        required :refund_settlements, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::SettlementRefundItem] }
 
         # @!method initialize(id:, refund_settlements:)
         #   Данные о сделке.
         #
         #   @param id [String] Идентификатор сделки.
         #
-        #   @param refund_settlements [Array<Yoomoney::Models::Refund::Deal::RefundSettlement>] Данные о распределении денег.
-
-        class RefundSettlement < Yoomoney::Internal::Type::BaseModel
-          # @!attribute amount
-          #
-          #   @return [Yoomoney::Models::MonetaryAmount]
-          required :amount, -> { Yoomoney::MonetaryAmount }
-
-          # @!attribute type
-          #
-          #   @return [Symbol, Yoomoney::Models::SettlementItemType]
-          required :type, enum: -> { Yoomoney::SettlementItemType }
-
-          # @!method initialize(amount:, type:)
-          #   @param amount [Yoomoney::Models::MonetaryAmount]
-          #   @param type [Symbol, Yoomoney::Models::SettlementItemType]
-        end
+        #   @param refund_settlements [Array<Yoomoney::Models::SettlementRefundItem>] Данные о распределении денег.
       end
 
       # @see Yoomoney::Models::Refund#refund_authorization_details

data/lib/yoomoney/models/refund_create_params.rb

@@ -91,30 +91,13 @@ module Yoomoney
         # @!attribute refund_settlements
         #   Данные о распределении денег.
         #
-        #   @return [Array<Yoomoney::Models::RefundCreateParams::Deal::RefundSettlement>]
-        required :refund_settlements,
-                 -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::RefundCreateParams::Deal::RefundSettlement] }
+        #   @return [Array<Yoomoney::Models::SettlementRefundItem>]
+        required :refund_settlements, -> { Yoomoney::Internal::Type::ArrayOf[Yoomoney::SettlementRefundItem] }
 
         # @!method initialize(refund_settlements:)
         #   Данные о сделке.
         #
-        #   @param refund_settlements [Array<Yoomoney::Models::RefundCreateParams::Deal::RefundSettlement>] Данные о распределении денег.
-
-        class RefundSettlement < Yoomoney::Internal::Type::BaseModel
-          # @!attribute amount
-          #
-          #   @return [Yoomoney::Models::MonetaryAmount]
-          required :amount, -> { Yoomoney::MonetaryAmount }
-
-          # @!attribute type
-          #
-          #   @return [Symbol, Yoomoney::Models::SettlementItemType]
-          required :type, enum: -> { Yoomoney::SettlementItemType }
-
-          # @!method initialize(amount:, type:)
-          #   @param amount [Yoomoney::Models::MonetaryAmount]
-          #   @param type [Symbol, Yoomoney::Models::SettlementItemType]
-        end
+        #   @param refund_settlements [Array<Yoomoney::Models::SettlementRefundItem>] Данные о распределении денег.
       end
 
       class RefundMethodData < Yoomoney::Internal::Type::BaseModel

data/lib/yoomoney/models/settlement_payment_item.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Yoomoney
+  module Models
+    class SettlementPaymentItem < Yoomoney::Internal::Type::BaseModel
+      # @!attribute amount
+      #
+      #   @return [Yoomoney::Models::MonetaryAmount]
+      required :amount, -> { Yoomoney::MonetaryAmount }
+
+      # @!attribute type
+      #
+      #   @return [Symbol, Yoomoney::Models::SettlementItemType]
+      required :type, enum: -> { Yoomoney::SettlementItemType }
+
+      # @!method initialize(amount:, type:)
+      #   @param amount [Yoomoney::Models::MonetaryAmount]
+      #   @param type [Symbol, Yoomoney::Models::SettlementItemType]
+    end
+  end
+end

data/lib/yoomoney/models/settlement_refund_item.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Yoomoney
+  module Models
+    class SettlementRefundItem < Yoomoney::Internal::Type::BaseModel
+      # @!attribute amount
+      #
+      #   @return [Yoomoney::Models::MonetaryAmount]
+      required :amount, -> { Yoomoney::MonetaryAmount }
+
+      # @!attribute type
+      #
+      #   @return [Symbol, Yoomoney::Models::SettlementItemType]
+      required :type, enum: -> { Yoomoney::SettlementItemType }
+
+      # @!method initialize(amount:, type:)
+      #   @param amount [Yoomoney::Models::MonetaryAmount]
+      #   @param type [Symbol, Yoomoney::Models::SettlementItemType]
+    end
+  end
+end

data/lib/yoomoney/models.rb

@@ -41,6 +41,10 @@ module Yoomoney
 
   Airline = Yoomoney::Models::Airline
 
+  AirlineLeg = Yoomoney::Models::AirlineLeg
+
+  AirlinePassenger = Yoomoney::Models::AirlinePassenger
+
   B2bSberbankCalculatedVatData = Yoomoney::Models::B2bSberbankCalculatedVatData
 
   B2bSberbankMixedVatData = Yoomoney::Models::B2bSberbankMixedVatData
@@ -171,6 +175,8 @@ module Yoomoney
 
   ReceiptDataCustomer = Yoomoney::Models::ReceiptDataCustomer
 
+  ReceiptDataItem = Yoomoney::Models::ReceiptDataItem
+
   ReceiptItemAgentType = Yoomoney::Models::ReceiptItemAgentType
 
   ReceiptItemMeasure = Yoomoney::Models::ReceiptItemMeasure
@@ -219,6 +225,10 @@ module Yoomoney
 
   SettlementItemType = Yoomoney::Models::SettlementItemType
 
+  SettlementPaymentItem = Yoomoney::Models::SettlementPaymentItem
+
+  SettlementRefundItem = Yoomoney::Models::SettlementRefundItem
+
   TransferData = Yoomoney::Models::TransferData
 
   Webhook = Yoomoney::Models::Webhook

data/lib/yoomoney/version.rb

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

data/lib/yoomoney.rb

@@ -64,8 +64,11 @@ 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"
@@ -149,6 +152,8 @@ require_relative "yoomoney/models/sbp_bank_list_params"
 require_relative "yoomoney/models/sbp_bank_list_response"
 require_relative "yoomoney/models/settlement"
 require_relative "yoomoney/models/settlement_item_type"
+require_relative "yoomoney/models/settlement_payment_item"
+require_relative "yoomoney/models/settlement_refund_item"
 require_relative "yoomoney/models/webhook"
 require_relative "yoomoney/models/webhook_create_params"
 require_relative "yoomoney/models/webhook_delete_params"

data/rbi/yoomoney/client.rbi

@@ -10,11 +10,11 @@ module Yoomoney
 
     DEFAULT_MAX_RETRY_DELAY = T.let(8.0, Float)
 
-    # HTTP Basic аутентификация клиента ЮKassa
+    # HTTP Basic аутентификация клиента ЮKassa (shopId)
     sig { returns(T.nilable(String)) }
     attr_reader :username
 
-    # HTTP Basic аутентификация клиента ЮKassa
+    # HTTP Basic аутентификация клиента ЮKassa (секретный ключ)
     sig { returns(T.nilable(String)) }
     attr_reader :password
 
@@ -51,6 +51,11 @@ module Yoomoney
     sig { returns(Yoomoney::Resources::Me) }
     attr_reader :me
 
+    # @api private
+    sig { override.returns(T::Hash[String, String]) }
+    private def auth_headers
+    end
+
     # Creates and returns a new client for interacting with the API.
     sig do
       params(
@@ -64,9 +69,11 @@ module Yoomoney
       ).returns(T.attached_class)
     end
     def self.new(
-      # HTTP Basic аутентификация клиента ЮKassa Defaults to `ENV["YOOMONEY_USERNAME"]`
+      # HTTP Basic аутентификация клиента ЮKassa (shopId) Defaults to
+      # `ENV["YOOMONEY_USERNAME"]`
       username: ENV["YOOMONEY_USERNAME"],
-      # HTTP Basic аутентификация клиента ЮKassa Defaults to `ENV["YOOMONEY_PASSWORD"]`
+      # HTTP Basic аутентификация клиента ЮKassa (секретный ключ) Defaults to
+      # `ENV["YOOMONEY_PASSWORD"]`
       password: ENV["YOOMONEY_PASSWORD"],
       # Override the default base URL for the API, e.g.,
       # `"https://api.example.com/v2/"`. Defaults to `ENV["YOOMONEY_BASE_URL"]`

data/rbi/yoomoney/internal/transport/base_client.rbi

@@ -171,6 +171,11 @@ module Yoomoney
         )
         end
 
+        # @api private
+        sig { overridable.returns(T::Hash[String, String]) }
+        private def auth_headers
+        end
+
         # @api private
         sig { returns(String) }
         private def user_agent

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::Airline::Leg])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::AirlineLeg])) }
       attr_reader :legs
 
-      sig { params(legs: T::Array[Yoomoney::Airline::Leg::OrHash]).void }
+      sig { params(legs: T::Array[Yoomoney::AirlineLeg::OrHash]).void }
       attr_writer :legs
 
-      sig { returns(T.nilable(T::Array[Yoomoney::Airline::Passenger])) }
+      sig { returns(T.nilable(T::Array[Yoomoney::AirlinePassenger])) }
       attr_reader :passengers
 
       sig do
-        params(passengers: T::Array[Yoomoney::Airline::Passenger::OrHash]).void
+        params(passengers: T::Array[Yoomoney::AirlinePassenger::OrHash]).void
       end
       attr_writer :passengers
 
@@ -35,8 +35,8 @@ module Yoomoney
       sig do
         params(
           booking_reference: String,
-          legs: T::Array[Yoomoney::Airline::Leg::OrHash],
-          passengers: T::Array[Yoomoney::Airline::Passenger::OrHash],
+          legs: T::Array[Yoomoney::AirlineLeg::OrHash],
+          passengers: T::Array[Yoomoney::AirlinePassenger::OrHash],
           ticket_number: String
         ).returns(T.attached_class)
       end
@@ -52,90 +52,14 @@ module Yoomoney
         override.returns(
           {
             booking_reference: String,
-            legs: T::Array[Yoomoney::Airline::Leg],
-            passengers: T::Array[Yoomoney::Airline::Passenger],
+            legs: T::Array[Yoomoney::AirlineLeg],
+            passengers: T::Array[Yoomoney::AirlinePassenger],
             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

data/rbi/yoomoney/models/airline_leg.rbi

@@ -0,0 +1,56 @@
+# typed: strong
+
+module Yoomoney
+  module Models
+    class AirlineLeg < Yoomoney::Internal::Type::BaseModel
+      OrHash =
+        T.type_alias do
+          T.any(Yoomoney::AirlineLeg, 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
+  end
+end

data/rbi/yoomoney/models/airline_passenger.rbi

@@ -0,0 +1,28 @@
+# typed: strong
+
+module Yoomoney
+  module Models
+    class AirlinePassenger < Yoomoney::Internal::Type::BaseModel
+      OrHash =
+        T.type_alias do
+          T.any(Yoomoney::AirlinePassenger, 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

data/rbi/yoomoney/models/payment_deal_info.rbi

@@ -13,13 +13,13 @@ module Yoomoney
       attr_accessor :id
 
       # Данные о распределении денег.
-      sig { returns(T::Array[Yoomoney::PaymentDealInfo::Settlement]) }
+      sig { returns(T::Array[Yoomoney::SettlementPaymentItem]) }
       attr_accessor :settlements
 
       sig do
         params(
           id: String,
-          settlements: T::Array[Yoomoney::PaymentDealInfo::Settlement::OrHash]
+          settlements: T::Array[Yoomoney::SettlementPaymentItem::OrHash]
         ).returns(T.attached_class)
       end
       def self.new(
@@ -32,53 +32,11 @@ module Yoomoney
 
       sig do
         override.returns(
-          {
-            id: String,
-            settlements: T::Array[Yoomoney::PaymentDealInfo::Settlement]
-          }
+          { id: String, settlements: T::Array[Yoomoney::SettlementPaymentItem] }
         )
       end
       def to_hash
       end
-
-      class Settlement < Yoomoney::Internal::Type::BaseModel
-        OrHash =
-          T.type_alias do
-            T.any(
-              Yoomoney::PaymentDealInfo::Settlement,
-              Yoomoney::Internal::AnyHash
-            )
-          end
-
-        sig { returns(Yoomoney::MonetaryAmount) }
-        attr_reader :amount
-
-        sig { params(amount: Yoomoney::MonetaryAmount::OrHash).void }
-        attr_writer :amount
-
-        sig { returns(Yoomoney::SettlementItemType::OrSymbol) }
-        attr_accessor :type
-
-        sig do
-          params(
-            amount: Yoomoney::MonetaryAmount::OrHash,
-            type: Yoomoney::SettlementItemType::OrSymbol
-          ).returns(T.attached_class)
-        end
-        def self.new(amount:, type:)
-        end
-
-        sig do
-          override.returns(
-            {
-              amount: Yoomoney::MonetaryAmount,
-              type: Yoomoney::SettlementItemType::OrSymbol
-            }
-          )
-        end
-        def to_hash
-        end
-      end
     end
   end
 end