From 496e840ae290652f9461d092e0731491b7b4b9a4 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 24 Mar 2025 06:30:39 +0000
Subject: [PATCH]  Capital PO international - 0001442

---
 app/Views/editCapitalAmendPO.php | 329 ++++++++++++++++---------------
 app/Views/editCapitalPo.php      |  16 +-
 2 files changed, 178 insertions(+), 167 deletions(-)

diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 5c7802b4..47a8be82 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -96,7 +96,7 @@ $TotalBasicAmount = 0.0;
 $scopeofwork = '';
 $Import_DispatchDetails = '';
 $Import_PlaceofOrgin = '';
-$CapitalRange = '';
+
 
 $Deliverydt = '';
 $DeliverSchedule = '';
@@ -196,8 +196,8 @@ if (!empty($POMaster)) {
         $PONO = $Req->PONO;
         $scopeofwork = $Req->ServiceDescription;
         //$PayableAT=$Req->PayableAT;
-        $ExchangeRateOn1 = new DateTime($Req->ExchangeRateCalculatedon);
-        $ExchangeRateOn = $ExchangeRateOn1->format('d-m-Y');
+        $Exchangedt = new DateTime($Req->ExchangeRateCalculatedon);
+        $ExchangeRateOn = $Exchangedt->format('d-m-Y');
         // $PaymentDays=$Req->PaymentDays;
         $PaymentOtherDescription = $Req->PaymentOtherDescription;
         $PaymentTerms = $Req->PaymentTerms;
@@ -383,19 +383,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
             document.getElementById('ExchangeRateOnDiv').style.display = 'none';
             document.getElementById('ExchangeRateDiv').style.display = 'none';
             document.getElementById('currencyTypeDiv').style.display = 'none';
-            //document.getElementById('ExchangeRateModalDiv').style.display = 'none';
+            document.getElementById('ExchangeRateModalDiv').style.display = 'none';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
             document.getElementById('HideImportTaxTotal').style.display = 'none';
-            // document.getElementById('ModalImportTaxHide').style.display = 'none';
+            document.getElementById('ModalImportTaxHide').style.display = 'none';
             document.getElementById('EditModalImportTaxHide').style.display = 'none';
-            // document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
-            //document.getElementById('ViewModalImportTaxHide').style.display = 'none';
-            //document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
-            document.getElementById('Deliverydtdiv').style.display = 'none';
+            document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
+            document.getElementById('ViewModalImportTaxHide').style.display = 'none';
+            document.getElementById('PlaceOforigindiv').style.display = 'none';
             document.getElementById('dispatchinternational').style.display = 'none';
-            document.getElementById('placeoforgin').style.display = 'none';
             document.getElementById('datedomestic').style.display = 'block';
-            //document.getElementById('deliverydateby').style.display = 'none';
 
 
             capitalType = 'Domestic';
@@ -405,14 +402,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
             document.getElementById('ExchangeRateOnDiv').style.display = 'block';
             document.getElementById('ExchangeRateDiv').style.display = 'block';
             document.getElementById('currencyTypeDiv').style.display = 'block';
-            //document.getElementById('ExchangeRateModalDiv').style.display = 'block';
+            document.getElementById('ExchangeRateModalDiv').style.display = 'block';
             document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
-            //document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
+            document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
             capitalType = 'International';
             document.getElementById('currencyTypeDiv').style.display = 'block';
+            document.getElementById('ViewModalImportTaxHide').style.display = 'block';
             document.getElementById('dispatchinternational').style.display = 'block';
-            //document.getElementById('deliverydateby').style.display = 'block';
-            //document.getElementById('ViewModalImportTaxHide').style.display = 'block';
+            document.getElementById('datedomestic').style.display = 'none';
+
         }
     }
 </script>
@@ -647,13 +645,13 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                         target="_blank"><u>(Click here)</u></a>
                                 </div>
                                 <div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
-                                    <label>Exchange Rate On</label><span class="text-danger"> * </span>
-
-                                    <?php
-                                    $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
-                                    echo form_input($data);
-                                    ?>
-
+                                    <label>Exchange Rate On</label>
+                                    <div class="form-group">
+                                        <?php
+                                        $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
                                 </div>
                                 <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
                                     <label id="CurrencySymbol">Exchange Rate </label><span class="text-danger"> * </span>
@@ -901,24 +899,16 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                         <td style="text-align:right !important">
                                                             <?php echo number_format($record->Rate * $record->Quantity, 2, '.', ''); ?>
                                                         </td>
