tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Server D3 Linksehat
2024-12-11 16:55:38 +07:00
parent 6689449fb0 ced9e6ac32
commit 922551a2b8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Client/Http/Controllers/Api/ClaimController.php
View File

@@ -298,7 +298,8 @@ class ClaimController extends Controller
'Keterangan', 'Keterangan',
'Catatan', 'Catatan',
'Invoice No', 'Invoice No',
'Billing No' 'Billing No',
'Type Of Member'
]; ];
$style = (new StyleBuilder()) $style = (new StyleBuilder())
->setFontBold() ->setFontBold()
@@ -341,6 +342,7 @@ class ClaimController extends Controller
'), '),
'request_logs.invoice_no', 'request_logs.invoice_no',
'request_logs.billing_no', 'request_logs.billing_no',
'request_logs.type_of_member',
) )
->groupBy( ->groupBy(
'request_logs.submission_date', 'request_logs.submission_date',
@@ -515,6 +517,7 @@ class ClaimController extends Controller
!empty($item->catatan) ? $item->catatan : '', !empty($item->catatan) ? $item->catatan : '',
!empty($item->invoice_no) ? $item->invoice_no : '', !empty($item->invoice_no) ? $item->invoice_no : '',
!empty($item->billing_no) ? $item->billing_no : '', !empty($item->billing_no) ? $item->billing_no : '',
!empty($item->type_of_member) ? $item->type_of_member : '',
]; ];
array_push($dataRow,$rowData); array_push($dataRow,$rowData);
@@ -551,6 +554,7 @@ class ClaimController extends Controller
'', '',
!empty($item->invoice_no) ? $item->invoice_no : '', !empty($item->invoice_no) ? $item->invoice_no : '',
!empty($item->billing_no) ? $item->billing_no : '', !empty($item->billing_no) ? $item->billing_no : '',
!empty($item->type_of_member) ? $item->type_of_member : '',
]; ];
array_push($dataRow,$rowData); array_push($dataRow,$rowData);

2
frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx
View File

@@ -58,7 +58,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "") { if (formData.type_of_member === "" && requestLog?.corporate_id === 4) {
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} else { } else {

2
frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx
View File

@@ -68,7 +68,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "") { if (formData.type_of_member === "" && requestLog?.corporate_id === 4) {
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} else if (isReasonSelected && formData.reason !== '') { } else if (isReasonSelected && formData.reason !== '') {