Merge pull request #1236 from Maykon-JDS/master

Ajuste no Make.php e na TraitEventsRTC.php

Author: robmachado

src/Make.php

@@ -2112,23 +2112,53 @@ public function tagprodObsCont(stdClass $std): ?DOMElement
         ];
         $std = $this->equilizeParameters($std, $possible);
         $identificador = 'VA01 <obsItem> - ';
-        $obsItem = $this->dom->createElement("obsItem");
+        if (isset($this->obsItem[$std->item])) {
+            $obsItem = $this->obsItem[$std->item];
+        } else {
+            $obsItem = $this->dom->createElement("obsItem");
+        }
         $obsCont = $this->dom->createElement("obsCont");
+        $obsCont->setAttribute("xCampo", $std->xCampo);
         $this->dom->addChild(
             $obsCont,
-            "xCampo",
-            substr(trim($std->xCampo ?? ''), 0, 20),
+            "xTexto",
+            $std->xTexto,
             true,
-            $identificador . "[item $std->item] (obsCont/xCampo) Identificação do campo"
+            $identificador . "[item $std->item] (obsCont/xTexto) Conteúdo do campo"
         );
+        $obsItem->appendChild($obsCont);
+        $this->obsItem[$std->item] = $obsItem;
+        return $obsItem;
+    }
+
+    /**
+     * Grupo de observações de uso livre (para o item da NF-e)
+     * Grupo de observações de uso livre do Fisco
+     */
+    public function tagprodObsFisco(stdClass $std): ?DOMElement
+    {
+        $possible = [
+            'item',
+            'xCampo',
+            'xTexto'
+        ];
+        $std = $this->equilizeParameters($std, $possible);
+        $identificador = 'VA01 <obsItem> - ';
+        if (isset($this->obsItem[$std->item])) {
+            $obsItem = $this->obsItem[$std->item];
+        } else {
+            $obsItem = $this->dom->createElement("obsItem");
+        }
+        $obsFisco = $this->dom->createElement("obsFisco");
+        $obsFisco->setAttribute("xCampo", $std->xCampo);
         $this->dom->addChild(
-            $obsCont,
+            $obsFisco,
             "xTexto",
-            substr(trim($std->xTexto ?? ''), 0, 60),
+            $std->xTexto,
             true,
-            $identificador . "[item $std->item] (obsCont/xTexto) Conteúdo do campo"
+            $identificador . "[item $std->item] (obsFisco/xTexto) Conteúdo do campo"
         );
-        $obsItem->appendChild($obsCont);
+        $obsItem->appendChild($obsFisco);
         $this->obsItem[$std->item] = $obsItem;
         return $obsItem;
     }

src/Traits/TraitEventsRTC.php

@@ -95,7 +95,7 @@ public function sefazSolApropCredPresumido(stdClass $std, ?string $verAplic = nu
         $gcred = '';
         foreach ($std->itens as $item) {
             $bc = number_format($item->vBC, 2, '.', '');
-            $gcred = "<gCredPres><nItem>{$item->item}</nItem><vBC>{$bc}</vBC>";
+            $gcred .= "<gCredPres nItem=\"{$item->item}\"><vBC>{$bc}</vBC>";
             if (!empty($item->gIBS)) {
                 $g = $item->gIBS;
                 $pc = number_format($g->pCredPres, 4, '.', '');

tests/MakeTest.php

@@ -457,7 +457,21 @@ public function test_tagprodObsCont(): void
         $tag = $this->make->tagprodObsCont($std);
 
         $this->assertEquals('obsItem', $tag->nodeName);
-        $this->assertEquals($std->xCampo, $tag->getElementsByTagName('xCampo')->item(0)->nodeValue);
+        $this->assertEquals($std->xCampo, $tag->getElementsByTagName('obsCont')->item(0)->getAttribute('xCampo'));
+        $this->assertEquals($std->xTexto, $tag->getElementsByTagName('xTexto')->item(0)->nodeValue);
+    }
+
+    public function test_tagprodObsFisco(): void
+    {
+        $std = new \stdClass();
+        $std->item = 1;
+        $std->xCampo = 'abc';
+        $std->xTexto = '123';
+
+        $tag = $this->make->tagprodObsFisco($std);
+
+        $this->assertEquals('obsItem', $tag->nodeName);
+        $this->assertEquals($std->xCampo, $tag->getElementsByTagName('obsFisco')->item(0)->getAttribute('xCampo'));
         $this->assertEquals($std->xTexto, $tag->getElementsByTagName('xTexto')->item(0)->nodeValue);
     }