br_danfe 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1f4f292bdbde6c761b111ff0dec61b4d9de9f8dc63880ce20e4a08a7db1568
-  data.tar.gz: c003eb4a660ca9211ff3fc3440757f60290ad64f5285cf9a17ae42045fb4ab0b
+  metadata.gz: dbfc9d821dc664401714b3611cfc696aa2b569b2f8aeaa11469511c27bff85f0
+  data.tar.gz: 14218c179db89c175265117bebd5332a8110a92a3fa5722631ac54f74d8f4849
 SHA512:
-  metadata.gz: 768f790b05abc78e00af3304db2a51678e4c3fb7432291b5e8207af2bd61c09d2a287c906598f94e91d7eddda97bd14099e70161303dc81dc55547c1efb76a42
-  data.tar.gz: '01788ddf78bc372eff580b8cbdc66ccf32e0db8bc90bf296090495491398d662bd4932d3831329d381998c9bc2f262f16fd2161b523686243dbf5f1df70bbef1'
+  metadata.gz: 9b9024776b1b7f0a7302bed95c225254c55086c5df53d35ae75ef50a8f79c6f1fe36d2c65173ec426004fe3d7692d23626f6d8ea9b3875505c17073b627a3e53
+  data.tar.gz: 1c6e82f74f8f3a29f07a0a5eaf718ccdac50bb82893fa5f5c2dc10209f25ae1295b5512c82f7a6d0e51e2a32d7a32c1eaf0f83c107357c77051944af4a85741e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    br_danfe (0.7.7)
+    br_danfe (0.8.0)
       barby (= 0.5.1)
       br_documents (>= 0.0.15)
       i18n (= 0.8.6)
@@ -84,4 +84,4 @@ DEPENDENCIES
   simplecov-html (= 0.10.1)
 
 BUNDLED WITH
-   1.17.2
+   1.16.3

data/config/locales/pt-BR.yml

@@ -105,7 +105,9 @@ pt-BR:
         vProd: "VL TOTAL"
         xProdST: "ST: MVA: %{pMVAST}% * Alíq: %{pICMSST}% * BC: %{vBCST} * Vlr: %{vICMSST}"
         xProdFCI: "FCI: %{nFCI}"
-        xProdFCP: "FCP: Alíq: %{pFCP}% * Vlr: %{vFCP}"
+        xProdFCP: "FCP: Base: %{vBCFCP} * Alíq: %{pFCP}% * Vlr: %{vFCP}"
+        xProdFCPICMS00: "FCP: Alíq: %{pFCP}% * Vlr: %{vFCP}"
+        xProdFCPST: "FCP ST: Base: %{vBCFCPST} * Alíq: %{pFCPST}% * Vlr: %{vFCPST}"
       ICMS:
         CST: "CST"
         vBC: "BC ICMS"

data/lib/br_danfe/danfe_lib/xprod.rb

@@ -10,8 +10,9 @@ module BrDanfe
 
         xprod += infAdProd if has_infAdProd?
         xprod += fci if fci?
-        xprod += st if st?
+        xprod += icms_st if icms_st?
         xprod += fcp if fcp?
+        xprod += fcp_st if fcp_st?
 
         xprod
       end
@@ -35,7 +36,7 @@ module BrDanfe
         !@det.css('prod/nFCI').text.empty?
       end
 
-      def st
+      def icms_st
         "\n#{I18n.t('danfe.det.prod.xProdST',
           pMVAST: Helper.numerify(@det.css('ICMS/*/pMVAST').text),
           pICMSST: Helper.numerify(@det.css('ICMS/*/pICMSST').text),
@@ -43,18 +44,44 @@ module BrDanfe
           vICMSST: Helper.numerify(@det.css('ICMS/*/vICMSST').text))}"
       end
 
-      def st?
-        @det.css("ICMS/*/vBCST").text.to_i > 0
+      def icms_st?
+        @det.css('ICMS/*/vBCST').text.to_i > 0
+      end
+
+      def fcp?
+        @det.css('ICMS/*/vFCP').text.to_i > 0
       end
 
       def fcp
-        "\n#{I18n.t('danfe.det.prod.xProdFCP',
+        icms00? ? fcp_for_icms00 : fcp_complete
+      end
+
+      def icms00?
+        @det.at_css('ICMS00')
+      end
+
+      def fcp_for_icms00
+        "\n#{I18n.t('danfe.det.prod.xProdFCPICMS00',
           vFCP: Helper.numerify(@det.css('ICMS00/vFCP').text),
           pFCP: Helper.numerify(@det.css('ICMS00/pFCP').text))}"
       end
 
