diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index b16cd3f7133a..bda1dfc226ad 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -251,6 +251,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$emailSignature'] = &$data['$signature'];
$data['$invoices'] = ['value' => $this->formatInvoices(), 'label' => ctrans('texts.invoices')];
+ $data['$invoice_references_subject'] = ['value' => $this->formatInvoiceReferencesSubject(), 'label' => ctrans('texts.invoices')];
$data['$invoice_references'] = ['value' => $this->formatInvoiceReferences(), 'label' => ctrans('texts.invoices')];
$data['$invoice'] = ['value' => $this->formatInvoice(), 'label' => ctrans('texts.invoices')];
$data['$invoice.po_number'] = ['value' => $this->formatPoNumber(), 'label' => ctrans('texts.po_number')];
@@ -329,6 +330,24 @@ class PaymentEmailEngine extends BaseEmailEngine
return $invoice_list;
}
+ private function formatInvoiceReferencesSubject()
+ {
+ $invoice_list = '';
+
+ foreach ($this->payment->invoices as $invoice) {
+ if (strlen($invoice->po_number) > 1) {
+ $invoice_list .= ctrans('texts.po_number')." {$invoice->po_number}
";
+ }
+
+ $invoice_list .= ctrans('texts.invoice_number_short')." {$invoice->number} " . Number::formatMoney($invoice->pivot->amount, $this->client).', ';
+
+ }
+
+ return $invoice_list;
+
+ }
+
+
private function formatInvoiceReferences()
{
$invoice_list = '
';
diff --git a/app/Services/Scheduler/ScheduleEntity.php b/app/Services/Scheduler/ScheduleEntity.php
index 857198491e8f..b7a93bd8f1e7 100644
--- a/app/Services/Scheduler/ScheduleEntity.php
+++ b/app/Services/Scheduler/ScheduleEntity.php
@@ -24,9 +24,9 @@ class ScheduleEntity
}
public function run()
- {nlog("here");
+ {
$class = 'App\\Models\\' . Str::camel($this->scheduler->parameters['entity']);
- nlog($class);
+
$class::find($this->decodePrimaryKey($this->scheduler->parameters['entity_id']))->service()->sendEmail();
$this->scheduler->forceDelete();