ruby_ufebs 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2985e0f51751be6e2d39ad174ab1d162f081f7bc8a04fbc8319378b42179488d
-  data.tar.gz: d71e02d5602bf66ed8fc2d658af25b5378f6699b1b72c59a7d424486213a2222
+  metadata.gz: 6ff1c48e339c56faf86b162c1fe9f1337d327fcb6f7e014ce440fef1e756d852
+  data.tar.gz: 967791229f3dc0956e30a63986cb6b02b4b1a78f7478f56075282d2f4d0a5ddb
 SHA512:
-  metadata.gz: 6a28bf284844ca5d4ed778877518399dcaa724686424e30a0da60fd8879d0a678bdddbd10f4358306064e6457fe9e599c2073b56ef9b4ec80595e77aacddadaa
-  data.tar.gz: 20664d0ab21c183cff7ceb6792689ae9a40c21e70a49e80e8d398cc7879d2b0a1d9afd419439be5d8cd2731aa2bba2fcc295ec2799b47e4ca84332d063de8828
+  metadata.gz: 5a7e69d400229877f1a605ec2c1b3c8e9ba83ee0de5f217b133257e47e4d6288aca658b94f9708be207be8d3dc6ba5e046c6ae49bc879e14e90370422c4ca499
+  data.tar.gz: b047649017890e80a9c704403ef92c0ac32eeee1cfc99872f66d89d52b78c5553d54c0080a6162258f96a690c75d8af028976a58d8427ddc4bb3824f7ae671f8

data/lib/ufebs/documents/base_payment.rb

@@ -7,8 +7,8 @@ module Ufebs
   module Documents
     class BasePayment
       include HappyMapper
-      DOCUMENT_NUMBER_TYPE = '06'.freeze
-      SYSTEM_CODE          = '02'.freeze
+      DOCUMENT_TRANS_KIND = '01'.freeze
+      SYSTEM_CODE         = '02'.freeze
 
       def validate
         Ufebs.validate(to_xml)
@@ -18,53 +18,46 @@ module Ufebs
         to_xml(Nokogiri::XML::Builder.new(:encoding => encoding)).to_xml
       end
 
-      def initialize(
-        ed_date: Time.now,
-        number: nil,
-        sum: nil,
-        charge_off_date: Time.now,
-        priority: 0,
-        receipt_date: Time.now,
-        ed_author: '',
-        acc_doc: nil,
-        payer: nil,
-        payee: nil,
-        purpose: '',
-        uin: nil,
-        trans_kind: DOCUMENT_NUMBER_TYPE,
-        payt_kind: nil,
-        system_code: nil,
-        payment_precedence: nil,
-        processing_details: nil,
-        departmental_info: nil
-      )
-        raise InvalidPriority.new('priority Реквизит должен иметь значение в диапазоне 0-5.') unless (0..5).include?(priority.to_i)
-
-        @ed_date         = Date.parse(ed_date.to_s).strftime('%Y-%m-%d')
-        @number          = number
-        @sum             = sum
-        @charge_off_date = Date.parse(charge_off_date.to_s).strftime('%Y-%m-%d')
-        @receipt_date    = Date.parse(receipt_date.to_s).strftime('%Y-%m-%d')
-        @priority        = priority
-        @acc_doc         = acc_doc.is_a?(Hash) ? Ufebs::Entities::AccDoc.new(acc_doc) : acc_doc
-        @payer           = payer.is_a?(Hash) ? Ufebs::Entities::Participant.new(payer) : payer
-        @payee           = payer.is_a?(Hash) ? Ufebs::Entities::Participant.new(payee) : payee
-        @purpose         = purpose
-        @departmental_info = departmental_info.is_a?(Hash) ? Ufebs::Entities::DepartmentalInfo.new(departmental_info) : departmental_info
-        @uin            = uin
-        @payt_kind      = payt_kind
-
-        @payment_precedence = payment_precedence
-        @processing_details = processing_details.is_a?(Hash) ? ::Ufebs::Entities::ProcessingDetails.new(processing_details) : processing_details
-
-        @ed_author   = ed_author
-        @type_number = trans_kind
-        @system_code = system_code || SYSTEM_CODE
+      def initialize(params = {})
+        params = {
+          ed_date:         Time.now,
+          charge_off_date: Time.now,
+          priority:        0,
+          receipt_date:    Time.now,
+          ed_author:       '',
+          purpose:         '',
+          trans_kind:      DOCUMENT_TRANS_KIND,
+          system_code:     SYSTEM_CODE
+        }.merge(params)
+
+        validate_priority(params[:priority])
+
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_date             then @ed_date             = Date.parse(value.to_s).strftime('%Y-%m-%d')
+          when :charge_off_date     then @charge_off_date     = Date.parse(value.to_s).strftime('%Y-%m-%d')
+          when :receipt_date        then @receipt_date        = Date.parse(value.to_s).strftime('%Y-%m-%d')
+          when :acc_doc             then @acc_doc             = value.is_a?(Hash) ? Ufebs::Entities::AccDoc.new(value) : value
+          when :payer               then @payer               = value.is_a?(Hash) ? Ufebs::Entities::Participant.new(value) : value
+          when :payee               then @payee               = value.is_a?(Hash) ? Ufebs::Entities::Participant.new(value) : value
+          when :partial_payt        then @partial_payt        = value.is_a?(Hash) ? Ufebs::Entities::PartialPayt.new(value) : value
+          when :departmental_info   then @departmental_info   = value.is_a?(Hash) ? Ufebs::Entities::DepartmentalInfo.new(value) : value
+          when :processing_details  then @processing_details  = value.is_a?(Hash) ? Ufebs::Entities::ProcessingDetails.new(value) : value
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
 
         yield self if block_given?
 
         super()
       end
