atol 0.7 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f129f8ca6618beca5e44db35155e882818694663ee505b9800fedb4767d380
-  data.tar.gz: 9035482fef46d4db6fbf99781251274fd12be69c6894074d97061b6b49d7976f
+  metadata.gz: a1486844075953dec57979f1ef563bc60376b75070f985ba25af3df74169b7ad
+  data.tar.gz: a9437ee9226697f12111b729f209cccec6493b86b30ddc3d8e75a36bc9ade358
 SHA512:
-  metadata.gz: da49ef69b1c04f79adb7de75e49e45da3a33d313433de6589d3c92a55aa7fcac7df6cae0a9e0304ef85d54fbdd3349cb38f9581430d58af600d73a00ee9ea653
-  data.tar.gz: 2c6ec17732b8172fdc1e2780dbaef84f13caf843020fa2c1a470a8bfea88686e2215c135f5bcbd16d6afec7084d08c6f03683103902a772631f48917f9955c9a
+  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/.rubocop_todo.yml

@@ -37,7 +37,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 # Offense count: 1
@@ -66,7 +66,7 @@ Layout/SpaceInsideHashLiteralBraces:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Exclude:
     - 'lib/atol.rb'
     - 'lib/atol/request.rb'
@@ -140,15 +140,6 @@ Style/BlockDelimiters:
   Exclude:
     - 'spec/atol/request/post_document/sell/body_spec.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/atol/transaction/get_token_spec.rb'
-    - 'spec/atol/transaction/post_document_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.

data/Gemfile

@@ -3,8 +3,6 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rubocop', require: false
-
 group :test do
   gem 'coveralls', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atol (0.7)
+    atol (0.8.1)
       anyway_config (~> 1.0)
 
 GEM
@@ -10,7 +10,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     anyway_config (1.1.3)
-    ast (2.3.0)
+    ast (2.4.1)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
       simplecov (~> 0.14.1)
@@ -23,13 +23,14 @@ GEM
     docile (1.1.5)
     hashdiff (0.3.7)
     json (2.1.0)
-    parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     public_suffix (3.0.1)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -43,14 +44,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.52.1)
+    rubocop (0.90.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.4.0)
+      parser (>= 2.7.1.4)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
     simplecov (0.14.1)
       docile (~> 1.1.0)
@@ -61,7 +66,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.4)
     tins (1.16.3)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.7.0)
     webmock (3.2.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -76,8 +81,8 @@ DEPENDENCIES
   coveralls
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop
+  rubocop (~> 0.90)
   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/atol-rb.gemspec

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'atol/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'atol'
-  spec.version       = Atol::Version::LIB
-  spec.authors       = ['GeorgeGorbanev']
-  spec.email         = ['GeorgeGorbanev@gmail.com']
+  spec.name = 'atol'
+  spec.version = Atol::Version::LIB
+  spec.authors = ['GeorgeGorbanev']
+  spec.email = ['GeorgeGorbanev@gmail.com']
 
-  spec.summary       = 'ATOL KaaS client for Ruby'
-  spec.homepage      = 'https://github.com/sputnik8/atol-rb'
-  spec.license       = 'MIT'
+  spec.summary = 'ATOL KaaS client for Ruby'
+  spec.homepage = 'https://github.com/sputnik8/atol-rb'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
@@ -27,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
+  spec.add_development_dependency 'rubocop', '~> 0.90'
   spec.add_development_dependency 'webmock', '~> 3.0'
 end

data/lib/atol/errors.rb

@@ -20,7 +20,7 @@ module Atol
   class ZeroItemQuantityError < StandardError; end
 
   ERRORS = Hash[
-      0 =>  BadJSONError,
+      0 => BadJSONError,
       10 => IncomingMissingTokenError,
       11 => IncomingExpiredTokenError,
       20 => GroupCodeToTokenError,

data/lib/atol/request/get_document_state.rb

@@ -11,6 +11,7 @@ module Atol
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
         raise(Atol::MissingConfigError, 'group_code missing') if @config.group_code.nil?
+
         @token = token
         @uuid = uuid
       end

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_i.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
-            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,30 +16,29 @@ module Atol
             @phone = phone
             @email = email
             @items = items
+            @agent_info_type = options[:agent_info_type]
           end
 
           def to_h
             body.clone
           end
 
-          def to_json
+          def to_json(*_args)
             body.to_json
           end
 
           private
 
           def body
-            @body ||= body_template.tap do |result|
+            body_template.tap do |result|
+              receipt = result[:receipt]
+              client = receipt[:client]
+
               result[:external_id] = @external_id
-              result[:receipt][:client][:email] = @email unless @email.empty?
-              result[:receipt][:client][:phone] = @phone unless @phone.empty?
               result[:service][:callback_url] = @config.callback_url if @config.callback_url
 
-              total = @items.inject(0) { |sum, item| sum += item[:sum] }
-
-              result[:receipt][:total] = total
-              result[:receipt][:payments][0][:sum] = total
-              result[:receipt][:items] = @items
+              add_client_data(client)
+              add_receipt_data(receipt)
             end
           end
 
@@ -65,6 +64,27 @@ module Atol
               timestamp: Time.now.strftime(Atol::TIMESTAMP_FORMAT)
             }
           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
         end
       end
     end

data/lib/atol/transaction/get_document_state.rb

@@ -9,6 +9,7 @@ module Atol
       def initialize(uuid:, token:, config: nil)
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
+
         @params = { uuid: uuid, token: token, config: @config }
       end
 

data/lib/atol/transaction/post_document.rb

@@ -9,6 +9,7 @@ module Atol
       def initialize(operation:, token:, body:, config: nil, req_logger: nil, res_logger: nil)
         @config = config || Atol.config
         raise(Atol::ConfigExpectedError) unless @config.is_a?(Atol::Config)
+
         @params = {
           operation: operation,
           token: token,

data/lib/atol/version.rb

@@ -3,6 +3,6 @@
 module Atol
   module Version
     API = 'v4'
-    LIB = '0.7'
+    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'
+  version: 0.8.1
 platform: ruby
 authors:
 - GeorgeGorbanev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.90'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.90'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -138,15 +138,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ATOL KaaS client for Ruby