Fix multiple undefined variable errors across pages
- show-documents: add $type, $countDocs, $countMediaFiles, $otherFiles, paginate files - show-team + show: JOIN users to order_members for name/avatar/phone - BonusController: load appraiser and order per bonus row - ProfileController: fix wrong view names (index→profile, show-*→activities/projects/documents) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -120,7 +120,10 @@ class AutoController extends Controller
|
||||
$order->dillerUser = $dillerUser;
|
||||
}
|
||||
|
||||
$members = DB::table('order_members')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get();
|
||||
$members = DB::table('order_members as om')
|
||||
->leftJoin('users as u', 'u.id', '=', 'om.user_id')
|
||||
->select('om.*', 'u.name', 'u.avatar', 'u.phone', 'u.role')
|
||||
->where('om.order_id', $order->id ?? 0)->where('om.order_type', 'auto_')->get();
|
||||
$appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get();
|
||||
$isAppraisers = $members->where('user_id', auth()->id())->count() > 0;
|
||||
$files = DB::table('files')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get();
|
||||
@@ -138,16 +141,28 @@ class AutoController extends Controller
|
||||
public function showTeam($order)
|
||||
{
|
||||
$order = DB::table('auto_orders')->find($order);
|
||||
$members = DB::table('order_members')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get();
|
||||
$members = DB::table('order_members as om')
|
||||
->leftJoin('users as u', 'u.id', '=', 'om.user_id')
|
||||
->select('om.*', 'u.name', 'u.avatar', 'u.phone', 'u.role')
|
||||
->where('om.order_id', $order->id ?? 0)->where('om.order_type', 'auto_')->get();
|
||||
$appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get();
|
||||
return view('auto.show-team', compact('order', 'members', 'appraisers'));
|
||||
}
|
||||
|
||||
public function showDocuments($order)
|
||||
public function showDocuments($order, Request $request)
|
||||
{
|
||||
$order = DB::table('auto_orders')->find($order);
|
||||
$files = DB::table('files')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get();
|
||||
return view('auto.show-documents', compact('order', 'files'));
|
||||
$type = $request->get('type', 'ALL');
|
||||
$filesQuery = DB::table('files')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_');
|
||||
if ($type !== 'ALL') {
|
||||
$filesQuery->where('type', $type);
|
||||
}
|
||||
$files = $filesQuery->paginate(20)->withQueryString();
|
||||
$allFiles = DB::table('files')->where('order_id', $order->id ?? 0)->where('order_type', 'auto_')->get();
|
||||
$countDocs = $allFiles->whereIn('type', ['passport_customer', 'certificate', 'appraiser_certificate', 'insurance_policy', 'participate_certificate'])->count();
|
||||
$countMediaFiles = $allFiles->whereIn('type', ['object_photo', 'object_files', 'compares'])->count();
|
||||
$otherFiles = $allFiles->where('type', 'additional')->count();
|
||||
return view('auto.show-documents', compact('order', 'files', 'type', 'countDocs', 'countMediaFiles', 'otherFiles'));
|
||||
}
|
||||
|
||||
public function orderClone($id)
|
||||
|
||||
Reference in New Issue
Block a user