Merge branch 'dev' of http://103.248.30.24:3000/kent-logistics/Kent-logistics-Laravel into dev
This commit is contained in:
@@ -85,7 +85,6 @@ public function approveProfileUpdate($id)
|
|||||||
$req = \App\Models\UpdateRequest::findOrFail($id);
|
$req = \App\Models\UpdateRequest::findOrFail($id);
|
||||||
$user = \App\Models\User::findOrFail($req->user_id);
|
$user = \App\Models\User::findOrFail($req->user_id);
|
||||||
|
|
||||||
// FIX: Ensure data is array
|
|
||||||
$newData = is_array($req->data) ? $req->data : json_decode($req->data, true);
|
$newData = is_array($req->data) ? $req->data : json_decode($req->data, true);
|
||||||
|
|
||||||
foreach ($newData as $key => $value) {
|
foreach ($newData as $key => $value) {
|
||||||
@@ -96,8 +95,18 @@ public function approveProfileUpdate($id)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update user table
|
||||||
$user->save();
|
$user->save();
|
||||||
|
|
||||||
|
// Update mark_list table
|
||||||
|
\App\Models\MarkList::where('customer_id', $user->customer_id)
|
||||||
|
->update([
|
||||||
|
'customer_name' => $user->customer_name,
|
||||||
|
'company_name' => $user->company_name,
|
||||||
|
'mobile_no' => $user->mobile_no
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Update request status
|
||||||
$req->status = 'approved';
|
$req->status = 'approved';
|
||||||
$req->admin_note = 'Approved by admin on ' . now();
|
$req->admin_note = 'Approved by admin on ' . now();
|
||||||
$req->save();
|
$req->save();
|
||||||
|
|||||||
Reference in New Issue
Block a user