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

renamed print files

Browse Source
This commit is contained in:
denisdulici
2019-11-30 00:39:44 +03:00
parent fdf1667f70
commit 1ce9350e97
11 changed files with 29 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Expenses/Bills.php
View File

@ -376,7 +376,7 @@ class Bills extends Controller
$bill->paid = $paid;
$bill->template_path = 'expenses.bills.bill';
$bill->template_path = 'expenses.bills.print';
return $bill;
}

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

@ -444,7 +444,7 @@ class Invoices extends Controller
$invoice->paid = $paid;
$invoice->template_path = 'incomes.invoices.invoice';
$invoice->template_path = 'incomes.invoices.print';
event(new \App\Events\Income\InvoicePrinting($invoice));

2
app/Http/Controllers/Portal/Invoices.php
View File

@ -124,7 +124,7 @@ class Invoices extends Controller
$invoice->paid = $paid;
$invoice->template_path = 'incomes.invoices.invoice';
$invoice->template_path = 'incomes.invoices.print';
event(new \App\Events\Income\InvoicePrinting($invoice));

14
app/Http/ViewComposers/Logo.php
View File

@ -21,13 +21,7 @@ class Logo
{
$logo = '';
$media_id = setting('company.logo');
if (setting('invoice.logo')) {
$media_id = setting('invoice.logo');
}
$media = Media::find($media_id);
$media = Media::find(setting('company.logo'));
if (!empty($media)) {
$path = Storage::path($media->getDiskPath());
@ -36,10 +30,12 @@ class Logo
return $logo;
}
} else {
$path = asset('public/img/akaunting-logo-green.png');
$path = asset('public/img/company.png');
}
$image = Image::make($path)->encode()->getEncoded();
$width = $height = setting('invoice.logo_size', 128);
$image = Image::make($path)->resize($width, $height)->encode()->getEncoded();
if (empty($image)) {
return $logo;

18
app/Providers/ViewComposer.php
View File

@ -16,22 +16,24 @@ class ViewComposer extends Provider
{
// Suggestions
View::composer(
['partials.admin.header'], 'App\Http\ViewComposers\Suggestions'
'partials.admin.header', 'App\Http\ViewComposers\Suggestions'
);
// Notifications
View::composer(
['partials.admin.content'], 'App\Http\ViewComposers\Notifications'
'partials.admin.content', 'App\Http\ViewComposers\Notifications'
);
// Add company info to menu
View::composer(
['partials.admin.menu', 'partials.portal.menu'], 'App\Http\ViewComposers\Menu'
['partials.admin.menu', 'partials.portal.menu'],
'App\Http\ViewComposers\Menu'
);
// Add notifications to header
View::composer(
['partials.wizard.navbar', 'partials.admin.navbar', 'partials.portal.navbar'], 'App\Http\ViewComposers\Header'
['partials.wizard.navbar', 'partials.admin.navbar', 'partials.portal.navbar'],
'App\Http\ViewComposers\Header'
);
// Add limits and bulk actions to index
@ -51,17 +53,19 @@ class ViewComposer extends Provider
// Add recurring
View::composer(
['partials.form.recurring',], 'App\Http\ViewComposers\Recurring'
'partials.form.recurring', 'App\Http\ViewComposers\Recurring'
);
// Add logo
View::composer(
['incomes.invoices.invoice', 'expenses.bills.bill'], 'App\Http\ViewComposers\Logo'
['expenses.bills.print', 'expenses.bills.show', 'incomes.invoices.print', 'incomes.invoices.show', 'portal.invoices.show'],
'App\Http\ViewComposers\Logo'
);
// Add Invoice Text
View::composer(
['incomes.invoices.*', 'portal.invoices.*'], 'App\Http\ViewComposers\InvoiceText'
['incomes.invoices.*', 'portal.invoices.*'],
'App\Http\ViewComposers\InvoiceText'
);
}