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

progress indicators, bug fixes, after a while

Browse Source
This commit is contained in:
Kwesi Banson
2023-12-13 12:13:47 +00:00
parent ea6d83e5d9
commit bc97f69748
1283 changed files with 1010757 additions and 7379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,16 +21,14 @@ class ClientsController extends Controller
*/
public function index()
{
$client = Models\Client::find(3);
$client_arr = new Models\Client;
$client_arr = $client_arr->with('auth_user_info','country_info', 'created_by_info')->orderBy('name', 'ASC')->paginate(15);
//dd($client_arr);
$data = [
'page_title' => 'Clients',
'client_arr' => $client_arr,
'current_user' => session('current_user')
];
// dd($data);
return view('client.index-tabulator', $data);
}
public function indexBak(){
@@ -57,18 +55,18 @@ class ClientsController extends Controller
->join('auth_users AS aumngr', 'aumngr.id', '=', 'clients.auth_user_id')
->join('auth_users AS aumodify', 'aumodify.id', '=', 'clients.last_modified_by')
->join('flags AS flags', 'flags.country', '=', 'clients.country')
->select('clients.id', 'clients.name', 'clients.status', 'clients.country', 'aumngr.name As accountMgr', 'aumodify.name AS modifiedBy', 'flags.url AS theflag')
->select('clients.id', 'clients.name', 'clients.status','clients.progress_indicator_score', 'clients.country', 'aumngr.name As accountMgr', 'aumodify.name AS modifiedBy', 'flags.url AS theflag')
->orderBy('name', 'ASC')
->paginate(15);
if($request->has('keyword')){ // != ''
if($request->has('keyword')){
$keyword = $request->keyword;
$client_arr = \DB::table('clients')
->join('auth_users AS aumngr', 'aumngr.id', '=', 'clients.auth_user_id')
->join('auth_users AS aumodify', 'aumodify.id', '=', 'clients.last_modified_by')
->join('flags AS flags', 'flags.country', '=', 'clients.country')
->select('clients.id','clients.name', 'clients.status', 'clients.country', 'aumngr.name As accountMgr', 'aumodify.name AS modifiedBy', 'flags.url AS theflag')
->whereRaw("clients.name like '%$keyword%' or clients.status like '%$keyword%' OR clients.country like '%$keyword%' OR aumngr.name like '%$keyword%' OR aumodify.name like '%$keyword%'")
->select('clients.id','clients.name', 'clients.status', 'clients.progress_indicators','clients.country', 'aumngr.name As accountMgr', 'aumodify.name AS modifiedBy', 'flags.url AS theflag')
->whereRaw("clients.name like '%$keyword%' or clients.status like '%$keyword%' OR clients.country like '%$keyword%' OR aumngr.name like '%$keyword%' OR aumodify.name like '%$keyword%' OR clients.progress_indicators_score like '%$keyword%'")
->orderBy('name', 'ASC')
->paginate(15);
}
@@ -107,7 +105,7 @@ class ClientsController extends Controller
{
$countries = Models\Country::pluck('en_short_name','en_short_name');
$service_type = Models\Service::pluck('name', 'name');
$payment_type = Models\PaymentType::pluck('name', 'id');
$payment_type = ['Prepaid' => 'Prepaid', 'Postpaid' => 'Postpaid']; //Models\PaymentType::pluck('name', 'id');
$auth_users = Models\SystemUser::pluck('name', 'id');
$status = ['Live' => 'Live', 'inactive' => 'Inactive', 'Prospective' => 'Prospective'];
$currency = Models\Currency::pluck('name','name');
@@ -150,6 +148,7 @@ class ClientsController extends Controller
'industry' => 'required',
'auth_user_id' => 'required', // account manager
]);
$client_arr = [
'name' => $request->name,
'email' => $request->email,
@@ -177,9 +176,18 @@ class ClientsController extends Controller
$client_arr['linkedin_name'] = $request->linkedin_name;
}
if ($request->has('contact_person')) {
$client_arr['contact_person'] = $request->contact_person;
$client_arr['contact_person'] = $request->contact_person;
}
if ($request->has('company_type')) {
$client_arr['company_type'] = $request->company_type;
}
if ($request->has('industry')) {
$client_arr['industry'] = $request->industry;
}
if ($request->has('payment_mode')) {
$client_arr['pay_mode'] = $request->payment_mode;
}
$result = Models\Client::create($client_arr);
if (in_array('3', $request->services)) {
@@ -213,7 +221,6 @@ class ClientsController extends Controller
'notes_body' => 'required'
]);
$auth_user = session('current_user');
//'email' => 'unique:users,email_address'
$notes_arr = [
'notes_body' => $request->notes_body,
'services' => implode(',', $request->services),
@@ -238,19 +245,23 @@ class ClientsController extends Controller
else{
$data = ['code' => 3, 'msg' => 'Your request could not be handled at this time'];
}
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") Added a new Note";
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
public function getSingleNote($id)
{
public function getSingleNote($id){
$note = Models\ClientNote::find($id);
if ($note) {
$current_date = date_create(date('Y-m-d'));
// dump($current_date);
$expiry_date = date_create($note->created_at);
// dump($expiry_date);
$diff = date_diff($current_date, $expiry_date);
$days = $diff->format("%a");
// dd($days);
if ($days > 7) {
return response()->json([ 'code' => 5, 'msg' => 'This Note has been locked for editing']);
}
@@ -296,6 +307,10 @@ class ClientsController extends Controller
else{
$data = ['code' => 3, 'msg' => 'Your request could not be handled at this time'];
}
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") Updated a Note";
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
public function financeStore(Request $request)
@@ -333,6 +348,10 @@ class ClientsController extends Controller
else{
$data = ['code' => 3, 'msg' => 'Your request could not be handled at this time'];
}
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") Added a payment record";
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
public function shortcodeStore(Request $request)
@@ -406,6 +425,10 @@ class ClientsController extends Controller
else{
$data = ['code' => 3, 'msg' => 'Your request could not be handled at this time'];
}
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") Added new short code";
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
public function financeUpdate(Request $request)
@@ -435,6 +458,10 @@ class ClientsController extends Controller
else{
$data = ['code' => 3, 'msg' => 'Your request could not be handled at this time'];
}
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") updated an existing payment record";
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
/**
@@ -715,8 +742,8 @@ class ClientsController extends Controller
$auth_users = Models\SystemUser::orderBy('name', 'ASC')->pluck('name', 'id');
$industries = Models\Industry::orderBy('name', 'ASC')->pluck('name', 'name');
$message_types_arr = ['International' => 'International', 'Local' => 'Local'];
$progress_indicators = Models\ClientIndicator::pluck('name', 'name');
$current_progress_indicators = json_decode($client->progress_indicators, true);
$how_we_got_clients_arr = ['Event : (GCCM) etc' => 'Event : (GCCM) etc', 'Referral' => 'Referral', 'Word of Mouth' => 'Word of Mouth', 'Marketing' => 'Marketing', 'Other' => 'Other'];
@@ -828,7 +855,9 @@ class ClientsController extends Controller
'message_types_arr' => $message_types_arr,
'industries' => $industries,
'how_we_got_clients_arr' => $how_we_got_clients_arr,
'current_services' => json_decode($client->services, true)
'current_services' => json_decode($client->services, true),
'progress_indicators' => $progress_indicators,
'current_progress_indicators' => $current_progress_indicators
];
return view('client.edit', $data);
}
@@ -856,6 +885,8 @@ class ClientsController extends Controller
// dump($request->has('other_document_name'));
// dd($request->all());
$client_update = Models\Client::find($id);
$progress_indicators_arr = json_encode($request->progress_indicators);
// dd($progress_indicators_arr);
if ($request->has('document_one') && $request->has('document_one_name')) {
if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();
@@ -927,6 +958,13 @@ class ClientsController extends Controller
$client_update->currency = $request->currency;
$client_update->notes = $request->notes;
$client_update->industry = $request->industry;
$client_update->progress_indicators = $progress_indicators_arr;
$general_indicators = Models\ClientIndicator::count();
$indicator_score = (count($request->progress_indicators)/$general_indicators) * 100;
$indicator_score = number_format($indicator_score);
// dd($indicator_score);
$client_update->progress_indicator_score = $indicator_score;
$client_update->skype_name = $request->skype_name ?? "";
$client_update->linkedin_name = $request->linkedin_name ?? "";
@@ -1011,6 +1049,10 @@ class ClientsController extends Controller
return response()->json($result_arr);
}
Session::flash('success_message', 'Client successfully deleted!');
$user_id = session('current_user.id');
$username = session('current_user.name');
$content = "User ID : " . $user_id . " (" . $username . ") Deleted a client with ID $id";
$this->logUsersActivity($type = 'staff', $content);
return redirect(route('client.index'));
}