Merge branch 'brevo-fix' into 'develop'
fix: brevo in (content commit that were missed) See merge request ldc-web/projets/support-web!132
This commit is contained in:
commit
c2b25c3503
3 changed files with 20 additions and 8 deletions
|
|
@ -2,12 +2,24 @@
|
|||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Repositories\EloquentSiteRepository;
|
||||
use App\Repositories\SiteRepository;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Support\Facades\URL;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Override;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
#[Override]
|
||||
public function register()
|
||||
{
|
||||
$this->app->singleton(
|
||||
SiteRepository::class,
|
||||
fn() => new EloquentSiteRepository()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Bootstrap any application services.
|
||||
*
|
||||
|
|
@ -24,7 +36,7 @@ class AppServiceProvider extends ServiceProvider
|
|||
return request()->getClientIp();
|
||||
} else {
|
||||
return request()->server('HTTP_X_FORWARDED_FOR') ??
|
||||
request()->getClientIp();
|
||||
request()->getClientIp();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,6 @@ class EventServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function shouldDiscoverEvents(): bool
|
||||
{
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
<p>Bonjour,</p>
|
||||
<p>Un nouveau ticket (n°{{ $ticketId }}) a été créé sur le support :</p>
|
||||
<ul>
|
||||
<li>Projet : {{ $siteName }}</li>
|
||||
<li>Titre : {{ $ticketTitle }}</li>
|
||||
<li>Type : {{ $ticketType->label() }}</li>
|
||||
<li>Créé par : {{ $userName }}</li>
|
||||
<li>Projet : {{ $siteName }}</li>
|
||||
<li>Titre : {{ $ticketTitle }}</li>
|
||||
<li>Type : {{ $ticketType->label() }}</li>
|
||||
<li>Créé par : {{ $userName }}</li>
|
||||
</ul>
|
||||
<p>
|
||||
Description :<br>
|
||||
{!! clean(nl2br($ticket->text)) !!}
|
||||
Description :<br>
|
||||
{!! clean(nl2br($ticketDescription)) !!}
|
||||
</p>
|
||||
<p>Lien vers le ticket : <a href="{{ route('bo.ticket.show', $ticketId) }}" traget="_blank">Ouvrir dans un nouvel onglet</a></p>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue