From 5ee2aa170a4a729c5b773b7e25fa63002f735036 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Sat, 5 Oct 2024 14:25:45 +0530
Subject: [PATCH] minor changes in revenue po - vadivel J

---
 app/Views/alterpurchaseorder.php       |   3 +
 app/Views/editRevenuepurchaseorder.php | 236 ++++++++++++++-----------
 2 files changed, 132 insertions(+), 107 deletions(-)

diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index a0bd8e2d..e1174010 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -5420,6 +5420,9 @@ if (!empty($INRSYMBOL)) {
                                     <center>
                                         <h4>Edit Revenue Purchase Order Line Item </h4>
                                     </center>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                    </button>
                                 </div>
                                 <div class="modal-body p-4" align="left">
                                     <!-- first row -->
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 143b60a6..0bf198c2 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -647,10 +647,10 @@ if (!empty($getlogpodtl)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#TripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#TripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+				
 			}
 
 			selValue = $("#drpFreight").val();
@@ -701,10 +701,10 @@ if (!empty($getlogpodtl)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#EditTripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#EditTripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+		
 			}
 
 			selValue = $("#drpEditFreight").val();
@@ -2730,7 +2730,7 @@ if (!empty($getlogpodtl)) {
 <!-- Add Model for revenue po -->
 <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width">
+	<div class="modal-dialog modal-full-width" style="width: 1060px !important;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
@@ -2785,7 +2785,7 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
@@ -2796,7 +2796,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Name</label>
 							<div class="form-group">
 								<?php
@@ -2805,7 +2805,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -2814,7 +2814,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Quantity<span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -2823,7 +2823,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						
+					</div>
+
+					<div class="form-row">
+						<div class="col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -2832,12 +2837,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>Per</label> <?php
 												$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
 												echo form_input($data); ?>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php
@@ -2847,9 +2852,10 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -2864,7 +2870,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
@@ -2873,7 +2879,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2884,8 +2890,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" style="text-align:left;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -2900,7 +2906,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Rate </label>
 							<div class="form-group">
 								<?php
@@ -2909,7 +2915,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2920,8 +2926,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Freight Type </label>
 							<?php
 							$options = array("0" => 'Select Freight Type');
@@ -2933,17 +2939,8 @@ if (!empty($getlogpodtl)) {
 							}
 							echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
 							?>
-						</div>
-						<div class="form-group col-md-2" id="TripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
+						</div>				
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<div class="form-group">
 								<?php
@@ -2952,7 +2949,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2962,9 +2959,23 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-9"></div>
+					    <div class="form-group col-md-3" id="TripsValue" style="display:none;">
+							<label>NO Of Trips</label>
+							<div class="form-group">
+								<?php
+								$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+								echo form_input($data);
+								?>
+							</div>
+						</div>
+					</div>
+
+					<div class="form-row">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>CGST In %</label>
 							<div class="form-group">
 								<?php
@@ -2973,7 +2984,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2984,8 +2995,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" id="SGSTAddModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>SGST In %</label>
 							<div class="form-group">
 								<?php
@@ -2994,7 +3005,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3004,10 +3015,10 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
-					<div class="form-row" style="text-align:left;">
-						<div id="IGSTAddModel" style="display:none;">
-							<div class="form-group col-md-8"></div>
-							<div class="form-group col-md-2">
+					<div class="form-row" id="IGSTAddModel" style="display:none;" >
+						
+							<div class="form-group col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>IGST In %</label>
 								<div class="form-group">
 									<?php
@@ -3016,7 +3027,7 @@ if (!empty($getlogpodtl)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 								<div class="form-group">
 									<?php
@@ -3025,11 +3036,11 @@ if (!empty($getlogpodtl)) {
 									?>
 								</div>
 							</div>
-						</div>
+						
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
 							<div class="form-group">
 								<?php
@@ -3040,8 +3051,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 							<?php
 							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
@@ -3073,7 +3084,7 @@ if (!empty($getlogpodtl)) {
 <!-- Edit Model for revenue po -->
 <div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width">
+	<div class="modal-dialog modal-full-width" style="width: 1060px;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@@ -3125,7 +3136,7 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
@@ -3137,7 +3148,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Name</label>
 							<div class="form-group">
 								<?php
@@ -3146,7 +3157,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -3155,7 +3166,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Quantity<span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -3164,7 +3175,11 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+					</div>
+
+					<div class="form-row">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -3173,12 +3188,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>Per</label> <?php
 												$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
 												echo form_input($data); ?>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php
@@ -3187,13 +3202,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-
 					</div>
 
 
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -3212,7 +3226,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
@@ -3221,7 +3235,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -3232,8 +3246,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" style="text-align:left;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -3252,7 +3266,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Rate </label>
 							<div class="form-group">
 								<?php
@@ -3261,7 +3275,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -3272,8 +3286,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Freight Type </label>
 							<?php $options = array("0" => 'Select Freight Type');
 							if (!empty($FreightType)) {
@@ -3283,16 +3297,8 @@ if (!empty($getlogpodtl)) {
 							}
 							echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); ?>
 						</div>
-						<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
+						
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<div class="form-group">
 								<?php
@@ -3301,7 +3307,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3311,30 +3317,46 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>CGST In %</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
+					    <div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+								<label>NO Of Trips</label>
+								<div class="form-group">
+									<?php
+									$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+									echo form_input($data);
+									?>
+								</div>
 							</div>
+					</div>
+
+					
+					<div class="form-row">
+					<div class="form-group col-md-6"></div>
+					<div class="form-group col-md-3">
+						<label>CGST In %</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+							echo form_input($data);
+							?>
 						</div>
 					</div>
+					<div class="form-group col-md-3">
+						<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					</div>
+
 					<div class="form-row" id="SGSTEditModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>SGST In %</label>
 							<div class="form-group">
 								<?php
@@ -3343,7 +3365,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3354,8 +3376,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" id="IGSTEditModel" style="display:none;">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>IGST In %</label>
 							<div class="form-group">
 								<?php
@@ -3364,7 +3386,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3375,8 +3397,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
 							<div class="form-group">
 								<?php
@@ -3389,8 +3411,8 @@ if (!empty($getlogpodtl)) {
 
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php