mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-17 02:04:03 +00:00
Rename SerialNumberFormatter to SerialNumberService for consistency
This commit is contained in:
@@ -60,7 +60,7 @@ Three guards: `web` (session), `api` (Sanctum tokens for `/api/v1/`), `customer`
|
||||
- **PDF generation**: DomPDF (`GeneratesPdfTrait`) or Gotenberg
|
||||
- **Email**: Mailable classes with `EmailLog` tracking
|
||||
- **File storage**: Spatie MediaLibrary, supports local/S3/Dropbox
|
||||
- **Serial numbers**: `SerialNumberFormatter` service
|
||||
- **Serial numbers**: `SerialNumberService` service
|
||||
- **Company settings**: `CompanySetting` model (key-value per company)
|
||||
|
||||
### Database
|
||||
|
||||
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\EstimateResource;
|
||||
use App\Models\CompanySetting;
|
||||
use App\Models\Estimate;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -26,7 +26,7 @@ class CloneEstimateController extends Controller
|
||||
|
||||
$date = Carbon::now();
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($estimate)
|
||||
->setCompany($estimate->company_id)
|
||||
->setCustomer($estimate->customer_id)
|
||||
|
||||
@@ -8,7 +8,7 @@ use App\Http\Resources\InvoiceResource;
|
||||
use App\Models\CompanySetting;
|
||||
use App\Models\Estimate;
|
||||
use App\Models\Invoice;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
@@ -43,7 +43,7 @@ class ConvertEstimateController extends Controller
|
||||
$due_date = Carbon::now()->addDays($dueDateDays)->format('Y-m-d');
|
||||
}
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($invoice)
|
||||
->setCompany($estimate->company_id)
|
||||
->setCustomer($estimate->customer_id)
|
||||
|
||||
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
|
||||
use App\Models\Estimate;
|
||||
use App\Models\Invoice;
|
||||
use App\Models\Payment;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
@@ -21,7 +21,7 @@ class NextNumberController extends Controller
|
||||
{
|
||||
$key = $request->key;
|
||||
$nextNumber = null;
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setCompany($request->header('company'))
|
||||
->setCustomer($request->userId);
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
namespace App\Http\Controllers\V1\Admin\General;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
@@ -17,7 +17,7 @@ class NumberPlaceholdersController extends Controller
|
||||
public function __invoke(Request $request)
|
||||
{
|
||||
if ($request->format) {
|
||||
$placeholders = SerialNumberFormatter::getPlaceholders($request->format);
|
||||
$placeholders = SerialNumberService::getPlaceholders($request->format);
|
||||
} else {
|
||||
$placeholders = [];
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
|
||||
use App\Http\Resources\InvoiceResource;
|
||||
use App\Models\CompanySetting;
|
||||
use App\Models\Invoice;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -26,7 +26,7 @@ class CloneInvoiceController extends Controller
|
||||
|
||||
$date = Carbon::now();
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($invoice)
|
||||
->setCompany($invoice->company_id)
|
||||
->setCustomer($invoice->customer_id)
|
||||
|
||||
@@ -30,7 +30,7 @@ class EstimateService
|
||||
|
||||
$estimate = Estimate::create($data);
|
||||
$estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id);
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($estimate)
|
||||
->setCompany($estimate->company_id)
|
||||
->setCustomer($estimate->customer_id)
|
||||
@@ -65,7 +65,7 @@ class EstimateService
|
||||
{
|
||||
$data = $request->getEstimatePayload();
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($estimate)
|
||||
->setCompany($estimate->company_id)
|
||||
->setCustomer($request->customer_id)
|
||||
|
||||
@@ -32,7 +32,7 @@ class InvoiceService
|
||||
|
||||
$invoice = Invoice::create($data);
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($invoice)
|
||||
->setCompany($invoice->company_id)
|
||||
->setCustomer($invoice->customer_id)
|
||||
@@ -73,7 +73,7 @@ class InvoiceService
|
||||
*/
|
||||
public function update(Invoice $invoice, Request $request): Invoice
|
||||
{
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($invoice)
|
||||
->setCompany($invoice->company_id)
|
||||
->setCustomer($request->customer_id)
|
||||
|
||||
@@ -28,7 +28,7 @@ class PaymentService
|
||||
$payment = Payment::create($data);
|
||||
$payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id);
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($payment)
|
||||
->setCompany($payment->company_id)
|
||||
->setCustomer($payment->customer_id)
|
||||
@@ -78,7 +78,7 @@ class PaymentService
|
||||
$invoice->subtractInvoicePayment($request->amount);
|
||||
}
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel($payment)
|
||||
->setCompany($payment->company_id)
|
||||
->setCustomer($request->customer_id)
|
||||
@@ -191,7 +191,7 @@ class PaymentService
|
||||
{
|
||||
$invoice = Invoice::find($transaction->invoice_id);
|
||||
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel(new Payment)
|
||||
->setCompany($invoice->company_id)
|
||||
->setCustomer($invoice->customer_id)
|
||||
|
||||
@@ -126,7 +126,7 @@ class RecurringInvoiceService
|
||||
|
||||
private function createInvoiceFromRecurring(RecurringInvoice $recurringInvoice): void
|
||||
{
|
||||
$serial = (new SerialNumberFormatter)
|
||||
$serial = (new SerialNumberService)
|
||||
->setModel(new Invoice)
|
||||
->setCompany($recurringInvoice->company_id)
|
||||
->setCustomer($recurringInvoice->customer_id)
|
||||
|
||||
@@ -5,10 +5,7 @@ namespace App\Services;
|
||||
use App\Models\CompanySetting;
|
||||
use App\Models\Customer;
|
||||
|
||||
/**
|
||||
* SerialNumberFormatter
|
||||
*/
|
||||
class SerialNumberFormatter
|
||||
class SerialNumberService
|
||||
{
|
||||
public const VALID_PLACEHOLDERS = ['CUSTOMER_SERIES', 'SEQUENCE', 'DATE_FORMAT', 'SERIES', 'RANDOM_SEQUENCE', 'DELIMITER', 'CUSTOMER_SEQUENCE'];
|
||||
|
||||
@@ -6,7 +6,7 @@ use App\Models\Currency;
|
||||
use App\Models\Customer;
|
||||
use App\Models\Estimate;
|
||||
use App\Models\User;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class EstimateFactory extends Factory
|
||||
@@ -68,7 +68,7 @@ class EstimateFactory extends Factory
|
||||
*/
|
||||
public function definition(): array
|
||||
{
|
||||
$sequenceNumber = (new SerialNumberFormatter)
|
||||
$sequenceNumber = (new SerialNumberService)
|
||||
->setModel(new Estimate)
|
||||
->setCompany(User::find(1)->companies()->first()->id)
|
||||
->setNextNumbers();
|
||||
|
||||
@@ -7,7 +7,7 @@ use App\Models\Customer;
|
||||
use App\Models\Invoice;
|
||||
use App\Models\RecurringInvoice;
|
||||
use App\Models\User;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class InvoiceFactory extends Factory
|
||||
@@ -78,7 +78,7 @@ class InvoiceFactory extends Factory
|
||||
*/
|
||||
public function definition(): array
|
||||
{
|
||||
$sequenceNumber = (new SerialNumberFormatter)
|
||||
$sequenceNumber = (new SerialNumberService)
|
||||
->setModel(new Invoice)
|
||||
->setCompany(User::find(1)->companies()->first()->id)
|
||||
->setNextNumbers();
|
||||
|
||||
@@ -7,7 +7,7 @@ use App\Models\Customer;
|
||||
use App\Models\Payment;
|
||||
use App\Models\PaymentMethod;
|
||||
use App\Models\User;
|
||||
use App\Services\SerialNumberFormatter;
|
||||
use App\Services\SerialNumberService;
|
||||
use Illuminate\Database\Eloquent\Factories\Factory;
|
||||
|
||||
class PaymentFactory extends Factory
|
||||
@@ -24,7 +24,7 @@ class PaymentFactory extends Factory
|
||||
*/
|
||||
public function definition(): array
|
||||
{
|
||||
$sequenceNumber = (new SerialNumberFormatter)
|
||||
$sequenceNumber = (new SerialNumberService)
|
||||
->setModel(new Payment)
|
||||
->setCompany(User::find(1)->companies()->first()->id)
|
||||
->setNextNumbers();
|
||||
|
||||
Reference in New Issue
Block a user