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', {