fix translation issues & formatting

This commit is contained in:
Mohit Panjwani
2020-12-09 11:36:14 +05:30
parent c9086747a3
commit 034c7e385c
16 changed files with 1257 additions and 89 deletions

View File

@ -430,8 +430,8 @@ class Estimate extends Model implements HasMedia
$company = Company::find($this->company_id);
$logo = $company->getMedia('logo')->first();
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
$logo = $logo->getPath();

View File

@ -514,7 +514,7 @@ class Invoice extends Model implements HasMedia
$logo = $company->getMedia('logo')->first();
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
@ -533,6 +533,7 @@ class Invoice extends Model implements HasMedia
'labels' => $labels,
'taxes' => $taxes
]);
return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view);
}

View File

@ -375,7 +375,7 @@ class Payment extends Model implements HasMedia
$logo = $company->getMedia('logo')->first();
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem() ;
$isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
$isLocalhost = config('session.domain') === 'localhost';
if ($logo && $isLocalhost && $isSystem) {
@ -384,7 +384,6 @@ class Payment extends Model implements HasMedia
$logo = $logo->getFullUrl();
}
view()->share([
'payment' => $this,
'company_address' => $this->getCompanyAddress(),