From b88ea8aa2c85bd7d6f7deb53a64f7d64ec7e63d6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 19 Mar 2019 07:38:13 +0200 Subject: [PATCH] Remove fix for duplicate invitations --- app/Ninja/Repositories/InvoiceRepository.php | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index 33226433d66f..f108fe96bd47 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -821,24 +821,15 @@ class InvoiceRepository extends BaseRepository } foreach ($client->contacts as $contact) { - $invitations = Invitation::scope()->whereContactId($contact->id)->whereInvoiceId($invoice->id)->orderBy('id')->get(); - - if ($invitations->count() == 0) { - if (in_array($contact->id, $sendInvoiceIds)) { - $invitation = Invitation::createNew($invoice); - $invitation->invoice_id = $invoice->id; - $invitation->contact_id = $contact->id; - $invitation->invitation_key = strtolower(str_random(RANDOM_KEY_LENGTH)); - $invitation->save(); - } - } else { - $isFirst = true; - foreach ($invitations as $invitation) { - if (! in_array($contact->id, $sendInvoiceIds) || !$isFirst) { - $invitation->delete(); - } - $isFirst = false; - } + $invitation = Invitation::scope()->whereContactId($contact->id)->whereInvoiceId($invoice->id)->first(); + if (in_array($contact->id, $sendInvoiceIds) && ! $invitation) { + $invitation = Invitation::createNew($invoice); + $invitation->invoice_id = $invoice->id; + $invitation->contact_id = $contact->id; + $invitation->invitation_key = strtolower(str_random(RANDOM_KEY_LENGTH)); + $invitation->save(); + } elseif (! in_array($contact->id, $sendInvoiceIds) && $invitation) { + $invitation->delete(); } }