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

Fixes for testS

Browse Source
This commit is contained in:
David Bomba 2021-10-08 16:23:00 +11:00
parent e6be94ad22
commit d93928ffbe
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/ActivityRepository.php
View File

@ -73,7 +73,6 @@ class ActivityRepository extends BaseRepository
if ($entity instanceof User || $entity->company->is_disabled) if ($entity instanceof User || $entity->company->is_disabled)
return; return;
$entity->load('company', 'client');
$backup = new Backup(); $backup = new Backup();
@ -82,6 +81,7 @@ class ActivityRepository extends BaseRepository
|| get_class($entity) == Credit::class || get_class($entity) == Credit::class
|| get_class($entity) == RecurringInvoice::class || get_class($entity) == RecurringInvoice::class
) { ) {
$entity->load('company', 'client');
$contact = $entity->client->primary_contact()->first(); $contact = $entity->client->primary_contact()->first();
$backup->html_backup = $this->generateHtml($entity); $backup->html_backup = $this->generateHtml($entity);
$backup->amount = $entity->amount; $backup->amount = $entity->amount;

2
app/Services/Invoice/InvoiceService.php
View File

@ -322,6 +322,8 @@ class InvoiceService
public function deletePdf() public function deletePdf()
{ {
$this->invoice->load('invitations');
$this->invoice->invitations->each(function ($invitation){ $this->invoice->invitations->each(function ($invitation){
Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf'); Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');

2
app/Services/Payment/SendEmail.php
View File

@ -32,6 +32,8 @@ class SendEmail
*/ */
public function run() public function run()
{ {
$this->payment->load('company', 'client.contacts');
$this->payment->client->contacts->each(function ($contact) { $this->payment->client->contacts->each(function ($contact) {
if ($contact->email) { if ($contact->email) {
EmailPayment::dispatchNow($this->payment, $this->payment->company, $contact); EmailPayment::dispatchNow($this->payment, $this->payment->company, $contact);