Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #5351 from turbo124/v5-develop

Browse Source 
v5.1.37
This commit is contained in:
David Bomba 2021-04-06 22:41:00 +10:00 committed by GitHub
commit aac6831d15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.36 5.1.37

2
app/Http/Controllers/InvoiceController.php
View File

@ -795,8 +795,6 @@ class InvoiceController extends BaseController
$file_path = $invoice->service()->getInvoicePdf($contact); $file_path = $invoice->service()->getInvoicePdf($contact);
nlog($file_path);
return response()->download($file_path, basename($file_path)); return response()->download($file_path, basename($file_path));
} }

1
app/Models/Company.php
View File

@ -100,7 +100,6 @@ class Company extends BaseModel
'country_id' => 'string', 'country_id' => 'string',
'custom_fields' => 'object', 'custom_fields' => 'object',
'settings' => 'object', 'settings' => 'object',
'custom_fields' => 'object',
'updated_at' => 'timestamp', 'updated_at' => 'timestamp',
'created_at' => 'timestamp', 'created_at' => 'timestamp',
'deleted_at' => 'timestamp', 'deleted_at' => 'timestamp',

4
app/Services/Credit/GetCreditPdf.php
View File

@ -13,6 +13,7 @@ namespace App\Services\Credit;
use App\Jobs\Entity\CreateEntityPdf; use App\Jobs\Entity\CreateEntityPdf;
use App\Services\AbstractService; use App\Services\AbstractService;
use App\Utils\TempFile;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class GetCreditPdf extends AbstractService class GetCreditPdf extends AbstractService
@ -48,6 +49,9 @@ class GetCreditPdf extends AbstractService
$file_path = CreateEntityPdf::dispatchNow($this->invitation); $file_path = CreateEntityPdf::dispatchNow($this->invitation);
} }
if(config('filesystems.default') == 's3')
return TempFile::path(Storage::disk($disk)->url($file_path));
return Storage::disk($disk)->path($file_path); return Storage::disk($disk)->path($file_path);
} }
} }

2
app/Services/PdfMaker/Design.php
View File

@ -499,7 +499,7 @@ class Design extends BaseDesign
} }
} elseif (Str::startsWith($variable, '$custom')) { } elseif (Str::startsWith($variable, '$custom')) {
$field = explode('_', $variable); $field = explode('_', $variable);
$visible = property_exists($this->client->company->custom_fields, $field[1]) && !empty($this->client->company->custom_fields->{$field[1]}); $visible = is_object($this->client->company->custom_fields) && property_exists($this->client->company->custom_fields, $field[1]) && !empty($this->client->company->custom_fields->{$field[1]});
$elements[1]['elements'][] = ['element' => 'div', 'elements' => [ $elements[1]['elements'][] = ['element' => 'div', 'elements' => [
['element' => 'span', 'content' => $variable . '_label', 'properties' => ['hidden' => !$visible, 'data-ref' => 'totals_table-' . substr($variable, 1) . '-label']], ['element' => 'span', 'content' => $variable . '_label', 'properties' => ['hidden' => !$visible, 'data-ref' => 'totals_table-' . substr($variable, 1) . '-label']],

4
app/Services/Quote/GetQuotePdf.php
View File

@ -15,6 +15,7 @@ use App\Jobs\Entity\CreateEntityPdf;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\Quote; use App\Models\Quote;
use App\Services\AbstractService; use App\Services\AbstractService;
use App\Utils\TempFile;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class GetQuotePdf extends AbstractService class GetQuotePdf extends AbstractService
@ -46,6 +47,9 @@ class GetQuotePdf extends AbstractService
$file_path = CreateEntityPdf::dispatchNow($invitation); $file_path = CreateEntityPdf::dispatchNow($invitation);
} }
if(config('filesystems.default') == 's3')
return TempFile::path(Storage::disk($disk)->url($file_path));
return Storage::disk($disk)->path($file_path); return Storage::disk($disk)->path($file_path);
} }
} }

2
config/ninja.php
View File

@ -14,7 +14,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.36', 'app_version' => '5.1.37',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),