-                                                        <td style="text-align:right !important"><?php if ($CapitalRange == '1') {
-                                                            echo $record->ServiceTaxamount;
-                                                        } else if ($CapitalRange == '0') {
-                                                            echo "0.0";
-                                                        } ?></td>
-
                                                         <?php if ($CapitalRange == '1') { ?>
-
-                                                            <!-- <td style="text-align:right"><?php echo $record->TotalValue + $record->Afvalue; ?></td> -->
-
-                                                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
+                                                            <td style="text-align:right !important"><?php echo $record->ServiceTaxamount; ?></td>
+                                                            <td style="text-align:right !important">CapitalRange
+                                                            <?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?>
                                                             </td>
 
-                                                        <?php } else if ($CapitalRange == '0') { ?>
-
-                                                            <td style="text-align:right !important">
-                                                                <?php echo number_format(($record->Rate * $record->Quantity), 2, '.', ''); ?>
-                                                                </td>
+                                                        <?php } ?>
+                                                        <?php if ($CapitalRange == '0') { ?>
+                                                            <td style="text-align:right !important"><?php echo '0'; ?></td>
+                                                            <td style="text-align:right !important"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
                                                         <?php } ?>
                                                         <?php
                                                         $row = array("materialCode" => $record->MaterialCode, "ReqNo" => $record->ReqNo);
@@ -1461,7 +1451,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
                             <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
                             <br>
-                            <div class="form-row" id="CAPdiv">
+                            <div id="CAPdiv">
+                            <div class="form-row">
 
                                 <div class="form-group col-md-3">
                                     <label>Total Basic Amount <?php echo "($INR)" ?></label>
@@ -1492,7 +1483,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
                             </div>
-
                             <div class="form-row">
                                 <div class="form-group col-md-3">
                                     <label>IGST <?php echo "($INR)" ?></label>
@@ -1509,8 +1499,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
 
                                 </div>
-
-
                                 <div class="form-group col-md-3">
                                     <label>Total Freight <?php echo "($INR)" ?> </label>
                                     <?php
@@ -1519,12 +1507,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
 
                                 </div>
-
-
-
-
-
-
                                 <div class="form-group col-md-3">
                                     <label>Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preServiceTotalorderValue"
@@ -1535,6 +1517,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div></br>
                             </div>
+                            </div>
 
 
 
@@ -1544,15 +1527,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                             <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
 
-                                <div class="form-group col-md-3">
-                                    <label>Total Frieght Amount <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalfrieght', 'value' => set_value('txttotalfrieght', $TotalFrieght), 'id' => 'txttotalfrieght', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Landing Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1561,7 +1536,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Assessable Value <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1570,7 +1545,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1579,25 +1554,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
-                                <div class="form-group col-md-3">
-                                    <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-3">
-                                    <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
-
-                                    <?php
-                                    $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                    echo form_input($data);
-                                    ?>
-                                </div>
-
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total Subtotal Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1607,7 +1564,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                 </div>
 
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label>Total IGST <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1616,9 +1573,29 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     ?>
                                 </div>
 
+                                <div class="form-group col-md-4">
+                                    <label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED', $totcustomED), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                                <div class="form-group col-md-4">
+                                    <label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH', $totcustomSH), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+
+                               
 
 
-                                <div class="form-group col-md-3">
+
+                                <div class="form-group col-md-4">
                                     <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
 
                                     <?php
@@ -1626,6 +1603,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                     echo form_input($data);
                                     ?>
                                 </div>
