br_danfe 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447b593d2df30cc919fbc59e6453d794c1a60319a256357f650023e51bc6f369
-  data.tar.gz: a1d696214eeb03ef958c001870427cada4d826fabeb09cb24b1174a3ff19107e
+  metadata.gz: 8ddb33657303d50b425d475e7c493dde5272ed1d4e4bd7d96f9eab45a8f5c600
+  data.tar.gz: 67ba29fde1351c27b7ff6479a6bfd5d803cc843b4a756f9594bc53c82f44a3a0
 SHA512:
-  metadata.gz: b7ca6b73178f85c69d8e40334cfdffe2a1840de6c4910c1a40d09f97df05624226a1c5e8e285b5774fcceac78646e32194ce372456a038a66f52f67cb6202f83
-  data.tar.gz: 480fbe9dedac710566471b56a87ec05598bde90232b49fce063462739f249be6084944f397b8424661a2201ce086c77b8ae76c0ceb3315c2b7bf12c0757dfd30
+  metadata.gz: e99eb16d42eff7bf889afa5d697f75bdba24ebcc091b8713d55fa83e6950f5b2bc4269d7401292594dbcd5585b1698cd2fbfa3ec45fb96dadb94d0f117da4bfb
+  data.tar.gz: cf348dbad5f7117cda63a7e3d88226c35900a99cfe3ae3dca13e9fab3b093a195c0e7a5331877275b9580ade584422fcb9a63f6b120f7f279eaaf9b647b1ae79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.16.0)
+    br_danfe (0.17.0)
       barby (= 0.6.8)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
@@ -25,7 +25,7 @@ GEM
     afm (0.2.2)
     ast (2.4.2)
     barby (0.6.8)
-    br_documents (0.2.0)
+    br_documents (0.2.1)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
     byebug (11.1.3)
@@ -60,11 +60,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
     minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -92,7 +90,7 @@ GEM
     psych (4.0.1)
     racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -147,7 +145,7 @@ DEPENDENCIES
   guard (~> 2.16.2)
   guard-rspec
   pdf-inspector (~> 1.3.0)
-  rake (= 13.0.1)
+  rake (= 13.0.6)
   rspec (= 3.10.0)
   rubocop (= 0.67.0)
   rubocop-performance (~> 1.1.0)

data/br_danfe.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard', '~> 2.16.2'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pdf-inspector', '~> 1.3.0'
-  spec.add_development_dependency 'rake', '13.0.1'
+  spec.add_development_dependency 'rake', '13.0.6'
   spec.add_development_dependency 'rspec', '3.10.0'
   spec.add_development_dependency 'rubocop', '0.67.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.1.0'

data/lib/br_danfe/danfe_lib/nfce.rb

@@ -1,7 +1,7 @@
 module BrDanfe
   module DanfeLib
     class Nfce < Base
-      PAGE_WIDTH = 8.cm
+      PAGE_WIDTH = 7.cm
       PAGE_HEIGHT = 100.cm
 
       private
@@ -31,7 +31,7 @@ module BrDanfe
           NfceLib::Key.new(@document, xml).render
           NfceLib::Recipient.new(@document, xml).render
           NfceLib::NfceIdentification.new(@document, xml).render
-          BrDanfe::QrCode.new(pdf: @document, xml: xml, qr_code_tag: xml['qrCode'], box_size: 3.cm).render
+          BrDanfe::QrCode.new(pdf: @document, xml: xml, qr_code_tag: xml['qrCode'], box_size: 4.5.cm).render
           NfceLib::Footer.new(@document, xml).render(footer_info)
 
           render_no_fiscal_value(xml)

data/lib/br_danfe/danfe_lib/nfce_lib/document.rb

@@ -12,7 +12,7 @@ module BrDanfe
             botton_margin: 0
           )
 
-          @document.font 'Courier'
+          @document.font 'tinos'
           @document.line_width = 0.3
         end
 

data/lib/br_danfe/danfe_lib/nfce_lib/footer.rb

@@ -9,11 +9,11 @@ module BrDanfe
 
         def render(info = '')
           tot_trib = @xml['ICMSTot/vTotTrib'].present? ? BrDanfe::Helper.numerify(@xml['ICMSTot/vTotTrib']) : '0,00'
