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

[Client Portal] Fix Corporate Manage

Browse Source
This commit is contained in:
Muhammad Fajar
2024-01-13 14:39:50 +07:00
parent 30fc2201bd
commit 1661dfc123
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Services/CorporateMemberService.php
View File

@@ -148,8 +148,8 @@ class CorporateMemberService
public function getAllMemberAlarmCenter(int $corporateId, Request $request) public function getAllMemberAlarmCenter(int $corporateId, Request $request)
{ {
$limit = $request->has('perPage') ? $request->input('perPage') : 10; $limit = $request->has('perPage') ? $request->input('perPage') : 10;
$start_date = date('Y-m-d', strtotime($request->input('start_date') . ' +1 day')); // $start_date = date('Y-m-d', strtotime($request->input('start_date') . ' +1 day'));
$end_date = date('Y-m-d', strtotime($request->input('end_date') . ' +1 day')); // $end_date = date('Y-m-d', strtotime($request->input('end_date') . ' +1 day'));
// dd($request); // dd($request);
return Member::query() return Member::query()
@@ -164,11 +164,11 @@ class CorporateMemberService
->orWhere('members.name', 'like', "%" . $search . "%"); ->orWhere('members.name', 'like', "%" . $search . "%");
}); });
}) })
->when($request->input('start_date'), function (Builder $query, $start) { ->when($request->input('start_date'), function (Builder $query, $start_date) {
$query->where('members.members_effective_date', '>=', $start); $query->where('members.members_effective_date', '>=', $start_date);
}) })
->when($request->input('end_date'), function (Builder $query, $end) { ->when($request->input('end_date'), function (Builder $query, $end_date) {
$query->where('members.members_expire_date', '<', $end); $query->where('members.members_expire_date', '<', $end_date);
}) })
->when($request->input('division'), function (Builder $query, $value) { ->when($request->input('division'), function (Builder $query, $value) {
$query->where('corporate_employees.division_id', $value); $query->where('corporate_employees.division_id', $value);
@@ -181,8 +181,8 @@ class CorporateMemberService
'memberId' => 'member_id', 'memberId' => 'member_id',
'fullName' => 'name', 'fullName' => 'name',
// 'status' => 'active', // 'status' => 'active',
'start_date' => 'member_plans.start', 'start_date' => 'member_plans.members_effective_date',
'end_date' => 'member_plans.end', 'end_date' => 'member_plans.members_expire_date',
// 'service' => 'plans.service_code', // 'service' => 'plans.service_code',
default => '' default => ''

8
frontend/client-portal/src/layouts/dashboard/header/CorporatePopover.tsx
View File

@@ -35,7 +35,13 @@ export default function CorporatePopover() {
}); });
setCorporateData(corporateManages.data); setCorporateData(corporateManages.data);
setCorporateValue(corporateManages.data[0].id); const storageCorporateValue = corporateManages.data.find(
(item: { id: number }) => item.id === parseInt(corporateValue)
);
setCorporateValue(
storageCorporateValue ? storageCorporateValue.id : corporateManages.data[0].id
);
} catch (error: any) { } catch (error: any) {
console.error('Error fetching data:', error.message); console.error('Error fetching data:', error.message);
} }