From ed9023b53067ca5fce5afb83d26b632e062f9e34 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Sat, 21 Sep 2024 17:08:04 +0530 Subject: [PATCH 1/7] scroll issue fixed on alter purchase order -vadivel J --- app/Views/alterpurchaseorder.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 35614e37..6a095574 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -51,6 +51,8 @@ if (!empty($INRSYMBOL)) { width: 100%; } + .modal { overflow: auto !important; } + .txtSpcialInstruction{ background-color: #f4f9fb; From 7dc84cdd5705222239147be622855bcc2bf92fd1 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Mon, 23 Sep 2024 12:18:24 +0530 Subject: [PATCH 2/7] 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 "'); ?> @@ -4630,8 +4630,7 @@ if (!empty($INRSYMBOL)) {