bug fixes, mno,client contract renewals, scheduling

This commit is contained in:
Kwesi Banson
2024-06-10 21:40:28 +00:00
parent 1a4a3acfda
commit 464b544587
110 changed files with 531 additions and 127 deletions

BIN
resources/.DS_Store vendored Executable file

Binary file not shown.

BIN
resources/lang/.DS_Store vendored Normal file

Binary file not shown.

BIN
resources/views/.DS_Store vendored Executable file

Binary file not shown.

BIN
resources/views/client/.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -11,6 +11,7 @@
<th class="column-title">Status</th>
<th class="column-title">Remarks</th>
<th class="column-title">Launch Date</th>
<th class="column-title">Renewal Date</th>
<th class="column-title no-link last"><span class="nobr">Action</span>
</th>
@@ -31,6 +32,14 @@
<td class="mes-td col-md-1">{{ $row->status }}</td>
<td class="mes-td col-md-2">{{ $row->remarks }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->launch_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">
@if($row->expiry_date == false)
{{ "No found"}}
@else
{{ date('d-m-Y', strtotime($row->expiry_date)) }}
@endif
</td>
<td class="last col-md-1" style="width: 100px;">
<span>
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>

View File

@@ -10,7 +10,7 @@
<th class="column-title">Toll Free</th>
<th class="column-title">Status</th>
<th class="column-title">Launch Date</th>
<th class="column-title">Expiry Date</th>
<th class="column-title">Renewal Date</th>
<th class="column-title no-link last"><span class="nobr">Action</span>
</th>
@@ -30,7 +30,13 @@
<td class="mes-td col-md-1">{{ $row->toll_free }}</td>
<td class="mes-td col-md-1">{{ $row->status }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->launch_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->expiry_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">
@if($row->expiry_date == false)
{{ "No found"}}
@else
{{ date('d-m-Y', strtotime($row->expiry_date)) }}
@endif
</td>
<td class="last col-md-1" style="width: 100px;">
<span>
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>

View File

@@ -30,9 +30,16 @@
<td class="mes-td col-md-2">{{ $row->network }}</td>
<td class="mes-td col-md-1">{{ $row->toll_free }}</td>
<td class="mes-td col-md-1">{{ $row->status }}</td>
<td class="mes-td col-md-2">{{ $row->remarks }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->launch_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->expiry_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">
@if($row->expiry_date == false)
{{ "No found"}}
@else
{{ date('d-m-Y', strtotime($row->expiry_date)) }}
@endif
</td>
<td class="last col-md-1" style="width: 100px;">
<span>
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>

View File

@@ -30,7 +30,13 @@
<td class="mes-td col-md-1">{{ $row->toll_free }}</td>
<td class="mes-td col-md-1">{{ $row->status }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->launch_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">{{ date('d-m-Y', strtotime($row->exipiry_date)) }}</td>
<td class="mes-td col-md-1" style="width: 100px;">
@if($row->expiry_date == false)
{{ "No found"}}
@else
{{ date('d-m-Y', strtotime($row->expiry_date)) }}
@endif
</td>
<td class="last col-md-1" style="width: 100px;">
<span>
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>

View File

@@ -7,7 +7,7 @@
<div class="">
<div class="right_cols" role="main">
<div class="">
<div class="row top_tiles">
@@ -49,11 +49,11 @@
<div class="row">
<div class="col-md-4">
<div class="col-md-3">
<div class="x_panel">
<div class="x_title">
<h2 class="blue">Recent Activities </h2>
<h2 class="blue">Additional Info </h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
@@ -69,7 +69,7 @@
<a>{{ $userrow->content }}</a>
</h2>
<div class="byline">
<span>{{ $userrow->activity_time }}</span>
<span>{{ $userrow->activity_time }}</span>
<!-- by <a>Jane Smith</a> -->
</div>
<p class="excerpt"></p>
@@ -78,17 +78,52 @@
</li>
@endforeach
@endif
</ul>
</div>
</div>
</div>
</div>
<div class="col-md-4">
</div>
<div class="col-md-3">
<div class="x_panel">
<div class="x_title">
<h2 class="blue">Recent Activities </h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div class="dashboard-widget-content">
<ul class="list-unstyled timeline widget">
@if($user_activities->isEmpty() == false)
@foreach($user_activities as $userrow)
<li>
<div class="block">
<div class="block_content">
<h2 class="title">
<a>{{ $userrow->content }}</a>
</h2>
<div class="byline">
<span>{{ $userrow->activity_time }}</span>
<!-- by <a>Jane Smith</a> -->
</div>
<p class="excerpt"></p>
</div>
</div>
</li>
@endforeach
@endif
</ul>
</div>
</div>
</div>
</div>
<div class="col-md-3">
<div class="x_panel">
<div class="x_title">
<h2 class="red">Contracts Expiry Dates </h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
@@ -96,7 +131,7 @@
@foreach($expiring_contracts as $row)
<article class="media event">
<a class="pull-left date" style="background-color: #de9a24">
<p class="month" style="margin-top: -4px; margin-bottom: -4px;">{{ date("M", strtotime($row->contract_validity)) }}</p>
<p class="day" style="font-size: 22px !important">{{ date("d", strtotime($row->contract_validity)) }}</p>
<p class="text-center" style="color:#fff; margin-bottom: -4px; margin-top: -4px;">{{ date("Y", strtotime($row->contract_validity)) }}</p>
@@ -122,14 +157,14 @@
</div>
</article>
@endif
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-3">
<div class="x_panel">
<div class="x_title">
<h2 class="green">Newly Added Clients</h2>
<h2 class="green">Newly Added Clients</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
@@ -137,7 +172,7 @@
@foreach($recent_clients as $recentrow)
<article class="media event">
<a class="pull-left date" style="background-color: #de9a24">
<p class="month" style="margin-top: -4px; margin-bottom: -4px;">{{ date("M", strtotime($recentrow->created_at)) }}</p>
<p class="day" style="font-size: 22px !important">{{ date("d", strtotime($recentrow->created_at)) }}</p>
<p class="text-center" style="color:#fff; margin-bottom: -4px; margin-top: -4px;">{{ date("Y", strtotime($recentrow->created_at)) }}</p>
@@ -167,7 +202,7 @@
</div>
</div>
</div>
</div>
@@ -179,4 +214,4 @@
<script src="{{ url('public/assets/js/dashboard.js') }}"></script>
@endsection
@endsection

View File

@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta charset="utf-8">
</head>
<body>
<div class="">
<img src="{!! url('public/assets/img/click-banner.png') !!}" alt="Click Mobile Banner Logo">
</div>
<h2>{{ date('F d, Y') }} Client Contract Renewal Alert <br></h2>
Hello Team<br>
<br>
<strong>Renewal Details</strong>
<br>
<em>{{ $alert_body }}</em>
<p>
Sincerely, <br>
Click Mobile ERP
</p>
</body>
</html>

View File

@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta charset="utf-8">
</head>
<body>
<div class="">
<img src="{!! url('public/assets/img/click-banner.png') !!}" alt="Click Mobile Banner Logo">
</div>
<h2>{{ date('F d, Y') }} Contract Renewal Alert <br></h2>
Hello Team<br>
<br>
<strong>Renewal Details</strong>
<br>
<em>{{ $alert_body }}</em>
<p>
Sincerely, <br>
Click Mobile ERP
</p>
</body>
</html>

View File

@@ -12,23 +12,23 @@
<div class="count">2500</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-clock-o"></i> Metric 1</span>
<span class="count_top"><i class="fa fa-clock-o"></i> Metric 2</span>
<div class="count">123.50</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 1 </span>
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 3 </span>
<div class="count green">2,500</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 1 </span>
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 4 </span>
<div class="count">4,567</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 1</span>
<span class="count_top"><i class="fa fa-dot-circle-o"></i> Metric 5</span>
<div class="count">2,315</div>
</div>
<div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">
<span class="count_top"><i class="fa fa-file-o"></i> Metric 1</span>
<span class="count_top"><i class="fa fa-file-o"></i> Metric 6</span>
<div class="count">7,325</div>
</div>
</div>

BIN
resources/views/marketer_report/.DS_Store vendored Executable file

Binary file not shown.

BIN
resources/views/network_ops/.DS_Store vendored Normal file

Binary file not shown.

View File

@@ -35,16 +35,16 @@
{!! Form::model($network_arr, ['method' => 'PATCH', 'url' => ['mnos', $network_arr], 'class' => 'form-horizontal form-label-left', 'files' => 'true' ]) !!}
<div class="row">
<div class="col-md-6">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class=" {{ $errors->has('name') ? 'has-error' : ''}}">
<label class="" for="name">Name</label>
{!! Form::text('name', old('name'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter name' , 'id' => 'name']) !!}
{!! $errors->first('name', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
</div>
<div class="form-group">
<div class="{{ $errors->has('country') ? 'has-error' : ''}}">
<label class="" for="country">Country</label>
{!! Form::select('country', $countries ,old('country'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Country' , 'id' => 'country']) !!}
@@ -52,14 +52,14 @@
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class="{{ $errors->has('account_manager_id') ? 'has-error' : ''}}">
<label class="" for="account_manager_id">Click Account Manager</label>
{!! Form::select('account_manager_id', $account_manager ,old('account_manager_id'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Account Manager' , 'id' => 'account_manager_id']) !!}
{!! $errors->first('account_manager_id', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class="{{ $errors->has('mno_account_manager') ? 'has-error' : ''}}">
<label class="" for="MnoAccountManager">MNO Account Manager</label>
{!! Form::text('mno_account_manager',old('mno_account_manager'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter MNO Account Manager' , 'id' => 'MnoAccountManager']) !!}
@@ -81,13 +81,13 @@
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('email') ? 'has-error' : ''}}">
<label class="" for="email">Email</label>
{!! Form::text('contact_person_email', old('contact_person_email'), ['class' => 'form-control ', 'placeholder'=>'Enter email' , 'id' => 'email']) !!}
{!! $errors->first('contact_person_email', '<p class="help-block">:message</p>') !!}
</div>
</div>
</div>
<div class="form-group">
<div class=" {{ $errors->has('skype_name') ? 'has-error' : ''}}">
<label class="" for="skypeName">Skype Name</label>
@@ -100,7 +100,7 @@
<div class="bg-<?php echo $status_bg; ?> " style="border-radius: 5px; border: 1px solid black; padding: 10px;">
<p >
Live:
<input type="radio" class="flat" name="connection_status" id="statusLive" value="Active" <?php echo ($network_arr->connection_status == 'Active') ? "checked" : ""; ?> />
<input type="radio" class="flat" name="connection_status" id="statusLive" value="Active" <?php echo ($network_arr->connection_status == 'Active') ? "checked" : ""; ?> />
</p>
<p>
Pending:
@@ -113,7 +113,7 @@
</div>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<div class=" {{ $errors->has('contact_person_finance') ? 'has-error' : ''}}">
<label class="" for="technicalPerson">Technical Support Person</label>
@@ -127,36 +127,36 @@
{!! Form::text('contact_person_finance', old('contact_person_finance'), ['class' => 'form-control', 'placeholder'=>'Enter Finance Contact Person' , 'id' => 'contactPersonFinance']) !!}
{!! $errors->first('contact_person', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
</div>
<div class="form-group">
<div class=" {{ $errors->has('services') ? 'has-error' : ''}}">
<label class="" for="type">Services</label>
{!! Form::select('services[]', $services, $current_services, ['class' => 'form-control typeServices' , 'id' => 'services', 'multiple'=> 'true']) !!}
{!! $errors->first('services', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('support_skype') ? 'has-error' : ''}}">
<label class="" for="rateEmail">Support Skype IDs (Multiple) </label>
{!! Form::select('support_skype[]', $support_skype_arr, $old_support_skype_arr, ['class' => 'form-control supportSkype', 'id' => 'supportSkype', 'multiple' => 'true']) !!}
{!! $errors->first('support_skype', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('support_email') ? 'has-error' : ''}}">
<label class="" for="supportEmail">Support Emails (Multiple) </label>
{!! Form::select('support_emails[]', $support_emails, $old_support_emails, ['class' => 'form-control supportEmail', 'id' => 'supportEmail', 'multiple' => 'true']) !!}
{!! $errors->first('support_emails', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('finance_emails') ? 'has-error' : ''}}">
<label class="" for="financeEmail">Finance Emails (Multiple) </label>
{!! Form::select('finance_emails[]', $finance_emails, $old_finance_emails, ['class' => 'form-control financeEmail', 'id' => 'financeEmail', 'multiple' => 'true']) !!}
{!! $errors->first('finance_emails', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
</div>
<div class="form-group">
<div class=" {{ $errors->has('support_phones') ? 'has-error' : ''}}">
<label class="" for="supportPhones">Support Phone Numbers (Multiple) </label>
{!! Form::select('support_phones[]', $support_phones, $old_support_phones, ['class' => 'form-control supportPhones', 'id' => 'supportPhones', 'multiple' => 'true']) !!}
@@ -170,33 +170,33 @@
{!! $errors->first('contract_validity', '<p class="help-block">:message</p>') !!}
</div>
</div>
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('contract_auto_renew') ? 'has-error' : ''}}">
<label class="" for="contractAutoRenew">Contract Auto Renewal</label>
{!! Form::select('contract_auto_renew', ['YES' => 'YES','NO' => 'NO'], old('contract_auto_renew'), ['class' => 'form-control ' , 'id' => 'contractAutoRenew' ]) !!}
{!! $errors->first('contract_auto_renew', '<p class="help-block">:message</p>') !!}
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h4>Recent Payments</h4>
@include('network_ops.partials.recent-payments')
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<div class=" {{ $errors->has('connection_type') ? 'has-error' : ''}}">
<label class="" for="connectionType">Connection Types</label>
{!! Form::select('connection_type[]', $connection_types, $old_connection_type, ['class' => 'form-control' , 'id' => 'connectionType', 'multiple'=> 'true']) !!}
{!! $errors->first('connection_type', '<p class="help-block">:message</p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="col-md-6">
<div class="form-group">
<div class=" {{ $errors->has('document_one_name') ? 'has-error' : ''}}">
<label class="" for="documentOneName">Document Name</label>
{!! Form::text('document_one_name', '', ['class' => 'form-control' , 'id' => 'documentOneName']) !!}
@@ -216,7 +216,7 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<div class="form-group">
<div class=" {{ $errors->has('document_two_name') ? 'has-error' : ''}}">
<label class="" for="documentOneName">Document Name</label>
{!! Form::text('document_two_name', '', ['class' => 'form-control' , 'id' => 'documentTwoName']) !!}
@@ -233,9 +233,9 @@
</div>
</div>
</div>
</div>
</div>
<div class="">
<p><b>IP Addresses</b> <a href="" class="btn btn-primary btn-xs pull-right" id="addIpBtn" ><i class="fa fa-plus-square"></i> Add IP</a></p>
@@ -289,7 +289,7 @@
{!! Form::close() !!}
</div>
</div>
</div>
</div>
</div>
</div>
@@ -312,6 +312,9 @@
$('.financeEmail').select2({
tags:true
});
$('#contractValidity').datetimepicker({
format: 'YYYY-MM-DD'
});
});
</script>