[UPD] Make::class, Convert::class, ValidTXT::class, Parser::class par…

…a NT_2018_005_v1.2
rogash · Mar 20, 2019 · 51a83cf · 51a83cf
1 parent f8041ac
commit 51a83cf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/Common/ValidTXT.php b/src/Common/ValidTXT.php
@@ -18,6 +18,7 @@
 class ValidTXT
 {
     const LOCAL="LOCAL";
+    const LOCAL_V12 = "LOCAL_V12";
     const SEBRAE="SEBRAE";
 
     /**
@@ -33,6 +34,8 @@ public static function loadStructure($version = 4.00, $baselayout = self::LOCAL)
         $comp = '';
         if (strtoupper($baselayout) === 'SEBRAE') {
             $comp = '_sebrae';
+        } elseif (strtoupper($baselayout) === 'LOCAL_V12') {
+            $comp = '_v1.2';
         }
         $file = $path . '/txtstructure' . ($version*100) . $comp . '.json';
         if (!is_file($file)) {

diff --git a/src/Convert.php b/src/Convert.php
@@ -20,8 +20,9 @@
 
 class Convert
 {
-    const LOCAL="LOCAL";
-    const SEBRAE="SEBRAE";
+    const LOCAL = "LOCAL";
+    const LOCAL_V12 = "LOCAL_V12";
+    const SEBRAE = "SEBRAE";
 
     protected $txt;
     protected $dados;
@@ -64,7 +65,7 @@ public static function parse($txt, $baselayout = self::LOCAL)
     public function toXml()
     {
         //$txt = Strings::removeSomeAlienCharsfromTxt($this->txt);
-
+        
         if (!$this->isNFe($this->txt)) {
             throw DocumentsException::wrongDocument(12, '');
         }

diff --git a/src/Factories/Parser.php b/src/Factories/Parser.php
@@ -21,8 +21,9 @@
 
 class Parser
 {
-    const LOCAL="LOCAL";
-    const SEBRAE="SEBRAE";
+    const LOCAL = "LOCAL";
+    const LOCAL_V12 = "LOCAL_V12";
+    const SEBRAE = "SEBRAE";
 
     /**
      * @var array
@@ -116,6 +117,8 @@ public function __construct($version = '4.00', $baselayout = self::LOCAL)
         $comp = "";
         if ($baselayout === 'SEBRAE') {
             $comp = "_sebrae";
+        } elseif ($baselayout == 'LOCAL_V12') {
+            $comp = "_v1.2";
         }
         $this->baselayout = $baselayout;
         $path = realpath(__DIR__."/../../storage/txtstructure$ver" . $comp . ".json");

diff --git a/src/Make.php b/src/Make.php
@@ -4446,7 +4446,7 @@ public function tagICMSSN(stdClass $std)
                 $this->dom->addChild(
                     $icmsSN,
                     'vICMSSubstituto',
-                    $std->vICMSSubstituto,
+                    !empty($std->vICMSSubstituto) ? number_format($std->vICMSSubstituto, 2, '.', '') : null,
                     false,
                     "[item $std->item] Valor do ICMS próprio do Substituto"
                 );
@@ -7416,6 +7416,7 @@ protected function equilizeParameters(stdClass $std, $possible)
     protected function hashCSRT($CSRT)
     {
         $comb = $CSRT . $this->chNFe;
-        return sha1($comb);
+        return base64_encode(sha1($comb, true));
+        ;
     }
 }