br_invoices_pdf 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 298be27e07b387193e6a49fbd0b1e69badf4bfc0
-  data.tar.gz: db89d1cff2cf9d31bdf909a7e2587558f4169411
+  metadata.gz: 9789280a8f99b22f164b17335efc48fa5072a39b
+  data.tar.gz: 11546516680254d6b9502f55f7e813bd2a97077d
 SHA512:
-  metadata.gz: 4dcd5f1177c71300991df3015951c148618fd650749002b2c766de21097a00e00616d03ec43dd145cfd6af3a446dcc8ae60c4a5f66b6043cf33170160ba1c41c
-  data.tar.gz: 9b7d79d7cbb32652ba965a15149e7ead92b7cb9244005fcba150574050011bc9e53e26eab12310edb732f467f7afda8fef69fb51ac4c7768b7e437428caa2006
+  metadata.gz: bb34a40c5de90ac81f2fb6bb622832cee19f1c5a006e33f3e43af16d2f7e4bdce8c7835ed55d6439e826fb99fbbf7beec940e3d96351cceb1dd2af19e76b9a19
+  data.tar.gz: 0f6065d4951a1b3573cdc7ef9ba0062d743b542af4e153698115c817f01351de5fc33bafa236e02571bbb78fe5f28b72e184a034f7b367e8d44f88778e3057cb

data/lib/br_invoices_pdf.rb

@@ -26,11 +26,13 @@ module BrInvoicesPdf
   def generate(type, xml, options = {})
     generator = @generators[type]
     raise(Errors::InvalidDocumentType, type) unless generator
+
     generator.generate(xml, options)
   end
 
   def register(type, renderer, parser)
     raise(ArgumentError, "Expected Symbol or String to type. Received #{type.class}") unless valid_type?(type)
+
     @generators[type.to_sym] = Generator.new(renderer, parser)
   end
 

data/lib/br_invoices_pdf/cfe/parser/access_key.rb

@@ -11,8 +11,10 @@ module BrInvoicesPdf
         def execute(xml)
           element = xml.locate('Signature/SignedInfo').first
           return unless element
+
           element = element.nodes.last
           return unless element
+
           element.attributes[:URI]
         end
       end

data/lib/br_invoices_pdf/cfe/parser/fisco_obs.rb

@@ -13,6 +13,7 @@ module BrInvoicesPdf
             node = element.nodes.first
             field = element.attributes[:xCampo]
             next unless node && field
+
             {
               text: node.text,
               field: field

data/lib/br_invoices_pdf/cfe/parser/payments.rb

@@ -12,6 +12,7 @@ module BrInvoicesPdf
           node_payments = xml.locate('infCFe/pgto')
 
           return unless node_payments
+
           payments_by_nodes(node_payments) if node_payments.any?
         end
 

data/lib/br_invoices_pdf/nfce/parser/payments.rb

@@ -9,16 +9,40 @@ module BrInvoicesPdf
         module_function
 
         def execute(xml)
-          node_payments = xml.locate("#{root_path(xml)}/pag")
+          xml_version = xml.locate(root_path(xml).to_s)[0].attributes[:versao]
+
+          return payments_new_version(xml) if xml_version[0] == '4'
+
+          payments_old_version(xml)
+        end
 
+        def payments_old_version(xml)
+          node_payments = xml.locate("#{root_path(xml)}/pag")
           node_payments.map(&method(:payment_by))
         end
 
-        def payment_by(element)
+        def payments_new_version(xml)
+          node_payments = xml.locate("#{root_path(xml)}/pag/detPag")
+          cashback = cashback_for(xml)
+
+          node_payments.map do |payment|
+            payment_by(payment, cashback: cashback)
+          end
+        end
+
+        def cashback_for(xml)
+          locate_element(xml.locate("#{root_path(xml)}/pag")[0], 'vTroco')
+        end
+
+        def payment_by(element, cashback: nil)
+          payment = locate_element(element, 'tPag')
+
+          cashback_amount = cashback if payment == '01'
+
           {
-            type: Util::Enum::PAYMENT_TYPES[locate_element(element, 'tPag')],
+            type: Util::Enum::PAYMENT_TYPES[payment],
             amount: locate_element(element, 'vPag'),
-            cashback: locate_element(element, 'vTroco')
+            cashback: cashback_amount || locate_element(element, 'vTroco')
           }
         end
         private_class_method :payment_by

data/lib/br_invoices_pdf/nfce/renderer/procon_info.rb

@@ -13,6 +13,7 @@ module BrInvoicesPdf
           procon_message = data[:additional_variables][:procon_message]
 
           return if ['', nil].include? procon_message
+
           box(pdf, [0, pdf.cursor], page_content_width(pdf)) do
             procon_message(pdf, procon_message)
           end

data/lib/br_invoices_pdf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrInvoicesPdf
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: br_invoices_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Thiago Ribeiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: barby