added expiry date to shortcode crud plus bug fixes
This commit is contained in:
Kwesi Banson
@@ -395,7 +395,8 @@ class ClientsController extends Controller
|
||||
'toll_free' => 'required',
|
||||
'status' => 'required',
|
||||
'remarks' => 'required',
|
||||
'launch_date' => 'required'
|
||||
'launch_date' => 'required',
|
||||
'expiry_date' => 'required'
|
||||
]);
|
||||
$auth_user = session('current_user');
|
||||
#$network = Models\NetworkOps::find($request->network);
|
||||
@@ -442,6 +443,7 @@ class ClientsController extends Controller
|
||||
'toll_free' => $request->toll_free,
|
||||
'last_updaed_by' => $auth_user['id'],
|
||||
'launch_date' => $request->launch_date,
|
||||
'expiry_date' => $request->expiry_date,
|
||||
'status' => $request->status
|
||||
];
|
||||
if ($request->has('remarks')) {
|
||||
@@ -809,12 +811,14 @@ class ClientsController extends Controller
|
||||
|
||||
//This should not be false because onboarding_progress_stage is populated during client creation
|
||||
$onboarding_progress = json_decode($client->onboarding_progress_stage, 1);
|
||||
//dump($client->progress_indicator);
|
||||
// dump($client->progress_indicator);
|
||||
// dd($onboarding_progress);
|
||||
$has_pending = in_array("PENDING", $onboarding_progress);
|
||||
if ($client->progress_indicator !== "COMPLETED") {
|
||||
$stage_details = Models\ClientOnboardingMainStage::where('stage', $client->progress_indicator)->first();
|
||||
//dd($stage_details);
|
||||
// dump($stage_details);
|
||||
$onboarding_sub_items_progress = Models\ClientOnboardingProgress::where('stage_id', $stage_details->stage_id)->where('client_id', $id)->pluck('name', 'name');
|
||||
// dd($onboarding_sub_items_progress);
|
||||
$onboarding_sub_items = Models\ClientOnboardingSubItem::where('stage_id', $stage_details->stage_id)->pluck('name', 'name');
|
||||
}
|
||||
|
||||
@@ -988,7 +992,7 @@ class ClientsController extends Controller
|
||||
#$pending_stage = array_key_first($pending_stage);
|
||||
reset($pending_stage);
|
||||
$pending_stage = key($pending_stage);
|
||||
|
||||
// dd($pending_stage);
|
||||
if ($pending_stage == true) {
|
||||
//Pending Exist
|
||||
$client_update->progress_indicator = $pending_stage;
|
||||
|
||||
@@ -26,3 +26,30 @@ Great idea on the performance indicators, I have a suggestion for clients that a
|
||||
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
|
||||
|
||||
|
||||
https://youtu.be/6kBAkodqBRM
|
||||
|
||||
https://youtu.be/OUSTGLL51m0
|
||||
|
||||
|
||||
3
public/assets/js/clientshow.js
vendored
3
public/assets/js/clientshow.js
vendored
@@ -32,6 +32,9 @@
|
||||
});
|
||||
$('#launchDate').datetimepicker({
|
||||
format: 'YYYY-MM-DD'
|
||||
});
|
||||
$('#expiryDate').datetimepicker({
|
||||
format: 'YYYY-MM-DD'
|
||||
});
|
||||
$('#createNotesBtn').click(function(evt){
|
||||
evt.preventDefault();
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-12" style="padding-bottom: 5px">
|
||||
<label for="tollFree">Status</label>
|
||||
<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>
|
||||
@@ -45,7 +45,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-12">
|
||||
<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 >
|
||||
@@ -54,6 +54,15 @@
|
||||
</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">
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
<th class="column-title">Network</th>
|
||||
<th class="column-title">Toll Free</th>
|
||||
<th class="column-title">Status</th>
|
||||
<th class="column-title">Remarks</th>
|
||||
<th class="column-title">Launch Date</th>
|
||||
<th class="column-title">Expiry Date</th>
|
||||
<th class="column-title no-link last"><span class="nobr">Action</span>
|
||||
</th>
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
<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="last col-md-1" style="width: 100px;">
|
||||
<span>
|
||||
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
<th class="column-title">Network/Country</th>
|
||||
<th class="column-title">Toll Free</th>
|
||||
<th class="column-title">Status</th>
|
||||
<th class="column-title">Remarks</th>
|
||||
<!-- <th class="column-title">Remarks</th> -->
|
||||
<th class="column-title">Launch Date</th>
|
||||
<th class="column-title">Expiry Date</th>
|
||||
<th class="column-title no-link last"><span class="nobr">Action</span>
|
||||
</th>
|
||||
|
||||
@@ -31,6 +32,7 @@
|
||||
<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="last col-md-1" style="width: 100px;">
|
||||
<span>
|
||||
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>
|
||||
|
||||
@@ -10,6 +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 no-link last"><span class="nobr">Action</span>
|
||||
</th>
|
||||
|
||||
@@ -28,8 +29,8 @@
|
||||
<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->exipiry_date)) }}</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>
|
||||
|
||||
Reference in New Issue
Block a user