br_danfe 0.11.1 → 0.11.2

data/lib/br_danfe/danfe_lib/dup.rb

@@ -11,32 +11,33 @@ module BrDanfe
       end
 
       def render
-        @pdf.ititle 0.42, 10.00, 0.75, @ltitle, "dup.title"
+        @pdf.ititle 0.42, 10.00, 0.75, @ltitle, 'dup.title'
         @pdf.ibox 0.85, 19.57, 0.75, Y
 
         x = 0.75
         y = Y
-        @xml.collect("xmlns", "dup") do |det|
+        @xml.collect('xmlns', 'dup') do |det|
           render_dup(det, x, y)
           x += 2.30
         end
       end
 
       private
+
       def render_dup(det, x, y)
-        @pdf.ibox 0.85, 2.12, x, y, "", I18n.t("danfe.dup.nDup"), italic
-        @pdf.ibox 0.85, 2.12, x + 0.70, y, "", det.css("nDup").text, normal
-        @pdf.ibox 0.85, 2.12, x, y + 0.20, "", I18n.t("danfe.dup.dVenc"), italic
+        @pdf.ibox 0.85, 2.12, x, y, '', I18n.t('danfe.dup.nDup'), italic
+        @pdf.ibox 0.85, 2.12, x + 0.70, y, '', det.css('nDup').text, normal
+        @pdf.ibox 0.85, 2.12, x, y + 0.20, '', I18n.t('danfe.dup.dVenc'), italic
 
-        @pdf.ibox 0.85, 2.12, x + 0.70, y + 0.20, "", dtduplicata(det), normal
+        @pdf.ibox 0.85, 2.12, x + 0.70, y + 0.20, '', dtduplicata(det), normal
 
-        @pdf.ibox 0.85, 2.12, x, y + 0.40, "", I18n.t("danfe.dup.vDup"), italic
-        @pdf.inumeric 0.85, 1.25, x + 0.70, y + 0.40, "", det.css("vDup").text, normal
+        @pdf.ibox 0.85, 2.12, x, y + 0.40, '', I18n.t('danfe.dup.vDup'), italic
+        @pdf.inumeric 0.85, 1.25, x + 0.70, y + 0.40, '', det.css('vDup').text, normal
       end
 
       def dtduplicata(det)
-        dtduplicata = det.css("dVenc").text
-        dtduplicata = dtduplicata[8,2] + "/" + dtduplicata[5, 2] + "/" + dtduplicata[0, 4]
+        dtduplicata = det.css('dVenc').text
+        dtduplicata = dtduplicata[8, 2] + '/' + dtduplicata[5, 2] + '/' + dtduplicata[0, 4]
         dtduplicata
       end
 

data/lib/br_danfe/danfe_lib/emit_header.rb

@@ -21,42 +21,44 @@ module BrDanfe
 
       def company_box
         @pdf.ibox 3.92, 7.46, 0.75, @y_position
-        @pdf.ibox 3.92, 7.46, 0.75, @y_position, "", @xml["emit/xNome"],
-          { size: 12, align: :center, border: 0, style: :bold }
+        @pdf.ibox 3.92, 7.46, 0.75, @y_position, '', @xml['emit/xNome'],
+                  { size: 12, align: :center, border: 0, style: :bold }
 
         address_company
       end
 
       def address_company
         if @logo.blank?
-          @pdf.ibox 3.92, 7.46, 1.25, @y_position + 1.46, "", address, { align: :left, border: 0 }
+          @pdf.ibox 3.92, 7.46, 1.25, @y_position + 1.46, '', address, { align: :left, border: 0 }
         else
-          @pdf.ibox 3.92, 7.46, 3.60, @y_position + 1.46, "", address, { size: 8, align: :left, border: 0 }
+          @pdf.ibox 3.92, 7.46, 3.60, @y_position + 1.46, '', address, { size: 8, align: :left, border: 0 }
           logo
         end
       end
 
       def address
-        formatted = @xml["enderEmit/xLgr"] + ", " + @xml["enderEmit/nro"] + "\n"
-        formatted += @xml["enderEmit/xBairro"] + " - " + cep + "\n"
-        formatted += @xml["enderEmit/xMun"] + "/" + @xml["enderEmit/UF"] + "\n"
-        formatted += phone + " " + @xml["enderEmit/email"]
+        formatted = @xml['enderEmit/xLgr'] + ', ' + @xml['enderEmit/nro'] + "\n"
+        formatted += @xml['enderEmit/xBairro'] + ' - ' + cep + "\n"
+        formatted += @xml['enderEmit/xMun'] + '/' + @xml['enderEmit/UF'] + "\n"
+        formatted += phone + ' ' + @xml['enderEmit/email']
         formatted
       end
 
       def phone
