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

Fixes for bulk emailing quotes

Browse Source
This commit is contained in:
David Bomba 2020-08-19 12:55:58 +10:00
parent 7b2e60a0d5
commit b2d5a8b070
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Quote/EmailQuote.php
View File

@ -60,7 +60,7 @@ class EmailQuote implements ShouldQueue
return $this->logMailError(Mail::failures()); return $this->logMailError(Mail::failures());
} }
$this->quote_invitation->quote->markSent()->save(); $this->quote_invitation->quote->service()->markSent()->save();
} }

4
app/Services/Quote/SendEmail.php
View File

@ -39,7 +39,7 @@ class SendEmail
* @param string $this->reminder_template The template name ie reminder1 * @param string $this->reminder_template The template name ie reminder1
* @return array * @return array
*/ */
public function run(): array public function run()
{ {
if (!$this->reminder_template) { if (!$this->reminder_template) {
$this->reminder_template = $this->quote->calculateTemplate(); $this->reminder_template = $this->quote->calculateTemplate();
@ -52,5 +52,7 @@ class SendEmail
EmailQuote::dispatchNow($email_builder, $invitation); EmailQuote::dispatchNow($email_builder, $invitation);
} }
}); });
$this->quote->service()->markSent();
} }
} }

1
app/Transformers/InvoiceHistoryTransformer.php
View File

@ -35,6 +35,7 @@ class InvoiceHistoryTransformer extends EntityTransformer
'activity_id' => $this->encodePrimaryKey($backup->activity_id), 'activity_id' => $this->encodePrimaryKey($backup->activity_id),
'json_backup' => (string) $backup->json_backup ?: '', 'json_backup' => (string) $backup->json_backup ?: '',
'html_backup' => (string) $backup->html_backup ?: '', 'html_backup' => (string) $backup->html_backup ?: '',
'amount' => (float) $backup->amount,
'created_at' => (int)$backup->created_at, 'created_at' => (int)$backup->created_at,
'updated_at' => (int)$backup->updated_at, 'updated_at' => (int)$backup->updated_at,
]; ];