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

Update Active Status and Fix Mode 3

Browse Source
This commit is contained in:
Dell
2022-07-25 12:24:55 +07:00
parent d7de76798e
commit 2493e7fd2a
14 changed files with 118 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,16 +276,19 @@ class MemberEnrollmentService
'member_id' => $row['member_id'],
'policy_id' => $row['policy_number']
]), 0, null, $row);
}
}
if ($memberPolicy->status != 'active') {
throw new ImportRowException(__('enrollment.MEMBER_INACTIVE', [
'member_id' => $row['member_id'],
'policy_id' => $row['policy_number']
]), 0, null, $row);
}
$member = $memberPolicy->member;
$member->active = false;
return $memberPolicy->delete();
return $member->save();
break;
case "4": // Member Update Start and End Date
$memberPolicy = MemberPolicy::query()

4
app/Models/Benefit.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class Benefit extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/CorporateBenefit.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class CorporateBenefit extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/CorporateDivision.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class CorporateDivision extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/CorporateEmployee.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class CorporateEmployee extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/CorporatePlan.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class CorporatePlan extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/CorporatePolicy.php
View File

@@ -2,14 +2,16 @@
namespace App\Models;
use App\Traits\Blameable;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
class CorporatePolicy extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'corporate_id',

4
app/Models/Member.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class Member extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
"id",

34
app/Models/MemberPlan.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class MemberPlan extends Model
{
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
'member_id',
'plan_id',
'status',
'start',
'end',
'created_by',
'updated_by',
'deleted_by',
];
public function member()
{
return $this->belongsTo(Member::class, 'member_id', 'member_id');
}
public function corporatePlan()
{
return $this->belongsTo(CorporatePlan::class, 'plan_id', 'code');
}
}

5
app/Models/MemberPolicy.php
View File

@@ -16,7 +16,10 @@ class MemberPolicy extends Model
'member_id',
'status',
'start',
'end'
'end',
'created_by',
'updated_by',
'deleted_by',
];
public function corporatePolicy()

4
app/Models/Plan.php
View File

@@ -2,12 +2,14 @@
namespace App\Models;
use App\Traits\Blameable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class Plan extends Model
{
use HasFactory;
use HasFactory, SoftDeletes, Blameable;
protected $fillable = [
"service_code",

44
database/migrations/2022_07_25_050001_create_member_plans_table.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('member_plans', function (Blueprint $table) {
$table->id();
$table->string('member_id');
$table->string('plan_id');
$table->string('status')->default('active');
$table->dateTime('start')->nullable();
$table->dateTime('end')->nullalbe();
$table->timestamps();
$table->softDeletes();
$table->unsignedBigInteger('created_by')->nullable();
$table->unsignedBigInteger('updated_by')->nullable();
$table->unsignedBigInteger('deleted_by')->nullable();
$table->index(['policy_id', 'member_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('member_plans');
}
};

4
frontend/dashboard/src/pages/Corporates/CorporatePlan/List.tsx
View File

@@ -76,7 +76,9 @@ export default function PlanList() {
<TableCell align="left">{row.code}</TableCell>
<TableCell align="left">{row.name}</TableCell>
<TableCell align="left">{ makeExcerpt(row.description) }</TableCell>
<TableCell align="right"><Button variant="outlined" color="success" size="small">Active</Button></TableCell>
{( row.active ? (<TableCell align="right"><Button variant="outlined" color="success" size="small">Active</Button></TableCell>)
: (<TableCell align="right"><Button variant="outlined" color="error" size="small">Inactive</Button></TableCell>)
)}
<TableCell align="right"><Link to={`/corporates/${row.corporate_id}/corporate-plans/${row.id}/edit`}><Button variant="outlined" color="success" size="small">Edit</Button></Link></TableCell>
</TableRow>
{/* COLLAPSIBLE ROW */}

4
frontend/dashboard/src/pages/Corporates/Member/List.tsx
View File

@@ -263,7 +263,9 @@ export default function CorporatePlanList() {
<TableCell align="left">{row.plan_id}</TableCell>
<TableCell align="left">{row.current_policy.start}</TableCell>
<TableCell align="left">{row.current_policy.end}</TableCell>
<TableCell align="right"><Button variant="outlined" color="success" size="small">Active</Button></TableCell>
{( row.active ? (<TableCell align="right"><Button variant="outlined" color="success" size="small">Active</Button></TableCell>)
: (<TableCell align="right"><Button variant="outlined" color="error" size="small">Inactive</Button></TableCell>)
)}
{/* <TableCell align="right"><Button variant="outlined" color="success" size="small">Edit</Button></TableCell> */}
</TableRow>
{/* COLLAPSIBLE ROW */}