vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_INVOICE_ORDER_IN_REPORTS

Browse Source
This commit is contained in:
Srinivas-Saravanan 2025-03-07 16:02:22 +05:30
parent b61e133a6d
commit a85a43f69c
6 changed files with 848 additions and 834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1270
app/Models/InvoiceModel.php
View File

File diff suppressed because it is too large Load Diff

294
app/Views/notify_the_expiry_subscribers.php
View File

@ -5,202 +5,208 @@
<h4 class="header-title mb-3"><?= $page_name; ?></h4> <h4 class="header-title mb-3"><?= $page_name; ?></h4>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<input type="number" class="form-control" id="params" name="params" placeholder="Number of Days" required /> <input type="number" class="form-control" id="params" name="params" placeholder="Number of Days" required />
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<button type="button" id="callajax" class="btn btn-primary" onclick="sendsms()">Send Message</button> <button type="button" id="callajax" class="btn btn-primary" onclick="sendsms()">Send Message</button>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input id = 'date_picker' class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" /> <input id='date_picker' class="form-control input-daterange-datepicker" type="text" name="date" value="<?php echo $selected_data; ?>" />
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<button type="submit" class="btn btn-primary" onclick="generateData()">Generate Report</button> <button type="submit" class="btn btn-primary" onclick="generateData()">Generate Report</button>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<br> <br>
<div class="col-md-12" style="margin: 15px;" id="target-div"></div> <div class="col-md-12" style="margin: 15px;" id="target-div"></div>
</div> </div>
<div id="modal_table"> <div id="modal_table">
<div class="table-responsive"> <div class="table-responsive">
<table id="datatable-buttons" class="table table-striped nowrap w-100"> <table id="datatable-buttons" class="table table-striped nowrap w-100">
<thead> <thead>
<tr> <tr>
<!-- <th hidden>id</th> --> <!-- <th hidden>id</th> -->
<th>Customer Name</th> <th>Customer Name</th>
<th>Sent Date</th> <th>Sent Date</th>
<th>Membership ID</th> <th>Membership ID</th>
<th>Email/Mobile</th> <th>Email/Mobile</th>
<th>Mode</th> <th>Mode</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
</thead> </thead>
<tbody id="table-body"> <tbody id="table-body">
</tbody> </tbody>
</table> </table>
</div></div></div></div> <!-- end card body--> </div>
</div> <!-- end card --> </div>
</div><!-- end col--><!-- end row--> </div>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col--><!-- end row-->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#modal_table').hide(); $('#modal_table').hide();
$('#datatable-buttons').DataTable({ $('#datatable-buttons').DataTable({
"dom": 'frtip', "dom": 'frtip',
"ordering": false, "ordering": false,
"paging": true, "paging": true,
"searching": true, "searching": true,
"autoWidth":true "autoWidth": true
}); });
var $select_data = '<?php echo $selected_data; ?>'; var $select_data = '<?php echo $selected_data; ?>';
var dateRangeFilter = $('input.input-daterange-datepicker').daterangepicker({ var dateRangeFilter = $('input.input-daterange-datepicker').daterangepicker({
locale: { locale: {
format: 'DD/MM/YYYY', format: 'DD/MM/YYYY',
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
startDate: $select_data ? moment($select_data.split(' - ')[0], 'DD/MM/YYYY') : moment(), startDate: $select_data ? moment($select_data.split(' - ')[0], 'DD/MM/YYYY') : moment(),
endDate: $select_data ? moment($select_data.split(' - ')[1], 'DD/MM/YYYY') : moment(), endDate: $select_data ? moment($select_data.split(' - ')[1], 'DD/MM/YYYY') : moment(),
ranges: { ranges: {
'Today': [moment(), moment()], 'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'This Month': [moment().startOf('month'), moment().endOf('month')] 'This Month': [moment().startOf('month'), moment().endOf('month')]
} }
}) })
.on('apply.daterangepicker', function(ev, picker) { .on('apply.daterangepicker', function(ev, picker) {
console.log(`Selected: ${picker.startDate.format('DD/MM/YYYY')} - ${picker.endDate.format('DD/MM/YYYY')}`); console.log(`Selected: ${picker.startDate.format('DD/MM/YYYY')} - ${picker.endDate.format('DD/MM/YYYY')}`);
}) })
.on('cancel.daterangepicker', function() { .on('cancel.daterangepicker', function() {
$(this).val(''); $(this).val('');
});
}); });
});
</script> </script>
<script> <script>
function sendsms() {
function sendsms(){
var params = $("#params").val(); var params = $("#params").val();
var params2 = $("#date_picker").val(); var params2 = $("#date_picker").val();
console.log("The param passed is "+params2); console.log("The param passed is " + params2);
if(params2){ if (params2) {
var dates = params2.split(" - "); var dates = params2.split(" - ");
var from_date = dates[0]; var from_date = dates[0];
var to_date = dates[1]; var to_date = dates[1];
} }
if (!params && !(params2)) { if (!params && !(params2)) {
alert("Enter a valid number of days."); alert("Enter a valid number of days.");
return; return;
}else{ } else {
console.log("param 1 is "+params); console.log("param 1 is " + params);
console.log("params 2 is "+ params2); console.log("params 2 is " + params2);
console.log('<?= base_url() . 'getExpCustomerDetail/' ?>'); console.log('<?= base_url() . 'getExpCustomerDetail/' ?>');
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: `<?= base_url() . 'getExpCustomerDetail/' ?>${params}/${params2}`, url: `<?= base_url() . 'getExpCustomerDetail/' ?>${params}/${params2}`,
data: { data: {
from_date : from_date, from_date: from_date,
to_date : to_date, to_date: to_date,
params : params params: params
}, },
success: function(response) { success: function(response) {
$('#target-div').html(response); // Insert raw HTML into the target div $('#target-div').html(response); // Insert raw HTML into the target div
$("#params").val(''); $("#params").val('');
console.log(response); console.log(response);
}, },
error: function(xhr, status, error) { error: function(xhr, status, error) {
console.error("AJAX Error:", error); console.error("AJAX Error:", error);
$('#target-div').html(""); $('#target-div').html("");
$("#params").val(''); $("#params").val('');
} }
}); });
} }
} }
function generateData(){ function generateData() {
var date = $("#date_picker").val(); var date = $("#date_picker").val();
console.log(date); console.log(date);
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: '<?= base_url('notify_the_expiry_subscribers') ?>', url: '<?= base_url('notify_the_expiry_subscribers') ?>',
data: { data: {
date: date date: date
}, },
success: function(response){ success: function(response) {
console.log(response); console.log(response);
var data = response.data; var data = response.data;
var table = $('#datatable-buttons').DataTable(); var table = $('#datatable-buttons').DataTable();
var tableBody = $('#table-body'); var tableBody = $('#table-body');
table.clear(); table.clear();
tableBody.empty(); tableBody.empty();
if (data && data.length > 0) { if (data && data.length > 0) {
data.forEach(function(item) { data.forEach(function(item) {
var sentTime = new Date(item.sent_time); var sentTime = new Date(item.sent_time);
var status = (item.receiving_status == 1) ? 'Success' : 'Fail'; var status = (item.receiving_status == 1) ? 'Success' : 'Fail';
var sentDateFormatted = ('0' + sentTime.getDate()).slice(-2) + '/' + var sentDateFormatted = ('0' + sentTime.getDate()).slice(-2) + '/' +
('0' + (sentTime.getMonth() + 1)).slice(-2) + '/' + ('0' + (sentTime.getMonth() + 1)).slice(-2) + '/' +
sentTime.getFullYear(); sentTime.getFullYear();
var sentTimeFormatted = ('0' + sentTime.getHours()).slice(-2) + ':' + var hours = sentTime.getHours();
('0' + sentTime.getMinutes()).slice(-2) + ':' + var minutes = ('0' + sentTime.getMinutes()).slice(-2);
('0' + sentTime.getSeconds()).slice(-2); var ampm = hours >= 12 ? 'PM' : 'AM';
var sentDateTimeFormatted = sentDateFormatted + ' ' + sentTimeFormatted; // Combine date and time hours = hours % 12 || 12; // Convert 0 (midnight) and 12 (noon) properly
table.row.add([
item.first_name + ' ' + item.last_name,
sentDateTimeFormatted,
item.membership_id,
item.receiving_entity,
item.mode,
status
]);
});
table.draw();
regenerateFilters(table);
$('#modal_table').show();
// table.draw();
} else {
tableBody.append('<tr><td colspan="6" class="text-center">No data available</td></tr>');
table.draw();
$('#modal_table').show();
}
},
error: function(xhr, status, error){
console.error("Ajax Error: ", error);
}
});
}
function regenerateFilters(table) {
$('#datatable-buttons thead tr:eq(1)').remove();
$('#datatable-buttons thead tr').clone(true).appendTo('#datatable-buttons thead');
$('#datatable-buttons thead tr:eq(1) th').each(function(i) { var sentTimeFormatted = ('0' + hours).slice(-2) + ':' + minutes + ' ' + ampm;
var title = $(this).text(); var sentDateTimeFormatted = sentDateFormatted + ' ' + sentTimeFormatted; // Combine date and time
var column = table.column(i);
var uniqueValues = column.data().unique().sort(); var sentDateTimeFormatted = sentDateFormatted + ' ' + sentTimeFormatted; // Combine date and time
table.row.add([
item.first_name + ' ' + item.last_name,
sentDateTimeFormatted,
item.membership_id,
item.receiving_entity,
item.mode,
status
]);
var select = $('<select class="form-control form-control-sm"><option value="">Search ' + title + '</option></select>') });
.appendTo($(this).empty())
.on('change', function() {
var val = $.fn.dataTable.util.escapeRegex($(this).val());
column
.search(val ? '^' + val + '$' : '', true, false)
.draw();
});
uniqueValues.each(function(d) { table.draw();
if (d) { regenerateFilters(table);
select.append('<option value="' + d + '">' + d + '</option>'); $('#modal_table').show();
// table.draw();
} else {
tableBody.append('<tr><td colspan="6" class="text-center">No data available</td></tr>');
table.draw();
$('#modal_table').show();
}
},
error: function(xhr, status, error) {
console.error("Ajax Error: ", error);
} }
}); });
}); }
}
function regenerateFilters(table) {
</script> $('#datatable-buttons thead tr:eq(1)').remove();
$('#datatable-buttons thead tr').clone(true).appendTo('#datatable-buttons thead');
$('#datatable-buttons thead tr:eq(1) th').each(function(i) {
var title = $(this).text();
var column = table.column(i);
var uniqueValues = column.data().unique().sort();
var select = $('<select class="form-control form-control-sm"><option value="">Search ' + title + '</option></select>')
.appendTo($(this).empty())
.on('change', function() {
var val = $.fn.dataTable.util.escapeRegex($(this).val());
column
.search(val ? '^' + val + '$' : '', true, false)
.draw();
});
uniqueValues.each(function(d) {
if (d) {
select.append('<option value="' + d + '">' + d + '</option>');
}
});
});
}
</script>

