atol 0.7.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75da4c224db9bbd13b7688b43902da591c3ebad3aea5a9fdd0e74b9331de1222
-  data.tar.gz: 22d9c1141823538a4fe595dbbefe0d82f33dd3e91635379abd48697729a7160c
+  metadata.gz: a1486844075953dec57979f1ef563bc60376b75070f985ba25af3df74169b7ad
+  data.tar.gz: a9437ee9226697f12111b729f209cccec6493b86b30ddc3d8e75a36bc9ade358
 SHA512:
-  metadata.gz: ea585b8d278bb75b6f4ae5f2ff358846337ea9ae4994dd4c3359d1edaf83997d29fe702a925d94bf11465543c332a40a346336e62432e083d12ff954859e866f
-  data.tar.gz: ed192a02125f15b2d9e4abe6003d89bad567e8a9e997ccd5b42627c527e34bbeff506cc19b84ce9a16c7b0a5399940ff1626b0be6e535d640d7e2de4ade7423e
+  metadata.gz: 371bf235401d4c640906305848b3c10239ecd27306551156cc394393f827eb49538ebc75064325a0fbfb1b8743ce2432c0d9abf4297941e9fe56592f5565fd68
+  data.tar.gz: 2a1c729790dae84ed6466c1195915ca206b8027ae4930656bf401bd3da9cfb3c2d41eeab98672afbbf900e841c57f8a6b432488d4094cd9f78f7573ca74980a2

data/.rubocop.yml

@@ -8,3 +8,7 @@ Style/Documentation:
 
 Metrics/LineLength:
   Max: 125
+
+Metrics/ParameterLists:
+  Exclude:
+    - lib/atol/request/post_document/item/body.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atol (0.7.1)
+    atol (0.8.1)
       anyway_config (~> 1.0)
 
 GEM
@@ -85,4 +85,4 @@ DEPENDENCIES
   webmock (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -5,7 +5,7 @@
 
 # atol-rb
 
-Пакет содержит набор классов для работы с [KaaS-сервисом АТОЛ-онлайн](https://online.atol.ru/) по [описанному протоколу](https://online.atol.ru/files/ffd/API_AO_v4.pdf).
+Пакет содержит набор классов для работы с [KaaS-сервисом АТОЛ-онлайн](https://online.atol.ru/) по [описанному протоколу](https://atol.online/upload/iblock/dff/4yjidqijkha10vmw9ee1jjqzgr05q8jy/API_atol_online_v4.pdf).
 
 ##### Совместимость
 
@@ -151,14 +151,20 @@ body = Atol::Request::PostDocument::Sell::Body.new(
   email: 'example@example.com',
   items: [
     ...
-  ]
+  ],
+  agent_info_type: 'bank_paying_agent'
 ).to_json
 ```
+
+`agent_info_type` опциональный аргумент - признак агента (тег ФФД - 1057)
+
 Массив `items` должен включать в себя объекты, которые так же соответствуют схеме.
 
 Для создания `items` можно использовать класс `Atol::Request::PostDocument::Item::Body`.
 
-Его конструктор принимает обязательные аргументы `name`, `price`, `payment_method`, `payment_object` и опциональный `quantity` (по умолчанию 1).
+Его конструктор принимает обязательные аргументы `name`, `price`, `payment_method`, `payment_object` и опциональные `quantity` (по умолчанию 1), `supplier_info_inn`, `supplier_info_name`, `agent_info_type` (тег ФФД - 1222).
+
+`supplier_info_inn` обязателен, если передан `agent_info_type`.
 
 Допустимые значения `payment_method`:
 ```ruby

data/lib/atol/request/post_document/item/body.rb

@@ -21,30 +21,55 @@ module Atol
             'composite', 'another'
           ]
 
-          attr_accessor :config, :name, :price, :quantity, :payment_method, :payment_object
+          attr_accessor :config, :name, :price, :quantity, :payment_method, :payment_object,
+                        :agent_info_type, :supplier_info_inn, :supplier_info_name
 
-          def initialize(config: nil, name:, price:, quantity: 1, payment_method:, payment_object:)
-            raise Atol::ZeroItemQuantityError if quantity.to_f.zero?
-            raise BadPaymentMethodError unless PAYMENT_METHODS.include?(payment_method.to_s)
-            raise BadPaymentObjectError unless PAYMENT_OBJECTS.include?(payment_object.to_s)
+          def initialize(config: nil, name:, price:, quantity: 1, payment_method:, payment_object:, **options)
+            setup_attributes(config, name, price, quantity, payment_method, payment_object, options)
+            validate_attributes
+          end
+
+          def to_h
+            body.clone
+          end
 
+          def to_json(*_args)
+            body.to_json
+          end
+
+          private
+
+          def setup_attributes(config, name, price, quantity, payment_method, payment_object, options)
             self.config = config || Atol.config
             self.name = name
             self.price = price.to_f
             self.quantity = quantity.to_f
             self.payment_method = payment_method.to_s
             self.payment_object = payment_object.to_s
+            self.agent_info_type = options[:agent_info_type].to_s
+            self.supplier_info_inn = options[:supplier_info_inn].to_s
+            self.supplier_info_name = options[:supplier_info_name].to_s
           end
 
-          def to_h
-            body.clone
+          def validate_attributes
+            raise Atol::ZeroItemQuantityError if quantity.to_f.zero?
+            raise BadPaymentMethodError unless PAYMENT_METHODS.include?(payment_method)
+            raise BadPaymentObjectError unless PAYMENT_OBJECTS.include?(payment_object)
           end
 
-          def to_json(*_args)
-            body.to_json
+          def agent_info
+            return if agent_info_type.nil? || agent_info_type.empty?
+
+            { agent_info: { type: agent_info_type } }
           end
 
-          private
+          def supplier_info
+            return if supplier_info_inn.nil? || supplier_info_inn.empty? || agent_info.nil?
+
+            info = { inn: supplier_info_inn, name: supplier_info_name }
+            filtered_info = info.reject { |_key, value| value&.empty? }
+            { supplier_info: filtered_info } unless filtered_info.empty?
+          end
 
           def body
             @body ||= {
@@ -55,7 +80,7 @@ module Atol
               tax: config.default_tax,
               payment_method: payment_method,
               payment_object: payment_object
-            }
+            }.merge(supplier_info.to_h, agent_info.to_h)
           end
         end
       end

