From 49771513291231fc32a173ebc595d337b50c7802 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Sat, 21 Sep 2024 16:13:50 +0530 Subject: [PATCH] CHANGE_PURCHASE_ORDER_SERVICE_REVENUE__CAPITAL_IMPORT_ADD_EDIT_CHECK_MODEL_2 --- app/Views/alterpurchaseorder.php | 2 +- app/Views/editCapitalPo.php | 35 +++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index e1ef4d26..13e1a8d9 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -7057,7 +7057,7 @@ if (!empty($INRSYMBOL)) { success: function (data) { // Handle the server response // $('#content').loader('hide'); - // alert(data); + alert(data); console.log(data); $('#txtRowCount').val(''); $('#txtDeletedRow').val(''); diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index b50ab48a..304519dc 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -7565,7 +7565,7 @@ } - + var edit = ''; $('#drpFreightloc').change(function() { var FreightType = $("#drpFreightloc").val(); @@ -7598,6 +7598,8 @@ if (selValue == '') { var PackagingCalculation = ''; + $('#CAPITAL').modal('hide'); + edit = 'FreightCalculationOn'; $('#packagingcalmodel').modal('show'); //PackagingCalculation = $("input:radio[name='optPackaging']:checked").val(); @@ -7617,7 +7619,20 @@ }); + $('#editpackagingcalmodel').on('hidden.bs.modal', function() { +$('#EDITCAPITAL').modal('show'); +$('.modal-backdrop').remove(); + +// console.log($('#edit'+tempUserId)); + +// $('#edit'+tempUserId).click(); +}); +$('#packagingcalmodel').on('hidden.bs.modal', function() { +console.log("add form "); + +$('#CAPITAL').modal('show'); +}); function calculateFreightlocaddper() { @@ -7625,7 +7640,7 @@ var Calculation = document.querySelector('input[name = "optPackaging"]:checked').value; var FreightType = $("#drpFreightloc").val(); $('#packagingcalmodel').modal('hide'); - + $('#CAPITAL').modal('show'); if (FreightType == '') { @@ -7734,6 +7749,7 @@ if (selValue == '') { var PackagingCalculation = ''; + $('#EDITCAPITAL').modal('hide'); $('#editpackagingcalmodel').modal('show'); //PackagingCalculation = $("input:radio[name='optPackaging']:checked").val(); @@ -7760,7 +7776,20 @@ var Calculation = document.querySelector('input[name = "editoptPackaging"]:checked').value; var FreightType = $("#drpFreighteditloc").val(); $('#editpackagingcalmodel').modal('hide'); - + $('.modal-backdrop').remove(); + $('#EDITCAPITAL').modal('show'); + if (!document.getElementById('modalScrollCSS')) { + var style = document.createElement('style'); + style.id = 'modalScrollCSS'; // Assign an ID to the style tag to avoid duplicates + style.innerHTML = ` + /* Force scroll by setting a max height */ + .modal-body { + max-height: 540px; + overflow-y: auto; + } + `; + document.head.appendChild(style); // Append the CSS to the head + } if (FreightType == '') {