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

refs #1753 move trait for setting number..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-01-14 00:33:48 +03:00
parent da99ff2d0a
commit 6822763d3c
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Abstracts/View/Components/DocumentForm.php
View File

@ -550,17 +550,7 @@ abstract class DocumentForm extends Base
return $document->document_number; return $document->document_number;
} }
$next = $type; $document_number = $this->getNextDocumentNumber($type);
if ($alias = config('type.' . $type . '.alias')) {
$next = $alias . '.' . str_replace('-', '_', $type);
}
$document_number = $this->getNextDocumentNumber($next);
if (empty($document_number)) {
$document_number = $this->getNextDocumentNumber($type);
}
if (empty($document_number)) { if (empty($document_number)) {
$document_number = $this->getNextDocumentNumber(Document::INVOICE_TYPE); $document_number = $this->getNextDocumentNumber(Document::INVOICE_TYPE);

8
app/Traits/Documents.php
View File

@ -11,6 +11,10 @@ trait Documents
{ {
public function getNextDocumentNumber(string $type): string public function getNextDocumentNumber(string $type): string
{ {
if ($alias = config('type.' . $type . '.alias')) {
$type = $alias . '.' . str_replace('-', '_', $type);
}
$prefix = setting("$type.number_prefix"); $prefix = setting("$type.number_prefix");
$next = setting("$type.number_next"); $next = setting("$type.number_next");
$digit = setting("$type.number_digit"); $digit = setting("$type.number_digit");
@ -20,6 +24,10 @@ trait Documents
public function increaseNextDocumentNumber(string $type): void public function increaseNextDocumentNumber(string $type): void
{ {
if ($alias = config('type.' . $type . '.alias')) {
$type = $alias . '.' . str_replace('-', '_', $type);
}
$next = setting("$type.number_next", 1) + 1; $next = setting("$type.number_next", 1) + 1;
setting(["$type.number_next" => $next]); setting(["$type.number_next" => $next]);