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

FIX_INVOICE FORM, FEAT_TOTAL IN REPORT

Browse Source
This commit is contained in:
Srinivas-Saravanan 2024-12-31 15:41:01 +05:30
parent 1c3e47b623
commit 9cbf6ac3fa
3 changed files with 355 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
app/Views/invoice_form.php
View File

@ -483,13 +483,13 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<span style="<?= $shippingChargesStyle ?>"> <span style="<?= $shippingChargesStyle ?>">
<label for="shippingChargesLabel">Charge Name </label> <label for="shippingChargesLabel">Charge Name </label>
<input type="text" class="form-control" id="shippingChargesLabel" name="shippingChargesLabel" placeholder="Shipping Charges Label" value="<?= isset($invoice_details['shipping_label']) ? $invoice_details['shipping_label'] : 'Shipping Charge' ?>" oninput="calculateOverallTotals()" <?= $shippingChargesHidden ?>> <input type="text" class="form-control" id="shippingChargesLabel" name="shippingChargesLabel" placeholder="Shipping Charges Label" value="<?= isset($invoice_details['shipping_label']) ? $invoice_details['shipping_label'] : 'Shipping Charge' ?>" <?= $shippingChargesHidden ?>>
</span> </span>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<span style="<?= $shippingChargesStyle ?>"> <span style="<?= $shippingChargesStyle ?>">
<label for="shippingCharges">Charge Amount </label> <label for="shippingCharges">Charge Amount </label>
<input type="number" class="form-control" id="shippingCharges" name="shippingCharges" placeholder="Charges Amount" value="<?= isset($invoice_details['shipping_charge']) ? $invoice_details['shipping_charge'] : 0 ?>" oninput="calculateOverallTotals()" <?= $shippingChargesHidden ?> step="0.001" > <input type="number" class="form-control" id="shippingCharges" name="shippingCharges" placeholder="Charges Amount" value="<?= isset($invoice_details['shipping_charge']) ? $invoice_details['shipping_charge'] : 0 ?>" oninput="if(this.value) calculateOverallTotals()" <?= $shippingChargesHidden ?> step="0.001" >
</span> </span>
</div> </div>
</div> </div>
@ -1197,7 +1197,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
// Calculate the total using the formula: subtotal - tax + shipping - discount // Calculate the total using the formula: subtotal - tax + shipping - discount
var total = overallAmount - overallTax + shippingCharges - overallDiscount; var total = overallAmount - overallTax + shippingCharges - overallDiscount;
console.log(total); // console.log(total);
// Update the subtotal, tax, shipping charges, discount, and total in the calculation card // Update the subtotal, tax, shipping charges, discount, and total in the calculation card
var subtotalElement = parseFloat(overallAmount.toFixed(2)); var subtotalElement = parseFloat(overallAmount.toFixed(2));
@ -2551,111 +2551,112 @@ $('#saveButton').click(function() {
function hideBillingShippingModel(params) { function hideBillingShippingModel(params) {
$('#editAddressesCheckbox').click(); $('#editAddressesCheckbox').click();
} }
// When discount is entered (keyup event)
$('#discount').keyup(function() {
$('#discount').keyup(function() { // Ensure the discount type is set (percentage or fixed amount)
if($('#discount-type').css('display') == 'none'){ if ($('#discount-type').css('display') == 'none') {
$('#discount-type').val('%'); $('#discount-type').val('%');
} }
$('#discount-type').show(); $('#discount-type').show();
$('#discount-type').attr('name', 'dis_type'); $('#discount-type').attr('name', 'dis_type');
// Clear individual item discount fields
$('.item-discount-amount').val(''); $('.item-discount-amount').val('');
var discountValue = $(this).val(); var discountValue = $(this).val();
var discountType = $('#discount-type').val(); var discountType = $('#discount-type').val();
var totalAmount = 0 ; // Calculate the total amount of items (subtotal)
var discountLastValue = 0; var totalAmount = 0;
$('.item-amount').each(function() { $('.item-amount').each(function() {
totalAmount += parseInt($(this).val()); totalAmount += parseFloat($(this).val()) || 0; // Ensure it's a number
}); });
// Apply the discount based on the discount type
var discountedAmount = 0;
if (discountType == '%') { if (discountType == '%') {
discountLastValue = totalAmount - (totalAmount * discountValue / 100 ); discountedAmount = totalAmount - (totalAmount * discountValue / 100);
}else{ } else {
discountLastValue = totalAmount - discountValue; discountedAmount = totalAmount - discountValue;
} }
var shippingCharges = $('#shippingCharges').val(); // Get the shipping charges and ensure it's a valid number
var shippingCharges = parseFloat($('#shippingCharges').val()) || 0;
if (isNaN(shippingCharges)) { // Final total after adding shipping charges
shippingCharges =0; var finalTotal = discountedAmount + shippingCharges;
}
discountLastValue += parseInt(shippingCharges);
$('#exacttotal').val(discountLastValue); // Update the fields with the calculated values
$('#grandtotal').val(parseInt(discountLastValue)); $('#subtotal').val(totalAmount.toFixed(2)); // Subtotal remains as the sum of item amounts
$('#balanceAmount').val(parseInt(discountLastValue)); $('#exacttotal').val(finalTotal.toFixed(2)); // Final total after discount and shipping
$('#grandtotal').val(finalTotal.toFixed(2)); // Grand total
$('#balanceAmount').val(finalTotal.toFixed(2)); // Balance amount (same as final total)
});
// var discountedPrice = calculateDiscountedPrice(discountValue);
// $('#discounted-price').text(discountedPrice);
});
function discountTypeKeyup(params) {
if($('#discount-type').css('display') == 'none'){
$('#discount-type').val('%');
}
$('#discount-type').show();
$('.item-discount-amount').val('');
var discountValue = $('#discount').val();
var discountType = $('#discount-type').val();
var totalAmount = 0 ;
var discountLastValue = 0;
$('.item-amount').each(function() {
totalAmount += parseInt($(this).val());
});
if (discountType == '%') {
discountLastValue = totalAmount - (totalAmount * discountValue / 100 );
}else{
discountLastValue = totalAmount - discountValue;
}
var shippingCharges = $('#shippingCharges').val();
if (isNaN(shippingCharges)) {
shippingCharges =0;
}
discountLastValue += parseInt(shippingCharges);
$('#exacttotal').val(discountLastValue );
$('#grandtotal').val(parseInt(discountLastValue));
$('#balanceAmount').val(parseInt(discountLastValue));
}
$('#discount-type').change(function () {
// When the discount type is changed (percentage or fixed)
$('#discount-type').change(function() {
var discountValue = $('#discount').val(); var discountValue = $('#discount').val();
var discountType = $(this).val(); var discountType = $(this).val();
var totalAmount = 0 ; // Calculate the total amount of items (subtotal)
var discountLastValue = 0; var totalAmount = 0;
$('.item-amount').each(function() { $('.item-amount').each(function() {
totalAmount += parseInt( $(this).val()); totalAmount += parseFloat($(this).val()) || 0; // Ensure it's a number
}); });
// Apply the discount based on the discount type
var discountedAmount = 0;
if (discountType == '%') { if (discountType == '%') {
discountLastValue = totalAmount - (totalAmount * discountValue / 100 ); discountedAmount = totalAmount - (totalAmount * discountValue / 100);
}else{ } else {
discountLastValue = totalAmount - discountValue; discountedAmount = totalAmount - discountValue;
} }
var shippingCharges = $('#shippingCharges').val(); // Get the shipping charges and ensure it's a valid number
if (isNaN(shippingCharges)) { var shippingCharges = parseFloat($('#shippingCharges').val()) || 0;
shippingCharges =0;
} // Final total after adding shipping charges
discountLastValue += parseInt(shippingCharges); var finalTotal = discountedAmount + shippingCharges;
// Update the fields with the calculated values
$('#subtotal').val(totalAmount.toFixed(2)); // Subtotal remains as the sum of item amounts
$('#exacttotal').val(finalTotal.toFixed(2)); // Final total after discount and shipping
$('#grandtotal').val(finalTotal.toFixed(2)); // Grand total
$('#balanceAmount').val(finalTotal.toFixed(2)); // Balance amount (same as final total)
});
// When shipping charge is updated
$('#shippingCharges').keyup(function() {
// Recalculate the final total with shipping charge
var shippingCharges = parseFloat($(this).val()) || 0;
// Recalculate the discount and apply shipping
var discountValue = $('#discount').val();
var discountType = $('#discount-type').val();
// Calculate the total amount of items (subtotal)
var totalAmount = 0;
$('.item-amount').each(function() {
totalAmount += parseFloat($(this).val()) || 0; // Ensure it's a number
});
// Apply the discount based on the discount type
var discountedAmount = 0;
if (discountType == '%') {
discountedAmount = totalAmount - (totalAmount * discountValue / 100);
} else {
discountedAmount = totalAmount - discountValue;
}
// Final total after adding shipping charges
var finalTotal = discountedAmount + shippingCharges;
// Update the fields with the recalculated values
$('#exacttotal').val(finalTotal.toFixed(2)); // Final total after discount and shipping
$('#grandtotal').val(finalTotal.toFixed(2)); // Grand total
$('#balanceAmount').val(finalTotal.toFixed(2)); // Balance amount (same as final total)
});
$('#exacttotal').val(discountLastValue);
$('#grandtotal').val(parseInt(discountLastValue));
$('#balanceAmount').val(parseInt(discountLastValue));
})
</script> </script>

99
app/Views/itemwise_report_with_payment_method.php
View File

@ -24,13 +24,13 @@
</div> </div>
</div> </div>
<!-- Table Section -->
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="table-responsive"> <div class="table-responsive">
<table style="width: 100;" id="datatable-buttons" class="table table-striped nowrap w-100"> <table style="width: 100%;" id="datatable-buttons" class="table table-striped nowrap w-100">
<thead> <thead>
<tr> <tr>
<th><b>Publisher Code</b></th> <th><b>Publisher Code</b></th>
@ -56,8 +56,13 @@
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<?php endforeach; ?> <?php endforeach; ?>
</tr>
</tbody> </tbody>
<tfoot>
<tr class="total-row">
<td colspan="6" style="text-align: right; font-weight: bold;">Total</td>
<td class="total" style="text-align: right;"></td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> <!-- end card body--> </div> <!-- end card body-->
@ -66,43 +71,64 @@
</div> </div>
<!-- end row--> <!-- end row-->
<script> <script>
$(document).ready(function() { $(document).ready(function () {
var table = $('#datatable-buttons').DataTable({ var table = $('#datatable-buttons').DataTable({
"order": [ dom: '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip',
[0, 'desc'] buttons: [
], {
"dom": '<"row mb-3"<"col-md-6 d-flex align-items-center"B><"col-md-6 d-flex justify-content-end"f>>rtip',
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) {
// Exclude the first and last columns var total = calculateTotal();
$(win.document.body).find('table').find('th:first-child, td:first-child').remove(); $(win.document.body)
.append(`<div style="text-align: right; font-weight: bold; margin-top: 20px;">Total Amount: ₹${total}</div>`);
} }
}, },
{ {
extend: 'csv', extend: 'csv',
text: 'CSV', text: 'CSV',
title: '<?= $page_name.' ' .$selected_data ?>', title: '<?= $page_name . " " . $selected_data ?>',
exportOptions: { customize: function (csv) {
columns: ':not(:first-child)' var total = calculateTotal();
var csvRows = csv.split("\n");
var columnCount = csvRows[0].split(",").length;
var emptyCells = Array(columnCount - 2).fill("").join(","); // Adjust the number of empty cells
var totalRow = `${emptyCells},Total,₹${total}`;
csvRows.push(totalRow);
return csvRows.join("\n");
} }
} }
],
columnDefs: [{
type: 'date',
targets: [1, 2, 3, 4, 5, 6],
orderable: false
}
// Specify the column index for date sorting and disable sorting
] ]
}); });
// Add date range filter and dropdowns // Function to calculate the total for print/CSV export
function calculateTotal() {
var total = table.rows({ filter: 'applied' }).data().pluck(6).reduce(function (a, b) {
return a + parseFloat(b) || 0; // Sum the 7th column (index 6) which represents the total cost
}, 0);
return total.toFixed(2);
}
// Add total row to the table footer (this will display the total in the table)
table.on('draw', function () {
updateTotal();
});
// Function to update the total in the footer
function updateTotal() {
var total = table.rows({ filter: 'applied' }).data().pluck(6).reduce(function (a, b) {
return a + parseFloat(b) || 0;
}, 0);
$('#datatable-buttons tfoot .total').html(`₹${total.toFixed(2)}`);
}
// Add date range filter and dropdowns for the table columns
$('#datatable-buttons thead tr').clone(true).appendTo('#datatable-buttons thead'); $('#datatable-buttons thead tr').clone(true).appendTo('#datatable-buttons thead');
$('#datatable-buttons thead tr:eq(1) th').each(function(i) { $('#datatable-buttons thead tr:eq(1) th').each(function(i) {
var title = $(this).text(); var title = $(this).text();
@ -122,27 +148,15 @@
select.append('<option value="' + d + '">' + d + '</option>'); select.append('<option value="' + d + '">' + d + '</option>');
}); });
// Handle column search using the input
$('input', this).on('keyup change', function() { $('input', this).on('keyup change', function() {
if (table.column(i).search() !== this.value) { if (table.column(i).search() !== this.value) {
table table.column(i).search(this.value).draw();
.column(i)
.search(this.value)
.draw();
} }
}); });
}); });
// Add date range filter for "Invoice Date" column // Date range picker initialization
moment.updateLocale('en', {
longDateFormat: {
L: 'DD/MM/YYYY',
// LTS: 'h:mm:ss A',
// LTS: 'h:mm A',
}
});
$(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')
@ -164,9 +178,11 @@
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);
table.draw(); // Redraw table when date range changes
}) })
.on('cancel.daterangepicker', function() { .on('cancel.daterangepicker', function() {
$(this).val(''); $(this).val('');
table.draw(); // Redraw table when date range is cleared
}); });
$('.today-btn').on('click', function() { $('.today-btn').on('click', function() {
@ -182,5 +198,4 @@
$('.today-btn').trigger('click'); $('.today-btn').trigger('click');
} }
}); });
});
</script> </script>

