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

invoice and bill reminding is moved console command to listeners

Browse Source
This commit is contained in:
Sevan Nerse
2020-04-15 11:27:58 +03:00
parent 981c825213
commit 4c988cb373
7 changed files with 120 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
use App\Models\Common\Company;
use App\Models\Purchase\Bill;
use App\Notifications\Purchase\Bill as Notification;
use App\Utilities\Overrider;
use Date;
use Illuminate\Console\Command;
@@ -60,7 +59,7 @@ class BillReminder extends Command
foreach ($days as $day) {
$day = (int) trim($day);
$this->remind($day, $company);
$this->remind($day);
}
}
@@ -69,7 +68,7 @@ class BillReminder extends Command
setting()->forgetAll();
}
protected function remind($day, $company)
protected function remind($day)
{
// Get due date
$date = Date::today()->addDays($day)->toDateString();
@@ -78,14 +77,8 @@ class BillReminder extends Command
$bills = Bill::with('contact')->accrued()->notPaid()->due($date)->cursor();
foreach ($bills as $bill) {
// Notify all users assigned to this company
foreach ($company->users as $user) {
if (!$user->can('read-notifications')) {
continue;
}
$user->notify(new Notification($bill, 'bill_remind_admin'));
}
event(new \App\Events\Purchase\BillReminding($bill));
}
}
}

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

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
use App\Models\Common\Company;
use App\Models\Sale\Invoice;
use App\Notifications\Sale\Invoice as Notification;
use App\Utilities\Overrider;
use Date;
use Illuminate\Console\Command;
@@ -60,7 +59,7 @@ class InvoiceReminder extends Command
foreach ($days as $day) {
$day = (int) trim($day);
$this->remind($day, $company);
$this->remind($day);
}
}
@@ -69,7 +68,7 @@ class InvoiceReminder extends Command
setting()->forgetAll();
}
protected function remind($day, $company)
protected function remind($day)
{
// Get due date
$date = Date::today()->subDays($day)->toDateString();
@@ -78,19 +77,7 @@ class InvoiceReminder extends Command
$invoices = Invoice::with('contact')->accrued()->notPaid()->due($date)->cursor();
foreach ($invoices as $invoice) {
// Notify the customer
if ($invoice->contact && !empty($invoice->contact_email)) {
$invoice->contact->notify(new Notification($invoice, 'invoice_remind_customer'));
}
// Notify all users assigned to this company
foreach ($company->users as $user) {
if (!$user->can('read-notifications')) {
continue;
}
$user->notify(new Notification($invoice, 'invoice_remind_admin'));
}
event(new \App\Events\Sale\InvoiceReminding($invoice));
}
}
}