From f8f2ef3f6581dd596efbf91bb9e27fc645b4ff49 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 17 Sep 2024 08:41:11 +0530 Subject: [PATCH 1/6] fixed bugs from tracker date -12/09/2024 employee module Additional - vadivel J --- app/Views/editEmployeenew.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index cde5b058..20cda936 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -254,10 +254,14 @@ if (!empty($EmpDetails)) { class="form-control w-50" readonly> -
+
+
- - name="isactive" value="1"> Is Active + + name="isactive" value="1">   +
@@ -402,8 +406,9 @@ if (!empty($EmpDetails)) {
Current address same as permanent - address + onclick="CheckClick"> +
@@ -1066,6 +1071,7 @@ if (!empty($EmpDetails)) {
+
From e5934f2d7f6f57bea43f67a20995214d7539aa64 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 17 Sep 2024 09:21:27 +0530 Subject: [PATCH 2/6] fixed bugs from tracker date -12/09/2024 employee module Additional fix-2 - vadivel J --- app/Views/editEmployeenew.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 20cda936..ee71c091 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -207,27 +207,29 @@ if (!empty($EmpDetails)) {
-
+
your image -
+
-
+
+ +

- + @@ -283,7 +285,7 @@ if (!empty($EmpDetails)) {
-
- +
'Select'); if (!empty($PoTypeOptions)) { - foreach ($PoTypeOptions as $POpt) : + foreach ($PoTypeOptions as $POpt): - $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; + $optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue; endforeach; } @@ -2636,10 +2640,10 @@ if (!empty($INRSYMBOL)) { $options1 = array("0" => 'Select Payment method'); //print_r( $options); if (!empty($Payment)) { - foreach ($Payment as $payment) : + foreach ($Payment as $payment): - $options1[$payment->PaymentID] = $payment->PaymentTerms; + $options1[$payment->PaymentID] = $payment->PaymentTerms; endforeach; } @@ -2651,7 +2655,7 @@ if (!empty($INRSYMBOL)) {
'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true'); + $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true'); echo form_input($data); ?>
@@ -2665,10 +2669,10 @@ if (!empty($INRSYMBOL)) {
- +
'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); + $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); echo form_input($data); ?>
@@ -2707,38 +2712,47 @@ if (!empty($INRSYMBOL)) {
- IS THIS OPEN ORDER FORMAT + IS THIS OPEN + ORDER FORMAT
- Select Line Item + Select Line + Item
+
- + @@ -1460,11 +1461,11 @@ if (!empty($getlogpodtl)) {
-
- +
+
+ }} ?>
- Cancel + Cancel   Update Service
@@ -2336,7 +2337,7 @@ if (!empty($getlogpodtl)) { --> - + \ No newline at end of file diff --git a/app/Views/Report_pending_purchase.php b/app/Views/Report_pending_purchase.php index 03bc0e6f..de33aaef 100755 --- a/app/Views/Report_pending_purchase.php +++ b/app/Views/Report_pending_purchase.php @@ -10,15 +10,19 @@ @@ -346,11 +367,11 @@
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 00956f24..eba13851 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -538,12 +538,12 @@ if (!empty($INRSYMBOL)) { $(document).ready(function() { $("#Deliverydt").datepicker({ format: 'dd-mm-yyyy', - startDate: new Date(), + startDate: new Date(), clearBtn: true }); $("#PODate").datepicker({ format: 'dd-mm-yyyy', - startDate: new Date(), + startDate: new Date(), clearBtn: true }); $("#PaymentTerms").select2(); @@ -559,6 +559,89 @@ if (!empty($INRSYMBOL)) { $('#Schedulediv').show(); }); clearTotalItemValues(); + + $('#Edit').click(function() { + console.log("1111111111111111111"); + + // tinyMCE.triggerSave(); + console.log("2222222222222222"); + + if (validateEditServiceTax()) { + alert('inside Add'); + var CostCode = $("#EditCostCenter").val(); + var AvilBudget = $('#EditAvlBudAmt').val(); + var editMaterialCode = $("#EditMaterialCode").val(); + var editDescription = $("#EditItemName").val(); + var editUOM = $('#EditUOM').val(); + var editPer = ''; + if ($("#EditPer").val().trim() == '') { + editPer = $("#EditUOM").val(); + } else { + editPer = $("#EditPer").val(); + } + var editQuantity = $('#EditQuantity').val(); + + var itemRate = $("#EditRate").val(); + + + + var Cgst = $("#EditCgst").val(); + var AfterCgst = $("#EditAfterCgst").val(); + var Sgst = $("#EditSgst").val(); + var AfterSgst = $("#EditAfterSgst").val(); + var Igst = $("#EditIgst").val(); + var AfterIgst = $("#EditAfterIgst").val(); + + var Frequency = $("#EditFrequency").val(); + var FrequencyValue = $("#EditFrequencyNo").val(); + var ServiceDescription = $('#EdittxtSpcialInstruction').val(); + var OtherAmt = $('#EditOtherAllowances').val(); + var TotalOrderValue = $("#EditTotalOrderValue ").val(); + + + var basicval = $("#txtEditBasicValue").val(); + + var TotalTaxValue = calculateEditTaxValue(); + + + + var tr = document.getElementById(userid); + var cellval = tr.cells; + + cellval[2].innerHTML = editMaterialCode; + cellval[3].innerHTML = editDescription; + cellval[4].innerHTML = editQuantity; + cellval[5].innerHTML = editUOM; + cellval[6].innerHTML = parseFloat(itemRate).toFixed(2); + cellval[7].innerHTML = parseFloat(basicval).toFixed(2); + cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2); + cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2); + + + $('#materialCode' + userid).val(editMaterialCode); + $('#materialName' + userid).val(editDescription); + $('#uom' + userid).val(editUOM); + $('#per' + userid).val(editPer); + + $('#quantity' + userid).val(editQuantity); + $('#itemRate' + userid).val(itemRate); + $('#Cgst' + userid).val(Cgst); + $('#AfterCgst' + userid).val(AfterCgst); + $('#Sgst' + userid).val(Sgst); + $('#AfterSgst' + userid).val(AfterSgst); + $('#Igst' + userid).val(Igst); + $('#AfterIgst' + userid).val(AfterIgst); + $('#ItemDescription' + userid).val(ServiceDescription); + $('#OtherAmt' + userid).val(OtherAmt); + + $('#TotalOrderValue' + userid).val(TotalOrderValue); + + populateValueMainFormForEditServiceTax(); + + } + + }); + });