+
+      protected
+
+      def validate_priority(priority)
+        return if (0..5).include?(priority.to_i)
+        raise InvalidPriority.new('priority Реквизит должен иметь значение в диапазоне 0-5.')
+      end
     end
   end
 end

data/lib/ufebs/documents/collection_order.rb

@@ -0,0 +1,18 @@
+require_relative 'base_payment'
+require_relative '../fields/payment_doc'
+
+module Ufebs
+  module Documents
+    class CollectionOrder < BasePayment
+      include HappyMapper
+      include Ufebs::Fields::PaymentDoc
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      tag 'ED104'
+      namespace 'ed'
+
+      attribute :receipt_date_collect_bank, String, tag: 'ReceiptDateCollectBank'
+      attribute :file_date,                 String, tag: 'FileDate'
+    end
+  end
+end

data/lib/ufebs/documents/payer_order.rb

@@ -0,0 +1,35 @@
+require_relative 'base_payment'
+require_relative '../fields/payment_doc'
+
+module Ufebs
+  module Documents
+    class PayerOrder < BasePayment
+      include HappyMapper
+
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      tag 'ED105'
+      namespace 'ed'
+
+      attribute :number,             String, tag: 'EDNo'
+      attribute :ed_date,            String, tag: 'EDDate'
+      attribute :ed_author,          String, tag: 'EDAuthor'
+      attribute :sum,                String, tag: 'Sum'
+      attribute :payt_kind,          String, tag: 'PaytKind'
+      attribute :trans_kind,         String, tag: 'TransKind'
+      attribute :uin,                String, tag: 'PaymentID'
+      attribute :system_code,        String, tag: 'SystemCode'
+      attribute :priority,           String, tag: 'Priority'
+      attribute :payment_precedence, String, tag: 'PaymentPrecedence'
+      attribute :trans_content,      String, tag: 'TransContent'
+
+      element :purpose, String, tag: 'Purpose'
+
+      has_one :acc_doc,            ::Ufebs::Entities::AccDoc,            tag: 'AccDoc'
+      has_one :payer,              ::Ufebs::Entities::Participant,       tag: 'Payer'
+      has_one :payee,              ::Ufebs::Entities::Participant,       tag: 'Payee'
+      has_one :partial_payt,       ::Ufebs::Entities::PartialPayt,       tag: 'PartialPayt'
+      has_one :processing_details, ::Ufebs::Entities::ProcessingDetails, tag: 'ProcessingDetails', state_when_nil: false
+      has_one :departmental_info,  ::Ufebs::Entities::DepartmentalInfo,  tag: 'DepartmentalInfo',  state_when_nil: false
+    end
+  end
+end

data/lib/ufebs/documents/payment_order.rb

