atol 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e641c3da1fd82f9b25d4d6f7945758211f2a304c
-  data.tar.gz: ffa5be8712a96c1fa5767289e5fb26735ecfd573
+  metadata.gz: dadf4b469fa9fa9b1489d00b72d057b28e3db6a8
+  data.tar.gz: 731afecf6097e8767443df85c6c13a919f415b2c
 SHA512:
-  metadata.gz: 8af070acadff92c07ea6bb74e21ea48b6ac78b94baea32edab622a60b44b3e53ca745a1033611c847cdf508bef08adc708626b37d1d80f6548471ccd580faa1b
-  data.tar.gz: 8d6c72068f8ba205e7260ce7f1f22beb6e365406a16171e11c0157f88cc536a3b74747947b9c906c6e77142d32456cb6d935c38be52a442a5739f34b2558811f
+  metadata.gz: eb8a892c606a28c653ba0e6bdeede5f9b96b895fe1430f80826dfd91af61126bb0b6a31ec4b261ece202da35ea1c1c0c6f624dd14daa3655192886ac020f6be9
+  data.tar.gz: 73e2c099851188b28784536d1755b49a8aad2cd706f6ece489e3d46d71972cb8d3eb42c3fa4e66fbdcca6533c22ec1e124d7d1244942d41e000c575d78f17e98

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atol (0.4.2)
+    atol (0.5.0)
       anyway_config (~> 1.0)
 
 GEM

data/README.md

@@ -106,12 +106,32 @@ body = Atol::Request::PostDocument::Sell::Body.new(
 
 Для создания `items` можно использовать класс `Atol::Request::PostDocument::Item::Body`.
 
-Его конструктор принимает обязательные аргументы `name`, `price` и опциональный `quantity` (по умолчанию 1).
+Его конструктор принимает обязательные аргументы `name`, `price`, `payment_method`, `payment_object` и опциональный `quantity` (по умолчанию 1).
+
+Допустимые значения `payment_method`:
+```ruby
+[
+  'full_prepayment', 'prepayment', 'advance', 'full_payment',
+  'partial_payment', 'credit', 'credit_payment'
+]
+```
+Допустимые значения `payment_object`:
+```ruby
+[
+  'commodity', 'excise', 'job', 'service', 'gambling_bet', 'gambling_prize',
+  'lottery', 'lottery_prize', 'intellectual_activity', 'payment','agent_commission',
+  'composite', 'another'
+]
+```
+
+Например:
 
 ```ruby
 item = Atol::Request::PostDocument::Item::Body.new(
   name: 'product name',
   price: 100,
+  payment_method: 'full_payment',
+  payment_object: 'service',
   quantity: 2
 ).to_h
 ```
@@ -126,15 +146,21 @@ body = Atol::Request::PostDocument::Sell::Body.new(
     Atol::Request::PostDocument::Item::Body.new(
       name: 'number 9',
       price: 50,
+      payment_method: 'full_payment',
+      payment_object: 'service',
       quantity: 2
     ).to_h,
     Atol::Request::PostDocument::Item::Body.new(
       name: 'number 9 large',
-      price: 100
+      price: 100,
+      payment_method: 'full_payment',
+      payment_object: 'service'
     ).to_h,
     Atol::Request::PostDocument::Item::Body.new(
       name: 'number 6',
-      price: 60
+      price: 60,
+      payment_method: 'full_payment',
+      payment_object: 'service'
     ).to_h
   ]
 ).to_json
@@ -143,28 +169,28 @@ body = Atol::Request::PostDocument::Sell::Body.new(
 Результат:
 ```json
 
-{  
-  "receipt":{  
-    "attributes":{  
+{
+  "receipt":{
+    "attributes":{
       "sno":"usn_income_outcome",
       "email":"example@example.com"
     },
-    "items":[  
-      {  
+    "items":[
+      {
         "name":"number 9",
         "price":50.0,
         "quantity":2.0,
         "sum":100.0,
         "tax":"none"
       },
-      {  
+      {
         "name":"number 9 large",
         "price":100.0,
         "quantity":1.0,
         "sum":100.0,
         "tax":"none"
       },
-      {  
+      {
         "name":"number 6",
         "price":60.0,
         "quantity":1.0,
@@ -172,15 +198,15 @@ body = Atol::Request::PostDocument::Sell::Body.new(
         "tax":"none"
       }
     ],
-    "payments":[  
-      {  
+    "payments":[
+      {
         "sum":260.0,
         "type":1
       }
     ],
     "total":260.0
   },
-  "service":{  
+  "service":{
     "inn":"123456789010",
     "payment_address":"г. Москва, ул. Ленина, д.1 к.2"
   },

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

@@ -5,13 +5,33 @@ module Atol
     class PostDocument
       module Item
         class Body
-          def initialize(name:, price:, quantity: 1, config: nil)
+          BadPaymentMethodError = Class.new(StandardError)
+          BadPaymentObjectError = Class.new(StandardError)
+
+          PAYMENT_METHODS = [
+            'full_prepayment', 'prepayment', 'advance', 'full_payment',
+            'partial_payment', 'credit', 'credit_payment'
+          ]
+
+          PAYMENT_OBJECTS = [
+            'commodity', 'excise', 'job', 'service', 'gambling_bet', 'gambling_prize',
+            'lottery', 'lottery_prize', 'intellectual_activity', 'payment', 'agent_commission',
+            'composite', 'another'
+          ]
+
+          attr_accessor :config, :name, :price, :quantity, :payment_method, :payment_object
+
+          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)
 
-            @config = config || Atol.config
-            @name = name
-            @price = price.to_f
-            @quantity = quantity.to_f
+            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
           end
 
           def to_h
@@ -26,11 +46,13 @@ module Atol
 
           def body
             @body ||= {
-              name: @name,
-              price: @price,
-              quantity: @quantity,
-              sum: (@price * @quantity).round(2),
-              tax: @config.default_tax
+              name: name,
+              price: price,
+              quantity: quantity,
+              sum: (price * quantity).round(2),
+              tax: config.default_tax,
+              payment_method: payment_method,
+              payment_object: payment_object
             }
           end
         end

data/lib/atol/version.rb

@@ -1,6 +1,6 @@
 module Atol
   module Version
     API = 'v4'.freeze
-    LIB = '0.4.2'.freeze
+    LIB = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atol
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - GeorgeGorbanev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config