cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 14:04:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/74-admin-workflow' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-01-10 07:29:15 +08:00
parent 5af8d2b72f 701936d311
commit 9fbf981b4c
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php
+1 -1
View File
@@ -63,7 +63,7 @@ class FetchAdminWFPendingApprovalPOLogic extends AbstractControllerLogic
$query->where('key', 'approve_po_admin_workflow_processed')
->orWhere(function ($query) {
$query->where('key', 'approve_po_admin_workflow_processing')
->where('updated_at', '>', Carbon::now()->subHour());
->where('updated_at', '>', Carbon::now()->subMinutes(30));
});
})
->pluck('owner_id')
app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php
+8 -8
View File
@@ -129,14 +129,14 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic
$key1 = '1688_'.$key1;
$key2 = '1688_'.$key2;
}
if (strpos($currentQuestion['question_number'], 'fill_po') === 0) {
$key1 = 'fill_po_'.$key1;
$key2 = 'fill_po_'.$key2;
}
if (strpos($currentQuestion['question_number'], 'approve_po') === 0) {
$key1 = 'approve_po_'.$key1;
$key2 = 'approve_po_'.$key2;
}
// if (strpos($currentQuestion['question_number'], 'fill_po') === 0) {
// $key1 = 'fill_po_'.$key1;
// $key2 = 'fill_po_'.$key2;
// }
// if (strpos($currentQuestion['question_number'], 'approve_po') === 0) {
// $key1 = 'approve_po_'.$key1;
// $key2 = 'approve_po_'.$key2;
// }
$processingRecord = $booking->attributesKVP()->where('key', $key2)->first();
if ($processingRecord) {
resources/assets/vue/vuex/modules/loadRequestQueue.js
Vendored
-3
View File
@@ -14,9 +14,6 @@ export default {
getListDetails: (state) => (name) => {
return state.queue.find(list => list.name === name);
},
// getListData: (state, getters) => (name) => {
// return (!getters.isInCompleteQueue()) ? state.queue.find(list => list.name === name).data : [];
// },
getListData: (state, getters) => (name) => {
if (!getters.isInCompleteQueue(name)) {
const list = state.queue.find(list => list.name === name);