cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +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-16 13:52:06 +08:00
parent 57c914d7a6 8fe21cfb22
commit b3fa0e9495
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Banks/Standards/Rules/CanUpdateBankMetadata.php
-3
View File
@@ -30,13 +30,10 @@ class CanUpdateBankMetadata extends AbstractRule
*/
protected function authorized($object): bool
{
//cief todo: 66 - temporary workaround
// if (!Auth::user()->can('update bank_metadata')) {
// return false;
// }
// return true;
if (in_array(Auth::user()->type, RoleTypes::ADMIN_ROLES)) {
return true;
}
resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue
+10 -3
View File
@@ -287,7 +287,7 @@
@click="addClass($event, 'question.answers')"
style="margin: 15px; padding: 15px 40px; min-width: 210px;">
{{ ans.display_text }}
<span v-if="ans.value ==='fill_po_edit_filled' && !answer_extra">(NOT TALLY)</span>
{{ ans.value === 'fill_po_edit_filled' && !answer_extra ? '(NOT TALLY)' : '' }}
</button>
<!-- <div class="col" v-for="ans in question.question_answers">
<div class="col question.answers">
@@ -572,11 +572,14 @@
const div = event.target;
this.answer = div.getAttribute('answerValue');
this.answerId = div.getAttribute('answerId');
this.removeClass(cls);
if(this.answer === 'fill_po_edit_filled' && !this.answer_extra){
this.answer = div.getAttribute('answerValue') + ",not_tally"
div.classList.add('btn-danger');
}
else{
div.classList.add('btn-primary');
}
this.removeClass(cls);
div.classList.add('btn-primary');
},
removeClass(cls) {
document.getElementsByClassName(cls).forEach(el => {
@@ -584,6 +587,10 @@
if (btnPrimaryEl) {
btnPrimaryEl.classList.remove('btn-primary');
}
const btnDangerEl = el.getElementsByClassName('btn-danger')[0];
if (btnDangerEl) {
btnDangerEl.classList.remove('btn-danger');
}
});
},
startTimer() {