-          @pdf.text "Tributos Totais Incidentes (Lei Federal 12.741/2012): R$ #{tot_trib}", size: 5, align: :center
+          @pdf.text "Tributos Totais Incidentes (Lei Federal 12.741/2012): R$ #{tot_trib}", size: 8, align: :center
 
           if info.present?
             @pdf.render_blank_line
-            @pdf.text info, size: 5, align: :center
+            @pdf.text info, size: 8, align: :center
           end
         end
       end

data/lib/br_danfe/danfe_lib/nfce_lib/header.rb

@@ -14,6 +14,7 @@ module BrDanfe
 
           render_company_info(cursor)
           render_logo(cursor) if @logo.present?
+          render_doc
 
           render_homologation if BrDanfe::Helper.homologation?(@xml)
         end
@@ -23,21 +24,20 @@ module BrDanfe
         def render_company_info(cursor)
           one_line = 1
 
-          @pdf.bounding_box([x_position, cursor], width: width_box, height: 45) do
-            @pdf.text (@xml['emit/xNome']).to_s, size: 7, align: :left, style: :bold
-            @pdf.text cnpj(@xml['emit/CNPJ']), size: 6, align: :left
-            @pdf.text BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), size: 6, align: :left
+          @pdf.bounding_box([x_position, cursor], width: width_box, height: 65) do
+            @pdf.text (@xml['emit/xNome']).to_s, size: 10, align: :left, style: :bold
+            @pdf.text cnpj(@xml['emit/CNPJ']), size: 9, align: :left
+            @pdf.text BrDanfe::DanfeLib::NfceLib::Helper.address(@xml.css('enderEmit')), size: 9, align: :left
             @pdf.render_blank_line if count_name_lines(@xml['emit/xNome']) == one_line
-            @pdf.text 'Documento Auxiliar da Nota Fiscal de Consumidor Eletrônica', size: 6, align: :left
           end
         end
 
         def x_position
-          @logo.present? ? 1.7.cm : 0
+          @logo.present? ? 2.2.cm : 0
         end
 
         def width_box
-          @logo.present? ? 5.7.cm : 7.4.cm
+          @logo.present? ? 4.5.cm : 6.7.cm
         end
 
         def cnpj(info)
@@ -51,7 +51,7 @@ module BrDanfe
         end
 
         def render_logo(cursor)
-          box_size = 45
+          box_size = 60
           logo_options = BrDanfe::Logo::Options.new(box_size, @logo_dimensions).options
 
           @pdf.bounding_box([0, cursor], width: box_size, height: box_size) do
@@ -59,9 +59,23 @@ module BrDanfe
           end
         end
 
-        def render_homologation
+        def render_doc
           @pdf.render_blank_line
-          @pdf.text 'EMITIDA EM AMBIENTE DE HOMOLOGAÇÃO – SEM VALOR FISCAL', size: 7, align: :center, style: :bold
+          cursor = @pdf.cursor
+
+          @pdf.bounding_box([0, cursor], width: 6.7.cm, height: 20) do
+            @pdf.text 'Documento Auxiliar da Nota Fiscal de Consumidor Eletrônica', size: 9, align: :center
+          end
+        end
+
+        def render_homologation
+          2.times { @pdf.render_blank_line }
+
+          cursor = @pdf.cursor
+          @pdf.bounding_box([0, cursor], width: 6.7.cm, height: 20) do
+            @pdf.text 'EMITIDA EM AMBIENTE DE HOMOLOGAÇÃO', size: 8, align: :center, style: :bold
+            @pdf.text 'SEM VALOR FISCAL', size: 8, align: :center, style: :bold
+          end
         end
       end
     end

data/lib/br_danfe/danfe_lib/nfce_lib/key.rb

@@ -10,9 +10,9 @@ module BrDanfe
         def render
           @pdf.render_blank_line
 
