From 671c7a54fb01c6ba0dbb9d89e01c6e7e12aac7ed Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Thu, 26 Oct 2023 22:31:10 +0800
Subject: [PATCH 01/18] fix delivery order in shipping invoice

---
 .../views/pages/pdfs/packing_list_measurement.blade.php     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/pdfs/packing_list_measurement.blade.php b/resources/views/pages/pdfs/packing_list_measurement.blade.php
index 3a7c3cc9..a5770d55 100644
--- a/resources/views/pages/pdfs/packing_list_measurement.blade.php
+++ b/resources/views/pages/pdfs/packing_list_measurement.blade.php
@@ -42,8 +42,10 @@
         </tr>
     </thead>
     <tbody>
-        @php     
-            $packages = $invoice_transaction->owner->packages;    
+        @php
+            $billable_packing_list = $invoice_transaction->owner->packingLists()->first();
+            $billable_packing_list = $billable_packing_list ? $billable_packing_list : $invoice_transaction->owner;
+            $packages = $billable_packing_list->packages;
             $totalCBM = 0;
             $totalQty = 0;
         @endphp

From 68c9e0451ac25f9f934a816a7fb3e0dc048e3524 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 27 Oct 2023 08:55:54 +0800
Subject: [PATCH 02/18] update admin geenrate invoice view

---
 ...CustomerPaymentBillingSectionComponent.vue |  2 +-
 .../AdminPaymentsBillingComponent.vue         | 42 +++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue
index fb69cee3..8e069bcf 100644
--- a/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col">
-            <div v-if="$store.getters.isAdmin" class="btn btn-sm btn-danger pointer m-t-10 m-b-15 d-none" @click="submit(route('api.transaction.invoice.company.regenerate', company_module_id), 'post', section, true , true)">Regenerate Invoice</div>
+            <div v-if="$store.getters.isAdmin" class="btn btn-sm btn-danger pointer m-t-10 m-b-15" @click="submit(route('api.transaction.invoice.company.regenerate', company_module_id), 'post', section, true , true)">Regenerate Invoice</div>
             <div class="row flex-nowrap">
                 <div class="col">
                     <div class="row tabsContainer">
diff --git a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
index c69c2c9c..13a4981b 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
@@ -84,6 +84,20 @@
                                                     <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
                                                 </modal-component>
                                             </div>
+                                            <div class="row" v-if="item.order.company_module.billingAddress">
+                                                <div class="col">
+                                                    <div class="col-auto requestModal pointer" data-type="editBillingAddress">
+                                                        <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
+                                                    </div>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
+                                                        <div class="row">
+                                                            <div class="col bg-white">
+                                                                <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
+                                                            </div>
+                                                        </div>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
                                             <div v-if="!item.order.address.post_code_area">
                                                 <div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
                                                 <modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
@@ -110,34 +124,6 @@
                                     </modal-component>
                                 </div>
                             </div>
-                            <div class="row text-center parentContainer m-t-10" v-if="['Pending Invoice', 'Pending Approval'].includes(invoice_status)" >
-                                <div class="col">
-                                    <div class="row" v-if="!item.order.company_module.billingAddress">
-                                        <div class="col">
-                                            <div>
-                                                <div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
-                                                <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
-                                                    <address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
-                                                </modal-component>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="row" v-if="item.order.company_module.billingAddress">
-                                        <div class="col">
-                                            <div class="col-auto requestModal pointer" data-type="editBillingAddress">
-                                                <i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
-                                            </div>
-                                            <modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
-                                                <div class="row">
-                                                    <div class="col bg-white">
-                                                        <address-form-component :id="item.order.company_module.id"  :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
-                                                    </div>
-                                                </div>
-                                            </modal-component>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                 </div>

From 97eaefa45afe7a6684894e2cd1b277ac5ad17172 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 27 Oct 2023 09:16:23 +0800
Subject: [PATCH 03/18] regenerate single invoice

