From 5c1befd7ab66c2180e886b303cc44f33132c0b2d Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Wed, 11 Dec 2024 16:47:26 +0700 Subject: [PATCH 1/2] update validasi --- .../CustomerService/Request/Components/DialogConfirmation.tsx | 2 +- .../Request/Components/DialogEditInformation.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx index c30af4af..674c00e5 100755 --- a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx +++ b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx @@ -58,7 +58,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo const handleSubmit = () => { - if (formData.type_of_member === "") { + if (formData.type_of_member === "" && requestLog?.corporate_id === 4) { setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); } else { diff --git a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx index 0131cf0a..7202392f 100755 --- a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx +++ b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx @@ -68,7 +68,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi const handleSubmit = () => { - if (formData.type_of_member === "") { + if (formData.type_of_member === "" && requestLog?.corporate_id === 4) { setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); } else if (isReasonSelected && formData.reason !== '') { From ced9e6ac32f82e70d3e44cf5824c076fc6a499c4 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Wed, 11 Dec 2024 16:53:36 +0700 Subject: [PATCH 2/2] tambah kolom type of member --- Modules/Client/Http/Controllers/Api/ClaimController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php index 607f8a8c..cbe1d67b 100755 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -298,7 +298,8 @@ class ClaimController extends Controller 'Keterangan', 'Catatan', 'Invoice No', - 'Billing No' + 'Billing No', + 'Type Of Member' ]; $style = (new StyleBuilder()) ->setFontBold() @@ -341,6 +342,7 @@ class ClaimController extends Controller '), 'request_logs.invoice_no', 'request_logs.billing_no', + 'request_logs.type_of_member', ) ->groupBy( 'request_logs.submission_date', @@ -515,6 +517,7 @@ class ClaimController extends Controller !empty($item->catatan) ? $item->catatan : '', !empty($item->invoice_no) ? $item->invoice_no : '', !empty($item->billing_no) ? $item->billing_no : '', + !empty($item->type_of_member) ? $item->type_of_member : '', ]; array_push($dataRow,$rowData); @@ -551,6 +554,7 @@ class ClaimController extends Controller '', !empty($item->invoice_no) ? $item->invoice_no : '', !empty($item->billing_no) ? $item->billing_no : '', + !empty($item->type_of_member) ? $item->type_of_member : '', ]; array_push($dataRow,$rowData);