mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-16 01:34:08 +00:00
Remove app/Space folder and extract model business logic into services
Relocate all 14 files from the catch-all app/Space namespace into proper locations: data providers to Support/Formatters, installation utilities to Services/Installation, PDF utils to Services/Pdf, module/update classes to Services/Module and Services/Update, SiteApi trait to Traits, and helpers to Support. Extract ~1,400 lines of business logic from 8 fat models (Invoice, Payment, Estimate, RecurringInvoice, Company, Customer, Expense, User) into 9 new service classes with constructor injection. Controllers now depend on services instead of calling static model methods. Shared item/tax creation logic consolidated into DocumentItemService.
This commit is contained in:
@@ -8,11 +8,16 @@ use App\Http\Requests\DeleteInvoiceRequest;
|
||||
use App\Http\Resources\InvoiceResource;
|
||||
use App\Jobs\GenerateInvoicePdfJob;
|
||||
use App\Models\Invoice;
|
||||
use App\Services\InvoiceService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class InvoicesController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly InvoiceService $invoiceService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@@ -46,10 +51,10 @@ class InvoicesController extends Controller
|
||||
{
|
||||
$this->authorize('create', Invoice::class);
|
||||
|
||||
$invoice = Invoice::createInvoice($request);
|
||||
$invoice = $this->invoiceService->create($request);
|
||||
|
||||
if ($request->has('invoiceSend')) {
|
||||
$invoice->send($request->subject, $request->body);
|
||||
$this->invoiceService->send($invoice, $request->only(['subject', 'body']));
|
||||
}
|
||||
|
||||
GenerateInvoicePdfJob::dispatch($invoice);
|
||||
@@ -79,11 +84,7 @@ class InvoicesController extends Controller
|
||||
{
|
||||
$this->authorize('update', $invoice);
|
||||
|
||||
$invoice = $invoice->updateInvoice($request);
|
||||
|
||||
if (is_string($invoice)) {
|
||||
return respondJson($invoice, $invoice);
|
||||
}
|
||||
$invoice = $this->invoiceService->update($invoice, $request);
|
||||
|
||||
GenerateInvoicePdfJob::dispatch($invoice, true);
|
||||
|
||||
@@ -104,7 +105,7 @@ class InvoicesController extends Controller
|
||||
->whereIn('id', $request->ids)
|
||||
->pluck('id');
|
||||
|
||||
Invoice::deleteInvoices($ids);
|
||||
$this->invoiceService->delete($ids);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
|
||||
Reference in New Issue
Block a user