16
app/Views/payment_status_table.php
View File

@ -6,20 +6,20 @@
<th><b>SCHEME Name</b></th> <th><b>SCHEME Name</b></th>
<th>Date/Time</th> <th>Date/Time</th>
<th><b>ORDER ID</b></th> <th><b>ORDER ID</b></th>
<th>Payment Status</th> <th style="text-align: left;">Payment Status</th>
<th><b>Amount</b></th> <th><b>Amount</b></th>
</tr> </tr>
</thead> </thead>
<tbody class="custom-tbody"> <tbody class="custom-tbody">
<?php foreach ($payment_status_data as $row) { ?> <?php foreach ($payment_status_data as $row) { ?>
<tr> <tr>
<td><?= isset($row['customer_name'])?$row['customer_name']:"-"?></td> <td style="text-align: left;"><?= isset($row['customer_name'])?$row['customer_name']:"-"?></td>
<td><?= isset($row['membership_id'])?$row['membership_id']:"-"?></td> <td style="text-align: left;"><?= isset($row['membership_id'])?$row['membership_id']:"-"?></td>
<td><?= isset($row['scheme_name'])?$row['scheme_name']:"-"?></td> <td style="text-align: left;"><?= isset($row['scheme_name'])?$row['scheme_name']:"-"?></td>
<td><?= isset($row['created_at'])? date("d/m/Y H:i:s", strtotime($row['created_at'])) : '-' ?></td> <td style="text-align: left;"><?= isset($row['created_at']) ? date("d/m/Y h:i A", strtotime($row['created_at'])) : '-' ?></td>
<td><?= isset($row['order_id'])?$row['order_id']:"-"?></td> <td style="text-align: left;"><?= isset($row['order_id'])?$row['order_id']:"-"?></td>
<td><?= isset($row['payment_status'])?$row['payment_status']:"-" ?></td> <td style="text-align: left;"><?= isset($row['payment_status'])?$row['payment_status']:"-" ?></td>
<td><?= isset($row['amount'])?$row['amount']:"-"?></td> <td style="text-align: right;"><?= isset($row['amount'])?$row['amount']:"-"?></td>
</tr> </tr>
<?php } ?> <?php } ?>
</tbody> </tbody>