-        Phone.format(@xml["enderEmit/fone"])
+        Phone.format(@xml['enderEmit/fone'])
       end
 
       def cep
-        Cep.format(@xml["enderEmit/CEP"])
+        Cep.format(@xml['enderEmit/CEP'])
       end
 
       def logo
         bounding_box_size = 80
         logo_options = BrDanfe::DanfeLib::LogoOptions.new(bounding_box_size, @logo_dimensions).options
 
-        @pdf.bounding_box([0.83.cm, Helper.invert(@y_position.cm + 1.02.cm)], width: bounding_box_size, height: bounding_box_size) do
+        @pdf.bounding_box(
+          [0.83.cm, Helper.invert(@y_position.cm + 1.02.cm)], width: bounding_box_size, height: bounding_box_size
+        ) do
           @pdf.image @logo, logo_options
         end
       end
@@ -64,47 +66,49 @@ module BrDanfe
       def danfe_box(page)
         @pdf.ibox 3.92, 2.08, 8.21, @y_position
 
-        @pdf.ibox 0.60, 2.08, 8.21, @y_position, "", "DANFE",
-          { size: 12, align: :center, border: 0, style: :bold }
+        @pdf.ibox 0.60, 2.08, 8.21, @y_position, '', 'DANFE',
+                  { size: 12, align: :center, border: 0, style: :bold }
 
-        @pdf.ibox 1.20, 2.08, 8.21, @y_position + 0.60, "", I18n.t("danfe.others.danfe"),
-          { size: 8, align: :center, border: 0 }
+        @pdf.ibox 1.20, 2.08, 8.21, @y_position + 0.60, '', I18n.t('danfe.others.danfe'),
+                  { size: 8, align: :center, border: 0 }
 
-        @pdf.ibox 0.60, 2.08, 8.21, @y_position + 1.80, "", "#{@xml['ide/tpNF']} - " + (@xml["ide/tpNF"] == "0" ? I18n.t("danfe.ide.tpNF.entry") : I18n.t("danfe.ide.tpNF.departure")),
-          { size: 8, align: :center, border: 0 }
+        @pdf.ibox 0.60, 2.08, 8.21, @y_position + 1.80, '',
+                  "#{@xml['ide/tpNF']} - " +
+                  (@xml['ide/tpNF'] == '0' ? I18n.t('danfe.ide.tpNF.entry') : I18n.t('danfe.ide.tpNF.departure')),
+                  { size: 8, align: :center, border: 0 }
 
-        @pdf.ibox 1.00, 2.08, 8.21, @y_position + 2.40, "",
-          I18n.t("danfe.ide.document", nNF: @xml["ide/nNF"], serie: @xml["ide/serie"]),
-          { size: 8, align: :center, valign: :center, border: 0, style: :bold }
+        @pdf.ibox 1.00, 2.08, 8.21, @y_position + 2.40, '',
+                  I18n.t('danfe.ide.document', nNF: @xml['ide/nNF'], serie: @xml['ide/serie']),
+                  { 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),
-          { 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),
+                  { size: 8, align: :center, valign: :center, border: 0, style: :bold }
       end
 
       def access_key_box
         @pdf.ibox 2.22, 10.02, 10.29, @y_position
-        @pdf.ibarcode 1.50, 8.00, 10.4010, @y_position + 1.90, @xml["chNFe"]
-        @pdf.ibox 0.85, 10.02, 10.29, @y_position + 2.22, I18n.t("danfe.chNFe"), @xml["chNFe"].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, "\\1 "),
-          { style: :bold, align: :center }
+        @pdf.ibarcode 1.50, 8.00, 10.4010, @y_position + 1.90, @xml['chNFe']
+        @pdf.ibox 0.85, 10.02, 10.29, @y_position + 2.22, I18n.t('danfe.chNFe'),
+                  @xml['chNFe'].gsub(/(\d)(?=(\d\d\d\d)+(?!\d))/, '\\1 '), { style: :bold, align: :center }
       end
 
       def sefaz_box
