From 76ba4035934166c81433bb2031c6cf774702b51e Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 4 Dec 2024 12:57:19 +0800 Subject: [PATCH] Admin Workflow --- .../forms/AdminWorkFlowFormComponent.vue | 4 +-- routes/admin_workflow.php | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue index b5ce6eac..941a61e8 100644 --- a/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue +++ b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue @@ -366,7 +366,7 @@
- ID: {{question.question_number}}
+ {{question.question_number}}, Booking Id: {{externalApiResponse.data.booking.id}}
@@ -650,7 +650,7 @@ position: fixed; bottom: 0px; left: 0px; - width: 200px; + width: 400px; background-color: rgba(0, 0, 0, 0.8); color: white; font-size: 10px; diff --git a/routes/admin_workflow.php b/routes/admin_workflow.php index c7f55f0f..8b83131f 100644 --- a/routes/admin_workflow.php +++ b/routes/admin_workflow.php @@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route; 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) + function jsonResp($data = null, $message = null, $status = 200) { $response = ['message' => $message]; @@ -56,18 +56,18 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp ->first(); if(!$booking){ - return jsonResponse(null, 'No booking found', 404); + return jsonResp(null, 'No booking found', 404); } markedProcessing($booking, '1688_admin_workflow_processing'); - return $booking ? jsonResponse([ + return $booking ? jsonResp([ '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' => $booking - ]) : jsonResponse(null, 'No booking found', 404); + ]) : jsonResp(null, 'No booking found', 404); })->name('fetch_oldest_order'); @@ -94,17 +94,17 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp ->first(); if(!$booking){ - return jsonResponse(null, 'No booking found', 404); + return jsonResp(null, 'No booking found', 404); } markedProcessing($booking, 'approve_po_admin_workflow_processing'); $result = new BookingResource($booking); - return jsonResponse([ + return jsonResp([ 'booking' => $result, ]); - // return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404); + // return $booking ? jsonResp(new BookingResource($booking)) : jsonResp(null, 'No booking found', 404); })->name('fetch_pending_approve_po'); @@ -132,17 +132,17 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp ->first(); if(!$booking){ - return jsonResponse(null, 'No booking found', 404); + return jsonResp(null, 'No booking found', 404); } markedProcessing($booking, 'fill_po_admin_workflow_processing'); $result = new BookingResource($booking); - return jsonResponse([ + return jsonResp([ 'booking' => $result, ]); - // return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404); + // return $booking ? jsonResp(new BookingResource($booking)) : jsonResp(null, 'No booking found', 404); })->name('fetch_pending_fill_po'); @@ -151,7 +151,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp $booking = Booking::find($bookingId); if (!$booking) { - return jsonResponse(null, 'No booking found', 404); + return jsonResp(null, 'No booking found', 404); } $attributes = $booking->modelAttributes() @@ -159,7 +159,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp ->get(['id', 'value']) ->map(fn ($attr) => $attr->only(['id', 'value'])); - return jsonResponse([ + return jsonResp([ 'booking' => $booking, 'booking_attributes' => $attributes, ]); @@ -181,7 +181,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp // $workflowTimestamp = WorkflowTimestamp::create($validator->validated()); - // return jsonResponse($workflowTimestamp, 'Workflow timestamp created successfully', 201); + // return jsonResp($workflowTimestamp, 'Workflow timestamp created successfully', 201); // })->name('add_workflow_timestamp'); @@ -199,7 +199,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp // $booking = Booking::find($request->booking_id); // if (!$booking) { - // return jsonResponse(null, 'Booking not found', 404); + // return jsonResp(null, 'Booking not found', 404); // } // $remark = new Remark([ @@ -211,7 +211,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp // $remark->save(); - // return jsonResponse($remark, 'Remark created successfully', 201); + // return jsonResp($remark, 'Remark created successfully', 201); // })->name('create_1688_login_issue_remark'); // Route::post('/create_issue_remark', function (Request $request) { @@ -229,7 +229,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp // if (!$booking) { - // return jsonResponse(null, 'Booking not found', 404); + // return jsonResp(null, 'Booking not found', 404); // } // $remark = new Remark([ @@ -241,7 +241,7 @@ Route::group(['prefix' => 'admin-work-flow', 'as' => 'admin_work_flow.', 'namesp // $remark->save(); - // return jsonResponse($remark, 'Remark created successfully', 201); + // return jsonResp($remark, 'Remark created successfully', 201); // })->name('create_issue_remark'); // Route::post('/create_po_issue_remark', function (Request $request) {