forge-joniko/ldc-boutique-cnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tax calculation for order refund

Browse source
This commit is contained in:
Jérémy Munsch 2023-05-23 10:17:42 +02:00
parent c1ac3d3a20
commit e42fdc4c15
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Lib/Helpers/ToolboxHelper.php
View file

@ -592,8 +592,11 @@ class ToolboxHelper
'date' => $date,
'documentType' => $documentType,
'basket' => $invoiceBasketItems,
'totalTtc' => $invoiceBasketItems->sum('subtotal'),
'totalTaxes' => $invoiceBasketItems->sum('tax')
'totalTtc' => \intval($invoiceBasketItems->sum('subtotal')),
'totalTaxes' => \intval($invoiceBasketItems->sum(function (object $basketItem) {
return ($basketItem->subtotal / abs($basketItem->subtotal)) *
$basketItem->qty * $basketItem->tax;
}))
],
[],
[

18
app/Models/Shop/Order.php
View file

@ -425,10 +425,17 @@ class Order extends Model
*/
public function getItemForOrderCancelling(): Collection
{
$remainingToRefund = \intval($this->transactions()
->where('id', '!=', $this->id)->pluck('items')->sum(function ($items) {
return \collect($items)->sum('subtotal');
}));
$itemsToRefund = $this->transactions()->where('id', '!=', $this->id)->pluck('items');
$remainingToRefund = \intval($itemsToRefund->sum(function ($items) {
return \collect($items)->sum('subtotal');
}));
$remainingTaxToRefund = \intval($itemsToRefund->sum(function ($items) {
return \collect($items)->sum(function ($basketItem) {
$basketItem = (object)$basketItem;
return ($basketItem->subtotal / abs($basketItem->subtotal)) *
$basketItem->qty * $basketItem->tax;
});
}));
// * Créer un dummy product pour représenter la transaction.
$cartItemOptions = \array_merge(Controller::$cartItemOptionsSkel, [
@ -441,7 +448,7 @@ class Order extends Model
'name' => trans('Remboursement complet'),
'price' => $remainingToRefund,
'weight' => 0,
'options' => $cartItemOptions
'options' => $cartItemOptions,
]);
$cartItem->setQuantity(1);
@ -450,6 +457,7 @@ class Order extends Model
$basketItem->price = $basketItem->price * -1;
$basketItem->options->price_ttc = $basketItem->options->price_ttc * -1;
$basketItem->subtotal = $basketItem->subtotal * -1;
$basketItem->tax = $remainingTaxToRefund * -1;
return collect()->add($basketItem)->values();
}