br_danfe 0.20.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b147ffdc115abf1fbddafd9b9e150fa28a8a679591b99bb587d69144ed87be98
-  data.tar.gz: dafa613951bdd04c7d144f9d2062e1c869e4eb383bd287dd297628d48693621c
+  metadata.gz: 345273bdb39c1d133110285def88a0dcae14df47b6e1b8fcd6085ab753d3898e
+  data.tar.gz: 2d24c830171df9dd03b4870e96704385a809d240ae7abcb3b4c0adc31673a2dd
 SHA512:
-  metadata.gz: 13334799087d11a4a521c2cca04cc0c7253b9c8a8afa17e8fc04f896cad46099a4740154bd485062ac57ad57ac40ef7dff60b57c0f0674d5eb62789d1d054ed1
-  data.tar.gz: 3613638cbad5891190114473ff1b51696e736b11e56f34b3662398d1952fe3c9aa73c7a5a66a1674543426386f5af40865200be60640fff6d6e48891eb2ba30b
+  metadata.gz: '08340f8602de112ea5260412165d3481f7a1122074093f30e505afacda6fbbdab1ccd43fdddffc606c60b546311ff89f92d08f20abc204832f33e95f702364fd'
+  data.tar.gz: 9ad4f2ed6707f8b4d486f4f8d78fb1cb4d251ae0b2b867c4cb760050343a491633ec5b59751d469e7eb7189feff096fd33e65f04a93afc334fdf64778ef3d9ee

data/.codeclimate.yml

@@ -14,7 +14,7 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-    channel: rubocop-0-67-0
+    channel: rubocop-0-92
 ratings:
   paths:
   - Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.20.0)
+    br_danfe (1.0.0)
       barby (= 0.6.9)
       br_documents (>= 0.1.3)
       i18n (>= 0.8.6)

data/config/locales/pt-BR.yml

@@ -144,6 +144,21 @@ pt-BR:
         received_at: "DATA DE RECEBIMENTO"
         receiver: "IDENTIFICAÇÃO E ASSINATURA DO RECEBEDOR"
         document: "NF-e\nN°. %{nNF}\nSÉRIE %{serie}"
+    entrega:
+      title: "INFORMAÇÕES DO LOCAL DE ENTREGA"
+      CNPJ: "CNPJ"
+      CPF:  "CPF"
+      xNome: "NOME/RAZÃO SOCIAL"
+      xLgr: "ENDEREÇO"
+      nro: "NÚMERO"
+      xCpl: "COMPLEMENTO"
+      xBairro: "BAIRRO"
+      cMun: "CÓDIGO DE MUNICÍPIO"
+      xMun: "MUNICÍPIO"
+      UF: "UF"
+      CEP: "CEP"
+      fone: "FONE/FAX"
+      IE: "INSCRIÇÃO ESTADUAL"
   nfce:
     payment_methods:
       '01': "Dinheiro"

data/lib/br_danfe/danfe_lib/nfe.rb

@@ -42,6 +42,7 @@ module BrDanfe
       def render_on_first_page(xml)
         NfeLib::Ticket.new(@document, xml).render
         NfeLib::Dest.new(@document, xml).render
+        NfeLib::Entrega.new(@document, xml).render
         NfeLib::Dup.new(@document, xml).render
         NfeLib::Icmstot.new(@document, xml).render
         NfeLib::Transp.new(@document, xml).render
@@ -73,13 +74,14 @@ module BrDanfe
         @document.go_to_page(page)
 
         emitter.render(initial_page_of_pdf, y_position, total_pages)
-        render_product_table_title initial_page_of_pdf
+        render_product_table_title initial_page_of_pdf, xml
         render_footer_information footer_info
         render_no_fiscal_value(xml)
       end
 
