br_danfe 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bda9b1730c41478b686a0e211b65145910338e0e9099278d0a0f668114e6a30
-  data.tar.gz: 2199391c1cea3f04961d4629b9832248383b6e608aa2dc236a03b9f4bc77da71
+  metadata.gz: 210c7c1c3a0ea98ed48753e1432c91ae8f4795400d5df40d7d9c2e0a91d4c502
+  data.tar.gz: 611c666027eca9cac90640753446085f58b4b9deacc43c8d0df5f7150d623a1f
 SHA512:
-  metadata.gz: 29594d4d225fa2ac7d3d2f6a85a6aed40a5daec51277e359775765a6001518dd3b9240d0c41fafd42a27ffe9b9160692bec874af728363b5c9f2b0d60049c140
-  data.tar.gz: 796ba3063a8188a8ee658bdfcf197b0517c1d8cae30d70314646bc7f15d13cf26c11a2079dddc2833d2c52187d74860e784aebaee151cb232d82cbf1cb65a7f2
+  metadata.gz: 4c04ab16fdac8a9285024a018b2c23cdd5d65c6e2748b8cafa9e97ec67cf10f49cc0e0766a475e060f2c65793a6400795988e299d6931bd4cacb2ed01d18092f
+  data.tar.gz: b894f40fba2376bd795beadfbf47dabe2db2c9d7a40e69c728d29550397c6df2baf14acb39ff73cface9df9ffd2de7832b2762647ccf2ab6715134fcfb740c82

data/Gemfile.lock

@@ -1,35 +1,35 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.14.2)
-      barby (= 0.5.1)
+    br_danfe (0.15.1)
+      barby (= 0.6.8)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)
       nokogiri (>= 1.8)
-      prawn (~> 2.0)
+      prawn (~> 2.4.0)
       prawn-table (= 0.2.2)
       rqrcode (~> 1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.0)
-    barby (0.5.1)
-    br_documents (0.1.3)
+    barby (0.6.8)
+    br_documents (0.2.0)
       activemodel (>= 4.0.0)
       i18n (>= 0.6.5)
     byebug (11.1.3)
-    chunky_png (1.3.15)
+    chunky_png (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.3.2)
     ffi (1.13.1)
@@ -48,7 +48,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json (2.3.0)
@@ -57,27 +57,29 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     nenv (0.3.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.19.1)
     parser (2.7.0.4)
       ast (~> 2.4.0)
-    pdf-core (0.8.1)
-    prawn (2.3.0)
-      pdf-core (~> 0.8.1)
-      ttfunk (~> 1.6)
+    pdf-core (0.9.0)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     psych (3.1.0)
+    racc (1.5.2)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.4)
@@ -86,7 +88,7 @@ GEM
     rqrcode (1.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 0.1)