---
 ...eSingleShippingInvoiceTransactionLogic.php | 76 +++++++++++++++++++
 ...leShippingInvoiceTransactionController.php | 21 +++++
 .../CustomerPaymentsBillingComponent.vue      | 15 ++++
 routes/transaction.php                        |  1 +
 4 files changed, 113 insertions(+)
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php
 create mode 100644 app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.php

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php
new file mode 100644
index 00000000..20dba2a0
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php
@@ -0,0 +1,76 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Order;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Models\Document;
+
+class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Regenerate Shipping Invoice',
+            'message' => 'You have successfully regenerated shipping invoice'
+        ];
+    }
+
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var CreatesFiles */
+    private $createsFiles;
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /**
+     * @param CreatesDocument $createsDocument
+     */
+    public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles, FetchesTransaction $fetchesTransaction)
+    {
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+        $this->fetchesTransaction = $fetchesTransaction;
+    }
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $invoice = $this->fetchesTransaction->execute(['id' => $request->route('invoice_id')]);
+
+        $invoice->documents()->delete();
+
+        $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
+
+        $document_object = new DocumentObject(
+            DocumentType::SHIPPING_INVOICE,
+            [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
+            '',
+            ApprovalStatus::COMPLETED,
+            'shipping_invoice'
+        );
+
+        $document =$this->createsDocument->execute($invoice, $document_object);
+
+        $this->createsFiles->execute($document, $document_object);
+
+        // dump($document);
+
+        return $this->response([]);
+    }
+
+}
diff --git a/app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.php b/app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.php
new file mode 100644
index 00000000..1607b327
--- /dev/null
+++ b/app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\RegenerateSingleShippingInvoiceTransactionLogic;
+
+
+class RegenerateSingleShippingInvoiceTransactionController
+{
+    /**
+     * @param Request $request
+     * @param RegenerateShippingInvoiceTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function regenerate(Request $request, RegenerateSingleShippingInvoiceTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
index f64b006c..70d6edf2 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
@@ -64,6 +64,21 @@
                             </div>
                         </div>
                         <div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="regenerateInvoice">
+                                <i class="fa fa-repeat"></i>
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateInvoice">
+                                <general-confirmation-form-component 
+                                    contentText="Are you sure you want to regenerate this Invoice?" 
+                                    modalType="delete" 
+                                    buttonText="Regenerate" 
+                                    class="text-center"
+                                    :apiRoute="route('api.transaction.invoice.regenerate', item.id)"
+                                    apiMethod="post"
+                                    :section="section"
+                                >
+                                </general-confirmation-form-component>
+                            </modal-component>
                             <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
                                 <i class="fa fa-close"></i>
                             </span>
diff --git a/routes/transaction.php b/routes/transaction.php
index 07a1cf1c..01e996dd 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -9,6 +9,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     Route::delete('/delete/{id}', 'DeleteTransactionController@delete')->name('delete');
     Route::delete('/delete-payment/{id}', 'DeletePaymentTransactionController@delete')->name('payment.delete');
     Route::put('{id}/status/update/{status}', 'UpdateTransactionStatusController@update')->where('status', 'approve|expire|reject')->name('update');
+    route::post('/{invoice_id}/regenerate', 'RegenerateSingleShippingInvoiceTransactionController@regenerate')->name('invoice.regenerate');
 
     Route::get('wallet/list', 'ListWalletTransactionsController@list')->name('wallet.list');
 

From 496df549f686410b92907bce5569614353d577b7 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 27 Oct 2023 10:10:02 +0800
Subject: [PATCH 04/18] remove code

---
 routes/web.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index ab9f5f3e..55cd1302 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1225,11 +1225,3 @@ Route::get('/wallets/active', function(){
     }
     echo '</table>';
 });
-
-Route::get('/accident-approve-invoice', function(){
-    $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->whereDate('updated_at', '2023-10-12')->get();
-    foreach ($invoices as $invoice) {
-        $orderMarking = $invoice->owner->owner->reference;
-        echo '<a href="'.route('order.v2.show', $orderMarking).'" target="_blank">'.$orderMarking.'</a><br>';
-    }
-});

From 412dbd64d5d5d7b3e6f5da60a72f01e996ad677c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 27 Oct 2023 16:12:31 +0800
Subject: [PATCH 05/18] fix-payment-status-updated-but-failed-update-invoice

---
 routes/web.php | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 55cd1302..7a6df56a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,11 +1,8 @@
 <?php
 
-use App\Classes\Exceptions\InternalServerErrorException;
-use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
 use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
 use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
 use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
-use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
@@ -16,12 +13,9 @@ use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProce
 use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
-use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
 use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\BusinessType;
 use App\Classes\ValueObjects\Constants\DocumentType;
@@ -30,7 +24,6 @@ use App\Classes\ValueObjects\Constants\PackageType;
 use App\Classes\ValueObjects\Constants\PackingListType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Http\Resources\CompanyResource;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
 use App\Models\Document;
@@ -1225,3 +1218,34 @@ Route::get('/wallets/active', function(){
     }
     echo '</table>';
 });
+
+Route::get('fix-payment-status-updated-but-failed-update-invoice', function (UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor) {
+    $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [2])
+        ->whereHas('transactions', function ($query) {
+            $query->where('type', TransactionType::PAYMENT)
+                ->whereIn('status', [2, 3]);
+        })->get();
+
+
+    foreach ($invoices as $invoice) {
+        echo "Fixing" . $invoice->owner->owner->reference . '<br>';
+
+        $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+
+        if (($invoice->amount - $totalPaidAmount) < 0.01) {
+            $updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
+
+            $packingList = $invoice->owner;
+
+            $packingList->status = ApprovalStatus::APPROVED;
+            $packingList->save();
+
+            if (app()->environment('production')) {
+                $updateDoFromVTPortalProcessor->execute($packingList);
+                $updateDoFromYDPortalProcessor->execute($packingList);
+            }
+
+            echo 'done fix ' . $invoice->owner->owner->reference . '<br>';
+        }
+    }
+});
\ No newline at end of file

From da6ec00dbd2b5af02616e5cdb925886fb840fdb6 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 27 Oct 2023 16:13:43 +0800
Subject: [PATCH 06/18] cleanup

---
 routes/web.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 7a6df56a..cc85078e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1234,9 +1234,7 @@ Route::get('fix-payment-status-updated-but-failed-update-invoice', function (Upd
 
         if (($invoice->amount - $totalPaidAmount) < 0.01) {
             $updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
-
             $packingList = $invoice->owner;
-
             $packingList->status = ApprovalStatus::APPROVED;
             $packingList->save();
 

From d950ee3d685e190bb262c6b8028b32a59a15fdcb Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 21 Nov 2023 16:34:32 +0800
Subject: [PATCH 07/18] Quick fix for feedback form entries cannot be
 downloaded

---
 app/Classes/Modules/Exports/Services/ExportsFeedback.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsFeedback.php b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
index 7bc26265..eec7b786 100644
--- a/app/Classes/Modules/Exports/Services/ExportsFeedback.php
+++ b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
@@ -38,7 +38,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
         return QAUserAnswerSelected::whereHas('question', function ($query) {
             $query->whereHas('questionnaire', function ($innerQuery) {
                 $innerQuery->where('group', 'feedback');
-            })->where('created_at', '>',  Carbon::now()->subMonths(1));
+            }); //->where('created_at', '>',  Carbon::now()->subMonths(1));
         })->orderBy('created_at', 'desc');
     }
 

From 820d96858f4983f7b8700f663e2f58e08118c60c Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 21 Nov 2023 19:29:40 +0800
Subject: [PATCH 08/18] Feedback Form Improvement

---
 .../Exports/Services/ExportsFeedback.php      |   7 +-
 .../Resources/HelpMenuQuestionResource.php    |   2 +-
 .../HelpMenuQuestionnaireSetsResource.php     |   1 +
 .../HelpMenuQuestionsAnswersResource.php      |   3 +
 app/Models/QAUserAnswerSelected.php           |   9 +
 database/seeders/DatabaseSeeder.php           |   5 +
 database/seeders/QAAnswerOptions2Seeder.php   | 395 ++++++++++++++++++
 database/seeders/QAQuestions2Seeder.php       | 148 +++++++
 .../elements/QuestionAnswerComponent.vue      |   2 +
 .../GenerateFeedbackLinkFormComponent.vue     |   2 +-
 resources/views/pages/feedback.blade.php      |   4 +-
 11 files changed, 574 insertions(+), 4 deletions(-)
 create mode 100644 database/seeders/QAAnswerOptions2Seeder.php
 create mode 100644 database/seeders/QAQuestions2Seeder.php

diff --git a/app/Classes/Modules/Exports/Services/ExportsFeedback.php b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
index eec7b786..1e07a854 100644
--- a/app/Classes/Modules/Exports/Services/ExportsFeedback.php
+++ b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
@@ -20,9 +20,11 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
     public function headings(): array
     {
         return [
+            'Version',
             'Question Set',
             'Question Text',
-            'Answer',
+            'Answer Text',
+            'Answer Value',
             'Source System',
             'Source Marking',
             'Source Email',
@@ -56,11 +58,14 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
             $companyModule = $user->companyModule()->first();
             $user_marking = $companyModule ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : "";
         }
+        $answer = $userAnswer->answer;
 
         return [
+            $userAnswer->question->questionnaire->version,
             $userAnswer->question->questionnaire->description,
             $userAnswer->question->question_text,
             $userAnswer->free_text_answer,
+            $answer->value,
             $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             $user ? $user_marking : $source->marking,
             $user ? $user->email : $source->email,
diff --git a/app/Http/Resources/HelpMenuQuestionResource.php b/app/Http/Resources/HelpMenuQuestionResource.php
index e41aeb53..516c3d54 100644
--- a/app/Http/Resources/HelpMenuQuestionResource.php
+++ b/app/Http/Resources/HelpMenuQuestionResource.php
@@ -34,7 +34,7 @@ class HelpMenuQuestionResource extends JsonResource
                 'question_number' => $q->question_number,
                 'question_text' => $q->question_text,
                 'question_type' => $q->question_type,
-                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->get()),
+                'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->orderBy('order', 'ASC')->get()),
                 'questionnaire_set_id' => $q->questionnaire_set_id,
                 'next_nested_question' => $q->next_nested_question,
                 'next_main_question' => $q->next_main_question,
diff --git a/app/Http/Resources/HelpMenuQuestionnaireSetsResource.php b/app/Http/Resources/HelpMenuQuestionnaireSetsResource.php
index 7c629a1d..d7143b99 100644
--- a/app/Http/Resources/HelpMenuQuestionnaireSetsResource.php
+++ b/app/Http/Resources/HelpMenuQuestionnaireSetsResource.php
@@ -18,6 +18,7 @@ class HelpMenuQuestionnaireSetsResource extends JsonResource
             'name' => $this->name,
             'description' => $this->description,
             'group' => $this->group,
+            'version' => $this->version,
         ];
     }
 }
diff --git a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
index 98314a16..1136ed9b 100644
--- a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
+++ b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
@@ -4,6 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Classes\ValueObjects\Constants\QASystemSourceType;
+use App\Models\QAAnswerOptions;
 use App\Models\QAQuestions;
 use Carbon\Carbon;
 
@@ -20,6 +21,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
         $question = QAQuestions::where('id', $this->question_id)->first();
         $source = new HelpMenuUserSourceResource($this->userSource);
         $user = $this->source_id === 0 ? new UserResource($this->user) : null;
+        $answerOption = QAAnswerOptions::where('id', $this->answer_option_id)->first();
 
         $user_marking = '';
         if($user){
@@ -32,6 +34,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
             'questionnaire' => new HelpMenuQuestionnaireSetsResource($this->question->questionnaire),
             'question_text' => $question ? $question->question_text : null,
             'free_text_answer' => $this->free_text_answer,
+            'answer_value' => $answerOption ? $answerOption->value : null,
             'source_system' => $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             'source_marking' => $user ? $user_marking : $source->marking,
             'source_email' => $user ? $user->email : $source->email,
diff --git a/app/Models/QAUserAnswerSelected.php b/app/Models/QAUserAnswerSelected.php
index e85296aa..5b4cf2a1 100644
--- a/app/Models/QAUserAnswerSelected.php
+++ b/app/Models/QAUserAnswerSelected.php
@@ -46,4 +46,13 @@ class QAUserAnswerSelected extends AbstractModel implements Documentable
         return $this->BelongsTo(QAQuestions::class, 'question_id', 'id');
     }
 
+
+    /**
+     * @return BelongsTo
+     */
+    public function answer(): BelongsTo
+    {
+        return $this->BelongsTo(QAAnswerOptions::class, 'answer_option_id', 'id');
+    }
+
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index ed1872de..76038b92 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -26,7 +26,12 @@ class DatabaseSeeder extends Seeder
         // $this->call(QAQuestionsDemoSeeder::class); //DEMO POC
         // $this->call(QAAnswerOptionsDemoSeeder::class); //DEMO POC
 
+        // 20230928 Set 1 to Set 3
         // $this->call(QAQuestionsSeeder::class);
         // $this->call(QAAnswerOptionsSeeder::class);
+
+        // 20231121 Set 4 to Set 6
+        // $this->call(QAQuestions2Seeder::class);
+        // $this->call(QAAnswerOptions2Seeder::class);
     }
 }
