Skip to content

Commit

Permalink
Merge pull request #221 from php-twinfield/fix/only-skip-setting-dim1…
Browse files Browse the repository at this point in the history
…-on-vat-line

Only skip setting dim1 when line type is VAT
  • Loading branch information
rojtjo authored Apr 1, 2023
2 parents 273becf + 1256428 commit dcde07a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/DomDocuments/TransactionsDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public function addTransaction(BaseTransaction $transaction)
$linesElement->appendChild($lineElement);

$dim1 = $transactionLine->getDim1();
if (!empty($dim1)) {
$isVatLine = $transactionLine->getLineType()->equals(LineType::VAT());
if (!$isVatLine || !empty($dim1)) {
$dim1Element = $this->createNodeWithTextContent('dim1', $dim1);
$lineElement->appendChild($dim1Element);
}
Expand Down
14 changes: 7 additions & 7 deletions tests/UnitTests/DomDocuments/TransactionsDocumentUnitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ private function fakeCashTransactionWithoutDim1OnVatLine(): CashTransaction
$totalLine
->setLineType(LineType::TOTAL())
->setId(1)
->setDim1('1002')
->setDim1('')
->setValue(Money::EUR(12100));

$detailLine = new CashTransactionLine();
$detailLine
->setLineType(LineType::DETAIL())
->setId(2)
->setDim1('1300')
->setDim1('')
->setDim2('1000')
->setValue(Money::EUR(10000))
->setVatCode('VH')
Expand Down Expand Up @@ -113,7 +113,7 @@ private function fakeJournalTransactionWithoutDim1OnVatLine(): JournalTransactio
$detailLine
->setLineType(LineType::DETAIL())
->setId(2)
->setDim1('1300')
->setDim1('')
->setDim2('1000')
->setValue(Money::EUR(10000))
->setVatCode('VH')
Expand Down Expand Up @@ -153,7 +153,7 @@ private function fakePurchaseTransactionWithoutDim1OnVatLine(): PurchaseTransact
$totalLine
->setLineType(LineType::TOTAL())
->setId(1)
->setDim1('1600')
->setDim1('')
->setDim2('2000')
->setValue(Money::EUR(12100))
->setDescription('');
Expand All @@ -162,7 +162,7 @@ private function fakePurchaseTransactionWithoutDim1OnVatLine(): PurchaseTransact
$detailLine
->setLineType(LineType::DETAIL())
->setId(2)
->setDim1('8020')
->setDim1('')
->setValue(Money::EUR(10000))
->setDescription('Outfit')
->setVatCode('IH');
Expand Down Expand Up @@ -200,7 +200,7 @@ private function fakeSalesTransactionWithoutDim1OnVatLine(): SalesTransaction
$totalLine
->setLineType(LineType::TOTAL())
->setId(1)
->setDim1('1300')
->setDim1('')
->setDim2('1000')
->setValue(Money::EUR(12100))
->setDescription('');
Expand All @@ -209,7 +209,7 @@ private function fakeSalesTransactionWithoutDim1OnVatLine(): SalesTransaction
$detailLine
->setLineType(LineType::DETAIL())
->setId(2)
->setDim1('8020')
->setDim1('')
->setValue(Money::EUR(10000))
->setDescription('Outfit')
->setVatCode('VH');
Expand Down

0 comments on commit dcde07a

Please sign in to comment.