-        @pdf.ibox 0.85, 10.02, 10.29, @y_position + 3.07, "", I18n.t("danfe.others.sefaz"),
-          { align: :center, size: 8 }
+        @pdf.ibox 0.85, 10.02, 10.29, @y_position + 3.07, '', I18n.t('danfe.others.sefaz'),
+                  { align: :center, size: 8 }
       end
 
       def render_emit(y_position)
         y_first_line = y_position + 3.92
         y_second_line = y_first_line + LINE_HEIGHT
 
-        @pdf.lbox LINE_HEIGHT, 10.04, 0.75, y_first_line, @xml, "ide/natOp"
-        @pdf.ibox LINE_HEIGHT, 9.52, 10.79, y_first_line, I18n.t("danfe.infProt"),
-          "#{@xml["infProt/nProt"]} #{Helper.format_datetime(@xml["infProt/dhRecbto"])}", { align: :center }
+        @pdf.lbox LINE_HEIGHT, 10.04, 0.75, y_first_line, @xml, 'ide/natOp'
+        @pdf.ibox LINE_HEIGHT, 9.52, 10.79, y_first_line, I18n.t('danfe.infProt'),
+                  "#{@xml['infProt/nProt']} #{Helper.format_datetime(@xml['infProt/dhRecbto'])}", { align: :center }
 
-        @pdf.lie LINE_HEIGHT, 6.36, 0.75, y_second_line, @xml, "enderEmit/UF", "emit/IE"
-        @pdf.lie LINE_HEIGHT, 6.86, 7.11, y_second_line, @xml, "enderDest/UF", "emit/IEST"
-        @pdf.lcnpj LINE_HEIGHT, 6.34, 13.97, y_second_line, @xml, "emit/CNPJ"
+        @pdf.lie LINE_HEIGHT, 6.36, 0.75, y_second_line, @xml, 'enderEmit/UF', 'emit/IE'
+        @pdf.lie LINE_HEIGHT, 6.86, 7.11, y_second_line, @xml, 'enderDest/UF', 'emit/IEST'
+        @pdf.lcnpj LINE_HEIGHT, 6.34, 13.97, y_second_line, @xml, 'emit/CNPJ'
       end
     end
   end

data/lib/br_danfe/danfe_lib/helper.rb

@@ -2,14 +2,14 @@ module BrDanfe
   module DanfeLib
     class Helper
       def self.numerify(number)
-        return "" if !number || number == ""
+        return '' if !number || number == ''
 
-        separated_number = number.to_s.split(".")
-        integer_part = separated_number[0].reverse.gsub( /\d{3}(?=\d)/, '\&.' ).reverse
-        decimal_part = separated_number[1] || "00"
-        decimal_part = decimal_part + "0" if decimal_part.size < 2
+        separated_number = number.to_s.split('.')
+        integer_part = separated_number[0].reverse.gsub(/\d{3}(?=\d)/, '\&.').reverse
+        decimal_part = separated_number[1] || '00'
+        decimal_part += '0' if decimal_part.size < 2
 
-        integer_part + "," + decimal_part
+        integer_part + ',' + decimal_part
       end
 
       def self.invert(y)
@@ -17,50 +17,50 @@ module BrDanfe
       end
 
       def self.format_datetime(xml_datetime)
-        formated = ""
+        formated = ''
 
-        if !xml_datetime.empty?
-          date = DateTime.strptime(xml_datetime, "%Y-%m-%dT%H:%M:%S")
-          formated = date.strftime("%d/%m/%Y %H:%M:%S")
+        unless xml_datetime.empty?
+          date = DateTime.strptime(xml_datetime, '%Y-%m-%dT%H:%M:%S')
+          formated = date.strftime('%d/%m/%Y %H:%M:%S')
         end
 
         formated
       end
 
       def self.format_date(xml_datetime)
-        formated = ""
+        formated = ''
 
-        if !xml_datetime.empty?
-          date = DateTime.strptime(xml_datetime, "%Y-%m-%d")
-          formated = date.strftime("%d/%m/%Y")
+        unless xml_datetime.empty?
+          date = DateTime.strptime(xml_datetime, '%Y-%m-%d')
+          formated = date.strftime('%d/%m/%Y')
         end
 
         formated
       end
 
       def self.format_time(xml_datetime)
-        formated = ""
+        formated = ''
 
         if xml_datetime.length == 8
           formated = xml_datetime
         elsif xml_datetime.length > 8