diff --git a/database/seeders/QAAnswerOptions2Seeder.php b/database/seeders/QAAnswerOptions2Seeder.php
new file mode 100644
index 00000000..f9aafe42
--- /dev/null
+++ b/database/seeders/QAAnswerOptions2Seeder.php
@@ -0,0 +1,395 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAAnswerOptions;
+
+class QAAnswerOptions2Seeder extends Seeder
+{
+    public function run()
+    {
+        // Set 1
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Dissatisfied";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Dissatisfied";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 4 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Satisfied";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 5 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Satisfied";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+        // Set 1
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Yes";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Partially";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "No";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+          // Set 1
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Clear";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Clear";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unclear";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unclear";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 4;
+        $answerOption->save();
+
+
+
+
+
+        // Set 2
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Yes";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Somewhat";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "No";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+        // Set 2
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Exceeded Expectations";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Met Expectations";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Below Expectations";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+          // Set 2
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Dissatisfied";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Dissatisfied";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Satisfied";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Satisfied";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 5;
+        $answerOption->save();
+
+
+
+
+
+        // Set 3
+        // Option 1 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Immediately";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Within a few hours";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Within a day";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "More than a day";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 10
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Never received a response";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 10;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+        // Set 3
+        // Option 1 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Clear";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Clear";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unclear";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 20
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unclear";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 20;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+        // Set 3
+        // Option 1 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Likely";
+        $answerOption->value = "5";
+        $answerOption->order = 5;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 2 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Likely";
+        $answerOption->value = "4";
+        $answerOption->order = 4;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 3 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Neutral";
+        $answerOption->value = "3";
+        $answerOption->order = 3;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 4 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Unlikely";
+        $answerOption->value = "2";
+        $answerOption->order = 2;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+        // Option 5 for Question 30
+        $answerOption = new QAAnswerOptions;
+        $answerOption->display_text = "Very Unlikely";
+        $answerOption->value = "1";
+        $answerOption->order = 1;
+        $answerOption->question_number = 30;
+        $answerOption->questionnaire_set_id = 6;
+        $answerOption->save();
+
+
+
+    }
+}
diff --git a/database/seeders/QAQuestions2Seeder.php b/database/seeders/QAQuestions2Seeder.php
new file mode 100644
index 00000000..54e55edc
--- /dev/null
+++ b/database/seeders/QAQuestions2Seeder.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use App\Models\QAQuestionnaireSet;
+use App\Models\QAQuestions;
+use App\Classes\ValueObjects\Constants\QAType;
+
+class QAQuestions2Seeder extends Seeder
+{
+    public function run()
+    {
+        $questionnaireSets = [
+            [
+                'name' => 'Set 1',
+                'description' => 'Customer Support Satisfaction Survey',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+            [
+                'name' => 'Set 2',
+                'description' => 'First Order Experience Feedback',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+            [
+                'name' => 'Set 3',
+                'description' => 'Sales Inquiry Experience',
+                'group' => 'feedback',
+                'version' => 2
+            ],
+        ];
+
+        foreach ($questionnaireSets as $set) {
+            $questionnaireSet = QAQuestionnaireSet::create([
+                'name' => $set['name'],
+                'description' => $set['description'],
+                'group' => $set['group'],
+                'version' => $set['version'],
+            ]);
+
+            $questions = [];
+
+            switch ($set['name']) {
+                case 'Set 1':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'On a scale of 1 to 5, how satisfied are you with the time it took to receive a response?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Was your issue resolved during this interaction?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'How clear and understandable was the communication from the support team?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+                case 'Set 2':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'Did you find what you were looking for without any issues?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Did the service  meet your expectations?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'On a scale of 1 to 5, how satisfied are you with the delivery time?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+                case 'Set 3':
+                    $questions = [
+                        [
+                            'question_number' => 10,
+                            'question_text' => 'How quickly did our sales team respond to your inquiry?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => true,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 20,
+                            'question_text' => 'Was the information provided by our sales team clear and easy to understand?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => false,
+                        ],
+                        [
+                            'question_number' => 30,
+                            'question_text' => 'After interacting with our sales team, how likely are you to use our service?',
+                            'question_type' => QAType::MULTIPLE_CHOICES,
+                            'is_start' => false,
+                            'is_end' => true,
+                        ]
+                    ];
+                    break;
+            }
+
+            foreach ($questions as $key => $questionData) {
+                $question = new QAQuestions;
+                $question->question_number = $questionData['question_number'];
+                $question->question_text = $questionData['question_text'];
+                $question->question_type = $questionData['question_type'];
+                $question->questionnaire_set_id = $questionnaireSet->id;
+
+                if (isset($questionData['next_nested_question'])) {
+                    $question->next_nested_question = $questionData['next_nested_question'];
+                }
+                if (isset($questionData['next_main_question'])) {
+                    $question->next_main_question = $questionData['next_main_question'];
+                }
+
+                $question->is_start = $questionData['is_start'];
+                $question->is_end = $questionData['is_end'];
+                if (isset($questionData['end_text'])) {
+                    $question->end_text = $questionData['end_text'];
+                }
+
+                $question->order = $key + 1;
+                $question->save();
+            }
+        }
+    }
+}
diff --git a/resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue b/resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue
index 1ad87455..252df086 100644
--- a/resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue
+++ b/resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue
@@ -1,8 +1,10 @@
 <template>
     <div class="row parentContainer">
+        <div class="col-1">{{ item.questionnaire.version }}</div>
         <div class="col-1">{{ item.questionnaire.description }}</div>
         <div class="col-2"> <p>{{ item.question_text }}</p> </div>
         <div class="col-1">{{ item.free_text_answer }}</div>
+        <div class="col-1">{{ item.answer_value }}</div>
         <div class="col-1">{{ item.source_system }}</div>
         <div class="col-1">{{ item.source_marking }}</div>
         <div class="col-2">{{ item.source_email }}</div>
diff --git a/resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue b/resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue
index 4fa8907a..a48c3bf8 100644
--- a/resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue
+++ b/resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue
@@ -13,7 +13,7 @@
                         <div class="col-12 col-md-8">
                             <validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.question_set">
                                 <label class="text-primary">Question Set</label>
-                                <select-component :options="[{'id': 1, 'text': 'Customer Support Satisfaction Survey'}, {'id': 2, 'text': 'First Order Experience Feedback'}, {'id': 3, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
+                                <select-component :options="[{'id': 4, 'text': 'Customer Support Satisfaction Survey'}, {'id': 5, 'text': 'First Order Experience Feedback'}, {'id': 6, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
                             </validation-wrapper-component>
                         </div>
 
diff --git a/resources/views/pages/feedback.blade.php b/resources/views/pages/feedback.blade.php
index e29a3eb6..bccf5204 100644
--- a/resources/views/pages/feedback.blade.php
+++ b/resources/views/pages/feedback.blade.php
@@ -25,9 +25,11 @@
                                         </button>
                                     </anchor-link-component>
                                     <div class="row align-items-center m-t-10 p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
+                                        <div class="col-1">Version</div>
                                         <div class="col-1">Question Set</div>
                                         <div class="col-2">Question Text</div>
-                                        <div class="col-1">Answer</div>
+                                        <div class="col-1">Answer Text</div>
+                                        <div class="col-1">Answer Value</div>
                                         <div class="col-1">Source System</div>
                                         <div class="col-1">Source Marking</div>
                                         <div class="col-2">Source Email</div>

From 3d1d1cce11fd7959556d1774292c12171e17800c Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 21 Nov 2023 19:41:30 +0800
Subject: [PATCH 09/18] Fix feedback answer text not displaying correctly at
 admin dashboard

---
 app/Classes/Modules/Exports/Services/ExportsFeedback.php | 2 +-
 app/Http/Resources/HelpMenuQuestionsAnswersResource.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsFeedback.php b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
index 1e07a854..e83930d4 100644
--- a/app/Classes/Modules/Exports/Services/ExportsFeedback.php
+++ b/app/Classes/Modules/Exports/Services/ExportsFeedback.php
@@ -64,7 +64,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
             $userAnswer->question->questionnaire->version,
             $userAnswer->question->questionnaire->description,
             $userAnswer->question->question_text,
-            $userAnswer->free_text_answer,
+            $answer->display_text,
             $answer->value,
             $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             $user ? $user_marking : $source->marking,
diff --git a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
index 1136ed9b..0d74319a 100644
--- a/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
+++ b/app/Http/Resources/HelpMenuQuestionsAnswersResource.php
@@ -33,7 +33,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
             'question_id' => $this->question_id,
             'questionnaire' => new HelpMenuQuestionnaireSetsResource($this->question->questionnaire),
             'question_text' => $question ? $question->question_text : null,
-            'free_text_answer' => $this->free_text_answer,
+            'free_text_answer' => $answerOption ? $answerOption->display_text : null,
             'answer_value' => $answerOption ? $answerOption->value : null,
             'source_system' => $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
             'source_marking' => $user ? $user_marking : $source->marking,

From babd492caa1908b9ae73e4681cdc316408989f1e Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 22 Nov 2023 03:14:36 +0800
Subject: [PATCH 10/18] Questions should have order by just like answers

---
 .../Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php b/app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php
index ca25eeb7..dd4e8984 100644
--- a/app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php
+++ b/app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php
@@ -59,7 +59,7 @@ class ListQuestionsQALogic extends AbstractControllerLogic
         $delimiter = "|";
         $parts = explode($delimiter, $decriptedToken);
         $questionSet = $parts[3];
-        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet]);
+        $query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet, 'order_by' => (object)['column' => 'order','DESC' => false]]);
         return $this->collectionResponse(HelpMenuQuestionResource::collection($query));
     }
 

