ruby_ufebs 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fde77327f89a47d9093cf6348a1166f21646a87
-  data.tar.gz: ac8b9f64f3fede7f12a31e2ed0c74bd8a3130c58
+  metadata.gz: 3b26e315abe1ba3846ac7362ab810fcec51c7a26
+  data.tar.gz: ae6b218f92527545fd7a2802c5a14e2dad6a5787
 SHA512:
-  metadata.gz: b91e5fed70f42e635255acdf20a61ff3975a3d6962232161ba0ed87fc08299abc5f8e54798984e152d93e41c80b430a066f90f8512ca1788fdd06290abde1fcb
-  data.tar.gz: dd597a549024422c3c692894b18d1ffa06c070f642c9f075fa52f9a42296735cec527609bd291123f063b7b1f621b0559fe519f0c19ab4987f79e73b5f2cc5ae
+  metadata.gz: 85d3cbfad527726ed2c74d240d8cfdda6d837fa2240c3175b212836a39bff643057ae977d0157a74dddcf25e1e68655657a79e9e8bf4f64c2b9c5bc7caa7ce41
+  data.tar.gz: f4c2b875afbe21fa5feed68e178efa788bc58890ba72d76b3aa92cc8f9b3792717c9112585c10f789fffd313390559fe5919892498c0c16b12b4e61393db73c1

data/lib/ufebs/documents/package_response.rb

@@ -0,0 +1,59 @@
+require_relative 'payment_response'
+require_relative '../entities/session'
+
+module Ufebs
+  module Documents
+    class Package
+      include HappyMapper
+      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_receiver, String, tag: 'EDReceiver'
+      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
+
+      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]
+        @number    = params[:number]
+        @quantity  = params[:quantity] || payment_orders.size
+        @sum       = params[:sum]
+        @system_code   = '01'
+        super()
+      end
+
+      def to_xml(encoding: 'UTF-8')
+        super(Nokogiri::XML::Builder.new(:encoding => encoding)).to_xml
+      end
+    end
+  end
+end
+
+# <?xml version="1.0" encoding="WINDOWS-1251"?>
+# <PacketESID xmlns="urn:cbr-ru:ed:v2.0" EDAuthor="4583001999" EDCreationTime="13:33:08" EDDate="2018-02-23" EDNo="1070230" EDReceiver="4525420000">
+#   <dsig:SigValue xmlns:dsig="urn:cbr-ru:dsig:v1.1">MIIBaQYJKoZIhvcNAQcCoIIBWjCCAVYCAQExDjAMBggqhQMHAQECAgUAMAsGCSqGSIb3DQEHATGCATIwggEuAgEBMGAwTDELMAkGA1UEBhMCUlUxCzAJBgNVBAgTAjAwMQ8wDQYDVQQHEwZSVEdTQlIxDTALBgNVBAoTBEdDS0kxEDAOBgNVBAMTB0FETUlOQ0ECEEBQFMCd4KlDNKW6RlhblsQwDAYIKoUDBwEBAgIFAKBpMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MDIyNzEzMzIzMlowLwYJKoZIhvcNAQkEMSIEIPretuTeA+Uosyhj6ROUT66yYTuZF+aaXclhxXXKmPxdMAwGCCqFAwcBAQEBBQAEQD/Ah3zv5DZv13fsX1Pcqd3Z7YFls14j+4rnYkrRuU31oR1clc4YUG1Lg71Hrp7q/uErXapd33FrjKyxO7Dvfxo=</dsig:SigValue>
+#   <InitialPacketED EDAuthor="4525420000" EDDate="2018-02-23" EDNo="5"/>
+#   <Session>
+#     <SessionID>6</SessionID>
+#   </Session>
+#   <ED206 Acc="30101810945250000420" BICCorr="044525000" CorrAcc="40101810845250010102" DC="1" EDAuthor="4583001999" EDDate="2018-02-23" EDNo="1070231" EDReceiver="4525420000" Sum="381" SystemCode="01" TransDate="2018-02-23" TransTime="13:33:08">
+#     <AccDoc AccDocDate="2018-02-23" AccDocNo="441"/>
+#     <EDRefID EDAuthor="4525420000" EDDate="2018-02-23" EDNo="6"/>
+#     <ProcessingDetails CreditDate="2018-02-23" DebitDate="2018-02-23"/>
+#   </ED206>
+#   <ED206 Acc="30101810945250000420" BICCorr="044525000" CorrAcc="40101810045250010041" DC="1" EDAuthor="4583001999" EDDate="2018-02-23" EDNo="1070232" EDReceiver="4525420000" Sum="680700" SystemCode="01" TransDate="2018-02-23" TransTime="13:33:08">
+#     <AccDoc AccDocDate="2018-02-23" AccDocNo="459"/>
+#     <EDRefID EDAuthor="4525420000" EDDate="2018-02-23" EDNo="7"/>
+#     <ProcessingDetails CreditDate="2018-02-23" DebitDate="2018-02-23"/>
+#   </ED206>
+# </PacketESID>

