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

multiple bug fixes including sender ID filtering

Browse Source
This commit is contained in:
Kwesi Banson Jnr
2026-04-16 14:22:04 +00:00
parent 72180de8e4
commit 5dbe76dbd4
380 changed files with 175085 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
resources/views/daily_quotes/index.blade.php
View File

@@ -14,14 +14,14 @@
<div class="title_left">
<ol class="breadcrumb">
<li><a href="{!! url('dashboard') !!}">Dashboard</a></li>
<li class="active">Sender IDs</li>
<li class="active">Daily Quotess</li>
</ol>
</div>
</div>
<div class="title_right">
<div class="row">
<form method="GET" action="{!! url('senderids') !!}">
<form method="GET" action="{!! url('dailyquotes') !!}">
<div class="col-md-5 col-sm-5 col-xs-12 form-group">
<div style="margin-top:1px; margin-right:-90px;" class="top_search">
</div>
@@ -50,29 +50,19 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2> Sender IDs </h2>
<h2> Daily Quotess </h2>
<div class="pull-right">
<a class="btn btn-warning btn-sm" href="{!! url('senderids/upload') !!}"><i class="fa fa-cloud-upload"></i> Upload Sender IDs</a>
<a class="btn btn-primary btn-sm" href="{!! url('senderids/create') !!}"><i class="fa fa-plus-circle"></i> New Sender ID</a>
<a class="btn btn-success btn-sm" href="{!! url('senderids/exportall') !!}"><i class="fa fa-plus-circle"></i> Download All</a>
<a class="btn btn-warning btn-sm" href="{!! url('dailyquotes/upload') !!}"><i class="fa fa-cloud-upload"></i> Upload Daily Quotess</a>
<a class="btn btn-primary btn-sm" href="{!! url('dailyquotes/create') !!}"><i class="fa fa-plus-circle"></i> New Daily Quotes</a>
<a class="btn btn-success btn-sm" href="{!! url('dailyquotes/exportall') !!}"><i class="fa fa-plus-circle"></i> Download All</a>
</div>
<div class="clearfix"></div>
</div>
<div class="x_content">
@if(session('current_user.rejected_rows_filename') !== null)
<div class=" well" >
<?php $url = session('current_user.rejected_rows_filename');?>
<a href="{{ url('senderids/uploadreportdownload', $url) }}" class="btn btn-link">View Sender ID Bulk Upload Report</a>
</div>
@endif
<div class="x_content">
<div>
<!-- <button id="senderid-download-xlsx" class="btn btn-success btn-sm"><i class="fa fa-file-excel-o"></i> Download XLSX</button>
<button id="senderid-download-pdf" class="btn btn-danger btn-sm"><i class="fa fa-file-pdf-o"></i> Download PDF</button> -->
</div>
<div id="senderIdsTable"></div>
<div id="dailyQuotesTable"></div>
</div>
</div>
</div>
@@ -92,7 +82,7 @@
function link(cell, formatterParams){
var url = cell.getValue();
var rowID = cell.getData().id
return "<a href='"+ base_url + "/senderids/"+rowID+"/edit' class='btn btn-link'>"+url+"</a>";
return "<a href='"+ base_url + "/dailyquotes/"+rowID+"/edit' class='btn btn-link'>"+url+"</a>";
}
function cellDesign (cell, formatterParams){
var value = cell.getValue();
@@ -103,10 +93,10 @@
// if(value === 'Approved'){
// console.log(value !== null);
if (value !== null) {
if(value.includes('Approved')){
if(value.includes('inactive')){
return "<span style='color:#3FB449; font-weight:bold;'>" + value + "</span>";
}
else if(value.includes('Active')){
else if(value.includes('active')){
return "<span style='color:#3FB449; font-weight:bold;'>" + value + "</span>";
}
else{
@@ -114,8 +104,8 @@
}
}
}
var table = new Tabulator("#senderIdsTable", {
ajaxURL: "senderids/all",
var table = new Tabulator("#dailyQuotesTable", {
ajaxURL: "dailyquotes/all",
paginationSize: 15,
layout: "fitColumns",
pagination: "remote",
@@ -125,49 +115,34 @@
columns: [
{
title: "Sender ID",
field: "senderid",
title: "Quotes",
field: "quote",
sorter: "string",
formatter: cellDesign,
formatter:link,
// formatter: cellDesign,
// formatter:link,
},
{
title: "Direct MNO",
field: "direct_mno",
title: "Author",
field: "author",
sorter: "string",
},
{
title: "Network",
field: "mno_name",
sorter: "string",
},
{
title: "Supplier",
field: "supplier_name",
title: "Quote Date",
field: "quote_date",
sorter: "string",
},
{
title: "Status",
field: "status",
sorter: "string",
formatter: statusDesign,
},
},
{
title: "Remarks",
field: "remarks",
sorter: "string",
formatter: statusDesign,
},
{
title: "Created By",
field: "createdBy",
title: "Added By",
field: "addedBy",
sorter: "string",
},
// {
// title: "Last Modified By",
// field: "modifiedBy",
// sorter: "string",
// }
],
rowClick:function(e, row){
@@ -176,20 +151,20 @@
//$('#userEditModal').modal('show');
},
});
document.getElementById("senderid-download-xlsx").addEventListener("click", function(){
table.download("xlsx", "senderid-list.xlsx", {sheetName:"Sheet 1"});
document.getElementById("dailyquotes-download-xlsx").addEventListener("click", function(){
table.download("xlsx", "dailyquotes-list.xlsx", {sheetName:"Sheet 1"});
});
//trigger download of data.pdf file
document.getElementById("senderid-download-pdf").addEventListener("click", function(){
document.getElementById("dailyquotes-download-pdf").addEventListener("click", function(){
table.download("pdf", "client-list.pdf", {
orientation:"portrait", //set page orientation to portrait
title:"Click Mobile - Sender ID", //add title to report
title:"Click Mobile - Daily Quotes", //add title to report
});
});
$('#keywordField').on('keyup', function(){
console.log('up');
var keyword = $(this).val();
table.setData("senderids/all?keyword=" + keyword);
table.setData("dailyquotes/all?keyword=" + keyword);
});