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

CHANGE_VIEW_ALIGNMENT_FIX

Browse Source
This commit is contained in:
aadhavan valli 2024-09-06 17:24:09 +05:30
parent 6e2df9bcaa
commit 75e6d7653c
7 changed files with 1610 additions and 1514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/Supplier.php
View File

@ -244,6 +244,7 @@ class Supplier extends BaseController
$file2 = $this->request->getFile('Cert_GST'); $file2 = $this->request->getFile('Cert_GST');
$file3 = $this->request->getFile('Cert_BANK'); $file3 = $this->request->getFile('Cert_BANK');
$path = ROOTPATH.'public/uploads/images/'; $path = ROOTPATH.'public/uploads/images/';
if($PAN){ $supplier['PAN'] = $PAN;} if($PAN){ $supplier['PAN'] = $PAN;}
if($GSTNo){ $supplier['GSTNO'] = $GSTNo;} if($GSTNo){ $supplier['GSTNO'] = $GSTNo;}
if ($file2 && $file2->isValid() && !$file2->hasMoved()) { if ($file2 && $file2->isValid() && !$file2->hasMoved()) {

6
app/Views/companyview.php
View File

@ -769,7 +769,7 @@ if (!empty($filenames)) {
url: "<?php echo base_url() ?>companycontroller/deletefile", url: "<?php echo base_url() ?>companycontroller/deletefile",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);
location.reload(); location.reload();
@ -940,7 +940,7 @@ if (!empty($filenames)) {
//if(bankname != '' || ifsccode != '' || bankaddress != '' ) //if(bankname != '' || ifsccode != '' || bankaddress != '' )
//{ //{
$('#content').loader('show'); // $('#content').loader('show');
$.ajax({ $.ajax({
data: { data: {
@ -951,7 +951,7 @@ if (!empty($filenames)) {
success: function(data) { success: function(data) {
$('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);

686
app/Views/dashboard.php
View File

File diff suppressed because it is too large Load Diff

4
app/Views/editSupplier.php
View File

@ -313,6 +313,10 @@ if (!empty($supplier)) {
<!-- Supplier Information --> <!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row" style="margin-bottom:10px;"> <div class="form-row" style="margin-bottom:10px;">
<div class="col-md-2">
<label class="col-form-label" for="SupplierID">Supplier ID<span class="badge">*</span></label>
<input type="text" name="SupplierID" id="SupplierID" class="form-control" readonly value="<?php echo $SupplierID; ?>">
</div>
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label> <label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label>
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>"> <input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>">

2
app/Views/employeeListing.php
View File

@ -183,7 +183,7 @@
], ],
pageLength: 10, // Default rows per page pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
responsive: true, // Responsive table // responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending) order: [], // Default ordering (column index 0, descending)
language: { language: {
paginate: { paginate: {

11
app/Views/expense_list.php
View File

@ -204,7 +204,7 @@
<label for="cost" class="col-form-label">Cost</label> <label for="cost" class="col-form-label">Cost</label>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<input type="number" name="cost" id="cost" class="form-control" onchange="totalCalculate()"> <input type="number" name="cost" id="cost" class="form-control" required onchange="totalCalculate()">
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
@ -323,7 +323,7 @@
var expenseId = $(this).data('id'); var expenseId = $(this).data('id');
var supplier_list = [<?php echo $supplier_list; ?>]; var supplier_list = [<?php echo $supplier_list; ?>];
$('#supplierid').empty(); // Clear the supplier dropdown $('#supplierid').empty(); // Clear the supplier dropdown
$('#supplierid').append('<option>Select Supplier</option>'); $('#supplierid').append('<option value="0">Select Supplier</option>');
supplier_list[0].forEach(function(supplier) { supplier_list[0].forEach(function(supplier) {
$('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>'); $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
}); });
@ -392,7 +392,7 @@
$('#payment_method').val(''); $('#payment_method').val('');
var supplier_list = [<?php echo $supplier_list; ?>]; var supplier_list = [<?php echo $supplier_list; ?>];
$('#supplierid').empty(); // Clear the supplier dropdown $('#supplierid').empty(); // Clear the supplier dropdown
$('#supplierid').append('<option>Select Supplier</option>'); $('#supplierid').append('<option value="0">Select Supplier</option>');
supplier_list[0].forEach(function(supplier) { supplier_list[0].forEach(function(supplier) {
$('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>'); $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
@ -405,8 +405,10 @@
$('#tempClick').on('click', function(e) { $('#tempClick').on('click', function(e) {
e.preventDefault(); e.preventDefault();
if ($('#supplierid').val() != 0) {
// Native HTML5 form validation // Native HTML5 form validation
if ($('#expenseForm')[0].checkValidity()) { if ($('#expenseForm')[0].checkValidity()) {
var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload
console.log(formActionUrl); console.log(formActionUrl);
@ -436,6 +438,9 @@
// If form is invalid, show native validation messages // If form is invalid, show native validation messages
$('#expenseForm')[0].reportValidity(); $('#expenseForm')[0].reportValidity();
} }
} else {
alert("Select Supplier");
}
}); });

2
app/Views/supplierListing.php
View File

@ -178,7 +178,7 @@
url: "<?php echo base_url() ?>deletesupplier", url: "<?php echo base_url() ?>deletesupplier",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);
location.reload(); location.reload();
} }