mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-08-05 07:32:14 +00:00
05e8acc3b1
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
113 lines
3.8 KiB
PHP
113 lines
3.8 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Company\Report;
|
|
|
|
use App\Facades\Pdf;
|
|
use App\Http\Controllers\Controller;
|
|
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;
|
|
use Illuminate\Http\Response;
|
|
use Illuminate\Support\Facades\App;
|
|
use Silber\Bouncer\BouncerFacade;
|
|
|
|
class ExpensesReportController extends Controller
|
|
{
|
|
/**
|
|
* Handle the incoming request.
|
|
*
|
|
* @param string $hash
|
|
* @return View|Response
|
|
*/
|
|
public function __invoke(Request $request, $hash)
|
|
{
|
|
$company = Company::where('unique_hash', $hash)->firstOrFail();
|
|
|
|
// These routes carry no company header, so ScopeBouncer is not in their
|
|
// middleware stack and the ability scope was never set. 'view-financial-reports'
|
|
// is stored scoped to a company, so the unscoped check always failed and every
|
|
// report PDF answered 403. Scope to the company named in the URL: the policy
|
|
// still checks membership, so this grants nothing new.
|
|
BouncerFacade::scope()->to($company->id);
|
|
|
|
$this->authorize('view report', $company);
|
|
|
|
$locale = CompanySetting::getSetting('language', $company->id);
|
|
|
|
App::setLocale($locale);
|
|
|
|
// Fetch individual expenses (filtered and ordered by date), then group by category
|
|
$expenses = Expense::with('category')
|
|
->whereCompanyId($company->id)
|
|
->applyFilters($request->only(['from_date', 'to_date', 'expense_category_id']))
|
|
->orderBy('expense_date', 'asc')
|
|
->get();
|
|
|
|
$totalAmount = $expenses->sum('base_amount');
|
|
|
|
$grouped = $expenses->groupBy(function ($item) {
|
|
return $item->category ? $item->category->name : trans('expenses.uncategorized');
|
|
});
|
|
|
|
$expenseGroups = collect();
|
|
foreach ($grouped as $categoryName => $group) {
|
|
$expenseGroups->push([
|
|
'name' => $categoryName,
|
|
'expenses' => $group,
|
|
'total' => $group->sum('base_amount'),
|
|
]);
|
|
}
|
|
|
|
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
|
|
$from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->translatedFormat($dateFormat);
|
|
$to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->translatedFormat($dateFormat);
|
|
$currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
|
|
|
|
$colors = [
|
|
'primary_text_color',
|
|
'heading_text_color',
|
|
'section_heading_text_color',
|
|
'border_color',
|
|
'body_text_color',
|
|
'footer_text_color',
|
|
'footer_total_color',
|
|
'footer_bg_color',
|
|
'date_text_color',
|
|
];
|
|
$colorSettings = CompanySetting::whereIn('option', $colors)
|
|
->whereCompany($company->id)
|
|
->get();
|
|
|
|
view()->share([
|
|
'expenseGroups' => $expenseGroups,
|
|
'colorSettings' => $colorSettings,
|
|
'totalExpense' => $totalAmount,
|
|
'company' => $company,
|
|
'from_date' => $from_date,
|
|
'to_date' => $to_date,
|
|
'currency' => $currency,
|
|
]);
|
|
// 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($templatePath);
|
|
}
|
|
|
|
if ($request->has('download')) {
|
|
return $pdf->download();
|
|
}
|
|
|
|
return $pdf->stream();
|
|
}
|
|
}
|