From 1ce9350e9769a9e01a799887860c741864da9e98 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 30 Nov 2019 00:39:44 +0300 Subject: [PATCH] renamed print files --- app/Http/Controllers/Expenses/Bills.php | 2 +- app/Http/Controllers/Incomes/Invoices.php | 2 +- app/Http/Controllers/Portal/Invoices.php | 2 +- app/Http/ViewComposers/Logo.php | 14 +- app/Providers/ViewComposer.php | 18 ++- .../bills/{bill.blade.php => print.blade.php} | 6 +- resources/views/expenses/bills/show.blade.php | 6 +- .../{invoice.blade.php => print.blade.php} | 4 +- .../views/incomes/invoices/show.blade.php | 6 +- .../views/portal/invoices/invoice.blade.php | 135 ------------------ .../views/portal/invoices/show.blade.php | 8 +- 11 files changed, 29 insertions(+), 174 deletions(-) rename resources/views/expenses/bills/{bill.blade.php => print.blade.php} (96%) rename resources/views/incomes/invoices/{invoice.blade.php => print.blade.php} (98%) delete mode 100644 resources/views/portal/invoices/invoice.blade.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index db56aaba3..4e0f456dd 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -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; } diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index f801dda2b..75d9a78c9 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -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)); diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php index 18a2a56c8..8a8ba369e 100644 --- a/app/Http/Controllers/Portal/Invoices.php +++ b/app/Http/Controllers/Portal/Invoices.php @@ -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)); diff --git a/app/Http/ViewComposers/Logo.php b/app/Http/ViewComposers/Logo.php index fb33c3131..f71afdc01 100644 --- a/app/Http/ViewComposers/Logo.php +++ b/app/Http/ViewComposers/Logo.php @@ -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; diff --git a/app/Providers/ViewComposer.php b/app/Providers/ViewComposer.php index 757527881..bddc9a277 100644 --- a/app/Providers/ViewComposer.php +++ b/app/Providers/ViewComposer.php @@ -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' ); } diff --git a/resources/views/expenses/bills/bill.blade.php b/resources/views/expenses/bills/print.blade.php similarity index 96% rename from resources/views/expenses/bills/bill.blade.php rename to resources/views/expenses/bills/print.blade.php index e6528180a..d109f83a1 100644 --- a/resources/views/expenses/bills/bill.blade.php +++ b/resources/views/expenses/bills/print.blade.php @@ -11,8 +11,10 @@ - @if ($logo) - Company + @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id)) + {{ $bill->contact_name }} + @else + {{ $bill->contact_name }} @endif diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index b7182f896..91e1267da 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -163,10 +163,10 @@ - @if (isset($bill->contact->logo) && !empty($bill->contact->logo->id)) - + @if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id)) + {{ $bill->contact_name }} @else - Company + {{ $bill->contact_name }} @endif diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/print.blade.php similarity index 98% rename from resources/views/incomes/invoices/invoice.blade.php rename to resources/views/incomes/invoices/print.blade.php index 1be5b5ed4..4ed9ddc36 100644 --- a/resources/views/incomes/invoices/invoice.blade.php +++ b/resources/views/incomes/invoices/print.blade.php @@ -11,9 +11,7 @@ - @if ($logo) - Company - @endif + {{ setting('company.name') }} diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 3978c11d4..f08e69380 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -185,11 +185,7 @@ - @if (setting('company.logo')) - - @else - Company - @endif + {{ setting('company.name') }} diff --git a/resources/views/portal/invoices/invoice.blade.php b/resources/views/portal/invoices/invoice.blade.php deleted file mode 100644 index 2f890a616..000000000 --- a/resources/views/portal/invoices/invoice.blade.php +++ /dev/null @@ -1,135 +0,0 @@ -@extends('layouts.portal') - -@section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number) - -@section('content') -
-
- @if ($logo) - - @endif -
-
-
- {{ setting('company.name') }}
- {{ setting('company.address') }}
- @if (setting('company.tax_number')) - {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
- @endif -
- @if (setting('company.phone')) - {{ setting('company.phone') }}
- @endif - {{ setting('company.email') }} -
-
-
- -
-
- {{ trans('invoices.bill_to') }} -
- {{ $invoice->contact_name }}
- {{ $invoice->contact_address }}
- @if ($invoice->contact_tax_number) - {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }}
- @endif -
- @if ($invoice->contact_phone) - {{ $invoice->contact_phone }}
- @endif - {{ $invoice->contact_email }} -
-
-
-
- - - - - - - @if ($invoice->order_number) - - - - - @endif - - - - - - - - - -
{{ trans('invoices.invoice_number') }}:{{ $invoice->invoice_number }}
{{ trans('invoices.order_number') }}:{{ $invoice->order_number }}
{{ trans('invoices.invoice_date') }}:@date($invoice->invoiced_at)
{{ trans('invoices.payment_due') }}:@date($invoice->due_At)
-
-
-
- -
-
- - - - - - - - - @foreach($invoice->items as $item) - - - - - - - @endforeach - -
{{ trans_choice('general.items', 1) }}{{ trans('invoices.quantity') }}{{ trans('invoices.price') }}{{ trans('invoices.total') }}
- {{ $item->name }} - {{ $item->quantity }}@money($item->price, $invoice->currency_code, true)@money($item->total, $invoice->currency_code, true)
-
-
- -
-
- @if ($invoice->notes) -

{{ trans_choice('general.notes', 2) }}

- -

- {{ $invoice->notes }} -

- @endif -
-
-
- - - @foreach($invoice->totals as $total) - @if($total->code != 'total') - - - - - @else - @if ($invoice->paid) - - - - - @endif - - - - - @endif - @endforeach - -
{{ trans($total['name']) }}:@money($total->amount, $invoice->currency_code, true)
{{ trans('invoices.paid') }}:- @money($invoice->paid, $invoice->currency_code, true)
{{ trans($total['name']) }}:@money($total->amount - $invoice->paid, $invoice->currency_code, true)
-
-
-
-@endsection diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index ee6457ce3..c03806eff 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -20,13 +20,7 @@ - @if (setting('company.logo')) - - @else - - - - @endif + {{ setting('company.name') }}