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

bug fixes on activity log and array_key_first alt using reset

Browse Source
This commit is contained in:
Kwesi Banson
2024-02-16 19:46:38 +00:00
parent d4ab479e0c
commit 7b3a29ca53
25 changed files with 579 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/client/index-tabulator.blade.php
View File

@@ -108,7 +108,8 @@
field: "accountMgr",
sorter: "string",
},
{ title:"Progress",
/*
{ title:"Onboarding Progress Score",
field:"progress_indicator_score",
sorter:"number",
hozAlign:"left",
@@ -116,6 +117,11 @@
width:200,
editable:true
},
*/
{ title:"Onboarding %",
field:"progress_indicator_score",
sorter:"number",
},
{
title: "Status",
field: "status",

74
resources/views/client/onboarding_show.blade.php
View File

@@ -29,42 +29,36 @@
<div class="x_content">
<br>
<div class="row">
<div class="col-md-12">
<h4>Agreement Stage</h4>
<div>
<div class="form-group" >
<div class=" {{ $errors->has('progress_indicators') ? 'has-error' : ''}}">
<label class="" for="payment_mode">Checklist Items</label>
{!! Form::select('progress_indicators[]', $progress_indicators, $current_progress_indicators, ['class' => 'form-control' , 'id' => 'progressIndicators', 'multiple' => 'true']) !!}
{!! $errors->first('progress_indicators', '<p class="help-block">:message</p>') !!}
</div>
</div>
</div>
<h4>Interconnectional (Bilateral)</h4>
<div>
</div>
<h4>Tests Completed</h4>
<div>
</div>
<h4>Rate Card Sharing</h4>
<div>
</div>
<h4>Rates Uploaded</h4>
<div>
</div>
</div>
</div>
<div class="ln_solid"></div>
<div class="form-group">
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed" style="width: 100%;">
<thead>
<tr class="headings">
<th class="column-title">Stage</th>
<th class="column-title">Activity</th>
<th class="column-title">Status</th>
</tr>
</thead>
<tbody>
@if ($onboarding_stages->isEmpty())
<tr>
<td class="" colspan="6">No Records found</td>
</tr>
@else
@foreach ($onboarding_stages as $row)
<tr class="even pointer">
<td class="mes-td" >{{ $row->stage_id }}</td>
<td class="mes-td">{{ $row->name }}</td>
<td class="mes-td <?php echo ($row->status == 'COMPLETED') ? 'text-success' : 'text-danger'; ?>" >
{{ $row->status }}
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
{{-- end of x_content --}}
</div>
@@ -79,13 +73,7 @@
@section('javascript')
<script type="text/javascript">
$(function(){
$('select').select2();
// $('.typeServices').select2({}).select2('val', PRESELECTED_FRUITS);
$('.typeServices').select2({
tags : true
});
});
</script>
@endsection

15
resources/views/client/partials/progress_indicator_details.blade.php
View File

@@ -10,29 +10,28 @@
</div>
<div class="modal-body">
<div class="">
<?php if ($showclient->progress_indicators !== null): ?>
<?php if ($showclient->onboarding_progress_stage !== null): ?>
<ul class="to_do">
<?php $current_indicators = json_decode($showclient->progress_indicators, true); ?>
@foreach($progress_indicators as $indirow)
<?php $current_indicators = json_decode($showclient->onboarding_progress_stage, true); ?>
@foreach($current_indicators as $key => $value)
<?php
$arr_check = in_array($indirow, $current_indicators);
$theCheck = ($arr_check == true) ? "fa-check-circle green" : "fa-question red";
$theCheck = ($value == "COMPLETED") ? "fa-check-circle green" : "fa-question red";
?>
<li>
<p>
<span class="fa {{ $theCheck }}"></span>
{{ $indirow }}
{{ $key }}
</p>
</li>
@endforeach
</ul>
<?php else: ?>
@foreach($progress_indicators as $indirow)
@foreach($current_indicators as $indkey => $indival)
<ul class="to_do">
<li>
<p>
<span class="fa fa-question red"></span>
{{ $indirow }}
{{ $indkey }}
</p>
</li>
</ul>

45
resources/views/client/partials/shortcode-index.blade.php Normal file
View File

@@ -0,0 +1,45 @@
<div>
<div class="table-responsive">
<table class="table table-striped ">
<thead>
<tr class="headings">
{{-- <th>#</th> --}}
<th class="column-title">Name</th>
<th class="column-title">Code</th>
<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 no-link last"><span class="nobr">Action</span>
</th>
</tr>
</thead>
<tbody>
@if ($codes_data->isEmpty())
<tr>
<td class="" colspan="12">No Records found</td>
</tr>
@else
@foreach ($codes_data as $row)
<tr class="even pointer">
<td class="mes-td col-md-2">{{ $row->name }}</td>
<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">{{ strtoupper($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="last col-md-1" style="width: 100px;">
<span>
<a href="" class="btn btn-xs btn-primary"><i class="fa fa-edit"></i></a>
</span>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>

88
resources/views/client/shortcodes.blade copy.php Normal file
View File

@@ -0,0 +1,88 @@
@extends('layouts.master')
@section('page_title')
@if(isset($page_title))
{{ $page_title }}
@endif
@endsection
@section('content')
<div class="">
<div class="page-title">
<div class="title_left">
<div class="title_left">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li><a href="{!! url('clients') !!}">Clients</a></li>
<li class="active">Short Codes </li>
</ol>
</div>
</div>
<div class="title_right">
<div class="row">
<div class="col-sm-12">
<div class="pull-right">
</div>
</div>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="row">
@include('commons.notifications')
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2> Client Short Codes </h2>
<div class="pull-right">
<!-- <a class="btn btn-primary btn-sm" href="{!! url('clients/create') !!}"><i class="fa fa-plus-circle"></i> Add Client</a> -->
</div>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div class="col-md-12" style="border: 1px solid; min-height: 500px;">
<div class="" role="tabpanel" data-example-id="togglable-tabs">
<ul id="myTab" class="nav nav-tabs bar_tabs" role="tablist">
<!-- <li role="presentation" class="active"><a href="#tabCompany" id="company-tab" role="tab" data-toggle="tab" aria-expanded="true">Company</a></li> -->
<li role="presentation" class="active"><a href="#tabSmsShortCode" role="tab" id="smsshortcode-tab2" data-toggle="tab" aria-expanded="true">SMS Short Codes</a></li>
<li role="presentation" class=""><a href="#tabUssdShortCode" role="tab" id="ussdshortcode-tab2" data-toggle="tab" aria-expanded="false">USSD Short Codes</a></li>
<li role="presentation" class=""><a href="#tabVoiceShortCode" role="tab" id="voiceshortcode-tab2" data-toggle="tab" aria-expanded="false">Voice Short Codes</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<!-- <div role="tabpanel" class="tab-pane fade active in" id="tabCompany" aria-labelledby="company-tab"> -->
<div role="tabpanel" class="tab-pane fade active in" id="tabSmsShortCode" aria-labelledby="smsshortcode-tab">
<h4 class="lead"><strong>SMS Short Code </strong></h4>
@include('client.partials.client-sms-codes')
</div>
<div role="tabpanel" class="tab-pane fade" id="tabUssdShortCode" aria-labelledby="ussdshortcode-tab">
<h4 class="lead"><strong>USSD Short Codes </strong></h4>
@include('client.partials.client-ussd-codes')
</div>
<div role="tabpanel" class="tab-pane fade" id="tabVoiceShortCode" aria-labelledby="voiceshortcode-tab">
<h4 class="lead"><strong>Voice Short Code </strong></h4>
@include('client.partials.client-voice-codes')
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('javascript')
<script type="text/javascript">
$(document).ready(function(){
});
</script>
@endsection

33
resources/views/client/shortcodes.blade.php
View File

@@ -13,7 +13,7 @@
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li><a href="{!! url('clients') !!}">Clients</a></li>
<li class="active">Clients</li>
<li class="active">Short Codes </li>
</ol>
</div>
</div>
@@ -44,29 +44,16 @@
<div class="x_content">
<div class="col-md-12" style="border: 1px solid; min-height: 500px;">
<div class="" role="tabpanel" data-example-id="togglable-tabs">
<ul id="myTab" class="nav nav-tabs bar_tabs" role="tablist">
<!-- <li role="presentation" class="active"><a href="#tabCompany" id="company-tab" role="tab" data-toggle="tab" aria-expanded="true">Company</a></li> -->
<li role="presentation" class="active"><a href="#tabSmsShortCode" role="tab" id="smsshortcode-tab2" data-toggle="tab" aria-expanded="true">SMS Short Codes</a></li>
<li role="presentation" class=""><a href="#tabUssdShortCode" role="tab" id="ussdshortcode-tab2" data-toggle="tab" aria-expanded="false">USSD Short Codes</a></li>
<li role="presentation" class=""><a href="#tabVoiceShortCode" role="tab" id="voiceshortcode-tab2" data-toggle="tab" aria-expanded="false">Voice Short Codes</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<!-- <div role="tabpanel" class="tab-pane fade active in" id="tabCompany" aria-labelledby="company-tab"> -->
<div role="tabpanel" class="tab-pane fade active in" id="tabSmsShortCode" aria-labelledby="smsshortcode-tab">
<h4 class="lead"><strong>SMS Short Code </strong></h4>
@include('client.partials.client-sms-codes')
<div role="tabpanel" class="tab-pane fade active in" id="tabSmsShortCode" aria-labelledby="smsshortcode-tab">
<h4 class="lead"><strong>
@if($type == 'voice')
{{ ucfirst($type) }} Short Code
@else
{{ strtoupper($type) }} Short Code
@endif
</strong></h4>
@include('client.partials.shortcode-index')
</div>
<div role="tabpanel" class="tab-pane fade" id="tabUssdShortCode" aria-labelledby="ussdshortcode-tab">
<h4 class="lead"><strong>USSD Short Codes </strong></h4>
@include('client.partials.client-ussd-codes')
</div>
<div role="tabpanel" class="tab-pane fade" id="tabVoiceShortCode" aria-labelledby="voiceshortcode-tab">
<h4 class="lead"><strong>Voice Short Code </strong></h4>
@include('client.partials.client-voice-codes')
</div>
</div>
</div>
</div>
</div>
</div>

1
resources/views/client/show.blade.php
View File

@@ -14,6 +14,7 @@
@include('client.partials.finance')
@include('client.partials.create-shortcodes')
@include('client.partials.edit-finance')
@include('client.partials.progress_indicator_details')
<?php ?>
<div class="">
<div class="page-title">

180
resources/views/finance/dashboard.blade.php Normal file
View File

@@ -0,0 +1,180 @@
@extends('layouts.master')
@section('css')
@endsection
@section('content')
<!-- top tiles -->
<div class="row tile_count">
<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>
<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>
<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>
<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>
<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>
<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>
<div class="count">7,325</div>
</div>
</div>
<!-- /top tiles -->
<div class="row">
<div class="col-md-4 col-sm-4 col-xs-12">
<div class="x_panel tile fixed_height_320">
<div class="x_title">
<h2>Invoice Tracker (Short Codes) </h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div class="table">
<table class="table table-striped table-condensed">
<thead>
<tr class="headings">
<th class="column-title">Invoice </th>
<th class="column-title">Invoice Date </th>
<th class="column-title">Order </th>
<th class="column-title">Amount </th>
</th>
</tr>
</thead>
<tbody>
<tr class="odd pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
<tr class="even pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
</body>
</table>
</div>
</div>
</div>
</div>
<div class="col-md-4 col-sm-4 col-xs-12">
<div class="x_panel tile fixed_height_320 overflow_hidden">
<div class="x_title">
<h2>SMS A2P Clients</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div class="table">
<table class="table table-striped table-condensed">
<thead>
<tr class="headings">
<th class="column-title">Invoice </th>
<th class="column-title">Invoice Date </th>
<th class="column-title">Order </th>
<th class="column-title">Amount </th>
</th>
</tr>
</thead>
<tbody>
<tr class="odd pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
<tr class="even pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
</body>
</table>
</div>
</div>
</div>
</div>
<div class="col-md-4 col-sm-4 col-xs-12">
<div class="x_panel tile fixed_height_320">
<div class="x_title">
<h2>Invoice Tracker (VAS) </h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
<div class="table">
<table class="table table-striped table-condensed">
<thead>
<tr class="headings">
<th class="column-title">Invoice </th>
<th class="column-title">Invoice Date </th>
<th class="column-title">Order </th>
<th class="column-title">Amount </th>
</th>
</tr>
</thead>
<tbody>
<tr class="odd pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
<tr class="even pointer">
<td class=" ">121000040</td>
<td class=" ">May 23, 2014 11:47:56 PM </td>
<td class=" ">121000210</td>
<td class=" ">Paid</td>
</tr>
</body>
</table>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('javascript')
<!-- DateJS -->
<!-- <script src="{{ url('public/assets/vendors/DateJS/build/date.js') }}"></script> -->
<script src="{{ url('public/assets/js/financedashboard.js') }}"></script>
@endsection

4
resources/views/layouts/partials/sidebar.blade.php
View File

@@ -32,7 +32,9 @@
</li> -->
<li><a><i class="fa fa-dot-circle-o"></i>Short Codes <span class="fa fa-chevron-down"></span></a>
<ul class="nav child_menu">
<li><a href="{!! url('clients/shortcodes') !!}">Short Codes</a></li>
<li><a href="{!! url('clients/shortcodes/sms') !!}">SMS</a></li>
<li><a href="{!! url('clients/shortcodes/ussd') !!}">USSD</a></li>
<li><a href="{!! url('clients/shortcodes/voice') !!}">Voice</a></li>
</ul>
</li>