diff --git a/.DS_Store b/.DS_Store deleted file mode 100755 index 633314c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index b6a4b86..119866a 100755 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Homestead.yaml npm-debug.log yarn-error.log .env +.DS_Store diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100755 index e020201..0000000 Binary files a/app/.DS_Store and /dev/null differ diff --git a/app/Http/.DS_Store b/app/Http/.DS_Store deleted file mode 100755 index c4033ed..0000000 Binary files a/app/Http/.DS_Store and /dev/null differ diff --git a/app/Http/Controllers/.DS_Store b/app/Http/Controllers/.DS_Store deleted file mode 100755 index 2fae972..0000000 Binary files a/app/Http/Controllers/.DS_Store and /dev/null differ diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php index 20ebee3..e9fd44c 100755 --- a/app/Http/Controllers/ClientsController.php +++ b/app/Http/Controllers/ClientsController.php @@ -380,6 +380,47 @@ class ClientsController extends Controller $this->logUsersActivity($type = 'staff', $content); return response()->json($data, 200); } + public function supportFeesStore(Request $request){ + $request->validate([ + 'client_id' => 'required', + 'services' => 'required', + 'invoice_number' => 'required', + // 'invoice_amount' => 'required|numeric', + 'invoice_date' => 'required', + 'status' => 'required', + 'recurring' => 'required' + ]); + $auth_user = session('current_user'); + + // dd($request->all()); + $support_fees_arr = [ + 'invoice_number' => $request->invoice_number, + 'recurring' => $request->recurring, + 'invoice_date' => $request->invoice_date, + 'invoice_status' => $request->status, + 'services' => implode(',', $request->services), + 'user_id' => $auth_user['id'], + 'status' => $request->status, + 'client_id' => $request->client_id + ]; + if ($request->has('remarks')) { + $support_fees_arr['remarks'] = $request->remarks; + } + $result = Models\ClientSupportFees::create($support_fees_arr); + + #$payments = Models\ClientPayment::with('client_info', 'created_by_info')->find($result->id); + if ($result) { + $data = ['code' => 1, 'msg' => 'Support Fees Details successfully added']; + } + 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 support fees record"; + $this->logUsersActivity($type = 'staff', $content); + return response()->json($data, 200); + } public function shortcodeStore(Request $request) { $request->validate([ @@ -591,6 +632,7 @@ class ClientsController extends Controller $recent_payments = Models\ClientPayment::where('client_id', $id)->orderBy('id', 'DESC')->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)->orderBy('id', 'DESC')->get(); $showdocuments = Models\ClientFile::where('client_id', $id)->get(); if ($showclient->status == 'Live') { @@ -659,7 +701,7 @@ class ClientsController extends Controller } sort($networks_raw); - + $recurring_arr = ['NO' => 'NO', 'Monthly' => 'Monthly', 'Quarterly' => 'Quarterly', 'Semiannual' => 'Semiannual', 'Yearly' => 'Yearly']; $data = [ 'page_title' => 'Client Profile', @@ -680,7 +722,9 @@ class ClientsController extends Controller 'renewal_due' => $renewal_due, 'recent_payments' => $recent_payments, 'highlight_colour' => $highlight_colour, - 'showdocuments' => $showdocuments + 'showdocuments' => $showdocuments, + 'support_fees' => $support_fees, + 'recurring_arr' => $recurring_arr ]; return view('client.show', $data); } @@ -850,7 +894,6 @@ class ClientsController extends Controller { $client = Models\Client::find($id); $service_type = Models\Service::orderBy('name', 'ASC')->pluck('name', 'name'); - $countries = Models\Country::orderBy('en_short_name', 'ASC')->pluck('en_short_name','en_short_name'); $payment_type = ['Prepaid' => 'Prepaid', 'Postpaid' => 'Postpaid']; // Models\PaymentType::pluck('name', 'id')->toArray(); @@ -878,7 +921,6 @@ class ClientsController extends Controller $onboarding_sub_items = Models\ClientOnboardingSubItem::where('stage_id', $stage_details->stage_id)->pluck('name', 'name'); } - /* else{ @@ -890,10 +932,7 @@ class ClientsController extends Controller } */ $how_we_got_clients_arr = ['Event : (GCCM) etc' => 'Event : (GCCM) etc', 'Referral' => 'Referral', 'Word of Mouth' => 'Word of Mouth', 'Marketing' => 'Marketing', 'Other' => 'Other']; - - // 'current_services' => json_decode($client->services, true); - if ($client->support_emails) { $support_emails = json_decode($client->support_emails, true); $support_emails = array_combine($support_emails, $support_emails); diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b841482..850ecb9 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -83,4 +83,92 @@ class Controller extends BaseController } return true; } + + public function sendToPaperless($file_path, $tags_arr, $created_at, $document_type, $title, $correspondent){ + $dir = getcwd(); + $prod_url = "http://206.225.84.201:8000/api/documents/post_document/"; + $local_url = "http://192.168.68.152:8000/api/documents/post_document/"; + // dd($ip); + if ($dir !== '/Users/kwesibanson/Sites/team_tracker') { + $url = $prod_url; + $auth = ""; + } + else{ + $url = $local_url; + $auth = "cGxhZG1pbjpCcmFuY2gyMDAw"; + } + // $pop = new \CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf'); + // $curl_file = new \CURLFILE(public_path('documents/ultra_host.pdf')); + $curl_file = new \CURLFILE(public_path($file_path)); + $curl = curl_init(); + $data = [ + "document" => $curl_file, + 'title' => $title, + 'correspondent' => $correspondent, + 'created' => $created_at, + 'document_type' => $document_type + ]; + if (count($tags_arr) > 0) { + foreach ($tags_arr as $tag) { + $data['tags'] = $tag; + } + } + // dd($data); + curl_setopt_array($curl, array( + CURLOPT_URL => $url, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'POST', + CURLOPT_POSTFIELDS => $data, //['document' => $curl_file], + // CURLOPT_POSTFIELDS => array('document'=> new CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf')), + CURLOPT_HTTPHEADER => array(': ', 'Authorization: Basic ' . $auth), + )); + $response = curl_exec($curl); + // print_r(curl_getinfo($ch)); + // dump(curl_errno($curl)); + // dump(curl_error($curl)); + curl_close($curl); + return $response; + + } + public function getToPaperlessParamValues($name){ + // $name = "document_types/"; + $dir = getcwd(); + $prod_url = "http://206.225.84.201:8000/api/$name/"; + $local_url = "http://192.168.68.152:8000/api/$name/"; + // dd($ip); + if ($dir !== '/Users/kwesibanson/Sites/team_tracker') { + $url = $prod_url; + $auth = ""; + } + else{ + $url = $local_url; + $auth = "cGxhZG1pbjpCcmFuY2gyMDAw"; + } + // $pop = new \CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf'); + // $curl_file = new \CURLFILE(public_path('documents/ultra_host.pdf')); + + // dd($data); + $curl = curl_init(); + curl_setopt_array($curl, array( + CURLOPT_URL => $url, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => array(': ', 'Authorization: Basic ' . $auth), + )); + $response = curl_exec($curl); + curl_close($curl); + return $response; + + } + } diff --git a/app/Http/Controllers/GeneralDocumentsController.php b/app/Http/Controllers/GeneralDocumentsController.php index 88ad0d2..752ce27 100644 --- a/app/Http/Controllers/GeneralDocumentsController.php +++ b/app/Http/Controllers/GeneralDocumentsController.php @@ -26,7 +26,7 @@ class GeneralDocumentsController extends Controller ->select(\DB::raw('count(*) as docs_count, network_operators.name, mno_files.mno_id')) ->groupBy('network_operators.name', 'mno_files.mno_id') ->get(); - + $category_names = [ 'api' => 'API Documents', 'presentations' => 'Presentations', @@ -62,7 +62,7 @@ class GeneralDocumentsController extends Controller { #$this->log_query(); $document_arr = \DB::table('general_documents') - ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') + ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') ->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at') ->orderBy('general_documents.name', 'ASC') ->paginate(15); @@ -70,12 +70,12 @@ class GeneralDocumentsController extends Controller if($request->has('keyword')){ $keyword = $request->keyword; $document_arr = \DB::table('general_documents') - ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') + ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') ->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at') ->orderBy('general_documents.name', 'ASC') ->whereRaw("general_documents.name LIKE '%$keyword%' OR general_documents.description LIKE '%$keyword%' OR general_documents.filename LIKE '%$keyword%' OR auth_users.name LIKE '%$keyword%'") - ->paginate(15); - } + ->paginate(15); + } return response()->json($document_arr); } public function getDocumentsCategoryJson(Request $request) @@ -83,7 +83,7 @@ class GeneralDocumentsController extends Controller //$this->log_query(); $category = $request->category; $document_arr = \DB::table('general_documents') - ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') + ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') ->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at') ->where('general_documents.category', $category) ->orderBy('general_documents.name', 'ASC') @@ -92,31 +92,30 @@ class GeneralDocumentsController extends Controller if($request->has('keyword')){ $keyword = $request->keyword; $document_arr = \DB::table('general_documents') - ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') + ->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by') ->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at') ->orderBy('general_documents.name', 'ASC') ->where('general_documents.category', $category) ->whereRaw("general_documents.name LIKE '%$keyword%' OR general_documents.description LIKE '%$keyword%' OR general_documents.filename LIKE '%$keyword%' OR auth_users.name LIKE '%$keyword%'") - ->paginate(15); - } + ->paginate(15); + } return response()->json($document_arr); } - public function create() - { + public function create(){ $categories = [ - 'sidwl' => 'Sender ID Whitelisting Letter', - 'api' => 'API Docs', - 'rates' => 'Rates', - 'scfees' => 'Short Code Fees', - 'presentations' => 'presentations', + 'sidwl' => 'Sender ID Whitelisting Letter', + 'api' => 'API Docs', + 'rates' => 'Rates', + 'scfees' => 'Short Code Fees', + 'presentations' => 'presentations', 'vpn_forms' => 'VPN Forms', 'user_guides' => 'User Guides', 'others' => 'Others' - ]; + ]; $data = [ - 'page_title' => 'Upload Document', - 'categories' => $categories + 'page_title' => 'Upload Document', + 'categories' => $categories ]; return view('generaldocuments.create', $data); } @@ -126,16 +125,27 @@ class GeneralDocumentsController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Requests\GeneralDocumentsRequest $request) - { - + public function store(Requests\GeneralDocumentsRequest $request){ + // dd($request->all()); if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) { if ($request->file('document_one')->isValid()) { - $filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension(); + //dd($request->all()); + $filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension(); $request->document_one->storeAs('general_files', $filename, 'public'); $document_arr['filename'] = $filename; $document_arr['category'] = $request->document_one_category; + # set parameters and push to paperless + $file_path = "documents/general_files/" . $filename; //"documents/oasl.pdf"; + $tags_arr = [1,2]; + $created_at = date('Y-m-d H:i:s'); + $document_type = 1; + $correspondent = 1; + $title = $request->document_one_name; + $retval_paperless = $this->sendToPaperless($file_path, $tags_arr, $created_at, $document_type, $title, $correspondent); + \Log::info($retval_paperless); + + $document_arr['file_extension'] = $request->document_one->extension(); $document_arr['file_reff'] = time() . uniqid(); $document_arr['name'] = $request->document_one_name; @@ -145,11 +155,11 @@ class GeneralDocumentsController extends Controller } if ($request->has('document_two') && $request->has('document_two_name') && $request->has('document_two_category')) { if ($request->file('document_two')->isValid()) { - $filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension(); + $filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension(); $request->document_two->storeAs('general_files', $filename, 'public'); $document_arr['filename'] = $filename; $document_arr['category'] = $request->document_two_category; - + $document_arr['file_extension'] = $request->document_two->extension(); $document_arr['file_reff'] = time() . uniqid(); $document_arr['name'] = $request->document_two_name; @@ -159,28 +169,27 @@ class GeneralDocumentsController extends Controller } if ($request->has('document_three') && $request->has('document_three_name') && $request->has('document_three_category')) { if ($request->file('document_three')->isValid()) { - $filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension(); + $filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension(); $request->document_three->storeAs('general_files', $filename, 'public'); $document_arr['filename'] = $filename; $document_arr['category'] = $request->document_three_category; - + $document_arr['file_extension'] = $request->document_three->extension(); $document_arr['file_reff'] = time() . uniqid(); $document_arr['name'] = $request->document_three_name; $document_arr['uploaded_by'] = session('current_user.id'); $result = Models\GeneralDocument::create($document_arr); } - } + } Session::flash('success_message', 'Document(s) successfully uploaded'); return redirect(url('generaldocuments')); } - public function storeBak(Request $request) - { + public function storeBak(Request $request){ $request->validate([ 'file' => 'required|mimes:csv,txt,xlx,xls,pdf|max:2048' ]); - $fileName = time().'.'.$request->file->extension(); + $fileName = time().'.'.$request->file->extension(); $request->file->move(public_path('uploads'), $fileName); @@ -195,8 +204,7 @@ class GeneralDocumentsController extends Controller ]; return view('generaldocuments.edit', $data); } - public function update(Request $request, $id) - { + public function update(Request $request, $id){ $document = Models\GeneralDocument::findOrFail($id); if ($request->has('document_one')) { if ($request->file('document_one')->isValid()) { @@ -204,7 +212,7 @@ class GeneralDocumentsController extends Controller $request->document_one->storeAs('general_files', $filename, 'public'); $document->filename = $filename; $document->file_extension = $request->document_one->extension(); - $document->file_reff = time() . uniqid(); + $document->file_reff = time() . uniqid(); } } $document->uploaded_by = session('current_user.id'); @@ -213,15 +221,14 @@ class GeneralDocumentsController extends Controller Session::flash('success_message', 'Document successfully Updated'); return redirect(url('generaldocuments')); } - public function getDocument($id) - { + public function getDocument($id){ $general_file = Models\GeneralDocument::find($id); if (!$general_file) { return redirect(url('generaldocuments')); } //PDF file is stored under project/public/download/info.pdf $file = public_path('documents/general_files/') . $general_file->filename; - + $headers = []; //['Content-Type: application/pdf']; $filename = $general_file->name; // . "_" . $general_file->file_reff; $filename = $this->cleanStr($filename); @@ -236,7 +243,29 @@ class GeneralDocumentsController extends Controller $string = preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Replaces multiple hyphens with single one. $string = preg_replace('/-+/', '_', $string); - + return $string; } + public function getDocumentCorrespondent($category){ + switch ($category) { + case 'sidwl': + // code... + break; + case 'api': + // code... + break; + case 'scfees': + // code... + break; + case 'presentations': + // code... + break; + case 'others': + // code... + break; + default: + // code... + break; + } + } } diff --git a/app/Http/Controllers/NetworkOperatorsController.php b/app/Http/Controllers/NetworkOperatorsController.php index a6ea400..07d6bda 100755 --- a/app/Http/Controllers/NetworkOperatorsController.php +++ b/app/Http/Controllers/NetworkOperatorsController.php @@ -66,13 +66,12 @@ class NetworkOperatorsController extends Controller // dd($data); return view('network_ops.index', $data); } - public function getMnosJson(Request $request) - { + public function getMnosJson(Request $request){ //$this->log_query(); $mno_arr = \DB::table('network_operators') ->join('staff_members AS staffam', 'staffam.id', '=', 'network_operators.account_manager_id') ->join('staff_members AS staffmodify', 'staffmodify.id', '=', 'network_operators.last_modified_by') - ->select('network_operators.id', 'staffam.name AS accountManager', 'network_operators.name AS networkName', 'network_operators.country', 'network_operators.connection_status', 'staffmodify.name AS modifiedBy') + ->select('network_operators.id', 'staffam.name AS accountManager', 'network_operators.name AS networkName', 'network_operators.country','network_operators.contract_validity', 'network_operators.connection_status', 'staffmodify.name AS modifiedBy') ->orderBy('network_operators.name', 'ASC') ->paginate(15); @@ -81,7 +80,7 @@ class NetworkOperatorsController extends Controller $mno_arr = \DB::table('network_operators') ->join('staff_members AS staffam', 'staffam.id', '=', 'network_operators.account_manager_id') ->join('staff_members AS staffmodify', 'staffmodify.id', '=', 'network_operators.last_modified_by') - ->select('network_operators.id', 'staffam.name AS accountManager', 'network_operators.name AS networkName', 'network_operators.country', 'network_operators.connection_status', 'staffmodify.name AS modifiedBy') + ->select('network_operators.id', 'staffam.name AS accountManager', 'network_operators.name AS networkName', 'network_operators.country','network_operators.contract_validity', 'network_operators.connection_status', 'staffmodify.name AS modifiedBy') ->whereRaw("network_operators.name LIKE '%$keyword%' OR network_operators.connection_status LIKE '%$keyword%' OR network_operators.country LIKE '%$keyword%' OR staffam.name LIKE '%$keyword%' ") ->orderBy('network_operators.name', 'ASC') ->paginate(15); @@ -94,8 +93,7 @@ class NetworkOperatorsController extends Controller * * @return \Illuminate\Http\Response */ - public function create() - { + public function create() { $countries = Models\Country::pluck('en_short_name','en_short_name'); $account_manager = Models\SystemUser::pluck('name', 'id'); $services = Models\Service::pluck('name', 'name'); @@ -117,8 +115,7 @@ class NetworkOperatorsController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Request $request) - { + public function store(Request $request){ $request->validate([ 'name' => 'required', 'country' => 'required', @@ -166,10 +163,10 @@ class NetworkOperatorsController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function show($id) - { + public function show($id){ //$operator_arr = Models\NetworkOps::findOrFail($id); $network_arr = Models\NetworkOps::with('account_manager_info')->findOrFail($id); + // dd($network_arr); $countries = Models\Country::orderBy('en_short_name')->pluck('en_short_name','en_short_name'); $account_manager = Models\SystemUser::orderBy('name')->pluck('name', 'id'); $services = Models\Service::orderBy('name')->pluck('name', 'name'); @@ -270,8 +267,7 @@ class NetworkOperatorsController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function edit($id) - { + public function edit($id){ $network_arr = Models\NetworkOps::findOrFail($id); $countries = Models\Country::orderBy('en_short_name')->pluck('en_short_name','en_short_name'); $account_manager = Models\SystemUser::orderBy('name')->pluck('name', 'id'); @@ -338,6 +334,7 @@ class NetworkOperatorsController extends Controller else{ $status_bg = "danger"; } + $rate_types = ['flat_rate' => 'Flat Rate', 'sliding' => 'Sliding Scale']; $data = [ 'page_title' => 'Edit Network Operator', 'network_arr' => $network_arr, @@ -356,6 +353,7 @@ class NetworkOperatorsController extends Controller 'status_bg' => $status_bg, 'connection_types' => $connection_types, 'old_connection_type' => $old_connection_type, + 'rate_types' => $rate_types, 'ip_addresses' => $ip_addresses, 'notes_arr' => $notes_arr, 'recent_payments' => $recent_payments, @@ -404,7 +402,25 @@ class NetworkOperatorsController extends Controller $result = Models\MnoFile::create($document_arr); } } + if ($request->has('sliding_rate_file') && $request->has('sliding_rate_file')) { + if ($request->file('sliding_rate_file')->isValid()) { + $filename = "erp_" . time() . "_sliding_rate." . $request->sliding_rate_file->extension(); + $request->sliding_rate_file->storeAs('mno_files', $filename, 'public'); + $document_arr['file_path'] = $filename; + // $operator_update->name = $request->name; + $document_arr['file_extension'] = $request->sliding_rate_file->extension(); + $document_arr['file_reff'] = time() . uniqid(); + $document_arr['name'] = "Sliding Scale Rate File"; + $document_arr['created_by'] = session('current_user.id'); + $document_arr['mno_id'] = $id; + $result = Models\MnoFile::create($document_arr); + $operator_update->sliding_rate_file = $filename; + } + } + if ($request->rate_type == 'flat_rate') { + $operator_update->buying_rate = $request->buying_rate; + } $operator_update->name = $request->name; $operator_update->country = $request->country; @@ -435,14 +451,13 @@ class NetworkOperatorsController extends Controller $operator_update->support_phones = ($request->support_phones) ? json_encode($request->support_phones) : ""; $operator_update->support_skype = ($request->support_skype) ? json_encode($request->support_skype) : ""; - + $operator_update->rate_type = $request->rate_type; $result = $operator_update->save(); Session::flash('success_message', 'Network Operator successfully Updated'); return redirect(url('mnos')); } - public function ipStore(Request $request) - { + public function ipStore(Request $request) { $request->validate([ 'mno_id' => 'required', 'ip_address' => 'required|ipv4', diff --git a/app/Http/Controllers/UtilityController.php b/app/Http/Controllers/UtilityController.php index ec71c00..4007736 100644 --- a/app/Http/Controllers/UtilityController.php +++ b/app/Http/Controllers/UtilityController.php @@ -40,6 +40,25 @@ class UtilityController extends Controller public function ntfyTest(){ $this->sendNtfy('In the ERP'); } + public function paperlessTest(){ + $file_path = "documents/oasl.pdf"; + $tags_arr = [1,2]; + $created_at = date('Y-m-d H:i:s'); + $document_type = 1; + $title = "OASL has entered the chat"; + $top = $this->sendToPaperless($file_path, $tags_arr, $created_at, $document_type, $title); + dd($top); + } + function getPaperlessAttributes($name){ + $retval = $this->getToPaperlessParamValues($name); + // dd($retval['results']); + $tip = json_decode($retval); + foreach ($tip->results as $value) { + dd($value); + } + dd($tip->results); + + } function insertOnboardingProgress(){ $all_clients = Models\Client::get(); $count_cl = 0; diff --git a/app/Http/Requests/UpdateMnoRequest.php b/app/Http/Requests/UpdateMnoRequest.php index 77e4d78..77f7af7 100644 --- a/app/Http/Requests/UpdateMnoRequest.php +++ b/app/Http/Requests/UpdateMnoRequest.php @@ -21,6 +21,7 @@ class UpdateMnoRequest extends FormRequest 'document_one.max' => 'The uploaded file may not be larger than 20MB.', 'document_two.mimes' => 'The uploaded file must be a PDF, An MS Word Document or An Image.', 'document_two.max' => 'The uploaded file may not be larger than 20MB.', + 'sliding_rate_file.max' => 'The Sliding Rate file may not be larger than 10MB.', ]; } /** @@ -42,6 +43,7 @@ class UpdateMnoRequest extends FormRequest 'contract_validity' => 'required', 'document_one' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx', 'document_two' => 'max:20480|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx', + 'sliding_rate_file' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx', ]; } diff --git a/app/Models/.DS_Store b/app/Models/.DS_Store deleted file mode 100755 index 2ba18cc..0000000 Binary files a/app/Models/.DS_Store and /dev/null differ diff --git a/app/Models/ClientSupportFees.php b/app/Models/ClientSupportFees.php new file mode 100644 index 0000000..1ec940c --- /dev/null +++ b/app/Models/ClientSupportFees.php @@ -0,0 +1,19 @@ +hasOne('App\Models\Client', 'id', 'client_id'); + } + public function created_by_info(){ + // return $this->hasOne('App\Models\Account', 'id', 'auth_user_id'); + return $this->hasOne('App\Models\SystemUser', 'id', 'auth_user_id'); + } +} diff --git a/composer.json b/composer.json index 5021ee9..e28c2d3 100755 --- a/composer.json +++ b/composer.json @@ -9,7 +9,8 @@ "fideloper/proxy": "~3.3", "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", - "laravelcollective/html": "^5.4.0" + "laravelcollective/html": "^5.4.0", + "maatwebsite/excel": "^3.1" }, "require-dev": { "filp/whoops": "~2.0", diff --git a/composer.lock b/composer.lock index ee9a8a3..b247f82 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2656f74132c8b717ed7fc576ccc5aab8", + "content-hash": "1b55af854942faedd605d375de12227b", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -337,6 +337,67 @@ }, "time": "2019-12-30T22:54:17+00:00" }, + { + "name": "ezyang/htmlpurifier", + "version": "v4.17.0", + "source": { + "type": "git", + "url": "https://github.com/ezyang/htmlpurifier.git", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "shasum": "" + }, + "require": { + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" + }, + "type": "library", + "autoload": { + "files": [ + "library/HTMLPurifier.composer.php" + ], + "psr-0": { + "HTMLPurifier": "library/" + }, + "exclude-from-classmap": [ + "/library/HTMLPurifier/Language/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1-or-later" + ], + "authors": [ + { + "name": "Edward Z. Yang", + "email": "admin@htmlpurifier.org", + "homepage": "http://ezyang.com" + } + ], + "description": "Standards compliant HTML filter written in PHP", + "homepage": "http://htmlpurifier.org/", + "keywords": [ + "html" + ], + "support": { + "issues": "https://github.com/ezyang/htmlpurifier/issues", + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" + }, + "time": "2023-11-17T15:01:25+00:00" + }, { "name": "fideloper/proxy", "version": "3.3.4", @@ -986,6 +1047,269 @@ ], "time": "2021-01-18T20:58:21+00:00" }, + { + "name": "maatwebsite/excel", + "version": "3.1.25", + "source": { + "type": "git", + "url": "https://github.com/Maatwebsite/Laravel-Excel.git", + "reference": "a3e56f1a60e49f21798fd242a3b3d2f4051eeda7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/a3e56f1a60e49f21798fd242a3b3d2f4051eeda7", + "reference": "a3e56f1a60e49f21798fd242a3b3d2f4051eeda7", + "shasum": "" + }, + "require": { + "ext-json": "*", + "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0", + "php": "^7.0", + "phpoffice/phpspreadsheet": "^1.14" + }, + "require-dev": { + "orchestra/testbench": "^6.0", + "predis/predis": "^1.1" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Maatwebsite\\Excel\\ExcelServiceProvider" + ], + "aliases": { + "Excel": "Maatwebsite\\Excel\\Facades\\Excel" + } + } + }, + "autoload": { + "psr-4": { + "Maatwebsite\\Excel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Patrick Brouwers", + "email": "patrick@maatwebsite.nl" + } + ], + "description": "Supercharged Excel exports and imports in Laravel", + "keywords": [ + "PHPExcel", + "batch", + "csv", + "excel", + "export", + "import", + "laravel", + "php", + "phpspreadsheet" + ], + "support": { + "issues": "https://github.com/Maatwebsite/Laravel-Excel/issues", + "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.25" + }, + "funding": [ + { + "url": "https://laravel-excel.com/commercial-support", + "type": "custom" + }, + { + "url": "https://github.com/patrickbrouwers", + "type": "github" + } + ], + "time": "2020-11-13T10:37:36+00:00" + }, + { + "name": "maennchen/zipstream-php", + "version": "2.2.6", + "source": { + "type": "git", + "url": "https://github.com/maennchen/ZipStream-PHP.git", + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", + "shasum": "" + }, + "require": { + "myclabs/php-enum": "^1.5", + "php": "^7.4 || ^8.0", + "psr/http-message": "^1.0", + "symfony/polyfill-mbstring": "^1.0" + }, + "require-dev": { + "ext-zip": "*", + "friendsofphp/php-cs-fixer": "^3.9", + "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0", + "mikey179/vfsstream": "^1.6", + "php-coveralls/php-coveralls": "^2.4", + "phpunit/phpunit": "^8.5.8 || ^9.4.2", + "vimeo/psalm": "^4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "ZipStream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paul Duncan", + "email": "pabs@pablotron.org" + }, + { + "name": "Jonatan Männchen", + "email": "jonatan@maennchen.ch" + }, + { + "name": "Jesse Donat", + "email": "donatj@gmail.com" + }, + { + "name": "András Kolesár", + "email": "kolesar@kolesar.hu" + } + ], + "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.", + "keywords": [ + "stream", + "zip" + ], + "support": { + "issues": "https://github.com/maennchen/ZipStream-PHP/issues", + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.6" + }, + "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, + { + "url": "https://opencollective.com/zipstream", + "type": "open_collective" + } + ], + "time": "2022-11-25T18:57:19+00:00" + }, + { + "name": "markbaker/complex", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/MarkBaker/PHPComplex.git", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Complex\\": "classes/src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@lange.demon.co.uk" + } + ], + "description": "PHP Class for working with complex numbers", + "homepage": "https://github.com/MarkBaker/PHPComplex", + "keywords": [ + "complex", + "mathematics" + ], + "support": { + "issues": "https://github.com/MarkBaker/PHPComplex/issues", + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" + }, + "time": "2022-12-06T16:21:08+00:00" + }, + { + "name": "markbaker/matrix", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/MarkBaker/PHPMatrix.git", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpdocumentor/phpdocumentor": "2.*", + "phploc/phploc": "^4.0", + "phpmd/phpmd": "2.*", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "sebastian/phpcpd": "^4.0", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Matrix\\": "classes/src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@demon-angel.eu" + } + ], + "description": "PHP Class for working with matrices", + "homepage": "https://github.com/MarkBaker/PHPMatrix", + "keywords": [ + "mathematics", + "matrix", + "vector" + ], + "support": { + "issues": "https://github.com/MarkBaker/PHPMatrix/issues", + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" + }, + "time": "2022-12-02T22:17:43+00:00" + }, { "name": "monolog/monolog", "version": "1.26.1", @@ -1121,6 +1445,69 @@ "abandoned": "dragonmantank/cron-expression", "time": "2019-12-28T04:23:06+00:00" }, + { + "name": "myclabs/php-enum", + "version": "1.8.4", + "source": { + "type": "git", + "url": "https://github.com/myclabs/php-enum.git", + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483", + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "1.*", + "vimeo/psalm": "^4.6.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + }, + "classmap": [ + "stubs/Stringable.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.8.4" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", + "type": "tidelift" + } + ], + "time": "2022-08-04T09:53:51+00:00" + }, { "name": "nesbot/carbon", "version": "1.39.1", @@ -1292,6 +1679,111 @@ }, "time": "2020-10-15T08:29:30+00:00" }, + { + "name": "phpoffice/phpspreadsheet", + "version": "1.29.0", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", + "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0", + "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-fileinfo": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "ext-zip": "*", + "ext-zlib": "*", + "ezyang/htmlpurifier": "^4.15", + "maennchen/zipstream-php": "^2.1 || ^3.0", + "markbaker/complex": "^3.0", + "markbaker/matrix": "^3.0", + "php": "^7.4 || ^8.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-main", + "dompdf/dompdf": "^1.0 || ^2.0", + "friendsofphp/php-cs-fixer": "^3.2", + "mitoteam/jpgraph": "^10.3", + "mpdf/mpdf": "^8.1.1", + "phpcompatibility/php-compatibility": "^9.3", + "phpstan/phpstan": "^1.1", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0", + "squizlabs/php_codesniffer": "^3.7", + "tecnickcom/tcpdf": "^6.5" + }, + "suggest": { + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "mpdf/mpdf": "Option for rendering PDF with PDF Writer", + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maarten Balliauw", + "homepage": "https://blog.maartenballiauw.be" + }, + { + "name": "Mark Baker", + "homepage": "https://markbakeruk.net" + }, + { + "name": "Franck Lefevre", + "homepage": "https://rootslabs.net" + }, + { + "name": "Erik Tilt" + }, + { + "name": "Adrien Crivelli" + } + ], + "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", + "homepage": "https://github.com/PHPOffice/PhpSpreadsheet", + "keywords": [ + "OpenXML", + "excel", + "gnumeric", + "ods", + "php", + "spreadsheet", + "xls", + "xlsx" + ], + "support": { + "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0" + }, + "time": "2023-06-14T22:48:31+00:00" + }, { "name": "psr/container", "version": "1.1.1", @@ -1340,6 +1832,166 @@ }, "time": "2021-03-05T17:36:06+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory" + }, + "time": "2024-04-15T12:06:14+00:00" + }, + { + "name": "psr/http-message", + "version": "1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/1.1" + }, + "time": "2023-04-04T09:50:52+00:00" + }, { "name": "psr/log", "version": "1.1.4", @@ -5594,5 +6246,5 @@ "php": ">=7.0.0" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.6.0" } diff --git a/pending-issues.md b/pending-issues.md index d3a6ad3..42eb613 100644 --- a/pending-issues.md +++ b/pending-issues.md @@ -8,7 +8,7 @@ Kind Regards, Sam -Thank you sir, +Thank you sir, Has it been uploaded on the ERP @'Kwesi Banson' I think these documents need special locking and even encryption – think about it, @@ -17,33 +17,33 @@ Sam # Mansa's Request -ERP request- A report for all new clients uploaded on ERP for the week and corresponding Account Manager. +ERP request- A report for all new clients uploaded on ERP for the week and corresponding Account Manager. Needed on friday by 10am. # Mphatso's Great idea on the performance indicators, I have a suggestion for clients that are live. - + When these are being edited, there’s no indicator that applies for their level of activity. - + Could we add something on traffic flow as the other options would not necessarily apply. # Mansa Hello Kwesi, - + Below are the route features for Click Mobile direct routes as requested for the ERP. - + Dynamic Alphanumeric -Yes/NO Dynamic Shortcode- Yes/No Dynamic Numeric- Yes/No Delivery Report- Yes/No Comments - + # Short Code Licence/Certificate Renewal Date - + Our ZICTA certificate for the Geopoll short code 5155 will expire on the 22nd of March. Renewal fee is K18,000. - + Kind Regards, - + Martha VFGH83347501 @@ -53,3 +53,7 @@ https://youtu.be/6kBAkodqBRM https://youtu.be/OUSTGLL51m0 +In response to SSL Certificate renewal +Anything that needs renewal etc - needs to be on the ERP under tech, + +Kind Regards diff --git a/public/.DS_Store b/public/.DS_Store deleted file mode 100755 index 9bcf137..0000000 Binary files a/public/.DS_Store and /dev/null differ diff --git a/public/assets/.DS_Store b/public/assets/.DS_Store deleted file mode 100644 index 2b0587a..0000000 Binary files a/public/assets/.DS_Store and /dev/null differ diff --git a/public/assets/js/.DS_Store b/public/assets/js/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/public/assets/js/.DS_Store and /dev/null differ diff --git a/public/assets/js/clientshow.js b/public/assets/js/clientshow.js index baf6d15..4d79ccb 100644 --- a/public/assets/js/clientshow.js +++ b/public/assets/js/clientshow.js @@ -33,6 +33,10 @@ $('#launchDate').datetimepicker({ format: 'YYYY-MM-DD' }); + + $('#invoiceDateSupport').datetimepicker({ + format: 'YYYY-MM-DD' + }); $('#expiryDate').datetimepicker({ format: 'YYYY-MM-DD' }); @@ -67,6 +71,10 @@ evt.preventDefault(); $('#financePaymentsForm').modal('show'); }); + $('#addSupportFeesInfoBtn').click(function(evt){ + evt.preventDefault(); + $('#supportFeesFormModal').modal('show'); + }); $('.paymentEntryEditBtn').click(function(tve){ tve.preventDefault(); //var theIDD = $("input[name=payment_entry_id]").val(); @@ -285,6 +293,57 @@ }); }); + $('#supportFeesEntryForm').submit(function(evt){ + evt.preventDefault(); + var formData = new FormData($(this)[0]); + $.ajax({ + type: "POST", + url: base_url + '/clients/support_fees_store', + data : formData, + processData: false, + contentType: false, + async: false, + success: function (data){ + if (data.code === 1) { + $("#financeForm")[0].reset(); + $.alert({ + title: 'Alert!', + content: 'Support Fees Details added successfully', + }); + setTimeout(function(){ + location.reload(); + }, 8000); + } + else if (data.code > 5) { + $.alert({ + title: 'Alert!', + content: data.msg, + }); + } + else { + $.alert({ + title: 'Alert!', + content: 'Your request could not be handled. Try again !', + }); + + } + }, + error: function(error){ + //console.log(error); + //console.log("AJAX error in request: " + JSON.stringify(err, null, 2)); + var output = $.parseJSON(error.responseText); + // console.log(output.errors); + $('#financeNotifyArea').removeClass('hidden'); + $('#financeNotifyArea').addClass('alert alert-danger'); + $.each(output.errors, function (key, value) { + // console.log(value[0]); + $('#financeNotifyArea').text(value[0]); + }); + } + }); + }); + + $('#financeServicesStore').change(function(evtt){ let currentServices = $('#financeServicesStore').val(); $.each(currentServices, function (key, value) { @@ -300,6 +359,7 @@ } }); }); + $('#financeEditForm').submit(function(evt){ evt.preventDefault(); var formData = new FormData($(this)[0]); @@ -336,6 +396,7 @@ } }); }); + $('#shortCodeEditForm').submit(function(evt){ evt.preventDefault(); var formData = new FormData($(this)[0]); diff --git a/public/assets/js/mnos.js b/public/assets/js/mnos.js index 6e5e6d9..fda761e 100644 --- a/public/assets/js/mnos.js +++ b/public/assets/js/mnos.js @@ -5,6 +5,28 @@ var d = new Date(); var currentDate = d.getFullYear() + '/' + ((''+month).length<2 ? '0' : '') + month + '/' + ((''+day).length<2 ? '0' : '') + day; //$('select').select2(); + var selectedRateTypeRest = $("#rateTypeSel").val(); + if (selectedRateTypeRest == 'sliding') { + $('#flatRateFileDiv').addClass('hidden'); + $('#slidingRateFileDiv').removeClass('hidden'); + } + else { + $('#flatRateFileDiv').removeClass('hidden'); + $('#slidingRateFileDiv').addClass('hidden'); + } + $("#rateTypeSel").change(function(){ + var selectedRateType = $("#rateTypeSel").val(); + // console.log(selectedRateType); + if (selectedRateType == 'sliding') { + $('#flatRateFileDiv').addClass('hidden'); + $('#slidingRateFileDiv').removeClass('hidden'); + } + else { + $('#flatRateFileDiv').removeClass('hidden'); + $('#slidingRateFileDiv').addClass('hidden'); + } + }); + $('#myDatepicker2').datetimepicker({ format: 'YYYY-MM-DD', maxDate: currentDate @@ -20,12 +42,12 @@ $('#addIpBtn').click(function(evt){ $('#createNotesBtn').click(function(evt){ evt.preventDefault(); - console.log('foo bar'); + // console.log('foo bar'); $('#newNotesForm').modal('show'); }); $('#newIpForm').submit(function(evt){ - evt.preventDefault(); + evt.preventDefault(); var formData = new FormData($(this)[0]); $.ajax({ type: "POST", @@ -56,27 +78,27 @@ $('#newIpForm').submit(function(evt){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } }, error: function(error){ var output = $.parseJSON(error.responseText); - console.log(output.errors); + // console.log(output.errors); $('#ipNotifyArea').removeClass('hidden'); $('#ipNotifyArea').addClass('alert alert-danger'); $.each(output.errors, function (key, value) { - console.log(value[0]); + // console.log(value[0]); $('#ipNotifyArea').text(value[0]); }); } - }); + }); }); $('.notesEditBtn').click(function(tve){ tve.preventDefault(); //var theIDD = $("input[name=payment_entry_id]").val(); var theIDD = $(this).siblings('.notesRowId').val(); - console.log(theIDD); + // console.log(theIDD); $.ajax({ type: "GET", @@ -86,7 +108,7 @@ $('.notesEditBtn').click(function(tve){ async: false, success: function (data){ if (data.code === 1) { - console.log(theIDD); + // console.log(theIDD); $('#noteIdEdit').val(theIDD); $('#notesServicesEdit').val(data.services_arr).change(); $('#notesBodyEdit').val(data.result.notes_body); @@ -105,17 +127,17 @@ $('.notesEditBtn').click(function(tve){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } } }); - + }); $('#newNotesFormForm').submit(function(evt){ - evt.preventDefault(); + evt.preventDefault(); var formData = new FormData($(this)[0]); $.ajax({ type: "POST", @@ -146,16 +168,16 @@ $('#newNotesFormForm').submit(function(evt){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } } - }); + }); }); $('#editNotesForm').submit(function(evt){ - evt.preventDefault(); - console.log($(this).length); + evt.preventDefault(); + // console.log($(this).length); var formData = new FormData($(this)[0]); $.ajax({ type: "POST", @@ -185,11 +207,11 @@ $('#editNotesForm').submit(function(evt){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } } - }); -}); + }); +}); $('#addPaymentBtn').click(function(evt){ evt.preventDefault(); $('#financePaymentsForm').modal('show'); @@ -207,7 +229,7 @@ $('.paymentEntryEditBtn').click(function(tve){ async: false, success: function (data){ if (data.code === 1) { - console.log(theIDD); + // console.log(theIDD); $('#paymentIdEdit').val(theIDD); $('#financeServicesEdit').val(data.services_arr).change(); $('#invoiceNumberEdit').val(data.result.invoice_number); @@ -228,7 +250,7 @@ $('.paymentEntryEditBtn').click(function(tve){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } } }); @@ -236,7 +258,7 @@ $('.paymentEntryEditBtn').click(function(tve){ }); $('#financeForm').submit(function(evt){ - evt.preventDefault(); + evt.preventDefault(); var formData = new FormData($(this)[0]); $.ajax({ type: "POST", @@ -267,27 +289,27 @@ $('#financeForm').submit(function(evt){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } }, error: function(error){ //console.log(error); //console.log("AJAX error in request: " + JSON.stringify(err, null, 2)); var output = $.parseJSON(error.responseText); - console.log(output.errors); + // console.log(output.errors); $('#financeNotifyArea').removeClass('hidden'); $('#financeNotifyArea').addClass('alert alert-danger'); $.each(output.errors, function (key, value) { - console.log(value[0]); + // console.log(value[0]); $('#financeNotifyArea').text(value[0]); }); } - }); + }); }); $('#financeEditForm').submit(function(evt){ - evt.preventDefault(); + evt.preventDefault(); var formData = new FormData($(this)[0]); $.ajax({ type: "POST", @@ -317,9 +339,9 @@ $('#financeEditForm').submit(function(evt){ title: 'Alert!', content: 'Your request could not be handled. Try again !', }); - + } } - }); + }); +}); }); -}); \ No newline at end of file diff --git a/public/assets/others/.DS_Store b/public/assets/others/.DS_Store deleted file mode 100644 index 8ce1603..0000000 Binary files a/public/assets/others/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/.DS_Store b/public/assets/vendors/.DS_Store deleted file mode 100755 index 19191b2..0000000 Binary files a/public/assets/vendors/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/autosize/.DS_Store b/public/assets/vendors/autosize/.DS_Store deleted file mode 100755 index a9849eb..0000000 Binary files a/public/assets/vendors/autosize/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/bootstrap-progressbar/.DS_Store b/public/assets/vendors/bootstrap-progressbar/.DS_Store deleted file mode 100755 index a9ebf8d..0000000 Binary files a/public/assets/vendors/bootstrap-progressbar/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/bootstrap/.DS_Store b/public/assets/vendors/bootstrap/.DS_Store deleted file mode 100755 index 82989f4..0000000 Binary files a/public/assets/vendors/bootstrap/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/bootstrap/dist/.DS_Store b/public/assets/vendors/bootstrap/dist/.DS_Store deleted file mode 100755 index f0074f2..0000000 Binary files a/public/assets/vendors/bootstrap/dist/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/bootstrap/less/.DS_Store b/public/assets/vendors/bootstrap/less/.DS_Store deleted file mode 100755 index da3f5a2..0000000 Binary files a/public/assets/vendors/bootstrap/less/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/dropify/.DS_Store b/public/assets/vendors/dropify/.DS_Store deleted file mode 100755 index 02b54a5..0000000 Binary files a/public/assets/vendors/dropify/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/dropzone/.DS_Store b/public/assets/vendors/dropzone/.DS_Store deleted file mode 100755 index 5395f17..0000000 Binary files a/public/assets/vendors/dropzone/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/dropzone/dist/.DS_Store b/public/assets/vendors/dropzone/dist/.DS_Store deleted file mode 100755 index 02ccc42..0000000 Binary files a/public/assets/vendors/dropzone/dist/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/fastclick/.DS_Store b/public/assets/vendors/fastclick/.DS_Store deleted file mode 100755 index 4b955f2..0000000 Binary files a/public/assets/vendors/fastclick/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/iCheck/.DS_Store b/public/assets/vendors/iCheck/.DS_Store deleted file mode 100644 index dddffb1..0000000 Binary files a/public/assets/vendors/iCheck/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/iCheck/skins/.DS_Store b/public/assets/vendors/iCheck/skins/.DS_Store deleted file mode 100644 index ca28c78..0000000 Binary files a/public/assets/vendors/iCheck/skins/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jQuery-Smart-Wizard/.DS_Store b/public/assets/vendors/jQuery-Smart-Wizard/.DS_Store deleted file mode 100755 index 18998e8..0000000 Binary files a/public/assets/vendors/jQuery-Smart-Wizard/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jQuery-Smart-Wizard/more_examples/.DS_Store b/public/assets/vendors/jQuery-Smart-Wizard/more_examples/.DS_Store deleted file mode 100755 index 6663929..0000000 Binary files a/public/assets/vendors/jQuery-Smart-Wizard/more_examples/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery-knob/.DS_Store b/public/assets/vendors/jquery-knob/.DS_Store deleted file mode 100755 index 0cf1b85..0000000 Binary files a/public/assets/vendors/jquery-knob/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.easy-pie-chart/.DS_Store b/public/assets/vendors/jquery.easy-pie-chart/.DS_Store deleted file mode 100755 index c2828ce..0000000 Binary files a/public/assets/vendors/jquery.easy-pie-chart/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.easy-pie-chart/src/.DS_Store b/public/assets/vendors/jquery.easy-pie-chart/src/.DS_Store deleted file mode 100755 index 5bc2fad..0000000 Binary files a/public/assets/vendors/jquery.easy-pie-chart/src/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.easy-pie-chart/test/.DS_Store b/public/assets/vendors/jquery.easy-pie-chart/test/.DS_Store deleted file mode 100755 index 819d172..0000000 Binary files a/public/assets/vendors/jquery.easy-pie-chart/test/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.inputmask/.DS_Store b/public/assets/vendors/jquery.inputmask/.DS_Store deleted file mode 100755 index cd081d8..0000000 Binary files a/public/assets/vendors/jquery.inputmask/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.inputmask/dist/.DS_Store b/public/assets/vendors/jquery.inputmask/dist/.DS_Store deleted file mode 100755 index 8a58b00..0000000 Binary files a/public/assets/vendors/jquery.inputmask/dist/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.inputmask/dist/min/.DS_Store b/public/assets/vendors/jquery.inputmask/dist/min/.DS_Store deleted file mode 100755 index 7380c14..0000000 Binary files a/public/assets/vendors/jquery.inputmask/dist/min/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.inputmask/extra/.DS_Store b/public/assets/vendors/jquery.inputmask/extra/.DS_Store deleted file mode 100755 index aca7d43..0000000 Binary files a/public/assets/vendors/jquery.inputmask/extra/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.tagsinput/.DS_Store b/public/assets/vendors/jquery.tagsinput/.DS_Store deleted file mode 100755 index 650c549..0000000 Binary files a/public/assets/vendors/jquery.tagsinput/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery.tagsinput/grunt-tasks/.DS_Store b/public/assets/vendors/jquery.tagsinput/grunt-tasks/.DS_Store deleted file mode 100755 index 9bbb116..0000000 Binary files a/public/assets/vendors/jquery.tagsinput/grunt-tasks/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/.DS_Store b/public/assets/vendors/jquery/.DS_Store deleted file mode 100755 index 2c84052..0000000 Binary files a/public/assets/vendors/jquery/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/external/.DS_Store b/public/assets/vendors/jquery/external/.DS_Store deleted file mode 100755 index 8b21b5c..0000000 Binary files a/public/assets/vendors/jquery/external/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/external/sizzle/.DS_Store b/public/assets/vendors/jquery/external/sizzle/.DS_Store deleted file mode 100755 index f5c8073..0000000 Binary files a/public/assets/vendors/jquery/external/sizzle/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/.DS_Store b/public/assets/vendors/jquery/src/.DS_Store deleted file mode 100755 index 5e3275e..0000000 Binary files a/public/assets/vendors/jquery/src/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/ajax/.DS_Store b/public/assets/vendors/jquery/src/ajax/.DS_Store deleted file mode 100755 index 1a7f70f..0000000 Binary files a/public/assets/vendors/jquery/src/ajax/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/core/.DS_Store b/public/assets/vendors/jquery/src/core/.DS_Store deleted file mode 100755 index 6215258..0000000 Binary files a/public/assets/vendors/jquery/src/core/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/css/.DS_Store b/public/assets/vendors/jquery/src/css/.DS_Store deleted file mode 100755 index fb25bc8..0000000 Binary files a/public/assets/vendors/jquery/src/css/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/data/.DS_Store b/public/assets/vendors/jquery/src/data/.DS_Store deleted file mode 100755 index f62087a..0000000 Binary files a/public/assets/vendors/jquery/src/data/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/manipulation/.DS_Store b/public/assets/vendors/jquery/src/manipulation/.DS_Store deleted file mode 100755 index 0686836..0000000 Binary files a/public/assets/vendors/jquery/src/manipulation/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jquery/src/traversing/.DS_Store b/public/assets/vendors/jquery/src/traversing/.DS_Store deleted file mode 100755 index 2ebece7..0000000 Binary files a/public/assets/vendors/jquery/src/traversing/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/jqueryUI/external/.DS_Store b/public/assets/vendors/jqueryUI/external/.DS_Store deleted file mode 100755 index 310a548..0000000 Binary files a/public/assets/vendors/jqueryUI/external/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/moment/.DS_Store b/public/assets/vendors/moment/.DS_Store deleted file mode 100755 index 66d8214..0000000 Binary files a/public/assets/vendors/moment/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/moment/src/.DS_Store b/public/assets/vendors/moment/src/.DS_Store deleted file mode 100755 index f303149..0000000 Binary files a/public/assets/vendors/moment/src/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/moment/src/lib/.DS_Store b/public/assets/vendors/moment/src/lib/.DS_Store deleted file mode 100755 index e0b4c4b..0000000 Binary files a/public/assets/vendors/moment/src/lib/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/nprogress/.DS_Store b/public/assets/vendors/nprogress/.DS_Store deleted file mode 100755 index 33b3ec6..0000000 Binary files a/public/assets/vendors/nprogress/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/pdfmake/.DS_Store b/public/assets/vendors/pdfmake/.DS_Store deleted file mode 100755 index c3d3d83..0000000 Binary files a/public/assets/vendors/pdfmake/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/pnotify/.DS_Store b/public/assets/vendors/pnotify/.DS_Store deleted file mode 100755 index 3079bd8..0000000 Binary files a/public/assets/vendors/pnotify/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/pnotify/libtests/.DS_Store b/public/assets/vendors/pnotify/libtests/.DS_Store deleted file mode 100755 index 4b70092..0000000 Binary files a/public/assets/vendors/pnotify/libtests/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/raphael/.DS_Store b/public/assets/vendors/raphael/.DS_Store deleted file mode 100755 index 5c296e5..0000000 Binary files a/public/assets/vendors/raphael/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/raphael/dev/.DS_Store b/public/assets/vendors/raphael/dev/.DS_Store deleted file mode 100755 index 61f79e8..0000000 Binary files a/public/assets/vendors/raphael/dev/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/raphael/dev/test/.DS_Store b/public/assets/vendors/raphael/dev/test/.DS_Store deleted file mode 100755 index 90b53af..0000000 Binary files a/public/assets/vendors/raphael/dev/test/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/.DS_Store b/public/assets/vendors/select2/.DS_Store deleted file mode 100755 index c5df83f..0000000 Binary files a/public/assets/vendors/select2/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/.DS_Store b/public/assets/vendors/select2/docs/.DS_Store deleted file mode 100755 index 15cb09d..0000000 Binary files a/public/assets/vendors/select2/docs/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/_includes/.DS_Store b/public/assets/vendors/select2/docs/_includes/.DS_Store deleted file mode 100755 index 2552c92..0000000 Binary files a/public/assets/vendors/select2/docs/_includes/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/_includes/options/.DS_Store b/public/assets/vendors/select2/docs/_includes/options/.DS_Store deleted file mode 100755 index 4963da2..0000000 Binary files a/public/assets/vendors/select2/docs/_includes/options/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/_sass/.DS_Store b/public/assets/vendors/select2/docs/_sass/.DS_Store deleted file mode 100755 index a9623fb..0000000 Binary files a/public/assets/vendors/select2/docs/_sass/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/_sass/vendor/.DS_Store b/public/assets/vendors/select2/docs/_sass/vendor/.DS_Store deleted file mode 100755 index e6518a6..0000000 Binary files a/public/assets/vendors/select2/docs/_sass/vendor/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/_sass/vendor/bootstrap/.DS_Store b/public/assets/vendors/select2/docs/_sass/vendor/bootstrap/.DS_Store deleted file mode 100755 index 9d5380b..0000000 Binary files a/public/assets/vendors/select2/docs/_sass/vendor/bootstrap/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/vendor/.DS_Store b/public/assets/vendors/select2/docs/vendor/.DS_Store deleted file mode 100755 index 3e2011c..0000000 Binary files a/public/assets/vendors/select2/docs/vendor/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/docs/vendor/images/.DS_Store b/public/assets/vendors/select2/docs/vendor/images/.DS_Store deleted file mode 100755 index 59b46b7..0000000 Binary files a/public/assets/vendors/select2/docs/vendor/images/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/src/.DS_Store b/public/assets/vendors/select2/src/.DS_Store deleted file mode 100755 index c95be7b..0000000 Binary files a/public/assets/vendors/select2/src/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/src/js/.DS_Store b/public/assets/vendors/select2/src/js/.DS_Store deleted file mode 100755 index 0477496..0000000 Binary files a/public/assets/vendors/select2/src/js/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/src/js/select2/.DS_Store b/public/assets/vendors/select2/src/js/select2/.DS_Store deleted file mode 100755 index 462b8d4..0000000 Binary files a/public/assets/vendors/select2/src/js/select2/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/src/scss/.DS_Store b/public/assets/vendors/select2/src/scss/.DS_Store deleted file mode 100755 index b460168..0000000 Binary files a/public/assets/vendors/select2/src/scss/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/src/scss/theme/.DS_Store b/public/assets/vendors/select2/src/scss/theme/.DS_Store deleted file mode 100755 index c8b2ad4..0000000 Binary files a/public/assets/vendors/select2/src/scss/theme/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/select2/tests/.DS_Store b/public/assets/vendors/select2/tests/.DS_Store deleted file mode 100755 index 9334a5f..0000000 Binary files a/public/assets/vendors/select2/tests/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/starrr/.DS_Store b/public/assets/vendors/starrr/.DS_Store deleted file mode 100755 index 06b68bc..0000000 Binary files a/public/assets/vendors/starrr/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/switchery/.DS_Store b/public/assets/vendors/switchery/.DS_Store deleted file mode 100755 index 9d7130e..0000000 Binary files a/public/assets/vendors/switchery/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/tabulator/.DS_Store b/public/assets/vendors/tabulator/.DS_Store deleted file mode 100644 index 76596e3..0000000 Binary files a/public/assets/vendors/tabulator/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/tabulator/js/.DS_Store b/public/assets/vendors/tabulator/js/.DS_Store deleted file mode 100644 index 68e57d2..0000000 Binary files a/public/assets/vendors/tabulator/js/.DS_Store and /dev/null differ diff --git a/public/assets/vendors/transitionize/.DS_Store b/public/assets/vendors/transitionize/.DS_Store deleted file mode 100755 index 2f5a28b..0000000 Binary files a/public/assets/vendors/transitionize/.DS_Store and /dev/null differ diff --git a/public/documents/general_files/erp_1719269060iroiRw.pdf b/public/documents/general_files/erp_1719269060iroiRw.pdf new file mode 100644 index 0000000..1f42603 Binary files /dev/null and b/public/documents/general_files/erp_1719269060iroiRw.pdf differ diff --git a/public/documents/mno_files/erp_1719508657gPQUmV_sliding_rate.pdf b/public/documents/mno_files/erp_1719508657gPQUmV_sliding_rate.pdf new file mode 100644 index 0000000..f7c82a1 Binary files /dev/null and b/public/documents/mno_files/erp_1719508657gPQUmV_sliding_rate.pdf differ diff --git a/public/documents/mno_files/erp_17195086735lArSM_sliding_rate.pdf b/public/documents/mno_files/erp_17195086735lArSM_sliding_rate.pdf new file mode 100644 index 0000000..f7c82a1 Binary files /dev/null and b/public/documents/mno_files/erp_17195086735lArSM_sliding_rate.pdf differ diff --git a/public/documents/mno_files/erp_1719509183_sliding_rate.pdf b/public/documents/mno_files/erp_1719509183_sliding_rate.pdf new file mode 100644 index 0000000..f7c82a1 Binary files /dev/null and b/public/documents/mno_files/erp_1719509183_sliding_rate.pdf differ diff --git a/public/documents/oasl.pdf b/public/documents/oasl.pdf new file mode 100755 index 0000000..5c55bed Binary files /dev/null and b/public/documents/oasl.pdf differ diff --git a/public/documents/ultra_host.pdf b/public/documents/ultra_host.pdf new file mode 100644 index 0000000..0d52273 Binary files /dev/null and b/public/documents/ultra_host.pdf differ diff --git a/resources/.DS_Store b/resources/.DS_Store deleted file mode 100755 index eb5601e..0000000 Binary files a/resources/.DS_Store and /dev/null differ diff --git a/resources/lang/.DS_Store b/resources/lang/.DS_Store deleted file mode 100644 index cb567cc..0000000 Binary files a/resources/lang/.DS_Store and /dev/null differ diff --git a/resources/views/.DS_Store b/resources/views/.DS_Store deleted file mode 100755 index cbc89c4..0000000 Binary files a/resources/views/.DS_Store and /dev/null differ diff --git a/resources/views/client/.DS_Store b/resources/views/client/.DS_Store deleted file mode 100644 index 5b60c81..0000000 Binary files a/resources/views/client/.DS_Store and /dev/null differ diff --git a/resources/views/client/laravel-2024-02-01.log b/resources/views/client/laravel-2024-02-01.log deleted file mode 100644 index 4fa9017..0000000 --- a/resources/views/client/laravel-2024-02-01.log +++ /dev/null @@ -1,195 +0,0 @@ -[2024-02-01 11:51:32] production.INFO: Mansa Olympio Successfully logged in at : 2024-02-01 11:51:32 -[2024-02-01 12:52:22] production.INFO: Mphatso Katundu Successfully logged in at : 2024-02-01 12:52:22 -[2024-02-01 14:20:13] production.INFO: Charity Mtembezeka Successfully logged in at : 2024-02-01 14:20:13 -[2024-02-01 14:50:19] production.INFO: Kwesi Banson Successfully logged in at : 2024-02-01 14:50:19 -[2024-02-01 15:29:39] production.ERROR: Trying to get property of non-object {"exception":"[object] (ErrorException(code: 0): Trying to get property of non-object at /var/www/html/general/team_tracker/app/Http/Controllers/ClientsController.php:799) -[stacktrace] -#0 /var/www/html/general/team_tracker/app/Http/Controllers/ClientsController.php(799): Illuminate\\Foundation\\Bootstrap\\HandleExceptions->handleError(8, 'Trying to get p...', '/var/www/html/g...', 799, Array) -#1 [internal function]: App\\Http\\Controllers\\ClientsController->edit('12') -#2 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): call_user_func_array(Array, Array) -#3 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction('edit', Array) -#4 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(212): Illuminate\\Routing\\ControllerDispatcher->dispatch(Object(Illuminate\\Routing\\Route), Object(App\\Http\\Controllers\\ClientsController), 'edit') -#5 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(169): Illuminate\\Routing\\Route->runController() -#6 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(658): Illuminate\\Routing\\Route->run() -#7 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#8 /var/www/html/general/team_tracker/app/Http/Middleware/CheckCurrentlyLoggedInUsers.php(28): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#9 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckCurrentlyLoggedInUsers->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#10 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#11 /var/www/html/general/team_tracker/app/Http/Middleware/CheckLogin.php(21): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#12 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckLogin->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#13 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#14 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php(41): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#15 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Routing\\Middleware\\SubstituteBindings->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#16 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#17 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#18 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#19 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#20 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#21 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#22 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#23 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(63): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#24 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Session\\Middleware\\StartSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#25 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#26 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#27 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#28 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#29 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#30 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#31 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#32 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#33 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(660): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#34 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(635): Illuminate\\Routing\\Router->runRouteWithinStack(Object(Illuminate\\Routing\\Route), Object(Illuminate\\Http\\Request)) -#35 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(601): Illuminate\\Routing\\Router->runRoute(Object(Illuminate\\Http\\Request), Object(Illuminate\\Routing\\Route)) -#36 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(590): Illuminate\\Routing\\Router->dispatchToRoute(Object(Illuminate\\Http\\Request)) -#37 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(176): Illuminate\\Routing\\Router->dispatch(Object(Illuminate\\Http\\Request)) -#38 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}(Object(Illuminate\\Http\\Request)) -#39 /var/www/html/general/team_tracker/vendor/fideloper/proxy/src/TrustProxies.php(56): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#40 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Fideloper\\Proxy\\TrustProxies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#41 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#42 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#43 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#44 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#45 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#46 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#47 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#48 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#49 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#50 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#51 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php(46): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#52 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\CheckForMaintenanceMode->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#53 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#54 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#55 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(151): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#56 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(116): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter(Object(Illuminate\\Http\\Request)) -#57 /var/www/html/general/team_tracker/index.php(55): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request)) -#58 {main} -"} -[2024-02-01 15:30:09] production.ERROR: View [client.onboarding_show] not found. {"exception":"[object] (InvalidArgumentException(code: 0): View [client.onboarding_show] not found. at /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php:137) -[stacktrace] -#0 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php(79): Illuminate\\View\\FileViewFinder->findInPaths('client.onboardi...', Array) -#1 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/Factory.php(128): Illuminate\\View\\FileViewFinder->find('client.onboardi...') -#2 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/helpers.php(979): Illuminate\\View\\Factory->make('client.onboardi...', Array, Array) -#3 /var/www/html/general/team_tracker/app/Http/Controllers/ClientsController.php(1212): view('client.onboardi...', Array) -#4 [internal function]: App\\Http\\Controllers\\ClientsController->showOnboardingForm('12') -#5 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): call_user_func_array(Array, Array) -#6 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction('showOnboardingF...', Array) -#7 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(212): Illuminate\\Routing\\ControllerDispatcher->dispatch(Object(Illuminate\\Routing\\Route), Object(App\\Http\\Controllers\\ClientsController), 'showOnboardingF...') -#8 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(169): Illuminate\\Routing\\Route->runController() -#9 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(658): Illuminate\\Routing\\Route->run() -#10 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#11 /var/www/html/general/team_tracker/app/Http/Middleware/CheckCurrentlyLoggedInUsers.php(28): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#12 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckCurrentlyLoggedInUsers->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#13 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#14 /var/www/html/general/team_tracker/app/Http/Middleware/CheckLogin.php(21): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#15 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckLogin->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#16 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#17 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php(41): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#18 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Routing\\Middleware\\SubstituteBindings->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#19 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#20 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#21 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#22 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#23 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#24 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#25 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#26 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(63): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#27 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Session\\Middleware\\StartSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#28 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#29 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#30 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#31 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#32 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#33 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#34 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#35 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#36 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(660): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#37 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(635): Illuminate\\Routing\\Router->runRouteWithinStack(Object(Illuminate\\Routing\\Route), Object(Illuminate\\Http\\Request)) -#38 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(601): Illuminate\\Routing\\Router->runRoute(Object(Illuminate\\Http\\Request), Object(Illuminate\\Routing\\Route)) -#39 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(590): Illuminate\\Routing\\Router->dispatchToRoute(Object(Illuminate\\Http\\Request)) -#40 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(176): Illuminate\\Routing\\Router->dispatch(Object(Illuminate\\Http\\Request)) -#41 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}(Object(Illuminate\\Http\\Request)) -#42 /var/www/html/general/team_tracker/vendor/fideloper/proxy/src/TrustProxies.php(56): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#43 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Fideloper\\Proxy\\TrustProxies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#44 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#45 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#46 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#47 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#48 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#49 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#50 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#51 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#52 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#53 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#54 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php(46): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#55 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\CheckForMaintenanceMode->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#56 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#57 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#58 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(151): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#59 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(116): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter(Object(Illuminate\\Http\\Request)) -#60 /var/www/html/general/team_tracker/index.php(55): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request)) -#61 {main} -"} -[2024-02-01 15:30:25] production.INFO: Mansa Olympio Successfully logged in at : 2024-02-01 15:30:25 -[2024-02-01 15:30:46] production.ERROR: Trying to get property of non-object {"exception":"[object] (ErrorException(code: 0): Trying to get property of non-object at /var/www/html/general/team_tracker/app/Http/Controllers/ClientsController.php:799) -[stacktrace] -#0 /var/www/html/general/team_tracker/app/Http/Controllers/ClientsController.php(799): Illuminate\\Foundation\\Bootstrap\\HandleExceptions->handleError(8, 'Trying to get p...', '/var/www/html/g...', 799, Array) -#1 [internal function]: App\\Http\\Controllers\\ClientsController->edit('166') -#2 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): call_user_func_array(Array, Array) -#3 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction('edit', Array) -#4 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(212): Illuminate\\Routing\\ControllerDispatcher->dispatch(Object(Illuminate\\Routing\\Route), Object(App\\Http\\Controllers\\ClientsController), 'edit') -#5 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Route.php(169): Illuminate\\Routing\\Route->runController() -#6 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(658): Illuminate\\Routing\\Route->run() -#7 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#8 /var/www/html/general/team_tracker/app/Http/Middleware/CheckCurrentlyLoggedInUsers.php(28): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#9 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckCurrentlyLoggedInUsers->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#10 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#11 /var/www/html/general/team_tracker/app/Http/Middleware/CheckLogin.php(21): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#12 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Middleware\\CheckLogin->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#13 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#14 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php(41): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#15 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Routing\\Middleware\\SubstituteBindings->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#16 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#17 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#18 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#19 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#20 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#21 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#22 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#23 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(63): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#24 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Session\\Middleware\\StartSession->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#25 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#26 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#27 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#28 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#29 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(68): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#30 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#31 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#32 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#33 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(660): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#34 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(635): Illuminate\\Routing\\Router->runRouteWithinStack(Object(Illuminate\\Routing\\Route), Object(Illuminate\\Http\\Request)) -#35 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(601): Illuminate\\Routing\\Router->runRoute(Object(Illuminate\\Http\\Request), Object(Illuminate\\Routing\\Route)) -#36 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Router.php(590): Illuminate\\Routing\\Router->dispatchToRoute(Object(Illuminate\\Http\\Request)) -#37 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(176): Illuminate\\Routing\\Router->dispatch(Object(Illuminate\\Http\\Request)) -#38 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(30): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}(Object(Illuminate\\Http\\Request)) -#39 /var/www/html/general/team_tracker/vendor/fideloper/proxy/src/TrustProxies.php(56): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#40 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Fideloper\\Proxy\\TrustProxies->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#41 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#42 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#43 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#44 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#45 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(30): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#46 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#47 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#48 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#49 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#50 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#51 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/CheckForMaintenanceMode.php(46): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#52 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): Illuminate\\Foundation\\Http\\Middleware\\CheckForMaintenanceMode->handle(Object(Illuminate\\Http\\Request), Object(Closure)) -#53 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Routing/Pipeline.php(53): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request)) -#54 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(102): Illuminate\\Routing\\Pipeline->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request)) -#55 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(151): Illuminate\\Pipeline\\Pipeline->then(Object(Closure)) -#56 /var/www/html/general/team_tracker/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(116): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter(Object(Illuminate\\Http\\Request)) -#57 /var/www/html/general/team_tracker/index.php(55): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request)) -#58 {main} -"} -[2024-02-01 15:32:30] production.INFO: Kwesi Banson Successfully logged in at : 2024-02-01 15:32:30 diff --git a/resources/views/client/partials/recent-payments.blade.php b/resources/views/client/partials/recent-payments.blade.php index e855bd5..17929e2 100644 --- a/resources/views/client/partials/recent-payments.blade.php +++ b/resources/views/client/partials/recent-payments.blade.php @@ -6,12 +6,13 @@ Invoice Number Invoice Amount Invoice Date - Services + Services + Short Code Remarks Status Action - + @@ -26,6 +27,7 @@ {{ $row->invoice_amount }} {{ date('d-m-Y', strtotime($row->invoice_date)) }} {{ $row->services }} + {{ $row->short_code or 'N/A' }} {{ $row->remarks }} {{ $row->invoice_status }} @@ -40,4 +42,4 @@ - \ No newline at end of file + diff --git a/resources/views/client/partials/support_fees.blade.php b/resources/views/client/partials/support_fees.blade.php new file mode 100644 index 0000000..8f4b3a3 --- /dev/null +++ b/resources/views/client/partials/support_fees.blade.php @@ -0,0 +1,44 @@ +
+
+ + + + + + + + + + + + + + + @if ($support_fees->isEmpty()) + + + + @else + @foreach ($support_fees as $row) + + + + + + + + + + + @endforeach + @endif + +
ServicesInvoice NumberInvoice DateRecurringStatusRemarksAction +
No Records found
{{ $row->services }} {{ $row->invoice_number }}{{ date('d-m-Y', strtotime($row->invoice_date)) }}{{ $row->recurring }} {{ $row->status }}{{ $row->remarks }} + + + + +
+
+
diff --git a/resources/views/client/partials/support_fees_form.blade.php b/resources/views/client/partials/support_fees_form.blade.php new file mode 100644 index 0000000..d0f3af6 --- /dev/null +++ b/resources/views/client/partials/support_fees_form.blade.php @@ -0,0 +1,81 @@ + + diff --git a/resources/views/client/show.blade.php b/resources/views/client/show.blade.php index 04baa6c..3764332 100755 --- a/resources/views/client/show.blade.php +++ b/resources/views/client/show.blade.php @@ -16,6 +16,7 @@ @include('client.partials.edit-shortcodes') @include('client.partials.edit-finance') @include('client.partials.progress_indicator_details') +@include('client.partials.support_fees_form')
@@ -274,6 +275,11 @@

Renewal Due : {{ $renewal_due }}

@endif +

Support Fees

+ +
+ + @include('client.partials.support_fees')

Finance Details

diff --git a/resources/views/layouts/partials/sidebar-live-ss.blade.php b/resources/views/layouts/partials/sidebar-live-ss.blade.php new file mode 100755 index 0000000..0c904fe --- /dev/null +++ b/resources/views/layouts/partials/sidebar-live-ss.blade.php @@ -0,0 +1,69 @@ + \ No newline at end of file diff --git a/resources/views/layouts/partials/sidebar-lv.blade.php b/resources/views/layouts/partials/sidebar-lv.blade.php new file mode 100644 index 0000000..e0d7f8a --- /dev/null +++ b/resources/views/layouts/partials/sidebar-lv.blade.php @@ -0,0 +1,68 @@ + diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php old mode 100755 new mode 100644 index 0c904fe..c1725db --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -3,7 +3,7 @@

General

- -
\ No newline at end of file + + diff --git a/resources/views/marketer_report/.DS_Store b/resources/views/marketer_report/.DS_Store deleted file mode 100755 index 5008ddf..0000000 Binary files a/resources/views/marketer_report/.DS_Store and /dev/null differ diff --git a/resources/views/network_ops/.DS_Store b/resources/views/network_ops/.DS_Store deleted file mode 100644 index 3616b2c..0000000 Binary files a/resources/views/network_ops/.DS_Store and /dev/null differ diff --git a/resources/views/network_ops/edit.blade.php b/resources/views/network_ops/edit.blade.php index 232d767..affa6ae 100755 --- a/resources/views/network_ops/edit.blade.php +++ b/resources/views/network_ops/edit.blade.php @@ -239,7 +239,7 @@

IP Addresses Add IP

- +
@@ -261,7 +261,7 @@

Notes Add Notes

-
Service
+
@@ -278,6 +278,34 @@ @endforeach
Services
+
+
+
+
+
+ + {!! Form::select('rate_type', $rate_types, old('rate_type'), ['class' => 'form-control' , 'id' => 'rateTypeSel']) !!} + {!! $errors->first('rate_type', '

:message

') !!} +
+
+
+ +
+
+
+ + {!! Form::text('buying_rate', old('buying_rate'), ['class' => 'form-control' , 'id' => 'buyingRateFlat']) !!} + {!! $errors->first('buying_rate', '

:message

') !!} +
+ +
+
+
+
diff --git a/resources/views/network_ops/index.blade.php b/resources/views/network_ops/index.blade.php index ac0542f..96961ee 100755 --- a/resources/views/network_ops/index.blade.php +++ b/resources/views/network_ops/index.blade.php @@ -123,6 +123,11 @@ return "" + value + ""; } }}, + { + title: "Contract Validity", + field: "contract_validity", + sorter: "date", + }, { title: "Account Manager", field: "accountManager", @@ -137,11 +142,11 @@ rowClick:function(e, row){ var userID = row.getData().id; - console.log(userID); + console.log(userID); //$('#userEditModal').modal('show'); }, }); - + $('#keywordField').on('keyup', function(){ console.log('up'); var keyword = $(this).val(); diff --git a/resources/views/network_ops/show.blade.php b/resources/views/network_ops/show.blade.php index 59581f2..a597c1c 100755 --- a/resources/views/network_ops/show.blade.php +++ b/resources/views/network_ops/show.blade.php @@ -28,7 +28,7 @@
-

Primary Details

+

Primary Details

@@ -58,23 +58,23 @@ - + - + - + - +
NameSkype Name {{ $mnoshow->contact_person_skype_name }}
Contract Type {{ $mnoshow->contract_type }}
Contract Validity {{ $mnoshow->contract_validity }}
Contract Auto Renew {{ $mnoshow->contract_auto_renew }}
-

Company Details

+

Company Details

@@ -83,7 +83,7 @@ @@ -91,7 +91,7 @@ @@ -99,7 +99,7 @@ @@ -107,7 +107,7 @@ @@ -115,7 +115,7 @@ @@ -123,30 +123,59 @@ - - + +
Name
Support Phones - support_phones) ? implode(',', json_decode($mnoshow->support_phones)) : ""; ?>
Support Emails - support_emails) ? implode(',', json_decode($mnoshow->support_emails)) : ""; ?>
Rate Emails - rate_emails) ? implode(',', json_decode($mnoshow->rate_emails)) : ""; ?>
Support Skype IDs - support_skype) ? implode(',', json_decode($mnoshow->support_skype)) : ""; ?>
Technical Support Person - technical_support_person) ?? "N/A"; ?>
Finace Contact Person - contact_person_finance) ?? "N/A"; ?>
-

