shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2613 Fixed: Document transaction edit amount validation issue solved.

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-09-01 10:32:15 +03:00
parent 3f20c1f8c4
commit 0d1170e944
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Modals/DocumentTransactions.php
View File

@ -204,7 +204,7 @@ class DocumentTransactions extends Controller
$response['redirect'] = route($route . '.show', $document->id); $response['redirect'] = route($route . '.show', $document->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]); $message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success(); flash($message)->success();
} else { } else {

7
app/Jobs/Banking/UpdateBankingDocumentTransaction.php
View File

@ -56,14 +56,14 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
protected function prepareRequest(): void protected function prepareRequest(): void
{ {
if (!isset($this->request['amount'])) { if (! isset($this->request['amount'])) {
$this->model->paid_amount = $this->model->paid; $this->model->paid_amount = $this->model->paid;
event(new PaidAmountCalculated($this->model)); event(new PaidAmountCalculated($this->model));
$this->request['amount'] = $this->model->amount - $this->model->paid_amount; $this->request['amount'] = $this->model->amount - $this->model->paid_amount;
} }
$currency_code = !empty($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; $currency_code = ! empty($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code;
$this->request['company_id'] = $this->model->company_id; $this->request['company_id'] = $this->model->company_id;
$this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; $this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code;
@ -92,7 +92,8 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate
$amount = round($converted_amount, $precision); $amount = round($converted_amount, $precision);
} }
$this->model->paid_amount = $this->model->paid; // if you edit transaction before remove transaction amount
$this->model->paid_amount = ($this->model->paid - $this->transaction->amount);
event(new PaidAmountCalculated($this->model)); event(new PaidAmountCalculated($this->model));
$total_amount = round($this->model->amount - $this->model->paid_amount, $precision); $total_amount = round($this->model->amount - $this->model->paid_amount, $precision);