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

bugs fix

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-25 13:27:42 +07:00
parent d0b8c25b7d
commit 453ff3ec90
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -70,6 +70,7 @@ class CorporateMemberController extends Controller
}) })
->select('members.*') ->select('members.*')
->selectRaw('(SELECT GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ") AS file_mcu_names from files_mcu WHERE files_mcu.memberid = members.id) AS file_mcu_names') ->selectRaw('(SELECT GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ") AS file_mcu_names from files_mcu WHERE files_mcu.memberid = members.id) AS file_mcu_names')
->groupBy('corporate_employees.member_id')
->paginate() ->paginate()
->appends($request->all()); ->appends($request->all());
return Helper::paginateResources(MemberDataTableResource::collection($members)); return Helper::paginateResources(MemberDataTableResource::collection($members));
@@ -185,7 +186,7 @@ class CorporateMemberController extends Controller
$imported_member_data = 0; $imported_member_data = 0;
$failed_member_data = []; $failed_member_data = [];
foreach ($reader->getSheetIterator() as $sheet) { foreach ($reader->getSheetIterator() as $sheet) {
$doc_headers_indexes = []; $doc_headers_indexes = [];
foreach ($sheet->getRowIterator() as $index => $row) { foreach ($sheet->getRowIterator() as $index => $row) {

10
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -349,7 +349,7 @@ class MemberEnrollmentService
} }
} else { } else {
// throw new ImportRowException(__('Format Date Invalid'), 0, null, $date_from_row); // throw new ImportRowException(__('Format Date Invalid'), 0, null, $date_from_row);
return null; return null;
} }
} }
@@ -877,7 +877,7 @@ class MemberEnrollmentService
} }
break; break;
case "2": // Member Information Update (Without Replacement Card) case "2": // Member Information Update (Without Replacement Card)
$this->validateRow($row); $this->validateRow($row);
$member = Member::query() $member = Member::query()
->where('member_id', $row['member_id']) ->where('member_id', $row['member_id'])
@@ -964,10 +964,10 @@ class MemberEnrollmentService
$division_id = $division->id; $division_id = $division->id;
} }
// Bisa disini penyebab data dobel // Bisa disini penyebab data dobel
$member->employeds()->updateOrCreate([ $member->employeds()->updateOrCreate([
'division_id' => $division_id 'member_id' => $member->id
],[ ],[
'corporate_id' => $corporate->id, 'corporate_id' => $corporate->id,
'branch_code' => $row['branch_code'], 'branch_code' => $row['branch_code'],
@@ -1107,7 +1107,7 @@ class MemberEnrollmentService
); );
} }
if (!$memberPolicy) { if (!$memberPolicy) {
throw new ImportRowException(__('enrollment.MEMBER_NOT_EXISTS', [ throw new ImportRowException(__('enrollment.MEMBER_NOT_EXISTS', [
'member_id' => $row['member_id'], 'member_id' => $row['member_id'],