From e7a63149b30b8083e5b52e8abb62364dd31fcc6e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 18 Jun 2024 13:43:57 +0800
Subject: [PATCH 01/41] revert update pending_orders, exclude approved refunds
 order from pending_orders list

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 469e2625..5d79c691 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,7 +403,7 @@ Route::get('/segments', function (Request $request) {
 Route::get('/pending_orders', function(){
     $payments = Transaction::where('type', TransactionType::PAYMENT)->where('owner_type', Booking::class)->whereIn('status', [ApprovalStatus::APPROVED])
         ->whereDoesntHave('transactions', function ($query) {
-            return $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);
+            return $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::PENDING_SUBMISSION, ApprovalStatus::PENDING_VERIFICATION]);
         })
         ->get();
 

From 60b1bbeee6ac614058d9299c9e6f9d875a648e80 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 21 Jun 2024 15:11:10 +0800
Subject: [PATCH 02/41] admin 1688 work flow template

---
 .../AdminWorkFlowSectionComponent.vue         | 77 +++++++++++++++++++
 .../dashboards/admin_work_flow.blade.php      |  4 +
 routes/web.php                                |  3 +
 3 files changed, 84 insertions(+)
 create mode 100644 resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
 create mode 100644 resources/views/pages/dashboards/admin_work_flow.blade.php

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
new file mode 100644
index 00000000..bd75c002
--- /dev/null
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -0,0 +1,77 @@
+<template>
+    <div class="row justify-content-center align-items-center text-center" style="min-height: 80vh;">
+        <div class="col">
+            <div v-if="currentQuestion">
+                <h2>{{ currentQuestion.text }}</h2>
+                <div v-for="(answer, index) in currentQuestion.answers" :key="index">
+                    <button @click="selectAnswer(answer.next)" class="btn btn-primary">
+                        {{ answer.text }}
+                    </button>
+                </div>
+            </div>
+            <div v-else>
+                <div v-if="readyToWork">
+                    <h1>Are you ready to work today?</h1>
+                    <div class="row">
+                        <div class="col">
+                            <button @click="startQuiz" class="btn btn-primary">Yes</button>
+                            <button @click="readyToWork = !readyToWork" class="btn btn-primary">No</button>
+                        </div>
+                    </div>
+                </div>
+                <div v-else>
+                    <h1>Come back when you are ready to work</h1>
+                    <button onClick="window.location.reload();" class="btn btn-primary">Refresh Page</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'QuizApp',
+    data() {
+        return {
+            questions: {
+                1: { 
+                    text: 'What will you work on?', 
+                    answers: [
+                        { text: '1688', next: '1688' }, 
+                        { text: 'Approve PO', next: 'approve_po' }, 
+                        { text: 'Fill PO', next: 'fill_po' }
+                    ] 
+                },
+                '1688': { text: 'Q1-A1', answers: [{ text: 'A1-A1', next: 'q1-a1-a1' }, { text: 'A1-A2', next: 'q1-a1-a2' }] },
+                'approve_po': { text: 'Q1-A2', answers: [] },
+                'fill_po': { text: 'Q1-A3', answers: [] },
+            },
+            currentQuestionId: null,
+            readyToWork: true
+        };
+    },
+    computed: {
+        currentQuestion() {
+            return this.questions[this.currentQuestionId];
+        }
+    },
+    methods: {
+        startQuiz() {
+            this.currentQuestionId = 1;
+        },
+        selectAnswer(nextQuestionId) {
+            this.currentQuestionId = nextQuestionId;
+        }
+    }
+};
+</script>
+
+<style scoped>
+.container {
+    margin: 20px;
+}
+
+.btn {
+    margin: 5px;
+}
+</style>
\ No newline at end of file
diff --git a/resources/views/pages/dashboards/admin_work_flow.blade.php b/resources/views/pages/dashboards/admin_work_flow.blade.php
new file mode 100644
index 00000000..4fe3ddb2
--- /dev/null
+++ b/resources/views/pages/dashboards/admin_work_flow.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <admin-work-flow-section-component></admin-work-flow-section-component>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 12269a21..9ee682ae 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1190,3 +1190,6 @@ Route::get('check-duplicate-refunds', function () {
     echo '</table>';
 });
 
+Route::get('/admin-work-flow', function () {
+    return view('pages.dashboards.admin_work_flow');
+})->name('admin-work-flow');

From 286ed8c73cf99649d5e7c3f8eb0a690dcf0d2517 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Fri, 21 Jun 2024 17:54:04 +0800
Subject: [PATCH 03/41] added approve_po v-if condition and the order number
 box for approve_po as well as the designated buttons

---
 .../AdminWorkFlowSectionComponent.vue         | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index bd75c002..ade11bf4 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -3,10 +3,22 @@
         <div class="col">
             <div v-if="currentQuestion">
                 <h2>{{ currentQuestion.text }}</h2>
-                <div v-for="(answer, index) in currentQuestion.answers" :key="index">
-                    <button @click="selectAnswer(answer.next)" class="btn btn-primary">
-                        {{ answer.text }}
-                    </button>
+                <div v-if="currentQuestionId === 'approve_po'">
+                    <div class="box">
+                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
+                            <p>{{ order }}</p>
+                        </div>
+                    </div>
+                    <button @click="selectOrder(order, 'approve')" class="btn btn-primary">Approve PO</button>
+                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
+                    <button @click="selectOrder(order, 'reject')" class="btn btn-primary">Reject PO</button>
+                </div>
+                <div v-else>
+                    <div v-for="(answer, index) in currentQuestion.answers" :key="index">
+                        <button @click="selectAnswer(answer.next)" class="btn btn-primary">
+                            {{ answer.text }}
+                        </button>
+                    </div>
                 </div>
             </div>
             <div v-else>
@@ -43,11 +55,12 @@ export default {
                     ] 
                 },
                 '1688': { text: 'Q1-A1', answers: [{ text: 'A1-A1', next: 'q1-a1-a1' }, { text: 'A1-A2', next: 'q1-a1-a2' }] },
-                'approve_po': { text: 'Q1-A2', answers: [] },
+                'approve_po': { text: 'Order Numbers', answers: [] },
                 'fill_po': { text: 'Q1-A3', answers: [] },
             },
             currentQuestionId: null,
-            readyToWork: true
+            readyToWork: true,
+            orderNumbers: ['Order 123', 'Order 456', 'Order 789']
         };
     },
     computed: {
@@ -61,6 +74,15 @@ export default {
         },
         selectAnswer(nextQuestionId) {
             this.currentQuestionId = nextQuestionId;
+        },
+        selectOrder(order, action) {
+            if (action === 'approve') {
+                alert(`${order} has been approved.`);
+            } else if (action === 'edit') {
+                alert(`Editing ${order}.`);
+            } else if (action === 'reject') {
+                alert(`${order} has been rejected.`);
+            }
         }
     }
 };
@@ -74,4 +96,15 @@ export default {
 .btn {
     margin: 5px;
 }
-</style>
\ No newline at end of file
+
+.box {
+    border: 1px solid #ddd;
+    padding: 20px;
+    margin-top: 20px;
+    border-radius: 8px;
+}
+
+.order {
+    margin-bottom: 15px;
+}
+</style>

From 6a8006c0b0039a8b1d6dcfebf9c757b2951df07a Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 25 Jun 2024 13:27:14 +0800
Subject: [PATCH 04/41] continue workflow, added Issue, approve PO and edit
 order

---
 .../AdminWorkFlowSectionComponent.vue         | 101 ++++++++++++++++--
 1 file changed, 95 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index ade11bf4..8c28cdac 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -3,16 +3,47 @@
         <div class="col">
             <div v-if="currentQuestion">
                 <h2>{{ currentQuestion.text }}</h2>
-                <div v-if="currentQuestionId === 'approve_po'">
+                <div v-if="currentQuestionId === 'fill_po'">
                     <div class="box">
                         <div v-for="(order, index) in orderNumbers" :key="index" class="order">
                             <p>{{ order }}</p>
                         </div>
+                        Total: CNY
+                    </div>
+                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
+                </div>
+                <div v-else-if="currentQuestionId === 'approve_po'"> 
+                    <div class="box">
+                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
+                            <p>{{ order }}</p>
+                        </div>
+                        Total: CNY
                     </div>
                     <button @click="selectOrder(order, 'approve')" class="btn btn-primary">Approve PO</button>
                     <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
                     <button @click="selectOrder(order, 'reject')" class="btn btn-primary">Reject PO</button>
                 </div>
+                <div v-else-if="currentQuestionId === 'edit_po'">
+                    <div class="box">
+                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
+                            <input v-model="orderNumbers[index]" class="form-control" />
+                        </div>
+                        <button @click="addOrder" class="btn btn-primary">Add Order</button>
+                        <div>Total: CNY</div>
+                    </div>
+                    <button @click="issueOrders" class="btn btn-primary">Issue?</button>
+                    <button @click="saveOrders" class="btn btn-primary">Done</button>
+                </div>
+                <div v-else-if="currentQuestionId === 'issue_po'">
+                    <div class="box">
+                        <h3>What issue did you encounter?</h3>
+                        <input type="text" id="issue" class="text-box" placeholder="Describe the issue...">
+                        <div class="upload-text">Upload an image if needed</div>
+                        <input type="file" id="image-upload" class="image-upload">
+                    </div>
+                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Back</button>
+                    <button @click="submit" class="btn btn-primary">Submit issue</button>
+                </div>
                 <div v-else>
                     <div v-for="(answer, index) in currentQuestion.answers" :key="index">
                         <button @click="selectAnswer(answer.next)" class="btn btn-primary">
@@ -54,9 +85,36 @@ export default {
                         { text: 'Fill PO', next: 'fill_po' }
                     ] 
                 },
-                '1688': { text: 'Q1-A1', answers: [{ text: 'A1-A1', next: 'q1-a1-a1' }, { text: 'A1-A2', next: 'q1-a1-a2' }] },
-                'approve_po': { text: 'Order Numbers', answers: [] },
-                'fill_po': { text: 'Q1-A3', answers: [] },
+                '1688': { 
+                    text: 'Q1-A1', 
+                    answers: [
+                        { text: 'A1-A1', next: 'q1-a1-a1' }, 
+                        { text: 'A1-A2', next: 'q1-a1-a2' }
+                        ] 
+                },
+                'approve_po': {},
+                'fill_po': {},
+                'po_filled': {
+                    text: 'PO Filled',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working' },
+                        { text: 'Next PO', next: 'approve_po' }
+                    ]
+                },
+                'submit_po' : {},
+                'po_approved': {
+                    text: 'PO Approved',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working' },
+                        { text: 'Next PO', next: 'approve_po' }
+                    ]
+                },
+                'edit_po': {},
+                'issue_po': {},
+                'stop_working': {
+                    text: 'Thank you for your work!',
+                    answers: []
+                }
             },
             currentQuestionId: null,
             readyToWork: true,
@@ -77,12 +135,25 @@ export default {
         },
         selectOrder(order, action) {
             if (action === 'approve') {
-                alert(`${order} has been approved.`);
+                this.currentQuestionId = 'po_approved';
             } else if (action === 'edit') {
-                alert(`Editing ${order}.`);
+                this.currentQuestionId = 'edit_po';
             } else if (action === 'reject') {
                 alert(`${order} has been rejected.`);
             }
+        },
+        addOrder() {
+            this.orderNumbers.push('');
+        },
+        saveOrders() {
+            alert('Orders have been saved: ' + this.orderNumbers.join(', '));
+            this.currentQuestionId = 'po_filled';
+        },
+        issueOrders(){
+            this.currentQuestionId = 'issue_po';
+        },
+        submit() {
+
         }
     }
 };
@@ -107,4 +178,22 @@ export default {
 .order {
     margin-bottom: 15px;
 }
+
+.image-upload {
+            width: 80%;
+            padding: 10px;
+            font-size: 16px;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            margin-bottom:10px;
+        }
+
+.text-box {
+            width: 80%;
+            padding: 10px;
+            font-size: 16px;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            margin-bottom: 20px;
+        }        
 </style>

From 33e6bec7528f2d1e3166117987b3c45d5837f6fb Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 16 Jul 2024 13:19:18 +0800
Subject: [PATCH 05/41] Finished up 1688 workflow, approve PO and fill PO

---
 .../AdminWorkFlowSectionComponent.vue         | 175 ++++++++++++++++--
 1 file changed, 163 insertions(+), 12 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 8c28cdac..7add11bf 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -12,6 +12,28 @@
                     </div>
                     <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
                 </div>
+                <div v-else-if="currentQuestionId === '1688'">
+                    <div>Login Information</div>
+                    <login-form-component></login-form-component>
+                    <button @click="selectOrder(order, 'issue_login')" class="btn btn-primary">Login Issue</button>
+                    <button @click="selectOrder(order, 'dummy_login')" class="btn btn-primary">Login Succesful</button>
+                </div>
+                <div v-else-if="currentQuestionId === 'login_successful'">
+                    <div>Order Information</div>
+                    <button @click="selectOrder(order, 'error_order')" class="btn btn-primary">Can't very order?</button>
+                    <button @click="selectOrder(order, 'verify_order')" class="btn btn-primary">Order Verified</button>
+                </div>
+                <div v-else-if="currentQuestionId === 'order_verify'">
+                    <div>Order Amount</div>
+                    <div class="box">
+                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
+                            <input v-model="orderNumbers[index]" class="form-control" />
+                        </div>
+                        CNY
+                    </div>
+                    <button @click="selectOrder(order, 'yes_order')" class="btn btn-primary">Yes</button>
+                    <button @click="selectOrder(order, 'back_order')" class="btn btn-primary">Back</button>
+                </div>
                 <div v-else-if="currentQuestionId === 'approve_po'"> 
                     <div class="box">
                         <div v-for="(order, index) in orderNumbers" :key="index" class="order">
@@ -31,17 +53,43 @@
                         <button @click="addOrder" class="btn btn-primary">Add Order</button>
                         <div>Total: CNY</div>
                     </div>
-                    <button @click="issueOrders" class="btn btn-primary">Issue?</button>
+                    <button @click="issueOthers" class="btn btn-primary">Issue?</button>
                     <button @click="saveOrders" class="btn btn-primary">Done</button>
                 </div>
-                <div v-else-if="currentQuestionId === 'issue_po'">
+                <div v-else-if="currentQuestionId === '1688_submit'">
+                    <div class="box">
+                        <h3>Upload English PO</h3>
+                        <input type="file" id="image-upload" class="image-upload">
+                    </div>
+                    <div class="box">
+                        <h3>Upload China PO</h3>
+                        <input type="file" id="image-upload" class="image-upload">
+                    </div>
+                    <div class="box">
+                        <h3>Upload bank slip</h3>
+                        <input type="file" id="image-upload" class="image-upload">
+                    </div>
+                    <button @click="nextorder" class="btn btn-primary">Proceed to next order</button>
+                    <button @click="submit_issue" class="btn btn-primary">Submit</button>
+                </div>
+                <div v-else-if="currentQuestionId === 'po_others'">
                     <div class="box">
                         <h3>What issue did you encounter?</h3>
                         <input type="text" id="issue" class="text-box" placeholder="Describe the issue...">
                         <div class="upload-text">Upload an image if needed</div>
                         <input type="file" id="image-upload" class="image-upload">
                     </div>
-                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Back</button>
+                    <button @click="issueOthers" class="btn btn-primary">Back</button>
+                    <button @click="submit" class="btn btn-primary">Submit issue</button>
+                </div>
+                <div v-else-if="currentQuestionId === '1688_others'">
+                    <div class="box">
+                        <h3>What issue did you encounter?</h3>
+                        <input type="text" id="issue" class="text-box" placeholder="Describe the issue...">
+                        <div class="upload-text">Upload an image if needed</div>
+                        <input type="file" id="image-upload" class="image-upload">
+                    </div>
+                    <button @click="issue1688" class="btn btn-primary">Back</button>
                     <button @click="submit" class="btn btn-primary">Submit issue</button>
                 </div>
                 <div v-else>
@@ -85,12 +133,66 @@ export default {
                         { text: 'Fill PO', next: 'fill_po' }
                     ] 
                 },
-                '1688': { 
-                    text: 'Q1-A1', 
+                '1688': {},
+                'issue_login': {
+                    text: 'Login Issues',
                     answers: [
-                        { text: 'A1-A1', next: 'q1-a1-a1' }, 
-                        { text: 'A1-A2', next: 'q1-a1-a2' }
-                        ] 
+                        { text: 'Need TAC', next: 'issue_submit'},
+                        { text: 'Wrong login details', next: 'issue_submit'},
+                        { text: 'Others', next: 'po_others'},
+                        { text: 'Order Cancelled', next: 'refund_request'},
+                    ]
+                },
+                'login_successful': {},
+                'issue_order': {
+                    answers: [
+                        { text: 'Amount not found', next: 'issue_submit'},
+                        { text: 'Plus Member', next: 'issue_submit'},
+                        { text: 'Others', next: 'po_others'},
+                        { text: 'Customer Did not verify 1688 account', next: 'issue_submit'},
+                        { text: 'WorldFirst account linked another account', next: 'issue_submit'},
+                        { text: 'Back', next: 'login_successful'},
+                    ]
+                },
+                'order_verify': {},
+                'order_verification': {
+                    text: 'Are You Sure this is the correct amount?',
+                    answers: [
+                        {text: 'Yes', next: 'proceed_order'},
+                        {text: 'No', next: 'insufficient_order'}
+                    ]
+                },
+                'proceed_order': {
+                    text: 'Please proceed the order on 1688',
+                    answers: [
+                        {text: 'Got Issue', next: '1688_order_issue'},
+                        {text: 'Done', next: '1688_submit'}
+                    ]
+                },
+                '1688_order_issue': {
+                    answers: [
+                        {text: 'Wrong Pin Number', next: '1688_issue_submit'},
+                        {text: 'Not Enough Stock', next: '1688_issue_submit'},
+                        {text: 'Others', next: '1688_others'},
+                        {text: 'No CrossBoarder', next: '1688_issue_submit'},
+                        {text: 'AngPau', next: '1688_issue_submit'}
+                    ]
+                },
+                '1688_others': {},
+                '1688_submit': {},
+                '1688_issue_submit': {
+                    text: 'Issue has been submitted',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working'},
+                        { text: 'Next Order', next: '1688'}
+                    ]
+                },
+                'refund_request': {
+                    text: 'Refund Request sent',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working' },
+                        { text: 'Next PO', next: 'approve_po' }
+                    ]
                 },
                 'approve_po': {},
                 'fill_po': {},
@@ -110,10 +212,38 @@ export default {
                     ]
                 },
                 'edit_po': {},