-      def fcp?
-        @det.css("ICMS00/vFCP").text.to_i > 0
+      def fcp_complete
+        "\n#{I18n.t('danfe.det.prod.xProdFCP',
+          vBCFCP: Helper.numerify(@det.css('ICMS/*/vBCFCP').text),
+          vFCP: Helper.numerify(@det.css('ICMS/*/vFCP').text),
+          pFCP: Helper.numerify(@det.css('ICMS/*/pFCP').text))}"
+      end
+
+      def fcp_st?
+        @det.css('ICMS/*/vFCPST').text.to_i > 0
+      end
+
+      def fcp_st
+        "\n#{I18n.t('danfe.det.prod.xProdFCPST',
+          vBCFCPST: Helper.numerify(@det.css('ICMS/*/vBCFCPST').text),
+          pFCPST: Helper.numerify(@det.css('ICMS/*/pFCPST').text),
+          vFCPST: Helper.numerify(@det.css('ICMS/*/vFCPST').text))}"
       end
     end
   end

data/lib/br_danfe/version.rb

@@ -1,3 +1,3 @@
 module BrDanfe
-  VERSION = '0.7.7'.freeze
+  VERSION = '0.8.0'.freeze
 end

data/spec/lib/danfe_lib/xprod_spec.rb

@@ -88,7 +88,7 @@ describe BrDanfe::DanfeLib::Xprod do
       end
     end
 
-    context "when have FCP" do
+    context "when have FCP on ICMS00 tag" do
       let(:xml_fcp) do
         xml = <<-eos
         <det nItem="1">
@@ -97,9 +97,11 @@ describe BrDanfe::DanfeLib::Xprod do
           </prod>
           <imposto>
             <vTotTrib>23.56</vTotTrib>
-            <ICMS00>
-              <vFCP>4.71</vFCP>
-              <pFCP>2.00</pFCP>
+            <ICMS>
+              <ICMS00>
+                <vFCP>4.71</vFCP>
+                <pFCP>2.00</pFCP>
+              </ICMS00>
             </ICMS>
           </imposto>
         </det>
@@ -136,10 +138,10 @@ describe BrDanfe::DanfeLib::Xprod do
                 <pICMSST>17.00</pICMSST>
                 <vICMSST>29.28</vICMSST>
               </ICMSSN202>
-            </ICMS>
-            <ICMS00>
-              <vFCP>4.71</vFCP>
-              <pFCP>2.00</pFCP>
+              <ICMS00>
+                <vFCP>4.71</vFCP>
+                <pFCP>2.00</pFCP>
+              </ICMS00>
             </ICMS>
           </imposto>
           <infAdProd>Informações adicionais do produto</infAdProd>
@@ -165,5 +167,73 @@ describe BrDanfe::DanfeLib::Xprod do
         expect(subject.render).to eq expected
       end
     end
+
+    context "when FCP is not in a ICMS00 tag" do
+      let(:xml_fcp) do
+        xml = <<-eos
+        <det nItem="1">
+          <prod>
+            <xProd>MONITOR DE ARCO ELETRICO</xProd>
+          </prod>
+          <imposto>
+            <vTotTrib>23.56</vTotTrib>
+            <ICMS>
+              <ICMS10>
+                <vBCFCP>235.50</vBCFCP>
+                <vFCP>4.71</vFCP>
+                <pFCP>2.00</pFCP>
+              </ICMS10>
+            </ICMS>
+          </imposto>
+        </det>
+        eos
+
+        Nokogiri::XML(xml)
+      end
+
+      subject { BrDanfe::DanfeLib::Xprod.new(xml_fcp) }
+
+      it "returns product + FCP" do
+        expected = "MONITOR DE ARCO ELETRICO"
+        expected += "\n"
+        expected += "FCP: Base: 235,50 * Alíq: 2,00% * Vlr: 4,71"
+
+        expect(subject.render).to eq expected
+      end
+    end
+
+    context "when have FCP ST" do
+      let(:xml_fcp) do
+        xml = <<-eos
+        <det nItem="1">
+          <prod>
+            <xProd>MONITOR DE ARCO ELETRICO</xProd>
+          </prod>
+          <imposto>
+            <vTotTrib>23.56</vTotTrib>
+            <ICMS>
+              <ICMS30>
+                <vBCFCPST>235.50</vBCFCPST>
+                <vFCPST>4.71</vFCPST>
+                <pFCPST>2.00</pFCPST>
+              </ICMS30>
+            </ICMS>
+          </imposto>
+        </det>
+        eos
+
+        Nokogiri::XML(xml)
+      end
+
+      subject { BrDanfe::DanfeLib::Xprod.new(xml_fcp) }
+
+      it "returns product + FCP" do
+        expected = "MONITOR DE ARCO ELETRICO"
+        expected += "\n"
+        expected += "FCP ST: Base: 235,50 * Alíq: 2,00% * Vlr: 4,71"
+
+        expect(subject.render).to eq expected
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: br_danfe
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - ASSEINFO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: barby