From b19493bbc6d427625a39b282cd1d9259bf2413b3 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Fri, 20 Dec 2024 18:07:02 +0530
Subject: [PATCH] purchase module  vadivel J 20-12-2024

---
 app/Models/Purchaseorder_model.php      |   2 -
 app/Views/EditservicePurchaseorder.php  |   7 +-
 app/Views/editRevenuepurchaseorder.php  |   5 +-
 app/Views/editServiceAmendPO.php        |   2 +
 app/Views/importpo.php                  |   4 +
 app/Views/incomingSilicaSandDetails.php | 201 ++++++++----------------
 app/Views/purchaseorder.php             |  39 +----
 7 files changed, 90 insertions(+), 170 deletions(-)

diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php
index 846c60f3..f36fe521 100755
--- a/app/Models/Purchaseorder_model.php
+++ b/app/Models/Purchaseorder_model.php
@@ -851,8 +851,6 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
 
 		    $result = $query->getResultArray();
 
-			//print_r($result);die;
-
 			return $result;
 		} else {
 			return [];
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index bccb699d..5b10c317 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1548,7 +1548,7 @@ if (!empty($getlogpodtl)) {
 <!-- Model for servicepo -->
 <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width" style="width: 1060px; !important">
+	<div class="modal-dialog modal-full-width" style="width: 1060px important;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Add Service Purchase Order Item</h4>
@@ -1826,7 +1826,7 @@ if (!empty($getlogpodtl)) {
 <!-- Edit Service Modal content Starts Here-->
 <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width" style="width: 1060px; !important">
+	<div class="modal-dialog modal-full-width" style="width: 1060px !important;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Service Purchase Order Item</h4>
@@ -3129,7 +3129,9 @@ if (!empty($getlogpodtl)) {
 		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
 
 	}
+	
 	//If others is the payment terms to display mandatory field
+	$(document).ready(function () {
 	$("#PaymentTerms").change(function() {
 		var otherPayment = '<?php echo $otherPayment; ?>';
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
@@ -3140,6 +3142,7 @@ if (!empty($getlogpodtl)) {
 			$('#Otherpayment').val('');
 		}
 	});
+    })
 
 	$('#ReqNo').change(function() {
 
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index eae88087..95f727b0 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -5146,7 +5146,8 @@ if (!empty($getlogpodtl)) {
 		return tot;
 	}
 	//If others is the payment terms to display mandatory field
-	$("#PaymentTerms").change(function () {
+	$(document).ready(function () {
+		$("#PaymentTerms").change(function () {
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
 			$('#otheroptiondiv').show();
 		} else {
@@ -5154,6 +5155,8 @@ if (!empty($getlogpodtl)) {
 			$('#Otherpayment').val('');
 		}
 	});
+	})
+
 	$('#ReqNo').change(function () {
 
 		var id = $('#ReqNo').val();
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 5de1e357..a9b852ce 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -2323,6 +2323,7 @@ foreach ($PaymentTerms as $TER) {
 		return TAXval; //  $('#AfterServiceTax').val(TAXval); 
 
 	}
+	$(document).ready(function () {
 	$("#PaymentTerms").change(function() {
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
 			$('#otheroptiondiv').show();
@@ -2330,4 +2331,5 @@ foreach ($PaymentTerms as $TER) {
 			$('#otheroptiondiv').hide();
 		}
 	});
+    })
 </script>
\ No newline at end of file
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index 42002729..bee0c182 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -4158,6 +4158,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
 
     // } ); 
+
+    $(document).ready(function () {
     $("#PaymentTerms").change(function() {
         //console.log($('#PaymentTerms').val().trim());
         if ($('#PaymentTerms').val().trim() == 'PT08')
@@ -4169,6 +4171,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             $('#otheroptiondiv').hide();
         }
     });
+    })
+    
     $('#drpFreight').change(function() {
         var FreightType = $('#drpFreight').val();
 
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index 3080c23f..98452604 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -341,17 +341,26 @@
                                             <!-- 'td:eq(5)' -->
                                                 <td class="celda_normal">
                                                     <?php echo $record['SupplierName']??''; ?>
-                                                </td>
+                                                </td>   
 
                                             <!-- 'td:eq(6)' -->
                                                 <td class="celda_normal"   contenteditable="true" >
                                                     <?php echo $record['grade']??''; ?>
                                                 </td>
 
-                                            <!-- 'td:eq(7)' -->
-                                                <td class="celda_normal"   contenteditable="true"  >
-                                                    <?php echo $record['gradeCondition']??''; ?>
-                                                </td>
+                                            <!-- 'td:eq(7)' --> 
+                                                <td class="celda_normal" style="color:#02d0eb;  background:white;"  contenteditable="true">
+                                                <select class="status grade-condition" style="width:100px;">
+                                                        <option value="">Select</option>
+                                                        <option value="wet"
+                                                        <?php echo ($record['gradeCondition'] == 'wet') ? "selected":''; ?>
+                                                        >Wet</option>
+                                                        <option value="dry"
+                                                        <?php echo ($record['gradeCondition'] == 'dry') ? "selected":''; ?>
+                                                        >Dry</option>
+                                                </select>
+                                                    
+                                                </td>   
 
                                             <!-- 'td:eq(8)' -->
                                                 <td class="celda_normal"  >
@@ -363,7 +372,7 @@
                                             <!-- 'td:eq(9)' -->
                                                 <td class="celda_normal">
                                                     <?php echo $record['Qty']??'0'; ?>
-                                                </td>
+                                                </td>   
 
                                             <!-- 'td:eq(10)' -->
                                                 <td style="display:none" >
@@ -516,7 +525,7 @@
                                                <td class="celda_normal" style="color:#02d0eb;  background:white;">
                                                <i
                                                class="fas fa-download download-lab-report" style="cursor:pointer;"></i>   
-                                             </td>
+                                               </td>
                                                     
                                             </tr>
                                         <?php } ?>
@@ -571,130 +580,9 @@
       <div class="modal-body">
         <form action="<?php echo base_url('/updateLabReport')?>" method="POST">
 
-            <div class="row">
 
-            <div class="col-md-3">
-                <div class="form-group">
-                    <label for="10Mm">10Mm</label>
-                    <input type="text" class="form-control" name="10Mm" id="10Mm" value="0.00">
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="form-group">
-                    <label for="20Mm">20Mm</label>
-                    <input type="text" class="form-control" name="20Mm" id="20Mm" value="0.00">
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="form-group">
-                    <label for="30Mm">30Mm</label>
-                    <input type="text" class="form-control" name="30Mm" id="30Mm" value="0.00">
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="form-group">
-                    <label for="40Mm">40Mm</label>
-                    <input type="text" class="form-control" name="40Mm" id="40Mm" value="0.00">
-                </div>
-            </div>
-            </div>
-
-            <div class="row">
-
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="50Mm">50Mm</label>
-                        <input type="text" class="form-control" name="50Mm" id="50Mm" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="70Mm">70Mm</label>
-                        <input type="text" class="form-control" name="70Mm" id="70Mm" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="100Mm">100Mm</label>
-                        <input type="text" class="form-control" name="100Mm" id="100Mm" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="140Mm">140Mm</label>
-                        <input type="text" class="form-control" name="140Mm" id="140Mm" value="0.00">
-                    </div>
-                </div>
-            </div>
-
-           
-
-            <div class="row">
-
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="200Mm">200Mm</label>
-                        <input type="text" class="form-control" name="200Mm" id="200Mm" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="300Mm">300Mm</label>
-                        <input type="text" class="form-control" name="300Mm" id="300Mm" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="pan">Pan</label>
-                        <input type="text" class="form-control" name="pan" id="pan" value="0.00" >
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="total">Total</label>
-                        <input type="text" class="form-control" name="total" id="total" value="0.00" readonly>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="moistureSpec">Moisture % spec</label>
-                        <input type="text" class="form-control" name="moistureSpec" id="moistureSpec" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="moistureActual">Moisture Actual</label>
-                        <input type="text" class="form-control" name="moistureActual" id="moistureActual" value="0.00">
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="moistureLoss">Moisture Loss </label>
-                        <input type="text" class="form-control" name="moistureLoss" id="moistureLoss" value="0.00" readonly>
-                    </div>
-                </div>
-                <div class="col-md-3">
-                    <div class="form-group">
-                        <label for="moistureLossQty">Moisture Loss Qty</label>
-                        <input type="text" class="form-control" name="moistureLossQty" id="moistureLossQty" value="0.00" readonly>
-                    </div>
-                </div>
-                </div>
-                        
-
-            <!-- hidden fields section -->
-            <input type="hidden"  name="id" id="issdId" value="">
-            <input type="hidden"  name="igrNo" id="igrNo" value=""> 
-            <input type="hidden"  name="materialCode" id="materialCode" value="">
-            <input type="hidden"  name="qty"          id="qty"          value="">
-            <input type="hidden"  name="plus20Loss"   id="plus20Loss"   value="">
-            <input type="hidden"  name="plus30Loss"   id="plus30Loss"   value="">
-            <input type="hidden"  name="sieveLossQty" id="sieveLossQty" value="">           
-            <input type="hidden"  name="salableQty"   id="salableQty"   value="">
+            
+                                
    
   
       </div>
@@ -720,7 +608,8 @@
       </div>
       <div class="modal-body p-4" id="content">
       <div style="text-align: right;"><small>REF:RIPL/DAD/R02</small></div>
-        <form>
+
+      <form action="<?php echo base_url('/updateLabReport')?>" method="POST">
         <header class="clearfix">
         <div class="row">
             <div class="col-3" width="100px;">
@@ -976,8 +865,37 @@
 		<b><small> * This is a system generated </small></b>
        </main>
     </div>
+
+            <!-- hidden fields section -->
+            <input type="hidden"  name="id" id="issdId" value="">
+            <input type="hidden"  name="igrNo" id="igrNo" value=""> 
+            <input type="hidden"  name="materialCode" id="materialCode" value="">
+            <input type="hidden"  name="qty"          id="qty"          value="">
+            <input type="hidden" class="form-control" name="10Mm" id="10Mm" value="0.00">
+            <input type="hidden" class="form-control" name="20Mm" id="20Mm" value="0.00">
+            <input type="hidden" class="form-control" name="30Mm" id="30Mm" value="0.00">
+            <input type="hidden" class="form-control" name="40Mm" id="40Mm" value="0.00">
+            <input type="hidden" class="form-control" name="50Mm" id="50Mm" value="0.00">
+            <input type="hidden" class="form-control" name="70Mm" id="70Mm" value="0.00">
+            <input type="hidden" class="form-control" name="100Mm" id="100Mm" value="0.00">
+            <input type="hidden" class="form-control" name="140Mm" id="140Mm" value="0.00">
+            <input type="hidden" class="form-control" name="200Mm" id="200Mm" value="0.00">
+            <input type="hidden" class="form-control" name="300Mm" id="300Mm" value="0.00">
+            <input type="hidden" class="form-control" name="pan" id="pan" value="0.00" >
+            <input type="hidden" class="form-control" name="total" id="total" value="0.00" readonly>
+            <input type="hidden" class="form-control" name="moistureSpec" id="moistureSpec" value="0.00">
+            <input type="hidden" class="form-control" name="moistureActual" id="moistureActual" value="0.00">
+            <input type="hidden" class="form-control" name="moistureLoss" id="moistureLoss" value="0.00" readonly>
+            <input type="hidden" class="form-control" name="moistureLossQty" id="moistureLossQty" value="0.00" readonly>
+            <input type="hidden"  name="plus20Loss"   id="plus20Loss"   value="">
+            <input type="hidden"  name="plus30Loss"   id="plus30Loss"   value="">
+            <input type="hidden"  name="sieveLossQty" id="sieveLossQty" value="">           
+            <input type="hidden"  name="salableQty"   id="salableQty"   value="">
+
+
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-success" data-dismiss="modal">Save</button>
         <button type="button" id="pdfGenerateId" class="btn btn-primary">Download</button>
       </div>
     </form>
@@ -986,7 +904,7 @@
 </div>
 
 
-
+<!-- download pdf punction -->
 
 <script>
 
@@ -1226,13 +1144,22 @@
             $('#downloadLabReportModel').modal('show');
 
             let someValue = $("#meshTableId").tableToJSON();
-            
+
             console.log(someValue);
 
         })
     })
 </script>
 
+
+
+
+
+
+
+
+
+
 <script>
     $(document).ready(function(){
         $('#10Mm , #20Mm, #30Mm, #40Mm, #50Mm, #70Mm, #100Mm, #1400Mm, #200Mm, #300Mm , #pan , #moistureSpec ,#moistureActual').change(function(){
@@ -1296,6 +1223,11 @@
     })
 </script>
 
+
+
+
+
+
 <script type="text/javascript">
    
 
@@ -1315,6 +1247,7 @@
 
                 // Get the selected values from dropdowns
                 row['Remark'] = $(this).find('.sand-status').val();
+                row['Grade Condition'] = $(this).find('.grade-condition').val()
                 
             });
 
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 129716b2..a543f8a9 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -62,34 +62,6 @@ if (!empty($INRSYMBOL)) {
 
 <style>
 	.modal { overflow: auto !important; }
-	/* #packagingcalmodel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#freightcalmodel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#ExciseDutyCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	} */
-
-	/* #VatCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	#CSTCalModel {
-		margin-top: 200px;
-		z-index: 1080 !important;
-	}
-
-	.modal {
-		padding-right: 30% ! important;
-	} */
 </style>
 
 <!-- Rich text -->
@@ -2047,7 +2019,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</div>
 								<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
-									<label>Description of Payable Terms</label>
+									<label>Description of Payable Terms<span class="text-danger">*</span></label>
 									<div>
 										<?php
 										$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control');
@@ -4106,7 +4078,8 @@ if (!empty($INRSYMBOL)) {
 	}
 
 	//If others is the payment terms to display mandatory field
-	$("#PaymentTerms").change(function() {
+	$(document).ready(function(){
+		$("#PaymentTerms").change(function() {
 		if ($('#PaymentTerms').val().trim() == 'PT08') {
 			$('#otheroptiondiv').show();
 			$('#Otherpayment').prop('required', true);
@@ -4116,7 +4089,9 @@ if (!empty($INRSYMBOL)) {
 			$('#Otherpayment').val('');
 		}
 	});
-	// set default null value
+	})
+
+
 	function clearTotalItemValues() {
 
 
@@ -4138,4 +4113,6 @@ if (!empty($INRSYMBOL)) {
 		location.reload();
 
 	}
+
+
 </script>
\ No newline at end of file