waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3159 from CihanSenturk/fix-transaction-recurring-duplicate-issue 

Fixed transaction recurring duplicate issue
This commit is contained in:
Cüneyt Şentürk 2024-05-02 15:38:01 +01:00 committed by GitHub
parent b91951547d d8c8dee6a4
commit db7a8efd56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Banking/Transaction.php
View File

@ -322,7 +322,7 @@ class Transaction extends Model
$suffix = $src->isRecurringTransaction() ? '-recurring' : '';
}
$this->number = $this->getNextTransactionNumber($suffix);
$this->number = $this->getNextTransactionNumber($this->type, $suffix);
$this->document_id = null;
$this->split_id = null;
unset($this->reconciled);

24
app/Utilities/TransactionNumber.php
View File

@ -5,6 +5,7 @@ namespace App\Utilities;
use App\Interfaces\Utility\TransactionNumber as TransactionNumberInterface;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use Illuminate\Support\Str;
class TransactionNumber implements TransactionNumberInterface
{
@ -15,16 +16,16 @@ class TransactionNumber implements TransactionNumberInterface
$digit = (int) setting('transaction' . $suffix . '.number_digit');
$get_number = fn($prefix, $next, $digit) => $prefix . str_pad($next, $digit, '0', STR_PAD_LEFT);
$number_exists = fn($number) => Transaction::where('number', $number)->exists();
$number_exists = fn($type, $number) => $this->numberExists($type, $number);
$transaction_number = $get_number($prefix, $next, $digit);
if ($number_exists($transaction_number)) {
if ($number_exists($type, $transaction_number)) {
do {
$next++;
$transaction_number = $get_number($prefix, $next, $digit);
} while ($number_exists($transaction_number));
} while ($number_exists($type, $transaction_number));
setting(['transaction' . $suffix . '.number_next' => $next]);
setting()->save();
@ -34,6 +35,23 @@ class TransactionNumber implements TransactionNumberInterface
}
public function numberExists($type, $number)
{
$number_exists = new Transaction;
if (Str::endsWith($type, '-recurring')) {
$number_exists = $number_exists->isRecurring();
}
if (Str::endsWith($type, '-split')) {
$number_exists = $number_exists->isSplitTransaction();
}
$number_exists = $number_exists->where('number', $number);
return $number_exists->exists();
}
public function increaseNextNumber($type, $suffix = '', ?Contact $contact): void
{
$next = setting('transaction' . $suffix . '.number_next', 1) + 1;