Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for paid to datesOM

This commit is contained in:
David Bomba 2025-03-26 14:50:06 +11:00
parent ae52852ade
commit 41dbbf284e
2 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/Services/Client/ClientService.php
View File

@ -102,45 +102,12 @@ class ClientService
$this->client->increment('balance', $balance); $this->client->increment('balance', $balance);
$this->client->increment('paid_to_date', $paid_to_date); $this->client->increment('paid_to_date', $paid_to_date);
/*
try {
DB::connection(config('database.default'))->transaction(function () use ($balance, $paid_to_date) {
$this->client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first();
$this->client->balance += $balance;
$this->client->paid_to_date += $paid_to_date;
$this->client->saveQuietly();
}, 2);
} catch (\Throwable $throwable) {
nlog("DB ERROR " . $throwable->getMessage());
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
}
*/
return $this; return $this;
} }
public function updatePaidToDate(float $amount) public function updatePaidToDate(float $amount)
{ {
// try {
// DB::connection(config('database.default'))->transaction(function () use ($amount) {
// $this->client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first();
// $this->client->paid_to_date += $amount;
// $this->client->saveQuietly();
// }, 2);
// } catch (\Throwable $throwable) {
// nlog("DB ERROR " . $throwable->getMessage());
// if (DB::connection(config('database.default'))->transactionLevel() > 0) {
// DB::connection(config('database.default'))->rollBack();
// }
// }
nlog("incrementing paid_to_date by {$amount}");
$this->client->increment('paid_to_date', $amount); $this->client->increment('paid_to_date', $amount);
return $this; return $this;

18
app/Services/Payment/DeletePayment.php
View File

@ -155,18 +155,16 @@ class DeletePayment
} }
//sometimes the payment is NOT created properly, this catches the payment and prevents the paid to date reducing inappropriately. //sometimes the payment is NOT created properly, this catches the payment and prevents the paid to date reducing inappropriately.
if ($this->update_client_paid_to_date) { // if ($this->update_client_paid_to_date) {
$reduced_paid_to_date = $this->payment->amount < 0 ? $this->payment->amount * -1 : min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1); // $reduced_paid_to_date = $this->payment->amount < 0 ? $this->payment->amount * -1 : min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1);
// $reduced_paid_to_date = min(0, ($this->payment->amount - $this->payment->refunded - $this->_paid_to_date_deleted) * -1); // $this->payment
// ->client
$this->payment // ->service()
->client // ->updatePaidToDate($reduced_paid_to_date)
->service() // ->save();
->updatePaidToDate($reduced_paid_to_date) // }
->save();
}
return $this; return $this;
} }