@@ -4,91 +4,13 @@ require_relative '../entities/participant'
 
 module Ufebs
   module Documents
-    class PaymentOrder
+    class PaymentOrder < BasePayment
       include HappyMapper
-      InvalidPriority = Class.new(StandardError)
+      include Ufebs::Fields::PaymentDoc
 
-      DOCUMENT_NUMBER_TYPE = '01'.freeze
-      SYSTEM_CODE          = '02'.freeze
-
-      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
       tag 'ED101'
       namespace 'ed'
-
-      attribute :number, String, tag: 'EDNo'
-      attribute :ed_date, String, tag: 'EDDate'
-      attribute :ed_author, String, tag: 'EDAuthor'
-      attribute :sum, String, tag: 'Sum'
-      attribute :payt_kind, String, tag: 'PaytKind'
-      attribute :type_number, String, tag: 'TransKind'
-      attribute :uin, String, tag: 'PaymentID'
-      attribute :charge_off_date, String, tag: 'ChargeOffDate'
-      attribute :receipt_date, String, tag: 'ReceiptDate'
-      attribute :system_code, String, tag: 'SystemCode'
-      attribute :priority, String, tag: 'Priority'
-      attribute :payment_precedence, String, tag: 'PaymentPrecedence'
-      has_one :acc_doc, ::Ufebs::Entities::AccDoc, tag: 'AccDoc'
-      has_one :payer, ::Ufebs::Entities::Participant, tag: 'Payer'
-      has_one :payee, ::Ufebs::Entities::Participant, tag: 'Payee'
-      element :purpose, String, tag: 'Purpose'
-
-      has_one :processing_details, ::Ufebs::Entities::ProcessingDetails, tag: 'ProcessingDetails', state_when_nil: false
-      has_one :departmental_info, Ufebs::Entities::DepartmentalInfo, tag: 'DepartmentalInfo', state_when_nil: false
-
-      def validate
-        Ufebs.validate(to_xml)
-      end
-
-      def as_xml(encoding: 'UTF-8')
-        to_xml(Nokogiri::XML::Builder.new(:encoding => encoding)).to_xml
-      end
-
-      def initialize(
-        ed_date: Time.now,
-        number: nil,
-        sum: nil,
-        charge_off_date: Time.now,
-        priority: 0,
-        receipt_date: Time.now,
-        ed_author: '',
-        acc_doc: nil,
-        payer: nil,
-        payee: nil,
-        purpose: '',
-        uin: nil,
-        payt_kind: nil,
-        payment_precedence: nil,
-        processing_details: nil,
-
-        system_code: SYSTEM_CODE,
-        departmental_info: nil
-      )
-        raise InvalidPriority.new('priority Реквизит должен иметь значение в диапазоне 0-5.') unless (0..5).include?(priority.to_i)
-
-        @ed_date         = Date.parse(ed_date.to_s).strftime('%Y-%m-%d')
-        @number          = number
-        @sum             = sum
-        @charge_off_date = Date.parse(charge_off_date.to_s).strftime('%Y-%m-%d')
-        @receipt_date    = Date.parse(receipt_date.to_s).strftime('%Y-%m-%d')
-        @priority        = priority
-        @acc_doc         = acc_doc.is_a?(Hash) ? Ufebs::Entities::AccDoc.new(acc_doc) : acc_doc
-        @payer           = payer.is_a?(Hash) ? Ufebs::Entities::Participant.new(payer) : payer
-        @payee           = payer.is_a?(Hash) ? Ufebs::Entities::Participant.new(payee) : payee
-        @purpose         = purpose
-        @departmental_info = departmental_info.is_a?(Hash) ? Ufebs::Entities::DepartmentalInfo.new(departmental_info) : departmental_info
-        @uin            = uin
-        @payt_kind      = payt_kind
-        @payment_precedence = payment_precedence
-        @processing_details = processing_details.is_a?(Hash) ? ::Ufebs::Entities::ProcessingDetails.new(processing_details) : processing_details
-
-        @ed_author   = ed_author
-        @type_number = DOCUMENT_NUMBER_TYPE
-        @system_code = system_code
-
-        yield self if block_given?
-
-        super()
-      end
     end
   end
 end