-          date = DateTime.strptime(xml_datetime, "%Y-%m-%dT%H:%M:%S %Z").to_time
-          formated = date.strftime("%H:%M:%S")
+          date = DateTime.strptime(xml_datetime, '%Y-%m-%dT%H:%M:%S %Z').to_time
+          formated = date.strftime('%H:%M:%S')
         end
 
         formated
       end
 
-      def self.has_no_fiscal_value?(xml)
+      def self.no_fiscal_value?(xml)
         homologation?(xml) || unauthorized?(xml)
       end
 
       def self.homologation?(xml)
-        xml_text(xml, "nfeProc/NFe/infNFe/ide/tpAmb") == "2"
+        xml_text(xml, 'nfeProc/NFe/infNFe/ide/tpAmb') == '2'
       end
 
       def self.unauthorized?(xml)
-        xml.css("nfeProc/protNFe/infProt/dhRecbto").empty?
+        xml.css('nfeProc/protNFe/infProt/dhRecbto').empty?
       end
 
       def self.mensure_text(pdf, text)
@@ -72,9 +72,9 @@ module BrDanfe
       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}"
+        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}"
       end
 
       def self.xml_text(xml, property)

data/lib/br_danfe/danfe_lib/icmstot.rb

@@ -13,20 +13,20 @@ module BrDanfe
       end
 
       def render
-        @pdf.ititle 0.42, 5.60, 0.75, @ltitle, "ICMSTot.title"
+        @pdf.ititle 0.42, 5.60, 0.75, @ltitle, 'ICMSTot.title'
 
-        @pdf.lnumeric LINE_HEIGHT, 3.56, 0.75, @l1, @xml, "ICMSTot/vBC"
-        @pdf.lnumeric LINE_HEIGHT, 4.06, 4.31, @l1, @xml, "ICMSTot/vICMS"
-        @pdf.lnumeric LINE_HEIGHT, 4.06, 8.37, @l1, @xml, "ICMSTot/vBCST"
-        @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l1, @xml, "ICMSTot/vST"
-        @pdf.lnumeric LINE_HEIGHT, 3.82, 16.49, @l1, @xml, "ICMSTot/vProd"
+        @pdf.lnumeric LINE_HEIGHT, 3.56, 0.75, @l1, @xml, 'ICMSTot/vBC'
+        @pdf.lnumeric LINE_HEIGHT, 4.06, 4.31, @l1, @xml, 'ICMSTot/vICMS'
+        @pdf.lnumeric LINE_HEIGHT, 4.06, 8.37, @l1, @xml, 'ICMSTot/vBCST'
+        @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l1, @xml, 'ICMSTot/vST'
+        @pdf.lnumeric LINE_HEIGHT, 3.82, 16.49, @l1, @xml, 'ICMSTot/vProd'
 
-        @pdf.lnumeric LINE_HEIGHT, 2.55, 0.75, @l2, @xml, "ICMSTot/vFrete"
-        @pdf.lnumeric LINE_HEIGHT, 3.05, 3.30, @l2, @xml, "ICMSTot/vSeg"
-        @pdf.lnumeric LINE_HEIGHT, 3.04, 6.35, @l2, @xml, "ICMSTot/vDesc"
-        @pdf.lnumeric LINE_HEIGHT, 3.04, 9.39, @l2, @xml, "ICMSTot/vOutro"
-        @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l2, @xml, "ICMSTot/vIPI"
-        @pdf.lnumeric LINE_HEIGHT, 3.82, 16.49, @l2, @xml, "ICMSTot/vNF", style: :bold
+        @pdf.lnumeric LINE_HEIGHT, 2.55, 0.75, @l2, @xml, 'ICMSTot/vFrete'
+        @pdf.lnumeric LINE_HEIGHT, 3.05, 3.30, @l2, @xml, 'ICMSTot/vSeg'
+        @pdf.lnumeric LINE_HEIGHT, 3.04, 6.35, @l2, @xml, 'ICMSTot/vDesc'
+        @pdf.lnumeric LINE_HEIGHT, 3.04, 9.39, @l2, @xml, 'ICMSTot/vOutro'
+        @pdf.lnumeric LINE_HEIGHT, 4.06, 12.43, @l2, @xml, 'ICMSTot/vIPI'
+        @pdf.lnumeric LINE_HEIGHT, 3.82, 16.49, @l2, @xml, 'ICMSTot/vNF', style: :bold
       end
     end
   end

data/lib/br_danfe/danfe_lib/infadic.rb