-    rqrcode_core (0.1.2)
+    rqrcode_core (0.2.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -118,7 +120,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     thor (1.0.1)
-    ttfunk (1.6.2.1)
+    ttfunk (1.7.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.5.0)

data/README.md

@@ -45,6 +45,22 @@ XML version | Supported?
           end
         end
 
+#### Usage in Rails Controller with more than one xml
+        class DanfeController < ApplicationController
+          def new
+            invoices = Invoice.where(ids: params[:ids])
+            xmls_as_string = []
+            
+            invoices.each do |invoice|
+                xmls_as_string << invoice.generate_xml # your method that generates the NF-e's xml
+            end
+
+            danfe = BrDanfe::Danfe.new(xmls_as_string)
+
+            send_data danfe.render_pdf, filename: "danfe.pdf", type: "application/pdf"
+          end
+        end
+
 ### Options
 
 * `logo_path`: Path of sender's logo image.

data/br_danfe.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.5.1'
 
-  spec.add_dependency 'barby', '0.5.1'
+  spec.add_dependency 'barby', '0.6.8'
   spec.add_dependency 'br_documents', '>= 0.1.3'
   spec.add_dependency 'i18n', '>= 0.8.6'
   spec.add_dependency 'nokogiri', '>= 1.8'
-  spec.add_dependency 'prawn', '~> 2.0'
+  spec.add_dependency 'prawn', '~> 2.4.0'
   spec.add_dependency 'prawn-table', '0.2.2'
   spec.add_dependency 'rqrcode', '~> 1.1.1'
 

data/config/locales/pt-BR.yml

@@ -151,4 +151,5 @@ pt-BR:
       '03': "Cartão de Crédito"
       '04': "Cartão de Débito"
       '05': "Crédito Loja"
+      '15': "Boleto"
       '99': "Outros"

data/lib/br_danfe/danfe.rb

@@ -1,12 +1,15 @@
 module BrDanfe
   class Danfe
-    def self.new(xml)
-      create_danfe BrDanfe::XML.new(xml)
+    def self.new(xmls)
+      xmls = [xmls] unless xmls.is_a?(Array)
+
+      parsed_xmls = xmls.map { |xml| BrDanfe::XML.new(xml) }
+
+      create_danfe(parsed_xmls)
     end
 
-    def self.create_danfe(xml)
-      nfe_code = '55'
-      xml['ide > mod'] == nfe_code ? DanfeLib::Nfe.new(xml) : DanfeLib::Nfce.new(xml)
+    def self.create_danfe(xmls)
+      BrDanfe::Helper.nfe?(xmls.first) ? DanfeLib::Nfe.new(xmls) : DanfeLib::Nfce.new(xmls)
     end
     private_class_method :create_danfe
   end

data/lib/br_danfe/danfe_lib/base.rb

@@ -3,8 +3,8 @@ module BrDanfe
     class Base
       attr_reader :options
 
-      def initialize(xml)
-        @xml = xml
+      def initialize(xmls)
+        @xmls = xmls
         @document = document
         @options = BrDanfe::Logo::Config.new
 

data/lib/br_danfe/danfe_lib/nfce.rb

@@ -24,21 +24,23 @@ module BrDanfe
       end
 
       def generate(footer_info)
-        NfceLib::Header.new(@document, @xml, @options.logo, @options.logo_dimensions).render
-        NfceLib::ProductList.new(@document, @xml).render
-        NfceLib::TotalList.new(@document, @xml).render
-        NfceLib::Key.new(@document, @xml).render
-        NfceLib::Recipient.new(@document, @xml).render
-        NfceLib::NfceIdentification.new(@document, @xml).render
-        NfceLib::QrCode.new(@document, @xml).render
-        NfceLib::Footer.new(@document, @xml).render(footer_info)
+        @xmls.each do |xml|
+          NfceLib::Header.new(@document, xml, @options.logo, @options.logo_dimensions).render
+          NfceLib::ProductList.new(@document, xml).render
+          NfceLib::TotalList.new(@document, xml).render
+          NfceLib::Key.new(@document, xml).render
+          NfceLib::Recipient.new(@document, xml).render
+          NfceLib::NfceIdentification.new(@document, xml).render
+          NfceLib::QrCode.new(@document, xml).render
+          NfceLib::Footer.new(@document, xml).render(footer_info)
 
-        render_no_fiscal_value
-        resize_page_height
+          render_no_fiscal_value(xml)
+          resize_page_height
+        end
       end
 
-      def render_no_fiscal_value
-        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.unauthorized?(@xml)
+      def render_no_fiscal_value(xml)
+        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.unauthorized?(xml)
       end
 
       def resize_page_height

data/lib/br_danfe/danfe_lib/nfe.rb

@@ -23,45 +23,57 @@ module BrDanfe
       end
 
       def generate(footer_info)
-        render_on_first_page
-        render_on_each_page footer_info
+        last_index = @xmls.size - 1
+
+        @xmls.each_with_index do |xml, index|
+          break unless BrDanfe::Helper.nfe?(xml)
+
+          initial_number_of_pages = @document.page_count
+          render_on_first_page(xml)
+          render_on_each_page(footer_info, xml, initial_number_of_pages)
+          @document.start_new_page unless index == last_index
+        end
+
         @document
       end
 
-      def render_on_first_page
-        NfeLib::Ticket.new(@document, @xml).render
-        NfeLib::Dest.new(@document, @xml).render
-        NfeLib::Dup.new(@document, @xml).render
-        NfeLib::Icmstot.new(@document, @xml).render
-        NfeLib::Transp.new(@document, @xml).render
-        n_vol = NfeLib::Vol.new(@document, @xml).render
-        has_issqn = NfeLib::Issqn.new(@document, @xml).render
-        NfeLib::Infadic.new(@document, @xml).render(n_vol)
-
-        render_products has_issqn
+      def render_on_first_page(xml)
+        NfeLib::Ticket.new(@document, xml).render
+        NfeLib::Dest.new(@document, xml).render
+        NfeLib::Dup.new(@document, xml).render
+        NfeLib::Icmstot.new(@document, xml).render
+        NfeLib::Transp.new(@document, xml).render
+        n_vol = NfeLib::Vol.new(@document, xml).render
+        has_issqn = NfeLib::Issqn.new(@document, xml).render
+        NfeLib::Infadic.new(@document, xml).render(n_vol)
+
+        render_products(has_issqn, xml)
       end
 
-      def render_products(has_issqn)
-        NfeLib::DetBody.new(@document, @xml).render(has_issqn)
+      def render_products(has_issqn, xml)
+        NfeLib::DetBody.new(@document, xml).render(has_issqn)
       end
 
-      def render_on_each_page(footer_info)
-        emitter = NfeLib::EmitHeader.new(@document, @xml, @options.logo, @options.logo_dimensions)
+      def render_on_each_page(footer_info, xml, initial_number_of_pages)
+        total_pages = @document.page_count + 1 - initial_number_of_pages
+
+        emitter = NfeLib::EmitHeader.new(@document, xml, @options.logo, @options.logo_dimensions)
+
+        total_pages.times do |page_index|
+          page = page_index + initial_number_of_pages
 
-        @document.page_count.times do |i|
-          page = i + 1
-          position = page == 1 ? 3.96 : 1.85
-          repeated_information page, position, emitter, footer_info
+          position = page_index + 1 == 1 ? 3.96 : 1.85
+          repeated_information(page, position, emitter, footer_info, xml, total_pages, page_index + 1)
         end
       end
 
-      def repeated_information(page, y_position, emitter, footer_info)
+      def repeated_information(page, y_position, emitter, footer_info, xml, total_pages, initial_page_of_pdf)
         @document.go_to_page(page)
 
-        emitter.render page, y_position
-        render_product_table_title page
+        emitter.render(initial_page_of_pdf, y_position, total_pages)
+        render_product_table_title initial_page_of_pdf
         render_footer_information footer_info
-        render_no_fiscal_value
+        render_no_fiscal_value(xml)
       end
 
       def render_product_table_title(page)
@@ -75,8 +87,8 @@ module BrDanfe
         end
       end
 
-      def render_no_fiscal_value
-        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.no_fiscal_value?(@xml)
+      def render_no_fiscal_value(xml)
+        @document.stamp('has_no_fiscal_value') if BrDanfe::Helper.no_fiscal_value?(xml)
       end
     end
   end

data/lib/br_danfe/danfe_lib/nfe_lib/emit_header.rb

@@ -9,10 +9,10 @@ module BrDanfe
           @logo_dimensions = logo_dimensions
         end
 
-        def render(page, y_position)
+        def render(page, y_position, total)
           @y_position = y_position
           company_box
-          danfe_box page
+          danfe_box(page, total)
           access_key_box
           sefaz_box
           render_emit y_position
@@ -64,7 +64,7 @@ module BrDanfe
           end
         end
 
-        def danfe_box(page)
+        def danfe_box(page, total)
           @pdf.ibox 3.92, 2.08, 8.21, @y_position
 
           @pdf.ibox 0.60, 2.08, 8.21, @y_position, '', 'DANFE',
@@ -83,7 +83,7 @@ module BrDanfe
                     size: 8, align: :center, valign: :center, border: 0, style: :bold
 
           @pdf.ibox 1.00, 2.08, 8.21, @y_position + 3.00, '',
-                    I18n.t('danfe.others.page', current: page, total: @pdf.page_count),
+                    I18n.t('danfe.others.page', current: page, total: total),
                     size: 8, align: :center, valign: :center, border: 0, style: :bold
         end
 

data/lib/br_danfe/danfe_lib/nfe_lib/issqn.rb

@@ -29,7 +29,7 @@ module BrDanfe
         private
 
         def can_render?
-          @xml[@serv].to_i.positive? || @xml[@bc].to_i.positive? || @xml[@iss].to_i.positive?
+          @xml[@serv].to_f.positive? || @xml[@bc].to_f.positive? || @xml[@iss].to_f.positive?
         end
       end
     end

data/lib/br_danfe/danfe_lib/nfe_lib/xprod.rb

@@ -47,11 +47,11 @@ module BrDanfe
         end
 
         def icms_st?
-          @det.css('ICMS/*/vBCST').text.to_i.positive?
+          @det.css('ICMS/*/vBCST').text.to_f.positive?
         end
 
         def fcp?
-          @det.css('ICMS/*/vFCP').text.to_i.positive?
+          @det.css('ICMS/*/vFCP').text.to_f.positive?
         end
 
         def fcp
@@ -76,7 +76,7 @@ module BrDanfe
         end
 
         def fcp_st?
-          @det.css('ICMS/*/vFCPST').text.to_i.positive?
+          @det.css('ICMS/*/vFCPST').text.to_f.positive?
         end
 
         def fcp_st
@@ -91,8 +91,8 @@ module BrDanfe
         end
 
         def icms_st_ret?
-          @det.css('ICMS/*/vBCSTRet').text.to_i.positive? || @det.css('ICMS/*/vICMSSTRet').text.to_i.positive? ||
-            @det.css('ICMS/*/pST').text.to_i.positive?
+          @det.css('ICMS/*/vBCSTRet').text.to_f.positive? || @det.css('ICMS/*/vICMSSTRet').text.to_f.positive? ||
+            @det.css('ICMS/*/pST').text.to_f.positive?
         end
 
         def icms_st_ret

data/lib/br_danfe/helper.rb

@@ -33,5 +33,11 @@ module BrDanfe
 
       formated
     end
+
+    def self.nfe?(xml)
+      nfe_code = '55'
+
+      xml['ide > mod'] == nfe_code
+    end
   end
 end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.14.2'.freeze
+  VERSION = '0.15.1'.freeze
 end

data/spec/br_danfe/danfe_lib/nfce_spec.rb

@@ -5,7 +5,7 @@ describe BrDanfe::DanfeLib::Nfce do
   let(:base_dir) { './spec/fixtures/nfce/v4.00/' }
   let(:xml) { BrDanfe::XML.new(File.read("#{base_dir}nfce.xml")) }
 
-  subject { described_class.new xml }
+  subject { described_class.new [xml] }
 
   before do
     subject.options.logo = 'spec/fixtures/logo.png'
@@ -53,5 +53,16 @@ describe BrDanfe::DanfeLib::Nfce do
         end
       end
     end
+
+    context 'when there is more than one xml' do
+      it 'renders multiple danfes on the same pdf' do
+        subject = described_class.new [xml, xml]
+
+        expect(File.exist?(output_pdf)).to be_falsey
+        subject.save_pdf output_pdf
+
+        expect("#{base_dir}multiples_xmls_on_the_same_pdf.pdf").to have_same_content_of file: output_pdf
+      end
+    end
   end
 end