-      def render_product_table_title(page)
-        y_position = page == 1 ? 18.91 : 7.40
+      def render_product_table_title(page, xml)
+        y_position = NfeLib::Entrega.delivery_local?(xml) && page == 1 ? 3.00 : 0
+        y_position += page == 1 ? 18.91 : 7.40
         @document.ititle 0.42, 10.00, 0.75, y_position, 'det.title'
       end
 

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

@@ -53,7 +53,7 @@ module BrDanfe
         end
 
         def address
-          address = Helper.generate_address @xml
+          address = Helper.generate_address @xml, 'enderDest'
 
           if Helper.address_is_too_big(@pdf, address)
             address = address[0..address.length - 2] while Helper.mensure_text(@pdf, "#{address.strip}...") > MAXIMUM_SIZE_FOR_STREET && !address.empty?

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

@@ -2,9 +2,13 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class DetBody
+        attr_reader :y_position_with_entrega
+
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
+
+          @y_position_with_entrega = Entrega.delivery_local?(@xml) ? 3.00 : 0.00
         end
 
         def render(has_issqn)
@@ -121,7 +125,8 @@ module BrDanfe
         end
 
         def table_position_on_first_page
-          Helper.invert(18.07.cm)
+          y_position = @y_position_with_entrega.cm + 18.07.cm
+          Helper.invert(y_position)
         end
 
         def table_position_on_next_pages

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

@@ -2,21 +2,25 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class Dup
-        Y = 12.92
+        attr_reader :y_position
+
+        Y_POSITION = 12.92
 
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
 
-          @ltitle = Y - 0.42
+          @y_position = Entrega.delivery_local?(@xml) ? Y_POSITION + 3.00 : Y_POSITION
+
+          @ltitle = @y_position - 0.42
         end
 
         def render
           @pdf.ititle 0.42, 10.00, 0.75, @ltitle, 'dup.title'
-          @pdf.ibox 0.85, 19.57, 0.75, Y
+          @pdf.ibox 0.85, 19.57, 0.75, @y_position
 
           x = 0.75
-          y = Y
+          y = @y_position
           @xml.collect('xmlns', 'dup') do |det|
             render_dup(det, x, y)
             x += 2.30

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

@@ -0,0 +1,86 @@
+module BrDanfe
+  module DanfeLib
+    module NfeLib
+      class Entrega
+        Y_POSITION = 12.92
+        MAXIMUM_SIZE_FOR_STREET = 319
+
+        def initialize(pdf, xml)
+          @pdf = pdf
+          @xml = xml
+
+          @y_position = Y_POSITION
+          @ltitle = @y_position - 0.42
+          @l1 = @y_position
+          @l2 = @y_position + LINE_HEIGHT
+          @l3 = @y_position + (LINE_HEIGHT * 2)
+        end
+
+        def render
+          if Entrega.delivery_local?(@xml)
+            @pdf.ititle 0.42, 10.00, 0.75, @ltitle, 'entrega.title'
+            render_line1
+            render_line2
+            render_line3
+          end
+        end
+
+        def self.delivery_local?(xml)
+          doc = xml.is_a?(BrDanfe::XML) ? xml : Nokogiri::XML(xml)
+          doc.css('entrega/xLgr').text.present?
+        end
+
+        private
+
+        def render_line1
+          @pdf.lbox LINE_HEIGHT, 11.82, 0.75, @l1, @xml, 'entrega/xNome'
+          render_cnpj_cpf
+          @pdf.lie LINE_HEIGHT, 2.92, 17.40, @l1, @xml, 'entrega/UF', 'entrega/IE'
+        end
+
+        def render_cnpj_cpf
+          if @xml['entrega/CNPJ'] == ''
+            @pdf.i18n_lbox LINE_HEIGHT, 4.37, 12.57, @l1, 'entrega.CPF', cpf
+          else
+            @pdf.lcnpj LINE_HEIGHT, 4.37, 12.57, @l1, @xml, 'entrega/CNPJ'
+          end
+        end
+
+        def cpf
+          cpf = BrDocuments::CnpjCpf::Cpf.new(@xml['entrega/CPF'])
+          cpf.formatted
+        end
+
+        def render_line2
+          @pdf.i18n_lbox LINE_HEIGHT, 11.82, 0.75, @l2, 'entrega.xLgr', address
+          @pdf.lbox LINE_HEIGHT, 4.37, 12.57, @l2, @xml, 'entrega/xBairro'
+          @pdf.i18n_lbox LINE_HEIGHT, 2.92, 17.40, @l2, 'entrega.CEP', cep
+        end
+
+        def address
+          address = Helper.generate_address @xml, 'entrega'
+
+          if Helper.address_is_too_big(@pdf, address)
+            address = address[0..address.length - 2] while Helper.mensure_text(@pdf, "#{address.strip}...") > MAXIMUM_SIZE_FOR_STREET && !address.empty?
+            address = "#{address.strip}..."
+          end
+          address
+        end
+
+        def cep
+          BrDanfe::Helper.format_cep(@xml['entrega/CEP'])
+        end
+
+        def render_line3
+          @pdf.lbox LINE_HEIGHT, 15.05, 0.75, @l3, @xml, 'entrega/xMun'
+          @pdf.lbox LINE_HEIGHT, 1.14, 15.8, @l3, @xml, 'entrega/UF'
+          @pdf.i18n_lbox LINE_HEIGHT, 2.92, 17.40, @l3, 'entrega.fone', phone
+        end
+
+        def phone
+          Phone.format(@xml['entrega/fone'])
+        end
+      end
+    end
+  end
+end

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

