QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-19 11:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SerialNumberFormatter to SerialNumberService for consistency

Browse Source
This commit is contained in:
Darko Gjorgjijoski
2026-04-03 16:09:22 +02:00
parent e208e3ba56
commit e0b8b86e06
14 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CLAUDE.md
View File

@@ -60,7 +60,7 @@ Three guards: `web` (session), `api` (Sanctum tokens for `/api/v1/`), `customer`
- **PDF generation**: DomPDF (`GeneratesPdfTrait`) or Gotenberg - **PDF generation**: DomPDF (`GeneratesPdfTrait`) or Gotenberg
- **Email**: Mailable classes with `EmailLog` tracking - **Email**: Mailable classes with `EmailLog` tracking
- **File storage**: Spatie MediaLibrary, supports local/S3/Dropbox - **File storage**: Spatie MediaLibrary, supports local/S3/Dropbox
- **Serial numbers**: `SerialNumberFormatter` service - **Serial numbers**: `SerialNumberService` service
- **Company settings**: `CompanySetting` model (key-value per company) - **Company settings**: `CompanySetting` model (key-value per company)
### Database ### Database

4
app/Http/Controllers/V1/Admin/Estimate/CloneEstimateController.php
View File

@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
use App\Http\Resources\EstimateResource; use App\Http\Resources\EstimateResource;
use App\Models\CompanySetting; use App\Models\CompanySetting;
use App\Models\Estimate; use App\Models\Estimate;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -26,7 +26,7 @@ class CloneEstimateController extends Controller
$date = Carbon::now(); $date = Carbon::now();
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($estimate) ->setModel($estimate)
->setCompany($estimate->company_id) ->setCompany($estimate->company_id)
->setCustomer($estimate->customer_id) ->setCustomer($estimate->customer_id)

4
app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php
View File

@@ -8,7 +8,7 @@ use App\Http\Resources\InvoiceResource;
use App\Models\CompanySetting; use App\Models\CompanySetting;
use App\Models\Estimate; use App\Models\Estimate;
use App\Models\Invoice; use App\Models\Invoice;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
@@ -43,7 +43,7 @@ class ConvertEstimateController extends Controller
$due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d'); $due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
} }
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($invoice) ->setModel($invoice)
->setCompany($estimate->company_id) ->setCompany($estimate->company_id)
->setCustomer($estimate->customer_id) ->setCustomer($estimate->customer_id)

4
app/Http/Controllers/V1/Admin/General/NextNumberController.php
View File

