shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Notification class to DocumentReminded event

Browse Source
This commit is contained in:
Burak Çakırel 2020-12-25 22:30:59 +03:00
parent 2d023873cc
commit ec7511a8bc
No known key found for this signature in database
GPG Key ID: 48FFBB7771B99C7C
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/BillReminder.php
View File

@ -5,6 +5,7 @@ namespace App\Console\Commands;
use App\Events\Document\DocumentReminded;
use App\Models\Common\Company;
use App\Models\Document\Document;
use App\Notifications\Purchase\Bill as Notification;
use App\Utilities\Overrider;
use Date;
use Illuminate\Console\Command;
@ -84,7 +85,7 @@ class BillReminder extends Command
foreach ($bills as $bill) {
try {
event(new DocumentReminded($bill));
event(new DocumentReminded($bill, Notification::class));
} catch (\Exception | \Throwable | \Swift_RfcComplianceException | \Illuminate\Database\QueryException $e) {
$this->error($e->getMessage());

3
app/Console/Commands/InvoiceReminder.php
View File

@ -5,6 +5,7 @@ namespace App\Console\Commands;
use App\Events\Document\DocumentReminded;
use App\Models\Common\Company;
use App\Models\Document\Document;
use App\Notifications\Sale\Invoice as Notification;
use App\Utilities\Overrider;
use Date;
use Illuminate\Console\Command;
@ -84,7 +85,7 @@ class InvoiceReminder extends Command
foreach ($invoices as $invoice) {
try {
event(new DocumentReminded($invoice));
event(new DocumentReminded($invoice, Notification::class));
} catch (\Exception | \Throwable | \Swift_RfcComplianceException | \Illuminate\Database\QueryException $e) {
$this->error($e->getMessage());

6
app/Events/Document/DocumentReminded.php
View File

@ -3,18 +3,22 @@
namespace App\Events\Document;
use App\Abstracts\Event;
use App\Models\Document\Document;
class DocumentReminded extends Event
{
public $document;
public $notification;
/**
* Create a new event instance.
*
* @param $document
* @param $notification
*/
public function __construct($document)
public function __construct(Document $document, string $notification)
{
$this->document = $document;
$this->notification = $notification;
}
}

9
app/Listeners/Document/SendDocumentReminderNotification.php
View File

@ -3,9 +3,6 @@
namespace App\Listeners\Document;
use App\Events\Document\DocumentReminded as Event;
use App\Models\Document\Document;
use App\Notifications\Sale\Invoice as InvoiceNotification;
use App\Notifications\Purchase\Bill as BillNotification;
class SendDocumentReminderNotification
{
@ -18,11 +15,7 @@ class SendDocumentReminderNotification
public function handle(Event $event)
{
$document = $event->document;
$notification = InvoiceNotification::class;
if ($document->type === Document::BILL_TYPE) {
$notification = BillNotification::class;
}
$notification = $event->notification;
// Notify the customer
if ($document->contact && !empty($document->contact_email)) {

6
modules/BC21/Events/Purchase/BillReminded.php
View File

@ -3,6 +3,8 @@
namespace App\Events\Purchase;
use App\Events\Document\DocumentReminded;
use App\Models\Document\Document;
use App\Notifications\Purchase\Bill as Notification;
/**
* @deprecated
@ -10,4 +12,8 @@ use App\Events\Document\DocumentReminded;
*/
class BillReminded extends DocumentReminded
{
public function __construct(Document $document)
{
parent::__construct($document, Notification::class);
}
}

6
modules/BC21/Events/Sale/InvoiceReminded.php
View File

@ -3,6 +3,8 @@
namespace App\Events\Sale;
use App\Events\Document\DocumentReminded;
use App\Models\Document\Document;
use App\Notifications\Sale\Invoice as Notification;
/**
* @deprecated
@ -10,4 +12,8 @@ use App\Events\Document\DocumentReminded;
*/
class InvoiceReminded extends DocumentReminded
{
public function __construct(Document $document)
{
parent::__construct($document, Notification::class);
}
}