br_danfe 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0467a09f17108189d7953b5bd67750e809be05d36afe21c826f61fd4f320f0
-  data.tar.gz: 7fe38cab43ff0bd9d2ecffc13ef01ceb05206a8687bf327336665ab5097bbd54
+  metadata.gz: d97bac5f6aa9b52198d4ddcda57af054804435a44c3582657d3bec9b162532a2
+  data.tar.gz: c2bece38b4dd7eff84c3dbc272fb37c3039994f41312df48b8dc14c802755464
 SHA512:
-  metadata.gz: e0bd82f8bc9ef158d75ee8f0c485f96797bc861aea126f364fa74d0350b5250e0eff248da553428391b2e8c4d4b1e09979cbe7e53d878667d35a33bcd7a602e1
-  data.tar.gz: 6ae919d97803f63da6cfde193469cdb416bf1790d17eae3678dd7b54c746cb066db4970696b2c3423887948e43cc7c68eefa295f1eba51793b2f18a8a3090d22
+  metadata.gz: e40ac5b1850ecf7645bf93a590110121a0b1cc1be6208273e52f2901331bb44b40a0c84baad938d741fa28be2d0e854c039fd4cf3213323945781be405c69d1f
+  data.tar.gz: 302f2a36eda72cca8fa454794dd49e845d7d9c5777c947a2ba2ed662d6dd72187443527b017f1609b5a540840293a3f52a7948c7983a6166fba4558de25587a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.10.1)
+    br_danfe (0.11.0)
       barby (= 0.5.1)
       br_documents (>= 0.0.15)
       i18n (= 0.8.6)