2
app/Views/received_payments_report.php
View File

@ -156,7 +156,7 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
var table = $('#datatable-buttons').DataTable({ var table = $('#datatable-buttons').DataTable({
"order": [[1, 'desc']], "order": [[0, 'desc']],
dom: '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip', dom: '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip',
buttons: [ buttons: [
{ {

2
app/Views/report_general_invoice.php
View File

@ -149,7 +149,7 @@
var table = $('#datatable-buttons').DataTable({ var table = $('#datatable-buttons').DataTable({
"order": [ "order": [
[1, 'desc'] // [0, 'desc']
], ],
"dom": '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip', "dom": '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip',
buttons: [{ buttons: [{

98
app/Views/report_userwise_and_eventwise.php
View File

@ -38,7 +38,7 @@
<th>Event Name</th> <th>Event Name</th>
<th>User Name</th> <th>User Name</th>
<th>Books Sold</th> <th>Books Sold</th>
<th>Payment Method</th> <!-- <th>Payment Method</th> -->
<th>Total Amount</th> <th>Total Amount</th>
</tr> </tr>
</thead> </thead>
@ -46,13 +46,15 @@
<?php foreach ($report_data as $row) { ?> <?php foreach ($report_data as $row) { ?>
<tr> <tr>
<td hidden><?php echo $row["user_id"]; ?></td> <td hidden><?php echo $row["user_id"]; ?></td>
<?php $unixTime = strtotime($row['invoice_date']); <?php
$invoice_date = date("d/m/Y", $unixTime);?> // Since invoice_date is now a proper date, we can format it directly
$invoice_date = date("d/m/Y", strtotime($row['invoice_date']));
?>
<td><?= $invoice_date ?></td> <td><?= $invoice_date ?></td>
<td style="text-align: left;"><?= $row['event_name'] ?></td> <td style="text-align: left;"><?= $row['event_name'] ?></td>
<td style="text-align: left;"><?= $row['first_name'].' ('.$row['role'].')'?></td> <td style="text-align: left;"><?= $row['first_name'] . ' (' . $row['role'] . ')' ?></td>
<td style="text-align: center;"><?= $row['books_sold'] ?></td> <td style="text-align: center;"><?= $row['books_sold'] ?></td>
<td style="text-align: left;"><?= strtoupper($row['payment_method'])?></td> <!-- <td style="text-align: left;"><?= strtoupper($row['payment_method']) ?></td> -->
<td style="text-align:right;padding-right: 67px;"><?= $row['total_amount'] ?></td> <td style="text-align:right;padding-right: 67px;"><?= $row['total_amount'] ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
@ -67,22 +69,22 @@
<!-- end row--> <!-- end row-->
<script> <script>
$(document).ready(function () { $(document).ready(function() {
var table = $('#datatable-buttons').DataTable({ var table = $('#datatable-buttons').DataTable({
"order": [[0, 'desc']], ordering: false,
// "order": [[0, 'desc']],
// "order": [[0, 'desc']], // "order": [[0, 'desc']],
"dom": '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip', "dom": '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip',
buttons: [ buttons: [{
{
extend: 'print', extend: 'print',
title: '<?= $page_name.' ' .$selected_data ?>', title: '<?= $page_name . ' ' . $selected_data ?>',
text: 'Print', text: 'Print',
customize: function (win) { } customize: function(win) {}
}, },
{ {
extend: 'csv', extend: 'csv',
text: 'CSV', text: 'CSV',
title: '<?= $page_name.' ' .$selected_data ?>', title: '<?= $page_name . ' ' . $selected_data ?>',
exportOptions: {} exportOptions: {}
} }
] ]
@ -111,44 +113,44 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
var $select_data = '<?php echo $selected_data; ?>'; var $select_data = '<?php echo $selected_data; ?>';
var dateRangeFilter = $('input.input-daterange-datepicker') var dateRangeFilter = $('input.input-daterange-datepicker')
.daterangepicker({ .daterangepicker({
locale: { locale: {
format: 'DD/MM/YYYY', format: 'DD/MM/YYYY',
cancelLabel: 'Clear' cancelLabel: 'Clear'
}, },
startDate: $select_data ? moment($select_data.split(' - ')[0], 'DD/MM/YYYY') : moment(), startDate: $select_data ? moment($select_data.split(' - ')[0], 'DD/MM/YYYY') : moment(),
endDate: $select_data ? moment($select_data.split(' - ')[1], 'DD/MM/YYYY') : moment(), endDate: $select_data ? moment($select_data.split(' - ')[1], 'DD/MM/YYYY') : moment(),
ranges: { ranges: {
'Today': [moment(), moment()], 'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'This Month': [moment().startOf('month'), moment().endOf('month')] 'This Month': [moment().startOf('month'), moment().endOf('month')]
} }
}) })
.on('apply.daterangepicker', function(ev, picker) { .on('apply.daterangepicker', function(ev, picker) {
var formattedStartDate = picker.startDate.format('DD/MM/YYYY'); var formattedStartDate = picker.startDate.format('DD/MM/YYYY');
var formattedEndDate = picker.endDate.format('DD/MM/YYYY'); var formattedEndDate = picker.endDate.format('DD/MM/YYYY');
var selectedDateRange = formattedStartDate + ' - ' + formattedEndDate; var selectedDateRange = formattedStartDate + ' - ' + formattedEndDate;
$(this).val(selectedDateRange); $(this).val(selectedDateRange);
}) })
.on('cancel.daterangepicker', function() { .on('cancel.daterangepicker', function() {
$(this).val(''); $(this).val('');
});
$('.today-btn').on('click', function() {
var today = moment();
dateRangeFilter.data('daterangepicker').setStartDate(today);
dateRangeFilter.data('daterangepicker').setEndDate(today);
dateRangeFilter.val(today.format('DD/MM/YYYY') + ' - ' + today.format('DD/MM/YYYY'));
dateRangeFilter.trigger('apply.daterangepicker');
}); });
// Trigger "Today" button click to set it as default if $select_data is empty $('.today-btn').on('click', function() {
if ($select_data === '') { var today = moment();
$('.today-btn').trigger('click'); dateRangeFilter.data('daterangepicker').setStartDate(today);
} dateRangeFilter.data('daterangepicker').setEndDate(today);
dateRangeFilter.val(today.format('DD/MM/YYYY') + ' - ' + today.format('DD/MM/YYYY'));
dateRangeFilter.trigger('apply.daterangepicker');
}); });
// Trigger "Today" button click to set it as default if $select_data is empty
if ($select_data === '') {
$('.today-btn').trigger('click');
}
});
</script> </script>