From 4c9235cc5390e895926c317969d7f88ab506452c Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 22 Nov 2023 03:22:39 +0800
Subject: [PATCH 11/18] Fix a tiny spelling mistake

---
 .../companies/sections/OnBoardingSectionComponent.vue         | 4 ++--
 resources/views/pages/dashboards/customer.blade.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
index c7b5b154..d80174cf 100644
--- a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
@@ -7,7 +7,7 @@
                         <div class="col">
                             <div class="row align-items-center justify-content-center m-b-10">
                                 <div class="col-auto p-r-10">
-                                    <h5 class="light">Welcome Abroad <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
+                                    <h5 class="light">Welcome Aboard <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
                                 </div>
                                 <div class="col-auto b-a b-thick b-primary padding-5">
                                     <h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
@@ -99,4 +99,4 @@
             </div>
         </div>
     </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/resources/views/pages/dashboards/customer.blade.php b/resources/views/pages/dashboards/customer.blade.php
index 159b504b..614ee62a 100644
--- a/resources/views/pages/dashboards/customer.blade.php
+++ b/resources/views/pages/dashboards/customer.blade.php
@@ -10,7 +10,7 @@
                                     <div class="col">
                                         <div class="row align-items-center justify-content-center m-b-10">
                                             <div class="col-auto p-r-10">
