From 99fc75bf730f730ebbb6b0ab3237fb4c4596b7ea Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Mon, 23 Sep 2024 17:42:55 +0530
Subject: [PATCH 1/2] table alignment in emergency purchase order

---
 app/Views/alterpurchaseorder.php | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index cf73f95d..e8bca645 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -2742,7 +2742,7 @@ if (!empty($INRSYMBOL)) {
 
                             <!-- table showing line items selected -->
                             <div class="row p-2">
-                                <table class="table table-bordered">
+                                <table class="table table-bordered ">
                                     <div align="right" style="padding-right:10px">
 
                                         <!-- Model for revenue PO -->
@@ -6093,27 +6093,7 @@ if (!empty($INRSYMBOL)) {
             });
 
             // Initialize the DataTable
-            var table = $('#serviceTax').DataTable({
-                dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
-                buttons: [
-                    'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
-                ],
-                pageLength: 10, // Default rows per page
-                lengthMenu: [
-                    [10, 20, 30, 50, -1],
-                    [10, 20, 30, 50, "All"]
-                ], // Rows per page options
-                responsive: true, // Responsive table
-                order: [
-                    [0, 'desc']
-                ], // Default ordering (column index 0, descending)
-                language: {
-                    paginate: {
-                        next: '<i class="fas fa-angle-right"></i>', // Next button icon
-                        previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
-                    }
-                }
-            });
+          
 
             Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
 

From c494ee96021498c0f856ed001f14866588690f33 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Tue, 24 Sep 2024 11:41:21 +0530
Subject: [PATCH 2/2] changes in the purchase order listing

---
 app/Controllers/Emergencypurchaseorder.php |  2 +
 app/Views/alterpurchaseorder.php           | 45 +++++++++++++---------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php
index 4cecdeb2..971bfd1b 100755
--- a/app/Controllers/Emergencypurchaseorder.php
+++ b/app/Controllers/Emergencypurchaseorder.php
@@ -372,7 +372,9 @@ class Emergencypurchaseorder extends BaseController
         //     redirect('purchaseorder/PurchaseOrderList', 'refresh');
         // }
         if ($POStatus == REQ_DRAFT) {
+            echo "<script>alert('You Have Successfully Saved the Purchase order! $PONO');</script>";
             $this->session->setFlashdata('success', 'You Have Successfully Saved the Purchase order! '.$PONO);
+
         } else {
             $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
         }
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index e8bca645..41b16547 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1496,7 +1496,7 @@ if (!empty($INRSYMBOL)) {
             $('#submitmodel').modal('hide');
             if (submitoptionvalue == 0) {
 
-                ///alert('normal SERVICE emergency');
+                // alert('normal SERVICE emergency');
                 $('#txtSpecialservice').val(0);
                 Save(1)
             } else {
@@ -1945,7 +1945,7 @@ if (!empty($INRSYMBOL)) {
 
 
         $('#purpose').on('change', function () {
-            console.log("purpose first");
+            
 
             $('#POType').val(this.value);
             if (this.value == 'REVENUE') //Revenue po
@@ -2011,17 +2011,16 @@ if (!empty($INRSYMBOL)) {
             console.log("purpose Second");
 
             // $('#purpose').change(function() {
-            console.log("1111111111111");
+
 
             var input = '';
             input = $("#purpose").val();
             if (input == -1) {
                 $("#POType").val('');
-                console.log("222222222222222222");
+                
 
             } else {
-                console.log("333333333333333333");
-
+               
                 $("#POType").val(input);
                 // $('#content').loader('show');
                 $.ajax({
@@ -2031,12 +2030,9 @@ if (!empty($INRSYMBOL)) {
                     type: "POST",
                     url: "<?php echo base_url() ?>emergencypurchaseorder/getMaterialCode",
                     success: function (data) {
-                        console.log("4444444444444444");
+                        
 
                         if (data) {
-                            console.log("55555555");
-                            console.log(data);
-
                             materialData = data;
                             console.log("material Data");
 
@@ -2052,7 +2048,7 @@ if (!empty($INRSYMBOL)) {
 
                                 });
                             } else if (input == 'REVENUE') {
-                                console.log("777777777777777");
+                               
 
                                 $('#MaterialCode').empty();
                                 $("#MaterialCode").append($('<option></option>').val("0").html("Select Item Code"));
@@ -2096,7 +2092,7 @@ if (!empty($INRSYMBOL)) {
                                 $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
                             } else {
                                 // $('#content').loader('hide');
-                                alert("Error");
+                                //alert("Error");
                             }
 
                         }
@@ -2580,7 +2576,9 @@ if (!empty($INRSYMBOL)) {
                                     <label>Purchase Order Date</label>
                                     <div class="form-group">
                                         <?php
-                                        $formattedDate = $dt->format('Y-m-d');
+                                    
+                                        $poDt=new DateTime('now', new DateTimeZone('Asia/Kolkata'));
+                                        $formattedDate = $poDt->format('Y-m-d');
                                         $data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $formattedDate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
                                         echo form_input($data);
                                         ?>
@@ -2671,7 +2669,7 @@ if (!empty($INRSYMBOL)) {
                                 </div>
 
                                 <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                                    <label>Description of Payable Terms</label>
+                                    <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
                                     <div class="form-group">
                                         <?php
                                         $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@@ -3117,7 +3115,7 @@ if (!empty($INRSYMBOL)) {
                                                                 <h4>Add Service Purchase Order Item </h4>
                                                             </center>
                                                         </div>
-                                                        <div align="left" style="padding: 31px;">
+                                                        <div  style="padding: 31px;">
 
                                                             <div class="row">
                                                                 <div class="col-md-3">
@@ -4603,6 +4601,13 @@ if (!empty($INRSYMBOL)) {
                 </div>
             </div>
 
+
+
+            
+        <!-- modal div -->
+            <!-- modal div -->
+                <!-- modal div -->
+
             <div class="card">
 
 
@@ -5037,7 +5042,7 @@ if (!empty($INRSYMBOL)) {
                                                 <?php
                                                 $options = array("0" => 'Item Code');
                                                 //print_r(  $options);
-                                                
+
                                                 echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
 
                                                 ?>
@@ -6055,7 +6060,7 @@ if (!empty($INRSYMBOL)) {
                     success: function (data) {
                         if (data) {
                             // $('#content').loader('hide');
-                            alert(data);
+                          //  alert(data);
                             //$('#txtRowCount').val('');
                             //$('#txtDeletedRow').val('');
 
@@ -7088,8 +7093,10 @@ if (!empty($INRSYMBOL)) {
                         success: function (data) {
                             // Handle the server response
                             // $('#content').loader('hide');
-                            alert(data);
-                            console.log(data);
+                            if(data){
+                                alert(data);
+                            }
+                            
                             $('#txtRowCount').val('');
                             $('#txtDeletedRow').val('');
                             $('#SpcialInstruction').val('');