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

fixed bugs from tracker date -12/09/2024 employee module - vadivel J

Browse Source
This commit is contained in:
vadivelJ96 2024-09-13 18:22:54 +05:30
commit fa34516cfd
35 changed files with 3338 additions and 3357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Views/addRawMaterial.php
View File

@ -26,15 +26,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Material Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
@ -132,8 +130,7 @@
</div>
<?php
$listErrors = session()->getFlashdata('listErrors');
if($listErrors)
{
if ($listErrors) {
?>
<div class="row">
<div class="col-md-12">
@ -149,8 +146,7 @@
<?php
helper('form');
$error = session()->getFlashdata('error');
if($error)
{
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
@ -160,8 +156,7 @@
<?php
$success = session()->getFlashdata('success');
if($success)
{
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
@ -242,7 +237,9 @@
//alert(m.length+" "+m+" "+s+" "+s.length);
$('#content').loader('show');
$.ajax({
data: { id: material },
data: {
id: material
},
type: "POST",
url: "<?php echo base_url(); ?>materialExist",
success: function(data) {
@ -267,7 +264,8 @@
// alert("empty data");
}
},error: function() {
},
error: function() {
$('#content').loader('hide');
alert("Error Occur");
}

12
app/Views/addSupplier.php
View File

@ -38,15 +38,13 @@
<!-- form start -->
</div>
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Supplier Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
@ -266,7 +264,9 @@
$.ajax({
type: "POST",
url: "<?= base_url() . 'supplierExist' ?>",
data: { id: supplier },
data: {
id: supplier
},
success: function(data) {
var count = data.length;
if (count > 2) {

8
app/Views/addUser.php
View File

@ -3,15 +3,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title ">Add User Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">

8
app/Views/addasset.php
View File

@ -3,15 +3,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Asset Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">

8
app/Views/addconfig.php
View File

@ -11,15 +11,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Config Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div>
</div>
<?php
helper('form');

32
app/Views/adddepartment.php
View File

@ -2,9 +2,10 @@
.pad {
padding-bottom: 1%;
}
.badge
{
color:red; background-color:#fff;
.badge {
color: red;
background-color: #fff;
}
</style>
@ -13,15 +14,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Department Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>departmentListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>departmentListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
@ -45,10 +44,8 @@
<select class="form-control required" id="HeadDept" name="HeadDept">
<option value="-1" required>Select Department Code</option>
<?php
if(!empty($depcode))
{
foreach ($depcode as $DC)
{
if (!empty($depcode)) {
foreach ($depcode as $DC) {
?>
<option value="<?php echo $DC->DEPCode ?>"><?php echo $DC->DEPCode . " - " . $DC->DepartmentName ?></option>
<?php
@ -74,8 +71,7 @@
<?php
helper('form');
$error = session()->getFlashdata('error');
if($error)
{
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
@ -84,8 +80,7 @@
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if($success)
{
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
@ -95,7 +90,8 @@
<div class="row">
<div class="col-md-12">
<?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?> </div>
<?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>');
?> </div>
</div>
</div>
</div>
@ -111,7 +107,6 @@
</div>
<script>
// function blockKeyPress(evt)
// {
// var charCode = (evt.which) ? evt.which : evt.keyCode;
@ -154,5 +149,4 @@
// return false;
// return true;
// }
</script>

9
app/Views/addemppaydate.php
View File

@ -34,16 +34,15 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Create Loan</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-12">

16
app/Views/assetListing.php
View File

@ -42,16 +42,15 @@
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2">Asset Details</h4>
<h4 class="page-title">Asset Details</h4>
<a class="btn btn-success" style="color:#fff" href="<?php echo base_url(); ?>addasset">Add New Asset</a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-success" href="<?php echo base_url(); ?>addasset">Add New Asset</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportasset">Export Asset Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
<div class="row">
<div class="col-12">
@ -162,7 +161,10 @@ $(document).ready(function() {
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
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
order: [], // Default ordering (column index 0, descending)
language: {

2
app/Views/attendance.php
View File

@ -210,7 +210,7 @@ $currentday = date('d');
</div>
<div class="col-3">
<input type="submit" value="Change Month" class="btn btn-success"
title='click here for load attendance for specified month'>
title='click here for load attendance for specified month' style="margin-top:0px;">
</div>
</div>

137
app/Views/capitalpurchaseorder.php
View File

@ -827,17 +827,17 @@
<div class="modal-body p-4">
<form>
<div class="radio">
<div>
<label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
</div>
<div class="radio">
<div>
<label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<div class="modal-footer" style="border:none;">
<a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
@ -855,17 +855,17 @@
<div class="modal-body p-4">
<form>
<div class="radio">
<div>
<label><input type="radio" name="editoptPackaging" checked="checked" value='0' id="editoptPackaging"> Basic Amount</label>
</div>
<div class="radio">
<div>
<label><input type="radio" name="editoptPackaging" id="editoptPackaging" value='1'> After Discount Amount</label>
</div>
</form>
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
<div class="modal-footer" style="border:none;">
<a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
</div>
@ -884,7 +884,7 @@
<div class="form-row">
<div class="form-group col-md-3">
<div class="form-group col-md-2">
<label>Req No<span class="text-danger">*</span></label>
@ -901,7 +901,7 @@
?>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-2">
<label>Department Name</label>
<div>
<?php
@ -910,7 +910,7 @@
?>
</div>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-2">
<label>Cost Center Code</label>
<div>
<?php
@ -921,16 +921,14 @@
?>
</div>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-2">
<label>Avail Bud Amount <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'CapitalbudAmt', 'value' => set_value('CapitalbudAmt'), 'id' => 'CapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row" id="hideModalExchange">
<div class="form-group col-md-12">
<div class="form-group col-md-2" id="hideModalExchange">
<label> Exchange Rate</label>
<?php
$data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
@ -1000,6 +998,8 @@
<span id="CAPdiv" style="padding: 5px;">
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<label>Discount Type </label>
<div>
@ -1041,6 +1041,8 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<label>Freight Type </label>
<div>
@ -1174,7 +1176,7 @@
<div class="form-row" style="padding:1%;"></div>
<div class="form-row" id="ModalImportTaxHide">
<br />
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:10px;">
<div class="form-row">
<div class="form-group col-md-4">
Basic Price <?php echo "($INR)" ?>
@ -1279,7 +1281,7 @@
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:10px;">
<div class="form-row">
<div class="form-group col-md-4">
Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
@ -1332,6 +1334,7 @@
</div>
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3" id="TripsValueafterHide"></div>
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
@ -1390,7 +1393,7 @@
echo form_input($data);
?>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<div class="form-group col-md-4" style="margin-top: -3.1%">
<span>Quantity</span>
<?php
$data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
@ -1399,10 +1402,11 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
Custom Duty<?php echo " ($INR)/UOM" ?>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php
$data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
@ -1412,19 +1416,25 @@
</div>
<div class="form-row">
<div class="form-group col-md-4">
Clearing Charges <?php echo "($INR)" ?>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php
$data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
echo form_input($data);
?>
</div>
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1478,7 +1488,7 @@
<div class="modal-body p-4">
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<div class="form-group col-md-2">
<label>Req No<span class="text-danger">*</span></label>
<div>
@ -1520,7 +1530,7 @@
?>
</div>
</div>
<div class="form-group col-md-3"> <label>Avail Bud Amount</label>
<div class="form-group col-md-2"> <label>Avail Bud Amount</label>
<div> <?php $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?> </div>
</div>
@ -1600,10 +1610,11 @@
</div>
</div>
<div class="form-row">
<div style="padding:5px;" id="EDITCAPdiv">
<div class="form-row"> <!--<div class="form-group col-md-4">
</div>-->
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<label>Discount Type </label>
<div>
@ -1645,6 +1656,7 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3" id="TripsValueloceditAfterHide"></div>
<div class="form-group col-md-3">
<label>Freight Type </label>
<div>
@ -1781,7 +1793,7 @@
</div>
<div class="form-row">
<div class="col-md-5 col-md-offset-4" align="right">
<div class="col-md-9 col-md-offset-4" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-3">
@ -1792,7 +1804,7 @@
?>
</div>
</div>
<div class="col-md-5 col-md-offset-4" align="right">
<div class="col-md-9 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-3">
@ -1809,7 +1821,7 @@
<div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="padding:0px;" id="EditModalImportTaxHide">
<br />
<div class="form-group col-md-6" style="padding:0px;text-align:left;">
<div class="form-group col-md-6" style="padding:10px;text-align:left;">
<div class="form-row">
<div class="form-group col-md-4">
Basic Price <?php echo "($INR)" ?>
@ -1940,7 +1952,7 @@
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:10px;">
<div class="form-row" style="text-align:left;">
<div class="form-group col-md-4">
Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
@ -2016,6 +2028,8 @@
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
@ -2086,7 +2100,7 @@
?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<div class="form-group col-md-4" style="margin-top: -3.1%">
<span>Quantity</span>
<div>
<?php
@ -2102,6 +2116,8 @@
<div class="form-group col-md-4">
Custom Duty <?php echo "($INR)/UOM" ?>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<div>
<?php
@ -2116,6 +2132,8 @@
<div class="form-group col-md-4">
Clearing Charges<?php echo "($INR)" ?>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<div>
<?php
@ -2125,13 +2143,12 @@
</div>
</div>
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<div>
<?php
@ -2150,7 +2167,6 @@
</div>
</div>
<div class="form-row" style="padding: 0px 30px 10px 30px; text-align: left;">
<div class="form-group col-md-12">
<label>Capital Description </label>
@ -2163,7 +2179,7 @@
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin: 10px;">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
</div>
</form>
@ -2229,6 +2245,7 @@
</tr>
</script> -->
<script>
var tempUserId = 0;
var RequistQuantity = '';
var AvilBudAmt = '';
var POMaxDate = '<?php echo $MaxPoDate; ?>';
@ -3301,7 +3318,7 @@
<td align="left">${TotalTaxValue}</td>
<td align="left">${Total}</td>
<td>
<a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<a data-target='#EDITCAPITAL' id="edit${temp}" data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill" data-toggle="tooltip" ></i>&nbsp;&nbsp;&nbsp;
</a>
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
@ -3396,7 +3413,7 @@
// var a=parseFloat($('#NoofTriploc'+temp).val());
// console.log(Nooftriploc);
$('#CAPITAL').modal('hide');
clearCapitalModalFields();
}
@ -4041,6 +4058,11 @@
$('#isEdit').val(1);
if (userid) {
tempUserId = userid;
} else {
userid = tempUserId;
}
// alert(userid);
var tr = document.getElementById(userid);
@ -4137,8 +4159,10 @@
if (FreightTypeloc == '<?php echo PERTRIP; ?>') {
$('#TripsValuelocedit').show();
$('#TripsValueloceditAfterHide').hide();
} else {
$('#TripsValuelocedit').hide();
$('#TripsValueloceditAfterHide').show();
}
@ -4172,7 +4196,6 @@
}
});
}
});
});
/*get edit material list*/
@ -4516,7 +4539,6 @@
* This function is used for Edit Capital
*/
$('.EditCapital').click(function() {
tinyMCE.triggerSave();
if (validateEditCapitalTax() && EditExceedQuantityCheck() && validateEditExceedLimit()) {
@ -4713,6 +4735,7 @@
cellval[9].innerHTML = Total;
$('#EDITCAPITAL').modal('hide');
populateValueMainFormForEditCapitalTax();
@ -5200,9 +5223,11 @@
if (FreightType == "PER TRIP") {
$('#TripsValue').show();
$('#TripsValueafterHide').hide();
} else {
$('#TripsValue').hide();
$('#TripsValueafterHide').show();
}
if ($('#AfterBasicPriceTax').val() != '') {
@ -5631,6 +5656,7 @@
var edit = '';
$('#drpFreightloc').change(function() {
var FreightType = $("#drpFreightloc").val();
@ -5663,6 +5689,8 @@
if (selValue == '<?php echo PERCENTAGE; ?>') {
var PackagingCalculation = '';
$('#CAPITAL').modal('hide');
edit = 'FreightCalculationOn';
$('#packagingcalmodel').modal('show');
//PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
@ -5681,14 +5709,27 @@
}
});
$('#editpackagingcalmodel').on('hidden.bs.modal', function() {
$('#EDITCAPITAL').modal('show');
$('.modal-backdrop').remove();
// console.log($('#edit'+tempUserId));
// $('#edit'+tempUserId).click();
});
$('#packagingcalmodel').on('hidden.bs.modal', function() {
console.log("add form ");
$('#CAPITAL').modal('show');
});
function calculateFreightlocaddper() {
var Calculation = document.querySelector('input[name = "optPackaging"]:checked').value;
var FreightType = $("#drpFreightloc").val();
$('#packagingcalmodel').modal('hide');
$('#CAPITAL').modal('show');
if (FreightType == '<?php echo PERCENTAGE; ?>') {
@ -5769,9 +5810,11 @@
if (FreightType == "PER TRIP") {
$('#TripsValuelocedit').show();
$('#TripsValueloceditAfterHide').hide();
} else {
$('#TripsValuelocedit').hide();
$('#TripsValueloceditAfterHide').show();
}
@ -5794,6 +5837,7 @@
if (selValue == '<?php echo PERCENTAGE; ?>') {
var PackagingCalculation = '';
$('#EDITCAPITAL').modal('hide');
$('#editpackagingcalmodel').modal('show');
//PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
@ -5820,8 +5864,20 @@
var Calculation = document.querySelector('input[name = "editoptPackaging"]:checked').value;
var FreightType = $("#drpFreighteditloc").val();
$('#editpackagingcalmodel').modal('hide');
$('.modal-backdrop').remove();
$('#EDITCAPITAL').modal('show');
if (!document.getElementById('modalScrollCSS')) {
var style = document.createElement('style');
style.id = 'modalScrollCSS'; // Assign an ID to the style tag to avoid duplicates
style.innerHTML = `
/* Force scroll by setting a max height */
.modal-body {
max-height: 540px;
overflow-y: auto;
}
`;
document.head.appendChild(style); // Append the CSS to the head
}
if (FreightType == '<?php echo PERCENTAGE; ?>') {
$('#txtAfterFreightlocedit').val('');
@ -5888,6 +5944,7 @@
}
EditRatechange();
}

72
app/Views/companyview.php
View File

@ -144,9 +144,7 @@ if (!empty($filenames)) {
reader.readAsDataURL(input.files[0]);
$('#ModifyImage').val(input.files[0]['name']);
}
}
else
{
} else {
if (input.files && input.files[0]) {
var reader = new FileReader();
@ -442,17 +440,14 @@ if (!empty($filenames)) {
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Business Settings</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
@ -582,13 +577,16 @@ if (!empty($filenames)) {
<div class="form-row" style="margin-bottom: 20px;">
<div class=" col-md-4">
<label class="col-form-label" for="UANumber">UA Number<span class="badge">*</span></label>
<input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber;?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase"> </div>
<input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber; ?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase">
</div>
<div class=" col-md-4">
<label class="col-form-label" for="TINNumber">TIN Number<span class="badge">*</span></label>
<input type="text" id="TIN" name="TIN" maxlength="11" class="form-control" value="<?php echo $TIN;?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number"> </div>
<input type="text" id="TIN" name="TIN" maxlength="11" class="form-control" value="<?php echo $TIN; ?>" pattern="(.){11,11}" onkeypress="return isNumberKey(event)" title="Please Enter 11 digit Number">
</div>
<div class=" col-md-4">
<label class="col-form-label" for="MSMENumber">MSME Number</label>
<input type="text" id="MSME" name="MSME" class="form-control" value="<?php echo $MSME;?>" title="Please Enter MSME" style="text-transform: uppercase"> </div>
<input type="text" id="MSME" name="MSME" class="form-control" value="<?php echo $MSME; ?>" title="Please Enter MSME" style="text-transform: uppercase">
</div>
</div>
<div class="form-row" style="margin-top:20px">
<div class=" col-md-4">
@ -621,13 +619,16 @@ if (!empty($filenames)) {
</div>
<div class="col-md-3">
<span for="IFSC">IFSC</span>
<input type="text" id="IFSC" name="IFSC" maxlength="500" class="form-control" value="<?php echo $bankifsc;?>"> </div>
<input type="text" id="IFSC" name="IFSC" maxlength="500" class="form-control" value="<?php echo $bankifsc; ?>">
</div>
<div class="col-md-3">
<span for="BankAccountNumber">Bank Account Number</span>
<input type="text" id="BankAccno" name="BankAccno" maxlength="500" class="form-control" onkeypress="return isNumberKey(event)"> </div>
<input type="text" id="BankAccno" name="BankAccno" maxlength="500" class="form-control" onkeypress="return isNumberKey(event)">
</div>
<div class="col-md-3">
<span for="BankName">Bank Address</span>
<input type="text" id="BankAddress" name="BankAddress" maxlength="500" class="form-control" value="<?php echo $bankaddress;?>"> </div>
<input type="text" id="BankAddress" name="BankAddress" maxlength="500" class="form-control" value="<?php echo $bankaddress; ?>">
</div>
</div>
</div>
<input type="hidden" id="BankState" name="BankState" class="form-control" value="Yes">
@ -658,19 +659,17 @@ if (!empty($filenames)) {
<td style="width: 18%;" contenteditable='true'><?php echo $uf->Bank_AccNo ?></td>
<td style="width: 40%;" contenteditable='true'><?php echo $uf->Address ?></a></td>
<td style="width: 10%;" contenteditable='true'>
<?php if($uf->Is_Active == 1 )
{
<?php if ($uf->Is_Active == 1) {
echo 'Yes';
}
else
{
} else {
echo 'No';
}
?>
</td>
</tr>
<?php } } ?>
<?php }
} ?>
</tbody>
</table>
</div>
@ -685,10 +684,8 @@ if (!empty($filenames)) {
<select class="form-control required" id="filedescription" name="filedescription">
<option value="CERTIFICATION">Select File Type</option>
<?php
if(!empty($filetype))
{
foreach ($filetype as $rl)
{
if (!empty($filetype)) {
foreach ($filetype as $rl) {
?>
<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
<?php
@ -783,9 +780,7 @@ if (!empty($filenames)) {
<script>
function payment_hidden()
{
function payment_hidden() {
//alert("worked");
var term = document.getElementById("PaymentTerms");
var termid = term.options[term.selectedIndex].value;
@ -890,8 +885,6 @@ function payment_hidden()
}
</script>
@ -946,34 +939,29 @@ $('#Add').click(function(){
// var isactive = <?php echo $bank_isactive ?>;
//alert(isactive);
if(bankname != '' || ifsccode != '' || bankaddress != '' )
{
if (bankname != '' || ifsccode != '' || bankaddress != '') {
//alert('both insert and update operation evaluated');
if (bankname == '') {
$("#BankName").focus();
return false;
}
else if (ifsccode == ''){
} else if (ifsccode == '') {
$('#IFSC').focus();
return false;
}
else if (bankaccno == ''){
} else if (bankaccno == '') {
$('#BankAccno').focus();
return false;
}
else if (bankaddress == ''){
} else if (bankaddress == '') {
$('#BankAddress').focus();
return false;
}
else{
} else {
//alert(isactive);
@ -1001,7 +989,9 @@ $('#Add').click(function(){
// $('#content').loader('show');
$.ajax({
data:{id:value},
data: {
id: value
},
type: "POST",
url: "<?php echo base_url() ?>companycontroller/bankdtl",

12
app/Views/configlisting.php
View File

@ -54,8 +54,6 @@ td {
text-align: center !important;
width: 15%;
}
</style>
@ -67,15 +65,13 @@ td {
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2">Configuration Details</h4>
</div>
</div>
<div class="col-6 text-right">
<h4 class="page-title">Configuration Details</h4>
<a class="btn btn-success" href="<?php echo base_url(); ?>addconfig">Add New Configuration</a>
</div>
</div>
</div>
<?php
helper('form');
$error = session()->getFlashdata('error');
@ -112,8 +108,6 @@ td {
<div class="error" id="error"></div>
</form>
<div class="card-body">
<table class="table dt-responsive nowrap w-100" id="datatable" >
<table id="config_list_table" class="table dt-responsive nowrap w-100">
<thead>
<tr>

13
app/Views/costListing.php
View File

@ -41,18 +41,15 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2">Cost Details</h4>
</div>
</div>
<div class="col-6 text-right">
<h4 class="page-title">Cost Details</h4>
<a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add New Cost List</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportcost">Export Cost Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
@ -121,7 +118,7 @@
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>

57
app/Views/createPOfromRequistion.php
View File

@ -253,70 +253,19 @@
</div>
</div>
<!-- start page title -->
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Create Purchase Order from Requistion</h4>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<?php
helper('form');
$error = session()->getFlashdata('error');
if ($error) {
?>
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('error'); ?>
</div>
<?php } ?>
<?php
$success = session()->getFlashdata('success');
if ($success) {
?>
<div class="alert alert-success alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('success'); ?>
</div>
<?php } ?>
<div class="row">
<div class="col-md-12">
<?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>');
?>
</div>
</div>
</div>
<?php
$listErrors = session()->getFlashdata('listErrors');
if ($listErrors) { ?>
<div class="row">
<div class="col-md-12">
<div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('listErrors'); ?>
</div>
</div>
</div>
<?php } ?>
<div class="col-md-12" style="margin-top: -79px;">
<!-- <div class="col-md-3 col-md-offset-9"> -->
<p>
<div align="right" style="padding-right:0px">
<!--<a href="<?php echo base_url(); ?>purchaseorderform/purchaseorder"> -->
<!--<button type="button" class="btn btn-success">Create PO</button></a> -->
<!--<input type="submit" class="btn btn-success" onclick="return Validate();" value="Create Purchase Order"> -->
<a class="btn btn-success" onclick="Validate();">Create Purchase Order</a>
<input type="hidden" name="txtReqNo" id="txtReqNo" />
<input type="hidden" name="txtReqType" id="txtReqType" />
</div>
</p>
<!-- </div> -->
</div>
</div>
<!-- start page title -->
<div class="row">
<div class="col-12">

17
app/Views/departmentListing.php
View File

@ -48,16 +48,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2">Department Details</h4>
</div>
</div>
<div class="col-6 text-right">
<h4 class="page-title">Department Details</h4>
<a class="btn btn-success" href="<?php echo base_url(); ?>adddepartment">Add New department</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportdepartment">Export department details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
</div>
<?php
@ -141,7 +138,6 @@
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>
@ -163,7 +159,10 @@
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
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
order: [], // Default ordering (column index 0, descending)
language: {

9
app/Views/editOld.php
View File

@ -31,17 +31,14 @@ if (!empty($EmpList)) {
<div class="content-page">
<div class="content">
<div class="container-fluid">
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit User <?= ' - ' . $EmpId; ?> Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- User Details Form -->
<div class="row">
<div class="col-12">

10
app/Views/editOldasset.php
View File

@ -144,15 +144,13 @@ if (!empty($assetList)) {
<div class="content-page">
<div class="content">
<div class="container-fluid">
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Asset Details - <?php echo $AssetCode; ?></h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="row">
<div class="col-12">
@ -273,8 +271,8 @@ if (!empty($assetList)) {
</div>
<div class="form-row mt-4 text-right">
<div class="col-md-12">
<a href="<?php echo base_url() ?>assetListing" class="btn btn-secondary">Cancel</a>
<button type="submit" class="btn btn-success">Submit</button>
<a href="<?php echo base_url() ?>assetListing" class="btn btn-cancel">Cancel</a>
</div>
</div>
</form>

14
app/Views/editOldemppay.php
View File

@ -163,15 +163,13 @@ if (!empty($emppay)) {
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Loan Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>emppayListings"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
@ -258,7 +256,7 @@ if (!empty($emppay)) {
</div>
</div>
<div class="col-md-12 text-right">
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:red ;color: white; margin-right: 15px;width: 80px;" />
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:red ;color: white; margin-right: 15px;width: 80px;border:none;" />
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
</div>
</div>
@ -409,7 +407,9 @@ if (!empty($emppay)) {
}
$("#deleteemp").click(function() {
var loanid = "<?php if(isset($Loan_ID)){ echo $Loan_ID; }else{
var loanid = "<?php if (isset($Loan_ID)) {
echo $Loan_ID;
} else {
echo $emppay[0]->Loan_ID;
} ?>";
var i = confirm("Do You want to delete " + loanid + " from Loan Master?");

14
app/Views/editRawmaterial.php
View File

@ -107,16 +107,15 @@ if ($total <= $reorder) {
<!-- Start Content-->
<div class="container-fluid">
<!-- Start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- End page title -->
<div class="row">
@ -265,7 +264,7 @@ if ($total <= $reorder) {
</div>
</div>
<div class="box-footer text-right">
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel">Cancel</a>
<a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-secondary">Cancel</a>
<input type="submit" class="btn btn-success" value="Submit" />
</div>
</form>
@ -385,7 +384,8 @@ if ($total <= $reorder) {
// alert("empty data");
}
},error: function() {
},
error: function() {
$('#content').loader('hide');
alert("Error Occur");
}

2
app/Views/editRevenuepurchaseorder.php
View File

@ -1863,7 +1863,7 @@ if (!empty($getlogpodtl)) {
<?php } else { ?>
<h4><?= "Amended Revenue Purchase Order - $PONO "; ?></h4>
<?php } ?>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>

10
app/Views/editSupplier.php
View File

@ -1,5 +1,4 @@
<?php
$SupplierID = '';
$SupplierName = '';
$Address = '';
@ -280,16 +279,13 @@ if (!empty($supplier)) {
<!-- form start -->
</div>
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Supplier Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">

11
app/Views/editconfig.php
View File

@ -24,17 +24,14 @@ if (!empty($master)) {
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Config <?= ' - ' . $ConfigName; ?> Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div>
</div>
<?php
helper('form');
$error = session()->getFlashdata('error');
@ -133,7 +130,7 @@ if (!empty($master)) {
<div class="form-row text-right" style="margin-top:10px; text-align:right">
<div class="col-md-12 text-right">
<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel">Cancel</a>
<a href="<?php echo base_url() ?>configlisting" class="btn btn-secondary">Cancel</a>
<input type="submit" class="btn btn-success" value="Update" />
</div>
</div>

34
app/Views/editdepartment.php
View File

@ -5,10 +5,8 @@ $DepartmentName = '';
$HeadDept = '';
$IsActive = '';
$chk = '';
if(!empty($department))
{
foreach ($department as $uf)
{
if (!empty($department)) {
foreach ($department as $uf) {
$DEPCode = $uf->DEPCode;
$DepartmentName = $uf->DepartmentName;
$HeadDept = $uf->HeadDept;
@ -16,16 +14,11 @@ if(!empty($department))
//echo 'CST date:'. $CSTDt ;
$chk = $uf->IsActive;
if($chk == 1)
{
if ($chk == 1) {
$IsActive = 'checked';
}
else
{
} else {
$IsActive = '';
}
}
}
@ -74,7 +67,6 @@ if(!empty($department))
// return false;
// return true;
// }
</script>
<style>
@ -85,12 +77,14 @@ if(!empty($department))
legend {
margin-left: 0% !important;
}
.pad {
padding-bottom: 1%;
}
.badge
{
color:red; background-color:#fff;
.badge {
color: red;
background-color: #fff;
}
</style>
@ -98,18 +92,14 @@ if(!empty($department))
<div class="content">
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-6">
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Department - <?php echo $DepartmentName; ?> Details</h4>
<a class="btn btn-secondary" href="<?php echo base_url(); ?>departmentListing"><span class="bold">Back</span></a>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>departmentListing"><span class="bold">Back</span></a>
</div>
</div>
<!-- end page title -->
<div class="row">
<div class="col-12">
<div class="card">

7
app/Views/employeeListing.php
View File

@ -88,14 +88,11 @@
}
?>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Employee Details</h4>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-success" href="<?php echo base_url(); ?>addemployee">Add New Employee</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportemployee">Export Employee Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
</div>
<div class="row">

8
app/Views/emppayListing.php
View File

@ -3,17 +3,14 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Employee Loan Details</h4>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">
@ -59,7 +56,6 @@
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>

6
app/Views/expense_list.php
View File

@ -63,15 +63,13 @@
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Expense List</h4>
</div>
</div>
<div class="col-6 text-right">
<a id="addExpense" class="btn btn-success" data-toggle="modal" href="#expenseModal">Add New Expense</a>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card">

3
app/Views/importpo.php
View File

@ -91,9 +91,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
toolbar: false,
setup: function(ed) {
ed.on('init', function(evt) {
console.log(evt);
console.log('<?php echo $t; ?>')
ed.setContent('<?php echo $t; ?>');
});
}

10
app/Views/payslipgenerate.php
View File

@ -137,10 +137,12 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
<div class="content-page">
<!-- Content Header (Page header) -->
<div class="container-fluid">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Config Details</h4>
</div>
<section class="content">
<div class="content">
<div class="card">
<div class="card-body" style="padding: 1rem 2rem !important;">
<form id="PayslipGenerator" action="<?php echo base_url() ?>PrintPdf" method="post" role="form" style="border:2px dotted; padding:5%">
@ -208,5 +210,9 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
</div>
</div>
</div>
</section>
</form>
</div>
</div>
</div>
</div>
</div>

60
app/Views/purchaseorder.php
View File

@ -458,7 +458,7 @@ if (!empty($INRSYMBOL)) {
}
Editchange();
});
var edit = '';
$('#PackagingType').change(function() {
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
@ -467,6 +467,8 @@ if (!empty($INRSYMBOL)) {
selValue = $("#PackagingType").val();
if (selValue == PercentageType) {
var PackagingCalculation = '';
$('#REVENUE').modal('hide');
edit = 'PackingCalculationOn';
$('#packagingcalmodel').modal('show');
$('#txtPackaging').removeAttr('readonly', 'true');
} else {
@ -488,6 +490,14 @@ if (!empty($INRSYMBOL)) {
}
calculatePackaging(0);
});
$('#packagingcalmodel').on('hidden.bs.modal', function() {
// Reopen the first modal when the second modal is closed
if(edit == 'PackingCalculationOn'){
$('#REVENUE').modal('show');
}else if(edit == 'EditPackingCalculationOn'){
$('#EDITREVENUE').modal('show');
}
});
$('#EditPackagingType').change(function() {
$('#txtEditPackaging').val('');
@ -495,6 +505,8 @@ if (!empty($INRSYMBOL)) {
selValue = $("#EditPackagingType").val();
if (selValue == PercentageType) {
var PackagingCalculation = '';
$('#EDITREVENUE').modal('hide');
edit = 'EditPackingCalculationOn';
$('#packagingcalmodel').modal('show');
$('#txtEditPackaging').removeAttr('readonly', 'true');
} else {
@ -604,6 +616,7 @@ if (!empty($INRSYMBOL)) {
//$('#CSTCalModel').modal('show');
}
});
var freight = '';
$('#drpFreight').change(function() {
var FreightType = $("#drpFreight").val();
if (FreightType == "PER TRIP") {
@ -617,6 +630,8 @@ if (!empty($INRSYMBOL)) {
$('#txtAfterFreight').val('');
if (selValue == PercentageType) {
var freightCalculation = '';
$('#REVENUE').modal('hide');
edit = 'FreightCalculationOn';
$('#freightcalmodel').modal('show');
//$('#freightcalmodel').modal('blur');
$('#txtFreight').removeAttr('readonly', 'true');
@ -636,6 +651,16 @@ if (!empty($INRSYMBOL)) {
calculateFreight(0);
});
$('#freightcalmodel').on('hidden.bs.modal', function() {
// Reopen the first modal when the second modal is closed
if(edit == 'FreightCalculationOn'){
$('#REVENUE').modal('show');
}else if(edit == 'EditFreightCalculationOn'){
$('#EDITREVENUE').modal('show');
}
});
$('#drpEditFreight').change(function() {
var FreightType = $("#drpEditFreight").val();
if (FreightType == "PER TRIP") {
@ -650,6 +675,8 @@ if (!empty($INRSYMBOL)) {
if (selValue == PercentageType) {
var FreightCalculation = '';
// $('#freight').modal('show');
edit = 'EditFreightCalculationOn';
$('#EDITREVENUE').modal('hide');
$('#freightcalmodel').modal('show');
$('#txtEditFreight').removeAttr('readonly', 'true');
//Editchange();
@ -1768,7 +1795,7 @@ if (!empty($INRSYMBOL)) {
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4><?= "Revenue Purchase Order"; ?></h4>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
@ -2194,15 +2221,19 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-body p-4">
<form>
<div class="radio">
<label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
<div>
<label>
<input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount
</label>
</div>
<div class="radio">
<label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
<div>
<label>
<input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount
</label>
</div>
</form>
</div>
<div class="modal-footer">
<div class="modal-footer" style="border:none;">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
@ -2212,7 +2243,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for freight Calculation-->
<div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-full-width">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Freight Calculation On</h4>
@ -2222,15 +2253,15 @@ if (!empty($INRSYMBOL)) {
<div class="modal-body p-4">
<form>
<div class="radio">
<div>
<label><input type="radio" name="optFreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
</div>
<div class="radio">
<div>
<label><input type="radio" name="optFreight" id="optFreight" value='1'> After Discount Amount</label>
</div>
</form>
</div>
<div class="modal-footer">
<div class="modal-footer" style="border:none;">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-info waves-effect waves-light" ID="FreightOption" onclick="SetfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
@ -3044,7 +3075,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
<div class="modal-footer">
<div class="modal-footer" style="border:none;>
<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div>
@ -3213,7 +3244,8 @@ if (!empty($INRSYMBOL)) {
$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
});});
});
});
$('.AddRevenue').click(function() {
tinyMCE.triggerSave();
if (validateRevenueTax() && ExceedQuantityCheck()) {
@ -3364,7 +3396,7 @@ $('#RevenueAppend').append(rowHtml);
addHidden(theForm, "Service_Description" + temp, Service_Description);
addHidden(theForm, "LineItemNo" + temp, 0);
$('#txtRowCount').val(temp);
// $('#REVENUE').modal('hide');
$('#REVENUE').modal('hide');
clearRevenueModalFields();
}

9
app/Views/rawmaterialListing.php
View File

@ -43,16 +43,12 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Material Master Details</h4>
</div>
</div>
<div class="col-6 text-right">
<a class="btn btn-success" href="<?php echo base_url(); ?>addRawmaterial">Add New Material</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportmaterial">Export Material Master <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
</div>
<?php
@ -134,7 +130,6 @@
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->
</div>

154
app/Views/sales_dashboard.php
View File

@ -1,5 +1,8 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
<style>
</style>
<div class="content-page">
<div class="content">
<!-- Start Content-->
@ -16,77 +19,97 @@
</div>
</div>
<div class="row">
<div class="col-xl-4 col-md-4">
<!-- Today Sales -->
<div class="col-xl-4">
<div class="card">
<div class="card-body" style="height: 150px;">
<h4 class="header-title" style="margin-bottom: 22px;">Today Sales</h4>
<div class="d-flex justify-content-between align-items-center">
<div class="knob-chart" dir="ltr">
<div class="text-left">
<p class="text-muted mb-0">Invoices</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo $today_sales->Invoices ?></span> </h4>
</div>
<h3 class="mb-0">Today Sales</h3>
<h4 class="mb-0 mt-0">
<span data-plugin="counterup" class="card_font_colorset_green" style="font-size: 20.7215px;">
<?php echo $today_sales->Invoices ?>
</span> Invoices
</h4>
</div>
<div class="d-flex justify-content-between align-items-center mt-3">
<div class="text-left">
<p class="text-muted mb-0">Qty in Kgs</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo $today_sales->Qty ?></span> </h4>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_green"><?php echo $today_sales->Qty ?></span>
</h4>
</div>
<div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo number_format($today_sales->Sales, 2); ?></span> </h4>
</div>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-4">
<div class="card">
<div class="card-body" style="height: 150px;">
<h4 class="header-title" style="margin-bottom: 22px;">This Month Sales</h4>
<div class="d-flex justify-content-between align-items-center">
<div class="knob-chart" dir="ltr">
<div class="text-left">
<p class="text-muted mb-0">Invoices</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo $this_month_sales->Invoices ?></span> </h4>
</div>
</div>
<div class="text-left">
<p class="text-muted mb-0">Qty in Kgs</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo $this_month_sales->Qty ?></span> </h4>
</div>
<div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p>
<h class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo number_format($this_month_sales->Sales, 2); ?></span> </h4>
</div>
</div>
</div>
</div>
</div>
<div class="col-xl-4 col-md-4">
<div class="card">
<div class="card-body" style="height: 150px;">
<h4 class="header-title" style="margin-bottom: 22px;">This year Sales</h4>
<div class="d-flex justify-content-between align-items-center">
<div class="knob-chart" dir="ltr">
<div class="text-left">
<p class="text-muted mb-0">Invoices</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo $this_year_sales->Invoices ?></span> </h4>
</div>
</div>
<div class="text-left">
<p class="text-muted mb-0">Qty in Kgs</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo $this_year_sales->Qty ?></span> </h4>
</div>
<div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo number_format($this_year_sales->Sales, 2); ?></span> </h4>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_green"><?php echo number_format($today_sales->Sales, 2); ?></span>
</h4>
</div>
</div>
</div>
</div>
</div>
<!-- This Month Sales -->
<div class="col-xl-4">
<div class="card">
<div class="card-body" style="height: 150px;">
<div class="d-flex justify-content-between align-items-center">
<h3 class="mb-0">This Month Sales</h3>
<h4 class="mb-0 mt-0">
<span data-plugin="counterup" class="card_font_colorset_bule" style="font-size: 20.7215px;">
<?php echo $this_month_sales->Invoices ?>
</span> Invoices
</h4>
</div>
<div class="d-flex justify-content-between align-items-center mt-3">
<div class="text-left">
<p class="text-muted mb-0">Qty in Kgs</p>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_bule"><?php echo $this_month_sales->Qty ?></span>
</h4>
</div>
<div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_bule"><?php echo number_format($this_month_sales->Sales, 2); ?></span>
</h4>
</div>
</div>
</div>
</div>
</div>
<!-- This Year Sales -->
<div class="col-xl-4">
<div class="card">
<div class="card-body" style="height: 150px;">
<div class="d-flex justify-content-between align-items-center">
<h3 class="mb-0">This Year Sales</h3>
<h4 class="mb-0 mt-0">
<span data-plugin="counterup" class="card_font_colorset_red" style="font-size: 20.7215px;">
<?php echo $this_year_sales->Invoices ?>
</span> Invoices
</h4>
</div>
<div class="d-flex justify-content-between align-items-center mt-3">
<div class="text-left">
<p class="text-muted mb-0">Qty in Kgs</p>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_red"><?php echo $this_year_sales->Qty ?></span>
</h4>
</div>
<div class="text-left">
<p class="text-muted mb-0">Sales in Rs.</p>
<h4 class="mb-1 mt-0">
<span data-plugin="counterup" class="card_font_colorset_red"><?php echo number_format($this_year_sales->Sales, 2); ?></span>
</h4>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xl-12 col-md-12">
<div class="card">
@ -167,16 +190,22 @@
</div> <!-- container -->
</div> <!-- content -->
</div>
<script>$(document).ready(function() {
<script>
$(document).ready(function() {
$('#datatable-buttonss').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
buttons: [
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
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
order: [[0, 'desc']], // Default ordering (column index 0, ascending)
order: [
[0, 'desc']
], // Default ordering (column index 0, ascending)
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
@ -185,7 +214,6 @@
}
});
});
</script>
@ -198,8 +226,7 @@
type: 'bar', // Bar chart
data: {
labels: ['April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December', 'January', 'February', 'March'], // Months of the year
datasets: [
{
datasets: [{
label: 'Current Year Sales',
data: currentYearSales,
backgroundColor: 'rgba(86, 166, 75, 0.6)', // Green color with opacity
@ -240,8 +267,3 @@
}
});
</script>

12
app/Views/supplierListing.php
View File

@ -58,15 +58,10 @@
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title">Supplier Listing</h4>
</div>
</div>
<div class="col-6 text-right">
<div class="form-group" style="margin-bottom:0px !important;">
<a class="btn btn-success" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportsupplier">Export Supplier Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div>
</div>
</div>
@ -201,7 +196,10 @@
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
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
order: [], // Default ordering (column index 0, descending)
language: {

9
app/Views/transporterListing.php
View File

@ -80,18 +80,13 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2">Transporter Details</h4>
</div>
</div>
<div class="col-6 text-right">
<h4 class="page-title">Transporter Details</h4>
<a data-toggle="modal" href="#transporterwizard" data-id="0" data-name="" class="btn btn-success">Add New Transporter</a>
</div>
</div>
</div>
<div class="row">
<div class="col-12">

15
app/Views/userListing.php
View File

@ -42,21 +42,14 @@
<!-- Start Content-->
<div class="container-fluid">
<!-- start page title -->
<div>
<div class="row">
<div class="col-6">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4 class="page-title pt-2 ">User Listing</h4>
</div>
</div>
<div class="col-6 text-right ">
<a class="btn btn-success " href="<?php echo base_url(); ?>addNew">Add New User</a>
</div>
</div>
</div>
<?php
helper('form');
$error = session()->getFlashdata('error');
@ -89,7 +82,8 @@
<table id="user_list_table" class="table dt-responsive nowrap w-100">
<thead>
<tr> <th>Created Date</th>
<tr>
<th>Created Date</th>
<!-- <th>User Id</th> -->
<th>User Name</th>
<th>Email</th>
@ -136,7 +130,6 @@
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div>
</div> <!-- container -->
</div> <!-- content -->

1
system/Helpers/form_helper.php
View File

@ -230,7 +230,6 @@ if (! function_exists('form_textarea')) {
if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
unset($defaults['cols']);
}
return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes($extra) . '>'
. htmlspecialchars($val)
. "</textarea>\n";