-          @pdf.text 'Consulte pela Chave de Acesso em', size: 7, align: :center, style: :bold
-          @pdf.text @xml['urlChave'], size: 7, align: :center
-          @pdf.text @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, '\\1 '), size: 6, align: :center
+          @pdf.text 'Consulte pela Chave de Acesso em', size: 9, align: :center, style: :bold
+          @pdf.text @xml['urlChave'], size: 9, align: :center
+          @pdf.text @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, '\\1 '), size: 8, align: :center
         end
       end
     end

data/lib/br_danfe/danfe_lib/nfce_lib/nfce_identification.rb

@@ -12,9 +12,9 @@ module BrDanfe
           identification = "NFC-e nº #{@xml['ide/nNF']} Série #{@xml['ide/serie']} #{emitted_at}"
 
           @pdf.render_blank_line
-          @pdf.text identification, size: 7, align: :center, style: :bold
-          @pdf.text "<b>Protocolo de autorização:</b> #{@xml['infProt/nProt']}", size: 7, align: :center, inline_format: true
-          @pdf.text "<b>Data de autorização: </b> #{BrDanfe::Helper.format_datetime(@xml['infProt/dhRecbto'])}", size: 7, align: :center, inline_format: true
+          @pdf.text identification, size: 9, align: :center, style: :bold
+          @pdf.text "<b>Protocolo de autorização:</b> #{@xml['infProt/nProt']}", size: 9, align: :center, inline_format: true
+          @pdf.text "<b>Data de autorização: </b> #{BrDanfe::Helper.format_datetime(@xml['infProt/dhRecbto'])}", size: 9, align: :center, inline_format: true
         end
       end
     end

data/lib/br_danfe/danfe_lib/nfce_lib/product_list.rb

@@ -14,19 +14,54 @@ module BrDanfe
 
         private
 
+        def render_headers(headers)
+          2.times { @pdf.render_blank_line }
+          cursor = @pdf.cursor
+          headers.each_with_index do |header, index|
+            cursor -= 10 if index == 1
+            @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.3.cm do
+              @pdf.text header[:content], header[:options]
+            end
+          end
+        end
+
         def headers
           [
-            header_column('Código', :left),
-            header_column('Descrição', :left),
-            header_column('Qtde', :right),
+            header_column('CÓDIGO - DESCRIÇÃO', :left),
+            header_column('QTD', :left),
             header_column('UN', :right),
-            header_column('Vl Unit', :right),
-            header_column('Vl Total', :right)
+            header_column('VL UNIT', :right),
+            header_column('TOTAL', :right)
           ]
         end
 
         def header_column(title, align)
-          { content: title, options: { align: align, size: 6, style: :bold } }
+          { content: title, options: { align: align, size: 9, style: :bold } }
+        end
+
+        def columns
+          [
+            { width: 6.7.cm, position: 0 },
+            { width: 1.7.cm, position: 0.cm },
+            { width: 1.cm, position: 1.7.cm },
+            { width: 1.7.cm, position: 2.7.cm },
+            { width: 2.3.cm, position: 4.4.cm }
+          ]
+        end
+
+        def render_products
+          @pdf.render_blank_line
+          products.each do |product|
+            cursor = @pdf.cursor
+
+            product.each_with_index do |cell, index|
+              cursor -= 10 if index == 1
+              @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.3.cm do
+                options = cell[:options].merge(overflow: :truncate)
+                @pdf.text_box cell[:content], options
+              end
+            end
+          end
         end
 
         def products