data/lib/ufebs/documents/payment_response.rb

@@ -0,0 +1,57 @@
+module Ufebs
+  module Documents
+    class PaymentResponse
+      include HappyMapper
+
+      register_namespace 'ed', "urn:cbr-ru:ed:v2.0"
+      tag 'ED206'
+      namespace 'ed'
+
+      attribute :acc,                 String, tag: 'Acc'
+      attribute :bic_corr,            String, tag: 'BICCorr'
+      attribute :corr_acc,            String, tag: 'CorrAcc'
+      attribute :dc,                  String, tag: 'DC'
+      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 :sum,                 String, tag: 'Sum'
+      attribute :system_code,         String, tag: 'SystemCode'
+      attribute :trans_date,          String, tag: 'TransDate'
+      attribute :trans_time,          String, tag: 'TransTime'
+
+      has_one :acc_doc, ::Ufebs::Entities::AccDoc,              tag: 'AccDoc'
+      has_one :ed_ref_id, ::Ufebs::Entities::EdRefId,           tag: 'EDRefID'
+      has_one :processing_details, ::Ufebs::Entities::ProcessingDetails, tag: 'ProcessingDetails'
+
+      def initialize(params = {})
+        params.each do |key, value|
+          case key
+          when :acc_doc
+            @acc_doc = value.is_a?(Hash) ? ::Ufebs::Entities::AccDoc.new(value) : acc_doc
+          when :ed_ref_id
+            @ed_ref_id = value.is_a?(Hash) ? ::Ufebs::Entities::EdRefId.new(value) : acc_doc
+          when :processing_details
+            @processing_details = value.is_a?(Hash) ? ::Ufebs::Entities::ProcessingDetails.new(value) : acc_doc
+          else instance_variable_set("@#{key}".to_sym, value)
+          end
+
+          super()
+        end
+      end
+    end
+  end
+end
+#   <ED206 Acc="30101810945250000420" 
+#   BICCorr="044525000" 
+#   CorrAcc="40101810045250010041" 
+#   DC="1" EDAuthor="4583001999" 
+#   EDDate="2018-02-23" EDNo="1070232" 
+#   EDReceiver="4525420000" Sum="680700" 
+#   SystemCode="01" 
+#   TransDate="2018-02-23" 
+#   TransTime="13:33:08">
+#     <AccDoc AccDocDate="2018-02-23" AccDocNo="459"/>
+#     <EDRefID EDAuthor="4525420000" EDDate="2018-02-23" EDNo="7"/>
+#     <ProcessingDetails CreditDate="2018-02-23" DebitDate="2018-02-23"/>
+#   </ED206>

data/lib/ufebs/version.rb

@@ -1,3 +1,3 @@
 module RubyUfebs
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/ufebs.rb

@@ -155,10 +155,21 @@ module Ufebs
     params.is_a?(Hash) ? Ufebs::Documents::PaymentOrder.new(params) : Ufebs::Documents::PaymentOrder.parse(params)
   end
 
-  def PackedEPD(payment_eds, params)
+  def PacketEPD(payment_eds, params)
     Ufebs::Documents::Package.new(payment_eds, params)
   end
 
+  def ED206(params)
+    return Ufebs::Documents::PaymentResponse.new(params) if params.is_a?(Hash)
+    Ufebs::Documents::PaymentResponse.parse(params)
+  end
+
+  def ED205(params)
+  end
+
+  def packetESID
+  end
+
   def validate(doc)
     doc = Nokogiri::XML(doc) if doc.is_a?(String)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ufebs
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Evgeniy Burdaev
@@ -424,7 +424,9 @@ files:
 - lib/ufebs.rb
 - lib/ufebs/configuration.rb
 - lib/ufebs/documents/package.rb
+- lib/ufebs/documents/package_response.rb
 - lib/ufebs/documents/payment_order.rb
+- lib/ufebs/documents/payment_response.rb
 - lib/ufebs/entities/acc_doc.rb
 - lib/ufebs/entities/bank.rb
 - lib/ufebs/entities/departmental_info.rb