Operations

+

Operations

- - + -
Services - services) ? implode(',', json_decode($mnoshow->services)) : ""; ?> - + + + services) ? implode(', ', json_decode($mnoshow->services)) : ""; ?> +
Connnection Typesconnection_type) ? implode(',', json_decode($mnoshow->connection_type)) : ""; ?> + + connection_type) ? implode(', ', json_decode($mnoshow->connection_type)) : ""; ?> + +
+ +

Rates

+ + @if($mnoshow->rate_type == 'flat_rate') + + + + + + + @else + + + + + + + + @endif +
Buying Rate {{ $mnoshow->buying_rate or '' }}
Rate Type{{ $mnoshow->rate_type }}
Sliding Scale Rate File +

+ + {{ $mnoshow->sliding_rate_file }} +

+
Rate Type{{ strtoupper($mnoshow->rate_type) }}
@@ -154,15 +183,15 @@
-

Notes

+

Notes

    @if($show_notes->isEmpty())
  • No notes found
    • @else - +
    - + @@ -193,14 +222,15 @@
    +

    Payments

    -
    # Content Services
    +
    - + @@ -227,13 +257,10 @@
    -

    IP Addresses

    -
    -
      - @if($ip_addresses->isEmpty()) -
    • No IP found
      • - @else -
    Invoice Number Invoice Amount Invoice DateServicesServices Remarks Status
    +

    IP Addresses

    + +
    +
    @@ -245,6 +272,9 @@ + @if($ip_addresses->isEmpty()) + + @else @foreach($ip_addresses as $row) @@ -257,12 +287,9 @@ @endforeach - + @endif
    #
    No Records found
    - @endif -
