Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 09:27:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure line item gateway fees are not cloned

Browse Source
This commit is contained in:
David Bomba 2024-09-04 09:17:46 +10:00
parent e491231090
commit c71d7ffeec
8 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -107,6 +107,7 @@ class StoreCreditRequest extends Request
$input = $this->decodePrimaryKeys($input);
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['line_items'] = $this->cleanFeeItems($input['line_items']);
$input['amount'] = $this->entityTotalAmount($input['line_items']);
if (array_key_exists('exchange_rate', $input) && is_null($input['exchange_rate'])) {

1
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -108,6 +108,7 @@ class StoreInvoiceRequest extends Request
if (isset($input['line_items']) && is_array($input['line_items'])) {
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['line_items'] = $this->cleanFeeItems($input['line_items']);
$input['amount'] = $this->entityTotalAmount($input['line_items']);
}
if(isset($input['partial']) && $input['partial'] == 0) {

1
app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
View File

@ -95,6 +95,7 @@ class StorePurchaseOrderRequest extends Request
if (isset($input['line_items']) && is_array($input['line_items'])) {
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['line_items'] = $this->cleanFeeItems($input['line_items']);
$input['amount'] = $this->entityTotalAmount($input['line_items']);
}

1
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -101,6 +101,7 @@ class StoreQuoteRequest extends Request
if (isset($input['line_items']) && is_array($input['line_items'])) {
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['line_items'] = $this->cleanFeeItems($input['line_items']);
$input['amount'] = $this->entityTotalAmount($input['line_items']);
}
if(isset($input['partial']) && $input['partial'] == 0) {

2
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -148,6 +148,8 @@ class StoreRecurringInvoiceRequest extends Request
}
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$input['line_items'] = $this->cleanFeeItems($input['line_items']);
$input['amount'] = $this->entityTotalAmount($input['line_items']);
if (isset($input['auto_bill'])) {

2
app/Services/Invoice/AutoBillInvoice.php
View File

@ -148,6 +148,7 @@ class AutoBillInvoice extends AbstractService
]);
nlog("Payment hash created => {$payment_hash->id}");
$this->invoice->saveQuietly();
$payment = false;
try {
@ -162,6 +163,7 @@ class AutoBillInvoice extends AbstractService
}
$this->invoice = $this->invoice->fresh();
$this->invoice->auto_bill_tries += 1;
if ($this->invoice->auto_bill_tries == 3) {

14
app/Utils/Traits/CleanLineItems.php
View File

@ -34,6 +34,20 @@ trait CleanLineItems
return $cleaned_items;
}
public function cleanFeeItems($items): array
{
//ensure we never allow gateway fees to be cloned across to new entities
foreach ($items as $key => $value) {
if (in_array($value->type_id, ['3','4'])) {
unset($items[$key]);
}
}
return $items;
}
/**
* Sets default values for the line_items.
* @param $item

2
tests/Feature/TaskStatusApiTest.php
View File

@ -73,8 +73,6 @@ class TaskStatusApiTest extends TestCase
])->put('/api/v1/task_statuses/'.$task_status->hashed_id, $data);
$xx = TaskStatus::where('company_id', $this->company->id)->pluck('status_order');
$t = TaskStatus::where('company_id', $this->company->id)->orderBy('status_order', 'asc')->first();
$this->assertEquals($id, $t->id);