Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactoring emails

Browse Source
This commit is contained in:
David Bomba 2021-02-14 22:09:32 +11:00
parent 6fd5d436c7
commit 4bfff15612
4 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Mail/NinjaMailer.php
View File

@ -9,7 +9,7 @@
* @license https://opensource.org/licenses/AAL * @license https://opensource.org/licenses/AAL
*/ */
namespace App\Mail; namespace App\Jobs\Mail;
use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailable;

2
app/Jobs/Mail/PaymentFailureMailer.php
View File

@ -91,7 +91,7 @@ class PaymentFailureMailer extends BaseMailerJob implements ShouldQueue
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new NinjaMailer($mail_obj); $nmo->mailable = new NinjaMailer($mail_obj);
$nmo->company = $this->companyl; $nmo->company = $this->company;
$nmo->to_user = $company_user->user; $nmo->to_user = $company_user->user;
$nmo->settings = $this->settings; $nmo->settings = $this->settings;

15
app/Listeners/SendVerificationNotification.php
View File

@ -11,7 +11,11 @@
namespace App\Listeners; namespace App\Listeners;
use App\Jobs\Mail\NinjaMailer;
use App\Jobs\Mail\NinjaMailerJob;
use App\Jobs\Mail\NinjaMailerObject;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Mail\Admin\VerifyUserObject;
use App\Notifications\Ninja\VerifyUser; use App\Notifications\Ninja\VerifyUser;
use App\Utils\Ninja; use App\Utils\Ninja;
use Exception; use Exception;
@ -45,7 +49,16 @@ class SendVerificationNotification implements ShouldQueue
MultiDB::setDB($event->company->db); MultiDB::setDB($event->company->db);
try { try {
$event->user->notify(new VerifyUser($event->user, $event->company));
$nmo = new NinjaMailerObject;
$nmo->mailable = new NinjaMailer(new VerifyUserObject($event->user, $event->company));
$nmo->company = $event->company;
$nmo->to_user = $event->user;
$nmo->settings = $event->company->settings;
NinjaMailerJob::dispatch($nmo);
// $event->user->notify(new VerifyUser($event->user, $event->company));
Ninja::registerNinjaUser($event->user); Ninja::registerNinjaUser($event->user);
} catch (Exception $e) { } catch (Exception $e) {

56
app/Mail/Admin/VerifyUserObject.php Normal file
View File

@ -0,0 +1,56 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Mail\Admin;
use App\Utils\Traits\MakesHash;
class VerifyUserObject
{
use MakesHash;
public $user;
public $company;
/**
*
*/
public function __construct($user, $company)
{
$this->user = $user;
$this->company = $company;
}
public function build()
{
$this->user->confirmation_code = $this->createDbHash($this->company->db);
$this->user->save();
$data = [
'title' => ctrans('texts.confirmation_subject'),
'message' => ctrans('texts.confirmation_message'),
'url' => url("/user/confirm/{$this->user->confirmation_code}"),
'button' => ctrans('texts.button_confirmation_message'),
'settings' => $this->company->settings,
];
$mail_obj = new \stdClass;
$mail_obj->subject = ctrans('texts.confirmation_subject');
$mail_obj->data = $data;
$mail_obj->markdown = 'email.admin.generic';
$mail_obj->tag = $this->company->company_key;
return $mail_obj;
}
}