diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php index ba83e7ecba92..f500accc6db4 100644 --- a/app/Console/Commands/CreateSingleAccount.php +++ b/app/Console/Commands/CreateSingleAccount.php @@ -340,10 +340,6 @@ class CreateSingleAccount extends Command $this->invoice_repo->markSent($invoice); - // if (rand(0, 1)) { - // $invoice = $invoice->service()->markPaid()->save(); - // } - //@todo this slow things down, but gives us PDFs of the invoices for inspection whilst debugging. event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars())); } diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 2dab5b2dd4cd..6b1172ebf1df 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -516,7 +516,7 @@ class CreateTestData extends Command if (rand(0, 1)) { $invoice = $invoice->service()->markPaid()->save(); } - //@todo this slow things down, but gives us PDFs of the invoices for inspection whilst debugging. + event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars())); } diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php index 8e5c3881d420..dae42b242547 100644 --- a/app/Console/Commands/DemoMode.php +++ b/app/Console/Commands/DemoMode.php @@ -431,7 +431,7 @@ class DemoMode extends Command $payment->save(); }); } - //@todo this slow things down, but gives us PDFs of the invoices for inspection whilst debugging. + event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars())); } diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php index 0a6a2511f6c2..99fcc8dbdf75 100644 --- a/app/Console/Commands/SendTestEmails.php +++ b/app/Console/Commands/SendTestEmails.php @@ -17,7 +17,6 @@ use App\Factory\ClientFactory; use App\Factory\CompanyUserFactory; use App\Factory\InvoiceFactory; use App\Factory\InvoiceInvitationFactory; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Invoice\CreateEntityPdf; use App\Mail\TemplateEmail; use App\Models\Account; @@ -155,7 +154,6 @@ class SendTestEmails extends Command $cc_emails = [config('ninja.testvars.test_email')]; $bcc_emails = [config('ninja.testvars.test_email')]; - $email_builder = (new InvoiceEmail())->build($ii, 'invoice'); $email_builder->setFooter($message['footer']) ->setSubject($message['subject']) @@ -165,6 +163,6 @@ class SendTestEmails extends Command ->cc($cc_emails) ->bcc($bcc_emails) //->replyTo(also_available_if_needed) - ->send(new TemplateEmail($email_builder, $user, $client)); + //->send(new TemplateEmail($email_builder, $user, $client)); } } diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php index b390da78a53d..1c87ddc47318 100644 --- a/app/Filters/CreditFilters.php +++ b/app/Filters/CreditFilters.php @@ -25,7 +25,6 @@ class CreditFilters extends QueryFilters * Filter based on client status. * * Statuses we need to handle - * //todo ?partials as a status? * - all * - paid * - unpaid diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php index 320e889079ed..522b048631e9 100644 --- a/app/Filters/InvoiceFilters.php +++ b/app/Filters/InvoiceFilters.php @@ -26,7 +26,6 @@ class InvoiceFilters extends QueryFilters * Filter based on client status. * * Statuses we need to handle - * //todo ?partials as a status? * - all * - paid * - unpaid diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index d768bf1cf33f..6edfb8f0821a 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -11,7 +11,6 @@ namespace App\Http\Controllers; -use App\Helpers\Email\InvoiceEmail; use App\Http\Requests\Email\SendEmailRequest; use App\Jobs\Entity\EmailEntity; use App\Jobs\Invoice\EmailInvoice; diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index bfecb4de8b0d..f740bd5c5b1a 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -20,7 +20,6 @@ use App\Factory\CloneInvoiceFactory; use App\Factory\CloneInvoiceToQuoteFactory; use App\Factory\InvoiceFactory; use App\Filters\InvoiceFilters; -use App\Helpers\Email\InvoiceEmail; use App\Http\Requests\Invoice\ActionInvoiceRequest; use App\Http\Requests\Invoice\CreateInvoiceRequest; use App\Http\Requests\Invoice\DestroyInvoiceRequest; @@ -723,8 +722,6 @@ class InvoiceController extends BaseController $invoice->service()->touchReminder($this->reminder_template)->save(); $invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($invoice) { - $email_builder = (new InvoiceEmail())->build($invitation, $this->reminder_template); - EmailEntity::dispatch($invitation, $invoice->company, $this->reminder_template); }); diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php index fcb449c201b2..a4a55b708f8d 100644 --- a/app/Jobs/Entity/EmailEntity.php +++ b/app/Jobs/Entity/EmailEntity.php @@ -14,7 +14,6 @@ namespace App\Jobs\Entity; use App\DataMapper\Analytics\EmailInvoiceFailure; use App\Events\Invoice\InvoiceWasEmailed; use App\Events\Invoice\InvoiceWasEmailedAndFailed; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Mail\BaseMailerJob; use App\Jobs\Utils\SystemLogger; use App\Libraries\MultiDB; diff --git a/app/Jobs/Ninja/AdjustEmailQuota.php b/app/Jobs/Ninja/AdjustEmailQuota.php index 1fecd1bbdd01..68f92ee97920 100644 --- a/app/Jobs/Ninja/AdjustEmailQuota.php +++ b/app/Jobs/Ninja/AdjustEmailQuota.php @@ -11,7 +11,6 @@ namespace App\Jobs\Ninja; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; use App\Models\Account; diff --git a/app/Jobs/Ninja/CheckDbStatus.php b/app/Jobs/Ninja/CheckDbStatus.php index a573cff8c219..b5302fe79e6e 100644 --- a/app/Jobs/Ninja/CheckDbStatus.php +++ b/app/Jobs/Ninja/CheckDbStatus.php @@ -11,7 +11,6 @@ namespace App\Jobs\Ninja; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; use App\Models\Account; diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php index b64404707d04..8adaec609548 100644 --- a/app/Jobs/Ninja/CompanySizeCheck.php +++ b/app/Jobs/Ninja/CompanySizeCheck.php @@ -11,7 +11,6 @@ namespace App\Jobs\Ninja; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; use App\Models\Account; diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 574a24ea3ebe..56d155479b4c 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -14,7 +14,6 @@ namespace App\Jobs\RecurringInvoice; use App\DataMapper\Analytics\SendRecurringFailure; use App\Events\Invoice\InvoiceWasEmailed; use App\Factory\RecurringInvoiceToInvoiceFactory; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Entity\EmailEntity; use App\Models\Invoice; use App\Models\RecurringInvoice; @@ -74,8 +73,6 @@ class SendRecurring implements ShouldQueue $invoice->invitations->each(function ($invitation) use ($invoice) { - $email_builder = (new InvoiceEmail())->build($invitation); - if($invitation->contact && strlen($invitation->contact->email) >=1){ EmailEntity::dispatch($invitation, $invoice->company); info("Firing email for invoice {$invoice->number}"); diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php index a49d560f90c8..301929ddb0d6 100644 --- a/app/Jobs/Util/ReminderJob.php +++ b/app/Jobs/Util/ReminderJob.php @@ -69,11 +69,9 @@ class ReminderJob implements ShouldQueue $reminder_template = $invoice->calculateTemplate('invoice'); $invoice->service()->touchReminder($this->reminder_template)->save(); - $invoice->invitations->each(function ($invitation) use ($invoice) { - $email_builder = (new InvoiceEmail())->build($invitation); - - EmailInvoice::dispatch($email_builder, $invitation, $invoice->company); + $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) { + EmailEntity::dispatch($invitation, $invitation->company, $reminder_template); info("Firing email for invoice {$invoice->number}"); }); diff --git a/app/Jobs/Util/SendFailedEmails.php b/app/Jobs/Util/SendFailedEmails.php index 35973ac60ba6..2e04c5d80b97 100644 --- a/app/Jobs/Util/SendFailedEmails.php +++ b/app/Jobs/Util/SendFailedEmails.php @@ -13,7 +13,6 @@ namespace App\Jobs\Util; use App\Helpers\Email\InvoiceEmail; use App\Jobs\Entity\EmailEntity; -use App\Jobs\Invoice\EmailInvoice; use App\Libraries\MultiDB; use App\Models\SystemLog; use Illuminate\Bus\Queueable; @@ -66,7 +65,6 @@ class SendFailedEmails implements ShouldQueue $invitation = $job_meta_array['entity_name']::where('key', $job_meta_array['invitation_key'])->with('contact')->first(); if ($invitation->invoice) { - $email_builder = (new InvoiceEmail())->build($invitation, $job_meta_array['reminder_template']); if ($invitation->contact->send_email && $invitation->contact->email) { EmailEntity::dispatch($invitation, $invitation->company, $job_meta_array['reminder_template']); diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php index 4adfe2df064c..3a455925f846 100644 --- a/app/Mail/Engine/InvoiceEmailEngine.php +++ b/app/Mail/Engine/InvoiceEmailEngine.php @@ -47,11 +47,9 @@ class InvoiceEmailEngine extends BaseEmailEngine elseif(strlen($this->client->getSetting('email_template_'.$this->reminder_template)) > 0) $body_template = $this->client->getSetting('email_template_'.$this->reminder_template); else{ - //$body_template = $this->client->getSetting('email_template_'.$this->reminder_template); $body_template = EmailTemplateDefaults::getDefaultTemplate('email_template_'.$this->reminder_template, $this->client->locale()); } - /* Use default translations if a custom message has not been set*/ if (iconv_strlen($body_template) == 0) { $body_template = trans( diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php index a69bf12c3511..4436a5e419bb 100644 --- a/app/Services/Invoice/SendEmail.php +++ b/app/Services/Invoice/SendEmail.php @@ -11,7 +11,6 @@ namespace App\Services\Invoice; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Entity\EmailEntity; use App\Models\ClientContact; use App\Models\Invoice; @@ -46,8 +45,6 @@ class SendEmail extends AbstractService } $this->invoice->invitations->each(function ($invitation) { - $email_builder = (new InvoiceEmail())->build($invitation, $this->reminder_template); - if ($invitation->contact->send_email && $invitation->contact->email) { EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template); diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php index c110c2492cff..caa5a5e17314 100644 --- a/app/Services/Invoice/TriggeredActions.php +++ b/app/Services/Invoice/TriggeredActions.php @@ -14,7 +14,6 @@ namespace App\Services\Invoice; use App\Events\Invoice\InvoiceWasEmailed; use App\Events\Payment\PaymentWasCreated; use App\Factory\PaymentFactory; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Invoice\EmailEntity; use App\Models\Client; use App\Models\Invoice; diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php index 10c1ab7e00bc..06e8d33d8058 100644 --- a/tests/Feature/InvoiceEmailTest.php +++ b/tests/Feature/InvoiceEmailTest.php @@ -10,7 +10,6 @@ */ namespace Tests\Feature; -use App\Helpers\Email\InvoiceEmail; use App\Jobs\Entity\EmailEntity; use App\Mail\TemplateEmail; use App\Models\ClientContact;