From a1bc18bd125d66edd804b54c5a8f1dee1d938aff Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Fri, 27 Sep 2024 17:21:23 +0530
Subject: [PATCH] capital po fixes

---
 app/Views/capitalpurchaseorder.php | 197 ++++++++++++++++++-----------
 1 file changed, 121 insertions(+), 76 deletions(-)

diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index f26c702a..c3136f0a 100755
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -970,6 +970,13 @@ if (!empty($INRSYMBOL)) {
                             echo form_input($data);
                             ?>
                         </div>
+                     
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md-3"></div>
+
                         <div class="form-group col-md-3" id="hideModalExchange">
                             <label> Exchange Rate</label>
                             <?php
@@ -977,6 +984,7 @@ if (!empty($INRSYMBOL)) {
                             echo form_input($data);
                             ?>
                         </div>
+
                     </div>
 
                     <div class="form-row" style="padding: 0px;">
@@ -1224,12 +1232,13 @@ if (!empty($INRSYMBOL)) {
                     </span>
 
                     <div class="form-row" style="padding:1%;"></div>
-                    <div class="form-row" id="ModalImportTaxHide" style="border:1px solid #000;padding:0px;">
+                    <div class="form-row p-2" id="ModalImportTaxHide" style="border:1px solid #000;padding:0px;">
                         <br />
                         <div class="form-group col-md-6" style="padding:10px;">
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Basic Price <?php echo "($INR)" ?>
+                                    <label>    Basic Price <?php echo "($INR)" ?> </label>
+                                 
                                 </div>
                                 <div class="form-group col-md-4" style="display:none;">
                                     <?php
@@ -1246,7 +1255,8 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Landing charge<?php echo "($INR)" ?>
+                                    <label>  Landing charge<?php echo "($INR)" ?> </label>
+                                  
                                 </div>
                                 <div class="form-group col-md-4">
                                     <?php
@@ -1263,7 +1273,8 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Assessable Value (A)<?php echo "($INR)" ?>
+                                    <label>  Assessable Value (A)<?php echo "($INR)" ?> </label>
+                                   
                                 </div>
                                 <div class="form-group col-md-4" style="display: none;">
                                     <?php
@@ -1281,7 +1292,8 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Custom duty (B)<?php echo "($INR)" ?>
+                                    <label>  Custom duty (B)<?php echo "($INR)" ?> </label>
+                                   
                                 </div>
                                 <div class="form-group col-md-4">
                                     <?php
@@ -1298,7 +1310,8 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Custom ED_cess (C)
+                                    <label>  Custom ED_cess (C) </label>
+                                   
                                 </div>
                                 <div class="form-group col-md-4">
                                     <?php
@@ -1315,7 +1328,8 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Custom S & H cess (D)
+                                    <label>    Custom S & H cess (D) </label>
+                                 
                                 </div>
                                 <div class="form-group col-md-4">
                                     <?php
@@ -1334,7 +1348,8 @@ if (!empty($INRSYMBOL)) {
                         <div class="form-group col-md-6" style="padding:10px;">
                             <div class="form-row">
                                 <div class="form-group col-md-4">
-                                    Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
+                                    <label>   Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?> </label>
+                                  
                                 </div>
                                 <div class="form-group col-md-4">
                                     <div style="display: none;">
@@ -1353,12 +1368,14 @@ if (!empty($INRSYMBOL)) {
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-4">
+                                       
                                     <!-- Additional Excise duty : (g) -->
-                                    <!--  <label><?php echo "IGST on (F) ($INR)"; ?></label> -->
+                                    <label><?php echo "IGST on (F) ($INR)"; ?></label>
 
-                                    IGST on (E) (F)<?php echo "($INR)"; ?>
+                                    <!-- IGST on (E) (F)<?php echo "($INR)"; ?> -->
                                 </div>
                                 <div class="form-group col-md-4">
+                                    
                                     <?php
                                     $data = array('name' => 'Igst ', 'value' => set_value('Igst', 0), 'id' => 'IgstInt',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
                                     echo form_input($data);
@@ -1371,10 +1388,17 @@ if (!empty($INRSYMBOL)) {
                                     ?>
                                 </div>
                             </div>
+                                
                             <div class="form-row">
-                                <div class="form-group col-md-8">
-                                    Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?>
+                                <div class="form-group col-md-4">   
+                                    <label>    Total Duty (G) <?php echo "($INR) (B+C+D+F)" ?> </label>
+                                 
                                 </div>
+
+                                <div class="form-group col-md-4">
+
+                                </div>
+
                                 <div class="form-group col-md-4">
                                     <?php
                                     $data = array('name' => 'Grossdutypayable ', 'value' => set_value('Grossdutypayable'), 'id' => 'Grossdutypayable',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
@@ -1383,10 +1407,12 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                             </div>
 
+                            <br>
+
                             <div class="form-row" style="padding:0px;">
-                                <div class="form-group col-md-3" id="TripsValueafterHide"></div>
-                                <div class="form-group col-md-3">
-                                    <span>Freight Type </span>
+                               
+                                <div class="form-group col-md-4">
+                                    <label>Freight Type </label>
                                     <?php
                                     $options = array("0" => 'Select Freight Type');
                                     //print_r(  $options);
@@ -1398,22 +1424,16 @@ if (!empty($INRSYMBOL)) {
                                     echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
                                     ?>
                                 </div>
-                                <div class="form-group col-md-3" id="TripsValue" style="display:none;">
-                                    <span>NO Of Trips</span>
-                                    <?php
-                                    $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
-                                    <span>Freight Rate </span>
+                              
+                                <div class="form-group col-md-4">
+                                    <label>Freight Rate </label>
                                     <?php
                                     $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
                                     echo form_input($data);
                                     ?>
                                 </div>
-                                <div class="form-group col-md-3" style="padding-left: 0px;">
-                                    <span>Freight Amt <?php echo "($INR)" ?></span>
+                                <div class="form-group col-md-4" style="padding-left: 0px;">
+                                    <label>Freight Amt <?php echo "($INR)" ?></label>
                                     <?php
                                     $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
                                     echo form_input($data);
@@ -1422,9 +1442,23 @@ if (!empty($INRSYMBOL)) {
                             </div>
 
                             <div class="form-row">
-                                <center> <label>Cost of the product Per UOM</label></center>
-                                <hr />
+                                <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>
+                                    <?php
+                                    $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                                    
                             </div>
+
+                            <br>
+
+
+                            <center> <label><h4>Cost of the product Per UOM<h4></label></center>
+                            <hr />
+                
                             <div class="form-row">
                                 <div class="form-group col-md-6">
                                 <label>Duty Impact</label>
@@ -1480,6 +1514,7 @@ if (!empty($INRSYMBOL)) {
                     </span>
 
 
+                    <br>
 
                     <div class="form-row" >
                         <div class="form-group col-md-12">
@@ -1517,6 +1552,7 @@ if (!empty($INRSYMBOL)) {
                 </div>
                 <form>
                     <div class="modal-body p-4" align="left">
+
                         <div class="form-row" style="padding:0px;">
 
                             <div class="form-group col-md-3">
@@ -1567,6 +1603,12 @@ if (!empty($INRSYMBOL)) {
                             </div>
 
 
+
+                        </div>
+
+                        <div class="form-row">
+                            <div class="form-group col-md-3"></div>
+
                             <div class="form-group col-md-3" id="hideModalExchangeEdit">
                                 <label> Exchange Rate</label>
                                 <div>
@@ -1853,13 +1895,15 @@ if (!empty($INRSYMBOL)) {
                             </div>
 
                         </div>
+
                         <div class="form-row" style="padding:1%;"></div>
-                        <div class="form-row" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
+                        <div class="form-row p-2" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
                             <br />
                             <div class="form-group col-md-6" style="padding:10px;text-align:left;">
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Basic Price <?php echo "($INR)" ?>
+                                        <label> Basic Price <?php echo "($INR)" ?> </label>
+                                        
                                     </div>
                                     <div class="form-group col-md-4" style="display:none;">
                                         <div>
@@ -1880,7 +1924,8 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Landing charge <?php echo "($INR)" ?>
+                                        <label>   Landing charge <?php echo "($INR)" ?> </label>
+                                      
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -1901,7 +1946,8 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Assessable Value (A)<?php echo "($INR)" ?>
+                                        <label>  Assessable Value (A)<?php echo "($INR)" ?> </label>
+                                       
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div class="form-group" style="display: none">
@@ -1922,7 +1968,8 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Custom duty (B)<?php echo "($INR)" ?>
+                                        <label>   Custom duty (B)<?php echo "($INR)" ?> </label>
+                                      
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -1946,7 +1993,8 @@ if (!empty($INRSYMBOL)) {
 
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Custom ED_cess (C)
+                                        <label>   Custom ED_cess (C) </label>
+                                      
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -1967,7 +2015,8 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Custom S & H cess (D)
+                                        <label>  Custom S & H cess (D) </label>
+                                       
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -1990,7 +2039,8 @@ if (!empty($INRSYMBOL)) {
                             <div class="form-group col-md-6" style="padding:10px;">
                                 <div class="form-row" style="text-align:left;">
                                     <div class="form-group col-md-4">
-                                        Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?>
+                                        <label> Subtotal (E) <?php echo "($INR)  (A+B+C+D)" ?></label>
+                                        
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div class="form-group" style="display: none;">
@@ -2011,14 +2061,12 @@ if (!empty($INRSYMBOL)) {
                                 </div>
 
 
-
-
                                 <div class="form-row" style="text-align:left;">
                                     <div class="form-group col-md-4">
                                         <!-- Additional Excise duty : (g) -->
-                                        <!--  <label><?php echo "IGST on (E): (F) ($INR)"; ?></label> -->
+                                         <label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
 
-                                        IGST on (E): (F)<?php echo "($INR)" ?>
+                                        
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -2038,17 +2086,10 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
 
-
-
-
-
-
-
-
-
-                                <div class="form-row" style="text-align:left;">
+                                <div class="form-row" style="text-align:left;"> 
                                     <div class="form-group col-md-8">
-                                        Total Duty (G)<?php echo "($INR) (B+C+D+F)" ?>
+                                        <label>  Total Duty (G)<?php echo "($INR) (B+C+D+F)" ?> </label>
+                                       
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -2063,9 +2104,8 @@ if (!empty($INRSYMBOL)) {
 
                                 <!--Start of Adding of Frieght model-->
                                 <div class="form-row" style="padding:0px;">
-                                    <div class="form-group col-md-3">
-                                    </div>
-                                    <div class="form-group col-md-3">
+                                   
+                                    <div class="form-group col-md-4">
                                         <span>Freight Type </span>
                                         <?php
                                         $options = array("0" => 'Select Freight Type');
@@ -2077,14 +2117,8 @@ if (!empty($INRSYMBOL)) {
                                         echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"');
                                         ?>
                                     </div>
-                                    <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
-                                        <span>NO Of Trips</span>
-                                        <?php
-                                        $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                    <div class="form-group col-md-3">
+                                  
+                                    <div class="form-group col-md-4">
                                         <span>Freight Rate </span>
                                         <?php
                                         $data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
@@ -2092,7 +2126,7 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
 
-                                    <div class="form-group col-md-3" style="padding-left: 0px;">
+                                    <div class="form-group col-md-4" style="padding-left: 0px;">
                                         <span>Freight Amt <?php echo "($INR)" ?></span>
                                         <?php
                                         $data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
@@ -2103,14 +2137,24 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                                 <!--End of Adding of freight in edit model -->
 
-
                                 <div class="form-row">
-                                    <center> <label>Cost of the product Per UOM</label></center>
-                                    <hr />
+                                    <div class="form-group col-md-9"></div>
+                                    <div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+                                        <span>NO Of Trips</span>
+                                        <?php
+                                        $data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+
                                 </div>
+
+                                <center> <label>Cost of the product Per UOM</label></center>
+                                <hr />
+                                
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Duty Impact
+                                      <label>  Duty Impact </label>
                                     </div>
                                     <div class="form-group col-md-4">
                                         <div>
@@ -2121,7 +2165,7 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
                                     <div class="form-group col-md-4" style="margin-top: -3.1%">
-                                        <span>Quantity</span>
+                                        <label>Quantity</label>
                                         <div>
                                             <?php
                                             $data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();');
@@ -2131,10 +2175,13 @@ if (!empty($INRSYMBOL)) {
                                     </div>
 
                                 </div>
+
                                 <div class="form-row">
 
                                     <div class="form-group col-md-4">
+                                        <label>
                                         Custom Duty <?php echo "($INR)/UOM" ?>
+                                    </label>
                                     </div>
                                     <div class="form-group col-md-4">
                                     </div>
@@ -2148,12 +2195,14 @@ if (!empty($INRSYMBOL)) {
                                     </div>
 
                                 </div>
+
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
-                                        Clearing Charges<?php echo "($INR)" ?>
-                                    </div>
-                                    <div class="form-group col-md-4">
+                                        <label>
+                                            Clearing Charges<?php echo "($INR)" ?>
+                                        </label>
                                     </div>
+                                    
                                     <div class="form-group col-md-4">
                                         <div>
                                             <?php
@@ -2166,10 +2215,6 @@ if (!empty($INRSYMBOL)) {
                                     <div class="form-group col-md-4">
                                         <!-- RMC Including Customers -->
                                         <label><?php echo "Nett per UOM($INR)"; ?></label>
-                                    </div>
-                                    <div class="form-group col-md-4">
-                                    </div>
-                                    <div class="form-group col-md-4">
                                         <div>
                                             <?php
                                             $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@@ -2178,8 +2223,6 @@ if (!empty($INRSYMBOL)) {
                                         </div>
                                     </div>
 
-
-
                                 </div>
 
 
@@ -2187,6 +2230,8 @@ if (!empty($INRSYMBOL)) {
 
                         </div>
 
+                        <br>
+
                         <div class="form-row" >
                             <div class="form-group col-md-12">
                                 <label>Capital Description </label>