br_invoices_pdf 0.2.4 → 0.2.5.alpha.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6497dbb88eaa1ddbe1402f648e3768451023a1d6
-  data.tar.gz: 141d5ef03f5ba2e827ef6f2331cb5f6c4372bc73
+  metadata.gz: 88244a31c52a4223162c3d18ca2379ee85a74bcd
+  data.tar.gz: b2c0d52ff91333ff71d2f45578c35a083ba8b86e
 SHA512:
-  metadata.gz: 833b95cb360a8e132abbc7e88d830d6aab2f3c1f8d0ae9a278f6963166641c43eac005751e584135021f4ae6dc7d9f5a1732ca0c37ab49881b0c1628b5a0b044
-  data.tar.gz: 21ec40424b2320cf1f28b80ab785faee852e0715deb180a97569736573cc37d21d90dcae9c3be6458b4d37541362af573ff22e4da6180e84527b79e0a587095a
+  metadata.gz: c21914368acef8f81e21b87734dbc8a018e614c6dd0eb654db9d958195f4787ebd966260182312c243bcdb9c38a2569180de99108f8366fd0acd360f7d5acafe
+  data.tar.gz: ad7902f053f39847e56460aa418175b91d795a83e2cd03538a26d2a995cc88c3330b5f79734c6f80699365e78b2ab53b7a12c509f54a91b17cb10e3f2cefb358

data/CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Unreleased
 
+### 0.2.5 [2017-09-28]
+- [Corrigido] CNPJ na CFE.
+
 ### 0.2.4 [2017-09-27]
 - [Corrigido] Tabela de produtos na CFE.
 

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

@@ -0,0 +1,15 @@
+module BrInvoicesPdf
+  module Cfe
+    module Parser
+      module Cnpj
+        extend BaseParser
+
+        module_function
+
+        def execute(xml)
+          locate_element(xml, 'infCFe/dest/CNPJ')
+        end
+      end
+    end
+  end
+end

data/lib/br_invoices_pdf/cfe/parser.rb

@@ -1,6 +1,7 @@
 require 'br_invoices_pdf/cfe/parser/access_key'
 require 'br_invoices_pdf/cfe/parser/company_attributes'
 require 'br_invoices_pdf/cfe/parser/cpf'
+require 'br_invoices_pdf/cfe/parser/cnpj'
 require 'br_invoices_pdf/cfe/parser/document_number'
 require 'br_invoices_pdf/cfe/parser/fisco_obs'
 require 'br_invoices_pdf/cfe/parser/payment'
@@ -22,7 +23,8 @@ module BrInvoicesPdf
         company_attributes: CompanyAttributes,
         fisco_obs: FiscoObs,
         access_key: AccessKey,
-        cpf: Cpf
+        cpf: Cpf,
+        cnpj: Cnpj
       }.freeze
 
       def parse(xml)

data/lib/br_invoices_pdf/cfe/renderer/base_renderer.rb

@@ -33,10 +33,11 @@ module BrInvoicesPdf
           end
         end
 
-        CNPJ_FORMAT = '%d.%d.%d/%d-%d'.freeze
+        CNPJ_FORMAT = '%02d.%03d.%03d/%04d-%02d'.freeze
         # :reek:FeatureEnvy
         def format_cnpj(cnpj)
-          format(CNPJ_FORMAT, cnpj[0, 2], cnpj[2, 3], cnpj[5, 3], cnpj[8, 4], cnpj[12, 2])
+          format(CNPJ_FORMAT, cnpj[0, 2].to_i, cnpj[2, 3].to_i, cnpj[5, 3].to_i,
+                 cnpj[8, 4].to_i, cnpj[12, 2].to_i)
         end
 
         CPF_FORMAT = '%d.%d.%d-%d'.freeze

data/lib/br_invoices_pdf/cfe/renderer/header.rb

@@ -8,24 +8,32 @@ module BrInvoicesPdf
 
         # :reek:FeatureEnvy
         def execute(pdf, data)
-          cpf = cpf_vlue(data[:cpf])
-
           pdf_setup(pdf) do
-            add_header_config(pdf, data, cpf)
+            add_header_config(pdf, data, identificator(data))
           end
 
           pdf.move_down(5)
         end
 
-        def cpf_vlue(cpf)
-          cpf ? 'CONSUMIDOR: ' + format_cpf(cpf) : 'CONSUMIDOR NAO IDENTIFICADO'
+        def identificator(data)
+          cpf = data[:cpf]
+          cnpj = data[:cnpj]
+          if cpf.to_s.empty?
+            if cnpj.to_s.empty?
+              'CONSUMIDOR NAO IDENTIFICADO'
+            else
+              'CONSUMIDOR: ' + format_cnpj(cnpj)
+            end
+          else
+            'CONSUMIDOR: ' + format_cpf(cpf)
+          end
         end
-        private_class_method :cpf_vlue
+        private_class_method :identificator
 
-        def add_header_config(pdf, data, cpf)
+        def add_header_config(pdf, data, identificator)
           pdf.font('Helvetica', style: :bold)
           pdf.text("Extrato: #{data[:document_number]}", align: :center)
-          pdf.text(cpf, align: :center)
+          pdf.text(identificator, align: :center)
           pdf.text('CUPOM FISCAL ELETRONICO - SAT', align: :center)
           pdf.font('Helvetica', style: :normal, align: :center)
         end

data/lib/br_invoices_pdf/version.rb

@@ -1,3 +1,3 @@
 module BrInvoicesPdf
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: br_invoices_pdf
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5.alpha.16
 platform: ruby
 authors:
 - Thiago Ribeiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -235,6 +235,7 @@ files:
 - lib/br_invoices_pdf/cfe/parser.rb
 - lib/br_invoices_pdf/cfe/parser/access_key.rb
 - lib/br_invoices_pdf/cfe/parser/base_parser.rb
+- lib/br_invoices_pdf/cfe/parser/cnpj.rb
 - lib/br_invoices_pdf/cfe/parser/company_attributes.rb
 - lib/br_invoices_pdf/cfe/parser/cpf.rb
 - lib/br_invoices_pdf/cfe/parser/document_number.rb
@@ -271,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13