Merge pull request #8483 from turbo124/v5-develop

v5.5.112
This commit is contained in:
David Bomba 2023-04-28 17:16:38 +10:00 committed by GitHub
commit 83d6bdc4f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 6 deletions

View File

@ -1 +1 @@
5.5.111
5.5.112

View File

@ -154,9 +154,12 @@ class TemplateEmail extends Mailable
}
}
if ($this->invitation && $this->invitation->invoice && $this->invitation->invoice->client->getSetting('enable_e_invoice') && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
$this->invitation->invoice->service()->getEInvoice($this->invitation->contact);
$disk = config('filesystems.default');
$this->attach(Storage::disk($disk)->path($this->invitation->invoice->client->xinvoice_filepath($this->invitation->invoice->invitations->first()) . $this->invitation->invoice->getFileName("xml")));
$xinvoice_filepath = $this->invitation->invoice->service()->getEInvoice($this->invitation->contact);
if(Storage::disk(config('filesystems.default'))->exists($xinvoice_filepath))
$this->attach(Storage::disk(config('filesystems.default'))->path($xinvoice_filepath), ['as' => $this->invitation->invoice->getFileName("xml"), 'mime' => null]);
}
return $this;

View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.5.111',
'app_tag' => '5.5.111',
'app_version' => '5.5.112',
'app_tag' => '5.5.112',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),