From 7dc84cdd5705222239147be622855bcc2bf92fd1 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Mon, 23 Sep 2024 12:18:24 +0530
Subject: [PATCH] emergency purchase order issue fixed -vadivel J

---
 app/Views/alterpurchaseorder.php | 233 +++++++++++++++++++++----------
 1 file changed, 161 insertions(+), 72 deletions(-)

diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 6a095574..cf73f95d 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -401,7 +401,7 @@ if (!empty($INRSYMBOL)) {
         selValue = $("#PackagingType").val();
         if (selValue == PercentageType) {
             var PackagingCalculation = '';
-            $('#REVENUE').modal('hide');
+            //$('#REVENUE').modal('hide');
             $('#packagingcalmodel').modal('show');
             $('#txtPackaging').removeAttr('readonly', 'true');
             
@@ -512,7 +512,7 @@ if (!empty($INRSYMBOL)) {
         selValue = $("#drpFreight").val();
         if (selValue == PercentageType) {
             var freightCalculation = '';
-            $('#REVENUE').modal('hide');
+          //  $('#REVENUE').modal('hide');
             $('#freightmodel').modal('show');
             $('#txtFreight').removeAttr('readonly', 'true');
         } else if (selValue == NilType) {
@@ -1551,13 +1551,13 @@ if (!empty($INRSYMBOL)) {
     function SetPackagingOption() {
         PackagingCalculation = $("input:radio[name='optPackaging']:checked").val();
         $('#packagingcalmodel').modal('hide');
-        showmodel();
+      
     }
 
     function setfreightOption() {
         freightCalculation = $("input:radio[name='optfreight']:checked").val();
         $('#freightmodel').modal('hide');
-        showmodel();
+       
     }
     /* Set the Packaging calculation option for calculating Packaging */
     function SetExciseCalculation() {
@@ -2894,7 +2894,7 @@ if (!empty($INRSYMBOL)) {
                                                                             endforeach;
                                                                         }
 
-                                                                        echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType"', 'class="form-control "');
+                                                                        echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" data-id="addRevenue"', 'class="form-control "');
 
                                                                         ?>
                                                                     </div>
@@ -4630,8 +4630,7 @@ if (!empty($INRSYMBOL)) {
                            
                                 <button type="button" class="btn btn-secondary waves-effect" 
                                 onclick="
-                               $('#packagingcalmodel').modal('hide');
-                               showmodel();"
+                               $('#packagingcalmodel').modal('hide');"
                                   
                                     value="Cancel">Cancel</button>
                                 <button type="button" class="btn btn-info waves-effect waves-light"
@@ -4853,9 +4852,6 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="modal-footer">
                                 <a class="btn btn-danger" data-dismiss="modal" 
-                               onclick="
-                               $('#freightmodel').modal('hide');
-                               showmodel()"
                                     value="Cancel">Cancel</a>
                                 <a class="btn btn-success" ID="freightOption"
                                 data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
@@ -5312,15 +5308,16 @@ if (!empty($INRSYMBOL)) {
                 <div class="modal-dialog">
                     <!-- Modal content-->
                     <form>
-                        <div class="modal-content" style="width:1000px;">
+                        <div class="modal-content" style="width:1200px;">
                             <div class="modal-header">
                                 <center>
                                     <h4>Edit Revenue Purchase Order Line Item </h4>
                                 </center>
                             </div>
                             <div class="modal-body p-4">
+                                <!-- first row -->
                                 <div class="row">
-                                    <div class="col-md-4">
+                                    <div class="col-md-3">
                                         <label>Req No<span class="badge mandatory">*</span></label>
                                         <div>
                                             <?php
@@ -5331,7 +5328,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3">
                                         <label>Department Name</label>
                                         <div class="form-group">
                                             <?php
@@ -5340,7 +5337,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3">
                                         <label>Cost Center Code</label>
                                         <div class="form-group">
                                             <?php
@@ -5349,6 +5346,11 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
+
+                                    <div class="col-md-3">
+                                        <!-- empty div for spacing needed -->
+                                    </div>
+
                                     <div class="col-md-3" style="display:none;">
                                         <label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
                                         <div class="form-group">
@@ -5360,8 +5362,10 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- second-row -->
                                 <div class="row">
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Item Code<span class="badge mandatory">*</span></label>
                                         <div>
                                             <?php
@@ -5373,7 +5377,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Item Name</label>
                                         <div class="form-group">
                                             <?php
@@ -5382,7 +5386,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-1">
+                                    <div class="col-md-3">
                                         <label>UOM</label>
                                         <div class="form-group">
                                             <?php
@@ -5391,7 +5395,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2" style="padding-right:0px;">
+                                    <div class="col-md-3" style="padding-right:0px;">
                                         <label>Quantity<span class="badge mandatory">*</span></label>
                                         <div class="form-group">
                                             <?php
@@ -5400,22 +5404,35 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2" style="padding-right: 0px;">
-                                        <label><?php echo "Rate  ($INRSYM)"; ?><span
-                                                class="badge mandatory">*</span></label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
+
+                          
+                                </div>
+
+                                <!-- third row -->
+                                <div class="row">
+
+                                    <div class="col-md-3">
+
                                     </div>
-                                    <div class="col-md-1">
+                                            
+                                    <div class="col-md-3" style="padding-right: 0px;">
+                                            <label><?php echo "Rate  ($INRSYM)"; ?><span
+                                                    class="badge mandatory">*</span></label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                    </div>    
+                                                                    
+                                    <div class="col-md-3">
                                         <label>Per</label> <?php
                                         $data = array('name' => 'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control');
                                         echo form_input($data); ?>
                                     </div>
-                                    <div class="col-md-2" style="padding: 0px;">
+
+                                    <div class="col-md-3" style="padding: 0px;">
                                         <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
                                         <div class="form-group">
                                             <?php
@@ -5424,10 +5441,15 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                </div>
+                                
+                                </div>      
+
+                               
+                                <!-- fourth row -->
+                            
                                 <div class="row">
-                                    <div class="col-md-4"></div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3"></div>
+                                    <div class="col-md-3">
                                         <label>Discount Type </label>
                                         <div>
                                             <?php
@@ -5448,7 +5470,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Discount Rate </label>
                                         <div class="form-group">
                                             <?php
@@ -5457,7 +5479,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
                                         <div class="form-group">
                                             <?php
@@ -5467,9 +5489,13 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- discount row -->
+                              
                                 <div class="row" style="text-align:left;">
-                                    <div class="col-md-4"></div>
-                                    <div class="col-md-4">
+                                
+                                    <div class="col-md-3"></div>
+                                    <div class="col-md-3">
                                         <label>Packaging Type </label>
                                         <div>
                                             <?php
@@ -5485,12 +5511,12 @@ if (!empty($INRSYMBOL)) {
                                                 endforeach;
                                             }
 
-                                            echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"', 'class="form-control "');
+                                            echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"  data-id="editRevenue" ', 'class="form-control "');
 
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Packaging Rate </label>
                                         <div class="form-group">
                                             <?php
@@ -5499,7 +5525,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
                                         <div class="form-group">
                                             <?php
@@ -5509,9 +5535,12 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- package -->
                                 <div class="row">
-                                    <div class="col-md-4"></div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3"></div>
+
+                                    <div class="col-md-3">
                                         <label>Freight Type </label>
                                         <div>
                                             <?php
@@ -5532,7 +5561,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2" id="EditTripsValue" style="display:none;">
+                                    <div class="col-md-3" id="EditTripsValue" style="display:none;">
                                         <label>NO Of Trips</label>
                                         <div class="form-group">
                                             <?php
@@ -5541,7 +5570,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Freight Rate </label>
                                         <div class="form-group">
                                             <?php
@@ -5550,7 +5579,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>Freight Amt <?php echo "($INRSYM)" ?></label>
                                         <div class="form-group">
                                             <?php
@@ -5560,15 +5589,13 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
 
-
-
-
-
                                 </div>
+
+                                <!-- freight -->
                                 <div class="row">
-                                    <div class="col-md-8">
+                                    <div class="col-md-6">
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>CGST in %</label>
                                         <div class="form-group">
                                             <?php
@@ -5577,7 +5604,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>CGST Amt <?php echo "($INRSYM)" ?></label>
                                         <div class="form-group">
                                             <?php
@@ -5587,10 +5614,12 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- CGST -->
                                 <div class="row" id="SGSTEditModel">
-                                    <div class="col-md-8">
+                                    <div class="col-md-6">
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>SGST in %</label>
                                         <div class="form-group">
                                             <?php
@@ -5599,7 +5628,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>SGST Amt <?php echo "($INRSYM)" ?></label>
                                         <div class="form-group">
                                             <?php
@@ -5609,10 +5638,12 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- IGST -->
                                 <div class="row" id="IGSTEditModel">
-                                    <div class="col-md-8">
+                                    <div class="col-md-6">
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>IGST in %</label>
                                         <div class="form-group">
                                             <?php
@@ -5621,7 +5652,7 @@ if (!empty($INRSYMBOL)) {
                                             ?>
                                         </div>
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-3">
                                         <label>IGST Amt <?php echo "($INRSYM)" ?></label>
                                         <div class="form-group">
                                             <?php
@@ -5631,10 +5662,12 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- insurance amount -->
                                 <div class="row">
-                                    <div class="col-md-8">
+                                    <div class="col-md-9">
                                     </div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3">
                                         <label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
                                         <div class="form-group">
                                             <?php
@@ -5644,10 +5677,12 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- total order amount -->
                                 <div class="row">
-                                    <div class="col-md-8">
+                                    <div class="col-md-9">
                                     </div>
-                                    <div class="col-md-4">
+                                    <div class="col-md-3">
                                         <div class="form-group">
                                             <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
                                             <?php
@@ -5657,6 +5692,8 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                 </div>
+
+                                <!-- revenue description -->
                                 <div class="row">
                                     <div class="col-12">
                                         <label><?php echo "Revenue Description"; ?></label>
@@ -5667,6 +5704,7 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
+
                             </div>
                             <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
 
@@ -5678,24 +5716,33 @@ if (!empty($INRSYMBOL)) {
                                     <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span
                                             class="bold">Edit Revenue</span></a>
                                 </div>
+                                </div>
                             </div>
                         </div>
 
+                             </div>
+                            </div>
+                        </div>
+
+
+
+                    </form>
+                </div>
+                         
+                    </form>
+                </div>
+                        </div>
+
+                       
+                            
+                    
+                    </div>
+
 
                     </form>
                 </div>
             </div>
 
-
-
-
-           
-
-                 
-
-
-        
-
         </div>
 
     </div>
@@ -7505,6 +7552,8 @@ if (!empty($INRSYMBOL)) {
                 populateValueMainFormForEditRevenueTax();
             }
 
+            $('#EDITREVENUE').modal('hide');
+        
         });
 
         function validateAddRevenueTax() {
@@ -8589,4 +8638,44 @@ if (!empty($INRSYMBOL)) {
         });
     </script>
 
-  
\ No newline at end of file
+
+
+<script>
+        $(document).ready(function() {
+        // When the second modal is about to be shown
+        $('#packagingcalmodel').on('show.bs.modal', function () {
+            // Set a higher z-index for the second modal to appear on top
+            $('#packagingcalmodel').css('z-index', 1060);  // Set the z-index for the second modal
+            // Ensure the second modal backdrop appears above the first one
+            setTimeout(function() {
+                $('.modal-backdrop').last().css('z-index', 1055);
+            }, 0);
+        });
+
+        // Reset z-index when the second modal is hidden (optional)
+        $('#packagingcalmodel').on('hidden.bs.modal', function () {
+            $('#packagingcalmodel').css('z-index', '');  // Reset to default
+        });
+    });
+
+</script>
+
+<script>
+    $(document).ready(function() {
+    // When the second modal is about to be shown
+        $('#freightmodel').on('show.bs.modal', function () {
+            // Set a higher z-index for the second modal to appear on top
+            $('#freightmodel').css('z-index', 1060);  // Set the z-index for the second modal
+            // Ensure the second modal backdrop appears above the first one
+            setTimeout(function() {
+                $('.modal-backdrop').last().css('z-index', 1055);
+            }, 0);
+        });
+
+        // Reset z-index when the second modal is hidden (optional)
+        $('#freightmodel').on('hidden.bs.modal', function () {
+            $('#freightmodel').css('z-index', '');  // Reset to default
+        });
+    });
+
+</script>
\ No newline at end of file