From 8abd5648feea6c455317f591ebfab9c3ace99f96 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Mon, 7 Oct 2024 09:52:35 +0530 Subject: [PATCH] fixed all previous issues -vadivelj --- app/Views/alterpurchaseorder.php | 9 +- app/Views/editRevenueAmendPO.php | 173 +++++++++++++++++++---------- app/Views/editimportpo.php | 185 +++++++++++++++---------------- 3 files changed, 210 insertions(+), 157 deletions(-) diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index e1174010..2d1f6c3a 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -512,7 +512,7 @@ if (!empty($INRSYMBOL)) { selValue = $("#drpFreight").val(); if (selValue == PercentageType) { var freightCalculation = ''; - // $('#REVENUE').modal('hide'); + $('#freightmodel').modal('show'); $('#txtFreight').removeAttr('readonly', 'true'); } else if (selValue == NilType) { @@ -4816,7 +4816,7 @@ if (!empty($INRSYMBOL)) {
Vehicle No -
+
Courier No @@ -6209,7 +6209,10 @@ if (!empty($INRSYMBOL)) { // Initialize the DataTable - Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo")); + Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}", { + placeholder: '' + }).mask($("#VehicleNo")); + // $("#ChallanInvDate").datepicker({ diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 7ac0530c..e4c39dd7 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -130,6 +130,10 @@ if (!empty($INRSYMBOL)) { ?> + + + + + + + + \ No newline at end of file diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 57c18e78..590de36b 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -969,9 +969,10 @@ if (!empty($getlogpodtl)) {

-
+
+
@@ -1075,10 +1076,11 @@ if (!empty($getlogpodtl)) {
+ > - +
@@ -1147,26 +1149,28 @@ if (!empty($getlogpodtl)) { } ?> -
+ + -
+
- 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); - echo form_textarea($data); - ?> + + 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40'); + echo form_textarea($data); + ?>
+
+ - -
+
@@ -1174,103 +1178,96 @@ if (!empty($getlogpodtl)) {
-
+
-
-
-
- - -      - +
+
+
+ + +      + + + + +
+
+
+ +
+ +
+ +
+ + + + + + + + + + + +   Cancel + +   Save as Draft - - -
-
-
+   Submit +   Approve + + -
-
+ + OK -
- - - - - - - - - - - -   Cancel - -   Save as Draft - -   Submit -   Approve - - - - - OK - - - -   Submit -   Approve - OK - + +   Submit +   Approve + OK + -
- -
- -
- -
-
-

-
-
- 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($StatusName) && !empty($StatusName)) { - if (isset($statusMappings[$StatusName])) { - echo $statusMappings[$StatusName]; - } else { - echo $StatusName; - } - } else { - echo "Status not provided"; - } - ?> -
-
-
- - - - +
-
+
+
+ +
+
+ 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + + if (isset($StatusName) && !empty($StatusName)) { + if (isset($statusMappings[$StatusName])) { + echo $statusMappings[$StatusName]; + } else { + echo $StatusName; + } + } else { + echo "Status not provided"; + } + ?> + +
+
+
+ +