tracker bugs : ps

app/Config/Routes.php

@@ -125,6 +125,7 @@ $routes->get('exportemployee', 'Employeedetails::exportemployee');
 
 
 $routes->post('employeeEmailExist', 'Employeedetails::CheckEmail');
+$routes->post('employeeMobileExist', 'Employeedetails::CheckMobile');
 $routes->post('employeePANExist', 'Employeedetails::checkPAN');
 $routes->post('employeecheckAadharNoExist', 'Employeedetails::checkAadharNo');
 

app/Controllers/Employeedetails.php

@@ -481,6 +481,25 @@ class Employeedetails extends BaseController
     return $this->response->setJSON($response);
   }
 
+  
+  function CheckMobile()
+  {
+    $ContactNumber = $this->request->getPost('ContactNumber');
+    //print_r($id);
+
+    $result = $this->employeedetails_model->checkMobileExists($ContactNumber);
+
+    $result = $result->getResultArray();
+
+    $response = [
+      "message" => "success",
+      "data" => $result 
+     ]; 
+
+   
+    return $this->response->setJSON($response);
+  }
+
   function checkPAN()
   {
 

app/Controllers/Inwardgateregister.php

@@ -1413,6 +1413,8 @@ function updateIGRWeight(){
     foreach ($request as $key => $value) {
         foreach ($dbIGRMaster as $key1 => $value1) {
             if ($value1 != $value && $key1 == $key) {
+                $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value;
+                $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1;
                 // Store each changed field in an array
                 $history_entries[] = [
                     'field' => $key1,

app/Controllers/Rawmaterialdetails.php

@@ -248,9 +248,9 @@ class Rawmaterialdetails extends BaseController
             }
             
             $HSNcode = ($HSN == '') ? null : $HSN;
-            
+            $material_rate = $this->request->getPost('material_rate');
 
-            $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UOM' => $UOM, 'Category' => $MaterialCategory, 'CreatedBy' => $CreatedBy,  'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder, 'Current_stock' => $currentstock);
+            $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UOM' => $UOM, 'Category' => $MaterialCategory, 'CreatedBy' => $CreatedBy,  'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder, 'Current_stock' => $currentstock, 'material_rate'=>$material_rate);
             //print_r($RawMaterial);die();      
             $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
 
@@ -310,6 +310,7 @@ class Rawmaterialdetails extends BaseController
             $MaterialType = $this->request->getPost('MaterialType');
             $MaterialCategory = $this->request->getPost('MaterialCategory');
             $materialcategoryarray = $this->rawmaterialdetails_model->getmaterialCategory();
+            $material_rate = $this->request->getPost('material_rate');
 
             foreach ($materialcategoryarray as $mc) {
                 $TempArr[] = $mc->ConfigValue;
@@ -337,7 +338,7 @@ class Rawmaterialdetails extends BaseController
             $HSNcode = ($HSN == '') ? null : $HSN;
 
             $RawMaterial = array();
-            $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UpdatedBy' => $UpdatedBy, 'UOM' => $UOM, 'IsActive' => $IsActive, 'Category' => $MaterialCategory, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder); //,'RMCode'=>$rmcode);
+            $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UpdatedBy' => $UpdatedBy, 'UOM' => $UOM, 'IsActive' => $IsActive, 'Category' => $MaterialCategory, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder,'material_rate'=>$material_rate); //,'RMCode'=>$rmcode);
 
             $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
 

app/Models/Employeedetails_model.php

@@ -172,6 +172,17 @@ class Employeedetails_model extends Model
         return $query;
     }
 
+    function checkMobileExists($ContactNumber= '', $Empid = ''){
+        $builder = $this->db->table('t_employee_details')->select('ContactNumber')
+        ->where('ContactNumber', $ContactNumber);
+        if ($Empid != '') {
+            $builder->where('EmpID  !=', $Empid);
+        }
+        $query = $builder->get();
+
+        return $query;
+    }
+
     function checkAadharExists($aadharNo, $Empid = '')
     {
 

app/Models/Inwardgateregister_model.php

@@ -1336,5 +1336,16 @@ $builder = $this->db->table('t_igr_history')
 		return $result; 
 	}
 
+	public function get_status($value){
+		$builder = $this->db->table('t_status')
+                    ->select('StatusCode,StatusName')
+                    ->where('StatusCode', $value);
+
+        $query = $builder->get()->getRow(); 
+
+        $StatusName = $query ? $query->StatusName : null; 
+        return $StatusName; 
+	}
+
 		 
 }  

app/Models/Monthlypay_model.php

@@ -67,6 +67,7 @@ class Monthlypay_model extends Model
 			->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.is_driver')
 			//->join('t_emp_pay_data','t_emp_pay_data.EmpID=t_employee_details.EmpID','Left')
 			->where('t_employee_details.IsActive', 1)
+			->where('t_employee_details.is_driver', 0)
 			->where('t_employee_details.DateofJoining <=', $lastdate)
 			->orderBy('EmpID', 'asc');
 		$query = $builder->get();
@@ -184,6 +185,7 @@ class Monthlypay_model extends Model
 			// ->where('month(t_employee_details.DateofJoining) <= ',$month_val)
 			->where('t_employee_details.DateofJoining <= ', $lastdate)
 			->where('Month_Year', $current)
+			->where('t_employee_details.is_driver', 0)
 			// ->where('t_employee_details.IsActive',1)
 			->orderBy('t_attendance.EmpID', 'asc');
 		$query = $builder->get();

app/Views/EditservicePurchaseorder.php

@@ -1229,17 +1229,19 @@ if (!empty($getlogpodtl)) {
 									</div>
 								</div>
 								
+							
 								<div class="form-row">
-									<div class="table-responsive table-bordered" style="padding-bottom: 30px;">
-										<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
+									<div class="table-responsive" style="padding-bottom: 30px;">
+									<table id="ServiceTable" class="table table-bordered table-hover mb-0"
+										style="font-size:12px;">
 											<thead>
 												<tr>
-													<th style="text-align:center !important;">SNo</th>
+													<th style="text-align:left !important;">SNo</th>
 													<th style="text-align:center !important;">Requisition No</th>
-													<th style="text-align:center !important;">Item Code</th>
+													<th style="text-align:left !important;">Item Code</th>
 													<th>Item Name</th>
 													<th>Line Item Specs</th>
-													<th style="text-align: center;">Quantity</th>
+													<th style="text-align: left;">Quantity</th>
 													<th>UOM</th>
 													<th style="text-align: right;">Rate <?php echo "($INRSYM)" ?></th>
 													<th style="text-align: right;">Basic Amount <?php echo "($INRSYM)" ?></th>
@@ -1268,10 +1270,10 @@ if (!empty($getlogpodtl)) {
 
 												?>
 														<tr id="<?php echo $index; ?>">
-															<td align="center"><?php echo $index; ?></td>
-															<td align="center"><?php echo $record->ReqNo ?></td>
-															<td align="center"><?php echo $record->MaterialCode ?></td>
-															<td><?php echo $record->MaterialName ?></td>
+															<td style="text-align:left !important;"><?php echo $index; ?></td>
+															<td style="text-align:center !important;"><?php echo $record->ReqNo ?></td>
+															<td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td>
+															<td style="text-align:left !important;"><?php echo $record->MaterialName ?></td>
 															<td>	
 																<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
 																<a href="#" 
@@ -1286,15 +1288,15 @@ if (!empty($getlogpodtl)) {
 																</div>
 																<?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
                                                     	    </td>
-															<td align="center"><?php echo $record->Quantity ?></td>
+															<td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
 															<td><?php echo $record->UOM ?></td>
 
-															<td align="right"><?php echo $record->Rate ?></td>
+															<td style="text-align:right !important;"><?php echo $record->Rate ?></td>
 
-															<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+															<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
 
-															<td align="right"><?php echo $record->Taxamount ?></td>
-															<td align="right"><?php echo $record->TotalValue ?></td>
+															<td style="text-align:right !important;"><?php echo $record->Taxamount ?></td>
+															<td style="text-align:right !important;"><?php echo $record->TotalValue ?></td>
 															<!-- <td align="right"><?php echo $record->Quantity ?></td>
 															<td align="right"><?php echo $record->ReceivedQuantity ?></td>
 															<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->

app/Views/addEmployeenew.php

@@ -1249,7 +1249,7 @@
             return false;
         }
         if ($('#ContactNumber').val().length < 1) {
-            alert('Please Enter  Contact Number');
+            alert('Please Enter Contact Number');
             return false;
         } else if (!getMobileValidation()) {
             return false;
@@ -1389,6 +1389,49 @@
 });
 
 
+    
+$('#ContactNumber').change(function() {
+
+var ContactNumber = $('#ContactNumber').val();
+if (getMobileValidation()) {
+    $('#loader').show();
+    $.ajax({
+        data: {
+            ContactNumber
+        },
+
+        type: "POST",
+        url: "<?php echo base_url(); ?>employeeMobileExist",
+        success: function(response) {
+            $('#loader').hide();
+
+            let responseCheck = response.data[0];
+            let responseContactNumber=response.data[0].ContactNumber;
+
+            if(responseCheck ){
+                if (responseContactNumber == ContactNumber) {
+        
+                var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number"
+                )
+               
+                    $('#ContactNumber').val('');
+                    $('#ContactNumber').focus();
+                    return false;
+               
+
+            }
+            }
+
+        },
+        complete: function() {
+        $('#loader').hide(); // Ensure the loader is always hidden after the request completes
+    }
+
+    });
+} 
+
+});
+
     $('#panno').change(function() {
 
         var panNo = $('#panno').val();

app/Views/addRawMaterial.php

@@ -49,7 +49,7 @@
                                                     <div class="form-row">
                                                         <div class=" col-md-3">
                                                             <label class="col-form-label" for="MaterialName">Material Name<span class="badge">*</span></label>
-                                                            <input type="text" class="form-control required "  required id="MaterialName" name="MaterialName" maxlength="255">
+                                                            <input type="text" class="form-control required " required id="MaterialName" name="MaterialName" maxlength="255">
                                                         </div>
                                                         <div class=" col-md-3">
                                                             <label class="col-form-label" for="MaterialType">Material Type<span class="badge">*</span></label>
@@ -66,11 +66,11 @@
                                                                 ?>
                                                             </select>
                                                         </div>
-                                                        
+
                                                         <div class=" col-md-3">
                                                             <label class="col-form-label" for="MatCate">Material Category
                                                                 <span class="badge">*</span></label>
-                                                                <!-- <i type="button" class="fe-plus-circle" id="addMaterialCaterogyModalButton" 
+                                                            <!-- <i type="button" class="fe-plus-circle" id="addMaterialCaterogyModalButton" 
                                                                 style="font-size: 16px; color:rgb(15, 155, 218);" data-toggle="modal" data-target="#addMaterialCaterogyModal" 
                                                                 title="Add Material Category">
                                                                 </i> -->
@@ -109,6 +109,10 @@
                                                             <label for="HSNcode">HSN code</label>
                                                             <input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
                                                         </div>
+                                                        <div class="col-md-3">
+                                                            <label for="material_rate">Rate<span class="badge">*</span></label>
+                                                            <input type="text" class="form-control" id="material_rate" onkeypress="return isNumberKey(event)" name="material_rate" required>
+                                                        </div>
                                                         <div class="col-md-3">
                                                             <label for="OpeningStock">Opening Stock</label>
                                                             <input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
@@ -120,19 +124,19 @@
                                                             echo form_input($data);
                                                             ?>
                                                         </div>
+                                                    </div>
+                                                    <div class="form-row" style="margin-top:20px">
                                                         <div class="col-md-3">
                                                             <label for="ReorderLevel">Reorder Level</label>
                                                             <input type="text" class="form-control" id="reorder" name="reorder" maxlength="255">
                                                         </div>
-                                                    </div>
-                                                    <div class="form-row" style="margin-top:20px">
                                                         <div class="col-md-3">
                                                             <label for="Remarks">Remarks</label>
                                                             <input type="text" class="form-control" id="remarks" name="remarks" maxlength="255">
                                                         </div>
                                                     </div>
 
-                                              
+
 
                                                 </div>
                                                 <div class="col-md-12 text-right">
@@ -195,28 +199,28 @@
 <!-- addMaterialCaterogyModal -->
 
 <div class="modal fade" id="addMaterialCaterogyModal" tabindex="-1" aria-labelledby="addMaterialCaterogyModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="addMaterialCaterogyModalLabel">Add Material Category</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form id="addMaterialCategoryForm">
-          <div class="form-group">
-            <label for="materialCategoryInput">Material Category</label>
-            <input type="text" class="form-control" id="materialCategoryInput" placeholder="Enter material category">
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" onclick="addMaterialCategory()">Save Category</button>
-      </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="addMaterialCaterogyModalLabel">Add Material Category</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form id="addMaterialCategoryForm">
+                    <div class="form-group">
+                        <label for="materialCategoryInput">Material Category</label>
+                        <input type="text" class="form-control" id="materialCategoryInput" placeholder="Enter material category">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary" onclick="addMaterialCategory()">Save Category</button>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
 
@@ -298,7 +302,7 @@
 
         let validation = Validate();
 
-        if(!validation){
+        if (!validation) {
             return false;
         }
 
@@ -306,7 +310,7 @@
         var materialCode = '';
         var materialCategory = $('#MatCate').val();
         var materialType = $('MaterialType').val();
-        if(materialName == ''){
+        if (materialName == '') {
             return;
         }
 
@@ -314,45 +318,49 @@
 
         $('#loader').show();
         $.ajax({
-            data: {materialCode,materialName,materialCategory},
+            data: {
+                materialCode,
+                materialName,
+                materialCategory
+            },
             type: "POST",
             url: "<?php echo base_url(); ?>materialExist",
             success: function(data) {
-                
+
                 if (data && data.length >= 1) {
-                        $('#loader').hide();
-                        let message = ""; 
-                        if (data[0]?.IsActive == 1) {
-                            message = "Material name already exists!\n\n";
-                        } else {
-                            message = "Material name already exists in the deleted section!\n\n";
-                        }
+                    $('#loader').hide();
+                    let message = "";
+                    if (data[0]?.IsActive == 1) {
+                        message = "Material name already exists!\n\n";
+                    } else {
+                        message = "Material name already exists in the deleted section!\n\n";
+                    }
 
-                        let related_name = "";
-                        $.each(data, function(i, obj) {
-                            related_name += obj.MaterialCode + " - " + obj.MaterialName + " - " + obj.MaterialType + " - " + obj.CategoryName + "\n";
-                        });
+                    let related_name = "";
+                    $.each(data, function(i, obj) {
+                        related_name += obj.MaterialCode + " - " + obj.MaterialName + " - " + obj.MaterialType + " - " + obj.CategoryName + "\n";
+                    });
 
-                        message += "'" + materialName + "' - related materials are:\n\n" + related_name;
+                    message += "'" + materialName + "' - related materials are:\n\n" + related_name;
 
-                        alert(message);
+                    alert(message);
 
-                        $("#MaterialName").val('');
-                        $("#MaterialName").focus();
-                     
-                } else{
+                    $("#MaterialName").val('');
+                    $("#MaterialName").focus();
+
+                } else {
                     console.log("Material name is unique");
                     $('#loader').hide();
-                    
+
                     $('#addMaterialForm').submit();
                 }
 
             },
             error: function(error) {
                 $('#loader').hide();
-                alert("Error Occur" ,error);
+                alert("Error Occur", error);
             },
-            complete: function(){
+            complete: function() {
                 $('#loader').hide();
                 console.log("Ajax completed..!!");
             }
@@ -360,35 +368,40 @@
     });
 
     function Validate() {
-        
+
         if ($("#MaterialName").val().length < 1) {
             alert('Please Enter MaterialName');
             $("#MaterialName").focus();
             return false;
         }
-
-        if ($("option:selected", $("#UOM")).val() == "") {
-            alert('Please Select UOM ');
-            $("#UOM").focus();
-            return false;
-        }
-        if ($("option:selected", $("#MaterialCategory")).val() == "") {
-            alert('Please Select Material Category');
-            $("#MaterialCategory").focus();
-            return false;
-        }
         if ($("option:selected", $("#MaterialType")).val() == "") {
             alert('Please Select Material Type');
             $("#MaterialType").focus();
             return false;
         }
+        if ($("option:selected", $("#MatCate")).val() == "") {
+            alert('Please Select Material Category');
+            $("#MatCate").focus();
+            return false;
+        }
+        if ($("option:selected", $("#UOM")).val() == "") {
+            alert('Please Select UOM ');
+            $("#UOM").focus();
+            return false;
+        }
+        if ($("#material_rate").val().length < 1) {
+            alert('Please Enter Rate');
+            $("#material_rate").focus();
+            return false;
+        }
+        
 
         return true;
     }
 </script>
 
 <script>
-    function addMaterialCategory (){
+    function addMaterialCategory() {
 
         $('#materialCategoryInput').val()
 
@@ -408,11 +421,9 @@
 
 
 <script>
-
-$(document).on('keydown', function(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault(); // Prevent default Enter key behavior
-    }
-});
-
+    $(document).on('keydown', function(event) {
+        if (event.key === 'Enter') {
+            event.preventDefault(); // Prevent default Enter key behavior
+        }
+    });
 </script>

app/Views/addUser.php

@@ -52,8 +52,8 @@
                                                             <input type="text" class="form-control required " readonly id="Designation" name="Designation" maxlength="128">
                                                         </div>
                                                         <div class="col-md-3">
-                                                            <label for="Emailaddress">Email address</label><span class="badge">*</span>
-                                                            <input type="text" class="form-control required "  id="MailID" name="MailID" maxlength="128">
+                                                            <label class="col-form-label" for="Emailaddress">Email address<span class="badge">*</span></label>
+                                                            <input type="text" class="form-control required email" id="MailID" name="MailID" maxlength="128">
                                                         </div>
                                                     </div>
                                                     <div class="form-row" style="margin-top:20px">

app/Views/alterpurchaseorder.php

@@ -2811,10 +2811,10 @@ if (!empty($INRSYMBOL)) {
                                         <thead>
                                             <tr>
                                                 <th>SNo</th>
-                                                <th>Requisition No</th>
+                                                <th style="text-align:center !important">Requisition No</th>
                                                 <th>Item Code</th>
                                                 <th>Item Description</th>
-                                                <th>Quantity</th>
+                                                <th class="text-right">Quantity</th>
                                                 <th>UOM</th>
                                                 <th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
                                                 <th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
@@ -6031,10 +6031,10 @@ if (!empty($INRSYMBOL)) {
             var html = `
                 <tr id="${temp}">
                     <td>${temp}</td>
-                    <td>${Reqnumber}</td>
+                    <td  style="text-align:center !important">${Reqnumber}</td>
                     <td>${materialCode}</td>
                     <td>${materialName}</td>
-                    <td align="center">${quantity}</td>
+                    <td align="right">${quantity}</td>
                     <td>${uom}</td>
                     <td align="right">${itemRate}</td>
                     <td align="right">${basicval}</td>
@@ -6699,10 +6699,10 @@ if (!empty($INRSYMBOL)) {
             var html = `
                 <tr id="${temp}">
                     <td>${temp}</td>
-                    <td>${Reqnumber}</td>
+                    <td style="text-align:center !important">${Reqnumber}</td>
                     <td>${materialCode}</td>
                     <td>${materialName}</td>
-                    <td align="center">${quantity}</td>
+                    <td align="right">${quantity}</td>
                     <td>${uom}</td>
                     <td align="right">${itemRate}</td>
                     <td align="right">${basicval}</td>

app/Views/attendance.php

@@ -224,7 +224,7 @@ $currentday = date('d');
                     <div class="col-6">
                         <div class="page-title-box page-title-box-alt">
                         <div class="page-title-right">
-                                <ol class="breadcrumb m-0">
+                                <ol class="breadcrumb mt-0.99 mb-2.5"">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">HR</a></li>
                                     <li class="breadcrumb-item active">
                                     <h4 class="page-title">Attendance </h4>
@@ -234,9 +234,6 @@ $currentday = date('d');
 
                         </div>
                     </div>
-                    <div class="col-6 text-right">
-                        <!-- Right-aligned buttons or links can be added here -->
-                    </div>
                 </div>
                 <div class="row">
                     <div class="col-12">

app/Views/capitalpurchaseorder.php

@@ -787,16 +787,16 @@ if (!empty($INRSYMBOL)) {
                                     <thead>
                                         <tr>
                                             <th>SNo</th>
-                                            <th>Requisition No</th>
+                                            <th align="center">Requisition No</th>
                                             <th>Item Code</th>
                                             <th>Item Description</th>
                                             <th>Line Item Specs</th>
-                                            <th>Quantity</th>
+                                            <th align="right">Quantity</th>
                                             <th>UOM</th>
-                                            <th>Rate</th>
-                                            <th>Basic Amount</th>
-                                            <th>Tax Amount</th>
-                                            <th>Total Order Amount</th>
+                                            <th align="right">Rate</th>
+                                            <th align="right">Basic Amount</th>
+                                            <th align="right">Tax Amount</th>
+                                            <th align="right">Total Order Amount</th>
                                             <th>Action</th>
                                         </tr>
                                     </thead>
@@ -3526,10 +3526,10 @@ if (!empty($INRSYMBOL)) {
             var rowHtml = `
                     <tr id="${temp}">
                         <td align="left">${temp}</td>
-                        <td align="left">${Reqnumber}</td>
+                        <td align="center">${Reqnumber}</td>
                         <td align="left">${materialCode}</td>
                         <td align="left">${materialName}</td>
-                        <td>
+                        <td align="left">
 						<a href="#" class="editable-field" 
 						data-notes = "-" data-id ="${temp}">-</a>
 						<div class="edit-container" style="display:none;">
@@ -3538,12 +3538,12 @@ if (!empty($INRSYMBOL)) {
 								<button class="cancel-btn">✖</button>
 						</div>
                         </td>
-                        <td align="left">${quantity}</td>
+                        <td align="right">${quantity}</td>
                         <td align="left">${uom}</td>
-                        <td align="left">${itemRate}</td>
-                        <td align="left">${basicval}</td>
-                        <td align="left">${TotalTaxValue}</td>
-                        <td align="left">${Total}</td>
+                        <td align="right">${itemRate}</td>
+                        <td align="right">${basicval}</td>
+                        <td align="right">${TotalTaxValue}</td>
+                        <td align="right">${Total}</td>
                         <td>
                             <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;

app/Views/editCapitalAmendPO.php

@@ -797,22 +797,20 @@ if (!empty($POItem) && $CapitalRange == '1') {
                             </div>
                             <div class="form-row">
                                 <div class="table-responsive">
-                                    <table id="serviceTax" class="table table-striped table-hover mb-0"
+                                    <table id="serviceTax" class="table table-bordered table-hover mb-0"
                                         style="font-size:12px;">
                                         <thead>
-
-
                                             <tr>
-                                                <th>SNo</th>
-                                                <th>Requisition No</th>
-                                                <th>Item Name</th>
-                                                <th>Quantity</th>
-                                                <th>UOM</th>
-                                                <th>Rate</th>
-                                                <th>Basic Amount</th>
-                                                <th>Tax Amount</th>
-                                                <th>Total Order Amount</th>
-                                                <th>Action</th>
+                                                <th style="text-align:left !important">SNo</th>
+												<th style="text-align:center !important">Requisition No</th>
+												<th style="text-align:left !important">Item Name</th>
+                                                <th style="text-align:right !important">Quantity</th>
+												<th style="text-align:left !important">UOM</th>
+                                                <th style="text-align:right !important">Rate<?php echo "($INR)" ?></th>
+												<th style="text-align:right !important">Basic Amount<?php echo "($INR)" ?></th>
+												<th style="text-align:right !important">Tax Amount<?php echo "($INR)" ?></th>
+												<th style="text-align:right !important">Total Order Amount<?php echo "($INR)" ?></th>
+                                                <th style="text-align:left !important">Action</th>
                                             </tr>
                                         </thead>
 
@@ -826,16 +824,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                                     ?>
                                                     <tr id="<?php echo $index; ?>">
-                                                        <td align="left"><?php echo $index; ?></td>
-                                                        <td><?php echo $record->ReqNo ?></td>
-                                                        <td><?php echo $record->MaterialName ?></td>
-                                                        <td style="text-align:right"><?php echo $record->Quantity ?></td>
-                                                        <td><?php echo $record->UOM ?></td>
-                                                        <td style="text-align:right"><?php echo $record->Rate ?></td>
-                                                        <td style="text-align:right">
+                                                        <td style="text-align:left !important"><?php echo $index; ?></td>
+                                                        <td style="text-align:center !important"><?php echo $record->ReqNo ?></td>
+                                                        <td style="text-align:left !important"><?php echo $record->MaterialName ?></td>
+                                                        <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
+                                                        <td style="text-align:left !important"><?php echo $record->UOM ?></td>
+                                                        <td style="text-align:right !important"><?php echo number_format($record->Rate, 2, '.', ''); ?></td>
+                                                        <td style="text-align:right !important">
                                                             <?php echo number_format($record->Rate * $record->Quantity, 2, '.', ''); ?>
                                                         </td>
-                                                        <td style="text-align:right"><?php if ($CapitalRange == '1') {
+                                                        <td style="text-align:right !important"><?php if ($CapitalRange == '1') {
                                                             echo $record->ServiceTaxamount;
                                                         } else if ($CapitalRange == '0') {
                                                             echo "0.0";
@@ -845,12 +843,12 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                                             <!-- <td style="text-align:right"><?php echo $record->TotalValue + $record->Afvalue; ?></td> -->
 
-                                                            <td><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
+                                                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
                                                             </td>
 
                                                         <?php } else if ($CapitalRange == '0') { ?>
 
-                                                                <td style="text-align:right">
+                                                            <td style="text-align:right !important">
                                                                 <?php echo number_format(($record->Rate * $record->Quantity), 2, '.', ''); ?>
                                                                 </td>
                                                         <?php } ?>

app/Views/editCapitalPo.php

@@ -870,7 +870,7 @@ if (!empty($getlogpodtl)) {
               </div>
 
               <div class="form-row">
-                <!-- <div class="col-md-9" align="right" style="padding:10px"> -->
+                <!-- <div class="col-md-9" style="text-align:right !important" style="padding:10px"> -->
                 <!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
                 <!-- </div> -->
                 <div class="form-group col-md-12" align=" right">
@@ -888,16 +888,16 @@ if (!empty($getlogpodtl)) {
                   <thead>
                     <tr>
                       <th>SNo</th>
-                      <th>Requisition No</th>
+                      <th style="text-align:center !important">Requisition No</th>
                       <th>Item Code</th>
                       <th>Item Description</th>
                       <th>Line Item Specs</th>
-                      <th>Quantity</th>
+                      <th style="text-align:right !important">Quantity</th>
                       <th>UOM</th>
-                      <th>Rate<?php echo "($INR)" ?></th>
-                      <th>Basic Amount<?php echo "($INR)" ?></th>
-                      <th>Tax Amount<?php echo "($INR)" ?></th>
-                      <th>Total Order Amount<?php echo "($INR)" ?></th>
+                      <th style="text-align:right !important">Rate<?php echo "($INR)" ?></th>
+                      <th style="text-align:right !important">Basic Amount<?php echo "($INR)" ?></th>
+                      <th style="text-align:right !important">Tax Amount<?php echo "($INR)" ?></th>
+                      <th style="text-align:right !important">Total Order Amount<?php echo "($INR)" ?></th>
                       <!-- <th>Actual Quantity</th>
                         <th>Received Quantity</th>
                         <th>Pending Quantity</th> -->
@@ -920,7 +920,7 @@ if (!empty($getlogpodtl)) {
                         ?>
                         <tr id="<?php echo $index; ?>">
                           <td align="left"><?php echo $index; ?></td>
-                          <td><?php echo $record->ReqNo ?></td>
+                          <td style="text-align:center !important"><?php echo $record->ReqNo ?></td>
                           <td><?php echo $record->MaterialCode ?></td>
                           <td><?php echo $record->MaterialName ?></td>
                           <td>	
@@ -937,28 +937,28 @@ if (!empty($getlogpodtl)) {
 																</div>
 																<?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
                           </td>
-                          <td align="right"><?php echo $record->Quantity ?></td>
-                          <td align="right"><?php echo $record->UOM ?></td>
-                          <td align="right"><?php echo $record->Rate ?></td>
-                          <td align="right"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                          <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
+                          <td ><?php echo $record->UOM ?></td>
+                          <td style="text-align:right !important"><?php echo $record->Rate ?></td>
+                          <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
                           <?php if ($CapitalRange == '1') { ?>
-                            <td align="right"><?php echo $record->ServiceTaxamount; ?></td>
-                            <td align="right">
+                            <td style="text-align:right !important"><?php echo $record->ServiceTaxamount; ?></td>
+                            <td style="text-align:right !important">
                               <?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
                             </td>
 
                           <?php } ?>
                           <?php if ($CapitalRange == '0') { ?>
-                            <td align="right"><?php echo '0'; ?></td>
+                            <td style="text-align:right !important"><?php echo '0'; ?></td>
 
-                            <td align="right"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
+                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
 
                           <?php } ?>
 
 
-                          <!-- <td align="right"><?php echo $record->Quantity ?></td>
-                    <td align="right"><?php echo $record->ReceivedQuantity ?></td>
-                    <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
+                          <!-- <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
+                    <td style="text-align:right !important"><?php echo $record->ReceivedQuantity ?></td>
+                    <td style="text-align:right !important"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
                           <?php
                           $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
                           array_push($res_arr_values, $row);
@@ -990,11 +990,11 @@ if (!empty($getlogpodtl)) {
                           <input type="hidden" name="<?php echo 'quantity' . $index ?>"
                             id="<?php echo 'quantity' . $index ?>" value="<?php echo $record->Quantity; ?>" />
 
-                          <input align="right" type="hidden" name="<?php echo 'b4qty' . $index ?>"
+                          <input style="text-align:right !important" type="hidden" name="<?php echo 'b4qty' . $index ?>"
                             id="<?php echo 'b4qty' . $index ?>" value="<?php echo $record->Quantity; ?>" />
                           <input type="hidden" name="<?php echo 'itemRate' . $index ?>"
                             id="<?php echo 'itemRate' . $index ?>" value="<?php echo $record->Rate; ?>" />
-                          <input align="right" type="hidden" name="<?php echo 'b4rate' . $index ?>"
+                          <input style="text-align:right !important" type="hidden" name="<?php echo 'b4rate' . $index ?>"
                             id="<?php echo 'b4rate' . $index ?>" value="<?php echo $record->Rate; ?>" />
 
                           <?php if ($CapitalRange == '1') { ?>
@@ -1021,11 +1021,11 @@ if (!empty($getlogpodtl)) {
                             <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>"
                               id="<?php echo 'ServiceTotalOrderValue' . $index ?>"
                               value="<?php echo $record->ServiceTaxamount; ?>" />
-                            <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'DisType' . $index ?>"
                               id="<?php echo 'DisType' . $index ?>" value="<?php echo $record->discount; ?>" />
-                            <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'DisVal' . $index ?>"
                               id="<?php echo 'DisVal' . $index ?>" value="<?php echo $record->discountval; ?>" />
-                            <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>"
                               id="<?php echo 'AfterDisVal' . $index ?>" value="<?php echo $record->Afterdiscountval; ?>" />
                             <input type="hidden" name="<?php echo 'basicvalInINR' . $index ?>"
                               id="<?php echo 'basicvalInINR' . $index ?>"
@@ -1050,19 +1050,19 @@ if (!empty($getlogpodtl)) {
                           <?php } ?>
 
                           <?php if ($CapitalRange == '0') { ?>
-                            <input align="right" type="hidden" name="<?php echo 'FreightType' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'FreightType' . $index ?>"
                               id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
 
 
-                            <input align="right" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'NoOfTrip' . $index ?>"
                               id="<?php echo 'NoOfTrip' . $index ?>" value="<?php echo $record->NoOfTrip; ?>" />
 
 
-                            <input align="right" type="hidden" name="<?php echo 'FreightVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'FreightVal' . $index ?>"
                               id="<?php echo 'FreightVal' . $index ?>" value="<?php echo $record->FreightValue; ?>" />
 
 
-                            <input align="right" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'AfterFreightVal' . $index ?>"
                               id="<?php echo 'AfterFreightVal' . $index ?>"
                               value="<?php echo $record->AfterFreightValue; ?>" />
 
@@ -1159,13 +1159,13 @@ if (!empty($getlogpodtl)) {
                             <input type="hidden" name="<?php echo 'ServiceTotalOrderValue' . $index ?>"
                               id="<?php echo 'ServiceTotalOrderValue' . $index ?>" value="0" />
 
-                            <input align="right" type="hidden" name="<?php echo 'DisType' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'DisType' . $index ?>"
                               id="<?php echo 'DisType' . $index ?>" value="0" />
 
-                            <input align="right" type="hidden" name="<?php echo 'DisVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'DisVal' . $index ?>"
                               id="<?php echo 'DisVal' . $index ?>" value="0" />
 
-                            <input align="right" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>"
+                            <input style="text-align:right !important" type="hidden" name="<?php echo 'AfterDisVal' . $index ?>"
                               id="<?php echo 'AfterDisVal' . $index ?>" value="0" />
 
 
@@ -1564,7 +1564,7 @@ if (!empty($getlogpodtl)) {
                 </div>
               </div>
 
-              <div align="right" style="padding:3% 2%;">
+              <div style="text-align:right !important" style="padding:3% 2%;">
                 <div>
 
 
@@ -1957,7 +1957,7 @@ if (!empty($getlogpodtl)) {
               echo form_input($data);
               ?>
             </div>
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> CGST In % </label>
             </div>
 
@@ -1982,7 +1982,7 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row" id="ADDCAPdiv3" style="padding:0px">
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> SGST In % </label>
 
             </div>
@@ -2011,7 +2011,7 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row" id="ADDCAPdiv2" style="padding:0px">
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> IGST In % </label>
             </div>
 
@@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
 
           </div>
           <div class="form-row" id="ADDCAPdiv1" style="padding:0px">
-            <div class="col-md-9 col-md-offset-4" align="right">
+            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Other Allowances <?php echo "($INR)" ?></label>
             </div>
             <div class="form-group col-md-3">
@@ -2049,7 +2049,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="col-md-9 col-md-offset-4" align="right">
+            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Total Amount <?php echo "($INR)" ?></label>
             </div>
             <div class="form-group col-md-3">
@@ -2645,7 +2645,7 @@ if (!empty($getlogpodtl)) {
               ?>
             </div>
 
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> CGST In % <label>
             </div>
 
@@ -2669,7 +2669,7 @@ if (!empty($getlogpodtl)) {
             </div>
           </div>
           <div class="form-row" id="EDITCAPdiv1">
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> SGST In % </label>
             </div>
             <div class="form-group col-md-3">
@@ -2694,7 +2694,7 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row" id="EDITCAPdiv2">
-            <div class="form-group col-md-6" align="right">
+            <div class="form-group col-md-6" style="text-align:right !important">
               <label> IGST In % </label>
             </div>
 
@@ -2721,7 +2721,7 @@ if (!empty($getlogpodtl)) {
 
           </div>
           <div class="form-row" id="EDITCAPdiv3">
-            <div class="col-md-9 col-md-offset-4" align="right">
+            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Other Allowances <?php echo "($INR)" ?></label>
             </div>
 
@@ -2733,7 +2733,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="col-md-9 col-md-offset-4" align="right">
+            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Total Amount <?php echo "($INR)" ?></label>
             </div>
             <div class="form-group col-md-3">
@@ -3278,7 +3278,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
             <div class="form-row">
-              <div class="form-group col-md-6" align="right">
+              <div class="form-group col-md-6" style="text-align:right !important">
                 CGST In %
               </div>
               <div class="form-group col-md-3">
@@ -3295,7 +3295,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
             <div class="form-row" id="VIEWCAPdiv1" style="padding: 0px;">
-              <div class="form-group col-md-6" align="right">
+              <div class="form-group col-md-6" style="text-align:right !important">
                 SGST In %
               </div>
               <div class="form-group col-md-3">
@@ -3312,7 +3312,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
             <div class="form-row" id="VIEWCAPdiv2" style="padding: 0px;">
-              <div class="form-group col-md-6" align="right">
+              <div class="form-group col-md-6" style="text-align:right !important">
                 IGST In %
               </div>
               <div class="form-group col-md-3">
@@ -3329,7 +3329,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
             <div class="form-row" id="VIEWCAPdiv3" style="padding: 0px;">
-              <div class="col-md-9 col-md-offset-4" align="right">
+              <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
                 <label>Other Allowances <?php echo "($INR)" ?></label>
               </div>
               <div class="form-group col-md-3">
@@ -3340,7 +3340,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
             <div class="form-row" id="" style="padding: 0px;">
-              <div class="col-md-9 col-md-offset-4" align="right">
+              <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
                 <label>Total Amount <?php echo "($INR)" ?></label>
               </div>
               <div class="form-group col-md-3">
@@ -3642,7 +3642,7 @@ if (!empty($getlogpodtl)) {
                   <div class="form-group col-md-4">
                   </div>
                 </div>
-                <div class="form-group col-md-6" align="right" style="display:none;"> <label>Total Order Amount
+                <div class="form-group col-md-6" style="text-align:right !important" style="display:none;"> <label>Total Order Amount
                     :</label></div>
                 <div class="form-group col-md-6" style="display:none;">
                   <div class="form-group">
@@ -4792,12 +4792,12 @@ if (!empty($getlogpodtl)) {
 												<button class="cancel-btn">✖</button>
 											</div></td>`;
 						}else{ rowHtml += `<td>-</td>`; }
-                rowHtml += `<td align="right">${quantity}</td>
-                <td align="right">${uom}</td>
-                <td align="right">${itemRate}</td>
-                <td align="right">${basicval}</td>
-                <td align="right">${TotalTaxValue}</td>
-                <td align="right">${Total}</td>
+                rowHtml += `<td style="text-align:right !important">${quantity}</td>
+                <td style="text-align:right !important">${uom}</td>
+                <td style="text-align:right !important">${itemRate}</td>
+                <td style="text-align:right !important">${basicval}</td>
+                <td style="text-align:right !important">${TotalTaxValue}</td>
+                <td style="text-align:right !important">${Total}</td>
                 <td>
                     <a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
                         <i class="ri-pencil-fill" data-toggle="tooltip" ></i>

app/Views/editEmployeenew.php

@@ -244,6 +244,11 @@ if (!empty($EmpDetails)) {
                                                         <input type='file' onchange="readURL(this);" id="photo"
                                                             name="photo" />
 
+                                                        <?php if($Emp->ProfilePic){ ?>
+                                                            <br/>
+                                                            <label style="white-space: normal; word-wrap: break-word; overflow-wrap: break-word; width: 100%;"><span>previously uploaded profile picture - </span>
+													        <small><?= $Emp->ProfilePic; ?></small></label>
+                                                        <?php } ?>
 
                                                         <input type="hidden" name="oldImageName" id="Image"
                                                             value="<?php echo $Emp->ProfilePic; ?>" class="form-control"
@@ -697,25 +702,25 @@ if (!empty($EmpDetails)) {
                                                 <div class="col-md-11">
                                                     <div class="row">
                                                         <div class="col-md-3">
-                                                            <label>Bank Name</label>
+                                                            <label>Bank Name<span class="badge">*</span></label>
                                                             <input type="text" id="bankbranchname" name="bankbranchname"
                                                                 class="form-control"
                                                                 value="<?php echo $BankBranchName; ?>" required>
 
                                                         </div>
                                                         <div class="col-md-3">
-                                                            <label>Account Number</label>
+                                                            <label>Account Number<span class="badge">*</span></label>
                                                             <input type="text" id="accountno" maxlength="20"
                                                                 name="accountno" placeholder="Account Number"
                                                                 class="form-control"
                                                                 value="<?php echo $BankAccountNo; ?>"
-                                                                onkeypress="return isNumberKey(event)">
+                                                                onkeypress="return isNumberKey(event)" required>
                                                         </div>
                                                         <div class="col-md-3">
-                                                            <label>IFSC Code</label>
+                                                            <label>IFSC Code<span class="badge">*</span></label>
                                                             <input type="text" id="ifsccode" name="ifsccode" onkeyup="convertToUpperCase()"                                                    
                                                                 placeholder="IFSC Code" class="form-control"
-                                                                value="<?php echo $IFSCCode; ?>">
+                                                                value="<?php echo $IFSCCode; ?>" required>
                                                         </div>
                                                         <div class="col-md-3">
                                                             <label>Bank Address</label>
@@ -1905,6 +1910,48 @@ if (!empty($EmpDetails)) {
         }
 
     });
+    $('#ContactNumber').change(function() {
+
+var ContactNumber = $('#ContactNumber').val();
+
+if (getMobileValidation() && ContactNumber != "<?= $ContactNumber ?>") {
+    $('#loader').show();
+    $.ajax({
+        data: {
+            ContactNumber
+        },
+
+        type: "POST",
+        url: "<?php echo base_url(); ?>employeeMobileExist",
+        success: function(response) {
+            $('#loader').hide();
+
+            let responseCheck = response.data[0];
+            let responseContactNumber=response.data[0].ContactNumber;
+
+            if(responseCheck ){
+                if (responseContactNumber == ContactNumber) {
+        
+                var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number"
+                )
+               
+                    $('#ContactNumber').val('');
+                    $('#ContactNumber').focus();
+                    return false;
+
+            }
+            }
+
+        },
+        complete: function() {
+        $('#loader').hide(); // Ensure the loader is always hidden after the request completes
+    }
+
+    });
+} 
+
+});
+
     $('#panno').change(function () {
 
         var panNo = $('#panno').val();

app/Views/editImportAmendPO.php

@@ -1202,13 +1202,18 @@ if (!empty($RequistionDetails)) {
                                     <table id="ImportTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
                                         <thead>
                                             <tr>
-                                                <th>SNo</th>
-                                                <th>Requisition No</th>
-                                                <th>Item Name</th>
-                                                <th>Quantity</th>
-                                                <th>UOM</th>
-                                                <th>Rate<?php echo $INR ?></th>
-                                                <th>Basic Amount<?php echo $INR ?></th>
+                                            
+                                                        
+                                                        
+                                                        
+                                                        
+                                                <th style="text-align:left !important">SNo</th>
+                                                <th style="text-align:center !important">Requisition No</th>
+                                                <th style="text-align:left !important">Item Name</th>
+                                                <th style="text-align:right !important">Quantity</th>
+                                                <th style="text-align:left !important">UOM</th>
+                                                <th style="text-align:right !important">Rate<?php echo $INR ?></th>
+                                                <th style="text-align:right !important">Basic Amount<?php echo $INR ?></th>
                                                 <!-- <th>Tax Amount</th>
                                                             <th>Total Order Amount</th> -->
                                                 <th>Action</th>
@@ -1225,13 +1230,13 @@ if (!empty($RequistionDetails)) {
 
                                             ?>
                                                     <tr id="<?php echo $index; ?>">
-                                                        <td align="left"><?php echo $index; ?></td>
-                                                        <td><?php echo $record->ReqNo ?></td>
+                                                        <td><?php echo $index; ?></td>
+                                                        <td style="text-align:center !important"><?php echo $record->ReqNo ?></td>
                                                         <td><?php echo $record->MaterialName ?></td>
-                                                        <td><?php echo $record->Quantity ?></td>
+                                                        <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
                                                         <td><?php echo $record->UOM ?></td>
-                                                        <td><?php echo $record->Rate ?></td>
-                                                        <td><?php echo $record->BasicValue ?></td>
+                                                        <td style="text-align:right !important"><?php echo $record->Rate ?></td>
+                                                        <td style="text-align:right !important"><?php echo $record->BasicValue ?></td>
                                                         <!-- <td><?php echo $record->Taxamount ?></td>
                                                             <td><?php echo $record->TotalOrderValue ?></td> -->
                                                         <input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />

app/Views/editRawmaterial.php

@@ -26,6 +26,7 @@ if (!empty($materialDetails)) {
         $UOM = $MD->UOM;
         $remarks = $MD->Remarks;
         $HSNcode = $MD->HSNCODE;
+        $material_rate = $MD->material_rate;
         $openstock = $MD->stock;
         $date = $MD->stockdate;
         $reorder = $MD->reorder;
@@ -161,25 +162,25 @@ if ($total <= $reorder) {
                                                         </select>
                                                     </div>
                                                 </div>
-                                               
+
                                                 <div class="col-md-3">
                                                     <div class="form-group">
                                                         <label for="MaterialCategory">Material Category
-                                                        <span class="badge">*</span></label>
-                                                                <!-- <i type="button" class="fe-plus-circle" id="addMaterialCaterogyModalButton" 
+                                                            <span class="badge">*</span></label>
+                                                        <!-- <i type="button" class="fe-plus-circle" id="addMaterialCaterogyModalButton" 
                                                                 style="font-size: 16px; color:rgb(15, 155, 218);" data-toggle="modal" data-target="#addMaterialCaterogyModal" 
                                                                 title="Add Material Caterogy">
                                                                 </i> -->
-                                                        <select class="form-control select2" id="MaterialCategory" name="MaterialCategory" required>    
-                                                                    <?php
-                                                                if (!empty($materialCategory)) {
-                                                                    foreach ($materialCategory as $SID) {
-                                                                ?>
-                                                                        <option value="<?php echo $SID->Key ?>" <?php if ($MaterialCategory === $SID->Key) echo "selected"; ?>><?php echo $SID->ConfigValue ?></option>
-                                                                <?php
-                                                                    }
+                                                        <select class="form-control select2" id="MaterialCategory" name="MaterialCategory" required>
+                                                            <?php
+                                                            if (!empty($materialCategory)) {
+                                                                foreach ($materialCategory as $SID) {
+                                                            ?>
+                                                                    <option value="<?php echo $SID->Key ?>" <?php if ($MaterialCategory === $SID->Key) echo "selected"; ?>><?php echo $SID->ConfigValue ?></option>
+                                                            <?php
                                                                 }
-                                                                ?>
+                                                            }
+                                                            ?>
                                                         </select>
                                                     </div>
                                                 </div>
@@ -211,6 +212,12 @@ if ($total <= $reorder) {
                                                         <input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)">
                                                     </div>
                                                 </div>
+                                                <div class="col-md-3">
+                                                    <div class="form-group">
+                                                        <label for="Rate">Rate<span class="badge">*</span></label>
+                                                        <input type="text" class="form-control" id="material_rate" onkeypress="return isNumberKey(event)" value="<?php echo $material_rate; ?>" name="material_rate" required>
+                                                    </div>
+                                                </div>
                                                 <?php if ($openstock != "") { ?>
                                                     <div class="col-md-3">
                                                         <div class="form-group">
@@ -226,7 +233,8 @@ if ($total <= $reorder) {
                                                         </div>
                                                     </div>
                                                 <?php } ?>
-
+                                            </div>
+                                            <div class="form-row mb-3">
                                                 <?php if ($date != "") { ?>
                                                     <div class="col-md-3">
                                                         <div class="form-group">
@@ -242,9 +250,6 @@ if ($total <= $reorder) {
                                                         </div>
                                                     </div>
                                                 <?php } ?>
-                                            </div>
-                                            <div class="form-row mb-3">
-
                                                 <div class="col-md-3">
                                                     <div class="form-group">
                                                         <label for="reorder">Reorder Level</label>
@@ -264,19 +269,27 @@ if ($total <= $reorder) {
                                                         <input type="text" class="form-control" id="avg_price" name="avg_price" readonly value="<?php echo $Average_Value ?>" maxlength="255">
                                                     </div>
                                                 </div>
+                                            </div>
+                                            <div class="form-row mb-3">
                                                 <div class="col-md-3">
                                                     <div class="form-group">
                                                         <label for="remarks">Remarks</label>
                                                         <input type="text" class="form-control" id="remarks" name="remarks" maxlength="255" value="<?php echo $remarks; ?>">
                                                     </div>
                                                 </div>
-                                            </div>
-                                            <div class="form-row mb-3">
-
+                                                        <div class="col-md-3">
+                                                            <div class="form-group">
+                                                                <label class="switch">
+                                                                    <input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive; ?> />
+                                                                    <span class="slider"></span>
+                                                                </label>
+                                                                <label class="mt-4">Is Active</label>
+                                                            </div>
+                                                        </div>
                                                 <div class="col-md-2">
                                                     <div class="form-group">
-                                                        <label for="isactive">Is Active</label><br />
-                                                        <input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive; ?>>
+                                                        
+                                                        
                                                     </div>
                                                 </div>
                                             </div>
@@ -284,9 +297,9 @@ if ($total <= $reorder) {
                                     </div>
                                 </div>
                                 <div class="box-footer text-right">
-                                <button type="button" class="btn btn-secondary" onclick="history.back()">
-                                    <span class="bold">Cancel</span>
-                                </button>
+                                    <button type="button" class="btn btn-secondary" onclick="history.back()">
+                                        <span class="bold">Cancel</span>
+                                    </button>
                                     <input type="button" id="editRawMaterialBtnId" class="btn btn-success" value="Submit" />
                                 </div>
                             </form>
@@ -304,28 +317,28 @@ if ($total <= $reorder) {
 <!-- modal -->
 
 <div class="modal fade" id="addMaterialCaterogyModal" tabindex="-1" aria-labelledby="addMaterialCaterogyModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="addMaterialCaterogyModalLabel">Add Material Category</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form id="addMaterialCategoryForm">
-          <div class="form-group">
-            <label for="materialCategoryInput">Material Category</label>
-            <input type="text" class="form-control" id="materialCategoryInput" placeholder="Enter material category">
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" onclick="addMaterialCategory()">Save Category</button>
-      </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="addMaterialCaterogyModalLabel">Add Material Category</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form id="addMaterialCategoryForm">
+                    <div class="form-group">
+                        <label for="materialCategoryInput">Material Category</label>
+                        <input type="text" class="form-control" id="materialCategoryInput" placeholder="Enter material category">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary" onclick="addMaterialCategory()">Save Category</button>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 
 
@@ -399,14 +412,14 @@ if ($total <= $reorder) {
         return true;
     }
 
-    $('#editRawMaterialBtnId').click(function(){
+    $('#editRawMaterialBtnId').click(function() {
 
         var materialName = $('#MaterialName').val();
         var materialCode = $('#RMcode').val();
         var materialCategory = $('#MaterialCategory').val();
         var materialType = $('#MaterialType').val();
 
-        if(materialName == ''){
+        if (materialName == '') {
             return;
         }
 
@@ -414,31 +427,35 @@ if ($total <= $reorder) {
 
         $('#loader').show();
         $.ajax({
-            data: {materialCode,materialName,materialCategory},
+            data: {
+                materialCode,
+                materialName,
+                materialCategory
+            },
             type: "POST",
             url: "<?php echo base_url(); ?>materialExist",
             success: function(data) {
 
                 if (data && data.length >= 1) {
                     $('#loader').hide();
-                        let message = ""; 
-                        if (data[0]?.IsActive == 1) {
-                            message = "Material name already exists!\n\n";
-                        } else {
-                            message = "Material name already exists in the deleted section!\n\n";
-                        }
+                    let message = "";
+                    if (data[0]?.IsActive == 1) {
+                        message = "Material name already exists!\n\n";
+                    } else {
+                        message = "Material name already exists in the deleted section!\n\n";
+                    }
 
-                        let related_name = "";
-                        $.each(data, function(i, obj) {
-                            related_name += obj.MaterialCode + " - " + obj.MaterialName + " - " + obj.MaterialType + " - " + obj.CategoryName + "\n";
-                        });
+                    let related_name = "";
+                    $.each(data, function(i, obj) {
+                        related_name += obj.MaterialCode + " - " + obj.MaterialName + " - " + obj.MaterialType + " - " + obj.CategoryName + "\n";
+                    });
 
-                        message += "'" + materialName + "' - related materials are:\n\n" + related_name;
+                    message += "'" + materialName + "' - related materials are:\n\n" + related_name;
 
-                        alert(message);
+                    alert(message);
 
-                        $("#MaterialName").val('');
-                        $("#MaterialName").focus();
+                    $("#MaterialName").val('');
+                    $("#MaterialName").focus();
                 } else {
                     $('#loader').hide();
                     console.log("working")
@@ -450,7 +467,7 @@ if ($total <= $reorder) {
                 $('#loader').hide();
                 alert("Error Occur");
             },
-            complete: function(){
+            complete: function() {
                 $('#loader').hide();
                 console.log("Ajax completed..!!");
             }
@@ -461,7 +478,7 @@ if ($total <= $reorder) {
 
 
 <script>
-    function addMaterialCategory (){
+    function addMaterialCategory() {
 
         $('#materialCategoryInput').val()
 
@@ -482,11 +499,9 @@ if ($total <= $reorder) {
 
 
 <script>
-
-$(document).on('keydown', function(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault(); // Prevent default Enter key behavior
-    }
-});
-
-</script>  
+    $(document).on('keydown', function(event) {
+        if (event.key === 'Enter') {
+            event.preventDefault(); // Prevent default Enter key behavior
+        }
+    });
+</script>

app/Views/editRevenueAmendPO.php

@@ -1218,16 +1218,16 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							<br>
 							<div class="form-row">
-								<div class="table-responsive">
-									<table id="revenueTax" class="table table-striped table-hover mb-0"
+							    <div class="table-responsive" style="padding-bottom: 30px;">
+									<table id="ServiceTable" class="table table-bordered table-hover mb-0"
 										style="font-size:12px;">
 										<thead>
 
 											<tr>
 												<th>SNo</th>
-												<th>Requisition No</th>
+												<th class="text-center">Requisition No</th>
 												<th>Item Name</th>
-												<th class="text-center">Quantity</th>
+												<th class="text-right">Quantity</th>
 												<th>UOM</th>
 												<th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
 												<th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
@@ -1248,17 +1248,17 @@ if (!empty($INRSYMBOL)) {
 													?>
 													<tr id="<?php echo $index; ?>">
 														<td align="left"><?php echo $index; ?></td>
-														<td><?php echo $record->ReqNo ?></td>
+														<td class="text-center"><?php echo $record->ReqNo ?></td>
 														<td><?php echo $record->MaterialName ?></td>
-														<td align="center"><?php echo $record->Quantity ?></td>
+														<td class="text-right"><?php echo $record->Quantity ?></td>
 														<td><?php echo $record->UOM ?></td>
-														<td align="right"><?php echo $record->Rate ?></td>
+														<td class="text-right"><?php echo $record->Rate ?></td>
 
-														<td align="right">
+														<td class="text-right">
 															<?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
 
-														<td align="right"><?php echo $record->Taxamount ?></td>
-														<td align="right"><?php echo $record->TotalValue ?></td>
+														<td class="text-right"><?php echo $record->Taxamount ?></td>
+														<td class="text-right"><?php echo $record->TotalValue ?></td>
 														<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>"
 															id="<?php echo 'Reqnumber' . $index ?>"
 															value="<?php echo $record->ReqNo; ?>" />

app/Views/editRevenuepurchaseorder.php

@@ -2332,13 +2332,13 @@ if (!empty($getlogpodtl)) {
 										<thead>
 
 											<tr>
-												<th style="text-align:center !important">SNo</th>
+												<th style="text-align:left !important">SNo</th>
 												<th style="text-align:center !important">Requisition No</th>
-												<th style="text-align:center !important">Item Code</th>
+												<th style="text-align:left !important">Item Code</th>
 												<th style="text-align:left !important">Item Description</th>
-												<th style="text-align:center !important">Line Item Specs</th>
-												<th style="text-align:center !important">Quantity</th>
-												<th style="text-align:center !important">UOM</th>
+												<th style="text-align:left !important">Line Item Specs</th>
+												<th style="text-align:right !important">Quantity</th>
+												<th style="text-align:left !important">UOM</th>
 												<th style="text-align:right !important">Rate <?php echo "($INRSYM)" ?>
 												</th>
 												<th style="text-align:right !important">Basic Amount
@@ -2353,7 +2353,7 @@ if (!empty($getlogpodtl)) {
 												<!-- <th>Actual Quantity</th>
 													<th>Received Quantity</th>
 													<th>Pending Quantity</th> -->
-												<th style="text-align:center !important">Action</th>
+												<th style="text-align:left !important">Action</th>
 											</tr>
 										</thead>
 										<tbody id='RevenueAppend'>
@@ -2365,11 +2365,11 @@ if (!empty($getlogpodtl)) {
 													$index = $index + 1;
 													?>
 													<tr id="<?php echo $index; ?>">
-														<td align="center"><?php echo $index; ?></td>
+														<td align="left"><?php echo $index; ?></td>
 														<td align="center"><?php echo $record->ReqNo ?></td>
-														<td align="center"><?php echo $record->MaterialCode ?></td>
+														<td align="left"><?php echo $record->MaterialCode ?></td>
 														<td align="left"><?php echo $record->MaterialName ?></td>
-														<td>	
+														<td align="left">	
 																<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
 																<a href="#" 
 																class="editable-field" 
@@ -2383,8 +2383,8 @@ if (!empty($getlogpodtl)) {
 																</div>
 																<?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
                                                     	</td>
-														<td align="center"><?php echo $record->Quantity ?></td>
-														<td align="center"><?php echo $record->UOM ?></td>
+														<td align="right"><?php echo $record->Quantity ?></td>
+														<td align="left"><?php echo $record->UOM ?></td>
 														<td align="right"><?php echo $record->Rate ?></td>
 
 														<td align="right">
@@ -4505,11 +4505,11 @@ if (!empty($getlogpodtl)) {
 			var rowHtml = `
 				<tr id="${temp}">
 					<td align="left">${temp}</td>
-					<td align="left">${Reqnumber}</td>
+					<td align="center">${Reqnumber}</td>
 					<td align="left">${materialCode}</td>
 					<td align="left">${materialName}</td>`;
 						if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") {
-							rowHtml += `<td><a href="#" class="editable-field" 
+							rowHtml += `<td align="left"><a href="#" class="editable-field" 
 											data-id="${temp}"
 											data-notes="-">-</a>
 											<div class="edit-container" style="display:none;">
@@ -4517,9 +4517,9 @@ if (!empty($getlogpodtl)) {
 												<button class="save-btn">✔</button>
 												<button class="cancel-btn">✖</button>
 											</div></td>`;
-						}else{ rowHtml += `<td>-</td>`; }
+						}else{ rowHtml += `<td align="left">-</td>`; }
 					rowHtml += `
-						<td align="left">${quantity}</td>
+						<td align="right">${quantity}</td>
 						<td align="left">${uom}</td>
 						<td align="right">${itemRate}</td>
 						<td align="right">${basicval}</td>

app/Views/editServiceAmendPO.php

@@ -1016,18 +1016,18 @@ foreach ($PaymentTerms as $TER) {
 								<thead>
 									<tr>
 										<th>SNo</th>
-										<th>Requisition No</th>
+										<th style="text-align:center !important">Requisition No</th>
 										<th>Item Code</th>
 										<th>Item Name</th>
-										<th>Quantity</th>
+										<th style="text-align:right !important">Quantity</th>
 										<th>UOM</th>
-										<th>Rate<?php echo $INRSYM ?></th>
-										<th>Basic Amount<?php echo $INRSYM ?></th>
-										<th>Tax Amount<?php echo $INRSYM ?></th>
-										<th>Total Order Amount<?php echo $INRSYM ?></th>
-										<th>Actual Quantity</th>
-										<th>Received Quantity</th>
-										<th>Pending Quantity</th>
+										<th style="text-align:right !important">Rate<?php echo "($INRSYM)" ?></th>
+										<th style="text-align:right !important">Basic Amount<?php echo "($INRSYM)" ?></th>
+										<th style="text-align:right !important">Tax Amount<?php echo "($INRSYM)" ?></th>
+										<th style="text-align:right !important">Total Order Amount<?php echo "($INRSYM)" ?></th>
+										<th style="text-align:right !important">Actual Quantity</th>
+										<th style="text-align:right !important">Received Quantity</th>
+										<th style="text-align:right !important">Pending Quantity</th>
 										<th>Action</th>
 									</tr>
 								</thead>
@@ -1053,19 +1053,19 @@ foreach ($PaymentTerms as $TER) {
 
 									?>
 											<tr id="<?php echo $index; ?>">
-												<td align="left"><?php echo $index; ?></td>
-												<td><?php echo $record->ReqNo ?> </td>
+												<td><?php echo $index; ?></td>
+												<td style="text-align:center !important"><?php echo $record->ReqNo ?> </td>
 												<td><?php echo $record->MaterialCode ?></td>
 												<td><?php echo $record->MaterialName ?></td>
-												<td><?php echo $record->Quantity ?></td>
+												<td style="text-align:right !important"><?php echo $record->Quantity ?></td>
 												<td><?php echo $record->UOM ?></td>
-												<td><?php echo $record->Rate ?></td>
-												<td><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
-												<td><?php echo $record->Taxamount ?></td>
-												<td><?php echo $record->TotalValue ?></td>
-												<td><?php echo $record->Quantity ?></td>
-												<td><?php echo $record->ReceivedQuantity ?></td>
-												<td><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
+												<td style="text-align:right !important"><?php echo $record->Rate ?></td>
+												<td style="text-align:right !important"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
+												<td style="text-align:right !important"><?php echo $record->Taxamount ?></td>
+												<td style="text-align:right !important"><?php echo $record->TotalValue ?></td>
+												<td style="text-align:right !important"><?php echo $record->Quantity ?></td>
+												<td style="text-align:right !important"><?php echo $record->ReceivedQuantity ?></td>
+												<td style="text-align:right !important"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
 
 
 												<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />

app/Views/editimportpo.php

@@ -828,15 +828,15 @@ if (!empty($getlogpodtl)) {
                                 <table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
                                     <thead>
                                         <tr>
-                                            <th>SNo</th>
-                                            <th>Requisition No</th>
-                                            <th>Material Code</th>
-                                            <th>Description</th>
-                                            <th>Line Item Specs</th>
-                                            <th>Quantity</th>
-                                            <th>UOM</th>
-                                            <th>Rate<?php echo $INR ?></th>
-                                            <th>Basic Amount<?php echo $INR ?></th>
+                                            <th style="text-align:left !important">SNo</th>
+                                            <th style="text-align:center !important">Requisition No</th>
+                                            <th style="text-align:left !important">Material Code</th>
+                                            <th style="text-align:left !important">Description</th>
+                                            <th style="text-align:left !important">Line Item Specs</th>
+                                            <th style="text-align:right !important">Quantity</th>
+                                            <th style="text-align:left !important">UOM</th>
+                                            <th style="text-align:right !important">Rate<?php echo "($INR)" ?></th>
+                                            <th style="text-align:right !important">Basic Amount<?php echo "($INR)" ?></th>
                                             <!-- <th>Received Qty</th>
                                                 <th>Rejected Qty</th>
                                                 <th>Pending Qty</th> -->
@@ -857,10 +857,10 @@ if (!empty($getlogpodtl)) {
                                         ?>
                                                 <tr id="<?php echo $index; ?>">
                                                     <td align="left"><?php echo $index; ?></td>
-                                                    <td><?php echo $record->ReqNo ?></td>
-                                                    <td><?php echo $record->MaterialCode ?></td>
-                                                    <td><?php echo $record->MaterialName ?></td>
-                                                    <td>	
+                                                    <td align="center"><?php echo $record->ReqNo ?></td>
+                                                    <td align="left"><?php echo $record->MaterialCode ?></td>
+                                                    <td align="left"><?php echo $record->MaterialName ?></td>
+                                                    <td align="left">
 																<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
 																<a href="#" 
 																class="editable-field" 
@@ -874,10 +874,10 @@ if (!empty($getlogpodtl)) {
 																</div>
 																<?php }else{ echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
                                                     	    </td>
-                                                    <td><?php echo $record->Quantity ?></td>
-                                                    <td><?php echo $record->UOM ?></td>
-                                                    <td><?php echo $record->Rate ?></td>
-                                                    <td><?php echo $record->BasicValue ?></td>
+                                                    <td align="right"><?php echo $record->Quantity ?></td>
+                                                    <td align="left"><?php echo $record->UOM ?></td>
+                                                    <td align="right"><?php echo $record->Rate ?></td>
+                                                    <td align="right"><?php echo $record->BasicValue ?></td>
                                                     <!-- <td><?php echo $record->ReceivedQuantity ?></td> -->
                                                     <!-- <td><?php echo $record->QuantityRejected ?></td> -->
                                                     <!-- <td><?php echo $record->PendingQty ?></td>  -->

app/Views/importpo.php

@@ -813,19 +813,20 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
                             </div>
                             <br />
-                            <div class="form-row">
-                                <table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                            <div class="form-row table-responsive" style="padding-bottom: 30px;">
+									<table id="ImportTax" class="table table-bordered table-hover mb-0"
+										style="font-size:12px;">
                                     <thead>
                                         <tr>
                                             <th>SNo</th>
-                                            <th>Requisition No</th>
+                                            <th style="text-align:right !important">Requisition No</th>
                                             <th>Material Code</th>
                                             <th>Description</th>
                                             <th>Line Item Specs</th>
-                                            <th>Quantity</th>
+                                            <th style="text-align:right !important">Quantity</th>
                                             <th>UOM</th>
-                                            <th>Rate<?php echo $INR ?></th>
-                                            <th>Basic Amount<?php echo $INR ?></th>
+                                            <th style="text-align:right !important">Rate<?php echo "($INR)" ?></th>
+                                            <th style="text-align:right !important">Basic Amount<?php echo "($INRSYM)" ?></th>
                                             <!-- <th>Received Qty</th> -->
                                             <!-- <th>Rejected Qty</th> -->
                                             <!-- <th>Pending Qty</th> -->
@@ -3515,11 +3516,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             // }));
             var rowHtml = `
     <tr id="${temp}">
-        <td align="left">${temp}</td>
-        <td align="left">${Reqnumber}</td>
-        <td align="left">${materialCode}</td>
-        <td align="left">${materialName}</td>
-        <td>
+        <td style="text-align:left !important">${temp}</td>
+        <td style="text-align:right !important">${Reqnumber}</td>
+        <td style="text-align:left !important">${materialCode}</td>
+        <td style="text-align:left !important">${materialName}</td>
+        <td style="text-align:left !important">
 						<a href="#" class="editable-field" 
 						data-notes = "-" data-id ="${temp}">-</a>
 						<div class="edit-container" style="display:none;">
@@ -3528,10 +3529,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 								<button class="cancel-btn">✖</button>
 						</div>
         </td>
-        <td align="left">${quantity}</td>
-        <td align="left">${uom}</td>
-        <td align="left">${itemRate}</td>
-        <td align="left">${BasicAmt}</td>
+        <td style="text-align:right !important">${quantity}</td>
+        <td style="text-align:left !important">${uom}</td>
+        <td style="text-align:right !important">${itemRate}</td>
+        <td style="text-align:right !important">${BasicAmt}</td>
         <td>
             <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
                 <i class="ri-pencil-fill" data-toggle="tooltip"></i>

app/Views/inwardgateregister.php

@@ -23,7 +23,7 @@
 				<div class="col-12">
 					<div class="page-title-box page-title-box-alt">
 					<div class="page-title-right">
-                                <ol class="breadcrumb m-0">
+                                <ol class="breadcrumb mt-2 mb-2.5">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
                                     <li class="breadcrumb-item active">
                                     <h4 class="page-title">Inward Gate Register</h4>
@@ -91,7 +91,7 @@
 									</div>
 									<div class="form-group col-md-3">
 										<label class="col-form-label">Invoice Date<span class="text-danger">*</span></label>
-										<input  class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
+										<input  class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off" data-date-orientation="bottom">
 									</div>
 
 
@@ -99,7 +99,7 @@
 
 									<div class="form-group col-md-3">
 										<label class="col-form-label">Material Received Date<span class="text-danger">*</span></label>
-										<input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
+										<input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off" data-date-orientation="bottom">
 									</div>
 									<div class="form-group col-md-3">
 

app/Views/leavereports.php

@@ -25,7 +25,7 @@
 					<div class="col-6">
 						<div class="page-title-box page-title-box-alt">
 						<div class="page-title-right">
-                                <ol class="breadcrumb m-0">
+                                <ol class="breadcrumb mt-2 mb-2.5">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">HR</a></li>
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Leave</a></li>
                                     <li class="breadcrumb-item active">
@@ -46,8 +46,8 @@
 					<div class="col-12">
 						<div class="card">
 							<form action="<?php echo base_url() ?>leavereports" method="POST" id="searchList">
-								<div class="row">
-									<div class="col-md-3" style="margin: 10px;">
+								<div class="row" style="padding: 18px 26px;">
+									<div class="col-md-3" style="margin: 10px 0px;">
 										<?php if (!empty($fiscalyears)) {
 											foreach ($fiscalyears as $fy):
 												$options[$fy] =  $fy;

app/Views/monthlypayinputs.php

@@ -111,7 +111,7 @@
                     <div class="col-6">
                         <div class="page-title-box page-title-box-alt">
                         <div class="page-title-right">
-                                <ol class="breadcrumb m-0">
+                                <ol class="breadcrumb mt-2 mb-2.5">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">HR</a></li>
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">PaySlip</a></li>
                                     <li class="breadcrumb-item active">

app/Views/publicholidays.php

@@ -13,8 +13,9 @@
         <div class="row">
           <div class="col-6">
             <div class="page-title-box page-title-box-alt">
-            <div class="page-title-right">
-                                <ol class="breadcrumb m-0">
+            <div class="page-title-right"> <!-- style="margin: 15px 0;" -->
+                                <!-- <ol class="breadcrumb mt-0"> -->
+                                <ol class="breadcrumb mt-2 mb-2.5">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">HR</a></li>
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Leave</a></li>
                                     <li class="breadcrumb-item active">
@@ -22,7 +23,6 @@
                                     </li>
                                 </ol>
                             </div>
-         
             </div>
           </div>
         </div>

app/Views/purchaseorder.php

@@ -2160,17 +2160,17 @@ if (!empty($INRSYMBOL)) {
 									<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
 										<thead>
 											<tr>
-												<th>SNo</th>
-												<th>Requisition No</th>
+											    <th>SNo</th>
+												<th style="text-align:left !important">Requisition No</th>
 												<th>Item Code</th>
 												<th>Item Description</th>
 												<th>Line Item Specs</th>
-												<th>Quantity</th>
+												<th style="text-align:right !important">Quantity</th>
 												<th>UOM</th>
-												<th>Rate <?php echo "($INRSYM)" ?></th>
-												<th>Basic Amount <?php echo "($INRSYM)" ?></th>
-												<th>Tax Amount <?php echo "($INRSYM)" ?></th>
-												<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Rate<?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Basic Amount<?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Tax Amount<?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Total Order Amount<?php echo "($INRSYM)" ?></th>
 												<th>Action</th>
 											</tr>
 										</thead>
@@ -3450,11 +3450,11 @@ if (!empty($INRSYMBOL)) {
 			// Define your template using ES6 template literals
 			var rowHtml = `
 	<tr id="${temp}">
-		<td align="left">${temp}</td>
-		<td align="left">${Reqnumber}</td>
-		<td align="left">${materialCode}</td>
-		<td align="left">${materialName}</td>
-		<td>
+		<td style="text-align:left !important">${temp}</td>
+		<td style="text-align:left !important">${Reqnumber}</td>
+		<td style="text-align:left !important">${materialCode}</td>
+		<td style="text-align:left !important">${materialName}</td>
+		<td style="text-align:left !important">
 						<a href="#" class="editable-field" 
 						data-notes = "-" data-id ="${temp}">-</a>
 						<div class="edit-container" style="display:none;">
@@ -3463,12 +3463,12 @@ if (!empty($INRSYMBOL)) {
 								<button class="cancel-btn">✖</button>
 						</div>
         </td>
-		<td align="right">${quantity}</td>
-		<td align="left">${uom}</td>
-		<td align="right">${itemRate}</td>
-		<td align="right">${basicval}</td>
-		<td align="right">${TotalTaxValue}</td>
-		<td align="right">${TotalOrderValue}</td>
+		<td style="text-align:right !important">${quantity}</td>
+		<td style="text-align:left !important">${uom}</td>
+		<td style="text-align:right !important">${itemRate}</td>
+		<td style="text-align:right !important">${basicval}</td>
+		<td style="text-align:right !important">${TotalTaxValue}</td>
+		<td style="text-align:right !important">${TotalOrderValue}</td>
 		<td>
 			<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
 				<i class="ri-pencil-fill" data-toggle="tooltip"></i>

app/Views/servicePurchaseorder.php

@@ -1048,16 +1048,16 @@ if (!empty($INRSYMBOL)) {
 										<thead>
 											<tr>
 												<th>SNo</th>
-												<th>Requisition No</th>
+												<th style="text-align:center !important">Requisition No</th>
 												<th>Item Code</th>
 												<th>Item Name</th>
 												<th>Line Item Specs</th>
-												<th>Quantity</th>
+												<th style="text-align:right !important">Quantity</th>
 												<th>UOM</th>
-												<th>Rate <?php echo "($INRSYM)" ?></th>
-												<th>Basic Amount <?php echo "($INRSYM)" ?></th>
-												<th>Tax Amount <?php echo "($INRSYM)" ?></th>
-												<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Rate <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Basic Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Tax Amount <?php echo "($INRSYM)" ?></th>
+												<th style="text-align:right !important">Total Order Amount <?php echo "($INRSYM)" ?></th>
 												<th>Action</th>
 											</tr>
 										</thead>
@@ -1977,10 +1977,10 @@ if (!empty($INRSYMBOL)) {
 
 			var rowHtml = `
 				<tr id="${temp}">
-					<td align="left">${temp}</td>
-					<td align="left">${Reqnumber}</td>
-					<td align="left">${materialCode}</td>
-					<td align="left">${materialName}</td>
+					<td>${temp}</td>
+					<td style="text-align:center !important">${Reqnumber}</td>
+					<td>${materialCode}</td>
+					<td>${materialName}</td>
 					<td>
                             <a href="#" class="editable-field" 
                             data-notes = "-" data-id ="${temp}">-</a>
@@ -1990,12 +1990,12 @@ if (!empty($INRSYMBOL)) {
                                     <button class="cancel-btn">✖</button>
                             </div>
         			</td>
-					<td align="left">${quantity}</td>
-					<td align="left">${uom}</td>
-					<td align="left">${itemRate}</td>
-					<td align="left">${basicval}</td>
-					<td align="left">${TotalTaxValue}</td>
-					<td align="left">${TotalOrderValue}</td>
+					<td style="text-align:right !important">${quantity}</td>
+					<td>${uom}</td>
+					<td style="text-align:right !important">${itemRate}</td>
+					<td style="text-align:right !important">${basicval}</td>
+					<td style="text-align:right !important">${TotalTaxValue}</td>
+					<td style="text-align:right !important">${TotalOrderValue}</td>
 					<td>
 						<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
 							<i class="ri-pencil-fill" data-toggle="tooltip"></i>

app/Views/viewinwardgateregister.php

@@ -251,8 +251,12 @@
 											<td><?php echo $record->SupplierName ?></td>
 											<td><?php echo $record->DeliveryChellanOrInvoiceNo ?></td>
 											<td align="right"><?php
-													$date = new DateTime($record->DeliveryChellanDate);
-													echo $date->format('d-m-Y'); ?></td> 
+											        $invdate = $record->DeliveryChellanDate;
+											        if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){
+														echo "";
+													}else{
+													$date = new DateTime($invdate);
+													echo $date->format('d-m-Y'); } ?></td> 
 											<td align="center" 
 											 style=" display : none ;"><?php echo $record->itemCount ?></td>
 											 
@@ -937,13 +941,15 @@
 							}
 
 							// Format dates
-							var dcd = new Date(item.DeliveryChellanDate);
-							var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
-							$("#InvoiceDate").val(dcd2);
-							console.log(item.MaterialRcvdDate)
+							// (item.DeliveryChellanDate && item.DeliveryChellanDate !== "0000-00-00 00:00:00")
+							
+
+							var dcd = (item.DeliveryChellanDate == 'null') ? ' ' : formatDateTime(item.DeliveryChellanDate, 1);
+							$("#InvoiceDate").val(dcd);
+							
 							var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1);
 							$("#MaterialRcvdDate").val(Mat_rcv_date);
-							console.log(item.MaterialRcvdDate)
+							// console.log(item.MaterialRcvdDate)
 							var gross_rcv_date = (item.GrossWeightDate == 'null') ? ' ' : formatDateTime(item.GrossWeightDate, 2);
 							$("#ser").val(item.ServiceDescription);
 									var amount = item.Rate*item.QuantityAsPerInvoice;