diff --git a/Modules/Internal/Http/Controllers/Api/CorporateController.php b/Modules/Internal/Http/Controllers/Api/CorporateController.php index a8fc5dbd..040b1d3f 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php @@ -79,7 +79,7 @@ class CorporateController extends Controller */ public function store(Request $request) { - + $request->validate([ 'code' => 'required|regex:/^[a-zA-Z0-9_]+$/', 'name' => 'required', @@ -468,9 +468,9 @@ class CorporateController extends Controller // $import->read($fileRead); // $import->write($fileWrite, 'xsls'); $result_headers = array_merge($row_data, ['Ingest Code' =>200, 'Ingest Note' => 'Success']); - + $import->addArrayToRow($result_headers, $sheet->getName()); - + } catch (ImportRowException $e) { // Write Data Validation Error to File // $import->read($fileRead); @@ -518,7 +518,7 @@ class CorporateController extends Controller } - public function importDocumentExample($document_type) + public function importDocumentExample($document_type) { switch ($document_type) { case 'plan-benefit': @@ -532,7 +532,7 @@ class CorporateController extends Controller 'file_name' => "Corporate Membership Import.xlsx", "file_url" => url('files/Corporate Membership Import.xlsx') ]); - break; + break; case 'diagnosis-exclusion': return Helper::responseJson([ 'file_name' => "Corporate Exclusion Import.xlsx", @@ -544,31 +544,31 @@ class CorporateController extends Controller 'file_name' => "Template - ICD.xlsx", "file_url" => url('files/Template - ICD.xlsx') ]); - break; + break; case 'master-formularium': return Helper::responseJson([ 'file_name' => "Template - Formularium.xlsx", "file_url" => url('files/Template - Formularium.xlsx') ]); - break; + break; case 'master-formularium-corporate': return Helper::responseJson([ 'file_name' => "Template - Formularium.xlsx", "file_url" => url('files/Template - Formularium - Corporate.xlsx') ]); - break; + break; case 'claim-request': return Helper::responseJson([ 'file_name' => "Template Format Claim.xlsx", "file_url" => url('files/Template Format Claim.xlsx') ]); - break; + break; case 'request-log': return Helper::responseJson([ 'file_name' => "Template Update Status Request LOG.xlsx", "file_url" => url('files/Template Update Status Request LOG.xlsx') ]); - break; + break; default: return Helper::responseJson([], 'error', 404); break; @@ -582,7 +582,7 @@ class CorporateController extends Controller $writer = WriterEntityFactory::createXLSXWriter(); // Membuka penulis untuk menulis ke file $writer->openToFile(public_path('files/CorporatePlan&BenefitImportData.xlsx')); - + // Sheet 1 $writer->getCurrentSheet()->setName('Plans'); $headers_map_to_table_fields = Plan::$listing_doc_headers; @@ -783,7 +783,7 @@ class CorporateController extends Controller { return Helper::responseJson(data: $request->toArray(), message: 'Tidak ada file yang ditambahkan'); } - + } public function getFilesDoc(Request $request) @@ -825,5 +825,5 @@ class CorporateController extends Controller return Helper::responseJson(data: $datas, message: 'Berhasil update status download menjadi '.($request->status_download == 0 ? 'Inactive' : 'Active')); } - + } diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 9acc2340..2bbdad92 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -178,7 +178,7 @@ class CorporateMemberController extends Controller $result_headers = $this->memberEnrollmentService->result_doc_headers; $singleRow = WriterEntityFactory::createRow($this->memberEnrollmentService->makeResultRow($result_headers)); $writer->addRow($singleRow); - + $imported_member_data = 0; $failed_member_data = []; foreach ($reader->getSheetIterator() as $sheet) { @@ -202,7 +202,7 @@ class CorporateMemberController extends Controller $new_member_data[$headers_map_to_table_fields[$doc_headers_indexes[$header_index]]] = $cell->getValue(); } } - + try { $rowResponse = $this->memberEnrollmentService->handleImportRow($corporate, $new_member_data); // Write Success Result to File @@ -257,23 +257,23 @@ class CorporateMemberController extends Controller $corporate_id = CorporateEmployee::where('member_id', $member_id)->value('corporate_id'); // $member = Member::findOrFail($member_id) // ->load([ - // 'currentPlan', - // 'currentPolicy', + // 'currentPlan', + // 'currentPolicy', // 'currentPlan.corporateBenefits' => function ($benefit) use ($request) { // return $benefit->when($request->benefit_ids, function ($q, $ids) { - + // $q->whereIn('benefit_id', $ids) // ->where([ // 'corporate_benefits.active' => 1, // 'corporate_benefits.corporate_id' => $corporate_id, // ]); // }); - // }, + // }, // // 'currentPlan.corporateBenefits.benefit' // ]); $member = Member::with([ - 'currentPlan', - 'currentPolicy', + 'currentPlan', + 'currentPolicy', 'currentPlan.corporateBenefits' => function ($query) use ($request, $corporate_id) { $query->when($request->benefit_ids, function ($q, $ids) use ($corporate_id) { $q->whereIn('benefit_id', $ids) @@ -283,7 +283,7 @@ class CorporateMemberController extends Controller }, // 'currentPlan.corporateBenefits.benefit' ])->findOrFail($member_id); - + $dateOfAdmission = $request->date_of_admission ? Carbon::parse($request->date_of_admission) : now(); // return view('pdf.guaranted_leter', compact('member')); @@ -307,7 +307,7 @@ class CorporateMemberController extends Controller // Menulis header kolom $headers_map_to_table_fields = $this->memberEnrollmentService->listing_doc_headers; $headerRow = WriterEntityFactory::createRowFromArray($headers_map_to_table_fields); - + $writer->addRow($headerRow); // dd('test'); // Menulis data @@ -366,7 +366,7 @@ class CorporateMemberController extends Controller $item['pre_existing'], // Pre Existing $item['bpjs_id'], // BPJS ID $item['endorsement_date'], // Endorsement Date - $item['remarks'], // Remarks + $item['remarks'], // Remarks NULL, // Internal Use NULL,// Member Since NULL,// Internal Use @@ -398,8 +398,8 @@ class CorporateMemberController extends Controller public function sendAllECard(Request $request, $corporate_id){ $members = Member::with([ - 'currentPlan', - 'currentPolicy', + 'currentPlan', + 'currentPolicy', 'currentCorporate', // 'currentPlan.corporateBenefits.benefit' ])->whereHas('currentCorporate', function ($query) use ($corporate_id) { @@ -415,7 +415,7 @@ class CorporateMemberController extends Controller $pdf = PDF::loadView('pdf.ecard', compact('member'))->setPaper('A5', 'portrait'); $pdf->save($pdfPath); } - + $dataEmail = [ // 'email' => $member->email, 'email' => 'tbfajri', @@ -425,7 +425,7 @@ class CorporateMemberController extends Controller 'attach' => $pdfPath, ]; $sendEmail = Helper::sendEmailattachData($dataEmail); - + if ($sendEmail === true){ $countSuccesSend ++; @@ -445,18 +445,18 @@ class CorporateMemberController extends Controller 'data_succes_send' => $countSuccesSend, ]; - return response()->json($response); + return response()->json($response); } public function viewECard(Request $request, $member_id){ $member = Member::with([ - 'currentPlan', - 'currentPolicy', - 'currentCorporate', + 'currentPlan', + 'currentPolicy', + 'currentCorporate', // 'currentPlan.corporateBenefits.benefit' ])->find($member_id); - $pdf = PDF::loadView('pdf.ecard', compact('member'))->setPaper('A5', 'portrait'); + $pdf = PDF::loadView('pdf.ecard', compact('member'))->setPaper('A4', 'portrait'); return $pdf->download('Ecard - '.$member->full_name.'.pdf'); } diff --git a/Modules/Internal/Services/CorporateService.php b/Modules/Internal/Services/CorporateService.php index 6d1d9ed3..497cbd15 100644 --- a/Modules/Internal/Services/CorporateService.php +++ b/Modules/Internal/Services/CorporateService.php @@ -29,10 +29,10 @@ class CorporateService MCU=Medical Check Up KB-VACC = Family Planning/Vaccination LAB = Test Diagnostic - PHAR = Pharmacy + PHAR = Pharmacy **/ protected $service_code = ['MEDIVAC', 'MSO', 'PAC', 'OPDE', 'IP', 'OP', 'MA', 'ANC', 'DE', 'GL', 'SP', 'PF', 'MCU', 'KB-VACC', 'LAB', 'PHAR']; - + protected function corporatePlansId($corporate_id){ $plans = Plan::where('corporate_id', $corporate_id)->get()->toArray(); $current_corporate_plans_id = []; @@ -80,8 +80,8 @@ class CorporateService throw new ImportRowException(__('plan.REQUIRED', [ 'attribute' => 'Customer Plan' ]), 0, null, $row); - } - + } + if (!in_array($row['type'], $plan_code)){ throw new ImportRowException(__('plan.NOT_MATCH', [ 'attribute' => 'Plan Type', @@ -105,13 +105,13 @@ class CorporateService // 'code' => $row['code'] // ]), 0, null, $row); // } - + if (!empty($row['family_plan']) && !in_array($row['family_plan'],$family_plan)) { throw new ImportRowException(__('plan.NOT_MATCH', [ 'attribute' => 'Family Plan', 'code' => $row['family_plan'] ]), 0, null, $row); - } + } if (!empty($row['prorate_type']) && !in_array($row['prorate_type'], $prorate_type)) { throw new ImportRowException(__('plan.NOT_MATCH', [ @@ -171,7 +171,7 @@ class CorporateService 'code' => $row['service_code'] ]), 0, null, $row); } - + if (empty($row['plan_code'])) { throw new ImportRowException(__('benefit.PLAN_CODE_REQUIRED'), 0, null, $row); } else if (!in_array($row['plan_code'], $current_corporate_plans)){ @@ -181,21 +181,21 @@ class CorporateService // ]), 0, null, $row); } - + if (empty($row['code'])) { throw new ImportRowException(__('plan.REQUIRED', [ 'attribute' => 'Benefit Code' ]), 0, null, $row); } - + if (empty($row['corporate_benefit_code'])) { throw new ImportRowException(__('Customer Benefit Code Required', [ 'attribute' => 'Customer Benefit Code' ]), 0, null, $row); } - + if (empty($row['description'])) { throw new ImportRowException(__('plan.REQUIRED', [ 'attribute' => 'Description' @@ -216,16 +216,16 @@ class CorporateService 'attribute' => 'Gender' ]), 0, null, $row); } - if (!empty($row['max_frequency_period']) && $row['max_frequency_period'] >= $max_frequence){ // jenis frequence + if (!empty($row['max_frequency_period']) && $row['max_frequency_period'] >= $max_frequence){ // jenis frequence throw new ImportRowException(__('plan.MAX_FREQUENCY'), 0, null, $row); } - - if (!empty($row['budget']) && !in_array($budget_aso)) { + + if (!empty($row['budget']) && !in_array($budget_aso)) { throw new ImportRowException(__('plan.MAX_FREQUENCY'), 0, null, $row); } - + // if (empty($row['limit_free_tc'])){ // throw new ImportRowException(__('plan.REQUIRED', [