From de485129088d1c90da464983e04379005f80375f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 30 Oct 2020 08:43:23 +1100
Subject: [PATCH] Activity record when quote is approved

---
 app/Events/Quote/QuoteWasViewed.php                        | 1 +
 app/Http/Controllers/ClientPortal/InvitationController.php | 2 ++
 app/Listeners/Quote/QuoteApprovedActivity.php              | 6 +++---
 app/Providers/EventServiceProvider.php                     | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Events/Quote/QuoteWasViewed.php b/app/Events/Quote/QuoteWasViewed.php
index 80452990837c..5a4adff1b3f8 100644
--- a/app/Events/Quote/QuoteWasViewed.php
+++ b/app/Events/Quote/QuoteWasViewed.php
@@ -12,6 +12,7 @@
 namespace App\Events\Quote;
 
 use App\Models\Company;
+use App\Models\QuoteInvitation;
 use Illuminate\Queue\SerializesModels;
 
 /**
diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index d09befc71655..4a1e29c45ffd 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -17,6 +17,8 @@ use App\Events\Misc\InvitationWasViewed;
 use App\Events\Quote\QuoteWasViewed;
 use App\Http\Controllers\Controller;
 use App\Models\InvoiceInvitation;
+use App\Models\QuoteInvitation;
+use App\Models\CreditInvitation;
 use App\Models\RecurringInvoiceInvitation;
 use App\Utils\Ninja;
 use App\Utils\Traits\MakesDates;
diff --git a/app/Listeners/Quote/QuoteApprovedActivity.php b/app/Listeners/Quote/QuoteApprovedActivity.php
index a63e4886bc25..0da7c13b0222 100644
--- a/app/Listeners/Quote/QuoteApprovedActivity.php
+++ b/app/Listeners/Quote/QuoteApprovedActivity.php
@@ -52,9 +52,9 @@ class QuoteApprovedActivity implements ShouldQueue
         $fields->client_id = $event->quote->client_id;
         $fields->user_id = $event->quote->user_id;
         $fields->client_contact_id = $event->contact->id;
-        $fields->company_id = $event->payment->company_id;
-        $fields->activity_type_id = Activity::RESTORE_PAYMENT;
+        $fields->company_id = $event->quote->company_id;
+        $fields->activity_type_id = Activity::APPROVE_QUOTE;
 
-        $this->activity_repo->save($fields, $event->payment, $event->event_vars);
+        $this->activity_repo->save($fields, $event->quote, $event->event_vars);
     }
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 75ff36321ea5..40bfe5214a59 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -87,8 +87,8 @@ use App\Listeners\Invoice\InvoiceArchivedActivity;
 use App\Listeners\Invoice\InvoiceCancelledActivity;
 use App\Listeners\Invoice\InvoiceDeletedActivity;
 use App\Listeners\Invoice\InvoiceEmailActivity;
-use App\Listeners\Invoice\InvoiceEmailedNotification;
 use App\Listeners\Invoice\InvoiceEmailFailedActivity;
+use App\Listeners\Invoice\InvoiceEmailedNotification;
 use App\Listeners\Invoice\InvoicePaidActivity;
 use App\Listeners\Invoice\InvoiceRestoredActivity;
 use App\Listeners\Invoice\InvoiceReversedActivity;
@@ -98,6 +98,7 @@ use App\Listeners\Invoice\UpdateInvoiceInvitations;
 use App\Listeners\Misc\InvitationViewedListener;
 use App\Listeners\Payment\PaymentNotification;
 use App\Listeners\Payment\PaymentRestoredActivity;
+use App\Listeners\Quote\QuoteApprovedActivity;
 use App\Listeners\Quote\QuoteArchivedActivity;
 use App\Listeners\Quote\QuoteDeletedActivity;
 use App\Listeners\Quote\QuoteEmailActivity;
@@ -262,6 +263,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         QuoteWasApproved::class => [
             ReachWorkflowSettings::class,
+            QuoteApprovedActivity::class,
         ],
         QuoteWasCreated::class => [
             CreatedQuoteActivity::class,