Fix new validations SUNTA - Summary v1,2

thegreenter · Dec 2, 2017 · 2980d5a · 2980d5a
1 parent 665fa80
commit 2980d5a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/src/Xml/Templates/summary-v2.xml.twig b/src/Xml/Templates/summary-v2.xml.twig
@@ -64,22 +64,30 @@
                 <cbc:ConditionCode>{{ det.estado }}</cbc:ConditionCode>
             </cac:Status>
             <sac:TotalAmount currencyID="PEN">{{ det.total|n_format }}</sac:TotalAmount>
-            <sac:BillingPayment>
-                <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperGravadas|n_format }}</cbc:PaidAmount>
-                <cbc:InstructionID>01</cbc:InstructionID>
-            </sac:BillingPayment>
-            <sac:BillingPayment>
-                <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperExoneradas|n_format }}</cbc:PaidAmount>
-                <cbc:InstructionID>02</cbc:InstructionID>
-            </sac:BillingPayment>
-            <sac:BillingPayment>
-                <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperInafectas|n_format }}</cbc:PaidAmount>
-                <cbc:InstructionID>03</cbc:InstructionID>
-            </sac:BillingPayment>
-            <cac:AllowanceCharge>
-                <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-                <cbc:Amount currencyID="PEN">{{ det.mtoDescuentos|default(0)|n_format }}</cbc:Amount>
-            </cac:AllowanceCharge>
+            {% if det.mtoOperGravadas %}
+                <sac:BillingPayment>
+                    <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperGravadas|n_format }}</cbc:PaidAmount>
+                    <cbc:InstructionID>01</cbc:InstructionID>
+                </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOperExoneradas %}
+                <sac:BillingPayment>
+                    <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperExoneradas|n_format }}</cbc:PaidAmount>
+                    <cbc:InstructionID>02</cbc:InstructionID>
+                </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOperInafectas %}
+                <sac:BillingPayment>
+                    <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperInafectas|n_format }}</cbc:PaidAmount>
+                    <cbc:InstructionID>03</cbc:InstructionID>
+                </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOtrosCargos %}
+                <cac:AllowanceCharge>
+                    <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+                    <cbc:Amount currencyID="PEN">{{ det.mtoOtrosCargos|n_format }}</cbc:Amount>
+                </cac:AllowanceCharge>
+            {% endif %}
             {% set igv = det.mtoIGV|n_format %}
             <cac:TaxTotal>
                 <cbc:TaxAmount currencyID="PEN">{{ igv }}</cbc:TaxAmount>

diff --git a/src/Xml/Templates/summary.xml.twig b/src/Xml/Templates/summary.xml.twig
@@ -52,22 +52,30 @@
             <sac:StartDocumentNumberID>{{ det.docInicio }}</sac:StartDocumentNumberID>
             <sac:EndDocumentNumberID>{{ det.docFin }}</sac:EndDocumentNumberID>
             <sac:TotalAmount currencyID="PEN">{{ det.total|n_format }}</sac:TotalAmount>
+            {% if det.mtoOperGravadas %}
             <sac:BillingPayment>
                 <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperGravadas|n_format }}</cbc:PaidAmount>
                 <cbc:InstructionID>01</cbc:InstructionID>
             </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOperExoneradas %}
             <sac:BillingPayment>
                 <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperExoneradas|n_format }}</cbc:PaidAmount>
                 <cbc:InstructionID>02</cbc:InstructionID>
             </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOperInafectas %}
             <sac:BillingPayment>
                 <cbc:PaidAmount currencyID="PEN">{{ det.mtoOperInafectas|n_format }}</cbc:PaidAmount>
                 <cbc:InstructionID>03</cbc:InstructionID>
             </sac:BillingPayment>
+            {% endif %}
+            {% if det.mtoOtrosCargos %}
             <cac:AllowanceCharge>
-                <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-                <cbc:Amount currencyID="PEN">{{ det.mtoDescuentos|default(0)|n_format }}</cbc:Amount>
+                <cbc:ChargeIndicator>true</cbc:ChargeIndicator>
+                <cbc:Amount currencyID="PEN">{{ det.mtoOtrosCargos|n_format }}</cbc:Amount>
             </cac:AllowanceCharge>
+            {% endif %}
             {% set igv = det.mtoIGV|n_format %}
             <cac:TaxTotal>
                 <cbc:TaxAmount currencyID="PEN">{{ igv }}</cbc:TaxAmount>

diff --git a/tests/Xml/Builder/FeSummaryBuilderTest.php b/tests/Xml/Builder/FeSummaryBuilderTest.php
@@ -62,7 +62,7 @@ private function getSummary()
             ->setMtoOperInafectas(24.4)
             ->setMtoOperExoneradas(50)
             ->setMtoOtrosTributos(12.32)
-            ->setMtoDescuentos(5)
+            ->setMtoOtrosCargos(5)
             ->setMtoIGV(3.6);
 
         $detiail2 = new SummaryDetail();

diff --git a/tests/Xml/Builder/FeSummaryV2BuilderTest.php b/tests/Xml/Builder/FeSummaryV2BuilderTest.php
@@ -24,7 +24,6 @@ public function testCreateXmlSummary()
         $summary = $this->getSummary();
 
         $xml = $this->build($summary);
-
         $this->assertNotEmpty($xml);
     }
 
@@ -60,11 +59,10 @@ private function getSummary()
                 ->setTipoDoc('03')
                 ->setNroDoc('B001-1'))
             ->setTotal(100)
-            ->setMtoOperGravadas(20.555)
             ->setMtoOperInafectas(24.4)
             ->setMtoOperExoneradas(50)
             ->setMtoOtrosTributos(12.32)
-            ->setMtoDescuentos(5)
+            ->setMtoOtrosCargos(0)
             ->setMtoIGV(3.6);
 
         $detiail2 = new SummaryDetailV2();