shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #281

Browse Source
This commit is contained in:
denisdulici
2018-04-16 19:01:29 +03:00
parent 7897300cb8
commit d2b0a816e3
12 changed files with 130 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Incomes/Invoices.php
View File

@ -87,7 +87,9 @@ class Invoices extends Controller
$payment_methods = Modules::getPaymentMethods();
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'taxes'));
}
/**
@ -103,7 +105,7 @@ class Invoices extends Controller
$items = Item::enabled()->pluck('name', 'id');
$taxes = Tax::enabled()->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id');
$number = $this->getNextInvoiceNumber();
@ -322,7 +324,7 @@ class Invoices extends Controller
$items = Item::enabled()->pluck('name', 'id');
$taxes = Tax::enabled()->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id');
return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes'));
}
@ -511,7 +513,11 @@ class Invoices extends Controller
$logo = $this->getLogo();
$html = view($invoice->template_path, compact('invoice', 'logo'))->render();
$taxes = collect(Tax::enabled()->get())->each(function ($item) {
$item->title = $item->name . ' (' . $item->rate . '%)';
})->pluck('title', 'name');
$html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render();
$pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html);
@ -567,7 +573,9 @@ class Invoices extends Controller
$logo = $this->getLogo();
return view($invoice->template_path, compact('invoice', 'logo'));
$taxes = Tax::enabled()->get()->pluck('title', 'name');
return view($invoice->template_path, compact('invoice', 'logo', 'taxes'));
}
/**
@ -583,7 +591,9 @@ class Invoices extends Controller
$logo = $this->getLogo();
$html = view($invoice->template_path, compact('invoice', 'logo'))->render();
$taxes = Tax::enabled()->get()->pluck('title', 'name');
$html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render();
$pdf = \App::make('dompdf.wrapper');
$pdf->loadHTML($html);