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

[Client Portal] - tambah feild item benefit di service monitoring (tb fajri)

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-13 19:28:42 +07:00
parent 50fbdc02bc
commit d659e8fd4e
4 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/RequestLog.php
View File

@@ -51,7 +51,7 @@ class RequestLog extends Model
'deleted_by',
];
public static $doc_headers_to_field_map = [
public static $doc_headers_to_field_map = [
"Date Of Request" => "submission_date",
"Date Addmission" => "submission_date",
"Member ID Peserta" => "member_id",
@@ -65,7 +65,7 @@ class RequestLog extends Model
"Total Billing" => "total_billing",
"Amount Approval" => "amount_approval",
"Amount Not Approval" => "amount_not_approval",
"QC 1" => "status_final_log",
"QC 1" => "status_final_log",
];
public static $listing_doc_headers = [
@@ -82,7 +82,7 @@ class RequestLog extends Model
"Total Billing",
"Amount Approval",
"Amount Not Approval",
"QC 1",
"QC 1",
];
public static $listing_data_doc_headers = [
@@ -246,6 +246,11 @@ class RequestLog extends Model
return $this->hasOne(RequestLogBenefit::class, 'request_log_id');
}
public function requestLogBenefits()
{
return $this->hasMany(RequestLogBenefit::class, 'request_log_id');
}
public function requestLogDailyMonitorings()
{
return $this->hasMany(RequestLogDailyMonitoring::class, 'request_log_id');

6
app/Services/CorporateMemberService.php
View File

@@ -212,9 +212,9 @@ class CorporateMemberService
// ->joinPlans('left')
// ->with(['currentPlan', 'person'])
// ->where('corporate_employees.corporate_id', $corporateId)
->whereHas('currentCorporate', function (Builder $query) use ($corporateId) {
$query->where('corporate_id', $corporateId);
})
// ->whereHas('currentCorporate', function (Builder $query) use ($corporateId) {
// // $query->where('corporate_id', $corporateId);
// })
->when($request->input('search'), function (Builder $query, $search) {
$query->where(function (Builder $query) use ($search) {
$query->orWhere('members.member_id', 'like', "%" . $search . "%")