-                                                <h5 class="light">Welcome Abroad, we provide logistics services.</h5>
+                                                <h5 class="light">Welcome Aboard, we provide logistics services.</h5>
                                             </div>
                                             <div class="col-auto b-a b-thick b-primary padding-5">
                                                 <h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
@@ -310,4 +310,4 @@
             </template>
         </list-component>
     </div>
-</div>
\ No newline at end of file
+</div>

From 0bf84fa7b164cc4a5f3283ff21b3dd4837398081 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 26 Nov 2023 22:01:02 +0800
Subject: [PATCH 12/18] update combined invoice and packinglist measurement

---
 resources/views/pages/pdfs/packing_list_measurement.blade.php | 4 +++-
 .../views/pages/pdfs/shipping_invoices_combined.blade.php     | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/packing_list_measurement.blade.php b/resources/views/pages/pdfs/packing_list_measurement.blade.php
index a5770d55..5ec8d32c 100644
--- a/resources/views/pages/pdfs/packing_list_measurement.blade.php
+++ b/resources/views/pages/pdfs/packing_list_measurement.blade.php
@@ -48,6 +48,7 @@
             $packages = $billable_packing_list->packages;
             $totalCBM = 0;
             $totalQty = 0;
+            $order_reference = $invoice_transaction->owner->owner ? $invoice_transaction->owner->owner->reference : null;
         @endphp
         @foreach ($packages as $key => $package)
             @php
