Quantity
@@ -144,7 +144,7 @@
},
created() {
this.product = this.data;
- this.product.unit_price = (Math.round((this.product.unit_price+ Number.EPSILON) * 1000) / 1000).toFixed(3)
+ this.product.unit_price = (Math.round((this.product.unit_price+ Number.EPSILON) * 1000) / 1000);
},
computed: {
productTotal(){
diff --git a/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue
new file mode 100644
index 00000000..edb45304
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue
@@ -0,0 +1,640 @@
+
+
+
+
{{ formattedTime }}
+
+
+
+
+
+
+
+
+
+
{{questionTitle}}
+
{{question.question_description}}
+
+
Login Information
+
+
+
+
+
+ ORDER Marking:
+
+
+
+
+
+
+ 1688 LOGIN ID/EMAIL/PHONE:
+
+
+ {{ externalApiResponse.data.account_no }}
+
+
+
+
+ 1688 LOGIN PASSWORD:
+
+
+ {{ externalApiResponse.data.holder_name }}
+
+
+
+
+ ALIPAY 6-DIGIT PAYMENT PIN:
+
+
+ {{ externalApiResponse.data.pin }}
+
+
+
+
+
+
+
+
+
+
+
+
+ Additional Info:
+
+
+
+ {{ index + 1 + '. #' + attribute.value }}
+
+
+
+
+
+
+
+ Additional Info: -
+
+
+
+
+
+
+
+
+
+
+ ORDER Reference(s):
+
+
+
+ {{ index + 1 + '. #' + attribute.value }}
+
+
+
+
+ Total CNY:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Upload the English PO
+
+
+
+
+ Photo or File
+
+
+
+
+
+ Upload the China PO
+
+
+
+ Photo or File
+
+
+
+
+
+
+
{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.
+
Tips on how your photo should look
+
+
+
+
+
+
+
+
+
+ Upload Bank Slip
+
+
+
+ Photo or File
+
+
+
+
+
+
+
{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.
+
Tips on how your photo should look
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Answer
+
+
+
+
+
+
+ Photo or File
+
+
+
+
+
+
+
{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.
+
Tips on how your photo should look
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Photo or File
+
+
+
+
+
+
+
{{ documentType === 0 ? 'IC': 'SSM registration'}} number shown in the photo should tally with {{ documentType === 0 ? 'IC': 'SSM registration'}} number provided above.
+
Tips on how your photo should look
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ans.display_text }}
+
+
+
+
+
+
+
+
+
+
+ Previous
+
+
+ Next
+
+
+
+
+
+
+
+
+
+ ID: {{question.question_number}}
+
+
+
+
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..4770fdf8
--- /dev/null
+++ b/resources/assets/vue/components/general/sections/AdminWorkFlowSectionComponent.vue
@@ -0,0 +1,670 @@
+
+
+
+
{{ formattedTime }}
+
+
+
+
+
{{ currentQuestion.text }}
+
+
+
+
+
+
Login Information
+
+
+
+
+
+ ORDER Marking:
+
+
+
+
+
+
+ 1688 LOGIN ID/EMAIL/PHONE:
+
+
+ {{ externalApiResponse.data.account_no }}
+
+
+
+
+ 1688 LOGIN PASSWORD:
+
+
+ {{ externalApiResponse.data.holder_name }}
+
+
+
+
+ ALIPAY 6-DIGIT PAYMENT PIN:
+
+
+ {{ externalApiResponse.data.pin }}
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
+ ORDER Reference(s):
+
+
+
+ {{ index + 1 + '. #' + attribute.value }}
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
+ ORDER Reference(s):
+
+
+
+ {{ index + 1 + '. #' + attribute.value }}
+
+
+
+
+ Total CNY:
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
+
+ Upload the English PO
+
+
+
+
+ Upload the China PO
+
+
+
+
+ Upload Bank Slip
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+
+
+ What issues did you encounter?
+
+
+
+
+
+
+
+
+
+
+
+
Api Failed. Please contact Tech Support
+
+
+
+
+
+
+
+
+ Go Back
+
+
+ {{ answer.text }}
+
+
+
+
+
+
+
+
+
+
+ "{{ currentQuestionId }}" {{ apiFailed ? 'api Failed' : "is empty" }}
+ . Please contact Tech Support
+
+
+
Refresh Page
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index 4048415a..dc944b45 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -41,7 +41,7 @@ export default {
}
successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
- this.successHandler(response)
+ this.successHandler(response, section);
});
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..558ab193
--- /dev/null
+++ b/resources/views/pages/dashboards/admin_work_flow.blade.php
@@ -0,0 +1,5 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+
+
+@endsection
diff --git a/routes/admin_work_flow.php b/routes/admin_work_flow.php
new file mode 100644
index 00000000..df0b714e
--- /dev/null
+++ b/routes/admin_work_flow.php
@@ -0,0 +1,228 @@
+ '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 () {
+ $excludedBookingIds = KeyValuePair::where('owner_type', 'App\Models\Booking')
+ ->where('key', '1688_admin_workflow_processed')
+ ->pluck('owner_id')
+ ->filter(function ($value) {
+ return is_numeric($value);
+ })
+ ->toArray();
+
+ $booking = Booking::where('service_id', 4)
+ ->where('status', ApprovalStatus::APPROVED)
+ ->whereNotIn('id', $excludedBookingIds)
+ ->first();
+
+ 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' => $booking
+ ]) : jsonResponse(null, 'No booking found', 404);
+ })->name('fetch_oldest_order');
+
+
+ Route::get('/fetch-pending-approved-po', function () {
+ $excludedBookingIds = KeyValuePair::where('owner_type', 'App\Models\Booking')
+ ->where('key', 'approve_po_admin_workflow_processed')
+ ->pluck('owner_id')
+ ->filter(function ($value) {
+ return is_numeric($value);
+ })
+ ->toArray();
+
+ $booking = Booking::with('transactions')
+ ->where('service_id', 4)
+ ->where('status', ApprovalStatus::APPROVED)
+ ->whereNotIn('id', $excludedBookingIds)
+ ->whereHas('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER)->where('status', '<', ApprovalStatus::APPROVED))
+ ->first();
+
+ $result = new BookingResource($booking);
+ return jsonResponse([
+ 'booking' => $result,
+ ]);
+
+ // return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404);
+ })->name('fetch_pending_approve_po');
+
+
+
+ Route::get('/fetch-pending-fill-po', function () {
+ $excludedBookingIds = KeyValuePair::where('owner_type', 'App\Models\Booking')
+ ->where('key', 'fill_po_admin_workflow_processed')
+ ->pluck('owner_id')
+ ->filter(function ($value) {
+ return is_numeric($value);
+ })
+ ->toArray();
+
+ $booking = Booking::with('transactions')
+ ->where('service_id', 4)
+ ->where('status', ApprovalStatus::APPROVED)
+ ->whereNotIn('id', $excludedBookingIds)
+ ->whereDoesntHave('transactions', fn ($query) => $query->where('type', TransactionType::PURCHASE_ORDER))
+ ->first();
+
+ $result = new BookingResource($booking);
+ return jsonResponse([
+ 'booking' => $result,
+ ]);
+
+ // return $booking ? jsonResponse(new BookingResource($booking)) : jsonResponse(null, 'No booking found', 404);
+ })->name('fetch_pending_fill_po');
+
+
+
+ Route::get('{booking_id}/fetch-model-attributes', function ($bookingId) {
+ $booking = Booking::find($bookingId);
+
+ if (!$booking) {
+ return jsonResponse(null, '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('/add-workflow-timestamp', function (Request $request) {
+ // $validator = Validator::make($request->all(), [
+ // 'current_node' => 'required|string',
+ // 'next_node' => 'required|string',
+ // 'seconds' => 'required|integer',
+ // 'user_id' => 'required|integer|exists:users,id',
+ // 'session_id' => 'required|string',
+ // ]);
+
+ // if ($validator->fails()) {
+ // throw new RequestValidationException($validator->messages()->first());
+ // }
+
+ // $workflowTimestamp = WorkflowTimestamp::create($validator->validated());
+
+ // return jsonResponse($workflowTimestamp, 'Workflow timestamp created successfully', 201);
+ // })->name('add_workflow_timestamp');
+
+
+ // 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',
+ // '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_issue_remark');
+
+ // Route::post('/create_po_issue_remark', function (Request $request) {
+ // $validator = Validator::make($request->all(), [
+ // 'booking_id' => 'required',
+ // 'remark' => 'required',
+ // 'user_id' => 'required',
+ // ]);
+
+ // if ($validator->fails()) {
+ // return response()->json(['message' => $validator->messages()->first()], 400); // Return validation error
+ // }
+
+ // $booking = Booking::find($request->booking_id);
+
+ // 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');
+
+});
diff --git a/routes/api.php b/routes/api.php
index ef7025a5..5bfb257e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -71,6 +71,10 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
require __DIR__ . '/job.php';
+ require __DIR__ . '/questionnaires.php';
+
+ require __DIR__ . '/admin_work_flow.php';
+
// require __DIR__ . '/rate.php';
// require __DIR__ . '/receipt.php';
diff --git a/routes/questionnaires.php b/routes/questionnaires.php
new file mode 100644
index 00000000..e3749d81
--- /dev/null
+++ b/routes/questionnaires.php
@@ -0,0 +1,9 @@
+ 'questionnaires', 'as' => 'questionnaires.', 'namespace' => 'Questionnaires'], function () {
+ Route::get('/{set_id}', 'FetchQuestionV1AdminWFController@fetch')->name('first.question');
+ Route::post('/question', 'UpdateNextQuestionV1AdminWFController@fetch')->name('next.question');
+ Route::get('/list', 'ListQuestionsAnswersQAController@list')->name('list.questions.answers');
+});
diff --git a/routes/web.php b/routes/web.php
index 80725e55..c2812a80 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1183,42 +1183,42 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
const fileInput = form.querySelector("input[type=\'file\']");
const files = fileInput.files;
const userToken = localStorage.getItem("user-token");
-
+
if (files.length === 0) {
alert("Please select at least one file to upload.");
return;
}
-
+
const fileReaders = [];
let totalFiles = files.length;
-
+
// Create a promise for each file to read it as Base64
Array.from(files).forEach((file) => {
const reader = new FileReader();
-
+
// Create a promise that resolves when the file is read
const fileReadPromise = new Promise((resolve, reject) => {
reader.onload = (event) => {
resolve(event.target.result);
};
-
+
reader.onerror = (error) => {
reject(error);
};
-
+
reader.readAsDataURL(file); // Read the file as Data URL (Base64)
});
-
+
fileReaders.push(fileReadPromise);
});
-
+
// Wait for all files to be read
Promise.all(fileReaders)
.then((fileData) => {
const payload = {
files: fileData, // Array of objects with name, type, and Base64 content
};
-
+
// Send the payload as JSON
return fetch(`/api/v1/transactions/${billId}/bill/verification`, {
method: "POST",
@@ -1339,3 +1339,7 @@ Route::get('/site.webmanifest', function () {
$contents = File::get($filePath);
return response($contents, 200)->header('Content-Type', 'application/manifest+json');
});
+
+Route::get('/admin-work-flow', function () {
+ return view('pages.dashboards.admin_work_flow');
+})->name('admin-work-flow');