-
@@ -272,19 +299,19 @@
-

Uploaded Documents

+

Uploaded Documents

@if($showdocuments->isEmpty() == false)
- -
+ +
@foreach($showdocuments as $docs)

{{ $docs->name }}.{{ $docs->file_extension }}

-
+
@endforeach
@@ -296,14 +323,14 @@
-
+ @endsection @section('javascript') @endsection diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php index e128691..7e1fa6b 100755 --- a/resources/views/reports/index.blade.php +++ b/resources/views/reports/index.blade.php @@ -36,7 +36,7 @@ - + @@ -102,11 +102,16 @@ field: "services", sorter: "string", }, + { + title: "Short Code", + field: "short_code", + sorter: "string", + }, { title: "Status", field: "invoice_status", sorter: "string", - }, + }, { title: "Invoice Date", field: "invoice_date", @@ -132,15 +137,15 @@ orientation:"portrait", //set page orientation to portrait title:"Click Mobile ERP - Client Payment Reports", //add title to report }); - }); - + }); + $('#keywordField').on('keyup', function(){ console.log('up'); var keyword = $(this).val(); table.setData("clientpaymentreports/all?keyword=" + keyword); }); - + }); diff --git a/resources/views/senderid/index.blade.php b/resources/views/senderid/index.blade.php index 69fe307..0680288 100644 --- a/resources/views/senderid/index.blade.php +++ b/resources/views/senderid/index.blade.php @@ -76,6 +76,19 @@ var rowID = cell.getData().id return ""+url+""; } + function cellDesign (cell, formatterParams){ + var value = cell.getValue(); + return "" + value + ""; + } + function statusDesign (cell, formatterParams){ + var value = cell.getValue(); + if(value === 'Approved'){ + return "" + value + ""; + } + else{ + return "" + value + ""; + } + } var table = new Tabulator("#senderIdsTable", { ajaxURL: "senderids/all", paginationSize: 15, @@ -91,26 +104,28 @@ sorter: "string", formatter:link, }, + { + title: "Country", + field: "country", + sorter: "string", + }, { title: "Sender ID", field: "senderid", sorter: "string", + formatter: cellDesign, }, { title: "Status", field: "status", sorter: "string", + formatter: statusDesign, }, { title: "Network", field: "networkName", sorter: "string", }, - { - title: "Country", - field: "country", - sorter: "string", - }, { title: "Created By", field: "createdBy", @@ -125,18 +140,18 @@ rowClick:function(e, row){ var userID = row.getData().id; - console.log(userID); + console.log(userID); //$('#userEditModal').modal('show'); }, }); - + $('#keywordField').on('keyup', function(){ console.log('up'); var keyword = $(this).val(); table.setData("senderids/all?keyword=" + keyword); }); - + }); diff --git a/routes/.DS_Store b/routes/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/routes/.DS_Store and /dev/null differ diff --git a/routes/web.php b/routes/web.php index 2a63af0..222ae22 100755 --- a/routes/web.php +++ b/routes/web.php @@ -37,6 +37,8 @@ Route::get('/home', 'HomeController@index')->name('home'); Route::get('dumpprogress', 'UtilityController@insertOnboardingProgress'); +Route::get('paperless', 'UtilityController@paperlessTest'); +Route::get('paperless_getparams/{name}', 'UtilityController@getPaperlessAttributes'); Route::get('testmap', 'UtilityController@maptest'); @@ -98,6 +100,9 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::post('clients/notes_update', 'ClientsController@notesUpdate'); Route::post('clients/notes_store', 'ClientsController@notesStore'); Route::post('clients/finance_store', 'ClientsController@financeStore'); + Route::post('clients/support_fees_store', 'ClientsController@supportFeesStore'); + + Route::post('clients/finance_update', 'ClientsController@financeUpdate'); Route::post('clients/shortcode_update', 'ClientsController@shortCodeUpdate'); diff --git a/scrap-board.php b/scrap-board.php index da2c0fe..5a1e097 100644 --- a/scrap-board.php +++ b/scrap-board.php @@ -46,5 +46,14 @@ if(date('D') == 'Sat' || date('D') == 'Sun') { $diff = abs(strtotime($expiry_date) - strtotime($current_date)); $days = floor($diff / (60*60*24)); */ +#mno_rates +// id +// mno_id +// buying_rate +// rate_method (flat, schedule) +// date_received +// modified_by_id +// file_uploaded (YES) +// comments ?> diff --git a/storage/laravel-2024-06-11.log b/storage/laravel-2024-06-11.log deleted file mode 100644 index 65e7f24..0000000 --- a/storage/laravel-2024-06-11.log +++ /dev/null @@ -1 +0,0 @@ -[2024-06-11 21:10:55] production.INFO: Kwesi Banson Successfully logged in at : 2024-06-11 21:10:55