@@ -35,9 +70,8 @@ module BrDanfe
 
         def product(det)
           [
-            cell_text(det.css('prod/cProd').text),
-            cell_text(det.css('prod/xProd').text),
-            cell_number(BrDanfe::Helper.numerify(det.css('prod/qCom').text)),
+            cell_text("#{det.css('prod/cProd').text} - #{det.css('prod/xProd').text}"),
+            cell_text(BrDanfe::Helper.numerify(det.css('prod/qCom').text), align: :left),
             cell_text(det.css('prod/uCom').text, align: :right),
             cell_number(BrDanfe::Helper.numerify(det.css('prod/vUnCom').text)),
             cell_number(BrDanfe::Helper.numerify(det.css('prod/vProd').text))
@@ -45,7 +79,7 @@ module BrDanfe
         end
 
         def cell_text(text, options = {})
-          cell = { content: text, options: { border_width: 0, size: 6 } }
+          cell = { content: text, options: { border_width: 0, size: 9 } }
           cell[:options].merge!(options)
           cell
         end
@@ -53,49 +87,6 @@ module BrDanfe
         def cell_number(text)
           cell_text(text, align: :right)
         end
-
-        def columns
-          [
-            { width: 0.9.cm, position: 0 },
-            { width: 2.6.cm, position: 0.9.cm },
-            { width: 1.1.cm, position: 3.5.cm },
-            { width: 0.4.cm, position: 4.6.cm },
-            { width: 1.2.cm, position: 5.cm },
-            { width: 1.2.cm, position: 6.2.cm }
-          ]
-        end
-
-        def render_headers(headers)
-          2.times { @pdf.render_blank_line }
-          cursor = @pdf.cursor
-          headers.each_with_index do |header, index|
-            @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: 0.2.cm do
-              @pdf.text header[:content], header[:options]
-            end
-          end
-        end
-
-        def render_products
-          @pdf.render_blank_line
-          index_of_product_name = 1
-          products.each do |product|
-            box_height = box_height(product[index_of_product_name][:content])
-            cursor = @pdf.cursor
-
-            product.each_with_index do |cell, index|
-              @pdf.bounding_box [columns[index][:position], cursor], width: columns[index][:width], height: box_height do
-                @pdf.text cell[:content], cell[:options]
-              end
-            end
-          end
-        end
-
-        def box_height(content)
-          line_height_base = 0.23.cm
-
-          lines = content.scan(/[\s\S]{1,20}( |$)/).length
-          line_height_base * lines
-        end
       end
     end
   end

data/lib/br_danfe/danfe_lib/nfce_lib/recipient.rb

@@ -23,7 +23,7 @@ module BrDanfe
         private
 
         def options
-          { size: 7, align: :center }
+          { size: 9, align: :center }
         end
 
         def identified_recipient?

data/lib/br_danfe/danfe_lib/nfce_lib/total_list.rb

@@ -18,12 +18,13 @@ module BrDanfe
         private
 
         def subtotal
+          @pdf.render_blank_line
           cursor = @pdf.cursor
-          @pdf.bounding_box [4.8.cm, cursor], width: 1.4.cm, height: 0.2.cm do
-            @pdf.text 'Subtotal R$', size: 6, align: :left
+          @pdf.bounding_box [3.5.cm, cursor], width: 1.6.cm, height: 0.4.cm do
+            @pdf.text 'Subtotal R$', size: 9, align: :left
           end
-          @pdf.bounding_box [6.2.cm, cursor], width: 1.2.cm, height: 0.2.cm do
-            @pdf.text BrDanfe::Helper.numerify(@xml['ICMSTot > vProd'].to_f), size: 6, align: :right
+          @pdf.bounding_box [5.1.cm, cursor], width: 1.6.cm, height: 0.4.cm do
+            @pdf.text BrDanfe::Helper.numerify(@xml['ICMSTot > vProd'].to_f), size: 9, align: :right
           end
         end
 
@@ -31,16 +32,16 @@ module BrDanfe
           @pdf.render_blank_line
 
           cursor = @pdf.cursor
-          print_text('Qtde. total de itens', cursor, size: 7, align: :left)
-          print_text(@xml.css('det').count.to_s, cursor, size: 7, align: :right)
+          print_text('QTD. TOTAL DE ITENS', cursor, size: 10, align: :left)
+          print_text(@xml.css('det').count.to_s, cursor, size: 10, align: :right)
 
           cursor = @pdf.cursor
-          print_text('Desconto R$', cursor, size: 7, align: :left)
-          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vDesc'].to_f), cursor, size: 7, align: :right)
+          print_text('DESCONTO R$', cursor, size: 10, align: :left)
+          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vDesc'].to_f), cursor, size: 10, align: :right)
 
           cursor = @pdf.cursor
-          print_text('Valor Total R$', cursor, size: 7, align: :left, style: :bold)
-          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vNF'].to_f), cursor, size: 7, align: :right, style: :bold)
+          print_text('VALOR TOTAL R$', cursor, size: 10, align: :left, style: :bold)
+          print_text(BrDanfe::Helper.numerify(@xml['ICMSTot > vNF'].to_f), cursor, size: 10, align: :right, style: :bold)
         end
 
         def payment_methods
@@ -59,19 +60,19 @@ module BrDanfe
             @pdf.render_blank_line
 
             cursor = @pdf.cursor
-            print_text('Forma de pagamento', cursor, size: 7, align: :left, style: :bold)
-            print_text('Valor pago R$', cursor, size: 7, align: :right, style: :bold)
+            print_text('FORMA PAGTO.', cursor, size: 9, align: :left, style: :bold)
+            print_text('VLR PAGO R$', cursor, size: 9, align: :right, style: :bold)
 
             payments.each do |key, value|
               cursor = @pdf.cursor
-              print_text(I18n.t("nfce.payment_methods.#{key}"), cursor, size: 7, align: :left)
-              print_text(BrDanfe::Helper.numerify(value.to_f), cursor, size: 7, align: :right)
+              print_text(I18n.t("nfce.payment_methods.#{key}"), cursor, size: 9, align: :left)
+              print_text(BrDanfe::Helper.numerify(value.to_f), cursor, size: 9, align: :right)
             end
           end
         end
 
         def print_text(text, cursor, options)
-          @pdf.bounding_box [0, cursor], width: 7.4.cm, height: 0.25.cm do
+          @pdf.bounding_box [0, cursor], width: 6.7.cm, height: 0.35.cm do
             @pdf.text text, options
           end
         end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.0'.freeze
 end

data/spec/br_danfe/danfe_lib/nfce_lib/header_spec.rb

@@ -42,7 +42,7 @@ describe BrDanfe::DanfeLib::NfceLib::Header do
     BrDanfe::XML.new(xml)
   end
 
-  let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 5.cm) }
+  let(:pdf) { BrDanfe::DanfeLib::NfceLib::Document.new(8.cm, 6.cm) }
 
   subject { described_class.new pdf, xml, logo, logo_options }
 