152
app/Views/received_payments_report.php
View File

@ -1,46 +1,45 @@
<style> <style>
.payment-button {
background-color: #f9f9f9;
color: #333;
border: 1px solid #ddd;
border-radius: 5px;
padding: 8px;
font-size: 0.9rem;
cursor: pointer;
text-align: center;
line-height: 1.3;
width: 100%;
height: 100%;
box-shadow: none;
}
.payment-button { .payment-button:hover {
background-color: #f9f9f9; /* Light background color matching the card */ background-color: #f0f0f0;
color: #333; /* Dark text for readability */ }
border: 1px solid #ddd; /* Subtle border for the button */
border-radius: 5px; /* Rounded corners */
padding: 8px; /* Inner padding for compactness */
font-size: 0.9rem; /* Font size for button text */
cursor: pointer; /* Pointer cursor on hover */
text-align: center; /* Center-align text */
line-height: 1.3; /* Adjust line height for multiline text */
width: 100%; /* Button fills card width */
height: 100%; /* Button fills card height */
box-shadow: none; /* Remove extra shadow for a flat look */
}
.payment-button:hover { .card-summary {
background-color: #f0f0f0; /* Slightly darker background on hover */ flex: 0 1 auto;
box-shadow: none; /* Keep flat design on hover */ text-align: center;
} border: none;
background-color: transparent;
.card-summary { width: 170px;
flex: 0 1 auto; /* Prevent layout disruptions */ height: 70px;
text-align: center; /* Center-align content */
border: none; /* No border for container */
background-color: transparent; /* Transparent container */
width: 170px; /* Card width */
height: 70px; /* Card height */
padding-left: 20px; padding-left: 20px;
} }
.nav { .nav {
display: flex; /* Keep existing layout */ display: flex;
flex-wrap: wrap; /* Allow wrapping */ flex-wrap: wrap;
gap: 10px; /* Spacing between cards */ gap: 10px;
list-style: none; /* Remove list style */ list-style: none;
padding: 5px; /* Padding for layout */ padding: 5px;
margin-bottom: 10px; /* Margin below */ margin-bottom: 10px;
} }
</style> </style>
<!-- start page title -->
<div class="row d-flex align-items-center"> <!-- start page title -->
<div class="row d-flex align-items-center">
<!-- Title Section --> <!-- Title Section -->
<div class="col-md-4"> <div class="col-md-4">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
@ -65,7 +64,6 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div> <div>
<ul class="nav"> <ul class="nav">
@ -103,8 +101,7 @@
</div> </div>
</li> </li>
<?php } ?> <?php } ?>
</ul> </ul>
</div> </div>
</div> </div>
@ -125,7 +122,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $total = 0; // Initialize total variable ?> <?php $total = 0; ?>
<?php foreach ($payment_data['result1'] as $row) { ?> <?php foreach ($payment_data['result1'] as $row) { ?>
<tr> <tr>
<td style="text-align: left;"><?php echo $row["invoice_number"]; ?></td> <td style="text-align: left;"><?php echo $row["invoice_number"]; ?></td>
@ -137,18 +134,11 @@
<td style="text-align: center;"><?= $row['payment_status'] ?></td> <td style="text-align: center;"><?= $row['payment_status'] ?></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>
<?php <?php
$total += $row['total_amount']; // Add each row's total_amount to $total $total += $row['total_amount'];
?> ?>
</tr> </tr>
<?php } ?> <?php } ?>
<!-- Total row -->
</tbody> </tbody>
<!-- <tr>
<td colspan="5" style="text-align: right; font-weight: bold;">Total Amount</td>
<td class="total-row" style="text-align: right;"></td>
</tr> -->
<?php //<?= isset($total) ? $total : "" ?>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="5" style="text-align: right; font-weight: bold;">Total Amount</td> <td colspan="5" style="text-align: right; font-weight: bold;">Total Amount</td>
@ -166,23 +156,40 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
var table = $('#datatable-buttons').DataTable({ var table = $('#datatable-buttons').DataTable({
"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) {
var total = calculateTotal();
$(win.document.body)
.append(`<div style="text-align: right; font-weight: bold; margin-top: 20px;">Total Amount: ₹${total}</div>`);
}
}, },
{ {
extend: 'csv', extend: 'csv',
text: 'CSV', text: 'CSV',
title: '<?= $page_name.' ' .$selected_data ?>', title: '<?= $page_name . " " . $selected_data ?>',
exportOptions: {} customize: function (csv) {
var total = calculateTotal();
var csvRows = csv.split("\n");
var columnCount = csvRows[0].split(",").length;
var emptyCells = Array(columnCount - 2).fill("").join(",");
var totalRow = `${emptyCells},Total,₹${total}`;
csvRows.push(totalRow);
return csvRows.join("\n");
}
} }
] ]
}); });
// Function to calculate the total of the filtered rows
function updateTotal() { function updateTotal() {
var total = table.rows({ filter: 'applied' }).data().pluck(5).reduce(function (a, b) { var total = table.rows({ filter: 'applied' }).data().pluck(5).reduce(function (a, b) {
return a + parseFloat(b) || 0; return a + parseFloat(b) || 0;
@ -191,9 +198,16 @@
$('#datatable-buttons tfoot .total-row').html(total.toFixed(2)); $('#datatable-buttons tfoot .total-row').html(total.toFixed(2));
} }
// Function to calculate the total for print/CSV export
function calculateTotal() {
var total = table.rows({ filter: 'applied' }).data().pluck(5).reduce(function (a, b) {
return a + parseFloat(b) || 0;
}, 0);
return total.toFixed(2);
}
$(document).on('click', '.payment-button', function () { $(document).on('click', '.payment-button', function () {
var paymentMethod = $(this).contents().first().text().trim().toUpperCase().split(" ").join(""); var paymentMethod = $(this).contents().first().text().trim().toUpperCase().split(" ").join("");
console.log(paymentMethod);
if (!paymentMethod) { if (!paymentMethod) {
return; return;
} }
@ -201,7 +215,7 @@
paymentMethod = 'Cash on delivery'; paymentMethod = 'Cash on delivery';
} }
table.column(3) table.column(3)
.search('^' + paymentMethod + '$', true, false) // Use regex for exact match .search('^' + paymentMethod + '$', true, false)
.draw(); .draw();
updateTotal(); updateTotal();
@ -211,28 +225,7 @@
}); });
</script> </script>
<script> <script>
// $(document).ready(function () {
// // Initially hide all nested tables
// $('.nested-table-data').hide();
// // Toggle nested table visibility on parent row click
// $('.custom-tbody tr').click(function () {
// var nestedTable = $(this).next().find('.nested-table-data');
// // Toggle visibility
// nestedTable.slideToggle();
// // You can add additional styling or animation here if needed
// // Prevent the parent row from triggering the toggle when nested table row is clicked
// return false;
// });
// });
// </script>
<script>
$(document).ready(function() { $(document).ready(function() {
var $select_data = '<?php echo $selected_data; ?>'; var $select_data = '<?php echo $selected_data; ?>';
@ -268,9 +261,8 @@
dateRangeFilter.trigger('apply.daterangepicker'); dateRangeFilter.trigger('apply.daterangepicker');
}); });
// Trigger "Today" button click to set it as default if $select_data is empty
if ($select_data === '') { if ($select_data === '') {
$('.today-btn').trigger('click'); $('.today-btn').trigger('click');
} }
}); });
</script> </script>