-                'issue_po': {},
+                'po_others': {},
+                'reject_po': {
+                    text: 'PO Rejected',
+                    answers: [
+                        { text: 'Issue', next: 'issue_po' },
+                        { text: 'Back', next: 'approve_po' } 
+                    ]
+                },
+                'issue_po': {
+                    answers: [
+                        { text: 'Sensitive Goods', next: 'issue_submit'},
+                        { text: 'Others', next: 'po_others'},
+                        { text: 'Stop Working', next: 'stop_working'},
+                        { text: 'Next PO', next: 'approve_po'}
+                    ]
+                },
+                'issue_submit': {
+                    text: 'Issue has been submitted',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working'},
+                        { text: 'Next Order', next: 'approve_po'}
+                    ]
+                },
+                '1688_issue_submitted': {
+                    text: 'Issue has been submitted',
+                    answers: [
+                        { text: 'Stop Working', next: 'stop_working'},
+                        { text: 'Next Order', next: '1688'}
+                    ]
+                },
                 'stop_working': {
                     text: 'Thank you for your work!',
-                    answers: []
                 }
             },
             currentQuestionId: null,
@@ -139,7 +269,19 @@ export default {
             } else if (action === 'edit') {
                 this.currentQuestionId = 'edit_po';
             } else if (action === 'reject') {
-                alert(`${order} has been rejected.`);
+                this.currentQuestionId = 'reject_po';
+            } else if (action == 'issue_login') {
+                this.currentQuestionId = 'issue_login'
+            } else if (action == 'dummy_login') {
+                this.currentQuestionId = 'login_successful'
+            } else if (action == 'error_order') {
+                this.currentQuestionId = 'issue_order'
+            } else if (action == 'verify_order') {
+                this.currentQuestionId = 'order_verify'
+            } else if (action == 'back_order') {
+                this.currentQuestionId = 'login_successful'
+            } else if (action == 'yes_order') {
+                this.currentQuestionId = 'order_verification'
             }
         },
         addOrder() {
@@ -149,9 +291,18 @@ export default {
             alert('Orders have been saved: ' + this.orderNumbers.join(', '));
             this.currentQuestionId = 'po_filled';
         },
-        issueOrders(){
+        nextorder() {
+             this.currentQuestionId = '1688';
+        },
+        issueOthers(){
             this.currentQuestionId = 'issue_po';
         },
+        issue1688() {
+            this.currentQuestionId = '1688_order_issue';
+        },
+        submit_issue() {
+            this.currentQuestionId = '1688_issue_submitted';
+        },
         submit() {
 
         }

From f7bd74bee4cca4f7ccf188244ea11a0634c61dc7 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 18 Jul 2024 15:33:39 +0800
Subject: [PATCH 06/41] made buttons bigger and align them horizontally

---
 .../AdminWorkFlowSectionComponent.vue         | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 7add11bf..3190ed5e 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -16,11 +16,11 @@
                     <div>Login Information</div>
                     <login-form-component></login-form-component>
                     <button @click="selectOrder(order, 'issue_login')" class="btn btn-primary">Login Issue</button>
-                    <button @click="selectOrder(order, 'dummy_login')" class="btn btn-primary">Login Succesful</button>
+                    <button @click="selectOrder(order, 'dummy_login')" class="btn btn-primary">Login Successful</button>
                 </div>
                 <div v-else-if="currentQuestionId === 'login_successful'">
                     <div>Order Information</div>
-                    <button @click="selectOrder(order, 'error_order')" class="btn btn-primary">Can't very order?</button>
+                    <button @click="selectOrder(order, 'error_order')" class="btn btn-primary">Can't verify order?</button>
                     <button @click="selectOrder(order, 'verify_order')" class="btn btn-primary">Order Verified</button>
                 </div>
                 <div v-else-if="currentQuestionId === 'order_verify'">
@@ -93,10 +93,12 @@
                     <button @click="submit" class="btn btn-primary">Submit issue</button>
                 </div>
                 <div v-else>
-                    <div v-for="(answer, index) in currentQuestion.answers" :key="index">
-                        <button @click="selectAnswer(answer.next)" class="btn btn-primary">
-                            {{ answer.text }}
-                        </button>
+                    <div class="answer-container">
+                        <div v-for="(answer, index) in currentQuestion.answers" :key="index" class="answer-item">
+                            <button @click="selectAnswer(answer.next)" class="btn btn-primary">
+                                {{ answer.text }}
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -315,10 +317,6 @@ export default {
     margin: 20px;
 }
 
-.btn {
-    margin: 5px;
-}
-
 .box {
     border: 1px solid #ddd;
     padding: 20px;
@@ -331,20 +329,37 @@ export default {
 }
 
 .image-upload {
-            width: 80%;
-            padding: 10px;
-            font-size: 16px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            margin-bottom:10px;
-        }
+    width: 80%;
+    padding: 10px;
+    font-size: 16px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    margin-bottom: 10px;
+}
 
 .text-box {
-            width: 80%;
-            padding: 10px;
-            font-size: 16px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            margin-bottom: 20px;
-        }        
+    width: 80%;
+    padding: 10px;
+    font-size: 16px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    margin-bottom: 20px;
+}
+
+.btn {
+    margin: 5px;
+    font-size: 18px; /* Adjust the font size */
+    padding: 12px 24px; /* Adjust the padding */
+    border-radius: 4px; /* Optional: adjust border radius */
+}
+
+.answer-container {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+}
+
+.answer-item {
+    margin: 10px;
+}
 </style>

From 8d48f6f4eb42d6d038dc3b5443244bd8cdc7cd84 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 22 Jul 2024 01:12:51 +0800
Subject: [PATCH 07/41] 1688 admin work flow clean up and call api

---
 app/Models/WorkflowTimestamp.php              |  47 ++
 ...22302_create_workflow_timestamps_table.php |  35 +
 .../AdminWorkFlowSectionComponent.vue         | 602 +++++++++---------
 routes/admin_work_flow.php                    |  90 +++
 routes/api.php                                |   2 +
 5 files changed, 470 insertions(+), 306 deletions(-)
 create mode 100644 app/Models/WorkflowTimestamp.php
 create mode 100644 database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
 create mode 100644 routes/admin_work_flow.php

diff --git a/app/Models/WorkflowTimestamp.php b/app/Models/WorkflowTimestamp.php
new file mode 100644
index 00000000..bb189afb
--- /dev/null
+++ b/app/Models/WorkflowTimestamp.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class WorkflowTimestamp extends Model
+{
+    use HasFactory;
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'workflow_timestamps';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'node',
+        'seconds',
+        'userId',
+        'session_id'
+    ];
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'timestamp' => 'datetime',
+    ];
+
+    /**
+     * Get the user that owns the workflow timestamp.
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'userId');
+    }
+}
diff --git a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
new file mode 100644
index 00000000..5a166ffd
--- /dev/null
+++ b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateWorkflowTimestampsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('workflow_timestamps', function (Blueprint $table) {
+            $table->id();
+            $table->string('node');
+            $table->integer('seconds');
+            $table->unsignedBigInteger('userId');
+            $table->string('session_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('workflow_timestamps');
+    }
+}
diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 3190ed5e..1d88a6ea 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -1,120 +1,119 @@
 <template>
     <div class="row justify-content-center align-items-center text-center" style="min-height: 80vh;">
         <div class="col">
-            <div v-if="currentQuestion">
-                <h2>{{ currentQuestion.text }}</h2>
-                <div v-if="currentQuestionId === 'fill_po'">
-                    <div class="box">
-                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
-                            <p>{{ order }}</p>
-                        </div>
-                        Total: CNY
-                    </div>
-                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
-                </div>
-                <div v-else-if="currentQuestionId === '1688'">
-                    <div>Login Information</div>
-                    <login-form-component></login-form-component>
-                    <button @click="selectOrder(order, 'issue_login')" class="btn btn-primary">Login Issue</button>
-                    <button @click="selectOrder(order, 'dummy_login')" class="btn btn-primary">Login Successful</button>
-                </div>
-                <div v-else-if="currentQuestionId === 'login_successful'">
-                    <div>Order Information</div>
-                    <button @click="selectOrder(order, 'error_order')" class="btn btn-primary">Can't verify order?</button>
-                    <button @click="selectOrder(order, 'verify_order')" class="btn btn-primary">Order Verified</button>
-                </div>
-                <div v-else-if="currentQuestionId === 'order_verify'">
-                    <div>Order Amount</div>
-                    <div class="box">
-                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
-                            <input v-model="orderNumbers[index]" class="form-control" />
-                        </div>
-                        CNY
-                    </div>
-                    <button @click="selectOrder(order, 'yes_order')" class="btn btn-primary">Yes</button>
-                    <button @click="selectOrder(order, 'back_order')" class="btn btn-primary">Back</button>
-                </div>
-                <div v-else-if="currentQuestionId === 'approve_po'"> 
-                    <div class="box">
-                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
-                            <p>{{ order }}</p>
-                        </div>
-                        Total: CNY
-                    </div>
-                    <button @click="selectOrder(order, 'approve')" class="btn btn-primary">Approve PO</button>
-                    <button @click="selectOrder(order, 'edit')" class="btn btn-primary">Edit PO</button>
-                    <button @click="selectOrder(order, 'reject')" class="btn btn-primary">Reject PO</button>
-                </div>
-                <div v-else-if="currentQuestionId === 'edit_po'">
-                    <div class="box">
-                        <div v-for="(order, index) in orderNumbers" :key="index" class="order">
-                            <input v-model="orderNumbers[index]" class="form-control" />
-                        </div>
-                        <button @click="addOrder" class="btn btn-primary">Add Order</button>
-                        <div>Total: CNY</div>
-                    </div>
-                    <button @click="issueOthers" class="btn btn-primary">Issue?</button>
-                    <button @click="saveOrders" class="btn btn-primary">Done</button>
-                </div>
-                <div v-else-if="currentQuestionId === '1688_submit'">
-                    <div class="box">
-                        <h3>Upload English PO</h3>
-                        <input type="file" id="image-upload" class="image-upload">
-                    </div>
-                    <div class="box">
-                        <h3>Upload China PO</h3>
-                        <input type="file" id="image-upload" class="image-upload">
-                    </div>
-                    <div class="box">
-                        <h3>Upload bank slip</h3>
-                        <input type="file" id="image-upload" class="image-upload">
-                    </div>
-                    <button @click="nextorder" class="btn btn-primary">Proceed to next order</button>
-                    <button @click="submit_issue" class="btn btn-primary">Submit</button>
-                </div>
-                <div v-else-if="currentQuestionId === 'po_others'">
-                    <div class="box">
-                        <h3>What issue did you encounter?</h3>
-                        <input type="text" id="issue" class="text-box" placeholder="Describe the issue...">
-                        <div class="upload-text">Upload an image if needed</div>
-                        <input type="file" id="image-upload" class="image-upload">
-                    </div>
-                    <button @click="issueOthers" class="btn btn-primary">Back</button>
-                    <button @click="submit" class="btn btn-primary">Submit issue</button>
-                </div>
-                <div v-else-if="currentQuestionId === '1688_others'">
-                    <div class="box">
-                        <h3>What issue did you encounter?</h3>
-                        <input type="text" id="issue" class="text-box" placeholder="Describe the issue...">
-                        <div class="upload-text">Upload an image if needed</div>
-                        <input type="file" id="image-upload" class="image-upload">
-                    </div>
-                    <button @click="issue1688" class="btn btn-primary">Back</button>
-                    <button @click="submit" class="btn btn-primary">Submit issue</button>
-                </div>
-                <div v-else>
-                    <div class="answer-container">
-                        <div v-for="(answer, index) in currentQuestion.answers" :key="index" class="answer-item">
-                            <button @click="selectAnswer(answer.next)" class="btn btn-primary">
-                                {{ answer.text }}
-                            </button>
-                        </div>
-                    </div>
+            <h1 class="m-b-50" :class="{ 'text-success': timer }">{{ formattedTime }}</h1>
+            <div v-if="isLoading" class="row">
+                <div class="col">
+                    <loading-component></loading-component>
                 </div>
             </div>
-            <div v-else>
-                <div v-if="readyToWork">
-                    <h1>Are you ready to work today?</h1>
-                    <div class="row">
-                        <div class="col">
-                            <button @click="startQuiz" class="btn btn-primary">Yes</button>
-                            <button @click="readyToWork = !readyToWork" class="btn btn-primary">No</button>
+            <div v-else class="row">
+                <div class="col">
+                    <div v-if="currentQuestion && Object.keys(currentQuestion).length">
+                        <h2 v-if="currentQuestion.text">{{ currentQuestion.text }}</h2>
+
+                        <div v-if="currentQuestionId === '1688'">
+                            <h1>Login Information</h1>
+                            <div v-if="externalApiResponse.data"
+                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                        <a :href="route('booking.details', externalApiResponse.data.booking_marking)"
+                                            target="_blank">{{ externalApiResponse.data.booking_marking }}</a>
+                                    </h3>
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">1688 LOGIN ID/EMAIL/PHONE: </span>
+                                        {{ externalApiResponse.data.account_no }}
+                                    </h3>
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">1688 LOGIN PASSWORD: </span>
+                                        {{ externalApiResponse.data.holder_name }}
+                                    </h3>
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ALIPAY 6-DIGIT PAYMENT PIN: </span>
+                                        {{ externalApiResponse.data.pin }}
+                                    </h3>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
                         </div>
+
+                        <div v-if="currentQuestionId === 'approve_po'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                        <a :href="route('booking.details', externalApiResponse.data.marking)"
+                                            target="_blank">{{ externalApiResponse.data.marking }}</a>
+                                    </h3>
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <purchase-order-form-component :data="externalApiResponse.data"
+                                                :section="section"></purchase-order-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div v-if="currentQuestionId === 'fill_po'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                        <a :href="route('booking.details', externalApiResponse.data.marking)"
+                                            target="_blank">{{ externalApiResponse.data.marking }}</a>
+                                    </h3>
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <purchase-order-form-component :data="externalApiResponse.data"
+                                                section="section"></purchase-order-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="row" v-if="currentQuestion.answers">
+                            <div class="col">
+                                <div class="w-100 d-block text-center">
+                                    <button v-for="(answer, index) in currentQuestion.answers" :key="index"
+                                        @click="selectAnswer(answer.next)"
+                                        class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                                        style="margin: 15px; padding: 15px 40px; min-width: 210px;">
+                                        {{ answer.text }}
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div v-else>
+                        <div class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                            <div class="col">
+                                <h1 class="text-white">"{{ currentQuestionId }}" is empty. Please contact Tech Support
+                                </h1>
+                            </div>
+                        </div>
+                        <button class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                            style="margin: 15px; padding: 15px 40px; min-width: 210px;"
+                            @click="selectAnswer('refresh_page')">Refresh Page</button>
                     </div>
-                </div>
-                <div v-else>
-                    <h1>Come back when you are ready to work</h1>
-                    <button onClick="window.location.reload();" class="btn btn-primary">Refresh Page</button>
                 </div>
             </div>
         </div>
@@ -123,243 +122,234 @@
 
 <script>
 export default {
-    name: 'QuizApp',
     data() {
         return {
+            section: 'initial_section',
             questions: {
-                1: { 
-                    text: 'What will you work on?', 
-                    answers: [
-                        { text: '1688', next: '1688' }, 
-                        { text: 'Approve PO', next: 'approve_po' }, 
-                        { text: 'Fill PO', next: 'fill_po' }
-                    ] 
-                },
-                '1688': {},
-                'issue_login': {
-                    text: 'Login Issues',
-                    answers: [
-                        { text: 'Need TAC', next: 'issue_submit'},
-                        { text: 'Wrong login details', next: 'issue_submit'},
-                        { text: 'Others', next: 'po_others'},
-                        { text: 'Order Cancelled', next: 'refund_request'},
+                "0": {
+                    "text": "Are you ready to work today?",
+                    "answers": [
+                        { "text": "Yes", "next": "start_work" },
+                        { "text": "No", "next": "no_work" }
                     ]
                 },
-                'login_successful': {},
-                'issue_order': {
-                    answers: [
-                        { text: 'Amount not found', next: 'issue_submit'},
-                        { text: 'Plus Member', next: 'issue_submit'},
-                        { text: 'Others', next: 'po_others'},
-                        { text: 'Customer Did not verify 1688 account', next: 'issue_submit'},
-                        { text: 'WorldFirst account linked another account', next: 'issue_submit'},
-                        { text: 'Back', next: 'login_successful'},
+                "start_work": {
+                    "text": "What will you work on?",
+                    "answers": [
+                        { "text": "1688", "next": "1688" },
+                        { "text": "Approve PO", "next": "approve_po" },
+                        { "text": "Fill PO", "next": "fill_po" }
                     ]
                 },
-                'order_verify': {},
-                'order_verification': {
-                    text: 'Are You Sure this is the correct amount?',
-                    answers: [
-                        {text: 'Yes', next: 'proceed_order'},
-                        {text: 'No', next: 'insufficient_order'}
+                "no_work": {
+                    "text": "Come back when you are ready to work",
+                    "answers": [
+                        { "text": "Refresh Page", "next": "refresh_page" }
                     ]
                 },
-                'proceed_order': {
-                    text: 'Please proceed the order on 1688',
-                    answers: [
-                        {text: 'Got Issue', next: '1688_order_issue'},
-                        {text: 'Done', next: '1688_submit'}
+                "1688": {
+                    "load_api": this.route("api.admin_work_flow.fetch_oldest_order"),
+                    "answers": [
+                        { "text": "Login Issue", "next": "login_issue" },
+                        { "text": "Login Successful", "next": "login_successful" }
                     ]
                 },
-                '1688_order_issue': {
-                    answers: [
-                        {text: 'Wrong Pin Number', next: '1688_issue_submit'},
-                        {text: 'Not Enough Stock', next: '1688_issue_submit'},
-                        {text: 'Others', next: '1688_others'},
-                        {text: 'No CrossBoarder', next: '1688_issue_submit'},
-                        {text: 'AngPau', next: '1688_issue_submit'}
+                "login_issue": {
+                    "text": "Login Issues",
+                    "answers": [
+                        { "text": "Need TAC", "next": "issue_submit" },
+                        { "text": "Wrong login details", "next": "issue_submit" },
+                        { "text": "Others", "next": "po_others" },
+                        { "text": "Order Cancelled", "next": "refund_request" }
                     ]
                 },
-                '1688_others': {},
-                '1688_submit': {},
-                '1688_issue_submit': {
-                    text: 'Issue has been submitted',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working'},
-                        { text: 'Next Order', next: '1688'}
+                "login_successful": {},
+                "issue_order": {
+                    "answers": [
+                        { "text": "Amount not found", "next": "issue_submit" },
+                        { "text": "Plus Member", "next": "issue_submit" },
+                        { "text": "Others", "next": "po_others" },
+                        { "text": "Customer Did not verify 1688 account", "next": "issue_submit" },
+                        { "text": "WorldFirst account linked another account", "next": "issue_submit" },
+                        { "text": "Back", "next": "login_successful" }
                     ]
                 },
-                'refund_request': {
-                    text: 'Refund Request sent',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working' },
-                        { text: 'Next PO', next: 'approve_po' }
+                "order_verify": {},
+                "order_verification": {
+                    "text": "Are You Sure this is the correct amount?",
+                    "answers": [
+                        { "text": "Yes", "next": "proceed_order" },
+                        { "text": "No", "next": "insufficient_order" }
                     ]
                 },
-                'approve_po': {},
-                'fill_po': {},
-                'po_filled': {
-                    text: 'PO Filled',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working' },
-                        { text: 'Next PO', next: 'approve_po' }
+                "proceed_order": {
+                    "text": "Please proceed the order on 1688",
+                    "answers": [
+                        { "text": "Got Issue", "next": "1688_order_issue" },
+                        { "text": "Done", "next": "1688_submit" }
                     ]
                 },
-                'submit_po' : {},
-                'po_approved': {
-                    text: 'PO Approved',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working' },
-                        { text: 'Next PO', next: 'approve_po' }
+                "1688_order_issue": {
+                    "answers": [
+                        { "text": "Wrong Pin Number", "next": "1688_issue_submit" },
+                        { "text": "Not Enough Stock", "next": "1688_issue_submit" },
+                        { "text": "Others", "next": "1688_others" },
+                        { "text": "No CrossBoarder", "next": "1688_issue_submit" },
+                        { "text": "AngPau", "next": "1688_issue_submit" }
                     ]
                 },
-                'edit_po': {},
-                'po_others': {},
-                'reject_po': {
-                    text: 'PO Rejected',
-                    answers: [
-                        { text: 'Issue', next: 'issue_po' },
-                        { text: 'Back', next: 'approve_po' } 
+                "1688_others": {},
+                "1688_submit": {},
+                "1688_issue_submit": {
+                    "text": "Issue has been submitted",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next Order", "next": "1688" }
                     ]
                 },
-                'issue_po': {
-                    answers: [
-                        { text: 'Sensitive Goods', next: 'issue_submit'},
-                        { text: 'Others', next: 'po_others'},
-                        { text: 'Stop Working', next: 'stop_working'},
-                        { text: 'Next PO', next: 'approve_po'}
+                "refund_request": {
+                    "text": "Refund Request sent",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
-                'issue_submit': {
-                    text: 'Issue has been submitted',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working'},
-                        { text: 'Next Order', next: 'approve_po'}
+                "approve_po": {
+                    // "text": "Order Number",
+                    "load_api": this.route("api.admin_work_flow.fetch_pending_approve_po"),
+                    "answers": [
+                        { "text": "Approve", "next": "po_approved" },
+                        { "text": "Edit PO", "next": "edit_po" },
+                        { "text": "Reject", "next": "reject_po" }
                     ]
                 },
-                '1688_issue_submitted': {
-                    text: 'Issue has been submitted',
-                    answers: [
-                        { text: 'Stop Working', next: 'stop_working'},
-                        { text: 'Next Order', next: '1688'}
+                "fill_po": {
+                    // "text": "Order Number",
+                    "load_api": this.route("api.admin_work_flow.fetch_pending_fill_po"),
+                    "answers": [
+                        { "text": "Approve", "next": "po_approved" },
+                        { "text": "Edit PO", "next": "edit_po" },
+                        { "text": "Reject", "next": "reject_po" }
                     ]
                 },
-                'stop_working': {
-                    text: 'Thank you for your work!',
+                "po_filled": {
+                    "text": "PO Filled",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next PO", "next": "approve_po" }
+                    ]
+                },
+                "submit_po": {},
+                "po_approved": {
+                    "text": "PO Approved",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next PO", "next": "approve_po" }
+                    ]
+                },
+                "edit_po": {},
+                "po_others": {},
+                "reject_po": {
+                    "text": "PO Rejected",
+                    "answers": [
+                        { "text": "Issue", "next": "issue_po" },
+                        { "text": "Back", "next": "approve_po" }
+                    ]
+                },
+                "issue_po": {
+                    "answers": [
+                        { "text": "Sensitive Goods", "next": "issue_submit" },
+                        { "text": "Others", "next": "po_others" },
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next PO", "next": "approve_po" }
+                    ]
+                },
+                "issue_submit": {
+                    "text": "Issue has been submitted",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next Order", "next": "approve_po" }
+                    ]
+                },
+                "1688_issue_submitted": {
+                    "text": "Issue has been submitted",
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working" },
+                        { "text": "Next Order", "next": "1688" }
+                    ]
+                },
+                "stop_working": {
+                    "text": "Thank you for your work!",
+                    "answers": [
+                        { "text": "Refresh Page", "next": "refresh_page" }
+                    ]
                 }
             },
+
             currentQuestionId: null,
-            readyToWork: true,
-            orderNumbers: ['Order 123', 'Order 456', 'Order 789']
+            isLoading: false,
+            externalApiResponse: { data: null },
+            timer: null,
+            elapsedTime: 0,
+            interval: 1000,
+            sessionId: null,
         };
     },
     computed: {
-        currentQuestion() {
-            return this.questions[this.currentQuestionId];
+        currentQuestion() { return this.questions[this.currentQuestionId] || {}; },
+        formattedTime() {
+            const hours = String(Math.floor(this.elapsedTime / 3600)).padStart(2, '0');
+            const minutes = String(Math.floor((this.elapsedTime % 3600) / 60)).padStart(2, '0');
+            const seconds = String(this.elapsedTime % 60).padStart(2, '0');
+            return `${hours}:${minutes}:${seconds}`;
+        }
+    },
+    mounted() {
+        this.currentQuestionId = 0;
+        if (this.sessionId == null) {
+            this.sessionId = this.generateSessionId();
         }
     },
     methods: {
-        startQuiz() {
-            this.currentQuestionId = 1;
-        },
+        startTimer() { this.timer = setInterval(() => this.elapsedTime++, this.interval); },
+        stopTimer() { clearInterval(this.timer); this.timer = null; },
+        startWork() { this.startTimer(); console.log("work is started"); },
+        endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId) {
+            if (nextQuestionId === 'refresh_page') return window.location.reload();
+            if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
+            if (nextQuestionId === 'start_work') this.startWork();
+            if (nextQuestionId === 'stop_work') this.stopTimer();
             this.currentQuestionId = nextQuestionId;
-        },
-        selectOrder(order, action) {
-            if (action === 'approve') {
-                this.currentQuestionId = 'po_approved';
-            } else if (action === 'edit') {
-                this.currentQuestionId = 'edit_po';
-            } else if (action === 'reject') {
-                this.currentQuestionId = 'reject_po';
-            } else if (action == 'issue_login') {
-                this.currentQuestionId = 'issue_login'
-            } else if (action == 'dummy_login') {
-                this.currentQuestionId = 'login_successful'
-            } else if (action == 'error_order') {
-                this.currentQuestionId = 'issue_order'
-            } else if (action == 'verify_order') {
-                this.currentQuestionId = 'order_verify'
-            } else if (action == 'back_order') {
-                this.currentQuestionId = 'login_successful'
-            } else if (action == 'yes_order') {
-                this.currentQuestionId = 'order_verification'
-            }
-        },
-        addOrder() {
-            this.orderNumbers.push('');
-        },
-        saveOrders() {
-            alert('Orders have been saved: ' + this.orderNumbers.join(', '));
-            this.currentQuestionId = 'po_filled';
-        },
-        nextorder() {
-             this.currentQuestionId = '1688';
-        },
-        issueOthers(){
-            this.currentQuestionId = 'issue_po';
-        },
-        issue1688() {
-            this.currentQuestionId = '1688_order_issue';
-        },
-        submit_issue() {
-            this.currentQuestionId = '1688_issue_submitted';
-        },
-        submit() {
 
-        }
+            // call api to recorrd timestamp
+            var logBody = {
+                'node': nextQuestionId,
+                'seconds': this.elapsedTime,
+                'userId': this.$store.getters.getUserId,
+                'session_id': this.sessionId,
+            };
+            this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
+
+            if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
+        },
+        generateSessionId() {
+            return 'xxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+                return v.toString(16);
+            });
+        },
+        callApi(url, method, section, parameters = null, showLoadingAnimation = true, storeResponseBody = true) {
+            if (showLoadingAnimation) this.isLoading = true;
+            this.$store.dispatch('crudRequest', { endpoint: url, method, parameters: parameters }).then(response =>
+                response.json().then(data => ({ data, ok: response.ok, status: response.status }))
+            ).then(apiResponse => {
+                if (storeResponseBody) this.externalApiResponse.data = apiResponse.data;
+                if (apiResponse.ok) this.successHandler(apiResponse.data);
+                else this.errorHandler(apiResponse.data, apiResponse.status);
+                if (showLoadingAnimation) this.isLoading = false;
+            });
+        },
     }
 };
 </script>
-
-<style scoped>
-.container {
-    margin: 20px;
-}
-
-.box {
-    border: 1px solid #ddd;
-    padding: 20px;
-    margin-top: 20px;
-    border-radius: 8px;
-}
-
-.order {
-    margin-bottom: 15px;
-}
-
-.image-upload {
-    width: 80%;
-    padding: 10px;
-    font-size: 16px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    margin-bottom: 10px;
-}
-
-.text-box {
-    width: 80%;
-    padding: 10px;
-    font-size: 16px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    margin-bottom: 20px;
-}
-
-.btn {
-    margin: 5px;
-    font-size: 18px; /* Adjust the font size */
-    padding: 12px 24px; /* Adjust the padding */
-    border-radius: 4px; /* Optional: adjust border radius */
-}
-
-.answer-container {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-}
-
-.answer-item {
-    margin: 10px;
-}
-</style>
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
new file mode 100644
index 00000000..ffbceace
--- /dev/null
+++ b/routes/admin_work_flow.php
@@ -0,0 +1,90 @@
+<?php
+
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\BookingResource;
+use App\Models\Booking;
+use App\Models\WorkflowTimestamp;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Http\Request;
+
+Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namespace' => 'AdminWorkFlow'], function () {
+
+    Route::get('/fetch-oldest-order', function () {
+        // currenly, using service id to hardcode fetch
+        // todo-new: pls confirm need to include 1688 vip orders
+        $booking = Booking::where('service_id', 4)
+            ->where('status', ApprovalStatus::APPROVED)
+            // ->latest()
+            ->first();
+
+        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
+
+        $bank = $booking->bank;
+
+        return response()->json([
+            'passwords' => $bank->holder_name ?? null,
+            'account_no' => $bank->account_no ?? null,
+            'pin' => $bank->bank_branch ?? null,
+            'holder_name' => $bank->holder_name ?? null,
+            'booking_marking' => $booking->marking ?? null,
+        ]);
+    })->name('fetch_oldest_order');
+
+
+
+    Route::post('/add-workflow-timestamp', function (Request $request) {
+        $validator = Validator::make($request->all(), [
+            'node' => 'required|string',
+            'seconds' => 'required|integer',
+            'userId' => 'required|integer|exists:users,id',
+            'session_id' => 'required|string',
+        ]);
+
+        if ($validator->fails()) throw new RequestValidationException($validator->messages()->first());
+
+        $workflowTimestamp = WorkflowTimestamp::create($request->only('node', 'seconds', 'userId', 'session_id'));
+
+        return response()->json([
+            'message' => 'Workflow timestamp created successfully',
+            'data' => $workflowTimestamp
+        ], 201);
+    })->name('add_workflow_timestamp');
+
+    
+
+    Route::get('/fetch-pending-approved-po', function () {
+        // currenly, using service id to hardcode fetch
+        // todo-new: pls confirm need to include 1688 vip orders
+        $booking = Booking::with('transactions')
+            ->where('service_id', 4)
+            ->where('status', ApprovalStatus::APPROVED)
+            ->whereHas('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '<', ApprovalStatus::APPROVED))
+            // ->latest()
+            ->first();
+
+        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
+
+        return response()->json(new BookingResource($booking));
+    })->name('fetch_pending_approve_po');
+
+
+
+    Route::get('/fetch-pending-fill-po', function () {
+        // currenly, using service id to hardcode fetch
+        // todo-new: pls confirm need to include 1688 vip orders
+        $booking = Booking::with('transactions')
+            ->where('service_id', 4)
+            ->where('status', ApprovalStatus::APPROVED)
+            ->whereDoesntHave('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER))
+            // ->latest()
+            ->first();
+
+        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
+
+        return response()->json(new BookingResource($booking));
+    })->name('fetch_pending_fill_po');
+
+});
diff --git a/routes/api.php b/routes/api.php
index 2d52b3ea..7c3e285f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -76,5 +76,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
+        require __DIR__ . '/admin_work_flow.php';
+
     });
 });

