RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-05-17 12:34:23 +00:00
commit ab9f996948
5 changed files with 94 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Views/Report_HSNCreditNoteRegister.php
View File

@ -154,14 +154,16 @@
</thead> </thead>
<tbody> <tbody>
<?php if(!empty($hsnCreditNoteRegister)){ <?php
$totalQuantity = 0; $totalQuantity = 0;
$totalTaxableAmount = 0; $totalTaxableAmount = 0;
$totalCgst = 0; $totalCgst = 0;
$totalSgst = 0; $totalSgst = 0;
$totalIgst = 0; $totalIgst = 0;
$totalNetInvoiceAmount = 0; $totalNetInvoiceAmount = 0;
?> ?>
<?php if(!empty($hsnCreditNoteRegister)){ ?>
<?php foreach($hsnCreditNoteRegister as $index => $hcn) { <?php foreach($hsnCreditNoteRegister as $index => $hcn) {

18
app/Views/Report_HSNSalesRegister.php
View File

@ -151,16 +151,18 @@
</thead> </thead>
<tbody> <tbody>
<?php if(!empty($hsnSalesRegister)){ <?php
$totalQuantity = 0;
$totalTaxableAmount = 0;
$totalCgst = 0;
$totalSgst = 0;
$totalIgst = 0;
$totalNetInvoiceAmount = 0;
?>
$totalQuantity = 0; <?php ?>
$totalTaxableAmount = 0;
$totalCgst = 0;
$totalSgst = 0;
$totalIgst = 0;
$totalNetInvoiceAmount = 0;
?> <?php if(!empty($hsnSalesRegister)){ ?>
<?php foreach($hsnSalesRegister as $index => $hs) { <?php foreach($hsnSalesRegister as $index => $hs) {

18
app/Views/Report_HSNSummaryRegister.php
View File

@ -154,17 +154,17 @@
</thead> </thead>
<tbody> <tbody>
<?php if(!empty($hsnSummaryRegister)){ <?php
$totalQuantity = 0;
$totalQuantity = 0; $totalTaxableAmount = 0;
$totalTaxableAmount = 0; $totalCgst = 0;
$totalCgst = 0; $totalSgst = 0;
$totalSgst = 0; $totalIgst = 0;
$totalIgst = 0; $totalNetInvoiceAmount = 0;
$totalNetInvoiceAmount = 0;
?> ?>
<?php if(!empty($hsnSummaryRegister)){ ?>
<?php foreach($hsnSummaryRegister as $index => $hsm) { <?php foreach($hsnSummaryRegister as $index => $hsm) {
$totalQuantity += $hsm['quantity']; $totalQuantity += $hsm['quantity'];

30
app/Views/expense_list.php
View File

@ -191,7 +191,7 @@
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<button title="Edit" class="edit-button" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;"> <button title="Edit" class="edit-button edit-btn" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;">
<i class="fas fa-pencil-alt"></i> <i class="fas fa-pencil-alt"></i>
</button> </button>
</td> </td>
@ -646,3 +646,31 @@ dateInput.addEventListener('change', function () {
}); });
</script> </script>
<script>
$(document).ready(function () {
// Ensure DataTable is initialized
let table = $('#expense_list_table').DataTable();
console.log("DataTable initialized:", table ? "Yes" : "No");
// Store page number on edit button click
$('#expense_list_table').on('click', '.edit-btn', function () {
const pageInfo = table.page.info();
console.log("Edit clicked, current page info:", pageInfo);
sessionStorage.setItem("datatablePage", pageInfo.page);
});
// Restore page if saved
let startPage = sessionStorage.getItem("datatablePage");
if (startPage !== null) {
console.log("Restoring to page:", startPage);
table.page(parseInt(startPage)).draw('page');
sessionStorage.removeItem("datatablePage");
} else {
console.log("No page info found in sessionStorage.");
}
});
</script>

54
app/Views/stock/incomingSilicaSandDetails.php
View File

@ -716,7 +716,7 @@
<div class="modal-footer"> <div class="modal-footer">
<span style="min-width: 150px; max-width: 150px;"> <span style="min-width: 150px; max-width: 150px;">
<select class="form-control select2" name="remark" id="remarkInFormId" required> <select class="form-control " name="remark" id="remarkInFormId" required>
<option value="">Select</option> <option value="">Select</option>
<option value="noRemark">No Remark</option> <option value="noRemark">No Remark</option>
<option value="accepted">Accepted</option> <option value="accepted">Accepted</option>
@ -1219,6 +1219,7 @@
$('#dwnldReportCommentsId').text(reportComments); $('#dwnldReportCommentsId').text(reportComments);
$('#dwnldGradeId').text(gradeRange); $('#dwnldGradeId').text(gradeRange);
$('#dwnldTimeId').text(reportTime); $('#dwnldTimeId').text(reportTime);
$('#remarkInFormId').val(remark);
if (sandType.trim().toLowerCase() == "silica sand") { if (sandType.trim().toLowerCase() == "silica sand") {
@ -1843,6 +1844,11 @@
materialReceivedTd.text(formattedMaterialDate); materialReceivedTd.text(formattedMaterialDate);
} }
$(this).find('td select.grade-condition').each(function() {
let selectedValue = $(this).val();
$(this).closest('td').text(selectedValue);
});
invoiceTd.css("text-align", "left"); invoiceTd.css("text-align", "left");
materialReceivedTd.css("text-align", "left"); materialReceivedTd.css("text-align", "left");
}); });
@ -1945,27 +1951,36 @@
<!-- remark onchange --> <!-- remark onchange -->
<script> <script>
$('#remarkInFormId').change(function() {
let remark = $(this).val(); $(document).ready(function(){
$('#dwnldAcceptedId').text(""); $('#remarkInFormId').change(function() {
$('#dwnldAcceptedUnderDeviationId').text("");
$('#dwnldRejectedId').text("");
if (remark == "accepted") {
$('#dwnldAcceptedId').text("Yes");
} else if (remark == "conditionallyAccepted") {
$('#dwnldAcceptedUnderDeviationId').text("Yes");
} else if (remark == "rejected") {
$('#dwnldRejectedId').text("Yes");
}
//without saving current change , cannot download the pdf
$('#pdfGenerateId').css('display', 'none'); let remark = $(this).val();
$('#reportNotice').text("* Please save the changes to download");
$('#dwnldAcceptedId').text("");
$('#dwnldAcceptedUnderDeviationId').text("");
$('#dwnldRejectedId').text("");
if (remark == "accepted") {
$('#dwnldAcceptedId').text("Yes");
} else if (remark == "conditionallyAccepted") {
$('#dwnldAcceptedUnderDeviationId').text("Yes");
} else if (remark == "rejected") {
$('#dwnldRejectedId').text("Yes");
}
//without saving current change , cannot download the pdf
$('#pdfGenerateId').css('display', 'none');
$('#reportNotice').text("* Please save the changes to download");
})
}) })
</script> </script>
<!-- onchange of month submit will happen --> <!-- onchange of month submit will happen -->
@ -2036,12 +2051,7 @@
dropdownParent: $('#fullscreenDiv') dropdownParent: $('#fullscreenDiv')
}); });
// Initialize Select2 when the modal is shown inside full screen
$('#downloadLabReportModel,').on('shown.bs.modal', function () {
$('.select2').select2({
dropdownParent: $(this) // This ensures Select2 works in the modal
});
});
}); });