From a7fb249cd2fd6ba9ad1225fecaaecbf5aad141c2 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 28 Feb 2025 13:22:47 +0000 Subject: [PATCH] tracker bugs : ps --- app/Config/Routes.php | 1 + app/Controllers/Employeedetails.php | 19 +++ app/Controllers/Inwardgateregister.php | 2 + app/Controllers/Rawmaterialdetails.php | 7 +- app/Models/Employeedetails_model.php | 11 ++ app/Models/Inwardgateregister_model.php | 11 ++ app/Models/Monthlypay_model.php | 2 + app/Views/EditservicePurchaseorder.php | 30 ++--- app/Views/addEmployeenew.php | 45 ++++++- app/Views/addRawMaterial.php | 153 ++++++++++++----------- app/Views/addUser.php | 4 +- app/Views/alterpurchaseorder.php | 12 +- app/Views/attendance.php | 5 +- app/Views/capitalpurchaseorder.php | 26 ++-- app/Views/editCapitalAmendPO.php | 44 ++++--- app/Views/editCapitalPo.php | 108 ++++++++-------- app/Views/editEmployeenew.php | 57 ++++++++- app/Views/editImportAmendPO.php | 29 +++-- app/Views/editRawmaterial.php | 159 +++++++++++++----------- app/Views/editRevenueAmendPO.php | 20 +-- app/Views/editRevenuepurchaseorder.php | 30 ++--- app/Views/editServiceAmendPO.php | 38 +++--- app/Views/editimportpo.php | 34 ++--- app/Views/importpo.php | 31 ++--- app/Views/inwardgateregister.php | 6 +- app/Views/leavereports.php | 6 +- app/Views/monthlypayinputs.php | 2 +- app/Views/publicholidays.php | 6 +- app/Views/purchaseorder.php | 36 +++--- app/Views/servicePurchaseorder.php | 32 ++--- app/Views/viewinwardgateregister.php | 20 +-- 31 files changed, 579 insertions(+), 407 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 99b93bea..c3dfa6d4 100755 --- a/app/Config/Routes.php +++ b/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'); diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index aa6e91d0..7f0aa25a 100755 --- a/app/Controllers/Employeedetails.php +++ b/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() { diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 438272e9..1df68778 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/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, diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 738e2c69..6575995d 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/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); diff --git a/app/Models/Employeedetails_model.php b/app/Models/Employeedetails_model.php index 48e3eed2..a69ac2fa 100755 --- a/app/Models/Employeedetails_model.php +++ b/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 = '') { diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index d8e6aa41..0546849a 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/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; + } + } \ No newline at end of file diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index e50c3b83..c2e59ce0 100755 --- a/app/Models/Monthlypay_model.php +++ b/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(); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 77c02c3c..c4965983 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1229,17 +1229,19 @@ if (!empty($getlogpodtl)) { +
-
- +
+
- + - + - + @@ -1268,10 +1270,10 @@ if (!empty($getlogpodtl)) { ?> - - - - + + + + - + - + - + - - + + diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 4032c8ad..d71e2506 100755 --- a/app/Views/addEmployeenew.php +++ b/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: "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(); diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 66c40e91..001df8d9 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -49,7 +49,7 @@
- +
@@ -66,11 +66,11 @@ ?>
- +
- @@ -109,6 +109,10 @@
+
+ + +
@@ -120,19 +124,19 @@ echo form_input($data); ?>
+
+
-
-
- +
@@ -195,28 +199,28 @@
- * - + +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index cded8c49..618819e2 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -2811,10 +2811,10 @@ if (!empty($INRSYMBOL)) {
- + - + @@ -6031,10 +6031,10 @@ if (!empty($INRSYMBOL)) { var html = ` - + - + @@ -6699,10 +6699,10 @@ if (!empty($INRSYMBOL)) { var html = ` - + - + diff --git a/app/Views/attendance.php b/app/Views/attendance.php index a4c608f7..01592c6a 100755 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -224,7 +224,7 @@ $currentday = date('d');
-
    +
    1. HR

    2. Attendance

      @@ -234,9 +234,6 @@ $currentday = date('d');
-
- -
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 52aacbe3..93f2b6f1 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -787,16 +787,16 @@ if (!empty($INRSYMBOL)) {
- + - + - - - - + + + + @@ -3526,10 +3526,10 @@ if (!empty($INRSYMBOL)) { var rowHtml = ` - + - - + - - - - + + + +
SNoSNo Requisition NoItem CodeItem Code Item Name Line Item SpecsQuantityQuantity UOM Rate Basic Amount
ReqNo ?>MaterialCode ?>MaterialName ?>ReqNo ?>MaterialCode ?>MaterialName ?> LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>Quantity ?> UOM ?>Rate ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Taxamount ?>TotalValue ?>
SNoRequisition NoRequisition No Item Code Item DescriptionQuantityQuantity UOM Rate Basic Amount
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}${quantity}${quantity} ${uom} ${itemRate} ${basicval}
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}${quantity}${quantity} ${uom} ${itemRate} ${basicval}
SNoRequisition NoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountRateBasic AmountTax AmountTotal Order Amount Action
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName} + - ${quantity}${quantity} ${uom}${itemRate}${basicval}${TotalTaxValue}${Total}${itemRate}${basicval}${TotalTaxValue}${Total}     diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 3a6058c8..9ead78a5 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -797,22 +797,20 @@ if (!empty($POItem) && $CapitalRange == '1') {
- - - - - - - - - - - - - + + + + + + + + + + @@ -826,16 +824,16 @@ if (!empty($POItem) && $CapitalRange == '1') { ?> - - - - - - - + + + + + + - - diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 0d0226ac..3c1dfbfd 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -870,7 +870,7 @@ if (!empty($getlogpodtl)) {
- +
@@ -888,16 +888,16 @@ if (!empty($getlogpodtl)) {
- + - + - - - - + + + + @@ -920,7 +920,7 @@ if (!empty($getlogpodtl)) { ?> - + - - - - + + + + - - + - + - + - + $record->MaterialCode, "ReqNo" => $record->ReqNo); array_push($res_arr_values, $row); @@ -990,11 +990,11 @@ if (!empty($getlogpodtl)) { - - @@ -1021,11 +1021,11 @@ if (!empty($getlogpodtl)) { - - - - - - - @@ -1159,13 +1159,13 @@ if (!empty($getlogpodtl)) { - - - @@ -1564,7 +1564,7 @@ if (!empty($getlogpodtl)) { -
+
@@ -1957,7 +1957,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
@@ -1982,7 +1982,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2011,7 +2011,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2049,7 +2049,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2645,7 +2645,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2669,7 +2669,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2694,7 +2694,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2721,7 +2721,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2733,7 +2733,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -3278,7 +3278,7 @@ if (!empty($getlogpodtl)) {
-
+
CGST In %
@@ -3295,7 +3295,7 @@ if (!empty($getlogpodtl)) {
-
+
SGST In %
@@ -3312,7 +3312,7 @@ if (!empty($getlogpodtl)) {
-
+
IGST In %
@@ -3329,7 +3329,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -3340,7 +3340,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -3642,7 +3642,7 @@ if (!empty($getlogpodtl)) {
-
`; } - rowHtml += ` - - - - - + rowHtml += ` + + + + +
SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountActionSNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate ?> + ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate, 2, '.', ''); ?> Rate * $record->Quantity, 2, '.', ''); ?> ServiceTaxamount; } else if ($CapitalRange == '0') { echo "0.0"; @@ -845,12 +843,12 @@ if (!empty($POItem) && $CapitalRange == '1') { - Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> + Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> + Rate * $record->Quantity), 2, '.', ''); ?>
SNoRequisition NoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountRateBasic AmountTax AmountTotal Order Amount
ReqNo ?>ReqNo ?> MaterialCode ?> MaterialName ?> @@ -937,28 +937,28 @@ if (!empty($getlogpodtl)) { LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Rate ?>Rate * $record->Quantity, 2, '.', '') ?>Quantity ?>UOM ?>Rate ?>Rate * $record->Quantity, 2, '.', '') ?> ServiceTaxamount; ?> + ServiceTaxamount; ?> Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> Rate * $record->Quantity, 2, '.', '') ?>Rate * $record->Quantity, 2, '.', '') ?> -${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${Total}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${Total} diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index a30ea8c9..5b216f6b 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -244,6 +244,11 @@ if (!empty($EmpDetails)) { + ProfilePic){ ?> +
+ +
- +
- + + onkeypress="return isNumberKey(event)" required>
- + + value="" required>
@@ -1905,6 +1910,48 @@ if (!empty($EmpDetails)) { } }); + $('#ContactNumber').change(function() { + +var ContactNumber = $('#ContactNumber').val(); + +if (getMobileValidation() && ContactNumber != "") { + $('#loader').show(); + $.ajax({ + data: { + ContactNumber + }, + + type: "POST", + 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(); diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index dacd1a37..dc7e9895 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1202,13 +1202,18 @@ if (!empty($RequistionDetails)) { - - - - - - - + + + + + + + + + + + + @@ -1225,13 +1230,13 @@ if (!empty($RequistionDetails)) { ?> - - + + - + - - + + diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 5f4ac772..5b73dbcc 100755 --- a/app/Views/editRawmaterial.php +++ b/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) { - +
- -
@@ -211,6 +212,12 @@ if ($total <= $reorder) { +
+
+ + +
+
@@ -226,7 +233,8 @@ if ($total <= $reorder) {
- + +
@@ -242,9 +250,6 @@ if ($total <= $reorder) {
-
-
-
@@ -264,19 +269,27 @@ if ($total <= $reorder) {
+
+
-
-
- +
+
+ + +
+
-
- > + +
@@ -284,9 +297,9 @@ if ($total <= $reorder) {
- +
@@ -304,28 +317,28 @@ if ($total <= $reorder) {
-
-
SNoRequisition NoItem NameQuantityUOMRateBasic AmountSNoRequisition NoItem NameQuantityUOMRateBasic Amount Action
ReqNo ?>ReqNo ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>BasicValue ?>Rate ?>BasicValue ?>
+
- + - + @@ -1248,17 +1248,17 @@ if (!empty($INRSYMBOL)) { ?> - + - + - + - - - + + diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 729fddf8..eaf2de39 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2332,13 +2332,13 @@ if (!empty($getlogpodtl)) { - + - + - - - + + + + @@ -2365,11 +2365,11 @@ if (!empty($getlogpodtl)) { $index = $index + 1; ?> - + - + - - - + + - + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { - rowHtml += ``; - }else{ rowHtml += ``; } + }else{ rowHtml += ``; } rowHtml += ` - + diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 66945d3b..7a1da430 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -1016,18 +1016,18 @@ foreach ($PaymentTerms as $TER) { - + - + - - - - - - - + + + + + + + @@ -1053,19 +1053,19 @@ foreach ($PaymentTerms as $TER) { ?> - - + + - + - - - - - - - + + + + + + + diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 82bf24cc..7c7f960a 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -828,15 +828,15 @@ if (!empty($getlogpodtl)) {
SNoRequisition NoRequisition No Item NameQuantityQuantity UOM Rate Basic Amount
ReqNo ?>ReqNo ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>Rate ?> + BasicValue, 2, '.', '') ?>Taxamount ?>TotalValue ?>Taxamount ?>TotalValue ?>
SNoSNo Requisition NoItem CodeItem Code Item DescriptionLine Item SpecsQuantityUOMLine Item SpecsQuantityUOM Rate Basic Amount @@ -2353,7 +2353,7 @@ if (!empty($getlogpodtl)) { - ActionAction
ReqNo ?>MaterialCode ?>MaterialCode ?> MaterialName ?> + LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Quantity ?>UOM ?> Rate ?> @@ -4505,11 +4505,11 @@ if (!empty($getlogpodtl)) { var rowHtml = `
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}- --${quantity}${quantity} ${uom} ${itemRate} ${basicval}
SNoRequisition NoRequisition No Item Code Item NameQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending QuantityRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending Quantity Action
ReqNo ?> ReqNo ?> MaterialCode ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>
- - - - - - - - - + + + + + + + + + @@ -857,10 +857,10 @@ if (!empty($getlogpodtl)) { ?> - - - - + + + - - - - + + + + diff --git a/app/Views/importpo.php b/app/Views/importpo.php index 2649fe30..4cfe8c3f 100755 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -813,19 +813,20 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
-
-
SNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic AmountSNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic Amount
ReqNo ?>MaterialCode ?>MaterialName ?> + ReqNo ?>MaterialCode ?>MaterialName ?> LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Rate ?>BasicValue ?>Quantity ?>UOM ?>Rate ?>BasicValue ?>
+
+
- + - + - - + + @@ -3515,11 +3516,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { // })); var rowHtml = ` - - - - - + + + + - - - - + + + +
SNoRequisition NoRequisition No Material Code Description Line Item SpecsQuantityQuantity UOMRateBasic AmountRateBasic Amount
${temp}${Reqnumber}${materialCode}${materialName} + ${temp}${Reqnumber}${materialCode}${materialName} - ${quantity}${uom}${itemRate}${BasicAmt}${quantity}${uom}${itemRate}${BasicAmt} diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 8798edd0..6c202920 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -23,7 +23,7 @@
-
    +
    1. Inward

    2. Inward Gate Register

      @@ -91,7 +91,7 @@
- +
@@ -99,7 +99,7 @@
- +
diff --git a/app/Views/leavereports.php b/app/Views/leavereports.php index cce2fe9f..1f9eed8b 100755 --- a/app/Views/leavereports.php +++ b/app/Views/leavereports.php @@ -25,7 +25,7 @@
-
    +
    1. HR
    2. Leave
    3. @@ -46,8 +46,8 @@
      -
      -
      +
      +
      -
        +
        1. HR
        2. PaySlip
        3. diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php index 0ddb9ca5..7dcc8b83 100755 --- a/app/Views/publicholidays.php +++ b/app/Views/publicholidays.php @@ -13,8 +13,9 @@
          -
          -
            +
            + +
            1. HR
            2. Leave
            3. @@ -22,7 +23,6 @@
            -
          diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 71630efa..1fcb4103 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -2160,17 +2160,17 @@ if (!empty($INRSYMBOL)) { - - + + - + - - - - + + + + @@ -3450,11 +3450,11 @@ if (!empty($INRSYMBOL)) { // Define your template using ES6 template literals var rowHtml = ` - - - - - + + + + - - - - - - + + + + + + - + - + - - - - + + + + @@ -1977,10 +1977,10 @@ if (!empty($INRSYMBOL)) { var rowHtml = ` - - - - + + + + - - - - - - + + + + + + + $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'); } ?> @@ -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;
          SNoRequisition NoSNoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRate Basic Amount Tax Amount Total Order Amount RateBasic AmountTax AmountTotal Order Amount Action
          ${temp}${Reqnumber}${materialCode}${materialName} + ${temp}${Reqnumber}${materialCode}${materialName} - ${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue} diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index ca1c1f45..3b57b6fb 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -1048,16 +1048,16 @@ if (!empty($INRSYMBOL)) {
          SNoRequisition NoRequisition No Item Code Item Name Line Item SpecsQuantityQuantity UOMRate Basic Amount Tax Amount Total Order Amount Rate Basic Amount Tax Amount Total Order Amount Action
          ${temp}${Reqnumber}${materialCode}${materialName}${temp}${Reqnumber}${materialCode}${materialName} - @@ -1990,12 +1990,12 @@ if (!empty($INRSYMBOL)) { ${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue} diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 5bf60e71..cf455b80 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -251,8 +251,12 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?> DeliveryChellanDate); - echo $date->format('d-m-Y'); ?> itemCount ?>