ruby_ufebs 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e83333c3ddd2efced356b512effbb097f574cd8f46d5d566d86de409e6f0f75
-  data.tar.gz: 7471a59c65e7ec39b8a9583a0aa8761cf7e75ebbeb6fd9c7f848587886913f0f
+  metadata.gz: 1d3c1f68438ac107f636161af2a6ac45ed75ce8e1bdff4dba5a875ef42a433ab
+  data.tar.gz: 57ceac1b56e7be8cd87285f71518ceed7b3a24f6d6a5fdedf57f1d51d414d0fd
 SHA512:
-  metadata.gz: 2ad0f9c339a28f1370457ead5a7fcac25fe8ff4595ad530d1e03d54ef218adb79cc5ba2240c832564b70359d40dab1296d68bc49829ffc5100c9c38a117aa537
-  data.tar.gz: e0db898ec38edbcbc70207ea43eca01ca7b1a2942503b1be60ca05621b466d50368809d9f7f63699d89273c17524082f972c7593d739eb371dc8656748995c61
+  metadata.gz: 5ea377537e98ed3d0562f835d41671f8593467c5ee74a8fabd9d67563a638d7c23d773634d09690e92eb08bd41bb933b966359ceaa95259e32efd280129470f5
+  data.tar.gz: a0b2a79b5a0c53b709bd73eecb71f2d87155e869631652702fc03d624d91a673abdf3b9b86a339b333567cf0891949b11385bbdddf045f48ad474a25b33cc9ff

data/lib/ufebs/documents/package.rb

@@ -4,25 +4,33 @@ require_relative '../entities/session'
 module Ufebs
   module Documents
     class Package
+      SYSTEM_CODE = '02'.freeze
+
       include HappyMapper
       SYSTEM_CODE = '02'
       register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
       tag 'PacketEPD'
       namespace 'ed'
 
-      attribute :ed_date, String, tag: 'EDDate'
-      attribute :ed_author, String, tag: 'EDAuthor'
+      attribute :ed_date,     String, tag: 'EDDate'
+      attribute :ed_author,   String, tag: 'EDAuthor'
       attribute :ed_receiver, String, tag: 'EDReceiver'
-      attribute :number, String, tag: 'EDNo'
-      attribute :quantity, String, tag: 'EDQuantity'
-      attribute :sum, String, tag: 'Sum'
+      attribute :number,      String, tag: 'EDNo'
+      attribute :quantity,    String, tag: 'EDQuantity'
+      attribute :sum,         String, tag: 'Sum'
       attribute :system_code, String, tag: 'SystemCode'
 
-      has_many :payment_orders, Ufebs::Documents::PaymentOrder
-      has_one :session, ::Ufebs::Entities::Session, tag: 'Session', state_when_nil: false
+      has_many :payment_orders,
+               ::Ufebs::Documents::PaymentOrder
+
+      has_one :session,
+              ::Ufebs::Entities::Session,
+              tag: 'Session',
+              state_when_nil: false
 
-      def initialize(payment_orders=[], params = {})
+      def initialize(payment_orders = [], params = {})
         @payment_orders = payment_orders
+
         @ed_date   = Date.parse(params.fetch(:ed_date){Time.now}.to_s).strftime('%Y-%m-%d')
         @ed_author = params[:ed_author]
         @ed_receiver = params[:ed_receiver]
@@ -30,6 +38,7 @@ module Ufebs
         @quantity  = params[:quantity] || payment_orders.size
         @sum       = params[:sum]
         @system_code   = params.fetch(:system_code) { SYSTEM_CODE }
+
         super()
       end
 

data/lib/ufebs/documents/payment_order.rb

@@ -1,4 +1,3 @@
-require_relative '../entities/bank'
 require_relative '../entities/acc_doc'
 require_relative '../entities/departmental_info'
 require_relative '../entities/participant'
@@ -27,6 +26,7 @@ module Ufebs
       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'
@@ -57,6 +57,9 @@ module Ufebs
         purpose: '',
         uin: nil,
         payt_kind: nil,
+        payment_precedence: nil,
+        processing_details: nil,
+
         system_code: SYSTEM_CODE,
         departmental_info: nil
       )