@@ -38,10 +38,10 @@ module BrDanfe
           Helper.mensure_text(pdf, address) > Dest::MAXIMUM_SIZE_FOR_STREET
         end
 
-        def self.generate_address(xml)
-          address_complement = " - #{xml_text(xml, 'enderDest/xCpl')}" if xml_text(xml, 'enderDest/xCpl').present?
-          address_number = " #{xml_text(xml, 'enderDest/nro')}" if xml_text(xml, 'enderDest/nro').present?
-          "#{xml_text(xml, 'enderDest/xLgr')}#{address_number}#{address_complement}"
+        def self.generate_address(xml, path)
+          address_complement = " - #{xml_text(xml, "#{path}/xCpl")}" if xml_text(xml, "#{path}/xCpl").present?
+          address_number = " #{xml_text(xml, "#{path}/nro")}" if xml_text(xml, "#{path}/nro").present?
+          "#{xml_text(xml, "#{path}/xLgr")}#{address_number}#{address_complement}"
         end
 
         def self.xml_text(xml, property)

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

@@ -2,15 +2,19 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class Icmstot
-        Y = 13.77 + SPACE_BETWEEN_GROUPS
+        attr_reader :y_position
+
+        Y_POSITION = 13.77 + SPACE_BETWEEN_GROUPS
 
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
 
-          @ltitle = Y - 0.42
-          @l1 = Y
-          @l2 = Y + LINE_HEIGHT
+          @y_position = Entrega.delivery_local?(@xml) ? Y_POSITION + 3.00 : Y_POSITION
+
+          @ltitle = @y_position - 0.42
+          @l1 = @y_position
+          @l2 = @y_position + LINE_HEIGHT
         end
 
         def render

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

@@ -44,7 +44,6 @@ module BrDanfe
           additional_data.push(address_content) if address?
           additional_data.push(difal_content) if difal?
           additional_data.push(fisco_content) if fisco?
-          additional_data.push(address_shipment) if shipment?
           additional_data.join(' * ')
         end
 
@@ -57,11 +56,11 @@ module BrDanfe
         end
 
         def address_content
-          "Endereço: #{Helper.generate_address @xml}"
+          "Endereço: #{Helper.generate_address @xml, 'enderDest'}"
         end
 
         def address?