From 4f86ba59804e65805b1ac7f55ed79ffc78147e07 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 22 Jul 2024 15:06:56 +0800
Subject: [PATCH 08/41] update typo

---
 .../general/sections/AdminWorkFlowSectionComponent.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 1d88a6ea..9d585a06 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -319,7 +319,7 @@ export default {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
-            if (nextQuestionId === 'stop_work') this.stopTimer();
+            if (nextQuestionId === 'stop_working') this.stopTimer();
             this.currentQuestionId = nextQuestionId;
 
             // call api to recorrd timestamp

From 8f1605c31ec1e4f29ad4dc9f91fa4a0cbfa2b1aa Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Mon, 22 Jul 2024 17:45:43 +0800
Subject: [PATCH 09/41] changed the timer to reset for every step

---
 .../sections/AdminWorkFlowSectionComponent.vue      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 9d585a06..f4d74cf3 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -291,6 +291,7 @@ export default {
             externalApiResponse: { data: null },
             timer: null,
             elapsedTime: 0,
+            stepTime: 0,
             interval: 1000,
             sessionId: null,
         };
@@ -298,9 +299,9 @@ export default {
     computed: {
         currentQuestion() { return this.questions[this.currentQuestionId] || {}; },
         formattedTime() {
-            const hours = String(Math.floor(this.elapsedTime / 3600)).padStart(2, '0');
-            const minutes = String(Math.floor((this.elapsedTime % 3600) / 60)).padStart(2, '0');
-            const seconds = String(this.elapsedTime % 60).padStart(2, '0');
+            const hours = String(Math.floor(this.stepTime / 3600)).padStart(2, '0');
+            const minutes = String(Math.floor((this.stepTime % 3600) / 60)).padStart(2, '0');
+            const seconds = String(this.stepTime % 60).padStart(2, '0');
             return `${hours}:${minutes}:${seconds}`;
         }
     },
@@ -311,7 +312,7 @@ export default {
         }
     },
     methods: {
-        startTimer() { this.timer = setInterval(() => this.elapsedTime++, this.interval); },
+        startTimer() { this.timer = setInterval(() => this.stepTime++, this.interval); },
         stopTimer() { clearInterval(this.timer); this.timer = null; },
         startWork() { this.startTimer(); console.log("work is started"); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
@@ -325,12 +326,12 @@ export default {
             // call api to recorrd timestamp
             var logBody = {
                 'node': nextQuestionId,
-                'seconds': this.elapsedTime,
+                'seconds': this.stepTime,
                 'userId': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
-
+            this.stepTime = 0;
             if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
         generateSessionId() {

From 9070c5f0dd52239c6e4d03285cedaa74b5923e62 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 22 Jul 2024 18:04:01 +0800
Subject: [PATCH 10/41] reverse commit

---
 .../sections/AdminWorkFlowSectionComponent.vue       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index f4d74cf3..7001d77d 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -299,9 +299,9 @@ export default {
     computed: {
         currentQuestion() { return this.questions[this.currentQuestionId] || {}; },
         formattedTime() {
-            const hours = String(Math.floor(this.stepTime / 3600)).padStart(2, '0');
-            const minutes = String(Math.floor((this.stepTime % 3600) / 60)).padStart(2, '0');
-            const seconds = String(this.stepTime % 60).padStart(2, '0');
+            const hours = String(Math.floor(this.elapsedTime / 3600)).padStart(2, '0');
+            const minutes = String(Math.floor((this.elapsedTime % 3600) / 60)).padStart(2, '0');
+            const seconds = String(this.elapsedTime % 60).padStart(2, '0');
             return `${hours}:${minutes}:${seconds}`;
         }
     },
@@ -312,7 +312,7 @@ export default {
         }
     },
     methods: {
-        startTimer() { this.timer = setInterval(() => this.stepTime++, this.interval); },
+        startTimer() { this.timer = setInterval(() => this.elapsedTime++, this.interval); },
         stopTimer() { clearInterval(this.timer); this.timer = null; },
         startWork() { this.startTimer(); console.log("work is started"); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
@@ -326,12 +326,12 @@ export default {
             // call api to recorrd timestamp
             var logBody = {
                 'node': nextQuestionId,
-                'seconds': this.stepTime,
+                'seconds': this.elapsedTime,
                 'userId': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
-            this.stepTime = 0;
+
             if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
         generateSessionId() {

From 4289c65e4f146b72b742fdd6ad0be15400223011 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Mon, 22 Jul 2024 18:09:46 +0800
Subject: [PATCH 11/41] recovered elapsedTime

---
 .../sections/AdminWorkFlowSectionComponent.vue        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 7001d77d..4e4498a7 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -312,7 +312,12 @@ export default {
         }
     },
     methods: {
-        startTimer() { this.timer = setInterval(() => this.elapsedTime++, this.interval); },
+        startTimer() { 
+            this.timer = setInterval(() => {
+                this.elapsedTime++;
+                this.stepTime++;
+            }, this.interval); 
+        },
         stopTimer() { clearInterval(this.timer); this.timer = null; },
         startWork() { this.startTimer(); console.log("work is started"); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
@@ -326,12 +331,12 @@ export default {
             // call api to recorrd timestamp
             var logBody = {
                 'node': nextQuestionId,
-                'seconds': this.elapsedTime,
+                'seconds': this.stepTime,
                 'userId': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
-
+            this.stepTime = 0;
             if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
         generateSessionId() {

From d6e45a0817f38e9a583ed05d998f2394477088d6 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 23 Jul 2024 10:20:15 +0800
Subject: [PATCH 12/41] added fetch_model_attributes

---
 routes/admin_work_flow.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index ffbceace..e98b1d09 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -3,6 +3,7 @@
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\BookingAttributeNames;
 use App\Http\Resources\BookingResource;
 use App\Models\Booking;
 use App\Models\WorkflowTimestamp;
@@ -10,6 +11,7 @@ use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
 
+
 Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namespace' => 'AdminWorkFlow'], function () {
 
     Route::get('/fetch-oldest-order', function () {
@@ -87,4 +89,27 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
         return response()->json(new BookingResource($booking));
     })->name('fetch_pending_fill_po');
 
+
+    Route::get('/fetch-model-attributes', function () {
+        $booking = Booking::where('service_id', 4)
+        ->where('status', ApprovalStatus::APPROVED)
+        // ->latest()
+        ->first();
+
+        if ($booking) {
+        $attributes = $booking->modelAttributes()
+            ->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)
+            ->get()
+            ->map(function ($attr) {
+                return [
+                    'id' => $attr->id,
+                    'value' => $attr->value
+                ];
+            });
+
+            return response()->json($attributes);
+        } else {
+            return response()->json(['message' => 'No approved booking found'], 404);
+        }
+    })->name('fetch_model_attributes');
 });

From 17e92133469023c4a842d9664987323d156063ca Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 23 Jul 2024 10:21:24 +0800
Subject: [PATCH 13/41] load fetch_model_attributes API for login_successful

---
 .../general/sections/AdminWorkFlowSectionComponent.vue    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 4e4498a7..40dab541 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -43,6 +43,10 @@
                             </div>
                         </div>
 
+                        <div v-if="currentQuestionId === 'login_successful'">
+                            {{ externalApiResponse.data }}
+                        </div>
+
                         <div v-if="currentQuestionId === 'approve_po'">
                             <div v-if="externalApiResponse.data" class="row">
                                 <div class="col">
@@ -163,7 +167,9 @@ export default {
                         { "text": "Order Cancelled", "next": "refund_request" }
                     ]
                 },
-                "login_successful": {},
+                "login_successful": {
+                    "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
+                },
                 "issue_order": {
                     "answers": [
                         { "text": "Amount not found", "next": "issue_submit" },

From 2c568dd17972a90c2a09b39c79e1cafb395ad736 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 23 Jul 2024 15:09:39 +0800
Subject: [PATCH 14/41] code review for 1688 login_successful node

---
 .../AdminWorkFlowSectionComponent.vue         |  2 ++
 routes/admin_work_flow.php                    | 31 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 40dab541..9f7eebf1 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -44,6 +44,8 @@
                         </div>
 
                         <div v-if="currentQuestionId === 'login_successful'">
+                            <!-- refer to '1688 QuestionId'above, display order reference, make sure it is clickable -->
+                            <!-- foreach of the attributes,print them out. refer to '1688 QuestionId'above -->
                             {{ externalApiResponse.data }}
                         </div>
 
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index e98b1d09..64de2c8a 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -55,7 +55,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
         ], 201);
     })->name('add_workflow_timestamp');
 
-    
+
 
     Route::get('/fetch-pending-approved-po', function () {
         // currenly, using service id to hardcode fetch
@@ -90,26 +90,25 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
     })->name('fetch_pending_fill_po');
 
 
+
     Route::get('/fetch-model-attributes', function () {
         $booking = Booking::where('service_id', 4)
-        ->where('status', ApprovalStatus::APPROVED)
-        // ->latest()
-        ->first();
+            ->where('status', ApprovalStatus::APPROVED)
+            // ->latest()
+            ->first();
 
         if ($booking) {
-        $attributes = $booking->modelAttributes()
-            ->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)
-            ->get()
-            ->map(function ($attr) {
-                return [
-                    'id' => $attr->id,
-                    'value' => $attr->value
-                ];
-            });
+            $attributes = $booking->modelAttributes()
+                ->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)
+                ->get(['id', 'value'])
+                ->map(fn ($attr) => $attr->only(['id', 'value']));
 
-            return response()->json($attributes);
-        } else {
-            return response()->json(['message' => 'No approved booking found'], 404);
+            return response()->json([
+                'booking' => $booking ?? null,
+                'booking_attributes' => $attributes ?? null,
+            ]);
         }
+
+        return response()->json(['message' => 'No approved booking found'], 404);
     })->name('fetch_model_attributes');
 });

From f46568c8d9a4e4ef846d1fb36e9e54b34e4ba0aa Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 23 Jul 2024 15:16:38 +0800
Subject: [PATCH 15/41] added back button

---
 .../sections/AdminWorkFlowSectionComponent.vue        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 40dab541..ca8e86d3 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -96,6 +96,12 @@
                         <div class="row" v-if="currentQuestion.answers">
                             <div class="col">
                                 <div class="w-100 d-block text-center">
+                                    <button @click="goBack()"
+                                        v-if="questionIds.length"
+                                        class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                                        style="margin: 15px; padding: 15px 40px; min-width: 210px;">
+                                        Back
+                                    </button>
                                     <button v-for="(answer, index) in currentQuestion.answers" :key="index"
                                         @click="selectAnswer(answer.next)"
                                         class="btn btn-lg btn-primary d-inline-block rounded fs-20"
@@ -293,6 +299,7 @@ export default {
             },
 
             currentQuestionId: null,
+            questionIds: [],
             isLoading: false,
             externalApiResponse: { data: null },
             timer: null,
@@ -332,6 +339,7 @@ export default {
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
             if (nextQuestionId === 'stop_working') this.stopTimer();
+            this.questionIds.push(this.currentQuestionId);
             this.currentQuestionId = nextQuestionId;
 
             // call api to recorrd timestamp
@@ -345,6 +353,9 @@ export default {
             this.stepTime = 0;
             if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
+        goBack() {
+            this.currentQuestionId = this.questionIds.pop();
+        },
         generateSessionId() {
             return 'xxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
                 var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);

From 28a775e926c2235f23f9badbfcc022123e1e04cc Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 23 Jul 2024 15:53:53 +0800
Subject: [PATCH 16/41] update 1688 admin workflow

---
 app/Models/WorkflowTimestamp.php              |  2 +
 ...22302_create_workflow_timestamps_table.php |  3 +-
 .../AdminWorkFlowSectionComponent.vue         | 43 ++++++++++++-------
 routes/admin_work_flow.php                    |  5 ++-
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/Models/WorkflowTimestamp.php b/app/Models/WorkflowTimestamp.php
index bb189afb..5cc6a17d 100644
--- a/app/Models/WorkflowTimestamp.php
+++ b/app/Models/WorkflowTimestamp.php
@@ -22,6 +22,8 @@ class WorkflowTimestamp extends Model
      * @var array
      */
     protected $fillable = [
+        'current_node',
+        'next_node',
         'node',
         'seconds',
         'userId',
diff --git a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
index 5a166ffd..3d8d29bb 100644
--- a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
+++ b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
@@ -15,7 +15,8 @@ class CreateWorkflowTimestampsTable extends Migration
     {
         Schema::create('workflow_timestamps', function (Blueprint $table) {
             $table->id();
-            $table->string('node');
+            $table->string('current_node');
+            $table->string('next_node');
             $table->integer('seconds');
             $table->unsignedBigInteger('userId');
             $table->string('session_id');
diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index d0a25c9b..8a629664 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -98,11 +98,10 @@
                         <div class="row" v-if="currentQuestion.answers">
                             <div class="col">
                                 <div class="w-100 d-block text-center">
-                                    <button @click="goBack()"
-                                        v-if="questionIds.length"
-                                        class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                                    <button @click="goBack()" v-if="questionIds.length"
+                                        class="btn btn-lg btn-default b-a b-grey d-inline-block rounded fs-20"
                                         style="margin: 15px; padding: 15px 40px; min-width: 210px;">
-                                        Back
+                                        Go Back
                                     </button>
                                     <button v-for="(answer, index) in currentQuestion.answers" :key="index"
                                         @click="selectAnswer(answer.next)"
@@ -138,7 +137,7 @@ export default {
         return {
             section: 'initial_section',
             questions: {
-                "0": {
+                "node_0": {
                     "text": "Are you ready to work today?",
                     "answers": [
                         { "text": "Yes", "next": "start_work" },
@@ -321,39 +320,51 @@ export default {
         }
     },
     mounted() {
-        this.currentQuestionId = 0;
+        this.currentQuestionId = 'node_0';
         if (this.sessionId == null) {
             this.sessionId = this.generateSessionId();
         }
     },
     methods: {
-        startTimer() { 
-            this.timer = setInterval(() => {
-                this.elapsedTime++;
-                this.stepTime++;
-            }, this.interval); 
+        startTimer() {
+            if (!this.timer) {
+                this.timer = setInterval(() => {
+                    this.elapsedTime++;
+                    this.stepTime++;
+                }, this.interval);
+            } else {
+                console.log("time has already started");
+            }
         },
         stopTimer() { clearInterval(this.timer); this.timer = null; },
-        startWork() { this.startTimer(); console.log("work is started"); },
+        startWork() { this.startTimer(); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
             if (nextQuestionId === 'stop_working') this.stopTimer();
-            this.questionIds.push(this.currentQuestionId);
-            this.currentQuestionId = nextQuestionId;
 
+            // exclude some node to click back
+            if (!['node_0'].includes(this.currentQuestionId)) {
+                this.questionIds.push(this.currentQuestionId);
+                this.callLogApi(this.currentQuestionId, nextQuestionId);
+            }
+
+            if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
+            this.currentQuestionId = nextQuestionId;
+        },
+        callLogApi(currentNode, nextNode) {
             // call api to recorrd timestamp
             var logBody = {
-                'node': nextQuestionId,
+                'current_node': currentNode,
+                'next_node': nextNode,
                 'seconds': this.stepTime,
                 'userId': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
             this.stepTime = 0;
-            if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
         },
         goBack() {
             this.currentQuestionId = this.questionIds.pop();
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index 64de2c8a..83f71110 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -39,7 +39,8 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
     Route::post('/add-workflow-timestamp', function (Request $request) {
         $validator = Validator::make($request->all(), [
-            'node' => 'required|string',
+            'current_node' => 'required|string',
+            'next_node' => 'required|string',
             'seconds' => 'required|integer',
             'userId' => 'required|integer|exists:users,id',
             'session_id' => 'required|string',
@@ -47,7 +48,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
         if ($validator->fails()) throw new RequestValidationException($validator->messages()->first());
 
-        $workflowTimestamp = WorkflowTimestamp::create($request->only('node', 'seconds', 'userId', 'session_id'));
+        $workflowTimestamp = WorkflowTimestamp::create($request->only('current_node', 'next_node', 'seconds', 'userId', 'session_id'));
 
         return response()->json([
             'message' => 'Workflow timestamp created successfully',

From 139259538564e8154b42347a159fa1b5dd220f5d Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 23 Jul 2024 16:58:44 +0800
Subject: [PATCH 17/41] implemented a for loop that lists all order references
 for login_successful

---
 .../AdminWorkFlowSectionComponent.vue         | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 8a629664..710d8d22 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -43,10 +43,24 @@
                             </div>
                         </div>
 
-                        <div v-if="currentQuestionId === 'login_successful'">
-                            <!-- refer to '1688 QuestionId'above, display order reference, make sure it is clickable -->
-                            <!-- foreach of the attributes,print them out. refer to '1688 QuestionId'above -->
-                            {{ externalApiResponse.data }}
+                       <div v-if="currentQuestionId === 'login_successful'">
+                            <h1>Order Information</h1>
+                            <div v-if="externalApiResponse.data"
+                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Reference(s): </span>
+                                    </h3>
+                                    <div v-for="(attribute, index) in externalApiResponse.data.booking_attributes" :key="index">
+                                        <a :href="route('booking.details', externalApiResponse.data.booking.marking)">#{{ attribute.value }}</a>
+                                    </div>
+                                </div>  
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
                         </div>
 
                         <div v-if="currentQuestionId === 'approve_po'">

From 56fddcea36c339ae987e03f7ac1185bc8fe26dde Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 23 Jul 2024 17:53:18 +0800
Subject: [PATCH 18/41] fixed link redirection, touch up the interface and
 added updated order verify

---
 .../AdminWorkFlowSectionComponent.vue         | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 710d8d22..4e3d6102 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -44,7 +44,12 @@
                         </div>
 
                        <div v-if="currentQuestionId === 'login_successful'">
-                            <h1>Order Information</h1>
+                            <h3>
+                                <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                <a :href="route('booking.details', externalApiResponse.data.booking.marking)" target="_blank">
+                                {{ externalApiResponse.data.booking.marking }}
+                                </a>
+                            </h3>
                             <div v-if="externalApiResponse.data"
                                 class="row bg-master-light m-t-15 m-b-15 rounded padding-30">
                                 <div class="col">
@@ -52,7 +57,9 @@
                                         <span class="bold d-inline-block m-r-15">ORDER Reference(s): </span>
                                     </h3>
                                     <div v-for="(attribute, index) in externalApiResponse.data.booking_attributes" :key="index">
-                                        <a :href="route('booking.details', externalApiResponse.data.booking.marking)">#{{ attribute.value }}</a>
+                                        <h2>
+                                        #{{ attribute.value }}
+                                        </h2>
                                     </div>
                                 </div>  
                             </div>
@@ -190,6 +197,10 @@ export default {
                 },
                 "login_successful": {
                     "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
+                    "answers": [
+                        { "text": "Can't verify order?", "next": "issue_order"},
+                        { "text": "Order Verified", "next": "order_verify"},
+                    ]
                 },
                 "issue_order": {
                     "answers": [
@@ -198,10 +209,14 @@ export default {
                         { "text": "Others", "next": "po_others" },
                         { "text": "Customer Did not verify 1688 account", "next": "issue_submit" },
                         { "text": "WorldFirst account linked another account", "next": "issue_submit" },
-                        { "text": "Back", "next": "login_successful" }
                     ]
                 },
-                "order_verify": {},
+                "order_verify": {
+                    "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
+                    "answers": [
+                        { "text": "Yes", "next": "order_verification"}
+                    ]
+                },
                 "order_verification": {
                     "text": "Are You Sure this is the correct amount?",
                     "answers": [
@@ -280,7 +295,6 @@ export default {
                     "text": "PO Rejected",
                     "answers": [
                         { "text": "Issue", "next": "issue_po" },
-                        { "text": "Back", "next": "approve_po" }
                     ]
                 },
                 "issue_po": {

From c340c9d4d812abaf6b5ac5d669852f1a3ad3657d Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 23 Jul 2024 22:58:36 +0800
Subject: [PATCH 19/41] 1688 work flow

---
 app/Models/Remark.php                         |   8 +
 ...22302_create_workflow_timestamps_table.php |   2 +-
 .../AdminWorkFlowSectionComponent.vue         | 186 +++++++++++++-----
 routes/admin_work_flow.php                    | 124 +++++++-----
 4 files changed, 216 insertions(+), 104 deletions(-)

diff --git a/app/Models/Remark.php b/app/Models/Remark.php
index f2de3a5c..271b4d4b 100644
--- a/app/Models/Remark.php
+++ b/app/Models/Remark.php
@@ -12,6 +12,14 @@ class Remark extends AbstractModel
 
     protected $table = 'remarks';
 
+    protected $fillable = [
+        'owner_id', 
+        'owner_type', 
+        'commenter_id', 
+        'content', 
+        'type'
+    ];
+
     public function owner(): morphTo
     {
         return $this->morphTo();
diff --git a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
index 3d8d29bb..203c58bd 100644
--- a/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
+++ b/database/migrations/2024_07_21_222302_create_workflow_timestamps_table.php
@@ -18,7 +18,7 @@ class CreateWorkflowTimestampsTable extends Migration
             $table->string('current_node');
             $table->string('next_node');
             $table->integer('seconds');
-            $table->unsignedBigInteger('userId');
+            $table->unsignedBigInteger('user_id');
             $table->string('session_id');
             $table->timestamps();
         });
diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 4e3d6102..acaed660 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -9,31 +9,56 @@
             </div>
             <div v-else class="row">
                 <div class="col">
-                    <div v-if="currentQuestion && Object.keys(currentQuestion).length">
+                    <div v-if="currentQuestion && Object.keys(currentQuestion).length && !apiFailed">
                         <h2 v-if="currentQuestion.text">{{ currentQuestion.text }}</h2>
 
+                        <!-- <p>currentQuestionId - {{ currentQuestionId }}</p> -->
+                        <!-- <p>currentOrder - {{ currentOrder }}</p> -->
+
                         <div v-if="currentQuestionId === '1688'">
                             <h1>Login Information</h1>
                             <div v-if="externalApiResponse.data"
-                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30">
-                                <div class="col">
-                                    <h3>
-                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
-                                        <a :href="route('booking.details', externalApiResponse.data.booking_marking)"
-                                            target="_blank">{{ externalApiResponse.data.booking_marking }}</a>
-                                    </h3>
-                                    <h3>
-                                        <span class="bold d-inline-block m-r-15">1688 LOGIN ID/EMAIL/PHONE: </span>
-                                        {{ externalApiResponse.data.account_no }}
-                                    </h3>
-                                    <h3>
-                                        <span class="bold d-inline-block m-r-15">1688 LOGIN PASSWORD: </span>
-                                        {{ externalApiResponse.data.holder_name }}
-                                    </h3>
-                                    <h3>
-                                        <span class="bold d-inline-block m-r-15">ALIPAY 6-DIGIT PAYMENT PIN: </span>
-                                        {{ externalApiResponse.data.pin }}
-                                    </h3>
+                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30 justify-content-center">
+                                <div class="col-auto text-left">
+                                    <table>
+                                        <tr>
+                                            <td>
+                                                <h3><span class="bold d-inline-block m-r-15">ORDER Marking: </span></h3>
+                                            </td>
+                                            <td>
+                                                <h3><a :href="route('booking.details', externalApiResponse.data.booking_marking)"
+                                                        target="_blank">{{ externalApiResponse.data.booking_marking
+                                                        }}</a></h3>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <h3><span class="bold d-inline-block m-r-15">1688 LOGIN ID/EMAIL/PHONE:
+                                                    </span></h3>
+                                            </td>
+                                            <td>
+                                                <h3>{{ externalApiResponse.data.account_no }}</h3>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <h3><span class="bold d-inline-block m-r-15">1688 LOGIN PASSWORD:
+                                                    </span></h3>
+                                            </td>
+                                            <td>
+                                                <h3>{{ externalApiResponse.data.holder_name }}</h3>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <h3><span class="bold d-inline-block m-r-15">ALIPAY 6-DIGIT PAYMENT PIN:
+                                                    </span></h3>
+                                            </td>
+                                            <td>
+                                                <h3>{{ externalApiResponse.data.pin }}</h3>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </div>
                             </div>
                             <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
@@ -43,25 +68,27 @@
                             </div>
                         </div>
 
-                       <div v-if="currentQuestionId === 'login_successful'">
+                        <div v-if="currentQuestionId === 'login_successful'">
                             <h3>
                                 <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
-                                <a :href="route('booking.details', externalApiResponse.data.booking.marking)" target="_blank">
-                                {{ externalApiResponse.data.booking.marking }}
+                                <a :href="route('booking.details', externalApiResponse.data.booking.marking)"
+                                    target="_blank">
+                                    {{ externalApiResponse.data.booking.marking }}
                                 </a>
                             </h3>
                             <div v-if="externalApiResponse.data"
-                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30">
-                                <div class="col">
+                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30 justify-content-center">
+                                <div class="col-auto text-left">
                                     <h3>
                                         <span class="bold d-inline-block m-r-15">ORDER Reference(s): </span>
                                     </h3>
-                                    <div v-for="(attribute, index) in externalApiResponse.data.booking_attributes" :key="index">
+                                    <div v-for="(attribute, index) in externalApiResponse.data.booking_attributes"
+                                        :key="index">
                                         <h2>
-                                        #{{ attribute.value }}
+                                            {{ index + 1 + '. #' + attribute.value }}
                                         </h2>
                                     </div>
-                                </div>  
+                                </div>
                             </div>
                             <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
                                 <div class="col">
@@ -119,14 +146,16 @@
                         <div class="row" v-if="currentQuestion.answers">
                             <div class="col">
                                 <div class="w-100 d-block text-center">
-                                    <button @click="goBack()" v-if="questionIds.length"
+                                    <button @click="goBack()"
+                                        v-if="questionIds.length && currentQuestion.show_back_btn != false"
                                         class="btn btn-lg btn-default b-a b-grey d-inline-block rounded fs-20"
                                         style="margin: 15px; padding: 15px 40px; min-width: 210px;">
                                         Go Back
                                     </button>
                                     <button v-for="(answer, index) in currentQuestion.answers" :key="index"
-                                        @click="selectAnswer(answer.next)"
+                                        @click="selectAnswer(answer.next)" :data-attr-next-step="answer.next"
                                         class="btn btn-lg btn-primary d-inline-block rounded fs-20"
+                                        :class="getbuttonClass(answer.btn_color)"
                                         style="margin: 15px; padding: 15px 40px; min-width: 210px;">
                                         {{ answer.text }}
                                     </button>
@@ -138,8 +167,9 @@
                     <div v-else>
                         <div class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
                             <div class="col">
-                                <h1 class="text-white">"{{ currentQuestionId }}" is empty. Please contact Tech Support
-                                </h1>
+                                <h1 class="text-white">
+                                    "{{ currentQuestionId }}" {{ apiFailed ? 'api Failed' : "is empty" }}
+                                    . Please contact Tech Support</h1>
                             </div>
                         </div>
                         <button class="btn btn-lg btn-primary d-inline-block rounded fs-20"
@@ -182,24 +212,24 @@ export default {
                 "1688": {
                     "load_api": this.route("api.admin_work_flow.fetch_oldest_order"),
                     "answers": [
-                        { "text": "Login Issue", "next": "login_issue" },
+                        { "text": "Login Issue", "next": "login_issue", 'btn_color': "warning" },
                         { "text": "Login Successful", "next": "login_successful" }
-                    ]
+                    ],
                 },
                 "login_issue": {
                     "text": "Login Issues",
                     "answers": [
-                        { "text": "Need TAC", "next": "issue_submit" },
-                        { "text": "Wrong login details", "next": "issue_submit" },
-                        { "text": "Others", "next": "po_others" },
-                        { "text": "Order Cancelled", "next": "refund_request" }
+                        { "text": "Need TAC", "next": "Need TAC" },
+                        { "text": "Wrong login details", "next": "Wrong login details" },
+                        { "text": "Others", "next": "Others" },
+                        { "text": "Order Cancelled", "next": "Order Cancelled" }
                     ]
                 },
                 "login_successful": {
-                    "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
+                    "load_api": 'fetch_model_attributes',
                     "answers": [
-                        { "text": "Can't verify order?", "next": "issue_order"},
-                        { "text": "Order Verified", "next": "order_verify"},
+                        { "text": "Can't verify order?", "next": "issue_order" },
+                        { "text": "Order Verified", "next": "order_verify" },
                     ]
                 },
                 "issue_order": {
@@ -212,9 +242,10 @@ export default {
                     ]
                 },
                 "order_verify": {
+                    // fetch order amount
                     "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
                     "answers": [
-                        { "text": "Yes", "next": "order_verification"}
+                        { "text": "Yes", "next": "order_verification" }
                     ]
                 },
                 "order_verification": {
@@ -336,6 +367,9 @@ export default {
             stepTime: 0,
             interval: 1000,
             sessionId: null,
+
+            currentOrder: null,
+            apiFailed: false,
         };
     },
     computed: {
@@ -367,18 +401,32 @@ export default {
         stopTimer() { clearInterval(this.timer); this.timer = null; },
         startWork() { this.startTimer(); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
-        selectAnswer(nextQuestionId) {
+        selectAnswer(nextQuestionId, goBack = false) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
+            if (this.currentQuestionId === 'login_issue') {
+
+                this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                    'booking_id': this.currentOrder.booking_id,
+                    'remark': nextQuestionId,
+                    'user_id': this.$store.getters.getUserId,
+                }, false, false);
+
+                nextQuestionId = 'issue_submit'
+            }
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
             if (nextQuestionId === 'stop_working') this.stopTimer();
 
             // exclude some node to click back
-            if (!['node_0'].includes(this.currentQuestionId)) {
+            if (!['node_0'].includes(this.currentQuestionId) && !goBack) {
                 this.questionIds.push(this.currentQuestionId);
                 this.callLogApi(this.currentQuestionId, nextQuestionId);
             }
 
+            if (!['node_0'].includes(this.currentQuestionId) && goBack) {
+                this.callLogApi(this.currentQuestionId, 'goBack');
+            }
+
             if (this.questions[nextQuestionId]?.load_api) this.callApi(this.questions[nextQuestionId].load_api, 'get', 'section');
             this.currentQuestionId = nextQuestionId;
         },
@@ -388,14 +436,15 @@ export default {
                 'current_node': currentNode,
                 'next_node': nextNode,
                 'seconds': this.stepTime,
-                'userId': this.$store.getters.getUserId,
+                'user_id': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
             this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
             this.stepTime = 0;
         },
         goBack() {
-            this.currentQuestionId = this.questionIds.pop();
+            var prevId = this.questionIds.pop();
+            this.selectAnswer(prevId, true);
         },
         generateSessionId() {
             return 'xxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -404,15 +453,44 @@ export default {
             });
         },
         callApi(url, method, section, parameters = null, showLoadingAnimation = true, storeResponseBody = true) {
+            if (url == 'fetch_model_attributes') {
+                url = this.route("api.admin_work_flow.fetch_model_attributes", this.currentOrder.booking_id)
+            }
             if (showLoadingAnimation) this.isLoading = true;
-            this.$store.dispatch('crudRequest', { endpoint: url, method, parameters: parameters }).then(response =>
-                response.json().then(data => ({ data, ok: response.ok, status: response.status }))
-            ).then(apiResponse => {
-                if (storeResponseBody) this.externalApiResponse.data = apiResponse.data;
-                if (apiResponse.ok) this.successHandler(apiResponse.data);
-                else this.errorHandler(apiResponse.data, apiResponse.status);
-                if (showLoadingAnimation) this.isLoading = false;
-            });
+            this.$store.dispatch('crudRequest', { endpoint: url, method, parameters: parameters })
+                .then(response => response.json().then(data => ({ data, ok: response.ok, status: response.status })))
+                .then(apiResponse => {
+                    if (storeResponseBody) {
+                        this.externalApiResponse = apiResponse.data;
+                    }
+
+                    if (apiResponse.ok) {
+                        this.successHandler(apiResponse.data);
+                    } else {
+                        // Improved error handling
+                        this.handleError(apiResponse.data, apiResponse.status);
+                    }
+
+                    if (showLoadingAnimation) {
+                        this.isLoading = false;
+                    }
+
+                    if (url === this.route("api.admin_work_flow.fetch_oldest_order")) {
+                        this.currentOrder = apiResponse.data.data;
+                    }
+                })
+                .catch(error => {
+                    // Handle network or other unexpected errors
+                    console.error('Unexpected error:', error);
+                    this.errorHandler({ message: 'An unexpected error occurred. Please try again later.' }, 500);
+                    this.apiFailed = true;
+                    if (showLoadingAnimation) {
+                        this.isLoading = false;
+                    }
+                });
+        },
+        getbuttonClass(className) {
+            return 'btn-' + className;
         },
     }
 };
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index 83f71110..6266096b 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -6,33 +6,42 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\BookingAttributeNames;
 use App\Http\Resources\BookingResource;
 use App\Models\Booking;
+use App\Models\Remark;
 use App\Models\WorkflowTimestamp;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
-
+use Illuminate\Http\JsonResponse;
 
 Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namespace' => 'AdminWorkFlow'], function () {
 
+    // Generalized JSON response function
+    function jsonResponse($data = null, $message = null, $status = 200)
+    {
+        $response = ['message' => $message];
+
+        if ($data !== null) {
+            $response['data'] = $data;
+        }
+
+        return response()->json($response, $status);
+    }
+
+
+
     Route::get('/fetch-oldest-order', function () {
-        // currenly, using service id to hardcode fetch
-        // todo-new: pls confirm need to include 1688 vip orders
         $booking = Booking::where('service_id', 4)
             ->where('status', ApprovalStatus::APPROVED)
-            // ->latest()
             ->first();
 
-        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
-
-        $bank = $booking->bank;
-
-        return response()->json([
-            'passwords' => $bank->holder_name ?? null,
-            'account_no' => $bank->account_no ?? null,
-            'pin' => $bank->bank_branch ?? null,
-            'holder_name' => $bank->holder_name ?? null,
+        return $booking ? jsonResponse([
+            'passwords' => $booking->bank->holder_name ?? null,
+            'account_no' => $booking->bank->account_no ?? null,
+            'pin' => $booking->bank->bank_branch ?? null,
+            'holder_name' => $booking->bank->holder_name ?? null,
             'booking_marking' => $booking->marking ?? null,
-        ]);
+            'booking_id' => $booking->id ?? null,
+        ]) : jsonResponse(null, 'No booking found', 404);
     })->name('fetch_oldest_order');
 
 
@@ -42,74 +51,91 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
             'current_node' => 'required|string',
             'next_node' => 'required|string',
             'seconds' => 'required|integer',
-            'userId' => 'required|integer|exists:users,id',
+            'user_id' => 'required|integer|exists:users,id',
             'session_id' => 'required|string',
         ]);
 
-        if ($validator->fails()) throw new RequestValidationException($validator->messages()->first());
+        if ($validator->fails()) {
+            throw new RequestValidationException($validator->messages()->first());
+        }
 
-        $workflowTimestamp = WorkflowTimestamp::create($request->only('current_node', 'next_node', 'seconds', 'userId', 'session_id'));
+        $workflowTimestamp = WorkflowTimestamp::create($validator->validated());
 
-        return response()->json([
-            'message' => 'Workflow timestamp created successfully',
-            'data' => $workflowTimestamp
-        ], 201);
+        return jsonResponse($workflowTimestamp, 'Workflow timestamp created successfully', 201);
     })->name('add_workflow_timestamp');
 
 
 
     Route::get('/fetch-pending-approved-po', function () {
-        // currenly, using service id to hardcode fetch
-        // todo-new: pls confirm need to include 1688 vip orders
         $booking = Booking::with('transactions')
             ->where('service_id', 4)
             ->where('status', ApprovalStatus::APPROVED)
             ->whereHas('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '<', ApprovalStatus::APPROVED))
-            // ->latest()
             ->first();
 
-        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
-
-        return response()->json(new BookingResource($booking));
+        return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404);
     })->name('fetch_pending_approve_po');
 
 
 
     Route::get('/fetch-pending-fill-po', function () {
-        // currenly, using service id to hardcode fetch
-        // todo-new: pls confirm need to include 1688 vip orders
         $booking = Booking::with('transactions')
             ->where('service_id', 4)
             ->where('status', ApprovalStatus::APPROVED)
             ->whereDoesntHave('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER))
-            // ->latest()
             ->first();
 
-        if (!$booking) return response()->json(['error' => 'No booking found'], 404);
-
-        return response()->json(new BookingResource($booking));
+        return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404);
     })->name('fetch_pending_fill_po');
 
 
 
-    Route::get('/fetch-model-attributes', function () {
-        $booking = Booking::where('service_id', 4)
-            ->where('status', ApprovalStatus::APPROVED)
-            // ->latest()
-            ->first();
+    Route::get('{booking_id}/fetch-model-attributes', function ($bookingId) {
+        $booking = Booking::find($bookingId);
 
-        if ($booking) {
-            $attributes = $booking->modelAttributes()
-                ->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)
-                ->get(['id', 'value'])
-                ->map(fn ($attr) => $attr->only(['id', 'value']));
-
-            return response()->json([
-                'booking' => $booking ?? null,
-                'booking_attributes' => $attributes ?? null,
-            ]);
+        if (!$booking) {
+            return jsonResponse(null, 'No approved booking found', 404);
         }
 
-        return response()->json(['message' => 'No approved booking found'], 404);
+        $attributes = $booking->modelAttributes()
+            ->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)
+            ->get(['id', 'value'])
+            ->map(fn ($attr) => $attr->only(['id', 'value']));
+
+        return jsonResponse([
+            'booking' => $booking,
+            'booking_attributes' => $attributes,
+        ]);
     })->name('fetch_model_attributes');
+
+    
+
+    Route::post('/create-1688-login-issue-remark', function (Request $request) {
+        $validator = Validator::make($request->all(), [
+            'booking_id' => 'required',
+            'remark' => 'required',
+            'user_id' => 'required',
+        ]);
+
+        if ($validator->fails()) {
+            throw new RequestValidationException($validator->messages()->first());
+        }
+
+        $booking = Booking::find($request->booking_id);
+
+        if (!$booking) {
+            return jsonResponse(null, 'Booking not found', 404);
+        }
+
+        $remark = new Remark([
+            'commenter_id' => $request->user_id,
+            'content' => $request->remark,
+            'owner_type' => get_class($booking),
+            'owner_id' => $booking->id,
+        ]);
+
+        $remark->save();
+
+        return jsonResponse($remark, 'Remark created successfully', 201);
+    })->name('create_1688_login_issue_remark');
 });

From 6123bb52856cfb7a5fff6726655010ef5670eb2a Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 24 Jul 2024 12:10:26 +0800
Subject: [PATCH 20/41] Finish 1688 Front end workflow, added if else condition
 for unqiue issues for login, issues and others

---
 .../AdminWorkFlowSectionComponent.vue         | 186 ++++++++++++++----
 1 file changed, 147 insertions(+), 39 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index acaed660..0a7be1d7 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -76,8 +76,7 @@
                                     {{ externalApiResponse.data.booking.marking }}
                                 </a>
                             </h3>
-                            <div v-if="externalApiResponse.data"
-                                class="row bg-master-light m-t-15 m-b-15 rounded padding-30 justify-content-center">
+                            <div v-if="externalApiResponse.data" class="row bg-master-light m-t-15 m-b-15 rounded padding-30 justify-content-center">
                                 <div class="col-auto text-left">
                                     <h3>
                                         <span class="bold d-inline-block m-r-15">ORDER Reference(s): </span>
@@ -97,6 +96,71 @@
                             </div>
                         </div>
 
+                        <div v-if="currentQuestionId === 'order_verify'">
+                            <h3>
+                                <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                <a :href="route('booking.details', externalApiResponse.data.booking.marking)"
+                                    target="_blank">
+                                    {{ externalApiResponse.data.booking.marking }}
+                                </a>
+                            </h3>
+                            <div v-if="externalApiResponse.data" class="row bg-master-light m-t-15 m-b-15 rounded padding-30 justify-content-center">
+                                <div class="col-auto text-left">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Reference(s): </span>
+                                    </h3>
+                                    <div v-for="(attribute, index) in externalApiResponse.data.booking_attributes"
+                                        :key="index">
+                                        <h2>
+                                            {{ index + 1 + '. #' + attribute.value }}
+                                        </h2>
+                                    </div>
+                                    <div class="col-auto text-center">
+                                        <h4>
+                                            Total CNY: <!-- {{ attribute.cost }} --> 
+                                        </h4>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div v-if="currentQuestionId === '1688_submit'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <h2>
+                                                Upload the English PO
+                                            </h2>
+                                            <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
+                                        </div>
+                                        <div class="col">
+                                            <h2>
+                                                Upload the China PO
+                                            </h2>
+                                            <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
+                                        </div>
+                                        <div class="col">
+                                            <h2>
+                                                Upload Bank Slip
+                                            </h2>
+                                            <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
                         <div v-if="currentQuestionId === 'approve_po'">
                             <div v-if="externalApiResponse.data" class="row">
                                 <div class="col">
@@ -143,6 +207,31 @@
                             </div>
                         </div>
 
+                        <div v-if="currentQuestionId === '1688_issue_others'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <h2>
+                                                What issues did you encounter?
+                                            </h2>
+                                            <div class="m-t-25">
+                                                <remark-comment-form-component></remark-comment-form-component>
+                                            </div>
+                                            <div class="m-t-25"> 
+                                                <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
                         <div class="row" v-if="currentQuestion.answers">
                             <div class="col">
                                 <div class="w-100 d-block text-center">
@@ -219,31 +308,31 @@ export default {
                 "login_issue": {
                     "text": "Login Issues",
                     "answers": [
-                        { "text": "Need TAC", "next": "Need TAC" },
-                        { "text": "Wrong login details", "next": "Wrong login details" },
-                        { "text": "Others", "next": "Others" },
-                        { "text": "Order Cancelled", "next": "Order Cancelled" }
+                        { "text": "Need TAC", "next": "Need Tac" },
+                        { "text": "Wrong login details", "next": "Wrong Login Details" },
+                        { "text": "Others", "next": "1688_issue_others" },
+                        { "text": "Order Cancelled", "next": "refund_request" }
                     ]
                 },
                 "login_successful": {
                     "load_api": 'fetch_model_attributes',
                     "answers": [
-                        { "text": "Can't verify order?", "next": "issue_order" },
+                        { "text": "Can't verify order?", "next": "1688_issue_order" },
                         { "text": "Order Verified", "next": "order_verify" },
                     ]
                 },
-                "issue_order": {
+                "1688_issue_order": {
                     "answers": [
-                        { "text": "Amount not found", "next": "issue_submit" },
-                        { "text": "Plus Member", "next": "issue_submit" },
-                        { "text": "Others", "next": "po_others" },
-                        { "text": "Customer Did not verify 1688 account", "next": "issue_submit" },
-                        { "text": "WorldFirst account linked another account", "next": "issue_submit" },
+                        { "text": "Amount not found", "next": "1688_issue_submit" },
+                        { "text": "Plus Member", "next": "1688_issue_submit" },
+                        { "text": "Others", "next": "1688_issue_others" },
+                        { "text": "Customer Did not verify 1688 account", "next": "1688_issue_submit" },
+                        { "text": "WorldFirst account linked another account", "next": "1688_issue_submit" },
                     ]
                 },
                 "order_verify": {
                     // fetch order amount
-                    "load_api": this.route("api.admin_work_flow.fetch_model_attributes"),
+                    "load_api": 'fetch_model_attributes',
                     "answers": [
                         { "text": "Yes", "next": "order_verification" }
                     ]
@@ -251,8 +340,8 @@ export default {
                 "order_verification": {
                     "text": "Are You Sure this is the correct amount?",
                     "answers": [
-                        { "text": "Yes", "next": "proceed_order" },
-                        { "text": "No", "next": "insufficient_order" }
+                        { "text": "No", "next": "insufficient_order" },
+                        { "text": "Yes", "next": "proceed_order" }
                     ]
                 },
                 "proceed_order": {
@@ -264,15 +353,25 @@ export default {
                 },
                 "1688_order_issue": {
                     "answers": [
-                        { "text": "Wrong Pin Number", "next": "1688_issue_submit" },
-                        { "text": "Not Enough Stock", "next": "1688_issue_submit" },
-                        { "text": "Others", "next": "1688_others" },
-                        { "text": "No CrossBoarder", "next": "1688_issue_submit" },
-                        { "text": "AngPau", "next": "1688_issue_submit" }
+                        { "text": "Wrong Pin Number", "next": "Wrong Pin Number" },
+                        { "text": "Not Enough Stock", "next": "Not Enough Stock" },
+                        { "text": "Others", "next": "1688_issue_others" },
+                        { "text": "No CrossBoarder", "next": "No CrossBoarder" },
+                        { "text": "AngPau", "next": "AngPau" }
+                    ]
+                },
+                "1688_issue_others": {
+                    "text": "Others",
+                    "answers": [
+                        { "text": "Submit Issue", "next": "1688_issue_submit"}
+                    ]
+                },
+                "1688_submit": {
+                    "answers": [
+                        { "text": "Stop Working", "next": "stop_working"},
+                        { "text": "Proceed to next order", "next": "1688"}
                     ]
                 },
-                "1688_others": {},
-                "1688_submit": {},
                 "1688_issue_submit": {
                     "text": "Issue has been submitted",
                     "answers": [
@@ -284,7 +383,7 @@ export default {
                     "text": "Refund Request sent",
                     "answers": [
                         { "text": "Stop Working", "next": "stop_working" },
-                        { "text": "Next PO", "next": "approve_po" }
+                        { "text": "Next PO", "next": "1688" }
                     ]
                 },
                 "approve_po": {
@@ -343,13 +442,6 @@ export default {
                         { "text": "Next Order", "next": "approve_po" }
                     ]
                 },
-                "1688_issue_submitted": {
-                    "text": "Issue has been submitted",
-                    "answers": [
-                        { "text": "Stop Working", "next": "stop_working" },
-                        { "text": "Next Order", "next": "1688" }
-                    ]
-                },
                 "stop_working": {
                     "text": "Thank you for your work!",
                     "answers": [
@@ -403,16 +495,32 @@ export default {
         endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId, goBack = false) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
-            if (this.currentQuestionId === 'login_issue') {
+            if (this.currentQuestionId === 'login_issue' || this.currentQuestionId === '1688_order_issue') {
+                if (nextQuestionId === 'refund_request') {
+                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = 'refund_request';
 
-                this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
-                    'booking_id': this.currentOrder.booking_id,
-                    'remark': nextQuestionId,
-                    'user_id': this.$store.getters.getUserId,
-                }, false, false);
+                } else if(nextQuestionId === '1688_issue_others') {
+                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = '1688_issue_others';
 
-                nextQuestionId = 'issue_submit'
-            }
+                } else {
+                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = '1688_issue_submit';
+                }
+        }
             if (!Object.keys(this.questions[nextQuestionId]).length) this.endWork();
             if (nextQuestionId === 'start_work') this.startWork();
             if (nextQuestionId === 'stop_working') this.stopTimer();

From 5b88b0ee2ea62a2d9c393230368e8ee4ca020802 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 25 Jul 2024 11:27:21 +0800
Subject: [PATCH 21/41] added api for po issue remark

---
 routes/admin_work_flow.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index 6266096b..1970d2cd 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -138,4 +138,33 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
         return jsonResponse($remark, 'Remark created successfully', 201);
     })->name('create_1688_login_issue_remark');
+
+    Route::post('/create_approve_issue_remark', function (Request $request) {
+        $validator = Validator::make($request->all(), [
+            'booking_id' => 'required',
+            'remark' => 'required',
+            'user_id' => 'required',
+        ]);
+
+        if ($validator->fails()) {
+            throw new RequestValidationException($validator->messages()->first());
+        }
+
+        $booking = Booking::find($request->booking_id);
+
+        if (!$booking) {
+            return jsonResponse(null, 'Booking not found', 404);
+        }
+
+        $remark = new Remark([
+            'commenter_id' => $request->user_id,
+            'content' => $request->remark,
+            'owner_type' => get_class($booking),
+            'owner_id' => $booking->id,
+        ]);
+
+        $remark->save();
+
+        return jsonResponse($remark, 'Remark created successfully', 201);
+    })->name('create_approve_issue_remark');
 });

From 12ba031e57a70bcbe170ab318d0205a24dace072 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 25 Jul 2024 11:27:53 +0800
Subject: [PATCH 22/41] updated the front end, everything should be working
 aside from the 1688 underpaid, overpaid workflow

---
 .../AdminWorkFlowSectionComponent.vue         | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 0a7be1d7..a5a4d276 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -207,7 +207,30 @@
                             </div>
                         </div>
 
-                        <div v-if="currentQuestionId === '1688_issue_others'">
+                        <div v-if="currentQuestionId === 'edit_po'">
+                            <div v-if="externalApiResponse.data" class="row">
+                                <div class="col">
+                                    <h3>
+                                        <span class="bold d-inline-block m-r-15">ORDER Marking: </span>
+                                        <a :href="route('booking.details', externalApiResponse.data.marking)"
+                                            target="_blank">{{ externalApiResponse.data.marking }}</a>
+                                    </h3>
+                                    <div class="row b-a b-primary padding-30 bg-white m-t-25">
+                                        <div class="col">
+                                            <purchase-order-form-component :data="externalApiResponse.data"
+                                                section="section"></purchase-order-form-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div v-else class="row bg-danger-light m-t-15 m-b-15 rounded padding-30">
+                                <div class="col">
+                                    <h1 class="text-white">Api Failed. Please contact Tech Support</h1>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div v-if="currentQuestionId === '1688_issue_others' || currentQuestionId === 'po_others'">
                             <div v-if="externalApiResponse.data" class="row">
                                 <div class="col">
                                     <div class="row b-a b-primary padding-30 bg-white m-t-25">
@@ -399,9 +422,7 @@ export default {
                     // "text": "Order Number",
                     "load_api": this.route("api.admin_work_flow.fetch_pending_fill_po"),
                     "answers": [
-                        { "text": "Approve", "next": "po_approved" },
                         { "text": "Edit PO", "next": "edit_po" },
-                        { "text": "Reject", "next": "reject_po" }
                     ]
                 },
                 "po_filled": {
@@ -411,7 +432,6 @@ export default {
                         { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
-                "submit_po": {},
                 "po_approved": {
                     "text": "PO Approved",
                     "answers": [
@@ -419,8 +439,18 @@ export default {
                         { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
-                "edit_po": {},
-                "po_others": {},
+                "edit_po": {
+                    "answers": [
+                        { "text": "Issue?", "next": "issue_po"},
+                        { "text": "Done", "next": "po_filled" },
+                    ]
+                },
+                "po_others": {
+                    "text": "Others",
+                    "answers": [
+                        { "text": "Submit Issue", "next": "issue_submit"}
+                    ]
+                },
                 "reject_po": {
                     "text": "PO Rejected",
                     "answers": [
@@ -512,6 +542,14 @@ export default {
                     }, false, false);
                     nextQuestionId = '1688_issue_others';
 
+                } else if(nextQuestionId === 'po_others') {
+                    this.callApi(this.route('api.admin_work_flow.create_approve_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = 'po_others';
+
                 } else {
                     this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,

From 0769d4d67cda63676a3ccf6446e9f3280a9d52b4 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 25 Jul 2024 14:58:17 +0800
Subject: [PATCH 23/41] changed create_login_issue_remark_api into
 create_issue_remark

---
 .../AdminWorkFlowSectionComponent.vue         | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index a5a4d276..ee00ee1f 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -346,11 +346,11 @@ export default {
                 },
                 "1688_issue_order": {
                     "answers": [
-                        { "text": "Amount not found", "next": "1688_issue_submit" },
-                        { "text": "Plus Member", "next": "1688_issue_submit" },
-                        { "text": "Others", "next": "1688_issue_others" },
-                        { "text": "Customer Did not verify 1688 account", "next": "1688_issue_submit" },
-                        { "text": "WorldFirst account linked another account", "next": "1688_issue_submit" },
+                        { "text": "Amount not found", "next": "Amount not found" },
+                        { "text": "Plus Member", "next": "Plus Member" },
+                        { "text": "Others", "next": "Others" },
+                        { "text": "Customer did not verify 1688 account", "next": "Customer did not verify 1688 account" },
+                        { "text": "WorldFirst account linked another account", "next": "WorldFirst account linked another account" },
                     ]
                 },
                 "order_verify": {
@@ -378,7 +378,7 @@ export default {
                     "answers": [
                         { "text": "Wrong Pin Number", "next": "Wrong Pin Number" },
                         { "text": "Not Enough Stock", "next": "Not Enough Stock" },
-                        { "text": "Others", "next": "1688_issue_others" },
+                        { "text": "Others", "next": "Others" },
                         { "text": "No CrossBoarder", "next": "No CrossBoarder" },
                         { "text": "AngPau", "next": "AngPau" }
                     ]
@@ -459,8 +459,8 @@ export default {
                 },
                 "issue_po": {
                     "answers": [
-                        { "text": "Sensitive Goods", "next": "issue_submit" },
-                        { "text": "Others", "next": "po_others" },
+                        { "text": "Sensitive Goods", "next": "Sensitive Goods" },
+                        { "text": "Others", "next": "PO Others" },
                         { "text": "Stop Working", "next": "stop_working" },
                         { "text": "Next PO", "next": "approve_po" }
                     ]
@@ -525,33 +525,42 @@ export default {
         endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId, goBack = false) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
-            if (this.currentQuestionId === 'login_issue' || this.currentQuestionId === '1688_order_issue') {
-                if (nextQuestionId === 'refund_request') {
-                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
-                        'booking_id': this.currentOrder.booking_id,
+            if (this.currentQuestionId === 'issue_po') {
+                if (nextQuestionId === 'po_others') {
+                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                        'marking': this.currentOrder.marking,
+                        'remark': 'PO Others',
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                } else {
+                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                        'marking': this.currentOrder.marking,
                         'remark': nextQuestionId,
                         'user_id': this.$store.getters.getUserId,
                     }, false, false);
+                    nextQuestionId = 'issue_submit';
+                }
+            }
+
+            if (this.currentQuestionId === 'login_issue' || this.currentQuestionId === '1688_issue_order' || this.currentQuestionId === '1688_order_issue') {
+                if (nextQuestionId === 'refund_request') {
+                    this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.booking_id,
+                        'remark': 'Order Cancelled',
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
                     nextQuestionId = 'refund_request';
 
                 } else if(nextQuestionId === '1688_issue_others') {
-                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                    this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,
-                        'remark': nextQuestionId,
+                        'remark': '1688 Others',
                         'user_id': this.$store.getters.getUserId,
                     }, false, false);
                     nextQuestionId = '1688_issue_others';
 
-                } else if(nextQuestionId === 'po_others') {
-                    this.callApi(this.route('api.admin_work_flow.create_approve_issue_remark'), 'post', 'section', {
-                        'booking_id': this.currentOrder.booking_id,
-                        'remark': nextQuestionId,
-                        'user_id': this.$store.getters.getUserId,
-                    }, false, false);
-                    nextQuestionId = 'po_others';
-
                 } else {
-                    this.callApi(this.route('api.admin_work_flow.create_1688_login_issue_remark'), 'post', 'section', {
+                    this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,
                         'remark': nextQuestionId,
                         'user_id': this.$store.getters.getUserId,
@@ -606,7 +615,7 @@ export default {
             this.$store.dispatch('crudRequest', { endpoint: url, method, parameters: parameters })
                 .then(response => response.json().then(data => ({ data, ok: response.ok, status: response.status })))
                 .then(apiResponse => {
-                    if (storeResponseBody) {
+                    if (storeResponseBody) { 
                         this.externalApiResponse = apiResponse.data;
                     }
 

From bfe1aa5efddfd83ac7468982e2dc0be819860e80 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 25 Jul 2024 14:58:41 +0800
Subject: [PATCH 24/41] changed api route and api name for issue remark

---
 routes/admin_work_flow.php | 63 +++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index 1970d2cd..c5bb2a4e 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -108,9 +108,37 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
         ]);
     })->name('fetch_model_attributes');
 
-    
 
-    Route::post('/create-1688-login-issue-remark', function (Request $request) {
+    // Route::post('/create-1688-login-issue-remark', function (Request $request) {
+    //     $validator = Validator::make($request->all(), [
+    //         'booking_id' => 'required',
+    //         'remark' => 'required',
+    //         'user_id' => 'required',
+    //     ]);
+
+    //     if ($validator->fails()) {
+    //         throw new RequestValidationException($validator->messages()->first());
+    //     }
+
+    //     $booking = Booking::find($request->booking_id);
+
+    //     if (!$booking) {
+    //         return jsonResponse(null, 'Booking not found', 404);
+    //     }
+
+    //     $remark = new Remark([
+    //         'commenter_id' => $request->user_id,
+    //         'content' => $request->remark,
+    //         'owner_type' => get_class($booking),
+    //         'owner_id' => $booking->id,
+    //     ]);
+
+    //     $remark->save();
+
+    //     return jsonResponse($remark, 'Remark created successfully', 201);
+    // })->name('create_1688_login_issue_remark');
+
+    Route::post('/create_issue_remark', function (Request $request) {
         $validator = Validator::make($request->all(), [
             'booking_id' => 'required',
             'remark' => 'required',
@@ -137,34 +165,5 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
         $remark->save();
 
         return jsonResponse($remark, 'Remark created successfully', 201);
-    })->name('create_1688_login_issue_remark');
-
-    Route::post('/create_approve_issue_remark', function (Request $request) {
-        $validator = Validator::make($request->all(), [
-            'booking_id' => 'required',
-            'remark' => 'required',
-            'user_id' => 'required',
-        ]);
-
-        if ($validator->fails()) {
-            throw new RequestValidationException($validator->messages()->first());
-        }
-
-        $booking = Booking::find($request->booking_id);
-
-        if (!$booking) {
-            return jsonResponse(null, 'Booking not found', 404);
-        }
-
-        $remark = new Remark([
-            'commenter_id' => $request->user_id,
-            'content' => $request->remark,
-            'owner_type' => get_class($booking),
-            'owner_id' => $booking->id,
-        ]);
-
-        $remark->save();
-
-        return jsonResponse($remark, 'Remark created successfully', 201);
-    })->name('create_approve_issue_remark');
+    })->name('create_issue_remark');
 });

From f94984d01e3d5be75d02aeeb455321f6211e0114 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Mon, 29 Jul 2024 14:24:39 +0800
Subject: [PATCH 25/41] added create_po_issue_remark and changed
 create_login_issue_remark to create_issue_remark

---
 routes/admin_work_flow.php | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index c5bb2a4e..ce35d458 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -28,7 +28,6 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
     }
 
 
-
     Route::get('/fetch-oldest-order', function () {
         $booking = Booking::where('service_id', 4)
             ->where('status', ApprovalStatus::APPROVED)
@@ -148,8 +147,9 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
         if ($validator->fails()) {
             throw new RequestValidationException($validator->messages()->first());
         }
-
+    
         $booking = Booking::find($request->booking_id);
+        
 
         if (!$booking) {
             return jsonResponse(null, 'Booking not found', 404);
@@ -166,4 +166,33 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
         return jsonResponse($remark, 'Remark created successfully', 201);
     })->name('create_issue_remark');
+
+    Route::post('/create_po_issue_remark', function (Request $request) {
+    $validator = Validator::make($request->all(), [
+        'marking' => 'required|exists:bookings,marking', // Validate if marking exists in the bookings table
+        'remark' => 'required',
+        'user_id' => 'required|exists:users,id', // Validate if user_id exists in the users table
+    ]);
+
+    if ($validator->fails()) {
+        return response()->json(['message' => $validator->messages()->first()], 400); // Return validation error
+    }
+
+    $booking = Booking::where('marking', $request->marking)->first();
+
+    if (!$booking) {
+        return response()->json(['message' => 'Booking not found'], 404);
+    }
+
+    $remark = new Remark([
+        'commenter_id' => $request->user_id,
+        'content' => $request->remark,
+        'owner_type' => get_class($booking),
+        'owner_id' => $booking->id,
+    ]);
+
+    $remark->save();
+
+    return response()->json(['data' => $remark, 'message' => 'Remark created successfully'], 201);
+    })->name('create_po_issue_remark');
 });

From 1f07402c2a297c21f7d98e5111179e54b671b7cb Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Mon, 29 Jul 2024 14:25:19 +0800
Subject: [PATCH 26/41] remark post attempt for pending PO approval

---
 .../AdminWorkFlowSectionComponent.vue         | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index ee00ee1f..677f87fc 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -237,7 +237,7 @@
                                         <div class="col">
                                             <h2>
                                                 What issues did you encounter?
-                                            </h2>
+                                            </h2>         
                                             <div class="m-t-25">
                                                 <remark-comment-form-component></remark-comment-form-component>
                                             </div>
@@ -525,21 +525,22 @@ export default {
         endWork() { this.stopTimer(); console.log("work is ended"); },
         selectAnswer(nextQuestionId, goBack = false) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
-            if (this.currentQuestionId === 'issue_po') {
-                if (nextQuestionId === 'po_others') {
-                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
-                        'marking': this.currentOrder.marking,
-                        'remark': 'PO Others',
-                        'user_id': this.$store.getters.getUserId,
-                    }, false, false);
-                } else {
-                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
-                        'marking': this.currentOrder.marking,
-                        'remark': nextQuestionId,
-                        'user_id': this.$store.getters.getUserId,
-                    }, false, false);
-                    nextQuestionId = 'issue_submit';
-                }
+             if (this.currentQuestionId === 'issue_po') {
+                 if (nextQuestionId === 'po_others') {
+                     this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                         'marking': this.currentOrder,
+                         'remark': 'PO Others',
+                         'user_id': this.$store.getters.getUserId,
+                     }, false, false);
+
+                 } else {
+                     this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                         'marking': this.currentOrder,
+                         'remark': nextQuestionId,
+                         'user_id': this.$store.getters.getUserId,
+                     }, false, false);
+                     nextQuestionId = 'issue_submit';
+                 }
             }
 
             if (this.currentQuestionId === 'login_issue' || this.currentQuestionId === '1688_issue_order' || this.currentQuestionId === '1688_order_issue') {
@@ -610,7 +611,10 @@ export default {
         callApi(url, method, section, parameters = null, showLoadingAnimation = true, storeResponseBody = true) {
             if (url == 'fetch_model_attributes') {
                 url = this.route("api.admin_work_flow.fetch_model_attributes", this.currentOrder.booking_id)
-            }
+            } else if (url == 'fetch_pending_approve_po') {
+                url = this.route("api.admin_work_flow.fetch_pending_approve_po", this.currentOrder)
+            } 
+            
             if (showLoadingAnimation) this.isLoading = true;
             this.$store.dispatch('crudRequest', { endpoint: url, method, parameters: parameters })
                 .then(response => response.json().then(data => ({ data, ok: response.ok, status: response.status })))
@@ -632,7 +636,10 @@ export default {
 
                     if (url === this.route("api.admin_work_flow.fetch_oldest_order")) {
                         this.currentOrder = apiResponse.data.data;
+                    } else if (url === this.route("api.admin_work_flow.fetch_oldest_order")) {
+                        this.currentOrder = apiResponse.data
                     }
+    
                 })
                 .catch(error => {
                     // Handle network or other unexpected errors

From 356c2265281228fd29460be48bd6996f704444de Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 30 Jul 2024 17:56:19 +0800
Subject: [PATCH 27/41] added emit submit form

---
 .../vue/components/general/forms/RemarkCommentFormComponent.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue b/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
index c2a0bd93..a429f0f4 100644
--- a/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
@@ -46,6 +46,7 @@
         },
         methods: {
             submitForm() {
+                this.$emit('remark-submitted', this.parameters.content);
                 this.submit(this.data ? this.route('api.remark.update', this.data.id) : this.route('api.remark.create', this.id), this.data ? 'put' : 'post', this.section, true, true);
             },
         },

From ef90e453258d20dbb8f979f08f2554ba610bb82c Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Tue, 30 Jul 2024 17:56:38 +0800
Subject: [PATCH 28/41] parsing remark component content to remark tabble

---
 .../AdminWorkFlowSectionComponent.vue         | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 677f87fc..2fd622fa 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -239,7 +239,7 @@
                                                 What issues did you encounter?
                                             </h2>         
                                             <div class="m-t-25">
-                                                <remark-comment-form-component></remark-comment-form-component>
+                                                <remark-comment-form-component @remark-submitted="handleRemarkSubmitted" section="section"></remark-comment-form-component>
                                             </div>
                                             <div class="m-t-25"> 
                                                 <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
@@ -523,6 +523,16 @@ export default {
         stopTimer() { clearInterval(this.timer); this.timer = null; },
         startWork() { this.startTimer(); },
         endWork() { this.stopTimer(); console.log("work is ended"); },
+        handleRemarkSubmitted(remarkContent) {
+            this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
+                'booking_id': this.currentOrder.booking_id,
+                'remark': remarkContent,
+                'user_id': this.$store.getters.getUserId,
+            }, false, false);
+
+            alert('Remark has been submitted');
+        },          
+        
         selectAnswer(nextQuestionId, goBack = false) {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
              if (this.currentQuestionId === 'issue_po') {
@@ -547,18 +557,17 @@ export default {
                 if (nextQuestionId === 'refund_request') {
                     this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,
-                        'remark': 'Order Cancelled',
+                        'remark': nextQuestionId,
                         'user_id': this.$store.getters.getUserId,
                     }, false, false);
                     nextQuestionId = 'refund_request';
 
                 } else if(nextQuestionId === '1688_issue_others') {
-                    this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
-                        'booking_id': this.currentOrder.booking_id,
-                        'remark': '1688 Others',
-                        'user_id': this.$store.getters.getUserId,
-                    }, false, false);
-                    nextQuestionId = '1688_issue_others';
+                    // this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
+                    //     'booking_id': this.currentOrder.booking_id,
+                    //     'remark': nextQuestionId,
+                    //     'user_id': this.$store.getters.getUserId,
+                    // }, false, false);
 
                 } else {
                     this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {

From 11bd2fd3b8fc9cda83c43ba97f6a0d5ec0a83dd7 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 31 Jul 2024 10:16:33 +0800
Subject: [PATCH 29/41] amend E2E activation service message to "..minimum
 amount is CNY 1000.."

---
 .../components/general/forms/C2cConfirmationFormComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
index 30c879a2..9659fbb5 100644
--- a/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
@@ -8,7 +8,7 @@
                         <div class="col">
                         <h3>To activate the service, please take note of the following important details:</h3>
                         <ol class="m-t-15">
-                            <li class='text-left'>The minimum amount is <strong>CNY 10,000</strong> for each transfer.</li>
+                            <li class='text-left'>The minimum amount is <strong>CNY 1000</strong> for each transfer.</li>
                             <li class='text-left'>The purchase order must be filled in before making payments.</li>
                             <li class='text-left'>The processing time for each transaction is <strong>3-7 working days</strong>.</li>
                         </ol>

From 3bcae87661fff42b0353ad0d83d92973833ebc11 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 31 Jul 2024 12:25:05 +0800
Subject: [PATCH 30/41] added required props to remark-form-component and fix
 errors from console

---
 .../general/sections/AdminWorkFlowSectionComponent.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 2fd622fa..21a0dd4a 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -239,7 +239,7 @@
                                                 What issues did you encounter?
                                             </h2>         
                                             <div class="m-t-25">
-                                                <remark-comment-form-component @remark-submitted="handleRemarkSubmitted" section="section"></remark-comment-form-component>
+                                                <remark-comment-form-component @remark-submitted="handleRemarkSubmitted" :data="externalApiResponse.data" :id="externalApiResponse.data.booking_id" :section="section" module_type="Booking"></remark-comment-form-component>
                                             </div>
                                             <div class="m-t-25"> 
                                                 <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>

From 8d45a30dc73d934159e8405b77056ff6c69fdb4a Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Thu, 1 Aug 2024 13:15:13 +0800
Subject: [PATCH 31/41] included file types File-Upload-Component

---
 .../general/sections/AdminWorkFlowSectionComponent.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 21a0dd4a..2df61d7d 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -242,7 +242,7 @@
                                                 <remark-comment-form-component @remark-submitted="handleRemarkSubmitted" :data="externalApiResponse.data" :id="externalApiResponse.data.booking_id" :section="section" module_type="Booking"></remark-comment-form-component>
                                             </div>
                                             <div class="m-t-25"> 
-                                                <file-upload-component :data="externalApiResponse.data" section="section"></file-upload-component>
+                                                <file-upload-component v-model="files" :value="value" v-on:input="$emit('input', $event)"></file-upload-component>
                                             </div>
                                         </div>
                                     </div>

From 049d3cc0981354adc3c53928a104feb7318a745d Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 2 Aug 2024 01:18:56 +0800
Subject: [PATCH 32/41] fix adding remark error

---
 .../AdminWorkFlowSectionComponent.vue         | 39 +++++++++----------
 routes/admin_work_flow.php                    |  6 +--
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
index 2df61d7d..3ceea3f0 100644
--- a/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -13,7 +13,7 @@
                         <h2 v-if="currentQuestion.text">{{ currentQuestion.text }}</h2>
 
                         <!-- <p>currentQuestionId - {{ currentQuestionId }}</p> -->
-                        <!-- <p>currentOrder - {{ currentOrder }}</p> -->
+                        <!-- <p>currentOrder - {{ currentOrder? currentOrder.id : 'null' }}</p> -->
 
                         <div v-if="currentQuestionId === '1688'">
                             <h1>Login Information</h1>
@@ -461,8 +461,8 @@ export default {
                     "answers": [
                         { "text": "Sensitive Goods", "next": "Sensitive Goods" },
                         { "text": "Others", "next": "PO Others" },
-                        { "text": "Stop Working", "next": "stop_working" },
-                        { "text": "Next PO", "next": "approve_po" }
+                        // { "text": "Stop Working", "next": "stop_working" },
+                        // { "text": "Next PO", "next": "approve_po" }
                     ]
                 },
                 "issue_submit": {
@@ -537,30 +537,29 @@ export default {
             if (nextQuestionId === 'refresh_page') return window.location.reload();
              if (this.currentQuestionId === 'issue_po') {
                  if (nextQuestionId === 'po_others') {
-                     this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
-                         'marking': this.currentOrder,
-                         'remark': 'PO Others',
-                         'user_id': this.$store.getters.getUserId,
-                     }, false, false);
+                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.id,
+                        'remark': 'PO Others',
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
 
                  } else {
-                     this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
-                         'marking': this.currentOrder,
-                         'remark': nextQuestionId,
-                         'user_id': this.$store.getters.getUserId,
-                     }, false, false);
-                     nextQuestionId = 'issue_submit';
+                    this.callApi(this.route('api.admin_work_flow.create_po_issue_remark'), 'post', 'section', {
+                        'booking_id': this.currentOrder.id,
+                        'remark': nextQuestionId,
+                        'user_id': this.$store.getters.getUserId,
+                    }, false, false);
+                    nextQuestionId = 'issue_submit';
                  }
             }
 
-            if (this.currentQuestionId === 'login_issue' || this.currentQuestionId === '1688_issue_order' || this.currentQuestionId === '1688_order_issue') {
+            if (['login_issue', '1688_issue_order', '1688_order_issue'].includes(this.currentQuestionId)) {
                 if (nextQuestionId === 'refund_request') {
                     this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
                         'booking_id': this.currentOrder.booking_id,
                         'remark': nextQuestionId,
                         'user_id': this.$store.getters.getUserId,
                     }, false, false);
-                    nextQuestionId = 'refund_request';
 
                 } else if(nextQuestionId === '1688_issue_others') {
                     // this.callApi(this.route('api.admin_work_flow.create_issue_remark'), 'post', 'section', {
@@ -604,7 +603,7 @@ export default {
                 'user_id': this.$store.getters.getUserId,
                 'session_id': this.sessionId,
             };
-            this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
+            // this.callApi(this.route('api.admin_work_flow.add_workflow_timestamp'), 'post', 'section', logBody, false, false);
             this.stepTime = 0;
         },
         goBack() {
@@ -643,10 +642,8 @@ export default {
                         this.isLoading = false;
                     }
 
-                    if (url === this.route("api.admin_work_flow.fetch_oldest_order")) {
-                        this.currentOrder = apiResponse.data.data;
-                    } else if (url === this.route("api.admin_work_flow.fetch_oldest_order")) {
-                        this.currentOrder = apiResponse.data
+                    if ([this.route("api.admin_work_flow.fetch_oldest_order"), this.route("api.admin_work_flow.fetch_pending_approve_po"), this.route("api.admin_work_flow.fetch_pending_fill_po")].includes(url)) {
+                        this.currentOrder = apiResponse.data.data
                     }
     
                 })
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
index ce35d458..f7767523 100644
--- a/routes/admin_work_flow.php
+++ b/routes/admin_work_flow.php
@@ -169,16 +169,16 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp
 
     Route::post('/create_po_issue_remark', function (Request $request) {
     $validator = Validator::make($request->all(), [
-        'marking' => 'required|exists:bookings,marking', // Validate if marking exists in the bookings table
+        'booking_id' => 'required',
         'remark' => 'required',
-        'user_id' => 'required|exists:users,id', // Validate if user_id exists in the users table
+        'user_id' => 'required',
     ]);
 
     if ($validator->fails()) {
         return response()->json(['message' => $validator->messages()->first()], 400); // Return validation error
     }
 
-    $booking = Booking::where('marking', $request->marking)->first();
+    $booking = Booking::find($request->booking_id);
 
     if (!$booking) {
         return response()->json(['message' => 'Booking not found'], 404);

From e732e475bfcd531c03ff24d32760a53b9e8f2133 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 7 Aug 2024 07:55:21 +0800
Subject: [PATCH 33/41] Fix some merge conflict done wrong

---
 .../bookings/forms/BookingPaymentQuotationComponent.vue         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index c74e8e3c..ce0c82d1 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -614,6 +614,8 @@
                     recipientBanks: this.data.company.recipient_banks.accounts,
                     bookingId: this.data.id
                 },
+                isEditRecipientBankDetailsCollapsed: false,
+                isAnyPaymentRecipientBankEdited: this.data.payment_history.some(payment => payment.bank !== null),
             }
         },
         validations () {

From 1d5e97fe8fb79a83b3c03119edc9a8b90823c210 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 7 Aug 2024 17:25:17 +0800
Subject: [PATCH 34/41] removed headers

---
 routes/web.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index a66457a6..94a81de7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,24 +403,8 @@ Route::get('/pending_orders', function(){
         ->orderBy('updated_at', 'desc')
         ->get();
         
-    echo '<table border="1">';
-    echo '<thead>';
-    echo '<tr>';
-    echo '<th>Booking Updated Date</th>';
-    echo '<th>Payment Type</th>';
-    echo '<th>Booking</th>';
-    echo '<th>Payment Currency</th>';
-    echo '<th>Payment Amount</th>';
-    echo '<th>Customer</th>';
-    echo '<th>Booking Currency</th>';
-    echo '<th>Booking Amount</th>';
-    echo '<th>Service</th>';
-    echo '<th>Payment Updated</th>';
-    echo '<th>Cust Supplier Acc Type</th>';
-    echo '<th>Cust Supplier Acc Name</th>';
-    echo '</tr>';
-    echo '</thead>';
-    echo '<tbody>';
+    echo '<table>';
+
     $i = 0;
     foreach ($payments as $payment){
         $booking = $payment->owner;

From 957389feeded038db0ff33d2ba9feaedaf24e1d6 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 7 Aug 2024 17:26:30 +0800
Subject: [PATCH 35/41] include the fix by edmond, for some reason VSCode is
 acting wierd today

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

diff --git a/routes/web.php b/routes/web.php
index 94a81de7..993f0de5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -427,8 +427,10 @@ Route::get('/pending_orders', function(){
         echo '<td>'.$payment->currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->amount, $refunds, 7), 5, '.', '').'</td>';
         echo '<td>'.$booking->company->reference.'</td>';
+        echo '<td></td>';
         echo '<td>'.$payment->original_currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
+        echo '<td></td>';
         echo '<td>'.$booking->service->name.'</td>';
         echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
         echo '<td>'.$bankType.'</td>';

From cfb12dde005a1fd4c013fa873c97c3415a4ee239 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 7 Aug 2024 17:34:03 +0800
Subject: [PATCH 36/41] fixed pending_orders table

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

diff --git a/routes/web.php b/routes/web.php
index 993f0de5..014131ea 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,6 @@ Route::get('/pending_orders', function(){
         echo '<td></td>';
         echo '<td>'.$payment->original_currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
-        echo '<td></td>';
         echo '<td>'.$booking->service->name.'</td>';
         echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
         echo '<td>'.$bankType.'</td>';

From 698d38db4f74e234dad366e14f0032e20fcc6613 Mon Sep 17 00:00:00 2001
From: Aqqil Azman <aqqil.azman99@gmail.com>
Date: Wed, 7 Aug 2024 17:38:41 +0800
Subject: [PATCH 37/41] added missing <td>

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index 014131ea..993f0de5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,6 +430,7 @@ Route::get('/pending_orders', function(){
         echo '<td></td>';
         echo '<td>'.$payment->original_currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
+        echo '<td></td>';
         echo '<td>'.$booking->service->name.'</td>';
         echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
         echo '<td>'.$bankType.'</td>';

From d8c53d11d7e53bc880a8fb6ff95f0b13e1762c0f Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 21 Aug 2024 22:00:46 +0800
Subject: [PATCH 38/41] Amendment meant to resolve merge conflict in
 development branch from branch dillon/63.6-company-with-multiple-employees

---
 .../Filters/{HasVouchersAll.php => HasVouchersAllWithUser.php}  | 2 +-
 app/Http/Resources/VoucherResource.php                          | 2 +-
 .../accounts/elements/VouchersNavigationBarComponent.vue        | 2 +-
 .../components/bookings/elements/AvailableVouchersComponent.vue | 2 +-
 .../vue/components/bookings/elements/ListVouchersComponent.vue  | 2 +-
 .../companies/sections/CustomerRewardsAdminSectionComponent.vue | 2 +-
 .../companies/sections/CustomerRewardsSectionComponent.vue      | 2 +-
 .../general/elements/VouchersSummaryAdminComponent.vue          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename app/Classes/General/Eloquent/Filters/{HasVouchersAll.php => HasVouchersAllWithUser.php} (96%)

diff --git a/app/Classes/General/Eloquent/Filters/HasVouchersAll.php b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
similarity index 96%
rename from app/Classes/General/Eloquent/Filters/HasVouchersAll.php
rename to app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
index d2ff7a2e..79a02914 100644
--- a/app/Classes/General/Eloquent/Filters/HasVouchersAll.php
+++ b/app/Classes/General/Eloquent/Filters/HasVouchersAllWithUser.php
@@ -6,7 +6,7 @@ use App\Classes\ValueObjects\Constants\RoleTypes;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 
-class HasVouchersAll implements Filter
+class HasVouchersAllWithUser implements Filter
 {
 
     /**
diff --git a/app/Http/Resources/VoucherResource.php b/app/Http/Resources/VoucherResource.php
index 031cf39f..cf9b2e7a 100644
--- a/app/Http/Resources/VoucherResource.php
+++ b/app/Http/Resources/VoucherResource.php
@@ -16,7 +16,7 @@ class VoucherResource extends JsonResource
     public function toArray($request)
     {
         $filteredRedemptions = new ArrayObject([]);
-        if ($request->has('filters') && str_contains($request->input('filters'), "has_vouchers_all")) {
+        if ($request->has('filters') && str_contains($request->input('filters'), "has_vouchers_all_with_user")) {
             $filteredRedemptions = new ArrayObject([]);
         }
         else{
diff --git a/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue b/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
index 60947cb9..ed2d8a93 100644
--- a/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
+++ b/resources/assets/vue/components/accounts/elements/VouchersNavigationBarComponent.vue
@@ -16,7 +16,7 @@
             }
         },
         created(){
-            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all': true,  order_by:{ column:'id', DESC:true }} ), 'get', 'voucherNavigationSection', false, false);
+            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': true,  order_by:{ column:'id', DESC:true }} ), 'get', 'voucherNavigationSection', false, false);
         },
         methods: {
             successHandler(response){
diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 9b08e7f3..7fd0520f 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -65,7 +65,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all':  this.employee.id} ), 'get', this.section, false, false);
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user':  this.employee.id} ), 'get', this.section, false, false);
                 }
             },
             successHandler(response){
diff --git a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
index 0de8b692..b869cf73 100644
--- a/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/ListVouchersComponent.vue
@@ -79,7 +79,7 @@
             fetchVouchers(){
                 this.isLoading = true;
                 if(this.employee){
-                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all':  this.employee.id} ), 'get', this.section, false, false);
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user':  this.employee.id} ), 'get', this.section, false, false);
                 }
             },
             successHandler(response){
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
index aba22978..a043d0b4 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
@@ -52,7 +52,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all': id }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': id }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
index b1f2a5f9..5abb8df1 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
@@ -52,7 +52,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all': true }">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_vouchers_all_with_user': true }">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-user-reward-item-component :data="data"></single-user-reward-item-component>
                                                                 </template>
diff --git a/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue b/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
index dc4a2a54..9a3987e6 100644
--- a/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
+++ b/resources/assets/vue/components/general/elements/VouchersSummaryAdminComponent.vue
@@ -30,7 +30,7 @@
             }
         },
         created(){
-            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all': this.company.employee.id,  order_by:{ column:'id', DESC:true }} ), 'get', this.section, false, false);
+            this.submit(this.route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_vouchers_all_with_user': this.company.employee.id,  order_by:{ column:'id', DESC:true }} ), 'get', this.section, false, false);
         },
         methods: {
             successHandler(response){

From 84da7086f63e789ea78f1d669af5557760d2c581 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 24 Aug 2024 18:42:17 +0800
Subject: [PATCH 39/41] voucher_campaigns table update for development
 environment only

---
 ..._183417_update_voucher_campaigns_table.php | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php

diff --git a/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php b/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php
new file mode 100644
index 00000000..45bf8584
--- /dev/null
+++ b/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class UpdateVoucherCampaignsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (env('APP_ENV') !== 'production') {
+            DB::table('voucher_campaigns')->where('id', 1)->update(['campaign_id' => 'camp_snxv2JQlh5v9LEDBbIBOnibD']);
+            DB::table('voucher_campaigns')->where('id', 2)->update(['campaign_id' => 'camp_lEM7WhLHFlhcRKRR0C4bXH0F']);
+            DB::table('voucher_campaigns')->where('id', 3)->update(['campaign_id' => 'camp_JP9qBGBYEinVjzAE1vjynMe0']);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        if (env('APP_ENV') !== 'production') {
+            DB::table('voucher_campaigns')->where('id', 1)->update(['campaign_id' => 'camp_0pXJ11fNxzLjNNVIJ1DCeTW1']);
+            DB::table('voucher_campaigns')->where('id', 2)->update(['campaign_id' => 'camp_pkLMhccKn0r74L61Fc36wYum']);
+            DB::table('voucher_campaigns')->where('id', 3)->update(['campaign_id' => 'camp_ZK6VwLHI9Ij8lBz5kAxcVy15']);
+        }
+    }
+}

From c76587d08ab8b1dab975875cdca5abf3bd6eb3f4 Mon Sep 17 00:00:00 2001
From: Jia Sheng <jiasheng@etctech.com.my>
Date: Tue, 24 Sep 2024 22:08:49 +0800
Subject: [PATCH 40/41] update on ambank csv file format

---
 .../ImportAmbankStatementLogic.php            | 256 ++++++++----------
 .../forms/ImportStatementFormComponent.vue    |   5 +-
 .../general/forms/FileUploadComponent.vue     |   2 +-
 3 files changed, 118 insertions(+), 145 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/ImportAmbankStatementLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/ImportAmbankStatementLogic.php
index e5d7adf0..afaddf92 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/ImportAmbankStatementLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/ImportAmbankStatementLogic.php
@@ -24,10 +24,11 @@ class ImportAmbankStatementLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Import Ambank Statement Transactions Details',
-            'message' => 'You have successfully updated the Ambank Statement Transactions Details'
+            'message' => 'You have successfully imported the Ambank Statement Transactions Details'
         ];
     }
 
@@ -37,178 +38,147 @@ class ImportAmbankStatementLogic extends AbstractControllerLogic
      * @return JsonResponse
      * @throws MalformedRequestException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
+        $requiredHeaders = ['Date', 'Time', 'Description', 'Recipient Reference', 'Other Payment Details', 'Transfer Type', 'Inward Amount', 'Outward Amount', 'Balance'];
 
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
 
-        foreach ($object->getFiles() as $file){
+        foreach ($object->getFiles() as $file) {
             $collection = Excel::toCollection(null, json_decode($file)->file_info->original->file, null, null, true);
 
-            $statementDetailRows = $collection->first()->slice(0,13);
+            // check whether the csv is format we expect for
+            foreach ($collection as $sheet_no => $sheet) {
+                $header_mapping_result = [];
+                foreach ($sheet as $row_no => $row) {
+                    if ($row[0] !== $requiredHeaders[0]) {
+                        continue;
+                    }
 
-            $dateInfoKey = $this->findInfoIndexFromExcelCollection($statementDetailRows, "STATEMENT DATE");
-            $statementDateRange = trim(explode(':', $this->extractInfoFromExcelCollection($statementDetailRows[$dateInfoKey])[0])[1]);
-            $dateFrom = trim(explode('-', $statementDateRange)[0]);
-            $dateTo = trim(explode('-', $statementDateRange)[1]);
-            $dateFrom = carbon::createFromFormat('d/m/Y', $dateFrom);
-            $dateTo = carbon::createFromFormat('d/m/Y', $dateTo);
-            $dateTo = carbon::parse($dateTo);  
-            $totalDebitKey = $this->findInfoIndexFromExcelCollection($statementDetailRows, "TOTAL DEBIT");
-            $totalDebit = $this->extractInfoFromExcelCollection($statementDetailRows[$totalDebitKey])[1];
-            $totalCreditKey = $this->findInfoIndexFromExcelCollection($statementDetailRows, "TOTAL CREDIT");
-            $totalCredit = $this->extractInfoFromExcelCollection($statementDetailRows[$totalCreditKey])[1];
-            $totalTransactions = $totalDebit + $totalCredit;
-            $beginBalanceKey = $this->findInfoIndexFromExcelCollection($statementDetailRows, "OPENING BALANCE");
-            $beginBalance = ((float) str_replace(',', '', $this->extractInfoFromExcelCollection($statementDetailRows[$beginBalanceKey])[1]));
-            $endBalanceKey = $this->findInfoIndexFromExcelCollection($statementDetailRows, "CLOSING BALANCE");
-            $endBalance = ((float) str_replace(',', '', $this->extractInfoFromExcelCollection($statementDetailRows[$endBalanceKey])[1]));
+                    foreach ($requiredHeaders as $col_no => $header) {
+                        if ($row[$col_no] !== $header) {
+                            $header_mapping_result[$col_no] = false;
+                        } else {
+                            $header_mapping_result[$col_no] = true;
+                        }
+                    }
+
+                    if (count($header_mapping_result) === 9) {
+                        break;
+                    }
+                }
+
+                if (count($header_mapping_result) === 0 || in_array(false, $header_mapping_result)) {
+                    throw new MalformedRequestException("Sheet {$sheet_no} format is not correct");
+                }
+            }
+
+            $data_start_from = $sheet->search(function ($row, $key) {
+                return $row[0] === 'Date';
+            }) + 1;
+            $data_end_at = $sheet->keys()->last();
+            $descending = true;
+
+            for ($i = $data_end_at; $i > 0; $i--) {
+                $parse_date = Carbon::createFromFormat('d/m/Y', $sheet[$i][0]);
+                if ($parse_date && $parse_date->format('d/m/Y') === $sheet[$i][0]) {
+                    $data_end_at = $i;
+                    break;
+                }
+            }
+
+            if (Carbon::createFromFormat('d/m/Y', $sheet[$data_start_from][0]) > Carbon::createFromFormat('d/m/Y', $sheet[$data_end_at][0])) {
+                $descending = true;
+            } else {
+                $descending = false;
+            }
+
+            $date_from = Carbon::createFromFormat('d/m/Y', $sheet[$descending ? $data_end_at : $data_start_from][0])->format('Y-m-d');
+            $date_to = Carbon::createFromFormat('d/m/Y', $sheet[$descending ? $data_start_from : $data_end_at][0])->format('Y-m-d');
+            $total_rows = abs($data_end_at - $data_start_from) + 1;
+            $begin_balance = floatval($sheet[$descending ? $data_end_at : $data_start_from][8]);
+            $end_balance = floatval($sheet[$descending ? $data_start_from : $data_end_at][8]);
+            $total_debit = 0;
+            $total_credit = 0;
 
             $account = StatementAccount::where('number', 8881040198515)->first();
 
             if (!$account) {
-                throw new Exception("Statement Account for CIEF LITE not found.");
+                throw new Exception("Statement Account for AMBANK not found.");
             }
 
-            $statement = AccountStatement::whereDate('date_from', $dateFrom)
-                ->whereDate('date_to', $dateTo)
-                ->where('total_amount', $totalTransactions)
-                ->where('begin_balance', $beginBalance)
-                ->where('end_balance', $endBalance)
+            $statement = AccountStatement::whereDate('date_from', $date_from)
+                ->whereDate('date_to', $date_to)
+                ->where('total_rows', $total_rows)
+                ->where('begin_balance', $begin_balance)
+                ->where('end_balance', $end_balance)
                 ->first();
 
 
-            if(!$statement){
+            if (!$statement) {
                 $statement = new AccountStatement([
-                    'date_from' => $dateFrom,
-                    'date_to' => $dateTo,
-                    'total_amount' => $totalTransactions,
-                    'begin_balance' => $beginBalance,
-                    'end_balance' => $endBalance,
+                    'statement_account_id' => $account->id,
+                    'date_from' => $date_from,
+                    'date_to' => $date_to,
+                    'total_rows' => $total_rows,
+                    'begin_balance' => $begin_balance,
+                    'end_balance' => $end_balance,
                 ]);
+                $statement->save();
             }
 
-            $account->statements()->save($statement);
-
-            $collection->map(function ($sheet, $key) use ($statement) {
-                if ($key === 0) {
-                    $headerColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11), "DATE");
-                    $dateColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11)[$headerColumnKey], "DATE");
-                    $descriptionColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11)[$headerColumnKey], "TRANSACTION");
-                    $debitColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11)[$headerColumnKey], "DEBIT");
-                    $creditColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11)[$headerColumnKey], "CREDIT");
-                    $balanceColumnKey = $this->findInfoIndexFromExcelCollection($sheet->slice(11)[$headerColumnKey], "BALANCE");
-                } else {
-                    if (strpos($sheet->first()->first(), "DATE") === false) {
-                        return;
-                    }
-                    $headerColumnKey = $this->findInfoIndexFromExcelCollection($sheet, "DATE");
-                    $dateColumnKey = $this->findInfoIndexFromExcelCollection($sheet[$headerColumnKey], "DATE");
-                    $descriptionColumnKey = $this->findInfoIndexFromExcelCollection($sheet[$headerColumnKey], "TRANSACTION");
-                    $debitColumnKey = $this->findInfoIndexFromExcelCollection($sheet[$headerColumnKey], "DEBIT");
-                    $creditColumnKey = $this->findInfoIndexFromExcelCollection($sheet[$headerColumnKey], "CREDIT");
-                    $balanceColumnKey = $this->findInfoIndexFromExcelCollection($sheet[$headerColumnKey], "BALANCE");
-                }
-                
-                $sheet->slice($headerColumnKey + 1)->map(function ($row, $index) use (
-                    $statement, 
-                    $sheet, 
-                    $dateColumnKey, 
-                    $descriptionColumnKey,
-                    $debitColumnKey,
-                    $creditColumnKey,
-                    $balanceColumnKey, 
-                    $key) 
-                {
-                    // if date or balance is null or empty, skip the row
-                    if (!$row[$dateColumnKey] || !$row[$balanceColumnKey]) {
-                        return;
+            foreach ($collection as $sheet_no => $sheet) {
+                foreach ($sheet as $row_no => $row) {
+                    if ($row_no < $data_start_from || $row_no > $data_end_at) {
+                        continue;
                     }
 
-                    $postingDate = carbon::createFromFormat('dM', trim($row[$dateColumnKey]));
+                    $posting_date = Carbon::createFromFormat('d/m/Y', $row[0])->format('Y-m-d');
+                    $posting_time = Carbon::parse($row[1])->format('H:i:s');
+                    $transaction_description = trim($row[2]);
+                    $transaction_description_2 = trim($row[3]);
+                    $transaction_description_3 = trim($row[4]);
+                    $transaction_description_4 = trim($row[5]);
+                    $inward_amount = floatval(trim($row[6]));
+                    $outward_amount = floatval(trim($row[7]));
+                    $amount = $inward_amount == 0 ? $outward_amount : $inward_amount;
 
-                    $description = trim($row[$descriptionColumnKey]);
-
-                    $nextRow = $sheet[$index + 1];
-
-                    if (!$nextRow[$dateColumnKey] && $nextRow[$descriptionColumnKey]) {
-                        $nextRowInfoArr = $this->extractInfoFromExcelCollection($nextRow);
-                        foreach ($nextRowInfoArr as $col) {
-                            if ($col) {
-                                $description .= ' '. $col;
-                            }
-                        }
+                    if ($inward_amount == 0) {
+                        $total_debit += 1;
+                    } else {
+                        $total_credit += 1;
                     }
 
-                    $descriptionArr = explode(',', $description);
+                    $balance = floatval(trim($row[8]));
 
-                    $transactionDescription = array_key_exists(0, $descriptionArr) ? trim($descriptionArr[0]) : "";
-                    $description2 = array_key_exists(1, $descriptionArr) ? trim($descriptionArr[1]) : "";
-                    $description3 = array_key_exists(2, $descriptionArr) ? trim($descriptionArr[2]) : "";
-                    $description4 = array_key_exists(3, $descriptionArr) ? trim($descriptionArr[3]) : "";
-                    $description5 = array_key_exists(4, $descriptionArr) ? trim($descriptionArr[4]) : "";
-              
-                    if (count($descriptionArr) > 5) {
-                        for ($i = 5; $i < count($descriptionArr); $i++) {
-                            $description5 = array_key_exists($i, $descriptionArr) ? $description5 . " " . trim($descriptionArr[$i]) : $description5;
-                        }
-                    }
-
-                    $amount = $row[$creditColumnKey] ? ((float) str_replace(',', '', trim($row[$creditColumnKey]))) : (-((float) str_replace(',', '', $row[$debitColumnKey])));
-                    $endBalance = ((float) str_replace(',', '', $row[$balanceColumnKey]));
-                    $transaction = new StatementTransaction([
-                        'posting_date' => $postingDate,
-                        'transaction_description' => $transactionDescription,
-                        'transaction_description_2' => $description2,
-                        'transaction_description_3' => $description3,
-                        'transaction_description_4' => $description4,
-                        'transaction_description_5' => $description5,
-                        'amount' => $amount,
-                        'end_balance' => $endBalance,
-                    ]);
-
-                    // Check if the transaction already exists for this statement
-                    $existingTransaction = StatementTransaction::whereDate('posting_date', $postingDate)
+                    // Check if the transaction already exists for any statement
+                    $existingTransaction = StatementTransaction::where('posting_date', ($posting_date . ' ' . $posting_time))
                         ->where('amount', $amount)
-                        ->where('transaction_description', $transactionDescription)
-                        ->whereRaw("CAST(REPLACE(end_balance,',','') AS DECIMAL(15,2)) = ?",[$endBalance])
+                        ->where('transaction_description', $transaction_description)
+                        ->whereRaw("CAST(REPLACE(end_balance,',','') AS DECIMAL(15,2)) = ?", [$balance])
                         ->first();
-                    
-                    if (!$existingTransaction) {
-                        $statement->transactions()->save($transaction);
-                    }
 
-                    return $transaction;
-                });
-            });
+                    if (!$existingTransaction) {
+                        $transaction = new StatementTransaction([
+                            'account_statement_id' => $statement->id,
+                            'posting_date' => $posting_date . ' ' . $posting_time,
+                            'transaction_description' => $transaction_description,
+                            'transaction_description_2' => $transaction_description_2,
+                            'transaction_description_3' => $transaction_description_3,
+                            'transaction_description_4' => $transaction_description_4,
+                            'amount' => $amount,
+                            'end_balance' => $balance,
+                        ]);
+
+                        $transaction->save();
+                    }
+                }
+
+                $statement->total_amount = $total_debit ?: $total_credit;
+                $statement->save();
+            }
         }
 
         return $this->response([]);
     }
-
-    private function findInfoIndexFromExcelCollection($collection, $keyword)
-    {
-        foreach ($collection as $key => $row) {
-            if ($row instanceof Collection) {
-                $infoArr = $this->extractInfoFromExcelCollection($row);
-                foreach ($infoArr as $info) {
-                    if (str_contains(strtolower($info), strtolower($keyword))) {
-                        return $key;
-                    }
-                }
-            } else {
-                if (str_contains(strtolower($row), strtolower($keyword))) {
-                    return $key;
-                }
-            }
-           
-        }
-    }
-
-    // return an array with information of the row start from 0 index
-    private function extractInfoFromExcelCollection($collection) 
-    {
-        return array_values(array_filter($collection->toArray()));
-    }
-
 }
diff --git a/resources/assets/vue/components/accounting/forms/ImportStatementFormComponent.vue b/resources/assets/vue/components/accounting/forms/ImportStatementFormComponent.vue
index f4aa76a2..723abb9f 100644
--- a/resources/assets/vue/components/accounting/forms/ImportStatementFormComponent.vue
+++ b/resources/assets/vue/components/accounting/forms/ImportStatementFormComponent.vue
@@ -70,7 +70,10 @@ export default {
             } else if (this.statementType.includes('LITE')) {
                 this.submit(this.route('api.accounting.statement.import.cief.lite'), 'post', this.section, true, false)
             }
-        }
+        },
+        errorHandler(error){
+            this.formHandler(error.message);
+        },
     },
     mixins: [formHandler]
 }
diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
index a7eceffd..a24ff071 100644
--- a/resources/assets/vue/components/general/forms/FileUploadComponent.vue
+++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
@@ -81,7 +81,7 @@
                 url: '#',
                 autoQueue: false,
                 processQueue: false,
-                acceptedFiles: 'image/*, application/*',
+                acceptedFiles: 'image/*, application/*, text/csv',
                 uploadMultiple: true,
                 clickable: '.select-btn',
                 previewTemplate: '<div class="row m-l-0 m-r-0 align-items-center m-t-5 m-b-5 bg-master-lightest text-left p-t-10 p-b-10 "> <div class="col-auto p-r-0"> <img data-dz-thumbnail style="width: 35px; height: 35px;" /> </div> <div class="col"> <div class="row m-b-5"> <div class="col"> <div class="dz-filename fs-8 bold"><span data-dz-name></span></div> </div> </div> <div class="row"> <div class="col"> <div class="dz-size muted light fs-10" data-dz-size></div> </div> </div> </div> <div class="col-auto"><i class="fs-16 fa fa-times-circle pointer hint-text" data-dz-remove></i></div> </div>'

From 5d6d6552eafefce908bf36670f20bfc5b2c10041 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 14 Oct 2024 03:17:28 +0800
Subject: [PATCH 41/41] Voucherify data patch for development environment only

---
 ..._183417_update_voucher_campaigns_table.php | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php b/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php
index 45bf8584..c24f918f 100644
--- a/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php
+++ b/database/migrations/2024_08_24_183417_update_voucher_campaigns_table.php
@@ -16,7 +16,31 @@ class UpdateVoucherCampaignsTable extends Migration
             DB::table('voucher_campaigns')->where('id', 1)->update(['campaign_id' => 'camp_snxv2JQlh5v9LEDBbIBOnibD']);
             DB::table('voucher_campaigns')->where('id', 2)->update(['campaign_id' => 'camp_lEM7WhLHFlhcRKRR0C4bXH0F']);
             DB::table('voucher_campaigns')->where('id', 3)->update(['campaign_id' => 'camp_JP9qBGBYEinVjzAE1vjynMe0']);
+
+            $voucherCampaignIds = [1, 2, 3];
+            foreach ($voucherCampaignIds as $id) {
+                $campaignId = DB::table('voucher_campaigns')->where('id', $id)->value('campaign_id');
+                $ownerId = DB::table('voucher_campaigns')->where('id', $id)->value('id');
+                $upperCampaignId = strtoupper($campaignId);
+
+                $keysToUpdate = DB::table('key_value_pairs')
+                    ->where('key', 'like', '%_TOTAL%')
+                    ->where('owner_type', 'App\Models\VoucherCampaign')
+                    ->where('owner_id', (int) $ownerId)
+                    ->get();
+
+                foreach ($keysToUpdate as $entry) {
+                    $parts = explode('_', $entry->key);
+                    $lastTwoParts = array_slice($parts, -2); // Get the last two elements
+                    $newKey = "{$upperCampaignId}_" . implode('_', $lastTwoParts);
+
+                    DB::table('key_value_pairs')
+                        ->where('id', $entry->id)
+                        ->update(['key' => $newKey]);
+                }
+            }
         }
+
     }
 
     /**