@@ -75,6 +78,7 @@ module Ufebs
         @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
 
         @ed_author   = ed_author
         @type_number = DOCUMENT_NUMBER_TYPE

data/lib/ufebs/entities/ed_info.rb

@@ -0,0 +1,26 @@
+require_relative 'ed_ref_id'
+
+module Ufebs
+  module Entities
+    class EdInfo
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      namespace 'ed'
+      tag 'EDInfo'
+
+      attribute :sum, String, tag: 'Sum'
+
+      has_one :ed_ref_id,
+              ::Ufebs::Entities::EdRefId
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :ed_ref_id then @ed_ref_id = Ufebs::Entities::EdRefId.new(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ufebs/entities/processing_details.rb

@@ -12,9 +12,10 @@ module Ufebs
       attribute :credit_date, String, tag: 'CreditDate'
       has_one :session, ::Ufebs::Entities::Session, tag: 'Session', state_when_nil: false
 
-      def initialize(debit_date: Time.now, credit_date: Time.now)
-        @debit_date = Date.parse(debit_date.to_s).strftime('%Y-%m-%d')
+      def initialize(debit_date: Time.now, credit_date: Time.now, session: nil)
+        @debit_date  = Date.parse(debit_date.to_s).strftime('%Y-%m-%d')
         @credit_date = Date.parse(credit_date.to_s).strftime('%Y-%m-%d')
+        @session     = session.is_a?(Hash) ? ::Ufebs::Entities::Session.new(session) : session
       end
     end
   end

data/lib/ufebs/entities/session.rb

@@ -7,10 +7,19 @@ module Ufebs
       register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
       namespace 'ed'
 
+      attribute :session_type, String, tag: 'SessionType'
+
       element :session_id, String, tag: 'SessionID'
+      element :settlement_time, String, tag: 'SettlementTime'
 
-      def initialize(session_id: nil)
-        @session_id = session_id
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :session_id      then @session_id = value
+          when :session_type    then @session_type = value
+          when :settlement_time then @settlement_time = value
+          end
+        end
       end
     end
   end

data/lib/ufebs/requests/group_status_answer.rb

@@ -0,0 +1,54 @@
+module Ufebs
+  module Requests
+    class GroupStatusAnswer
+      include HappyMapper
+      register_namespace 'ed', 'urn:cbr-ru:ed:v2.0'
+      tag 'ED207'
+      namespace 'ed'
+
+      attribute :ed_author,   String, tag: 'EDAuthor'
+      attribute :ed_date,     String, tag: 'EDDate'
+      attribute :ed_no,       String, tag: 'EDNo'
+      attribute :ed_receiver, String, tag: 'EDReceiver'
+      attribute :status_code, String, tag: 'StatusCode'
+      attribute :quantity_ed, String, tag: 'QuantityED'
+      attribute :sum,         String, tag: 'Sum'
+      attribute :ed_day_no,   String, tag: 'EDDayNo'
+
+      has_one :initial_ed,
+              Ufebs::Entities::EdRefId,
+              tag: 'InitialED'
+
+      has_many :ed_infos, tag: 'EDInfo'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key.to_sym
+          when :initial_ed then @initial_ed = Ufebs::Entities::EdRefId.new(value)
+          when :ed_infos   then @ed_infos   = set_ed_infos(value)
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+        end
+      end
+
+      def set_ed_infos(value)
+        value.map { |params| Ufebs::Entities::EdInfo.new(params) }
+      end
+    end
+  end
+end
+
+# <?xml version="1.0" encoding="WINDOWS-1251"?>
+# <ED207 xmlns="urn:cbr-ru:ed:v2.0"
+#        EDNo="90" EDDate="2018-07-16" EDAuthor="4583001999"
+#        EDReceiver="4525545000"
+#        StatusCode="01" QuantityED="2" Sum="6000000" EDDayNo="10">
+#   <InitialED EDNo="9" EDDate="2018-07-16"
+#              EDAuthor="4525545000"></InitialED>
+#   <EDInfo Sum="2400000">
+#     <EDRefID EDNo="7" EDDate="2018-07-16" EDAuthor="4525545000"/>
+#   </EDInfo>
+#   <EDInfo Sum="3600000">
+#     <EDRefID EDNo="16" EDDate="2018-07-16" EDAuthor="4525545000"/>
+#   </EDInfo>
+# </ED207>

data/lib/ufebs/requests/negative_status_notification.rb

@@ -10,9 +10,10 @@ module Ufebs
       tag 'ED201'
       namespace 'ed'
 
-      attribute :ctrl_code,  String, tag: 'CtrlCode'
-      attribute :ctrl_time,  String, tag: 'CtrlTime'
-      element   :annotation, String, tag: 'Annotation'
+      attribute :ctrl_code,        String, tag: 'CtrlCode'
+      attribute :ctrl_time,        String, tag: 'CtrlTime'
+      element   :annotation,       String, tag: 'Annotation'
+      element   :error_diagnostic, String, tag: 'ErrorDiagnostic'
 
       has_one :ed_ref_id, ::Ufebs::Entities::EdRefId
 

data/lib/ufebs/requests/receipt.rb

@@ -30,10 +30,11 @@ module Ufebs
       def initialize(params = {})
         params.each do |key, value|
           case key.to_sym
-          when :abstract_date   then @abstract_date   = Date.parse(value.to_s).strftime('%Y-%m-%d')
-          when :end_time        then @end_time        = DateTime.parse(value.to_s).strftime('%H:%M:%S')
-          when :last_movet_date then @last_movet_date = Date.parse(value.to_s).strftime('%Y-%m-%d')
-          when :trans_infos     then @trans_infos     = set_trans_infos(value)
+          when :abstract_date      then @abstract_date      = Date.parse(value.to_s).strftime('%Y-%m-%d')
+          when :end_time           then @end_time           = DateTime.parse(value.to_s).strftime('%H:%M:%S')
+          when :last_movet_date    then @last_movet_date    = Date.parse(value.to_s).strftime('%Y-%m-%d')
+          when :trans_infos        then @trans_infos        = set_trans_infos(value)
+          when :processing_details then @processing_details = Ufebs::Entities::ProcessingDetails.new(value)
           else instance_variable_set("@#{key}".to_sym, value)
           end
         end

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/lib/ufebs.rb

@@ -39,71 +39,6 @@ module Ufebs
                     end
   end
 
-  def ED201(params)
-    Ufebs::Requests::NegativeStatusNotification.parse(params)
-  end
-
-  def ED208(params)
-    Ufebs::Requests::PositiveStatusNotification.parse(params)
-  end
-
-  # XML запрос-зонд
-  # @param params [Hash]
-  # @option :number аттрибут EDNo
-  # @option :ed_date аттрибут EDDate
-  # @option :ed_author аттрибут EDAuthor
-  def ED999(params)
-    Ufebs::Requests::TestRequest.new(params)
-  end
-
-  def ED210(params)
-  end
-
-  def ED205(params)
-    Ufebs::Requests::StatusAnswer.parse(params)
-  end
-
-  # Создание/Парсинг выписки ED211
-  # @example Пример
-  #   ed211 = Ufebs::Requests::Receipt.new(
-  #     number: '8',
-  #     ed_date: '2003-04-14',
-  #     ed_author: '4525545000',
-  #     ed_receiver: '4525000000',
-  #     abstract_date: Date.today,
-  #     abstract_kind: '1',
-  #     acc: '30101810945250000420',
-  #     bic: '044525000',
-  #     end_time: '00:47:07',
-  #     enter_bal: '72619100',
-  #     inquiry_session: '0',
-  #     last_movet_date: Date.today,
-  #     out_bal: '72619100',
-  #     rtgs_unconfirmed_ed: '0'
-  #   )
-  def ED211(params)
-    params.is_a?(Hash) ? Ufebs::Requests::Receipt.new(params) : Ufebs::Requests::Receipt.parse(params)
-  end
-
-  def ED243(params)
-    if params.is_a?(Hash)
-      Ufebs::Requests::DefineRequest.new(params)
-    else
-      Ufebs::Requests::DefineRequest.parse(params)
-    end
-  end
-
-  def ED218(params)
-  end
-
-  def ED244(params)
-    if params.is_a?(Hash)
-      Ufebs::Requests::DefineAnswer.new(params)
-    else
-      Ufebs::Requests::DefineAnswer.parse(params)
-    end
-  end
-
   # Создание XML по формату ED101(Платежное поручение)
   # @param params [Hash, String] Hash значений документа или его строковое представление в виде XML
   # @option params [Integer] :number номер документа аттрибут EDNo
@@ -168,6 +103,15 @@ module Ufebs
     params.is_a?(Hash) ? Ufebs::Documents::PaymentOrder.new(params) : Ufebs::Documents::PaymentOrder.parse(params)
   end
 
+
+  def ED201(params)
+    Ufebs::Requests::NegativeStatusNotification.parse(params)
+  end
+
+  def ED205(params)
+    Ufebs::Requests::StatusAnswer.parse(params)
+  end
+
   def ED104(params)
     params.is_a?(Hash) ? Ufebs::Documents::InvoiceOrder.new(params) : Ufebs::Documents::InvoiceOrder.parse(params)
   end
@@ -181,6 +125,72 @@ module Ufebs
     Ufebs::Documents::PaymentResponse.parse(params)
   end
 
+  def ED207(params)
+    return Ufebs::Requests::GroupStatusAnswer.new(params) if params.is_a?(Hash)
+    Ufebs::Requests::GroupStatusAnswer.parse(params)
+  end
+
+  def ED208(params)
+    Ufebs::Requests::PositiveStatusNotification.parse(params)
+  end
+
+  def ED210(params)
+  end
+
+  # Создание/Парсинг выписки ED211
+  # @example Пример
+  #   ed211 = Ufebs::Requests::Receipt.new(
+  #     number: '8',
+  #     ed_date: '2003-04-14',
+  #     ed_author: '4525545000',
+  #     ed_receiver: '4525000000',
+  #     abstract_date: Date.today,
+  #     abstract_kind: '1',
+  #     acc: '30101810945250000420',
+  #     bic: '044525000',
+  #     end_time: '00:47:07',
+  #     enter_bal: '72619100',
+  #     inquiry_session: '0',
+  #     last_movet_date: Date.today,
+  #     out_bal: '72619100',
+  #     rtgs_unconfirmed_ed: '0'
+  #   )
+  def ED211(params)
+    params.is_a?(Hash) ? Ufebs::Requests::Receipt.new(params) : Ufebs::Requests::Receipt.parse(params)
+  end
+
+  def ED218(params)
+  end
+
+  def ED243(params)
+    if params.is_a?(Hash)
+      Ufebs::Requests::DefineRequest.new(params)
+    else
+      Ufebs::Requests::DefineRequest.parse(params)
+    end
+  end
+
+  def ED244(params)
+    if params.is_a?(Hash)
+      Ufebs::Requests::DefineAnswer.new(params)
+    else
+      Ufebs::Requests::DefineAnswer.parse(params)
+    end
+  end
+
+  # XML запрос-зонд
+  # @param params [Hash]
+  # @option :number аттрибут EDNo
+  # @option :ed_date аттрибут EDDate
+  # @option :ed_author аттрибут EDAuthor
+  def ED999(params)
+    Ufebs::Requests::TestRequest.new(params)
+  end
+
+  def PacketEPD(payment_eds, params)
+    Ufebs::Documents::Package.new(payment_eds, params)
+  end
+
   def PacketESID(params)
     Ufebs::Documents::PackageResponse.parse(params)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Evgeniy Burdaev
@@ -404,6 +404,7 @@ files:
 - lib/ufebs/entities/ed_define_answer_info.rb
 - lib/ufebs/entities/ed_define_request_info.rb
 - lib/ufebs/entities/ed_field_list.rb
+- lib/ufebs/entities/ed_info.rb
 - lib/ufebs/entities/ed_reestr_info.rb
 - lib/ufebs/entities/ed_ref_id.rb
 - lib/ufebs/entities/initial_packet.rb
@@ -417,6 +418,7 @@ files:
 - lib/ufebs/requests/define_answer.rb
 - lib/ufebs/requests/define_request.rb
 - lib/ufebs/requests/group_request.rb
+- lib/ufebs/requests/group_status_answer.rb
 - lib/ufebs/requests/negative_status_notification.rb
 - lib/ufebs/requests/package_request.rb
 - lib/ufebs/requests/positive_status_notification.rb