QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-08-05 15:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(pdf): let payment receipts and reports be overridden too (#731)

Browse Source 
Only invoices and estimates could be customised. Payment receipts and all five
reports were hardcoded to app.pdf.*, so changing them meant editing files inside
the image -- and losing the edit on the next upgrade.

Those documents have no template picker and no design to choose between, so
overriding one is not a selection: it is a same-named file in
storage/app/templates/pdf/{type}/ winning over the built-in. PdfTemplateUtils::
resolveView() is that rule, and it needs no setting, no column and no UI.

resolveView asks View::exists rather than checking the storage disk. The disk and
the view namespace are registered separately and could disagree about where
custom templates live; asking the thing that will actually render removes that
possibility.

make:template covers the new types. Their names are not free, since an override
replaces one specific document, so it validates against the real list -- 'payment'
for payments, and the five report names -- and reports what is available when the
name is wrong. Neither type gets a preview image written, having no picker to
show one in.

The payment preview route also went through the built-in view directly rather
than the service, so ?preview ignored an override and rendered with none of the
shared data. It goes through the service now, like invoices and estimates.

Claude-Session: https://claude.ai/code/session_01QmECndmNZwzN65Zz9P87dF
This commit is contained in:
Darko Gjorgjijoski
2026-08-01 13:01:15 +02:00
committed by GitHub
parent 8ab860a1ae
commit 05e8acc3b1
11 changed files with 258 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Company/Report/CustomerSalesReportController.php
View File

@@ -8,6 +8,7 @@ use App\Models\Company;
use App\Models\CompanySetting;
use App\Models\Currency;
use App\Models\Customer;
use App\Support\Pdf\PdfTemplateUtils;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -93,10 +94,15 @@ class CustomerSalesReportController extends Controller
'currency' => $currency,
]);
$pdf = Pdf::loadView('app.pdf.reports.sales-customers');
// Renders a same-named file from storage/app/templates/pdf/reports/
// when one exists, so a report can be overridden without a
// template picker it has no concept of.
$templatePath = PdfTemplateUtils::resolveView('reports', 'sales-customers');
$pdf = Pdf::loadView($templatePath);
if ($request->has('preview')) {
return view('app.pdf.reports.sales-customers');
return view($templatePath);
}
if ($request->has('download')) {

10
app/Http/Controllers/Company/Report/ExpensesReportController.php
View File

@@ -8,6 +8,7 @@ use App\Models\Company;
use App\Models\CompanySetting;
use App\Models\Currency;
use App\Models\Expense;
use App\Support\Pdf\PdfTemplateUtils;
use Carbon\Carbon;
use Illuminate\Contracts\View\View;
use Illuminate\Http\Request;
@@ -91,10 +92,15 @@ class ExpensesReportController extends Controller
'to_date' => $to_date,
'currency' => $currency,
]);
$pdf = Pdf::loadView('app.pdf.reports.expenses');
// Renders a same-named file from storage/app/templates/pdf/reports/
// when one exists, so a report can be overridden without a
// template picker it has no concept of.
$templatePath = PdfTemplateUtils::resolveView('reports', 'expenses');
$pdf = Pdf::loadView($templatePath);
if ($request->has('preview')) {
return view('app.pdf.reports.expenses');
return view($templatePath);
}
if ($request->has('download')) {

10
app/Http/Controllers/Company/Report/ItemSalesReportController.php
View File

@@ -8,6 +8,7 @@ use App\Models\Company;
use App\Models\CompanySetting;
use App\Models\Currency;
use App\Models\InvoiceItem;
use App\Support\Pdf\PdfTemplateUtils;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -78,10 +79,15 @@ class ItemSalesReportController extends Controller
'to_date' => $to_date,
'currency' => $currency,
]);
$pdf = Pdf::loadView('app.pdf.reports.sales-items');
// Renders a same-named file from storage/app/templates/pdf/reports/
// when one exists, so a report can be overridden without a
// template picker it has no concept of.
$templatePath = PdfTemplateUtils::resolveView('reports', 'sales-items');
$pdf = Pdf::loadView($templatePath);
if ($request->has('preview')) {
return view('app.pdf.reports.sales-items');
return view($templatePath);
}
if ($request->has('download')) {

10
app/Http/Controllers/Company/Report/ProfitLossReportController.php
View File

@@ -9,6 +9,7 @@ use App\Models\CompanySetting;
use App\Models\Currency;
use App\Models\Expense;
use App\Models\Payment;
use App\Support\Pdf\PdfTemplateUtils;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -86,10 +87,15 @@ class ProfitLossReportController extends Controller
'to_date' => $to_date,
'currency' => $currency,
]);
$pdf = Pdf::loadView('app.pdf.reports.profit-loss');
// Renders a same-named file from storage/app/templates/pdf/reports/
// when one exists, so a report can be overridden without a
// template picker it has no concept of.
$templatePath = PdfTemplateUtils::resolveView('reports', 'profit-loss');
$pdf = Pdf::loadView($templatePath);
if ($request->has('preview')) {
return view('app.pdf.reports.profit-loss');
return view($templatePath);
}
if ($request->has('download')) {

10
app/Http/Controllers/Company/Report/TaxSummaryReportController.php
View File

@@ -8,6 +8,7 @@ use App\Models\Company;
use App\Models\CompanySetting;
use App\Models\Currency;
use App\Models\Tax;
use App\Support\Pdf\PdfTemplateUtils;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -81,10 +82,15 @@ class TaxSummaryReportController extends Controller
'currency' => $currency,
]);
$pdf = Pdf::loadView('app.pdf.reports.tax-summary');
// Renders a same-named file from storage/app/templates/pdf/reports/
// when one exists, so a report can be overridden without a
// template picker it has no concept of.
$templatePath = PdfTemplateUtils::resolveView('reports', 'tax-summary');
$pdf = Pdf::loadView($templatePath);
if ($request->has('preview')) {
return view('app.pdf.reports.tax-summary');
return view($templatePath);
}
if ($request->has('download')) {

8
app/Http/Controllers/Pdf/DocumentPdfController.php
View File

@@ -8,6 +8,7 @@ use App\Models\Invoice;
use App\Models\Payment;
use App\Services\Document\EstimateService;
use App\Services\Document\InvoiceService;
use App\Services\Document\PaymentService;
use Illuminate\Http\Request;
class DocumentPdfController extends Controller
@@ -15,6 +16,7 @@ class DocumentPdfController extends Controller
public function __construct(
private readonly InvoiceService $invoiceService,
private readonly EstimateService $estimateService,
private readonly PaymentService $paymentService,
) {}
public function invoice(Request $request, Invoice $invoice)
@@ -38,7 +40,11 @@ class DocumentPdfController extends Controller
public function payment(Request $request, Payment $payment)
{
if ($request->has('preview')) {
return view('app.pdf.payment.payment');
// Through the service, so the preview gets the same shared data and
// the same custom-override resolution as the rendered receipt. This
// used to name the built-in view directly, so a preview ignored an
// override and rendered with no data at all.
return $this->paymentService->getPdfData($payment);
}
return $payment->getGeneratedPDFOrStream('payment');