mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-25 14:14: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:
@@ -7,11 +7,16 @@ use App\Http\Requests\DeletePaymentsRequest;
|
||||
use App\Http\Requests\PaymentRequest;
|
||||
use App\Http\Resources\PaymentResource;
|
||||
use App\Models\Payment;
|
||||
use App\Services\PaymentService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class PaymentsController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PaymentService $paymentService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@@ -48,7 +53,7 @@ class PaymentsController extends Controller
|
||||
{
|
||||
$this->authorize('create', Payment::class);
|
||||
|
||||
$payment = Payment::createPayment($request);
|
||||
$payment = $this->paymentService->create($request);
|
||||
|
||||
return new PaymentResource($payment);
|
||||
}
|
||||
@@ -64,7 +69,7 @@ class PaymentsController extends Controller
|
||||
{
|
||||
$this->authorize('update', $payment);
|
||||
|
||||
$payment = $payment->updatePayment($request);
|
||||
$payment = $this->paymentService->update($payment, $request);
|
||||
|
||||
return new PaymentResource($payment);
|
||||
}
|
||||
@@ -77,7 +82,7 @@ class PaymentsController extends Controller
|
||||
->whereIn('id', $request->ids)
|
||||
->pluck('id');
|
||||
|
||||
Payment::deletePayments($ids);
|
||||
$this->paymentService->delete($ids);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
|
||||
@@ -5,11 +5,16 @@ namespace App\Http\Controllers\V1\Admin\Payment;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\SendPaymentRequest;
|
||||
use App\Models\Payment;
|
||||
use App\Services\PaymentService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class SendPaymentController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PaymentService $paymentService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Handle the incoming request.
|
||||
*
|
||||
@@ -20,7 +25,7 @@ class SendPaymentController extends Controller
|
||||
{
|
||||
$this->authorize('send payment', $payment);
|
||||
|
||||
$response = $payment->send($request->all());
|
||||
$response = $this->paymentService->send($payment, $request->all());
|
||||
|
||||
return response()->json($response);
|
||||
}
|
||||
|
||||
@@ -4,12 +4,17 @@ namespace App\Http\Controllers\V1\Admin\Payment;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Payment;
|
||||
use App\Services\PaymentService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Mail\Markdown;
|
||||
|
||||
class SendPaymentPreviewController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PaymentService $paymentService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Handle the incoming request.
|
||||
*
|
||||
@@ -21,7 +26,7 @@ class SendPaymentPreviewController extends Controller
|
||||
|
||||
$markdown = new Markdown(view(), config('mail.markdown'));
|
||||
|
||||
$data = $payment->sendPaymentData($request->all());
|
||||
$data = $this->paymentService->sendPaymentData($payment, $request->all());
|
||||
$data['url'] = $payment->paymentPdfUrl;
|
||||
|
||||
return $markdown->render('emails.send.payment', ['data' => $data]);
|
||||
|
||||
Reference in New Issue
Block a user