TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pdf-mail' into 'master'

Browse Source 
Add Logo and Company name on Email Template

See merge request mohit.panjvani/crater-web!49
This commit is contained in:
Mohit Panjwani
2019-11-19 08:47:30 +00:00
parent 8f55b30b0d ac20ef1cd8
commit 37a4737155
25 changed files with 576 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EstimatesController.php
View File

@ -13,6 +13,7 @@ use Crater\User;
use Crater\Item;
use Validator;
use Crater\CompanySetting;
use Crater\Company;
use Crater\Mail\EstimatePdf;
use Crater\TaxType;
use Crater\Tax;
@ -147,6 +148,7 @@ class EstimatesController extends Controller
$data['estimate'] = $estimate->toArray();
$userId = $data['estimate']['user_id'];
$data['user'] = User::find($userId)->toArray();
$data['company'] = Company::find($estimate->company_id);
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',
@ -310,6 +312,8 @@ class EstimatesController extends Controller
$data['estimate'] = $estimate->toArray();
$userId = $data['estimate']['user_id'];
$data['user'] = User::find($userId)->toArray();
$data['company'] = Company::find($estimate->company_id);
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',

3
app/Http/Controllers/InvoicesController.php
View File

@ -3,6 +3,7 @@ namespace Crater\Http\Controllers;
use Illuminate\Http\Request;
use Crater\CompanySetting;
use Crater\Company;
use Illuminate\Support\Collection;
use Crater\Currency;
use Crater\InvoiceTemplate;
@ -148,6 +149,7 @@ class InvoicesController extends Controller
if ($request->has('invoiceSend')) {
$data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
$data['user'] = User::find($request->user_id)->toArray();
$data['company'] = Company::find($invoice->company_id);
$notificationEmail = CompanySetting::getSetting(
'notification_email',
@ -374,6 +376,7 @@ class InvoicesController extends Controller
$data['invoice'] = $invoice->toArray();
$userId = $data['invoice']['user_id'];
$data['user'] = User::find($userId)->toArray();
$data['company'] = Company::find($invoice->company_id);
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',