+                                <div class="form-group col-md-4">
+                                    <label>Total Frieght Amount <?php echo "($INR)" ?></label>
+
+                                    <?php
+                                    $data = array('name' => 'txttotalfrieght', 'value' => set_value('txttotalfrieght', $TotalFrieght), 'id' => 'txttotalfrieght', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
 
 
@@ -1650,7 +1635,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                               </div>
                                 </div>  -->
 
-                                <div class="form-group col-md-3">
+                                <div class="form-group col-md-4">
                                     <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
                                     <input type="hidden" name="preinterTotalorderValue"
                                         value="<?php echo $totalCapitalOrder ?>">
@@ -1818,7 +1803,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                             </form>
                                         </div>
                                         <div class="modal-footer ">
-                                            <a class="btn btn-success" data-dismiss="modal"
+                                            <a class="btn btn-secondary" data-dismiss="modal"
                                                 value="Cancel">Cancel</a>
                                                 &nbsp;&nbsp;
                                             <a class="btn btn-success" ID="editPackagingOption"
@@ -2121,35 +2106,36 @@ if (!empty($POItem) && $CapitalRange == '1') {
 
                                                 </div>
                                                 <div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
-                                                    <div class="form-group col-md-9" align="right">
+                                                    <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
                                                         <label>Other Allowances <?php echo "($INR)" ?></label>
                                                     </div>
 
                                                     <div class="form-group col-md-3">
-                                                        <?php
+                                                    <div class="form-group">                                                        <?php
                                                         $data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
-                                                </div>
-                                                <div class="form-row" id="EDITCAPdiv4" style="display:flex;"><!--EDITCAPdiv4 -->
-                                                    <div class="form-group col-md-9" align="right">
-                                                        <label>Total Order Value <?php echo "($INR)" ?></label>
                                                     </div>
-
+                                                    <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
+                                                    <label>Total Amount <?php echo "($INR)" ?></label>
+                                                    </div>
                                                     <div class="form-group col-md-3">
+                                                    <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true');
                                                         echo form_input($data);
                                                         ?>
                                                     </div>
+                                                    </div>
                                                 </div>
-                                                <div id="EditModalImportTaxHide" style="display:none;">
-                                                    <div class="form-row" style="border:solid black 1px; padding:1%;">
-                                                        <div class="form-row" style="padding:1%;">
-                                                            
-                                                            <br/>
-                                                            
+                                                <div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
+                                                </div><!-- /.C.D3-->
+                                                <div class="form-row" style="padding:1%;"></div><!-- /.layer-->
+                                                <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide"
+                                                style="display:none;">
+                                                <br />
+                                                                                                                
                                                             <div class="form-group col-md-6" style="padding:15px;">
                                                                 <div class="form-row">
                                                                     <div class="form-group col-md-4">
@@ -2442,9 +2428,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
                                                                 </div>
                                                             </div>
 
-                                                        </div>
-                                                    </div>
-                                                </div>
+                                                </div> <!-- /EditModalImportTaxHide  closed here -->
                                                 <br>
                                                 <div class="form-row" style="text-align: left;">
                                                     <div class="form-group col-md-12">
@@ -2573,6 +2557,10 @@ if (!empty($POItem) && $CapitalRange == '1') {
             $('#ADDCAPdiv2').hide();
             $('#ADDCAPdiv3').hide();
             $('#EDITCAPdiv').hide();
+            $('#EDITCAPdiv').hide();
+            $('#EDITCAPdiv1').hide();
+            $('#EDITCAPdiv2').hide();
+            $('#EDITCAPdiv3').hide();
             // $('#EDITCAPdiv1').hide();
             // $('#EDITCAPdiv2').hide();
             // $('#EDITCAPdiv3').hide();
@@ -3323,7 +3311,7 @@ Calculate Landing charge
         $("#EDITCAPITAL").on("shown.bs.modal", function (e) {
 
 
-
+            
             userid = $(e.relatedTarget).data('userid');
 
 
@@ -3334,6 +3322,24 @@ Calculate Landing charge
             var cellval = tr.cells;
 
             var id = $('#Reqnumber' + userid).val();
+
+            $('#EditReqnumber').val($('#Reqnumber' + userid).val());
+            $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val());
+            $("#EditCostCenter").val($('#CPCostCode' + userid).val());
+            $('#EditCapitalbudAmt').val(parseFloat($('#AvilBudget' + userid).val()).toFixed(2));
+            $('#EditExchangeRtModal').val($('#echangeRate' + userid).val());
+
+            $('#EditCapitalItemName').val($('#materialName' + userid).val());
+
+            $('#EditCPUOM').val($('#uom' + userid).val());
+            $('#EditPer').val($('#per' + userid).val());
+            $('#EditAmendPer').val($('#per' + userid).val()); // refer this
+            $('#EditCPQuantity').val($('#quantity' + userid).val());
+            $('#EditCPRate').val($('#rateInUs' + userid).val());
+
+            $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2));
+
+
             var disc = $('#DisType' + userid).val();
             if (disc != 'NIL') {
                 //alert('removed');
@@ -3343,43 +3349,22 @@ Calculate Landing charge
                 $('#txtEditDiscount').attr('readonly', true);
             }
 
-            $('#EditReqnumber').val($('#Reqnumber' + userid).val());
-
-            $('#EditCapitalDepartmentName').val($('#departmentName' + userid).val());
-            $("#EditCostCenter").val($('#CPCostCode' + userid).val());
-            $('#EditCapitalbudAmt').val($('#AvilBudget' + userid).val());
-            $('#EditExchangeRtModal').val($('#echangeRate' + userid).val());
-
-            $('#EditCapitalItemName').val($('#materialName' + userid).val());
-            $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val());
-            $('#EditFrequency').val($('#frequency' + userid).val());
-
-            $('#EditCPUOM').val($('#uom' + userid).val());
-            $('#EditAmendPer').val($('#per' + userid).val());
-            $('#EditCPQuantity').val($('#quantity' + userid).val());
-            $('#EditCPRate').val(parseFloat($('#rateInUs' + userid).val()).toFixed(2));
-
-            $('#EditCPTotalAmount').val(parseFloat($('#basicval' + userid).val()).toFixed(2));
-
             RequistQuantity = $('#quantity' + userid).val();
-            $('#EditCgst').val($('#CGST' + userid).val());
-            $('#EditAfterCgst').val($('#afterCGST' + userid).val());
-            $('#EditSgst').val($('#SGST' + userid).val());
-            $('#EditAfterSgst').val($('#afterSGST' + userid).val());
-            $('#EditIgst').val($('#IGST' + userid).val());
-            $('#EditAfterIgst').val($('#afterIGST' + userid).val());
-            $('#EditOtherAllowances').val($('#otherallowance' + userid).val());
-            //$('#Editservicetotalordervaue').val($('#totalservicevalue'+userid).val());
-
-            $('#Editservicetotalordervaue').val(cellval[9].innerHTML);
-
-
+            $('#EditCgst').val($('#Cgst' + userid).val());
+            $('#EditSgst').val($('#Sgst' + userid).val());
+            $('#EditIgst').val($('#Igst' + userid).val());
+            $('#EditAfterCgst').val($('#AfterCgst' + userid).val());
+            $('#EditAfterSgst').val($('#AfterSgst' + userid).val());
+            $('#EditAfterIgst').val($('#AfterIgst' + userid).val());
+            $('#EditOtherAllowances').val($('#OtherAmt' + userid).val());
 
             $('#drpFreighteditloc').val($('#Ftype' + userid).val());
             $('#NOOfTripslocedit').val($('#NoTrip' + userid).val());
             $('#txtFreightlocedit').val($('#Fvalue' + userid).val());
             $('#txtAfterFreightlocedit').val($('#Afvalue' + userid).val());
 
+
+
             var FreightType = $('#drpFreighteditloc').val();
 
 
@@ -3393,6 +3378,9 @@ Calculate Landing charge
 
 
 
+
+
+
             $('#EditAfterBasicPriceTax').val($('#basicvalInINR' + userid).val());
             $('#EditAfterLandingCharge').val($('#landingCharge' + userid).val());
 
@@ -3407,8 +3395,19 @@ Calculate Landing charge
             $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses' + userid).val());
             //$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
 
+            $('#EdittxtTotalOrderValue').val(cellval[10].innerHTML);
 
-            $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val());
+
+
+            $('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
+            $('#EditSubtotal').val($("#SubTotal" + userid).val());
+            $('#EditIgstInt').val($("#IGSTInt" + userid).val());
+            // alert("Fetched the value GST"+$("#IGSTInt" + userid).val());
+            $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val());
+            // alert("Fetched the value IGST"+$("#AfterIGSTInt" + userid).val());
+            $('#EditDutyImpact').val($("#DutyImpact" + userid).val());
+            $('#EditNett').val($("#NetValue" + userid).val());
+            $('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
 
             /* get % value */
 
@@ -3418,43 +3417,33 @@ Calculate Landing charge
 
             $('#EditCustomEDcess').val($('#beforeCustomEDCess' + userid).val());
             $('#EditCustomSHcess').val($('#beforeCustomSHCess' + userid).val());
-
+            $('#EditAdditionalExciseduty').val($('#beforeAdditionalExciseDuty' + userid).val());
             $('#EditPurQuantity').val($('#PurQuantity' + userid).val());
 
-
-
-
-            $('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
-            $('#EditSubtotal').val($("#SubTotal" + userid).val());
-            $('#EditIgstInt').val($("#IGSTInt" + userid).val());
-            $('#EditAfterIgstInt').val($("#AfterIGSTInt" + userid).val());
-            $('#EditDutyImpact').val($("#DutyImpact" + userid).val());
-            $('#EditNett').val($("#NetValue" + userid).val());
-            $('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
-
-
-
-
-
             var EditUOM = $('#uom' + userid).val();
             $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
             $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EditUOM + ')');
-            $("#EditDiscountType").val($('#DisType' + userid).val());
-            $('#txtEditDiscount').val($('#DisVal' + userid).val());
-            $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
-            tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val());
-            $('#AmendtxtFreight').val($('#FreightVal' + userid).val());
-            $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val());
-            $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val());
-            $("#drpamendFreight").val($('#FreightType' + userid).val());
+            $('#txtEditFreight').val($('#FreightVal' + userid).val());
+            $('#txtEditAfterFreight').val($('#AfterFreightVal' + userid).val());
+            $('#EditNOOfTrips').val($('#NoOfTrip' + userid).val());
+            $("#drpEditFreight").val($('#FreightType' + userid).val());
 
             var FreightType = $('#FreightType' + userid).val();
 
             if (FreightType == "PER TRIP") {
-                $('#AmendTripsValue').show();
+                $('#EditTripsValue').show();
             } else {
-                $('#AmendTripsValue').hide();
+                $('#EditTripsValue').hide();
             }