@@ -59,7 +60,8 @@
             @endphp
             <tr>
                 <td width="5%" class="center top">{{ $key + 1 }}</td>
-                <td class="description">{!! $package->description  !!}</td>
+                <!-- <td class="description">{!! $package->description  !!}</td> -->
+                <td class="description">{{ $order_reference }}</td>
                 <td width="15%" class="center top" style="text-align: center">
                     {!! $measurement !!}
                 </td>
diff --git a/resources/views/pages/pdfs/shipping_invoices_combined.blade.php b/resources/views/pages/pdfs/shipping_invoices_combined.blade.php
index ce0b7e9c..fb7fb494 100644
--- a/resources/views/pages/pdfs/shipping_invoices_combined.blade.php
+++ b/resources/views/pages/pdfs/shipping_invoices_combined.blade.php
@@ -129,6 +129,8 @@ $grandSubTotal = 0;
     @foreach ($invoice_transactions as $transaction)
         <pagebreak />
         @include('pages.pdfs.shipping_invoice_inner', ['invoice_transaction' => $transaction])
+        <pagebreak />
+        @include('pages.pdfs.packing_list_measurement', ['invoice_transaction' => $transaction])
     @endforeach
 
 

From c9877bb53e023289f0080e7abba3acf258cad60f Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 26 Nov 2023 22:21:02 +0800
Subject: [PATCH 13/18] update packinglist measurement - change from order
 number to packinglist number