data/lib/ufebs/documents/payment_requirement.rb

@@ -0,0 +1,22 @@
+require_relative 'base_payment'
+require_relative '../fields/payment_doc'
+
+module Ufebs
+  module Documents
+    class PaymentRequirement < BasePayment
+      include HappyMapper
+      include Ufebs::Fields::PaymentDoc
+
+      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      tag 'ED103'
+      namespace 'ed'
+
+      attribute :receipt_date_collect_bank, String, tag: 'ReceiptDateCollectBank'
+      attribute :file_date,                 String, tag: 'FileDate'
+      attribute :payt_condition,            String, tag: 'PaytCondition'
+      attribute :acpt_term,                 String, tag: 'AcptTerm'
+      attribute :doc_dispatch_date,         String, tag: 'DocDispatchDate'
+      attribute :maturity_date,             String, tag: 'MaturityDate'
+    end
+  end
+end

data/lib/ufebs/entities/partial_payt.rb

@@ -0,0 +1,31 @@
+require_relative 'acc_doc'
+
+module Ufebs
+  module Entities
+    class PartialPayt
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+      tag 'PartialPayt'
+
+      attribute :payt_no,           String, tag: 'PaytNo'
+      attribute :trans_kind,        String, tag: 'TransKind'
+      attribute :sum_residual_payt, String, tag: 'SumResidualPayt'
+
+      has_one :acc_doc, ::Ufebs::Entities::AccDoc, tag: 'AccDoc'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :acc_doc then set_acc_doc(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_acc_doc(value)
+        @acc_doc = value.is_a?(Hash) ? ::Ufebs::Entities::AccDoc.new(value) : value
+      end
+    end
+  end
+end

data/lib/ufebs/fields/payment_doc.rb

@@ -2,25 +2,26 @@ module Ufebs
   module Fields
     module PaymentDoc
       def self.included(content)
-        content.attribute :number, String, tag: 'EDNo'
-        content.attribute :ed_date, String, tag: 'EDDate'
-        content.attribute :ed_author, String, tag: 'EDAuthor'
-        content.attribute :sum, String, tag: 'Sum'
-        content.attribute :payt_kind, String, tag: 'PaytKind'
-        content.attribute :type_number, String, tag: 'TransKind'
-        content.attribute :uin, String, tag: 'PaymentID'
-        content.attribute :charge_off_date, String, tag: 'ChargeOffDate'
-        content.attribute :receipt_date, String, tag: 'ReceiptDate'
-        content.attribute :system_code, String, tag: 'SystemCode'
-        content.attribute :priority, String, tag: 'Priority'
+        content.attribute :number,             String, tag: 'EDNo'
+        content.attribute :ed_date,            String, tag: 'EDDate'
+        content.attribute :ed_author,          String, tag: 'EDAuthor'
+        content.attribute :sum,                String, tag: 'Sum'
+        content.attribute :payt_kind,          String, tag: 'PaytKind'
+        content.attribute :trans_kind,         String, tag: 'TransKind'
+        content.attribute :uin,                String, tag: 'PaymentID'
+        content.attribute :charge_off_date,    String, tag: 'ChargeOffDate'
+        content.attribute :receipt_date,       String, tag: 'ReceiptDate'
+        content.attribute :system_code,        String, tag: 'SystemCode'
+        content.attribute :priority,           String, tag: 'Priority'
         content.attribute :payment_precedence, String, tag: 'PaymentPrecedence'
-        content.has_one :acc_doc, ::Ufebs::Entities::AccDoc, tag: 'AccDoc'
-        content.has_one :payer, ::Ufebs::Entities::Participant, tag: 'Payer'
-        content.has_one :payee, ::Ufebs::Entities::Participant, tag: 'Payee'
+
         content.element :purpose, String, tag: 'Purpose'
 
+        content.has_one :acc_doc,            ::Ufebs::Entities::AccDoc,            tag: 'AccDoc'
+        content.has_one :payer,              ::Ufebs::Entities::Participant,       tag: 'Payer'
+        content.has_one :payee,              ::Ufebs::Entities::Participant,       tag: 'Payee'
+        content.has_one :departmental_info,  ::Ufebs::Entities::DepartmentalInfo,  tag: 'DepartmentalInfo',  state_when_nil: false
         content.has_one :processing_details, ::Ufebs::Entities::ProcessingDetails, tag: 'ProcessingDetails', state_when_nil: false
-        content.has_one :departmental_info, Ufebs::Entities::DepartmentalInfo, tag: 'DepartmentalInfo', state_when_nil: false
       end
     end
   end

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

data/lib/ufebs.rb

@@ -104,15 +104,15 @@ module Ufebs
   end
 
   def ED103(params)
-    params.is_a?(Hash) ? Ufebs::Documents::PaymentClaim.new(params) : Ufebs::Documents::PaymentClaim.parse(params)
+    params.is_a?(Hash) ? Ufebs::Documents::PaymentRequirement.new(params) : Ufebs::Documents::PaymentRequirement.parse(params)
   end
 
   def ED104(params)
-    params.is_a?(Hash) ? Ufebs::Documents::InvoiceOrder.new(params) : Ufebs::Documents::InvoiceOrder.parse(params)
+    params.is_a?(Hash) ? Ufebs::Documents::CollectionOrder.new(params) : Ufebs::Documents::CollectionOrder.parse(params)
   end
 
   def ED105(params)
-    params.is_a?(Hash) ? Ufebs::Documents::BillingOrder.new(params) : Ufebs::Documents::BillingOrder.parse(params)
+    params.is_a?(Hash) ? Ufebs::Documents::PayerOrder.new(params) : Ufebs::Documents::PayerOrder.parse(params)
   end
 
   def ED107(params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Evgeniy Burdaev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -394,15 +394,15 @@ files:
 - lib/ufebs/configuration.rb
 - lib/ufebs/documents/bank_order.rb
 - lib/ufebs/documents/base_payment.rb
-- lib/ufebs/documents/billing_order.rb
-- lib/ufebs/documents/invoice_order.rb
+- lib/ufebs/documents/collection_order.rb
 - lib/ufebs/documents/memorial_order.rb
 - lib/ufebs/documents/package.rb
 - lib/ufebs/documents/package_response.rb
-- lib/ufebs/documents/payment_claim.rb
+- lib/ufebs/documents/payer_order.rb
 - lib/ufebs/documents/payment_order.rb
 - lib/ufebs/documents/payment_order_ed107.rb
 - lib/ufebs/documents/payment_order_ed108.rb
+- lib/ufebs/documents/payment_requirement.rb
 - lib/ufebs/documents/payment_response.rb
 - lib/ufebs/documents/some_order.rb
 - lib/ufebs/entities/acc_doc.rb
@@ -415,6 +415,7 @@ files:
 - lib/ufebs/entities/ed_reestr_info.rb
 - lib/ufebs/entities/ed_ref_id.rb
 - lib/ufebs/entities/initial_packet.rb
+- lib/ufebs/entities/partial_payt.rb
 - lib/ufebs/entities/participant.rb
 - lib/ufebs/entities/processing_details.rb
 - lib/ufebs/entities/session.rb

data/lib/ufebs/documents/billing_order.rb

@@ -1,15 +0,0 @@
-require_relative 'base_payment'
-require_relative '../fields/payment_doc'
-
-module Ufebs
-  module Documents
-    class BillingOrder < BasePayment
-      include HappyMapper
-      include Ufebs::Fields::PaymentDoc
-
-      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
-      tag 'ED105'
-      namespace 'ed'
-    end
-  end
-end

data/lib/ufebs/documents/invoice_order.rb

@@ -1,15 +0,0 @@
-require_relative 'base_payment'
-require_relative '../fields/payment_doc'
-
-module Ufebs
-  module Documents
-    class InvoiceOrder < BasePayment
-      include HappyMapper
-      include Ufebs::Fields::PaymentDoc
-
-      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
-      tag 'ED104'
-      namespace 'ed'
-    end
-  end
-end

data/lib/ufebs/documents/payment_claim.rb

@@ -1,15 +0,0 @@
-require_relative 'base_payment'
-require_relative '../fields/payment_doc'
-
-module Ufebs
-  module Documents
-    class PaymentClaim < BasePayment
-      include HappyMapper
-      include Ufebs::Fields::PaymentDoc
-
-      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
-      tag 'ED103'
-      namespace 'ed'
-    end
-  end
-end