@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\Estimate; use App\Models\Estimate;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Payment; use App\Models\Payment;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
@@ -21,7 +21,7 @@ class NextNumberController extends Controller
{ {
$key = $request->key; $key = $request->key;
$nextNumber = null; $nextNumber = null;
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setCompany($request->header('company')) ->setCompany($request->header('company'))
->setCustomer($request->userId); ->setCustomer($request->userId);

4
app/Http/Controllers/V1/Admin/General/NumberPlaceholdersController.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\V1\Admin\General; namespace App\Http\Controllers\V1\Admin\General;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
@@ -17,7 +17,7 @@ class NumberPlaceholdersController extends Controller
public function __invoke(Request $request) public function __invoke(Request $request)
{ {
if ($request->format) { if ($request->format) {
$placeholders = SerialNumberFormatter::getPlaceholders($request->format); $placeholders = SerialNumberService::getPlaceholders($request->format);
} else { } else {
$placeholders = []; $placeholders = [];
} }

4
app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php
View File

@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
use App\Http\Resources\InvoiceResource; use App\Http\Resources\InvoiceResource;
use App\Models\CompanySetting; use App\Models\CompanySetting;
use App\Models\Invoice; use App\Models\Invoice;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -26,7 +26,7 @@ class CloneInvoiceController extends Controller
$date = Carbon::now(); $date = Carbon::now();
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($invoice) ->setModel($invoice)
->setCompany($invoice->company_id) ->setCompany($invoice->company_id)
->setCustomer($invoice->customer_id) ->setCustomer($invoice->customer_id)

4
app/Services/EstimateService.php
View File

@@ -30,7 +30,7 @@ class EstimateService
$estimate = Estimate::create($data); $estimate = Estimate::create($data);
$estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id); $estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id);
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($estimate) ->setModel($estimate)
->setCompany($estimate->company_id) ->setCompany($estimate->company_id)
->setCustomer($estimate->customer_id) ->setCustomer($estimate->customer_id)
@@ -65,7 +65,7 @@ class EstimateService
{ {
$data = $request->getEstimatePayload(); $data = $request->getEstimatePayload();
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($estimate) ->setModel($estimate)
->setCompany($estimate->company_id) ->setCompany($estimate->company_id)
->setCustomer($request->customer_id) ->setCustomer($request->customer_id)

4
app/Services/InvoiceService.php
View File

@@ -32,7 +32,7 @@ class InvoiceService
$invoice = Invoice::create($data); $invoice = Invoice::create($data);
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($invoice) ->setModel($invoice)
->setCompany($invoice->company_id) ->setCompany($invoice->company_id)
->setCustomer($invoice->customer_id) ->setCustomer($invoice->customer_id)
@@ -73,7 +73,7 @@ class InvoiceService
*/ */
public function update(Invoice $invoice, Request $request): Invoice public function update(Invoice $invoice, Request $request): Invoice
{ {
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($invoice) ->setModel($invoice)
->setCompany($invoice->company_id) ->setCompany($invoice->company_id)
->setCustomer($request->customer_id) ->setCustomer($request->customer_id)

6
app/Services/PaymentService.php
View File

@@ -28,7 +28,7 @@ class PaymentService
$payment = Payment::create($data); $payment = Payment::create($data);
$payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id); $payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id);
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($payment) ->setModel($payment)
->setCompany($payment->company_id) ->setCompany($payment->company_id)
->setCustomer($payment->customer_id) ->setCustomer($payment->customer_id)
@@ -78,7 +78,7 @@ class PaymentService
$invoice->subtractInvoicePayment($request->amount); $invoice->subtractInvoicePayment($request->amount);
} }
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel($payment) ->setModel($payment)
->setCompany($payment->company_id) ->setCompany($payment->company_id)
->setCustomer($request->customer_id) ->setCustomer($request->customer_id)
@@ -191,7 +191,7 @@ class PaymentService
{ {
$invoice = Invoice::find($transaction->invoice_id); $invoice = Invoice::find($transaction->invoice_id);
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel(new Payment) ->setModel(new Payment)
->setCompany($invoice->company_id) ->setCompany($invoice->company_id)
->setCustomer($invoice->customer_id) ->setCustomer($invoice->customer_id)

2
app/Services/RecurringInvoiceService.php
View File

@@ -126,7 +126,7 @@ class RecurringInvoiceService
private function createInvoiceFromRecurring(RecurringInvoice $recurringInvoice): void private function createInvoiceFromRecurring(RecurringInvoice $recurringInvoice): void
{ {
$serial = (new SerialNumberFormatter) $serial = (new SerialNumberService)
->setModel(new Invoice) ->setModel(new Invoice)
->setCompany($recurringInvoice->company_id) ->setCompany($recurringInvoice->company_id)
->setCustomer($recurringInvoice->customer_id) ->setCustomer($recurringInvoice->customer_id)

5
app/Services/SerialNumberFormatter.php → app/Services/SerialNumberService.php
View File

@@ -5,10 +5,7 @@ namespace App\Services;
use App\Models\CompanySetting; use App\Models\CompanySetting;
use App\Models\Customer; use App\Models\Customer;
/** class SerialNumberService
* SerialNumberFormatter
*/
class SerialNumberFormatter
{ {
public const VALID_PLACEHOLDERS = ['CUSTOMER_SERIES', 'SEQUENCE', 'DATE_FORMAT', 'SERIES', 'RANDOM_SEQUENCE', 'DELIMITER', 'CUSTOMER_SEQUENCE']; public const VALID_PLACEHOLDERS = ['CUSTOMER_SERIES', 'SEQUENCE', 'DATE_FORMAT', 'SERIES', 'RANDOM_SEQUENCE', 'DELIMITER', 'CUSTOMER_SEQUENCE'];

4
database/factories/EstimateFactory.php
View File

@@ -6,7 +6,7 @@ use App\Models\Currency;
use App\Models\Customer; use App\Models\Customer;
use App\Models\Estimate; use App\Models\Estimate;
use App\Models\User; use App\Models\User;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
class EstimateFactory extends Factory class EstimateFactory extends Factory
@@ -68,7 +68,7 @@ class EstimateFactory extends Factory
*/ */
public function definition(): array public function definition(): array
{ {
$sequenceNumber = (new SerialNumberFormatter) $sequenceNumber = (new SerialNumberService)
->setModel(new Estimate) ->setModel(new Estimate)
->setCompany(User::find(1)->companies()->first()->id) ->setCompany(User::find(1)->companies()->first()->id)
->setNextNumbers(); ->setNextNumbers();

4
database/factories/InvoiceFactory.php
View File

@@ -7,7 +7,7 @@ use App\Models\Customer;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\RecurringInvoice; use App\Models\RecurringInvoice;
use App\Models\User; use App\Models\User;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
class InvoiceFactory extends Factory class InvoiceFactory extends Factory
@@ -78,7 +78,7 @@ class InvoiceFactory extends Factory
*/ */
public function definition(): array public function definition(): array
{ {
$sequenceNumber = (new SerialNumberFormatter) $sequenceNumber = (new SerialNumberService)
->setModel(new Invoice) ->setModel(new Invoice)
->setCompany(User::find(1)->companies()->first()->id) ->setCompany(User::find(1)->companies()->first()->id)
->setNextNumbers(); ->setNextNumbers();

4
database/factories/PaymentFactory.php
View File

@@ -7,7 +7,7 @@ use App\Models\Customer;
use App\Models\Payment; use App\Models\Payment;
use App\Models\PaymentMethod; use App\Models\PaymentMethod;
use App\Models\User; use App\Models\User;
use App\Services\SerialNumberFormatter; use App\Services\SerialNumberService;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
class PaymentFactory extends Factory class PaymentFactory extends Factory
@@ -24,7 +24,7 @@ class PaymentFactory extends Factory
*/ */
public function definition(): array public function definition(): array
{ {
$sequenceNumber = (new SerialNumberFormatter) $sequenceNumber = (new SerialNumberService)
->setModel(new Payment) ->setModel(new Payment)
->setCompany(User::find(1)->companies()->first()->id) ->setCompany(User::find(1)->companies()->first()->id)
->setNextNumbers(); ->setNextNumbers();