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

bug fixes and new additions

Browse Source
This commit is contained in:
Kwesi Banson Jnr
2025-08-13 00:10:17 +00:00
parent cf39ff2682
commit eabf61b7da
133 changed files with 4231 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/Http/Controllers/ReportsController.php
View File

@@ -102,12 +102,75 @@ class ReportsController extends Controller{
->select('user_activities.id','auth_users.name', 'user_activities.content', 'user_activities.ip_address', 'user_activities.created_at', 'user_activities.updated_at')
->whereRaw("user_activities.name like '%$keyword%' or user_activities.ip_address like '%$keyword%' OR user_activities.created_at like '%$keyword%' OR user_activities.updated_at like '%$keyword%'")
->orderBy('user_activities.created_at', 'DESC')
->get();
// ->paginate(15);
//->get();
->paginate(50);
}
return response()->json($user_activities);
}
public function getMnosContracts(){
#$user_activities = Models\UserActivity::where('user_id', '>', '1')->with('userInfo')->orderBy('created_at', 'DESC')->take(5)->get();
$data = [
'page_title' => 'Expired MNO Contracts',
'current_user' => session('current_user')
];
return view('reports.mno-expired-contracts', $data);
}
public function getMnosContractsJson(Request $request){
$today = Carbon::now()->format('m-d');
$expired_contracts = \DB::table('network_operators')
->join('auth_users', 'auth_users.id', '=', 'network_operators.account_manager_id')
->select('network_operators.id','auth_users.name AS accountManager', 'network_operators.name','network_operators.contact_person', 'network_operators.contact_person_email', 'network_operators.country', 'network_operators.contract_validity', 'network_operators.created_at')
->whereRaw("DATE_FORMAT(contract_validity, '%m-%d') < ?", [$today])
->orderBy('network_operators.name', 'DESC')
->get();
if($request->has('keyword')){
$keyword = $request->keyword;
$expired_contracts = \DB::table('network_operators')
->join('auth_users', 'auth_users.id', '=', 'network_operators.account_manager_id')
->select('network_operators.id','auth_users.name AS accountManager', 'network_operators.name','network_operators.contact_person', 'network_operators.contact_person_email', 'network_operators.country', 'network_operators.contract_validity', 'network_operators.created_at')
->whereRaw("DATE_FORMAT(contract_validity, '%m-%d') < ?", [$today])
->whereRaw("network_operators.name like '%$keyword%' or network_operators.contact_person like '%$keyword%' OR network_operators.created_at like '%$keyword%' OR network_operators.contract_validity like '%$keyword%' OR network_operators.contact_person_email like '%$keyword%'")
->orderBy('network_operators.name', 'DESC')
->get();
}
return response()->json($expired_contracts);
}
public function getClientContracts(){
#$user_activities = Models\UserActivity::where('user_id', '>', '1')->with('userInfo')->orderBy('created_at', 'DESC')->take(5)->get();
$data = [
'page_title' => 'Expirted Client Contracts',
'current_user' => session('current_user')
];
return view('reports.clients-expired-contracts', $data);
}
public function getClientContractsJson(Request $request){
$today = Carbon::now()->format('m-d');
$expired_contracts = \DB::table('clients')
->join('auth_users', 'auth_users.id', '=', 'clients.auth_user_id')
->select('clients.id','auth_users.name AS accountManager', 'clients.name','clients.contact_person', 'clients.email', 'clients.country', 'clients.contract_validity', 'clients.created_at')
->whereRaw("DATE_FORMAT(contract_validity, '%m-%d') < ?", [$today])
->orderBy('clients.name', 'DESC')
->get();
if($request->has('keyword')){
$keyword = $request->keyword;
$expired_contracts = \DB::table('clients')
->join('auth_users', 'auth_users.id', '=', 'clients.auth_user_id')
->select('clients.id','auth_users.name AS accountManager', 'clients.name','clients.contact_person', 'clients.email', 'clients.country', 'clients.contract_validity', 'clients.created_at')
->whereRaw("DATE_FORMAT(contract_validity, '%m-%d') < ?", [$today])
->whereRaw("clients.name like '%$keyword%' or clients.contact_person like '%$keyword%' OR clients.created_at like '%$keyword%' OR clients.contract_validity like '%$keyword%' OR clients.contact_person_email like '%$keyword%'")
->orderBy('clients.name', 'DESC')
->get();
}
return response()->json($expired_contracts);
}
public function getAmNewClients(){
// $new_clients = Models\Client::where()
}