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

bug fixes, senderID polishing, support fees, paperless partial

Browse Source
This commit is contained in:
Kwesi Banson
2024-07-02 09:25:00 +00:00
parent 318fddbff0
commit edb78d1bfc
116 changed files with 1488 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Http/Controllers/NetworkOperatorsController.php
View File

@@ -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',