tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7961 from turbo124/v5-develop

Browse source 
Escape variables in custom email designs
This commit is contained in:
David Bomba 2022-11-21 08:29:14 +11:00 • committed by GitHub
commit 58c697e36d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View file

@ -108,6 +108,8 @@ class UpdateCompanyRequest extends Request
}
}
$settings['email_style_custom'] = str_replace("{{", "", $settings['email_style_custom']);
if (! $account->isFreeHostedClient()) {
return $settings;
}

7
app/Listeners/Invoice/InvoiceEmailFailedActivity.php
View file

@ -14,18 +14,13 @@ namespace App\Listeners\Invoice;
use App\Libraries\MultiDB;
use App\Models\Activity;
use App\Repositories\ActivityRepository;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use stdClass;
class InvoiceEmailFailedActivity implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $delay = 10;
// public $delay = 10;
protected $activity_repo;