diff --git a/app/Abstracts/View/Components/Documents/Form.php b/app/Abstracts/View/Components/Documents/Form.php index fff562d38..46892646c 100644 --- a/app/Abstracts/View/Components/Documents/Form.php +++ b/app/Abstracts/View/Components/Documents/Form.php @@ -3,7 +3,7 @@ namespace App\Abstracts\View\Components\Documents; use App\Abstracts\View\Component; -use App\Interfaces\Service\DocumentNumberService; +use App\Interfaces\Utility\DocumentNumber; use App\Models\Common\Contact; use App\Models\Document\Document; use App\Models\Setting\Currency; @@ -267,7 +267,7 @@ abstract class Form extends Component * @return void */ public function __construct( - protected DocumentNumberService $documentNumberService, + protected DocumentNumber $documentNumberUtility, string $type, $model = false, $document = false, $currencies = false, $currency = false, $currency_code = false, string $formId = 'document', $formRoute = '', $formMethod = '', bool $hideCompany = false, string $textSectionCompaniesTitle = '', string $textSectionCompaniesDescription = '', @@ -819,10 +819,10 @@ abstract class Form extends Component $contact = ($this->contact instanceof \stdClass) ? null : $this->contact; - $document_number = $this->documentNumberService->getNextDocumentNumber($type, $contact); + $document_number = $this->documentNumberUtility->getNextNumber($type, $contact); if (empty($document_number)) { - $document_number = $this->documentNumberService->getNextDocumentNumber(Document::INVOICE_TYPE, $contact); + $document_number = $this->documentNumberUtility->getNextNumber(Document::INVOICE_TYPE, $contact); } return $document_number; diff --git a/app/Interfaces/Service/DocumentNumberService.php b/app/Interfaces/Service/DocumentNumberService.php deleted file mode 100644 index a7cd36a26..000000000 --- a/app/Interfaces/Service/DocumentNumberService.php +++ /dev/null @@ -1,12 +0,0 @@ -status = 'draft'; - $this->document_number = app(DocumentNumberService::class)->getNextDocumentNumber($type, $src->contact); + $this->document_number = app(DocumentNumber::class)->getNextNumber($type, $src->contact); } public function getSentAtAttribute(string $value = null) diff --git a/app/Providers/Binding.php b/app/Providers/Binding.php new file mode 100644 index 000000000..3355ad5d4 --- /dev/null +++ b/app/Providers/Binding.php @@ -0,0 +1,19 @@ + DocumentNumber::class, + ]; +} diff --git a/app/Providers/Service.php b/app/Providers/Service.php deleted file mode 100644 index 2c59cfebf..000000000 --- a/app/Providers/Service.php +++ /dev/null @@ -1,19 +0,0 @@ - CoreDocumentNumberService::class, - ]; -} diff --git a/app/Traits/Documents.php b/app/Traits/Documents.php index 2ed5a1855..9b7e35e1a 100644 --- a/app/Traits/Documents.php +++ b/app/Traits/Documents.php @@ -2,7 +2,7 @@ namespace App\Traits; -use App\Interfaces\Service\DocumentNumberService; +use App\Interfaces\Utility\DocumentNumber; use App\Models\Document\Document; use App\Abstracts\View\Components\Documents\Document as DocumentComponent; use App\Utilities\Date; @@ -46,23 +46,23 @@ trait Documents } /** - * Deprecated. Use the DocumentNumberService::getNextDocumentNumber() method instead. + * Deprecated. Use the DocumentNumber::getNextNumber() method instead. * * @deprecated This method is deprecated and will be removed in future versions. */ public function getNextDocumentNumber(string $type): string { - return app(DocumentNumberService::class)->getNextDocumentNumber($type, null); + return app(DocumentNumber::class)->getNextNumber($type, null); } /** - * Deprecated. Use the DocumentNumberService::increaseNextDocumentNumber() method instead. + * Deprecated. Use the DocumentNumber::increaseNextNumber() method instead. * * @deprecated This method is deprecated and will be removed in future versions. */ public function increaseNextDocumentNumber(string $type): void { - app(DocumentNumberService::class)->increaseNextDocumentNumber($type, null); + app(DocumentNumber::class)->increaseNextNumber($type, null); } public function getDocumentStatuses(string $type): Collection diff --git a/app/Services/Document/CoreDocumentNumberService.php b/app/Utilities/DocumentNumber.php similarity index 60% rename from app/Services/Document/CoreDocumentNumberService.php rename to app/Utilities/DocumentNumber.php index a97fed6e5..7275028e5 100644 --- a/app/Services/Document/CoreDocumentNumberService.php +++ b/app/Utilities/DocumentNumber.php @@ -1,24 +1,24 @@ resolveTypeAlias($type); $prefix = setting($type . '.number_prefix'); - $next = (string)setting($type . '.number_next'); - $digit = (int)setting($type . '.number_digit'); + $next = (string) setting($type . '.number_next'); + $digit = (int) setting($type . '.number_digit'); return $prefix . str_pad($next, $digit, '0', STR_PAD_LEFT); } - public function increaseNextDocumentNumber(string $type, ?Contact $contact): void + public function increaseNextNumber(string $type, ?Contact $contact): void { $type = $this->resolveTypeAlias($type); diff --git a/config/app.php b/config/app.php index 954153681..6ae43df28 100644 --- a/config/app.php +++ b/config/app.php @@ -188,6 +188,7 @@ return [ */ App\Providers\App::class, App\Providers\Auth::class, + App\Providers\Binding::class, App\Providers\Blade::class, // App\Providers\Broadcast::class, App\Providers\Event::class, @@ -195,7 +196,6 @@ return [ App\Providers\Observer::class, App\Providers\Queue::class, App\Providers\Route::class, - App\Providers\Service::class, App\Providers\Validation::class, App\Providers\ViewComposer::class, diff --git a/database/factories/Document.php b/database/factories/Document.php index 6f6813441..0bbed99e2 100644 --- a/database/factories/Document.php +++ b/database/factories/Document.php @@ -9,7 +9,7 @@ use App\Events\Document\DocumentReceived; use App\Events\Document\DocumentSent; use App\Events\Document\DocumentViewed; use App\Events\Document\PaymentReceived; -use App\Interfaces\Service\DocumentNumberService; +use App\Interfaces\Utility\DocumentNumber; use App\Jobs\Document\UpdateDocument; use App\Models\Common\Contact; use App\Models\Common\Item; @@ -268,11 +268,11 @@ class Document extends AbstractFactory */ public function getDocumentNumber($type, Contact $contact) { - $document_number_service = app(DocumentNumberService::class); + $utility = app(DocumentNumber::class); - $document_number = $document_number_service->getNextDocumentNumber($type, $contact); + $document_number = $utility->getNextNumber($type, $contact); - $document_number_service->increaseNextDocumentNumber($type, $contact); + $utility->increaseNextNumber($type, $contact); return $document_number; }