data/lib/atol/request/post_document/sell/body.rb

@@ -7,7 +7,7 @@ module Atol
     class PostDocument
       module Sell
         class Body
-          def initialize(external_id:, phone: '', email: '', items:, config: nil)
+          def initialize(external_id:, phone: '', email: '', items:, config: nil, **options)
             raise(Atol::EmptyClientContactError) if phone.empty? && email.empty?
             raise(Atol::EmptySellItemsError) if items.empty?
 
@@ -16,6 +16,7 @@ module Atol
             @phone = phone
             @email = email
             @items = items
+            @agent_info_type = options[:agent_info_type]
           end
 
           def to_h
@@ -32,13 +33,12 @@ module Atol
             body_template.tap do |result|
               receipt = result[:receipt]
               client = receipt[:client]
+
               result[:external_id] = @external_id
-              client[:email] = @email unless @email.empty?
-              client[:phone] = @phone unless @phone.empty?
               result[:service][:callback_url] = @config.callback_url if @config.callback_url
 
-              receipt[:total] = receipt[:payments][0][:sum] = total
-              receipt[:items] = @items
+              add_client_data(client)
+              add_receipt_data(receipt)
             end
           end
 
@@ -65,6 +65,23 @@ module Atol
             }
           end
 
+          def add_client_data(client)
+            client[:email] = @email unless @email.empty?
+            client[:phone] = @phone unless @phone.empty?
+          end
+
+          def add_receipt_data(receipt)
+            receipt[:total] = receipt[:payments][0][:sum] = total
+            receipt[:items] = @items
+            add_agent_and_supplier_info(receipt)
+          end
+
+          def add_agent_and_supplier_info(receipt)
+            return if @agent_info_type.nil? || @agent_info_type.empty?
+
+            receipt[:agent_info] = { type: @agent_info_type }
+          end
+
           def total
             @total ||= @items.inject(0) { |sum, item| sum += item[:sum] }
           end

data/lib/atol/version.rb

@@ -3,6 +3,6 @@
 module Atol
   module Version
     API = 'v4'
-    LIB = '0.7.1'
+    LIB = '0.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atol
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - GeorgeGorbanev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ATOL KaaS client for Ruby