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

upload foto, dan bugs import

Browse Source
This commit is contained in:
pajri
2022-12-21 17:22:45 +07:00
parent 88ad144921
commit b1c908a6f6
12 changed files with 576 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Modules/Internal/Http/Controllers/Api/CorporateController.php
View File

@@ -18,6 +18,8 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Maatwebsite\Excel\Facades\Excel;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use App\Models\File;
use Illuminate\Support\Facades\Storage;
use Modules\Internal\Services\CorporateService;
@@ -220,6 +222,18 @@ class CorporateController extends Controller
$managerOne = User::where('email', 'manager+one@gmail.com')->first();
$managerOne->managedCorporates()->attach($newCorporate);
if ($request->hasFile('logo')) {
$pathFileAvatar = File::storeFile('avatar', $newCorporate->id, $request->file('logo'));
$newCorporate->files()->updateOrCreate([
'type' => 'avatar',
'name' => File::getFileName('avatar', $newCorporate->id, $request->file('logo')),
'extension' => $request->file('logo')->getClientOriginalExtension(),
'path' => $pathFileAvatar,
'created_by' => auth()->user()->id,
'updated_by' => auth()->user()->id,
]);
}
DB::commit();
} catch (\Exception $e) {
@@ -282,9 +296,13 @@ class CorporateController extends Controller
try {
DB::beginTransaction();
//karena pake formdata
$linkingRules = $request->linking_rules;
$linkingRules = explode(',', $linkingRules);
$corporate = Corporate::findOrFail($id);
$corporate->fill($request->toArray());
$corporate->fill($request->all());
$corporate->linking_rules = $linkingRules;
$corporate->save();
$corporate->policies()->updateOrCreate(
@@ -304,6 +322,19 @@ class CorporateController extends Controller
]
);
if ($request->hasFile('logo')) {
$pathFileAvatar = File::storeFile('avatar', $corporate->id, $request->file('logo'));
$corporate->files()->updateOrCreate([
'type' => 'avatar',
'name' => File::getFileName('avatar', $corporate->id, $request->file('logo')),
'extension' => $request->file('logo')->getClientOriginalExtension(),
'path' => $pathFileAvatar,
'created_by' => auth()->user()->id,
'updated_by' => auth()->user()->id,
]);
}
DB::commit();
} catch (\Exception $e) {
DB::rollBack();

12
Modules/Internal/Services/CorporateService.php
View File

@@ -10,7 +10,7 @@ use App\Models\Plan;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
class CorporateService
{
{
protected function validatePlanRow($row)
{
if (empty($row['service_code'])) {
@@ -84,12 +84,16 @@ class CorporateService
public function handleBenefitRow(Corporate $corporate, $row)
{
try {
$benefit_data = $row;
$benefit_data["corporate_id"] = $corporate->id;
$this->validateBenefitRow($benefit_data);
$plan = $corporate->plans->where('corporate_plan_id', $benefit_data['plan_code'])->first();
$plan = Plan::where('corporate_plan_id', $benefit_data['plan_code'])->first();
// $corporate->plans->where('corporate_plan_id', $benefit_data['plan_code'])->first();
$benefit_data['plan_code'] = $plan->id;
$benefit = Benefit::updateOrCreate([
@@ -104,11 +108,11 @@ class CorporateService
$corporateBenefit = $corporate->corporateBenefits()->updateOrCreate([
'benefit_id' => $benefit->id,
'plan_id' => $plan->id
], $benefit_data );
], $benefit_data);
return $corporateBenefit;
} catch (\Exception $e) {
dd($e->getMessage());
// dd($e->getMessage());
throw $e;
}
}

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

@@ -362,8 +362,8 @@ class MemberEnrollmentService
"nik" => $row['nik'] ?? null,
"birth_date" => Carbon::parse(strtotime($row['date_of_birth'])),
"gender" => Helper::genderNormalization($row['sex']),
"language" => $row['language'] ?? null,
"race" => $row['race'] ?? null,
// "language" => $row['language'] ?? null,
// "race" => $row['race'] ?? null,
"marital_status" => $row['marital_status'] ?? null,
"record_type" => $row['record_type'] ?? null,
"principal_id" => $row['principal_id'] ?? null,
@@ -429,15 +429,6 @@ class MemberEnrollmentService
]), 0, null, $row);
} else {
$member = new Member();
$person = Person::create([
'name' => $row['name'],
'birth_date' => Carbon::parse(strtotime($row['date_of_birth'])),
'gender' => Helper::genderPerson($row['sex']),
'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null,
]);
$member->person_id = $person->id;
$member->save();
}
$memberPolicy = $member->policies()
@@ -463,10 +454,22 @@ class MemberEnrollmentService
$this->validateRow($row);
try {
DB::beginTransaction();
$member->fill($member_data);
if ($member->save()) {
$person = Person::create([
'name' => $row['name'],
'birth_date' => Carbon::parse(strtotime($row['date_of_birth'])),
'gender' => Helper::genderPerson($row['sex']),
'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null,
]);
$member->person_id = $person->id;
$member->save();
$memberPolicy = new MemberPolicy();
$memberPolicy->fill([
'member_id' => $member->member_id,