after a series of bug fixes plus Non MNO logic for Sender IDs, unfinished leave management and holiday modules

This commit is contained in:
Kwesi Banson Jnr
2025-03-19 10:33:04 +00:00
parent 6cede6d980
commit cf39ff2682
112 changed files with 26812 additions and 496 deletions

View File

@@ -0,0 +1,118 @@
<div class="modal fade" id="newShortCodeFormModal" tabindex="-1" role="dialog" aria-labelledby="paymentModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<!-- <h4 class="modal-title">Default Modal</h4> -->
<h5 class="modal-title text-center" id="paymentModalLabelHeading">New Short Code Form</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div id="notifyArea" class="alert alert-danger hidden"></div>
<form class="form-vertical" method="POST" id="shortCodeForm" action="{{ url('clients/shortcodes_store') }}">
{{ csrf_field() }}
<input type="hidden" name="client_id" id="clientID" value="{{ $showclient->id }}">
<input type="hidden" name="code_type" id="shortCodeType">
<div class="row">
<div class="form-group" >
<div class="col-md-12" style="padding-bottom: 5px;">
<label for="name">Friendly Name *</label>
<input type="text" class="form-control" name="name" id="name" required >
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="networks">Country *</label>
{!! Form::select('country', $countries, null, ['class' => 'form-control' , 'id' => 'shortCodeCountry', 'required' => 'required', 'style' => 'width: 100%']) !!}
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="networks">Network *</label>
<!-- 'multiple'=> 'true', -->
{!! Form::select('network', $mnos_arr, null, ['class' => 'form-control' , 'id' => 'networks', 'required' => 'required', 'style' => 'width: 100%']) !!}
</div>
</div>
<div class="form-group" >
<div class="col-md-12" style="padding-bottom: 5px;">
<label for="shortCode">Code *</label>
<input type="number" class="form-control" name="shortcode" id="shortCode" required >
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="tollFree">Toll Free</label>
<select name="toll_free" id="tollFree" class="form-control" required style="width: 100%;">
<option value="YES">YES</option>
<option value="NO">NO</option>
</select>
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="monthlyFee">Monthly Fee</label>
<input type="number" class="form-control" name="monthly_fee" id="monthlyFee" >
</div>
</div>
<div class="form-group">
<div class="col-md-6">
<div class='input-group date' id='myDatepicker22' style="padding-bottom: 5px;">
<label for="launchDate">Launch Date</label>
<input type="text" class="form-control" name="launch_date" id="launchDate" required >
<div class="input-group-addon">
<span class="fa fa-calendar"></span>
</div>
</div>
</div>
<div class="col-md-6">
<div class='input-group date' id='myDatepicker223' style="padding-bottom: 5px;">
<label for="expiryDate">Expiry Date</label>
<input type="text" class="form-control" name="expiry_date" id="expiryDate" required >
<div class="input-group-addon">
<span class="fa fa-calendar"></span>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="codeStatus">Status</label>
<select id="codeStatus" name="status" class="form-control" required style="width: 100%;">
<option value="LIVE">Live</option>
<option value="PENDING">Pending</option>
<option value="TESTING">Testing</option>
<option value="INACTIVE">Inactive </option>
</select>
</div>
</div>
<div class="form-group" >
<div class="col-md-12" style="padding-bottom: 5px;">
<label for="remarks">Remarks</label>
<input type="text" class="form-control" name="remarks" id="remarks"></textarea>
</div>
</div>
<div class="form-group" style="margin-bottom: 0.2rem; padding-bottom: 5px; padding-top: 5px;">
<div class="col-md-12" style="padding-bottom: 10px;">
<button type="submit" class="btn btn-success btn-block updateBtn"> <i class="fa fa-send"></i> Submit</button>
</div>
</div>
<div class="form-group" style="margin-bottom: 0.5rem; padding-bottom: 5px; padding-top: 5px;">
<div class="col-md-12">
<button type="button" class="btn btn-dark btn-block" data-dismiss="modal"><i class="fa fa-close"></i> Close</button>
</div>
</div>
</div>
</form>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->

View File

@@ -25,8 +25,7 @@
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="networks">Network *</label>
<!-- 'multiple'=> 'true', -->
{!! Form::select('network', $networks_raw, null, ['class' => 'form-control' , 'id' => 'networks', 'required' => 'required', 'style' => 'width: 100%']) !!}
{!! Form::select('network', $country_network_arr, null, ['class' => 'form-control' , 'id' => 'networks', 'placeholder'=>'Select Network ' , 'required' => 'required' , 'style' => 'width: 100%']) !!}
</div>
</div>
<div class="form-group" >
@@ -44,6 +43,12 @@
</select>
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="monthlyFee">Monthly Fee</label>
<input type="number" class="form-control" name="monthly_fee" id="monthlyFee" >
</div>
</div>
<div class="form-group">
<div class="col-md-6">
<div class='input-group date' id='myDatepicker22' style="padding-bottom: 5px;">