---
 resources/views/pages/pdfs/packing_list_measurement.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/packing_list_measurement.blade.php b/resources/views/pages/pdfs/packing_list_measurement.blade.php
index 5ec8d32c..71f167ad 100644
--- a/resources/views/pages/pdfs/packing_list_measurement.blade.php
+++ b/resources/views/pages/pdfs/packing_list_measurement.blade.php
@@ -61,7 +61,7 @@
             <tr>
                 <td width="5%" class="center top">{{ $key + 1 }}</td>
                 <!-- <td class="description">{!! $package->description  !!}</td> -->
-                <td class="description">{{ $order_reference }}</td>
+                <td class="description">{{ $billable_packing_list->owner->reference }}</td>
                 <td width="15%" class="center top" style="text-align: center">
                     {!! $measurement !!}
                 </td>

From 5cdbc09c5becc8124da8c79d85a0cf5c927358de Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 26 Nov 2023 23:45:32 +0800
Subject: [PATCH 14/18] update packinglist measurement - add order number

---
 resources/views/pages/pdfs/packing_list_measurement.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/pdfs/packing_list_measurement.blade.php b/resources/views/pages/pdfs/packing_list_measurement.blade.php
index 71f167ad..e17ceb7a 100644
--- a/resources/views/pages/pdfs/packing_list_measurement.blade.php
+++ b/resources/views/pages/pdfs/packing_list_measurement.blade.php
@@ -61,7 +61,7 @@
             <tr>
                 <td width="5%" class="center top">{{ $key + 1 }}</td>
                 <!-- <td class="description">{!! $package->description  !!}</td> -->
-                <td class="description">{{ $billable_packing_list->owner->reference }}</td>
+                <td class="description">{!! $order_reference . '<br>' . $billable_packing_list->owner->reference  !!}</td>
                 <td width="15%" class="center top" style="text-align: center">
                     {!! $measurement !!}
                 </td>

From 12f05b7aa66b7cb5acf7f3d6427cd323e1e511be Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 28 Nov 2023 22:15:36 +0800
Subject: [PATCH 15/18] add paymentUnknownOrderLog

---
 app/Http/Resources/WalletTransactionResource.php | 2 ++
 config/logging.php                               | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/Http/Resources/WalletTransactionResource.php b/app/Http/Resources/WalletTransactionResource.php