@@ -91,6 +91,7 @@ module BrDanfe
         if volumes_number > 1
           return Y_POSITION + 0.30 + volumes_number * 0.15 + 0.2
         end
+
         Y_POSITION + 0.30
       end
 

data/lib/br_danfe/danfe_lib/issqn.rb

@@ -10,15 +10,15 @@ module BrDanfe
         @title = Y_POSITION - 0.42
         @y_position = Y_POSITION
 
-        @serv = "total/ISSQNtot/vServ"
-        @bc = "total/ISSQNtot/vBC"
-        @iss = "total/ISSQNtot/vISS"
+        @serv = 'total/ISSQNtot/vServ'
+        @bc = 'total/ISSQNtot/vBC'
+        @iss = 'total/ISSQNtot/vISS'
       end
 
       def render
         if can_render?
-          @pdf.ititle 0.42, 10.00, 0.75, @title, "issqn.title"
-          @pdf.lbox LINE_HEIGHT, 4.64, 0.75, @y_position, @xml, "emit/IM"
+          @pdf.ititle 0.42, 10.00, 0.75, @title, 'issqn.title'
+          @pdf.lbox LINE_HEIGHT, 4.64, 0.75, @y_position, @xml, 'emit/IM'
           @pdf.lnumeric LINE_HEIGHT, 5.14, 5.39, @y_position, @xml, @serv
           @pdf.lnumeric LINE_HEIGHT, 5.14, 10.53, @y_position, @xml, @bc
           @pdf.lnumeric LINE_HEIGHT, 4.64, 15.67, @y_position, @xml, @iss
@@ -28,7 +28,7 @@ module BrDanfe
       private
 
       def can_render?
-        (@xml[@serv].to_i > 0) || (@xml[@bc].to_i > 0) || (@xml[@iss].to_i > 0)
+        @xml[@serv].to_i.positive? || @xml[@bc].to_i.positive? || @xml[@iss].to_i.positive?
       end
     end
   end

data/lib/br_danfe/danfe_lib/options.rb

@@ -1,21 +1,22 @@
 module BrDanfe
   module DanfeLib
     class Options < OpenStruct
-      DEFAULTOPTIONS = { logo: "", logo_dimensions: {} }
+      DEFAULTOPTIONS = { logo: '', logo_dimensions: {} }.freeze
 
-      def initialize(new_options={})
+      def initialize(new_options = {})
         options = DEFAULTOPTIONS.merge(config_yaml_load)
         super options.merge(new_options)
       end
 
       private
+
       def file
-        File.exists?("config/br_danfe.yml") ? File.open("config/br_danfe.yml").read : ""
+        File.exist?('config/br_danfe.yml') ? File.open('config/br_danfe.yml').read : ''
       end
 
       def config_yaml_load
-        @file_read = YAML.load( file )
-        @file_read ? (@file_read["br_danfe"]||{})["options"] : {}
+        @file_read = YAML.safe_load(file)
+        @file_read ? (@file_read['br_danfe'] || {})['options'] : {}
       end
     end
   end

data/lib/br_danfe/danfe_lib/phone.rb

@@ -3,9 +3,9 @@ module BrDanfe
     class Phone
       def self.format(phone)
         if phone.length == 10
-          phone.sub(/(\d{2})(\d{4})(\d{4})/, "(\\1) \\2-\\3")
+          phone.sub(/(\d{2})(\d{4})(\d{4})/, '(\\1) \\2-\\3')
         else
-          phone.sub(/(\d{2})(\d{5})(\d{4})/, "(\\1) \\2-\\3")
+          phone.sub(/(\d{2})(\d{5})(\d{4})/, '(\\1) \\2-\\3')
         end
       end
     end

data/lib/br_danfe/danfe_lib/ticket.rb

@@ -7,10 +7,12 @@ module BrDanfe
       end
 
       def render