data/spec/fixtures/nfce/lib/document#render.pdf

@@ -13,20 +13,18 @@ endobj
 3 0 obj
 << /Type /Pages
 /Count 2
-/Kids [5 0 R 8 0 R]
+/Kids [5 0 R 7 0 R]
 >>
 endobj
 4 0 obj
-<< /Length 55
+<< /Length 38
 >>
 stream
 q
 0.3 w
 
 BT
-8.50394 38.74569 Td
-/F1.0 6 Tf
-<> Tj
+8.50394 38.36169 Td
 ET
 
 Q
@@ -43,19 +41,11 @@ endobj
 /ArtBox [0 0 226.77165 51.02362]
 /Contents 4 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F1.0 6 0 R
->>
+/Font << >>
 >>
 >>
 endobj
 6 0 obj
-<< /Type /Font
-/Subtype /Type1
-/BaseFont /Courier
-/Encoding /WinAnsiEncoding
->>
-endobj
-7 0 obj
 << /Length 10
 >>
 stream
@@ -65,7 +55,7 @@ Q
 
 endstream
 endobj
-8 0 obj
+7 0 obj
 << /Type /Page
 /Parent 3 0 R
 /MediaBox [0 0 226.77165 51.02362]
@@ -73,27 +63,26 @@ endobj
 /BleedBox [0 0 226.77165 51.02362]
 /TrimBox [0 0 226.77165 51.02362]
 /ArtBox [0 0 226.77165 51.02362]
-/Contents 7 0 R
+/Contents 6 0 R
 /Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
 >>
 >>
 endobj
 xref
-0 9
+0 8
 0000000000 65535 f 
 0000000015 00000 n 
 0000000109 00000 n 
 0000000158 00000 n 
 0000000221 00000 n 
-0000000326 00000 n 
-0000000647 00000 n 
-0000000742 00000 n 
-0000000802 00000 n 
+0000000309 00000 n 
+0000000618 00000 n 
+0000000678 00000 n 
 trailer
-<< /Size 9
+<< /Size 8
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-1099
+975
 %%EOF