From 5c24b6f81e0dae0ac8d5f782ac0ce39faae29d79 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Sun, 1 Oct 2023 00:32:40 +0800
Subject: [PATCH 1/5] Relocate help menu and make dynamic questionnaire set
 generation

---
 .../FetchFirstQuestionQAProcessor.php         |  2 +-
 .../FetchNextQuestionQAProcessor.php          |  9 ++-
 .../general/elements/HelpMenuComponent.vue    | 68 +++++++++++++++++++
 .../general/forms/HelpMenuFormComponent.vue   | 18 ++---
 .../sections/OrderProfileSectionComponent.vue |  2 +-
 .../OrderProfileV2SectionComponent.vue        |  2 +-
 resources/views/layouts/base_portal.blade.php |  1 +
 resources/views/partials/helpmenu.blade.php   |  1 +
 routes/help_menu.php                          |  2 +-
 9 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 resources/assets/vue/components/general/elements/HelpMenuComponent.vue
 create mode 100644 resources/views/partials/helpmenu.blade.php

diff --git a/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php b/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
index 9f463418..c4f81f27 100644
--- a/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/FetchFirstQuestionQAProcessor.php
@@ -23,7 +23,7 @@ class FetchFirstQuestionQAProcessor
 
     public function execute(Request $request){
         try {
-            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1]);
+            $query = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $request->route('set_id')]);
             return $query;
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());
diff --git a/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php b/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
index d9fc9a0a..39188cf5 100644
--- a/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/FetchNextQuestionQAProcessor.php
@@ -38,6 +38,7 @@ class FetchNextQuestionQAProcessor
         $nextQuestionNumber = 0;
         $nextNestedQuestion = 0;
         $nextMainQuestion= 0;
+        $questionnaireSetId = 0;
         $currentQuestion = $request->question;
         $questionType = QAType::DEFAULT;
         $returnQuestion = null;
@@ -48,7 +49,9 @@ class FetchNextQuestionQAProcessor
             $questionType = $currentQuestion['question_type'];
             $nextNestedQuestion = $currentQuestion['next_nested_question'];
             $nextMainQuestion = $currentQuestion['next_main_question'];
+            $questionnaireSetId = $currentQuestion['questionnaire_set_id'];
         }
+
         if ($request->has('answerObj')) {
             $nextQuestionNumber = $request->answerObj['next_question_number'];
         }
@@ -58,7 +61,7 @@ class FetchNextQuestionQAProcessor
             $previousAnswer = $this->listsHelpMenuUserAnswerSelected->execute(['user_id' => $userId, 'order_by' => (object)['column' => 'id','DESC' => true]])[0];
 
             //Get previous question
-            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id' => $previousAnswer['question_id']]);
+            $previousQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id' => $previousAnswer['question_id']]);
             $returnQuestion = $previousQuestion;
         }
         else{
@@ -79,11 +82,11 @@ class FetchNextQuestionQAProcessor
                 $returnQuestion = null;
             }
             else if($question_number != 0){
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'question_number' => $question_number]);
+                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'question_number' => $question_number]);
                 $returnQuestion =  $nextQuestion;
             }
             else if (array_key_exists('id', $request->input('question'))) {
-                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => 1, 'id_next' => $questionId, 'next_main_question' => null]);
+                $nextQuestion = $this->fetchesHelpMenuQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id_next' => $questionId, 'next_main_question' => null]);
                 $returnQuestion = $nextQuestion;
             }
         }