+
+            $("#EditDiscountType").val($('#DisType' + userid).val());
+            $('#txtEditDiscount').val($('#DisVal' + userid).val());
+            $('#txtEditAfterDiscount').val($('#AfterDisVal' + userid).val());
+
+            tinyMCE.get('EditItemDescription').setContent($('#CapitalItemDescrition' + userid).val());
+
+
+
             var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
 
             $("#EditMaterialCode").empty();
@@ -3462,13 +3451,35 @@ Calculate Landing charge
             $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
 
             for (i = 0; i < Material.length; i++) {
-                $.each(Material[i], function (idx, obj) {
-                    if (obj.MaterialCode != $('#materialCode' + userid).val()) {
-                        $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
+                $.each(Material[i], function(idx, obj) {
+                if (obj.MaterialCode != $('#materialCode' + userid).val()) {
+                    $("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
 
-                    }
+                }
                 });
             }
+
+            $('#Edittxtservicedescription').val($('#ServiceMaterialDescription' + userid).val());
+            $('#EditFrequency').val($('#frequency' + userid).val());
+
+            //old
+            $('#Editservicetotalordervaue').val(cellval[9].innerHTML);
+            $('#EdittxtTotalOrderValue').val($('#PerKgExpense' + userid).val()); 
+
+            /* get % value */
+            $('#AmendtxtFreight').val($('#FreightVal' + userid).val());
+            $('#AmendtxtAfterFreight').val($('#AfterFreightVal' + userid).val());
+            $('#AmendNOOfTrips').val($('#NoOfTrip' + userid).val());
+            $("#drpamendFreight").val($('#FreightType' + userid).val());
+
+            
+
+            if (FreightType == "PER TRIP") {
+                $('#AmendTripsValue').show();
+            } else {
+                $('#AmendTripsValue').hide();
+            }
+            
             $('#EditLandingCharge').attr("style", "pointer-events: none;");
             $('#EditHighseas').attr("style", "pointer-events: none;");
             $('#EditCustomduty').attr("style", "pointer-events: none;");
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index b7c46863..bb79bced 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1680,7 +1680,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
 
@@ -1712,7 +1712,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
       </div>
@@ -1742,7 +1742,7 @@ if (!empty($getlogpodtl)) {
         </form>
       </div>
       <div class="modal-footer" style="border:none;">
-        <a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
+        <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
         <a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();">&nbsp;&nbsp;<span
             class="bold">Ok</span></a>
 
@@ -2421,7 +2421,7 @@ if (!empty($getlogpodtl)) {
           </div>
         </div>
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
           <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add
               Capital</span></a>
         </div>
@@ -2745,7 +2745,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
+            <diEditOtherAllowancesv class="col-md-9 col-md-offset-4" style="text-align:right !important">
               <label>Total Amount <?php echo "($INR)" ?></label>
             </div>
             <div class="form-group col-md-3">
@@ -3072,7 +3072,7 @@ if (!empty($getlogpodtl)) {
           </div><!-- C.Desc -->
         </div><!-- /.body -->
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
           <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update
               Capital</span></a>
         </div><!-- /.footer -->
@@ -3669,7 +3669,7 @@ if (!empty($getlogpodtl)) {
           </div><!-- form-row capitial Description -->
         </div><!-- modal-body -->
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
           <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
             <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
           <?php } ?>
@@ -4254,7 +4254,7 @@ if (!empty($getlogpodtl)) {
           </div>
         </div>
         <div class="modal-footer">
-          <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
+          <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
           <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
             <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
           <?php } ?>