@@ -36,10 +36,10 @@ GEM
     docile (1.1.5)
     i18n (0.8.6)
     json (1.8.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
     pdf-core (0.6.1)
     prawn (2.1.0)
       pdf-core (~> 0.6.1)

data/config/locales/pt-BR.yml

@@ -130,7 +130,6 @@ pt-BR:
       title: "DADOS ADICIONAIS"
       infCpl: "INFORMAÇÕES COMPLEMENTARES"
       reserved: "RESERVADO AO FISCO"
-      others: "OUTRAS INFORMAÇÕES"
       difal: "Valores totais do ICMS Interestadual: DIFAL da UF destino R$%{vICMSUFDest} + FCP R$%{vFCPUFDest}; DIFAL da UF Origem R$%{vICMSUFRemet}."
       vol:
         title: "CONTINUAÇÃO TRANSPORTADOR/VOLUMES TRANSPORTADOS"

data/lib/br_danfe/danfe_lib/infadic.rb

@@ -6,131 +6,100 @@ module BrDanfe
       def initialize(pdf, xml)
         @pdf = pdf
         @xml = xml
-
-        @title = Y_POSITION - 0.41
+        @title_position = Y_POSITION - 0.41
         @y_position = Y_POSITION
       end
 
-      def render(n_vol)
-        @pdf.ititle 0.42, 10.00, 0.75, @title, "infAdic.title"
-
-        if n_vol > 1
-          render_extra_volumes
-        elsif difal?
-          render_difal
-        else
-          title = I18n.t "danfe.infAdic.infCpl"
-          observation = generate_observation @xml["infAdic/infCpl"]
-          @pdf.ibox 2.65, 12.45, 0.75, @y_position, title, observation, { size: 6, valign: :top }
-        end
-
-        @pdf.ibox 2.65, 7.15, 13.20, @y_position, I18n.t("danfe.infAdic.reserved")
+      def render(volumes_number)
+        render_title
+        render_subtitle
+        render_volumes if volumes_number > 1
+        render_additional_data generate_y_position(volumes_number) if additional_data?
+        render_reserved_fisco
       end
 
       private
 
-      def render_extra_volumes
-        @pdf.ibox 2.65, 12.45, 0.75, @y_position, I18n.t("danfe.infAdic.infCpl"), "", { size: 8, valign: :top }
-
-        y = Y_POSITION + 0.20
-
-        if difal?
-          @pdf.ibox 1.65, 12.45, 0.75, y, "", difal_content, { size: 5, valign: :top, border: 0 }
-          y += 0.27
-        else
-          y += 0.07
-        end
-
-        @pdf.ibox 2.65, 12.45, 0.75, y, "", I18n.t("danfe.infAdic.vol.title"), { size: 5, valign: :top, border: 0 }
-
-        volumes = 0
-        y += 0.07
-
-        @xml.collect("xmlns", "vol") do |det|
-          volumes += 1
-          if volumes > 1
-            render_extra_volume(det, y + 0.10)
-            y += 0.15
-          end
-        end
-
-        render_info_cpl_with_others y
+      def render_title
+        @pdf.ititle 0.42, 10.00, 0.75, @title_position, 'infAdic.title'
       end
 
-      def difal?
-        !@xml["ICMSTot/vICMSUFDest"].to_f.zero?
+      def render_subtitle
+        @pdf.ibox 2.65, 12.45, 0.75, @y_position, I18n.t('danfe.infAdic.infCpl'), '', size: 8, valign: :top
       end
 
-      def difal_content
-        I18n.t("danfe.infAdic.difal",
-          vICMSUFDest: numerify(@xml["ICMSTot/vICMSUFDest"]),
-          vFCPUFDest: numerify(@xml["ICMSTot/vFCPUFDest"]),
-          vICMSUFRemet: numerify(@xml["ICMSTot/vICMSUFRemet"]))
+      def render_volumes
+        InfadicVol.new(@xml, @pdf).render
       end
 
-      def numerify(value)
-        Helper.numerify(value) if value != ""
+      def render_additional_data(y_position)
+        data = generate_additional_data
+        @pdf.ibox 2.65, 12.45, 0.75, y_position, '', data, { size: 6, valign: :top, border: 0 }
       end
 
-      def render_extra_volume(det, y)
-        render_field "qVol", det, 0.70, 0.75, 0.70, 1.04, y, :text
-        render_field "esp", det, 0.50, 1.35, 3.00, 1.75, y, :text
-        render_field "marca", det, 0.70, 4.15, 2.00, 4.75, y, :text
-        render_field "nVol", det, 1.00, 6.10, 1.00, 6.70, y, :text
-        render_field "pesoB", det, 1.30, 7.00, 1.30, 7.00, y, :numeric
-        render_field "pesoL", det, 0.90, 8.50, 1.50, 8.50, y, :numeric
+      def generate_additional_data
+        additional_data = []
+        additional_data.push(complementary_content) if complementary?
+        additional_data.push(address_content) if address?
+        additional_data.push(difal_content) if difal?
+        additional_data.push(fisco_content) if fisco?
+        additional_data.join(' * ')
       end
 
-      def render_field(field, det, w1, x1, w2, x2, y, kind)
-        label = I18n.t("danfe.infAdic.vol.#{field}")
-        value = det.css(field).text
-
-        @pdf.ibox 0.35, w1, x1, y, "", label, style_normal
-
-        if kind == :numeric
-          @pdf.inumeric 0.35, w2, x2, y, "", value, style_decimal
-        else
-          @pdf.ibox 0.35, w2, x2, y, "", value, style_italic
-        end
+      def complementary_content
+        @xml['infAdic/infCpl'].to_s
       end
 
-      def style_normal
-        { size: 4, border: 0 }
+      def complementary?
+        @xml['infAdic/infCpl'].to_s != ''
       end
 
-      def style_italic
-        style_normal.merge({ style: :italic })
+      def address_content
+        "Endereço: #{Helper.generate_address @xml}"
       end
 
-      def style_decimal
-        style_italic.merge({ decimals: 3 })
+      def address?
+        Helper.address_is_too_big @pdf, Helper.generate_address(@xml)
       end
 
-      def render_info_cpl_with_others(y)
-        @pdf.ibox 1.65, 12.45, 0.75, y + 0.30, "", I18n.t("danfe.infAdic.others"), { size: 6, valign: :top, border: 0 }
-        @pdf.ibox 1.65, 12.45, 0.75, y + 0.50, "", @xml["infAdic/infCpl"], { size: 5, valign: :top, border: 0 }
+      def difal_content
+        I18n.t(
+          'danfe.infAdic.difal',
+          vICMSUFDest: numerify(@xml['ICMSTot/vICMSUFDest']),
+          vFCPUFDest: numerify(@xml['ICMSTot/vFCPUFDest']),
+          vICMSUFRemet: numerify(@xml['ICMSTot/vICMSUFRemet'])
+        )
       end
 
-      def render_difal
-        @pdf.ibox 2.65, 12.45, 0.75, @y_position, I18n.t("danfe.infAdic.infCpl"), "", { size: 8, valign: :top }
-
-        y = Y_POSITION + 0.20
-        @pdf.ibox 1.65, 12.45, 0.75, y, "", difal_content, { size: 5, valign: :top, border: 0 }
+      def numerify(value)
+        Helper.numerify(value) if value != ''
+      end
 
-        y += 0.10
+      def difal?
+        @xml['ICMSTot/vICMSUFDest'].to_f != 0
+      end
 
-        render_info_cpl_with_others y
+      def fisco_content
+        @xml['infAdic/infAdFisco'].to_s
       end
 
-      def generate_observation(informations)
-        observation = informations
+      def fisco?
+        @xml['infAdic/infAdFisco'].to_s.present?
+      end
 
-        address = Helper.generate_address @xml
-        if Helper.address_is_too_big @pdf, address
-          observation = "#{observation} * Endereço: #{address}"
+      def generate_y_position(volumes_number)
+        if volumes_number > 1
+          return Y_POSITION + 0.30 + volumes_number * 0.15 + 0.2
         end
+        Y_POSITION + 0.30
+      end
+
+      def additional_data?
+        complementary? || address? || difal? || fisco?
+      end
 
-        observation
+      def render_reserved_fisco
+        @pdf.ibox 2.65, 7.15, 13.20, @y_position, I18n.t('danfe.infAdic.reserved')
       end
     end
   end

data/lib/br_danfe/danfe_lib/infadic_vol.rb

@@ -0,0 +1,101 @@
+module BrDanfe
+  module DanfeLib
+    class InfadicVol
+      def initialize(xml, pdf)
+        @xml = xml
+        @pdf = pdf
+        @y_position = 27.56
+      end
+
+      def render
+        render_volume_title
+        render_volume
+      end
+
+      private
+
+      def render_volume_title
+        @pdf.ibox 2.65, 12.45, 0.75, @y_position + 0.30, '', I18n.t('danfe.infAdic.vol.title'), size: 5, valign: :top,
+          border: 0
+      end
+
+      def render_volume
+        volumes = 0
+        y_position = @y_position + 0.47
+
+        @xml.collect('xmlns', 'vol') do |det|
+          volumes += 1
+
+          if volumes > 1
+            render_fields det, y_position
+            y_position += 0.15
+          end
+        end
+      end
+
+      def render_fields(det, y_position)
+        render_esp det, y_position
+        render_marca det, y_position
+        render_qvol det, y_position
+        render_nvol det, y_position
+        render_pesob det, y_position
+        render_pesol det, y_position
+      end
+
+      def render_esp(det, y_position)
+        render_item_title 0.5, 1.35, 'esp', y_position
+        render_item_field det.css('esp').text, 3, 1.75, y_position
+      end
+
+      def render_item_title(width, x_position, field, y_position)
+        label = I18n.t("danfe.infAdic.vol.#{field}")
+        @pdf.ibox 0.35, width, x_position, y_position, '', label, style_normal
+      end
+
+      def style_normal
+        { size: 4, border: 0 }
+      end
+
+      def render_item_field(value, width, x_position, y_position)
+        @pdf.ibox 0.35, width, x_position, y_position, '', value, style_italic
+      end
+
+      def style_italic
+        style_normal.merge(style: :italic)
+      end
+
+      def render_marca(det, y_position)
+        render_item_title 0.7, 4.15, 'marca', y_position
+        render_item_field det.css('marca').text, 2, 4.75, y_position
+      end
+
+      def render_qvol(det, y_position)
+        render_item_title 0.7, 0.75, 'qVol', y_position
+        render_item_field det.css('qVol').text, 0.7, 1.04, y_position
+      end
+
+      def render_nvol(det, y_position)
+        render_item_title 1, 6.1, 'nVol', y_position
+        render_item_field det.css('nVol').text, 1, 6.7, y_position
+      end
+
+      def render_pesob(det, y_position)
+        render_item_title 1.3, 7, 'pesoB', y_position
+        render_peso_item_field det.css('pesoB').text, 1.3, 7, y_position
+      end
+
+      def render_peso_item_field(value, width, x_position, y_pos)
+        @pdf.inumeric 0.35, width, x_position, y_pos, '', value, style_decimal
+      end
+
+      def style_decimal
+        style_italic.merge(decimals: 3)
+      end
+
+      def render_pesol(det, y_position)
+        render_item_title 0.9, 8.5, 'pesoL', y_position
+        render_peso_item_field det.css('pesoL').text, 1.5, 8.5, y_position
+      end
+    end
+  end
+end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/spec/features/danfe_spec.rb

@@ -125,10 +125,10 @@ describe BrDanfe::Danfe do
         it "renders xml to the pdf" do
           expect(File.exist?(output_pdf)).to be_falsey
 
-          danfe = BrDanfe::Danfe.new(File.read("#{base_dir}withot_issqn.xml"))
+          danfe = BrDanfe::Danfe.new(File.read("#{base_dir}without_issqn.xml"))
           danfe.save_pdf output_pdf
 
-          expect("#{base_dir}withot_issqn.fixture.pdf").to have_same_content_of file: output_pdf
+          expect("#{base_dir}without_issqn.fixture.pdf").to have_same_content_of file: output_pdf
         end
       end
 

data/spec/fixtures/nfe/lib/{infadic#render-extra_volume_difal.pdf → infadic#render-all_the_informations.pdf}

@@ -17,7 +17,7 @@ endobj
 >>
 endobj
 4 0 obj
-<< /Length 2548
+<< /Length 2884
 >>
 stream
 q
@@ -40,198 +40,198 @@ ET
 
 
 BT
-23.2598 83.5771 Td
-/F1.0 5 Tf
-[<56> 111 <616c6f72657320746f7461697320646f2049434d5320496e746572657374616475616c3a20444946> 74 <414c2064612055462064657374696e6f205224322e3931352c3738202b20464350205224342e3839322c37383b20444946> 74 <414c206461205546204f726967656d20522437352e3339342c37382e>] TJ
-ET
-
-
-BT
-23.2598 75.9236 Td
+23.2598 80.7425 Td
 /F1.0 5 Tf
 [<434f4e54494e55> 40 <41> 40 <c7c3> 55 <4f205452414e53504f52> 60 <54> 93 <41444f522f56> 40 <4f4c554d4553205452414e53504f52> 60 <54> 93 <41444f53>] TJ
 ET
 
 
 BT
-23.2598 71.7877 Td
+40.2677 76.6066 Td
 /F1.0 4 Tf
-[<51> 10 <55> 40 <414e54> 74 <2e3a>] TJ
+[<455350> 111 <2e3a>] TJ
 ET
 
 
 BT
-31.4803 71.7877 Td
+51.6063 76.6066 Td
 /F3.0 4 Tf
-[<32>] TJ
+[<56> 30 <4f4c554d45532032>] TJ
 ET
 
 
 BT
-40.2677 71.7877 Td
+119.6378 76.6066 Td
 /F1.0 4 Tf
-[<455350> 111 <2e3a>] TJ
+[<4d415243413a>] TJ
 ET
 
 
 BT
-51.6063 71.7877 Td
+136.6457 76.6066 Td
 /F3.0 4 Tf
-[<56> 30 <4f4c554d45532032>] TJ
+[<4449564552534f532032>] TJ
 ET
 
 
 BT
-119.6378 71.7877 Td
+23.2598 76.6066 Td
 /F1.0 4 Tf
-[<4d415243413a>] TJ
+[<51> 10 <55> 40 <414e54> 74 <2e3a>] TJ
 ET
 
 
 BT
-136.6457 71.7877 Td
+31.4803 76.6066 Td
 /F3.0 4 Tf
-[<4449564552534f532032>] TJ
+[<32>] TJ
 ET
 
 
 BT
-174.9134 71.7877 Td
+174.9134 76.6066 Td
 /F1.0 4 Tf
 [<4e554d2e3a>] TJ
 ET
 
 
 BT
-191.9213 71.7877 Td
+191.9213 76.6066 Td
 /F3.0 4 Tf
 [<32>] TJ
 ET
 
 
 BT
-200.4252 71.7877 Td
+200.4252 76.6066 Td
 /F1.0 4 Tf
 [<5045534f20422e3a>] TJ
 ET
 
 
 BT
-217.2756 71.7877 Td
+217.2756 76.6066 Td
 /F3.0 4 Tf
 [<322e3230302c303030>] TJ
 ET
 
 
 BT
-242.9449 71.7877 Td
+242.9449 76.6066 Td
 /F1.0 4 Tf
 [<5045534f204ccd512e3a>] TJ
 ET
 
 
 BT
-265.4646 71.7877 Td
+265.4646 76.6066 Td
 /F3.0 4 Tf
 [<322e3030302c303030>] TJ
 ET
 
 
 BT
-23.2598 67.5357 Td
+40.2677 72.3546 Td
 /F1.0 4 Tf
-[<51> 10 <55> 40 <414e54> 74 <2e3a>] TJ
+[<455350> 111 <2e3a>] TJ
 ET
 
 
 BT
-31.4803 67.5357 Td
+51.6063 72.3546 Td
 /F3.0 4 Tf
-[<33>] TJ
+[<56> 30 <4f4c554d45532033>] TJ
 ET
 
 
 BT
-40.2677 67.5357 Td
+119.6378 72.3546 Td
 /F1.0 4 Tf
-[<455350> 111 <2e3a>] TJ
+[<4d415243413a>] TJ
 ET
 
 
 BT
-51.6063 67.5357 Td
+136.6457 72.3546 Td
 /F3.0 4 Tf
-[<56> 30 <4f4c554d45532033>] TJ
+[<4449564552534f532033>] TJ
 ET
 
 
 BT
-119.6378 67.5357 Td
+23.2598 72.3546 Td
 /F1.0 4 Tf
-[<4d415243413a>] TJ
+[<51> 10 <55> 40 <414e54> 74 <2e3a>] TJ
 ET
 
 
 BT
-136.6457 67.5357 Td
+31.4803 72.3546 Td
 /F3.0 4 Tf
-[<4449564552534f532033>] TJ
+[<33>] TJ
 ET
 
 
 BT
-174.9134 67.5357 Td
+174.9134 72.3546 Td
 /F1.0 4 Tf
 [<4e554d2e3a>] TJ
 ET
 
 
 BT
-191.9213 67.5357 Td
+191.9213 72.3546 Td
 /F3.0 4 Tf
 [<33>] TJ
 ET
 
 
 BT
-200.4252 67.5357 Td
+200.4252 72.3546 Td
 /F1.0 4 Tf
 [<5045534f20422e3a>] TJ
 ET
 
 
 BT
-217.2756 67.5357 Td
+217.2756 72.3546 Td
 /F3.0 4 Tf
 [<332e3330302c303030>] TJ
 ET
 
 
 BT
-242.9449 67.5357 Td
+242.9449 72.3546 Td
 /F1.0 4 Tf
 [<5045534f204ccd512e3a>] TJ
 ET
 
 
 BT
-265.4646 67.5357 Td
+265.4646 72.3546 Td
 /F3.0 4 Tf
 [<332e3030302c303030>] TJ
 ET
 
 
 BT
-23.2598 56.2485 Td
+23.2598 61.6343 Td
 /F1.0 6 Tf
-[<4f555452415320494e464f524d41> 40 <c7d54553>] TJ
+[<4c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742e20446f6e656320636f6e67756520696e20646f6c6f72207365642073616769747469732e202a20456e64657265e76f3a2041> 74 <7620646120536175646164652031313235202d20456d20616e65> 15 <786f20616f>] TJ
 ET
 
 
 BT
-23.2598 51.2622 Td
-/F1.0 5 Tf
-[<556d61206f6273657276> 25 <61e7e36f>] TJ
+23.2598 54.9383 Td
+/F1.0 6 Tf
+[<7375706572206d65726361646f206d61696f7220646f2062616972726f202a2056> 111 <616c6f72657320746f7461697320646f2049434d5320496e746572657374616475616c3a20444946> 74 <414c2064612055462064657374696e6f205224322e3931352c3738202b20464350205224342e3839322c37383b20444946> 74 <414c206461205546>] TJ
+ET
+
+
+BT
+23.2598 48.2423 Td
+/F1.0 6 Tf
+[<4f726967656d20522437352e3339342c37382e202a2054> 80 <6f74616c206465204643502d5354> 50 <3a203334382c3936>] TJ
 ET
 
 374.1732 21.5433 202.6772 75.1181 re
@@ -288,15 +288,15 @@ xref
 0000000109 00000 n 
 0000000158 00000 n 
 0000000215 00000 n 
-0000002815 00000 n 
-0000003019 00000 n 
-0000003117 00000 n 
-0000003216 00000 n 
+0000003151 00000 n 
+0000003355 00000 n 
+0000003453 00000 n 
+0000003552 00000 n 
 trailer
 << /Size 9
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-3316
+3652
 %%EOF