From 12ba031e57a70bcbe170ab318d0205a24dace072 Mon Sep 17 00:00:00 2001 From: Aqqil Azman Date: Thu, 25 Jul 2024 11:27:53 +0800 Subject: [PATCH] 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 @@ -
+
+
+
+

+ ORDER Marking: + {{ externalApiResponse.data.marking }} +

+
+
+ +
+
+
+
+
+
+

Api Failed. Please contact Tech Support

+
+
+
+ +
@@ -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,