From d5ec3427647894fd9bf0c4a0c25ae161f85526a3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 23 Sep 2019 13:22:24 +1000
Subject: [PATCH] Nuances of client contact invitations

---
 app/Models/InvoiceInvitation.php        |  2 +-
 app/Repositories/InvoiceRepository.php  | 17 ++++++++++++++++-
 app/Transformers/InvoiceTransformer.php | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php
index d4a161fcddb3..814c19e71449 100644
--- a/app/Models/InvoiceInvitation.php
+++ b/app/Models/InvoiceInvitation.php
@@ -72,7 +72,7 @@ class InvoiceInvitation extends BaseModel
 
     public function getName()
     {
-
+        return $this->invitation_key;
     }
 
     public function getLink()
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index 4853bb52f4f0..8718d783fb39 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -16,8 +16,10 @@ use App\Events\Invoice\InvoiceWasUpdated;
 use App\Factory\InvoiceInvitationFactory;
 use App\Helpers\Invoice\InvoiceCalc;
 use App\Jobs\Company\UpdateCompanyLedgerWithInvoice;
+use App\Models\ClientContact;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 
@@ -26,7 +28,7 @@ use Illuminate\Support\Carbon;
  */
 class InvoiceRepository extends BaseRepository
 {
-
+    use MakesHash;
     /**
      * Gets the class name.
      *
@@ -57,6 +59,19 @@ class InvoiceRepository extends BaseRepository
 
         $invoice->save();
 
+        if(isset($data['client_contacts']))
+        {
+            foreach($data['client_contacts'] as $contact)
+            {
+                if($contact['send_invoice'] == 1)
+                {
+                    $client_contact = ClientContact::find($this->decodePrimaryKey($contact['id']));
+                    $client_contact->send_invoice = true;
+                    $client_contact->save();
+                }
+            }
+        }
+
         event(new CreateInvoiceInvitation($invoice));
 
         $invoice_calc = new InvoiceCalc($invoice, $invoice->settings);
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index e9b4dedf52d3..7c5f66568142 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -12,6 +12,8 @@
 namespace App\Transformers;
 
 use App\Models\Invoice;
+use App\Models\InvoiceInvitation;
+use App\Transformers\InvoiceInvitationTransformer;
 use App\Utils\Traits\MakesHash;
 
 class InvoiceTransformer extends EntityTransformer
@@ -23,12 +25,18 @@ class InvoiceTransformer extends EntityTransformer
     ];
 
     protected $availableIncludes = [
-    //    'invitations',
+        'invitations',
     //    'payments',
     //    'client',
     //    'documents',
     ];
 
+    public function includeInvitations(Invoice $invoice)
+    {
+        $transformer = new InvoiceInvitationTransformer($this->serializer);
+
+        return $this->includeCollection($invoice->invitations, $transformer, InvoiceInvitation::class);
+    }
 /*
     public function includeInvoiceItems(Invoice $invoice)
     {
@@ -37,12 +45,7 @@ class InvoiceTransformer extends EntityTransformer
         return $this->includeCollection($invoice->invoice_items, $transformer, ENTITY_INVOICE_ITEM);
     }
 
-    public function includeInvitations(Invoice $invoice)
-    {
-        $transformer = new InvitationTransformer($this->account, $this->serializer);
 
-        return $this->includeCollection($invoice->invitations, $transformer, ENTITY_INVITATION);
-    }
 
     public function includePayments(Invoice $invoice)
     {
@@ -112,7 +115,7 @@ class InvoiceTransformer extends EntityTransformer
             'has_expenses' => (bool) $invoice->has_expenses,
             'custom_text_value1' => $invoice->custom_text_value1 ?: '',
             'custom_text_value2' => $invoice->custom_text_value2 ?: '',
-            'line_items' => $invoice->line_items,
+            'line_items' => $invoice->line_items ?: '',
             'backup' => $invoice->backup ?: '',
             'settings' => $invoice->settings,