-          Helper.address_is_too_big @pdf, Helper.generate_address(@xml)
+          Helper.address_is_too_big @pdf, Helper.generate_address(@xml, 'enderDest')
         end
 
         def difal_content
@@ -77,21 +76,6 @@ module BrDanfe
           BrDanfe::Helper.numerify(value) if value != ''
         end
 
-        def shipment?
-          @xml['entrega'].present?
-        end
-
-        def address_shipment
-          street = @xml['entrega/xLgr'].to_s
-          number = @xml['entrega/nro'].to_s
-          complement = @xml['entrega/xCpl'].to_s
-          neighborhood = @xml['entrega/xBairro'].to_s
-          city = @xml['entrega/xMun'].to_s
-          uf = @xml['entrega/UF'].to_s
-
-          "Endereço de entrega: #{street}, nº #{number} - #{neighborhood} - #{city} - #{uf} - #{complement}"
-        end
-
         def difal?
           value = @xml['ICMSTot/vICMSUFDest'].presence || '0.0'
           BigDecimal(value).positive?
@@ -114,7 +98,7 @@ module BrDanfe
         end
 
         def additional_data?
-          complementary? || address? || difal? || fisco? || shipment?
+          complementary? || address? || difal? || fisco?
         end
 
         def render_reserved_fisco

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

@@ -2,14 +2,16 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class Issqn
+        attr_reader :y_position
+
         Y_POSITION = 25.72 + SPACE_BETWEEN_GROUPS
 
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
 
-          @title = Y_POSITION - 0.42
-          @y_position = Y_POSITION
+          @y_position = Entrega.delivery_local?(@xml) ? Y_POSITION + 3.00 : Y_POSITION
+          @title = @y_position - 0.42
 
           @serv = 'total/ISSQNtot/vServ'
           @bc = 'total/ISSQNtot/vBC'

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

@@ -2,15 +2,19 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class Transp
-        Y = 15.89 + SPACE_BETWEEN_GROUPS
+        attr_reader :y_position
+
+        Y_POSITION = 15.89 + SPACE_BETWEEN_GROUPS
 
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
 
-          @ltitle = Y - 0.42
-          @l1 = Y
-          @l2 = Y + LINE_HEIGHT
+          @y_position = Entrega.delivery_local?(@xml) ? Y_POSITION + 3.00 : Y_POSITION
+
+          @ltitle = @y_position - 0.42
+          @l1 = @y_position
+          @l2 = @y_position + LINE_HEIGHT
         end
 
         def render

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

@@ -2,13 +2,17 @@ module BrDanfe
   module DanfeLib
     module NfeLib
       class Vol
-        Y = 18.01
+        attr_reader :y_position
+
+        Y_POSITION = 18.01
 
         def initialize(pdf, xml)
           @pdf = pdf
           @xml = xml
 
-          @l1 = Y
+          @y_position = Entrega.delivery_local?(@xml) ? Y_POSITION + 3.00 : Y_POSITION
+
+          @l1 = @y_position
         end
 
         def render

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.20.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/br_danfe/danfe_lib/nfe_lib/det_body_spec.rb

@@ -418,6 +418,79 @@ describe BrDanfe::DanfeLib::NfeLib::DetBody do
       end
     end
 