diff --git a/resources/assets/vue/components/general/elements/HelpMenuComponent.vue b/resources/assets/vue/components/general/elements/HelpMenuComponent.vue
new file mode 100644
index 00000000..2f1a6e34
--- /dev/null
+++ b/resources/assets/vue/components/general/elements/HelpMenuComponent.vue
@@ -0,0 +1,68 @@
+<template>
+     <div class="parentContainer">
+        <div class="floating-button">
+            <button class="requestModal round-button" data-type="helpMenu">
+                <i class="fa fa-info"></i>
+                <span class="beta-label">Beta</span>
+            </button>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
+                <help-menu-form-component></help-menu-form-component>
+            </modal-component>
+        </div>
+     </div>
+</template>
+
+<script>
+  export default {
+  };
+</script>
+
+<style scoped>
+    .floating-button {
+        position: fixed;
+        z-index: 9999;
+        bottom: 95px;
+        right: 24px;
+    }
+
+
+    .round-button {
+        width: 60px;
+        height: 60px;
+        background-color: #007bff;
+        color: white;
+        border: none;
+        border-radius: 50%;
+        font-size: 24px;
+        cursor: pointer;
+        outline: none;
+    }
+
+    .round-button:hover {
+    background-color: #0056b3;
+    }
+
+    .beta-label {
+        position: absolute;
+        top: 44px;
+        left: 88%;
+        transform: translateX(-50%);
+        background-color: #ffee00;
+        color: black;
+        padding: 0px 4px;
+        border-radius: 5px;
+        font-size: 11px;
+    }
+
+    @media (max-height: 600px) {
+        .floating-button {
+            bottom: 85px;
+            right: 14px;
+        }
+
+        .round-button {
+            width: 54px;
+            height: 54px;
+        }
+    }
+</style>
diff --git a/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue b/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
index bef90475..e27851a5 100644
--- a/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
@@ -77,16 +77,6 @@
 <script>
     import { required } from "vuelidate/lib/validators";
     export default {
-        props: {
-            data:{
-                type: Object,
-                required: true
-            },
-            module_type: {
-                type: String,
-                required: true
-            }
-        },
         data(){
             return {
                 section: 'helpMenuForm',
@@ -132,7 +122,7 @@
         },
         methods: {
             fetchFirstQuestion(){
-                this.submit(route('api.helpmenu.first.question'), 'get', this.section, false, false);
+                this.submit(route('api.helpmenu.first.question', 4), 'get', this.section, false, false);
             },
             successHandler(response){
                 this.$store.dispatch('completeList', {'name': this.section, 'data': []});
@@ -173,7 +163,7 @@
                     else{
                         if(this.question.is_end){
                             if(this.question.question_type === 5){
-                                this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                                this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, false, false);
                                 this.closeModal();
                                 this.reset();
                             }
@@ -192,7 +182,7 @@
                             }
                         }
                         else{
-                            this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                            this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, false, false);
                         }
                     }
                 }
@@ -200,7 +190,7 @@
                     this.formTouched = false;
                     this.parameters.question = this.question;
                     this.parameters.isPrevious = true;
-                    this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, true, true);
+                    this.submit(this.route('api.helpmenu.next.question'), 'post', this.section, false, false);
                 }
             },
             reset() {
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index e812b31e..25417616 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -30,7 +30,7 @@
                                                 <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
                                             <!-- <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
-                                                <help-menu-form-component module_type="Order" :data="order"></help-menu-form-component>
+                                                <help-menu-form-component></help-menu-form-component>
                                             </modal-component> -->
                                         </div>
                                     </div>
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
index 67f1f959..0f9ae103 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
@@ -30,7 +30,7 @@
                                                 <change-order-number-form-component :section="section" :data="order"></change-order-number-form-component>
                                             </modal-component>
                                             <!-- <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="helpMenu">
-                                                <help-menu-form-component module_type="Order" :data="order"></help-menu-form-component>
+                                                <help-menu-form-component></help-menu-form-component>
                                             </modal-component> -->
                                         </div>
                                     </div>
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index e6bec7e5..f7945c60 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -99,6 +99,7 @@
                 </div>
             </div>
             @include('partials.footer')
+            @include('partials.helpmenu')
         </div>
     </div>
 
diff --git a/resources/views/partials/helpmenu.blade.php b/resources/views/partials/helpmenu.blade.php
new file mode 100644
index 00000000..4e828435
--- /dev/null
+++ b/resources/views/partials/helpmenu.blade.php
@@ -0,0 +1 @@
+<help-menu-component></help-menu-component>
diff --git a/routes/help_menu.php b/routes/help_menu.php
index 04ce8d03..c0556b17 100644
--- a/routes/help_menu.php
+++ b/routes/help_menu.php
@@ -3,7 +3,7 @@
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'helpmenu', 'as' => 'helpmenu.', 'namespace' => 'HelpMenu'], function () {
-    Route::get('/question', 'FetchQuestionQAController@fetch')->name('first.question');
+    Route::get('/question/{set_id}', 'FetchQuestionQAController@fetch')->name('first.question');
     Route::post('/question', 'UpdateNextQuestionQAController@fetch')->name('next.question');
     Route::post('/generate', 'GenerateFeedbackUrlController@generate')->name('feedback.url.generate');
     Route::get('/list', 'ListQuestionsAnswersQAController@list')->name('list.questions.answers');

From 42b6140df77e6035a62794bbe6dbc7b02b5bb758 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Thu, 5 Oct 2023 17:30:29 +0800
Subject: [PATCH 2/5] UX update when system failed to open a support ticket via
 help menu

---
 .../ControllersLogic/UpdateNextQuestionQALogic.php        | 3 ++-
 .../HelpMenu/Processors/DeleteAnswerQAProcessor.php       | 8 ++++++++
 .../PerfexCRM/Services/FetchesPerfexCRMCustomer.php       | 4 +++-
 .../components/general/forms/HelpMenuFormComponent.vue    | 3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateNextQuestionQALogic.php b/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateNextQuestionQALogic.php
index 99a35c6c..ec43ab13 100644
--- a/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateNextQuestionQALogic.php
+++ b/app/Classes/Modules/HelpMenu/ControllersLogic/UpdateNextQuestionQALogic.php
@@ -75,7 +75,8 @@ class UpdateNextQuestionQALogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws ErrorException
+     * @throws MalformedRequestException
+     * @throws ResourceNotFoundException
      */
     public function logic(Request $request) : JsonResponse
     {
diff --git a/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php b/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
index ff0b9c1f..adac3fe7 100644
--- a/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
+++ b/app/Classes/Modules/HelpMenu/Processors/DeleteAnswerQAProcessor.php
@@ -25,6 +25,14 @@ class DeleteAnswerQAProcessor
         $this->listsHelpMenuUserAnswerSelected = $listsHelpMenuUserAnswerSelected;
     }
 
+
+    /**
+     * @param int $userId
+     * @param int $questionId
+     * @param Request $request
+     * @return void
+     * @throws ResourceNotFoundException
+     */
     public function execute($userId, $questionId, $request){
         if ($request->has('isPrevious')) {
             //Get current and previous question's answer
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
index dd5acff1..5f72e9c1 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
@@ -28,7 +28,9 @@ class FetchesPerfexCRMCustomer
                 return null;
             }
         }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
+            $error = 'Unable to get correct response from Perfex CRM server: ' . $exception->getMessage();
+            Log::error($error);
+            throw new MalformedRequestException($error);
         }
     }
 }