View File

@@ -19,6 +19,12 @@
<label for="financeServicesEdit">Services *</label>
{!! Form::select('services[]', $service_type_names , old('services'), ['class' => 'form-control' , 'id' => 'financeServicesEdit', 'required' => 'required', 'multiple'=> 'true', 'style' => 'width: 100%']) !!}
</div>
</div>
<div class="form-group" >
<div class="col-md-12" style="padding-bottom: 5px;">
<label for="shortCodeEdit">Short Code</label>
<input type="text" class="form-control" name="short_code" id="financeShortCodeEdit" required >
</div>
</div>
<div class="form-group" >
<div class="col-md-12" style="padding-bottom: 5px;">

View File

@@ -45,6 +45,12 @@
</select>
</div>
</div>
<div class="form-group">
<div class="col-md-12" style="padding-bottom: 5px">
<label for="monthlyFeeEdit">Monthly Fee</label>
<input type="number" class="form-control" name="monthly_fee" id="monthlyFeeEdit" >
</div>
</div>
<div class="form-group">
<div class="col-md-6">
<div class='input-group date' id='myDatepicker22Edit' style="padding-bottom: 5px;">

View File

@@ -23,8 +23,20 @@
@foreach ($client_sender_ids as $row)
<tr class="even pointer">
<td class="mes-td col-md-2">{{ $row->senderid }} </td>
<td class="col-md-2">{{ $row->network_info->name }}</td>
<td class="col-md-2">{{ $row->network_info->country }}</td>
<td class="col-md-2">
<?php
if(isset($row->network_info->name)){
echo $row->network_info->name;
}
?>
</td>
<td class="col-md-2">
<?php
if(isset($row->network_info->country)){
echo $row->network_info->country;
}
?>
</td>
<td class="col-md-1"><span class="label label-<?php echo ($row->status == 'Approved') ? 'success' : 'warning'; ?>"> {{ $row->status }}</span></td>
<td class="col-md-2">{{ $row->created_by_info->name }}</td>
<td class="mes-td col-md-2" style="width: 100px;">{{ $row->remarks }}</td>

View File

@@ -8,6 +8,7 @@
<th class="column-title">Code</th>
<th class="column-title">Network</th>
<th class="column-title">Toll Free</th>
<th class="column-title">MOnthly Free</th>
<th class="column-title">Status</th>
<th class="column-title">Remarks</th>
<th class="column-title">Launch Date</th>
@@ -29,6 +30,7 @@
<td class="mes-td col-md-1 text-danger"><b>{{ $row->shortcode }}</b></td>
<td class="mes-td col-md-2">{{ $row->network }}</td>
<td class="mes-td col-md-1">{{ strtoupper($row->toll_free) }}</td>
<td class="mes-td col-md-1">{{ strtoupper($row->monthly_fee) }}</td>
<td class="mes-td col-md-1">
<!-- style='color:#3FB449; font-weight:bold;'
dump($row->status)

View File

@@ -8,6 +8,7 @@
<th class="column-title">Code</th>
<th class="column-title">Network</th>
<th class="column-title">Toll Free</th>
<th class="column-title">Monthly Fee</th>
<th class="column-title">Status</th>
<th class="column-title">Launch Date</th>
<th class="column-title">Renewal Date</th>
@@ -28,11 +29,12 @@
<td class="mes-td col-md-1">{{ $row->shortcode }}</td>
<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->monthly_fee }}</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;">
@if($row->expiry_date == false)
{{ "No found"}}
{{ "Not found"}}
@else
{{ date('d-m-Y', strtotime($row->expiry_date)) }}
@endif

View File

@@ -8,6 +8,7 @@
<th class="column-title">Code</th>
<th class="column-title">Network/Country</th>
<th class="column-title">Toll Free</th>
<th class="column-title">MOnthly Fee</th>
<th class="column-title">Status</th>
<!-- <th class="column-title">Remarks</th> -->
<th class="column-title">Launch Date</th>
@@ -29,6 +30,7 @@
<td class="mes-td col-md-1">{{ $row->shortcode }}</td>
<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->monthly_fee }}</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;">

View File

@@ -8,6 +8,7 @@
<th class="column-title">Code</th>
<th class="column-title">Network/Country</th>
<th class="column-title">Toll Free</th>
<th class="column-title">MOnthly Fee</th>
<th class="column-title">Status</th>
<th class="column-title">Launch Date</th>
<th class="column-title">Expiry Date</th>
@@ -28,6 +29,7 @@
<td class="mes-td col-md-1">{{ $row->shortcode }}</td>
<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->monthly_fee }}</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;">