-        @pdf.ibox 0.85, 15.60, 0.75, 1.85, I18n.t("danfe.ticket.xNome", xNome: @xml["emit/xNome"])
-        @pdf.ibox 0.85, 3.85, 0.75, 2.7, I18n.t("danfe.ticket.received_at")
-        @pdf.ibox 0.85, 11.75, 4.60, 2.7, I18n.t("danfe.ticket.receiver")
-        @pdf.ibox 1.70, 4.00, 16.35, 1.85, "", I18n.t("danfe.ticket.document", nNF: @xml["ide/nNF"], serie: @xml["ide/serie"]), {align: :center, valign: :center}
+        @pdf.ibox 0.85, 15.60, 0.75, 1.85, I18n.t('danfe.ticket.xNome', xNome: @xml['emit/xNome'])
+        @pdf.ibox 0.85, 3.85, 0.75, 2.7, I18n.t('danfe.ticket.received_at')
+        @pdf.ibox 0.85, 11.75, 4.60, 2.7, I18n.t('danfe.ticket.receiver')
+        @pdf.ibox 1.70, 4.00, 16.35, 1.85, '',
+                  I18n.t('danfe.ticket.document', nNF: @xml['ide/nNF'], serie: @xml['ide/serie']),
+                  { align: :center, valign: :center }
       end
     end
   end

data/lib/br_danfe/danfe_lib/transp.rb

@@ -13,39 +13,40 @@ module BrDanfe
       end
 
       def render
-        @pdf.ititle 0.42, 10.00, 0.75, @ltitle, "transporta.title"
-
-        @pdf.lbox LINE_HEIGHT, 8.52, 0.75, @l1, @xml, "transporta/xNome"
-        @pdf.i18n_lbox LINE_HEIGHT, 2.79, 9.27, @l1, "transp.modFrete.title", mod_frete
-        @pdf.lbox LINE_HEIGHT, 1.78, 12.06, @l1, @xml, "veicTransp/RNTC"
-        @pdf.i18n_lbox LINE_HEIGHT, 2.29, 13.84, @l1, "veicTransp.placa", plate
-        @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l1, @xml, "veicTransp/UF"
-        @pdf.lcnpj LINE_HEIGHT, 3.44, 16.89, @l1, @xml, "transporta/CNPJ"
-        @pdf.lbox LINE_HEIGHT, 8.52, 0.75, @l2, @xml, "transporta/xEnder"
-        @pdf.lbox LINE_HEIGHT, 6.86, 9.27, @l2, @xml, "transporta/xMun"
-        @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l2, @xml, "transporta/UF"
-        @pdf.lie LINE_HEIGHT, 3.44, 16.89, @l2, @xml, "transporta/UF", "transporta/IE"
+        @pdf.ititle 0.42, 10.00, 0.75, @ltitle, 'transporta.title'
+
+        @pdf.lbox LINE_HEIGHT, 8.52, 0.75, @l1, @xml, 'transporta/xNome'
+        @pdf.i18n_lbox LINE_HEIGHT, 2.79, 9.27, @l1, 'transp.modFrete.title', mod_frete
+        @pdf.lbox LINE_HEIGHT, 1.78, 12.06, @l1, @xml, 'veicTransp/RNTC'
+        @pdf.i18n_lbox LINE_HEIGHT, 2.29, 13.84, @l1, 'veicTransp.placa', plate
+        @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l1, @xml, 'veicTransp/UF'
+        @pdf.lcnpj LINE_HEIGHT, 3.44, 16.89, @l1, @xml, 'transporta/CNPJ'
+        @pdf.lbox LINE_HEIGHT, 8.52, 0.75, @l2, @xml, 'transporta/xEnder'
+        @pdf.lbox LINE_HEIGHT, 6.86, 9.27, @l2, @xml, 'transporta/xMun'
+        @pdf.lbox LINE_HEIGHT, 0.76, 16.13, @l2, @xml, 'transporta/UF'
+        @pdf.lie LINE_HEIGHT, 3.44, 16.89, @l2, @xml, 'transporta/UF', 'transporta/IE'
       end
 
       private
+
       def plate
-        Plate.format(@xml["veicTransp/placa"])
+        Plate.format(@xml['veicTransp/placa'])
       end
 
       def mod_frete
-        case @xml["transp/modFrete"]
-        when "0"
-          modality = "emitter"
-        when "1"
-          modality = "recipient"
-        when "2"
-          modality = "third_party"
-        when "3"
-          modality = "own_emitter"
-        when "4"
-          modality = "own_recipient"
-        when "9"
-          modality = "no_freight"
+        case @xml['transp/modFrete']
+        when '0'
+          modality = 'emitter'
+        when '1'
+          modality = 'recipient'
+        when '2'
+          modality = 'third_party'
+        when '3'
+          modality = 'own_emitter'
+        when '4'
+          modality = 'own_recipient'
+        when '9'
+          modality = 'no_freight'
         end
 
         I18n.t("danfe.transp.modFrete.#{modality}")