index 2550a061..141da749 100644
--- a/app/Http/Resources/WalletTransactionResource.php
+++ b/app/Http/Resources/WalletTransactionResource.php
@@ -33,12 +33,14 @@ class WalletTransactionResource extends JsonResource
             case TransactionType::PAYMENT:
                 $invoice = Transaction::where('payment_reference', $this->bill_no)->first();
                 if(!$invoice) {
+                    Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
                     $description = 'Payment for unknown invoice, please contact tech support.';
                     break;
                 }
 
                 $order = $invoice->owner->owner->owner;
                 if(!$order) {
+                    Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
                     $description = 'Payment for unknown order, please contact tech support.';
                     break;
                 }
diff --git a/config/logging.php b/config/logging.php
index 1aa06aa3..5868ffb5 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -100,6 +100,12 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
+
+        'paymentUnknownOrderLog' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/paymentUnknownOrderLog.log'),
+            'level' => 'info',
+        ],
     ],
 
 ];

From 4c532deb4d2139baec5ce2f95eedc55ce29317cc Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 28 Nov 2023 22:44:36 +0800
Subject: [PATCH 16/18] debug yd address update

---
 .../Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
index efcfd697..2273e10b 100644
--- a/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
+++ b/app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
@@ -72,6 +72,7 @@ class UpdateDoFromYDPortalProcessor
 
 
         } catch (\Exception $exception){
+            log::debug($exception);
             throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
         }
     }

From 6b09d5faccbce105c08fd4ac29a13b58ec134755 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Fri, 8 Dec 2023 13:41:00 +0800
Subject: [PATCH 17/18] Minor update on question text

---
 database/seeders/QAQuestions2Seeder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/database/seeders/QAQuestions2Seeder.php b/database/seeders/QAQuestions2Seeder.php
index 54e55edc..452eb4d5 100644
--- a/database/seeders/QAQuestions2Seeder.php
+++ b/database/seeders/QAQuestions2Seeder.php
@@ -47,7 +47,7 @@ class QAQuestions2Seeder extends Seeder
                     $questions = [
                         [
                             'question_number' => 10,
-                            'question_text' => 'On a scale of 1 to 5, how satisfied are you with the time it took to receive a response?',
+                            'question_text' => 'How satisfied are you with the time it took to receive a response?',
                             'question_type' => QAType::MULTIPLE_CHOICES,
                             'is_start' => true,
                             'is_end' => false,
@@ -86,7 +86,7 @@ class QAQuestions2Seeder extends Seeder
                         ],
                         [
                             'question_number' => 30,
-                            'question_text' => 'On a scale of 1 to 5, how satisfied are you with the delivery time?',
+                            'question_text' => 'How satisfied are you with the delivery time?',
                             'question_type' => QAType::MULTIPLE_CHOICES,
                             'is_start' => false,
                             'is_end' => true,

From 6d3a2d9259dd152aebc6fa01d7defb810cb5db91 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 9 Dec 2023 12:50:12 +0800
Subject: [PATCH 18/18] Update title for public feedback form page requested by
 Omair

---
 resources/views/pages/feedback/customer.blade.php | 1 +
 resources/views/vendor/head.blade.php             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/feedback/customer.blade.php b/resources/views/pages/feedback/customer.blade.php
index 5decb580..39527063 100644
--- a/resources/views/pages/feedback/customer.blade.php
+++ b/resources/views/pages/feedback/customer.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.base_no_login')
+@section('title', 'Share Your Feedback - CIEF Customer Service')
 @section('inner_content')
     <feedback-customer-section-component token="{{$token}}"></feedback-customer-section-component>
 @endsection
diff --git a/resources/views/vendor/head.blade.php b/resources/views/vendor/head.blade.php
index 6173a632..f36a5b76 100644
--- a/resources/views/vendor/head.blade.php
+++ b/resources/views/vendor/head.blade.php
@@ -8,7 +8,7 @@
 
 <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
 <meta charset="utf-8"/>
-<title>IZYIM Shipping</title>
+<title>@yield('title', 'IZYIM Shipping')</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no"/>
 <link rel="apple-touch-icon" sizes="57x57" href="{{asset('images/favicon/apple-icon-57x57.png')}}">
 <link rel="apple-touch-icon" sizes="60x60" href="{{asset('images/favicon/apple-icon-60x60.png')}}">
@@ -28,4 +28,4 @@
 <meta name="theme-color" content="#ffffff">
 <meta name="csrf-token" content="{{ csrf_token() }}">
 <link href="{{ asset('css/vendor.css') }}" rel="stylesheet" type="text/css"/>
-<link href="{{ asset('css/site.css') }}" rel="stylesheet" type="text/css"/>
\ No newline at end of file
+<link href="{{ asset('css/site.css') }}" rel="stylesheet" type="text/css"/>