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

Merge pull request #959 from denisdulici/master

Browse Source 
Renamed print files
This commit is contained in:
Denis Duliçi
2019-11-30 00:41:56 +03:00
committed by GitHub
parent fdf1667f70 1ce9350e97
commit b4063b5f89
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->paid = $paid;
$bill->template_path = 'expenses.bills.bill'; $bill->template_path = 'expenses.bills.print';
return $bill; return $bill;
} }

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

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

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

@@ -21,13 +21,7 @@ class Logo
{ {
$logo = ''; $logo = '';
$media_id = setting('company.logo'); $media = Media::find(setting('company.logo'));
if (setting('invoice.logo')) {
$media_id = setting('invoice.logo');
}
$media = Media::find($media_id);
if (!empty($media)) { if (!empty($media)) {
$path = Storage::path($media->getDiskPath()); $path = Storage::path($media->getDiskPath());
@@ -36,10 +30,12 @@ class Logo
return $logo; return $logo;
} }
} else { } 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)) { if (empty($image)) {
return $logo; return $logo;

18
app/Providers/ViewComposer.php
View File

@@ -16,22 +16,24 @@ class ViewComposer extends Provider
{ {
// Suggestions // Suggestions
View::composer( View::composer(
['partials.admin.header'], 'App\Http\ViewComposers\Suggestions' 'partials.admin.header', 'App\Http\ViewComposers\Suggestions'
); );
// Notifications // Notifications
View::composer( View::composer(
['partials.admin.content'], 'App\Http\ViewComposers\Notifications' 'partials.admin.content', 'App\Http\ViewComposers\Notifications'
); );
// Add company info to menu // Add company info to menu
View::composer( 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 // Add notifications to header
View::composer( 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 // Add limits and bulk actions to index
@@ -51,17 +53,19 @@ class ViewComposer extends Provider
// Add recurring // Add recurring
View::composer( View::composer(
['partials.form.recurring',], 'App\Http\ViewComposers\Recurring' 'partials.form.recurring', 'App\Http\ViewComposers\Recurring'
); );
// Add logo // Add logo
View::composer( 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 // Add Invoice Text
View::composer( View::composer(
['incomes.invoices.*', 'portal.invoices.*'], 'App\Http\ViewComposers\InvoiceText' ['incomes.invoices.*', 'portal.invoices.*'],
'App\Http\ViewComposers\InvoiceText'
); );
} }

6
resources/views/expenses/bills/bill.blade.php → resources/views/expenses/bills/print.blade.php
View File

@@ -11,8 +11,10 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if ($logo) @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id))
<img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/> <img src="{{ Storage::url($bill->contact->logo->id) }}" height="128" width="128" alt="{{ $bill->contact_name }}"/>
@else
<img src="{{ $logo }}" alt="{{ $bill->contact_name }}"/>
@endif @endif
</th> </th>
</tr> </tr>

6
resources/views/expenses/bills/show.blade.php
View File

@@ -163,10 +163,10 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (isset($bill->contact->logo) && !empty($bill->contact->logo->id)) @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id))
<img src="{{ Storage::url($bill->contact->logo->id) }}"/> <img src="{{ Storage::url($bill->contact->logo->id) }}" height="128" width="128" alt="{{ $bill->contact_name }}"/>
@else @else
<img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/> <img src="{{ $logo }}" alt="{{ $bill->contact_name }}"/>
@endif @endif
</th> </th>
</tr> </tr>

4
resources/views/incomes/invoices/invoice.blade.php → resources/views/incomes/invoices/print.blade.php
View File

@@ -11,9 +11,7 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if ($logo) <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
<img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
@endif
</th> </th>
</tr> </tr>
</tbody> </tbody>

6
resources/views/incomes/invoices/show.blade.php
View File

@@ -185,11 +185,7 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (setting('company.logo')) <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
<img src="{{ Storage::url(setting('company.logo')) }}"/>
@else
<img src="{{ asset('public/img/company.png') }}" height="128" width="128" alt="Company"/>
@endif
</th> </th>
</tr> </tr>
</tbody> </tbody>

135
resources/views/portal/invoices/invoice.blade.php
View File

@@ -1,135 +0,0 @@
@extends('layouts.portal')
@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
@section('content')
<div class="row">
<div class="col-md-7">
@if ($logo)
<img src="{{ $logo }}"/>
@endif
</div>
<div class="col-md-5 invoice-company">
<address>
<strong>{{ setting('company.name') }}</strong><br>
{{ setting('company.address') }}<br>
@if (setting('company.tax_number'))
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}<br>
@endif
<br>
@if (setting('company.phone'))
{{ setting('company.phone') }}<br>
@endif
{{ setting('company.email') }}
</address>
</div>
</div>
<div class="row">
<div class="col-md-7">
{{ trans('invoices.bill_to') }}
<address>
<strong>{{ $invoice->contact_name }}</strong><br>
{{ $invoice->contact_address }}<br>
@if ($invoice->contact_tax_number)
{{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}<br>
@endif
<br>
@if ($invoice->contact_phone)
{{ $invoice->contact_phone }}<br>
@endif
{{ $invoice->contact_email }}
</address>
</div>
<div class="col-md-5">
<div class="table-responsive">
<table class="table no-border">
<tbody>
<tr>
<th>{{ trans('invoices.invoice_number') }}:</th>
<td class="text-right">{{ $invoice->invoice_number }}</td>
</tr>
@if ($invoice->order_number)
<tr>
<th>{{ trans('invoices.order_number') }}:</th>
<td class="text-right">{{ $invoice->order_number }}</td>
</tr>
@endif
<tr>
<th>{{ trans('invoices.invoice_date') }}:</th>
<td class="text-right">@date($invoice->invoiced_at)</td>
</tr>
<tr>
<th>{{ trans('invoices.payment_due') }}:</th>
<td class="text-right">@date($invoice->due_At)</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 table-responsive">
<table class="table table-striped">
<tbody>
<tr>
<th>{{ trans_choice('general.items', 1) }}</th>
<th class="text-center">{{ trans('invoices.quantity') }}</th>
<th class="text-right">{{ trans('invoices.price') }}</th>
<th class="text-right">{{ trans('invoices.total') }}</th>
</tr>
@foreach($invoice->items as $item)
<tr>
<td>
{{ $item->name }}
</td>
<td class="text-center">{{ $item->quantity }}</td>
<td class="text-right">@money($item->price, $invoice->currency_code, true)</td>
<td class="text-right">@money($item->total, $invoice->currency_code, true)</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-7">
@if ($invoice->notes)
<p class="lead">{{ trans_choice('general.notes', 2) }}</p>
<p class="text-muted well well-sm no-shadow" style="margin-top: 10px;">
{{ $invoice->notes }}
</p>
@endif
</div>
<div class="col-md-5">
<div class="table-responsive">
<table class="table">
<tbody>
@foreach($invoice->totals as $total)
@if($total->code != 'total')
<tr>
<th>{{ trans($total['name']) }}:</th>
<td class="text-right">@money($total->amount, $invoice->currency_code, true)</td>
</tr>
@else
@if ($invoice->paid)
<tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th>
<td class="text-right">- @money($invoice->paid, $invoice->currency_code, true)</td>
</tr>
@endif
<tr>
<th>{{ trans($total['name']) }}:</th>
<td class="text-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</td>
</tr>
@endif
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endsection

8
resources/views/portal/invoices/show.blade.php
View File

@@ -20,13 +20,7 @@
<tbody> <tbody>
<tr> <tr>
<th> <th>
@if (setting('company.logo')) <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
<img src="{{ Storage::url(setting('company.logo')) }}"/>
@else
<span class="avatar avatar-size rounded-circle bg-primary">
<i class="fas fa-building"></i>
</span>
@endif
</th> </th>
</tr> </tr>
</tbody> </tbody>