mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 17:24:10 +00:00
119a1712b0
Ports the net behaviour from three master commits into v3.0 as a single change, because v3.0 has already diverged structurally (controller moved from V1/Admin/Report to Company/Report, blade has its own CSS rework using the bundled fonts partial, and v3.0's App\Facades\Pdf replaces Barryvdh\DomPDF\Facade\Pdf). The three source commits are:834b53ea(grouped itemized expenses),e22050bc(DomPDF facade + Pint — adapted to v3.0's App\Facades\Pdf),0e9f18d4(expenses.uncategorized + pdf_expense_group_total_label i18n keys + View|Response return type). Controller: replaces the expenseCategories aggregate fetch with an itemized Expense query ordered by date, groups by category name with expenses.uncategorized fallback, and shares an expenseGroups collection of {name, expenses, total} plus the overall totalExpense. Adds expense_category_id to applyFilters. Updates the docblock return type from JsonResponse to View|Response. Keeps v3.0's App\Facades\Pdf. Blade: replaces the single expenseCategories aggregate table with a per-group itemized table (date / note / amount columns + per-group total line using the new pdf_expense_group_total_label i18n key). Adds the item-table-* CSS classes and removes the old expense-total-table bottom block. lang/en.json: adds expenses.uncategorized = "Uncategorized" and pdf_expense_group_total_label = "Group total:".
99 lines
3.1 KiB
PHP
99 lines
3.1 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 Carbon\Carbon;
|
|
use Illuminate\Contracts\View\View;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Response;
|
|
use Illuminate\Support\Facades\App;
|
|
|
|
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)->first();
|
|
|
|
$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,
|
|
]);
|
|
$pdf = Pdf::loadView('app.pdf.reports.expenses');
|
|
|
|
if ($request->has('preview')) {
|
|
return view('app.pdf.reports.expenses');
|
|
}
|
|
|
|
if ($request->has('download')) {
|
|
return $pdf->download();
|
|
}
|
|
|
|
return $pdf->stream();
|
|
}
|
|
}
|