Skip to content

Commit 7ab118c

Browse files
authored
Merge pull request #6 from Lurivar/master
Fix for deleted product taxes
2 parents d19d97e + 59f4d95 commit 7ab118c

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

Config/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<language>en_US</language>
1616
<language>fr_FR</language>
1717
</languages>
18-
<version>2.3.1</version>
18+
<version>2.3.2</version>
1919
<author>
2020
<name>Gilles Bourgeat</name>
2121
<email>gbourgeat@openstudio.fr</email>

Controller/CreditNoteController.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -749,11 +749,19 @@ protected function performOrderProducts(Form $formValidate, CreditNote $creditNo
749749
->setPriceWithTax($orderProductWithTax);
750750

751751
if (null !== $pse = ProductSaleElementsQuery::create()->findOneById($orderProduct->getProductSaleElementsId())) {
752-
$creditNoteDetail->setTaxRuleId(
753-
$pse->getProduct()->getTaxRuleId()
754-
);
752+
if ($pse->getProduct() === null) {
753+
$creditNoteDetail->setTaxRuleId(TaxRuleQuery::create()->findOneByIsDefault(true)->getId());
754+
} else {
755+
$creditNoteDetail
756+
->setTaxRuleId(
757+
$pse
758+
->getProduct()
759+
->getTaxRuleId()
760+
)
761+
;
762+
}
755763
}
756-
764+
757765
$creditNote->addCreditNoteDetail(
758766
$creditNoteDetail
759767
);

0 commit comments

Comments
 (0)