From 0426b6c9416fd6402eb4d4191e6d2ed3f9e3b41d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 16 Apr 2021 07:58:34 +1000
Subject: [PATCH] Add payment notification on manual payment creation

---
 app/Http/Controllers/PaymentController.php    | 20 ++++++++++++++----
 .../Company/CreateCompanyTaskStatuses.php     |  8 +++----
 app/Models/Webhook.php                        | 21 +++++++++++++++++--
 app/Repositories/PaymentRepository.php        |  6 +++++-
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 82224dd1a383..c1463151d9aa 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -592,7 +592,7 @@ class PaymentController extends BaseController
              $this->payment_repo->restore($payment);
                 
                 if (! $bulk) {
-                    return $this->listResponse($payment);
+                    return $this->itemResponse($payment);
                 }
 
                 break;
@@ -600,7 +600,7 @@ class PaymentController extends BaseController
              $this->payment_repo->archive($payment);
                 
                 if (! $bulk) {
-                    return $this->listResponse($payment);
+                    return $this->itemResponse($payment);
                 }
                 // code...
                 break;
@@ -608,14 +608,26 @@ class PaymentController extends BaseController
              $this->payment_repo->delete($payment);
                 
                 if (! $bulk) {
-                    return $this->listResponse($payment);
+                    return $this->itemResponse($payment);
                 }
                 // code...
                 break;
             case 'email':
                 //dispatch email to queue
-                break;
+                $this->payment->service()->sendEmail();
 
+                if (! $bulk) {
+                    return $this->itemResponse($payment);
+                }
+                break;
+            case 'email_receipt':
+                $this->payment->service()->sendEmail();
+
+                if (! $bulk) {
+                    return $this->itemResponse($payment);
+                }
+                break;
+            
             default:
                 // code...
                 break;
diff --git a/app/Jobs/Company/CreateCompanyTaskStatuses.php b/app/Jobs/Company/CreateCompanyTaskStatuses.php
index 3eec3f7203bd..99ec5658855d 100644
--- a/app/Jobs/Company/CreateCompanyTaskStatuses.php
+++ b/app/Jobs/Company/CreateCompanyTaskStatuses.php
@@ -45,10 +45,10 @@ class CreateCompanyTaskStatuses
     public function handle()
     {
         $task_statuses = [
-            ['name' => ctrans('texts.backlog'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
-            ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
-            ['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
-            ['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now()],
+            ['name' => ctrans('texts.backlog'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 1],
+            ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2],
+            ['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 3],
+            ['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 4],
 
         ];
 
diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php
index 1372bf03e92c..c6adaa44139b 100644
--- a/app/Models/Webhook.php
+++ b/app/Models/Webhook.php
@@ -45,12 +45,29 @@ class Webhook extends BaseModel
     
     public static $valid_events = [
         self::EVENT_CREATE_CLIENT,
-        self::EVENT_CREATE_PAYMENT,
-        self::EVENT_CREATE_QUOTE,
         self::EVENT_CREATE_INVOICE,
+        self::EVENT_CREATE_QUOTE,
+        self::EVENT_CREATE_PAYMENT,
         self::EVENT_CREATE_VENDOR,
+        self::EVENT_UPDATE_QUOTE,
+        self::EVENT_DELETE_QUOTE,
+        self::EVENT_UPDATE_INVOICE,
+        self::EVENT_DELETE_INVOICE,
+        self::EVENT_UPDATE_CLIENT,
+        self::EVENT_DELETE_CLIENT,
+        self::EVENT_DELETE_PAYMENT,
+        self::EVENT_UPDATE_VENDOR,
+        self::EVENT_DELETE_VENDOR,
         self::EVENT_CREATE_EXPENSE,
+        self::EVENT_UPDATE_EXPENSE,
+        self::EVENT_DELETE_EXPENSE,
         self::EVENT_CREATE_TASK,
+        self::EVENT_UPDATE_TASK,
+        self::EVENT_DELETE_TASK,
+        self::EVENT_APPROVE_QUOTE,
+        self::EVENT_LATE_INVOICE,
+        self::EVENT_EXPIRED_QUOTE,
+        self::EVENT_REMIND_INVOICE,
     ];
 
     protected $fillable = [
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index ae9f7733b37c..43235573e257 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -155,7 +155,11 @@ class PaymentRepository extends BaseRepository {
         }
 
 		if ( ! $is_existing_payment && ! $this->import_mode ) {
-			event( new PaymentWasCreated( $payment, $payment->company, Ninja::eventVars(auth()->user()->id) ) );
+
+            if ($payment->client->getSetting('client_manual_payment_notification')) 
+                $payment->service()->sendEmail();
+			
+            event( new PaymentWasCreated( $payment, $payment->company, Ninja::eventVars(auth()->user()->id) ) );
 		}
 
         nlog("payment amount = {$payment->amount}");