gitkwesi/ERP-upgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated client views and routes

Browse Source
This commit is contained in:
Kwesi Banson Jnr
2026-07-23 21:16:22 +00:00
parent 7b29bb278c
commit 08ded57875
10 changed files with 1685 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

270
app/Http/Controllers/ClientsController.php
View File

@@ -4,19 +4,193 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\DB;
class ClientsController extends Controller
{
public function index()
{
// $clients = Models\Client::get();
public function index(){
$countries = Models\Country::pluck('en_short_name', 'en_short_name');
$service_type = Models\Service::pluck('name', 'name');
$staff_members = Models\StaffMember::pluck('name', 'id');
// dd($staff_members);
$data = [
'page_title' => 'Dashboard',
// 'clients' => $clients
'service_types' => $service_type,
'countries' => $countries,
'staff_members' => $staff_members
];
return view('clients.index', $data);
}
public function show(int $id)
{
$showclient = Models\Client::with([
'service_info',
'country_flag_info',
'auth_user_info',
'short_code_info',
])->findOrFail($id);
$progress_indicators = Models\ClientIndicator::pluck('name', 'name');
$service_type = Models\Service::pluck('name', 'id');
$service_type_names = Models\Service::pluck('name', 'name');
$show_services = Models\ClientCategory::where('client_id', $id)->get();
$country_networks = DB::table('network_operators')
->selectRaw('id, CONCAT(name, " (", country, ")") AS network')
->orderBy('network')
->pluck('network', 'network');
$auth_users = Models\SystemUser::orderBy('name')->pluck('name', 'id');
$networks_raw = [
'AirtelTigo GH',
'MTN GH',
'Airtel MW',
'Airtel Zambia',
'TNM MW',
'Safaricom Kenya',
'Airtel Kenya',
'Telkom Kenya',
'Orange Kenya',
];
$show_notes_query = Models\ClientNote::with(['created_by_info', 'client_info'])
->where('client_id', $id)
->latest();
$show_notes = $show_notes_query->take(20)->get();
$show_notes_highlight = (clone $show_notes_query)
->where('highlight', 'YES')
->take(1)
->get();
$voice_codes = Models\ClientShortCode::where('client_id', $id)
->where('code_type', 'voice')
->get();
$sms_codes = Models\ClientShortCode::where('client_id', $id)
->where('code_type', 'sms')
->get();
$ussd_codes = Models\ClientShortCode::where('client_id', $id)
->where('code_type', 'ussd')
->get();
$recent_payments = Models\ClientPayment::where('client_id', $id)
->latest('id')
->get();
$countries = Models\Country::pluck('en_short_name', 'en_short_name');
$networks = Models\NetworkOps::pluck('name', 'id');
$support_fees = Models\ClientSupportFees::where('client_id', $id)
->latest('id')
->get();
$showdocuments = Models\ClientFile::where('client_id', $id)->get();
$status_bg = match ($showclient->status) {
'Live' => 'info',
'Prospective' => 'warning',
default => 'danger',
};
$progress_status_bg = match (true) {
$showclient->progress_indicator_score >= 70 => 'success',
$showclient->progress_indicator_score >= 50 => 'warning',
default => 'danger',
};
[$renewal_due, $highlight_colour] = $this->getRenewalDue(
$showclient->contract_validity
);
$recurring_arr = [
'NO' => 'NO',
'Monthly' => 'Monthly',
'Quarterly' => 'Quarterly',
'Semiannual' => 'Semiannual',
'Yearly' => 'Yearly',
];
$sender_id_statuses = [
'Pending' => 'Pending',
'Inactive' => 'Inactive',
'Approved' => 'Approved',
];
$change_account_mgr_permission = Config::get('permissions.CHANGE_ACCOUNT_MANAGERS');
// dump($change_account_mgr_permission);
$change_account_mgr_permission = $this->hasAnyAccess([$change_account_mgr_permission]) ? 'YES' : 'NO';
// dd($change_account_mgr_permission);
return view('clients.show', [
'page_title' => 'Client Profile',
'showclient' => $showclient,
'show_services' => $show_services,
'service_type' => $service_type,
'service_type_names' => $service_type_names,
'show_notes' => $show_notes,
'show_notes_highlight' => $show_notes_highlight,
'status_bg' => $status_bg,
'progress_status_bg' => $progress_status_bg,
'voice_codes' => $voice_codes,
'sms_codes' => $sms_codes,
'ussd_codes' => $ussd_codes,
'countries' => $countries,
'networks' => $networks,
'progress_indicators' => $progress_indicators,
'networks_raw' => array_combine($networks_raw, $networks_raw),
'renewal_due' => $renewal_due,
'recent_payments' => $recent_payments,
'highlight_colour' => $highlight_colour,
'showdocuments' => $showdocuments,
'support_fees' => $support_fees,
'recurring_arr' => $recurring_arr,
'sender_id_statuses' => $sender_id_statuses,
'change_account_mgr_permisson' => $change_account_mgr_permission,
'am_list_arr' => $auth_users,
'country_network_arr' => $country_networks,
'mnos_arr' => ['' => '-- Select Country first --'],
]);
}
private function getRenewalDue(?string $contractValidity): array
{
if (blank($contractValidity)) {
return ['N/A', 'none'];
}
$expiryDate = Carbon::parse($contractValidity)->startOfDay();
$today = now()->startOfDay();
if ($expiryDate->greaterThanOrEqualTo($today)) {
$days = $today->diffInDays($expiryDate);
return match (true) {
$days > 365 => ['In ' . floor($days / 365) . ' year(s)', 'none'],
$days > 31 => ['In ' . floor($days / 31) . ' month(s)', 'none'],
default => ['In ' . $days . ' day(s)', 'none'],
};
}
$days = $expiryDate->diffInDays($today);
return match (true) {
$days > 365 => ['Contract expired ' . floor($days / 365) . ' year(s) ago', 'warning'],
$days > 31 => ['Contract expired ' . floor($days / 31) . ' month(s) ago', 'warning'],
default => ['Contract expired ' . $days . ' day(s) ago', 'warning'],
};
}
public function fetchDataOld(Request $request)
{
$query = Models\Client::query();
@@ -147,4 +321,90 @@ class ClientsController extends Controller
return $pdf->download('clients_export_' . date('Y-m-d_H-i') . '.pdf');
}
public function store(Request $request): JsonResponse|RedirectResponse
{
$request->validate([
'name' => 'required|unique:clients,name',
'email' => 'required|email',
'services' => 'required|array',
'country' => 'required',
'status' => 'required',
'payment_mode' => 'required',
'currency' => 'required',
'company_type' => 'required',
'industry' => 'required',
'account_manager' => 'required',
]);
$onboarding_stages = Models\ClientOnboardingMainStage::orderBy('stage_id')->get();
$client_current_stages = [];
foreach ($onboarding_stages as $value) {
$client_current_stages[$value->stage] = "PENDING";
}
$client_arr = [
'name' => $request->name,
'email' => $request->email,
'country' => $request->country,
'status' => $request->status,
'pay_mode' => $request->payment_mode,
'currency' => $request->currency,
'auth_user_id' => $request->auth_user_id,
'created_by' => Auth::user()->id,
'last_modified_by' => Auth::user()->id,
'progress_indicator_score' => 10,
'progress_indicator' => $onboarding_stages[0]->stage,
'onboarding_progress_stage' => json_encode($client_current_stages),
'notes' => $request->notes,
'services' => json_encode($request->services),
'phone' => $request->phone,
'skype_name' => $request->skype_name,
'linkedin_name' => $request->linkedin_name,
'contact_person' => $request->contact_person,
'company_type' => $request->company_type,
'industry' => $request->industry,
];
$result = Models\Client::create(array_filter($client_arr));
$get_stage_subs_items = Models\ClientOnboardingSubItem::get();
foreach ($get_stage_subs_items as $value) {
Models\ClientOnboardingProgress::create([
'stage_id' => $value->stage_id,
'client_id' => $result->id,
'name' => $value->name,
'status' => 'PENDING'
]);
}
if (in_array('USSD', $request->services)) {
Log::info('ussd client detected');
Models\UssdClientPayment::create([
'client_id' => $result->id,
'last_modified_by_id' => session('current_user.id')
]);
}
Models\UserActivity::create([
'type' => 'staff',
'content' => session('current_user.name') . " added a new client ({$result->name}) successfully!",
'user_id' => session('current_user.id'),
'ip_address' => request()->ip(),
'device' => $request->header('User-Agent')
]);
if ($request->ajax() || $request->wantsJson()) {
return response()->json([
'success' => true,
'message' => 'Client successfully added',
'data' => $result
]);
}
Session::flash('success_message', 'Client successfully added');
return redirect('clients');
}
}