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:
Linksehat Staging Server
2024-01-06 11:38:35 +07:00
parent 37b8229fc2 a9c48f63a4
commit fe71286728
4 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/Internal/Http/Controllers/Api/AuthController.php
View File

@@ -4,6 +4,7 @@ namespace Modules\Internal\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Models\User;
use App\Models\Person;
use Crypt;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -136,6 +137,7 @@ class AuthController extends Controller
$validator = Validator::make($request->all(), [
'email' => 'required|email|unique:users,email',
'username' => 'required|unique:users,username',
'name' => 'required',
'password' => [
'required',
'min:5',
@@ -154,6 +156,16 @@ class AuthController extends Controller
'password' => Hash::make($request->password),
]);
$person = Person::updateOrCreate(
[
'id' => $user->person_id
],
[
'name' => $request->name ?? null
]
);
$user->person_id = $person->id;
$user->save();
return response()->json($user);
} catch (\Exception $e) {
return response()->json([

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

@@ -937,7 +937,9 @@ class MemberEnrollmentService
// $memberPlan->plan_id = $plan->id;
// $memberPlan->save();
// }
// Hapus Member plan terkait
$member->memberPlans()->delete();
//Update plan
$plans = explode(",",$row['plan_id']);
if (count($plans) > 0) {

6
app/Providers/AppServiceProvider.php
View File

@@ -12,6 +12,7 @@ use App\Models\CorporateService;
use App\Models\CorporatePlan;
use App\Models\CorporateBenefit;
use App\Models\Member;
use App\Models\MemberPlan;
use App\Models\CorporateHospital;
use App\Models\ExclusionRules;
use App\Models\ExclusionImport;
@@ -70,6 +71,11 @@ class AppServiceProvider extends ServiceProvider
$this->logAuditTrail($model, 'updated');
});
MemberPlan::updated(function ($model) {
$this->logAuditTrail($model, 'updated');
});
Member::deleted(function ($model) {
$this->logAuditTrail($model, 'deleted');
});

62
frontend/dashboard/src/pages/Corporates/Member/History.tsx
View File

@@ -118,38 +118,38 @@ export default function MemberHistory() {
</TableRow>
</TableHead>
<TableBody>
{Object.entries(item.old_values).map(([key, value]) => {
let renderedValue;
if (key === 'reason' || key === 'updated_at') {
switch (key) {
case 'updated_at':
renderedValue = fDateTime(item.new_values[key]);
value = fDateTime(value);
break;
default:
renderedValue = item.new_values[key];
break;
{Object.entries(item.old_values).map(([key, value]) => {
let renderedValue;
if (renderedValue !== value) {
switch (key) {
case 'updated_at':
renderedValue = fDateTime(item.new_values[key]);
value = fDateTime(value);
break;
default:
renderedValue = item.new_values[key];
break;
}
const field = key.charAt(0).toUpperCase() + key.slice(1);
return (
<TableRow key={key}>
<TableCell align="left">
<Typography variant="body2">{field ? field : '-'}</Typography>
</TableCell>
<TableCell align="left">
<Typography variant="body2">{value ? value : '-'}</Typography>
</TableCell>
<TableCell align="left">
<Typography variant="body2">{renderedValue ? renderedValue : ''}</Typography>
</TableCell>
</TableRow>
);
}
const field = key.charAt(0).toUpperCase() + key.slice(1);
return (
<TableRow key={key}>
<TableCell align="left">
<Typography variant="body2">{field ? field : '-'}</Typography>
</TableCell>
<TableCell align="left">
<Typography variant="body2">{value ? value : '-'}</Typography>
</TableCell>
<TableCell align="left">
<Typography variant="body2">{renderedValue ? renderedValue : ''}</Typography>
</TableCell>
</TableRow>
);
}
else{
return null;
}
})}
else{
return null;
}
})}
</TableBody>
</Table>
</TableContainer>