diff --git a/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue b/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
index 943f3867..423e1765 100644
--- a/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/HelpMenuFormComponent.vue
@@ -134,7 +134,8 @@
                 }
             },
             errorHandler(error){
-                this.error = error.message;
+                // this.error = error.message;
+                this.error = 'We are sorry, something went wrong. Please contact us via live chat.';
             },
             submitForm(direction) {
                 this.parameters = {}

From 5584d22376e526b274fc5327d7441cb320d61a66 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Thu, 5 Oct 2023 19:58:07 +0800
Subject: [PATCH 3/5] Improvement to log capture thrown by custom exception
 (ConnectionErrorException), to evaluate if need to extend to other custom
 exception as well

---
 .../Exceptions/ConnectionErrorException.php   | 20 +++++++++++++++++++
 .../CreatesPerfexCRMSupportTicket.php         |  5 +++--
 .../Services/FetchesPerfexCRMCustomer.php     |  8 +++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 app/Classes/Exceptions/ConnectionErrorException.php

diff --git a/app/Classes/Exceptions/ConnectionErrorException.php b/app/Classes/Exceptions/ConnectionErrorException.php
new file mode 100644
index 00000000..52189ac8
--- /dev/null
+++ b/app/Classes/Exceptions/ConnectionErrorException.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\Exceptions;
+
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use Illuminate\Support\Facades\Log;
+
+final class ConnectionErrorException extends ServiceApiException {
+    public function __construct(?string $message = null, ?string $exceptionMessage = null, ?string $payload = null, ?string $exceptionTrace = null) {
+        Log::error($message. ": ". $exceptionMessage);
+        if($payload){
+            Log::error('Payload: '.$payload);
+        }
+        if($exceptionTrace){
+            Log::error($exceptionTrace);
+        }
+        parent::__construct($message ?? 'A connection error has occurred. Please check application logs for more information.',
+            HttpStatus::SERVER_ERROR);
+    }
+}
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
index 48058509..f8cfe60e 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
@@ -37,8 +37,9 @@ class CreatesPerfexCRMSupportTicket
                 return null;
             }
         }catch(\Exception $exception){
-            $error = 'Support Ticket creation failed: ' . $exception->getMessage();
-            Log::error($error.'\nPayload to create ticket: '.json_encode($data));
+            $error = 'Support Ticket creation failed';
+            Log::error($error. ": ". $exception->getMessage());
+            Log::error('Payload: '.json_encode($data));
             throw new MalformedRequestException($error);
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
index 5f72e9c1..decc51bc 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMCustomer.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class FetchesPerfexCRMCustomer
@@ -27,7 +28,12 @@ class FetchesPerfexCRMCustomer
                 Log::error('FetchesPerfexCRMCustomer: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             $error = 'Unable to get correct response from Perfex CRM server: ' . $exception->getMessage();
             Log::error($error);
             throw new MalformedRequestException($error);

From f5482a29e49e92d41a3b8210576c0cd29dabf00d Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Sun, 8 Oct 2023 17:23:55 +0800
Subject: [PATCH 4/5] New exception handling for all PerfexCRM services

---
 .../Services/ConvertsPerfexCRMLeadToCustomer.php       | 10 ++++++++--
 .../PerfexCRM/Services/CreatesPerfexCRMCustomer.php    | 10 ++++++++--
 .../Services/CreatesPerfexCRMCustomerContact.php       | 10 ++++++++--
 .../Services/CreatesPerfexCRMCustomerProject.php       | 10 ++++++++--
 .../PerfexCRM/Services/CreatesPerfexCRMInvoice.php     | 10 ++++++++--
 .../Services/CreatesPerfexCRMInvoicePayment.php        | 10 ++++++++--
 .../PerfexCRM/Services/CreatesPerfexCRMLead.php        | 10 ++++++++--
 .../PerfexCRM/Services/CreatesPerfexCRMMilestone.php   | 10 ++++++++--
 .../Services/CreatesPerfexCRMSupportTicket.php         |  8 +++++++-
 .../PerfexCRM/Services/CreatesPerfexCRMTask.php        | 10 ++++++++--
 .../PerfexCRM/Services/FetchesPerfexCRMInvoice.php     |  8 +++++++-
 .../PerfexCRM/Services/FetchesPerfexCRMLead.php        |  8 +++++++-
 .../PerfexCRM/Services/FetchesPerfexCRMMilestone.php   | 10 ++++++++--
 .../PerfexCRM/Services/FetchesPerfexCRMProject.php     | 10 ++++++++--
 .../PerfexCRM/Services/FetchesPerfexCRMTask.php        | 10 ++++++++--
 .../PerfexCRM/Services/UpdatesPerfexCRMCustomer.php    | 10 ++++++++--
 .../PerfexCRM/Services/UpdatesPerfexCRMInvoice.php     |  8 +++++++-
 .../PerfexCRM/Services/UpdatesPerfexCRMLead.php        |  8 +++++++-
 .../PerfexCRM/Services/UpdatesPerfexCRMProject.php     |  8 +++++++-
 .../PerfexCRM/Services/UpdatesPerfexCRMTask.php        | 10 ++++++++--
 20 files changed, 154 insertions(+), 34 deletions(-)

diff --git a/app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php b/app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php
index 3abf292a..0e41b5a7 100644
--- a/app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/ConvertsPerfexCRMLeadToCustomer.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class ConvertsPerfexCRMLeadToCustomer
@@ -27,8 +28,13 @@ class ConvertsPerfexCRMLeadToCustomer
                 Log::error('ConvertsPerfexCRMLeadToCustomer: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php
index 289abac5..9555c61b 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomer.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomer
@@ -30,8 +31,13 @@ class CreatesPerfexCRMCustomer
                 Log::error('CreatesPerfexCRMCustomer: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $companyName, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php
index 1e76a02b..1f5478eb 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerContact.php
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CustomerContactObject;
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomerContact
@@ -37,8 +38,13 @@ class CreatesPerfexCRMCustomerContact
                 Log::error('CreatesPerfexCRMCustomerContact: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php
index 33d9c3d2..2b6fa9de 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMCustomerProject.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMCustomerProject
@@ -36,8 +37,13 @@ class CreatesPerfexCRMCustomerProject
                 Log::error('CreatesPerfexCRMCustomerProject: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php
index 5991025e..21de87e5 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoice.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePerfexCRMObject;
 
@@ -56,8 +57,13 @@ class CreatesPerfexCRMInvoice
                 Log::error('CreatesPerfexCRMInvoice: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php
index 05eec8b7..4e58d59f 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMInvoicePayment.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\InvoicePaymentPerfexCRMObject;
 
@@ -36,8 +37,13 @@ class CreatesPerfexCRMInvoicePayment
                 Log::error('CreatesPerfexCRMInvoicePayment: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php
index ea7b7917..b2ac9c23 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMLead.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
 
@@ -43,8 +44,13 @@ class CreatesPerfexCRMLead
                 Log::error('CreatesPerfexCRMLead: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server ' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php
index 27bdf44e..37342882 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMMilestone.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMMilestone
@@ -39,8 +40,13 @@ class CreatesPerfexCRMMilestone
                 Log::error('CreatesPerfexCRMMilestone: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
index f8cfe60e..b15f09c1 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMSupportTicket.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class CreatesPerfexCRMSupportTicket
@@ -36,7 +37,12 @@ class CreatesPerfexCRMSupportTicket
                 Log::error($response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             $error = 'Support Ticket creation failed';
             Log::error($error. ": ". $exception->getMessage());
             Log::error('Payload: '.json_encode($data));
diff --git a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php
index 4c89a3db..1d04ce5e 100644
--- a/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php
+++ b/app/Classes/Modules/PerfexCRM/Services/CreatesPerfexCRMTask.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateTaskPerfexCRMObject;
@@ -60,8 +61,13 @@ class CreatesPerfexCRMTask
                 Log::error('CreatesPerfexCRMTask: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php
index 3d4f9222..9104a3a9 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMInvoice.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class FetchesPerfexCRMInvoice
@@ -29,7 +30,12 @@ class FetchesPerfexCRMInvoice
                 Log::error('FetchesPerfexCRMInvoice: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php
index 773b602c..09f1af6e 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMLead.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class FetchesPerfexCRMLead
@@ -27,7 +28,12 @@ class FetchesPerfexCRMLead
                 Log::error('FetchesPerfexCRMLead: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), $email, $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php
index 6d2ab27f..77433f6e 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMMilestone.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class FetchesPerfexCRMMilestone
@@ -33,8 +34,13 @@ class FetchesPerfexCRMMilestone
                 Log::error('FetchesPerfexCRMMilestone: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php
index 94797363..a6f43b7e 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMProject.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class FetchesPerfexCRMProject
@@ -33,8 +34,13 @@ class FetchesPerfexCRMProject
                 Log::error('FetchesPerfexCRMProject: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
index 6cd4f052..a83eb112 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Helper;
 
@@ -47,8 +48,13 @@ class FetchesPerfexCRMTask
                 Helper::debugLogger($response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
index 74706e49..193155e3 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
 use App\Classes\General\Helper;
@@ -41,8 +42,13 @@ class UpdatesPerfexCRMCustomer
                 // Helper::debugLogger($response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php
index d7a467c1..5f21cd32 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMInvoice.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class UpdatesPerfexCRMInvoice
@@ -63,7 +64,12 @@ class UpdatesPerfexCRMInvoice
                 Log::error('UpdatesPerfexCRMInvoice: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php
index 0e992c32..6ac332f7 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMLead.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 use App\Classes\ValueObjects\Constants\PerfexCRMCustomFields;
 
@@ -44,7 +45,12 @@ class UpdatesPerfexCRMLead
                 Log::error('UpdatesPerfexCRMLead: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php
index 535f128b..9dceba4c 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMProject.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class UpdatesPerfexCRMProject
@@ -36,7 +37,12 @@ class UpdatesPerfexCRMProject
                 Log::error('UpdatesPerfexCRMProject: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
             throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
index 1c9f047b..1ece3431 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMTask.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\PerfexCRM\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\ConnectionErrorException;
 use Illuminate\Support\Facades\Log;
 
 class UpdatesPerfexCRMTask
@@ -41,8 +42,13 @@ class UpdatesPerfexCRMTask
                 Log::error('UpdatesPerfexCRMTask: '.$response);
                 return null;
             }
-        }catch(\Exception $exception){
-            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server' . $exception->getMessage());
+        }
+        catch(\Illuminate\Http\Client\ConnectionException $exception){
+            $error = 'Failed to connect to CRM';
+            throw new ConnectionErrorException($error, $exception->getMessage(), "", $exception->getTraceAsString());
+        }
+        catch(\Exception $exception){
+            throw new MalformedRequestException('Unable to get correct response from Perfex CRM server: ' . $exception->getMessage());
         }
     }
 }

From bffe438455b667325ac1bad53897b2746aa2c899 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Mon, 16 Oct 2023 01:09:24 +0800
Subject: [PATCH 5/5] Disable help menu

---
 resources/views/layouts/base_portal.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index f7945c60..5a2d502b 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -99,7 +99,7 @@
                 </div>
             </div>
             @include('partials.footer')
-            @include('partials.helpmenu')
+            <!-- @include('partials.helpmenu') -->
         </div>
     </div>