+    context 'with entrega' do
+      let(:products) do
+        <<~XML
+          <det nItem="1">
+            <prod>
+              <cProd>REF 06</cProd>
+              <xProd>Produto com FCI</xProd>
+              <NCM>90303329</NCM>
+              <EXTIPI>00</EXTIPI>
+              <CFOP>5101</cfop>
+              <uCom>PC</uCom>
+              <qCom>1.00</qCom>
+              <vUnCom>49.23</vUnCom>
+              <vProd>49.23</vProd>
+            </prod>
+            <imposto>
+              <ICMS>
+                <ICMS00>
+                  <orig>0</orig>
+                  <CST>00</CST>
+                  <modBC>3</modBC>
+                  <vBC>49.23</vBC>
+                  <pICMS>12.00</pICMS>
+                  <vICMS>5.90</vICMS>
+                </ICMS00>
+              </ICMS>
+              <IPI>
+                <cEnq>999</cEnq>
+                <IPITrib>
+                  <CST>50</CST>
+                  <vBC>49.23</vBC>
+                  <pIPI>5.00</pIPI>
+                  <vIPI>2.46</vIPI>
+                </IPITrib>
+              </IPI>
+            </imposto>
+          </det>
+        XML
+      end
+
+      let(:xml_as_string) do
+        <<~XML
+          <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+            <infNFe Id="NFe25111012345678901234550020000134151000134151" versao="2.00">
+              #{products}
+              <entrega>
+                <CNPJ>82743287000880</CNPJ>
+                <xNome>Schneider Electric Brasil Ltda</xNome>
+                <xLgr>Av da Saudade</xLgr>
+                <nro>1125</nro>
+                <xBairro>Frutal</xBairro>
+                <xCpl>Sala 01 e 02</xCpl>
+                <cMun>3552403</cMun>
+                <xMun>SUMARE</xMun>
+                <UF>SP</UF>
+                <CEP>13171320</CEP>
+                <fone>1921046300</fone>
+                <IE>671008375110</IE>
+              </entrega>
+            </infNFe>
+          </NFe>
+        XML
+      end
+
+      it 'renders xml to the pdf' do
+        expect(File.exist?(output_pdf)).to be_falsey
+
+        pdf.render_file output_pdf
+
+        expect("#{base_dir}det_body#render-with_entrega.pdf").to have_same_content_of file: output_pdf
+      end
+    end
+
     context 'when the product table occupies more than one page' do
       context 'when the product table occupies two pages' do
         let(:products) { ("#{product_1}\n#{product_2}" * 22) + "\n#{product_1}" }

data/spec/br_danfe/danfe_lib/nfe_lib/dup_spec.rb

@@ -48,5 +48,55 @@ describe BrDanfe::DanfeLib::NfeLib::Dup do
 
       expect("#{base_dir}dup#render.pdf").to have_same_content_of file: output_pdf
     end
+
+    describe 'with entrega' do
+      let(:xml_as_string) do
+        <<~XML
+          <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
+            <infNFe Id="NFe25111012345678901234550020000134151000134151" versao="2.00">
+              <cobr>
+                <dup>
+                  <nDup>1</nDup>
+                  <dVenc>2015-02-13</dVenc>
+                  <vDup>25.56</vDup>
+                </dup>
+                <dup>
+                  <nDup>2</nDup>
+                  <dVenc>2015-03-15</dVenc>
+                  <vDup>25.56</vDup>
+                </dup>
+                <dup>
+                  <nDup>3</nDup>
+                  <dVenc>2015-04-14</dVenc>
+                  <vDup>25.55</vDup>
+                </dup>
+              </cobr>
+              <entrega>
+                <CNPJ>82743287000880</CNPJ>
+                <xNome>Schneider Electric Brasil Ltda</xNome>
+                <xLgr>Av da Saudade</xLgr>
+                <nro>1125</nro>
+                <xBairro>Frutal</xBairro>
+                <xCpl>Sala 01 e 02</xCpl>
+                <cMun>3552403</cMun>
+                <xMun>SUMARE</xMun>
+                <UF>SP</UF>
+                <CEP>13171320</CEP>
+                <fone>1921046300</fone>
+                <IE>671008375110</IE>
+              </entrega>
+            </infNFe>
+          </NFe>
+        XML
+      end
+
+      it 'renders xml to the pdf' do
+        expect(File.exist?(output_pdf)).to be_falsey
+
+        pdf.render_file output_pdf
+
+        expect("#{base_dir}dup#render-with_entrega.pdf").to have_same_content_of file: output_pdf
+      end
+    end
   end
 end