GST Release Add, Edit, Delete Working

Reviewed-on: #18

controllers/gst_release_controller.py

@@ -1,8 +1,8 @@
-from flask import Blueprint, render_template, request, redirect, url_for
+# routes/gst_release_routes.py
+from flask import Blueprint, render_template, request, redirect, url_for, flash
 from flask_login import login_required
 from model.gst_release import GSTRelease
 from model.Log import LogHelper
-from flask import flash, current_app
 
 gst_release_bp = Blueprint('gst_release_bp', __name__)
 gst_service = GSTRelease()
@@ -13,7 +13,7 @@ gst_service = GSTRelease()
 def add_gst_release():
     if request.method == 'POST':
         gst_service.AddGSTRelease(request)
-        LogHelper.log_action("Add GST Release", f"User added GST release")
+        LogHelper.log_action("Add GST Release", "User added GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -30,7 +30,7 @@ def edit_gst_release(gst_release_id):
 
     if request.method == 'POST':
         gst_service.EditGSTRelease(request, gst_release_id)
-        LogHelper.log_action("Edit GST Release", f"User edited GST release")
+        LogHelper.log_action("Edit GST Release", "User edited GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -40,7 +40,7 @@ def edit_gst_release(gst_release_id):
 @gst_release_bp.route('/delete_gst_release/<int:gst_release_id>', methods=['GET', 'POST'])
 @login_required
 def delete_gst_release(gst_release_id):
-    gst_service.DeleteGSTRelease(gst_release_id)  # remove request
+    gst_service.DeleteGSTRelease(gst_release_id)
-    LogHelper.log_action("Delete GST Release", f"User deleted GST release")
+    LogHelper.log_action("Delete GST Release", "User deleted GST release")
     flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
     return redirect(url_for('gst_release_bp.add_gst_release'))

controllers/hold_types_controller.py

@@ -10,21 +10,21 @@ hold_bp = Blueprint("hold_types", __name__)
 @hold_bp.route('/add_hold_type', methods=['GET','POST'])
 @login_required
 def add_hold_type():
-
     hold = HoldTypes()
 
     if request.method == 'POST':
-        hold.AddHoldType(request)   # ✅
+        hold.AddHoldType(request)
-        return hold.resultMessage
+        # ✅ Always redirect to same page (NO JSON)
+        return redirect(url_for("hold_types.add_hold_type"))
 
-    hold_types = hold.GetAllHoldTypes()   # ✅
+    # GET request → show data
+    hold_types = hold.GetAllHoldTypes()
 
     return render_template(
         "add_hold_type.html",
         Hold_Types_data=hold_types
     )
 
-
 # ---------------- CHECK HOLD TYPE (OPTIONAL LIKE BLOCK) ----------------
 @hold_bp.route('/check_hold_type', methods=['POST'])
 @login_required

controllers/log_controller.py

@@ -21,7 +21,6 @@ def activity_log():
         end_date,
         user_name
     )
-
     return render_template(
         "activity_log.html",
         logs=filtered_logs,

controllers/payment_controller.py

@@ -86,12 +86,12 @@ def edit_payment(payment_id):
 
     return render_template('edit_payment.html', payment_data=payment_data)
 
-
 # ------------------- Delete Payment -------------------
-@payment_bp.route('/delete_payment/<int:payment_id>', methods=['POST'])
+@payment_bp.route('/delete_payment/<int:payment_id>', methods=['GET'])
 @login_required
 def delete_payment(payment_id):
     success, pmc_no, invoice_no = Paymentmodel.delete_payment(payment_id)
+
     if not success:
         flash("Payment not found or failed to delete", "error")
     else:

model/FolderAndFile.py

@@ -27,13 +27,27 @@ class FolderAndFile:
         os.makedirs(folder, exist_ok=True)
         return folder
 
-    # -----------------------------
+    @staticmethod
-    # FILE PATH METHODS
+    def get_logs_folder():
-    # -----------------------------
+        folder = os.path.join(current_app.root_path, "logs")
+
+        if not os.path.exists(folder):
+            os.makedirs(folder)
+
+        os.makedirs(folder, exist_ok=True)
+        return folder
+    
+    # FILE PATH METHODS - download
     @staticmethod
     def get_download_path(filename):
         return os.path.join(FolderAndFile.get_download_folder(), filename)
     
+    # FILE PATH METHODS - upload file
     @staticmethod
     def get_upload_path(filename):
         return os.path.join(FolderAndFile.get_upload_folder(), filename)
+    
+    # FILE PATH METHODS - activity log file
+    @staticmethod
+    def get_activity_log_path(filename):
+        return os.path.join(FolderAndFile.get_logs_folder(), filename)

model/ItemCRUD.py

@@ -6,7 +6,6 @@ import config
 import re
 import mysql.connector
 
-
 # ----------------------------------------------------------
 # Mapping Class
 # ----------------------------------------------------------
@@ -23,10 +22,11 @@ class itemCRUDMapping:
             self.name = "Hold Type"
         elif itemType is ItemCRUDType.Subcontractor:
             self.name = "Subcontractor"
+        elif itemType.name == "GSTRelease":
+            self.name = "GSTRelease"
         else:
             self.name = "Item"
 
-
 # ----------------------------------------------------------
 # Generic CRUD Class
 # ----------------------------------------------------------
@@ -93,13 +93,47 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
             # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                # Duplicate check (PMC_No + Invoice_No)
+                if storedprocfetch:
+                    cursor.callproc(storedprocfetch, (data['PMC_No'], data['Invoice_No']))
+                    existing_item = None
+                    for rs in cursor.stored_results():
+                        existing_item = rs.fetchone()
+                    if existing_item:
+                        self.isSuccess = False
+                        self.resultMessage = HtmlHelper.json_response(
+                            ResponseHandler.already_exists(self.itemCRUDMapping.name), 409
+                        )
+                        return
+
+                # Insert GSTRelease
+                cursor.callproc(storedprocadd, (
+                    data['PMC_No'],
+                    data['Invoice_No'],
+                    data['Basic_Amount'],
+                    data['Final_Amount'],
+                    data['Total_Amount'],
+                    data['UTR'],
+                    data['Contractor_ID']
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.add_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:
 
-                # Duplicate check
                 cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
-
                 existing_item = None
                 for rs in cursor.stored_results():
                     existing_item = rs.fetchone()
@@ -111,7 +145,6 @@ class ItemCRUD:
                     )
                     return
 
-                # Insert
                 cursor.callproc(storedprocadd, (
                     data['Contractor_Name'],
                     data['Address'],
@@ -123,26 +156,24 @@ class ItemCRUD:
                     data['GST_No'],
                     data['Contractor_password']
                 ))
-
                 connection.commit()
-
                 self.isSuccess = True
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.add_success(self.itemCRUDMapping.name), 200
                 )
                 return
             
+
             # ======================================================
-            # NORMAL (Village / Block / State)
+            # NORMAL SINGLE-FIELD (Village / Block / State)
             # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                 self.isSuccess = False
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
                 )
                 return
 
-            # Duplicate check
             if parentid is None:
                 cursor.callproc(storedprocfetch, (childname,))
             else:
@@ -159,17 +190,14 @@ class ItemCRUD:
                 )
                 return
 
-            # Insert
             if parentid is None:
                 cursor.callproc(storedprocadd, (childname,))
             else:
                 cursor.callproc(storedprocadd, (childname, parentid))
 
             connection.commit()
-
             self.isSuccess = True
             self.resultMessage = HtmlHelper.json_response(
-              
                 ResponseHandler.add_success(self.itemCRUDMapping.name), 200
             )
 
@@ -199,9 +227,32 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
             # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                cursor.callproc(storedprocupdate, (
+                    data['p_pmc_no'],       # PMC_No
+                    data['p_invoice_no'],   # Invoice_No
+                    data['p_basic_amount'], # Basic_Amount
+                    data['p_final_amount'], # Final_Amount
+                    data['p_total_amount'], # Total_Amount
+                    data['p_utr'],          # UTR
+                    data['p_gst_release_id']# GST_Release_Id
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.update_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:
+
                 cursor.callproc(storedprocupdate, (
                     childid,
                     data['Contractor_Name'],
@@ -214,9 +265,7 @@ class ItemCRUD:
                     data['GST_No'],
                     data['Contractor_password']
                 ))
-
                 connection.commit()
-
                 self.isSuccess = True
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.update_success(self.itemCRUDMapping.name), 200
@@ -224,9 +273,9 @@ class ItemCRUD:
                 return
 
             # ======================================================
-            # NORMAL
+            # NORMAL SINGLE-FIELD
             # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                 self.isSuccess = False
                 self.resultMessage = ResponseHandler.update_failure(self.itemCRUDMapping.name)['message']
                 return
@@ -237,7 +286,6 @@ class ItemCRUD:
                 cursor.callproc(storedprocupdate, (childid, parentid, childname))
 
             connection.commit()
-
             self.isSuccess = True
             self.resultMessage = ResponseHandler.update_success(self.itemCRUDMapping.name)['message']
 
@@ -259,20 +307,15 @@ class ItemCRUD:
 
         data = []
         connection = config.get_db_connection()
-
         if not connection:
             return []
 
         cursor = connection.cursor()
-
         try:
             cursor.callproc(storedproc)
-
             for result in cursor.stored_results():
                 data = result.fetchall()
-
             self.isSuccess = True
-
         except mysql.connector.Error as e:
             print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
             self.isSuccess = False
@@ -280,7 +323,6 @@ class ItemCRUD:
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
             return []
-
         finally:
             cursor.close()
             connection.close()
@@ -298,13 +340,10 @@ class ItemCRUD:
 
         try:
             cursor.callproc(storedproc, (id,))
-
             for rs in cursor.stored_results():
                 data = rs.fetchone()
-
         except mysql.connector.Error as e:
             print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
-
         finally:
             cursor.close()
             connection.close()
@@ -324,7 +363,7 @@ class ItemCRUD:
             f"User {current_user.id} checked '{childname}'"
         )
 
-        if not re.match(RegEx.patternAlphabetOnly, childname):
+        if not re.match(RegEx.allPattern, childname):
             return HtmlHelper.json_response(
                 ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
             )
@@ -353,7 +392,6 @@ class ItemCRUD:
             return HtmlHelper.json_response(
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
-
         finally:
             cursor.close()
             connection.close()

model/Log.py

@@ -1,29 +1,41 @@
 import os
-from datetime import datetime
 from flask import current_app
-from flask_login import current_user
+from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
 
+from datetime import datetime
+
+from model.FolderAndFile import FolderAndFile
 
 class LogHelper:
     @staticmethod
     def log_action(action, details=""):
-        """Add a log entry."""
+        """Log user actions with timestamp, user, action, and details."""
-        log_data = LogData()
+        logData = LogData()
-        log_data.add_log(action, details)
+        logData.WriteLog(action, details="")
-
 
 class LogData:
+    filepath = ""
+    timestamp = None
 
     def __init__(self):
-        self.filepath = os.path.join(current_app.root_path, 'activity.log')
+        self.filepath = FolderAndFile.get_activity_log_path('activity.log')
         self.timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        self.user = getattr(current_user, "cn", None) \
+        self.user = LogData.get_current_user()
-                    or getattr(current_user, "username", None) \
-                    or getattr(current_user, "sAMAccountName", "Unknown")
 
 
-    def add_log(self, action, details=""):
+    @staticmethod
-        """Create/Add a log entry."""
+    def get_current_user():
+        if hasattr(current_user, "cn") and current_user.cn:
+            return current_user.cn
+        elif hasattr(current_user, "username") and current_user.username:
+            return current_user.username
+        elif hasattr(current_user, "sAMAccountName") and current_user.sAMAccountName:
+            return current_user.sAMAccountName
+        return "Unknown"
+
+    def WriteLog(self, action, details=""):
+        """Log user actions with timestamp, user, action, and details."""
+        
         with open(self.filepath, "a", encoding="utf-8") as f:
             f.write(
                 f"Timestamp: {self.timestamp} | "
@@ -32,73 +44,41 @@ class LogData:
                 f"Details: {details}\n"
             )
 
-    def get_all_logs(self):
+    def GetActivitiesLog(self):
-        """Read all logs."""
         logs = []
+
         if os.path.exists(self.filepath):
-            with open(self.filepath, 'r', encoding="utf-8") as f:
+            with open(self.filepath, 'r') as f:
                 for line in f:
                     parts = line.strip().split(" | ")
                     if len(parts) == 4:
                         logs.append({
-                            "timestamp": parts[0].split(":", 1)[1].strip(),
+                            "timestamp": parts[0].replace("Timestamp:", "").strip(),
-                            "user": parts[1].split(":", 1)[1].strip(),
+                            "user": parts[1].replace("User:", "").strip(),
-                            "action": parts[2].split(":", 1)[1].strip(),
+                            "action": parts[2].replace("Action:", "").strip(),
-                            "details": parts[3].split(":", 1)[1].strip()
+                            "details": parts[3].replace("Details:", "").strip()
                         })
         return logs
 
-    def get_filtered_logs(self, start_date=None, end_date=None, user_name=None):
+    def GetFilteredActivitiesLog(self, startDate, endDate, userName):
-        """Filter logs by date and/or user."""
+        filtered_logs = self.GetActivitiesLog()
-        logs = self.get_all_logs()
 
-        # Filter by date
+        # Date filter
-        if start_date or end_date:
+        if startDate or endDate:
-            start_dt = datetime.strptime(start_date, "%Y-%m-%d") if start_date else datetime.min
+            try:
-            end_dt = datetime.strptime(end_date, "%Y-%m-%d") if end_date else datetime.max
+                start_dt = datetime.strptime(startDate, "%Y-%m-%d") if startDate else datetime.min
-            logs = [
+                end_dt = datetime.strptime(endDate, "%Y-%m-%d") if endDate else datetime.max
-                log for log in logs
+
+                filtered_logs = [
+                    log for log in filtered_logs
                     if start_dt <= datetime.strptime(log["timestamp"], "%Y-%m-%d %H:%M:%S") <= end_dt
                 ]
 
-        # Filter by username
+            except Exception as e:
-        if user_name:
+                print("Date filter error:", e)
-            logs = [log for log in logs if user_name.lower() in log.get("user", "").lower()]
-
-        return logs
-
-    def update_log(self, index, action=None, details=None):
-        """Update a specific log entry by index (0-based)."""
-        logs = self.get_all_logs()
-        if 0 <= index < len(logs):
-            if action:
-                logs[index]["action"] = action
-            if details:
-                logs[index]["details"] = details
-            self._rewrite_logs_file(logs)
-            return True
-        return False
-
-    def delete_log(self, index):
-        """Delete a specific log entry by index (0-based)."""
-        logs = self.get_all_logs()
-        if 0 <= index < len(logs):
-            logs.pop(index)
-            self._rewrite_logs_file(logs)
-            return True
-        return False
-
-    # ------------------- INTERNAL HELPER -------------------
-
-    def _rewrite_logs_file(self, logs):
-        """Overwrite the log file with current logs."""
-        with open(self.filepath, "w", encoding="utf-8") as f:
-            for log in logs:
-                f.write(
-                    f"Timestamp: {log['timestamp']} | "
-                    f"User: {log['user']} | "
-                    f"Action: {log['action']} | "
-                    f"Details: {log['details']}\n"
-                )
             
+        # Username filter
+        if userName:
+            filtered_logs = [log for log in filtered_logs if userName.lower() in log["user"].lower()]
 
+        return filtered_logs

model/Utilities.py

@@ -8,10 +8,11 @@ class ItemCRUDType(Enum):
     State = 4
     HoldType = 5
     Subcontractor = 6
-    
+    GSTRelease = 7
 
 class RegEx:
     patternAlphabetOnly = "^[A-Za-z ]+$"
+    allPattern = "^(?!\s*$).+"
 
 
 class ResponseHandler:

model/gst_release.py

@@ -1,109 +1,8 @@
-# from flask import request
+# model/gst_release.py
-# from model.ItemCRUD import ItemCRUD
-# from model.Utilities import ItemCRUDType
-
-# class GSTRelease:
-#     """CRUD operations for GST Release using ItemCRUD"""
-
-#     def __init__(self):
-#         self.isSuccess = False
-#         self.resultMessage = ""
-
-#     # ------------------- Add GST Release -------------------
-#     def AddGSTRelease(self, request):
-#         pmc_no = request.form.get('PMC_No', '').strip()
-#         invoice_no = request.form.get('invoice_No', '').strip()
-
-#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-#         gst.AddItem(
-#             request=request,
-#             parentid=None,
-#             childname=f"{pmc_no}-{invoice_no}",
-#             storedprocfetch="CheckGSTReleaseExists",
-#             storedprocadd="AddGSTReleaseFromExcel"  # your stored procedure handles extra fields
-#         )
-
-#         self.isSuccess = gst.isSuccess
-#         self.resultMessage = str(gst.resultMessage)
-
-#     # ------------------- Get All GST Releases -------------------
-#     def GetAllGSTReleases(self):
-#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-#         # Pass request=None for fetch
-#         rows = gst.GetAllData(request=None, storedproc="GetAllGSTReleases")
-
-#         self.isSuccess = gst.isSuccess
-#         self.resultMessage = str(gst.resultMessage)
-
-#         data = []
-#         for row in rows:
-#             data.append({
-#                 "gst_release_id": row[0],
-#                 "pmc_no": row[1],
-#                 "invoice_no": row[2],
-#                 "basic_amount": row[3],
-#                 "final_amount": row[4],
-#                 "total_amount": row[5],
-#                 "utr": row[6],
-#                 "contractor_id": row[7]
-#             })
-#         return data
-
-#     # ------------------- Get GST Release By ID -------------------
-#     def GetGSTReleaseByID(self, gst_release_id):
-#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-#         row = gst.GetDataByID(gst_release_id, request=None, storedproc="GetGSTReleaseById")
-
-#         self.isSuccess = gst.isSuccess
-#         self.resultMessage = str(gst.resultMessage)
-
-#         if row:
-#             return {
-#                 "gst_release_id": row[0],
-#                 "pmc_no": row[1],
-#                 "invoice_no": row[2],
-#                 "basic_amount": row[3],
-#                 "final_amount": row[4],
-#                 "total_amount": row[5],
-#                 "utr": row[6],
-#                 "contractor_id": row[7]
-#             }
-#         return None
-
-#     # ------------------- Edit GST Release -------------------
-#     def EditGSTRelease(self, request, gst_release_id):
-#         pmc_no = request.form.get('PMC_No', '').strip()
-#         invoice_no = request.form.get('invoice_No', '').strip()
-
-#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-#         gst.EditItem(
-#             request=request,
-#             childid=gst_release_id,
-#             parentid=None,
-#             childname=f"{pmc_no}-{invoice_no}",
-#             storedprocupdate="UpdateGSTRelease"  # stored procedure handles extra fields
-#         )
-
-#         self.isSuccess = gst.isSuccess
-#         self.resultMessage = str(gst.resultMessage)
-
-#     # ------------------- Delete GST Release -------------------
-#     def DeleteGSTRelease(self, gst_release_id):
-#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-#         gst.DeleteItem(
-#             itemID=gst_release_id,
-#             request=None,
-#             storedprocDelete="DeleteGSTReleaseById"
-#         )
-
-#         self.isSuccess = gst.isSuccess
-#         self.resultMessage = str(gst.resultMessage)
-
 from flask import request, jsonify
 from model.ItemCRUD import ItemCRUD
 from model.Utilities import ItemCRUDType
 
-
 class GSTRelease:
 
     def __init__(self):
@@ -115,6 +14,12 @@ class GSTRelease:
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
 
+            # Print the full form data
+            print("===== DEBUG: FORM DATA =====")
+            for key, value in request.form.items():
+                print(f"{key} : {value}")
+            print("=============================")
+
             data = {
                 "PMC_No": request.form.get("PMC_No", "").strip(),
                 "Invoice_No": request.form.get("Invoice_No", "").strip(),
@@ -125,6 +30,11 @@ class GSTRelease:
                 "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
             }
 
+            print("===== DEBUG: PARSED DATA =====")
+            print(data)
+            print("==============================")
+
+            # Add GST Release
             gst.AddItem(
                 request=request,
                 data=data,
@@ -132,6 +42,8 @@ class GSTRelease:
                 storedprocadd="AddGSTReleaseFromExcel"
             )
 
+            print(f"AddItem result: isSuccess={gst.isSuccess}, message={gst.resultMessage}")
+
             self.isSuccess = gst.isSuccess
             self.resultMessage = str(gst.resultMessage)
 
@@ -142,20 +54,26 @@ class GSTRelease:
 
         return jsonify({"success": self.isSuccess, "message": self.resultMessage})
 
-    # ------------------- Edit GST Release -------------------
     def EditGSTRelease(self, request, gst_release_id):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
 
+            # Map form inputs to stored procedure parameters
             data = {
-                "PMC_No": request.form.get("PMC_No", "").strip(),
+                "p_pmc_no": request.form.get("PMC_No", "").strip(),
-                "Invoice_No": request.form.get("Invoice_No", "").strip(),
+                "p_invoice_no": request.form.get("invoice_no", "").strip(),
-                "Basic_Amount": float(request.form.get("Basic_Amount", 0) or 0),
+                "p_basic_amount": float(request.form.get("Basic_Amount", 0) or 0),
-                "Final_Amount": float(request.form.get("Final_Amount", 0) or 0),
+                "p_final_amount": float(request.form.get("Final_Amount", 0) or 0),
-                "Total_Amount": float(request.form.get("Total_Amount", 0) or 0),
+                "p_total_amount": float(request.form.get("Total_Amount", 0) or 0),
-                "UTR": request.form.get("UTR", "").strip()
+                "p_utr": request.form.get("UTR", "").strip(),
+                "p_gst_release_id": gst_release_id
             }
 
+            print("===== DEBUG: UPDATE DATA =====")
+            print(data)
+            print("==============================")
+
+            # Call your stored procedure
             gst.EditItem(
                 request=request,
                 childid=gst_release_id,
@@ -171,8 +89,6 @@ class GSTRelease:
             self.isSuccess = False
             self.resultMessage = str(e)
 
-        return jsonify({"success": self.isSuccess, "message": self.resultMessage})
-
     # ------------------- Delete GST Release -------------------
     def DeleteGSTRelease(self, gst_release_id):
         try:
@@ -198,7 +114,6 @@ class GSTRelease:
     def GetAllGSTReleases(self):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-
             rows = gst.GetAllData(None, "GetAllGSTReleases")
 
             data = []
@@ -224,7 +139,6 @@ class GSTRelease:
     def GetGSTReleaseByID(self, gst_release_id):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-
             row = gst.GetDataByID(gst_release_id, "GetGSTReleaseById")
 
             if row:

static/js/hold_types.js

@@ -3,7 +3,7 @@ $(document).ready(function () {
         let holdType = $(this).val().replace(/^\s+/, "");
         $(this).val(holdType);
 
-         let reg = /^[A-Za-z]/;
+        let reg = /^.+$/; // all pattern allow
 
         if (!reg.test(holdType)) {
             $("#holdTypeMessage").text("Hold Type must start with a letter.").css("color", "red");

static/js/search_on_table.js

@@ -1,26 +1,23 @@
-
 // Search on table using search inpute options
 function searchTable() {
     let input = document.getElementById("searchBar").value.toLowerCase();
-    let rows = document.querySelectorAll("table tbody tr");
+    let tables = document.querySelectorAll("table");
 
-    rows.forEach(row => {
+    tables.forEach(table => {
-        let blockName = row.cells[1].textContent.toLowerCase();
+        let rows = table.querySelectorAll("tr");
-        let districtName = row.cells[2].textContent.toLowerCase();
-        let villageName = row.cells[3].textContent.toLowerCase();
 
-        if (blockName.includes(input) || districtName.includes(input)|| villageName.includes(input)) {
+        rows.forEach((row, index) => {
-            row.style.display = "";
+            if (index === 0) return; // header skip
-        } else {
+
-            row.style.display = "none";
+            let text = row.textContent.toLowerCase();
-        }
+
+            row.style.display = text.includes(input) ? "" : "none";
+        });
     });
 }
 
 
 
-
-
 // Common Sorting Script for Tables
 function sortTable(n, dir) {
     var table, rows, switching, i, x, y, shouldSwitch;
@@ -57,14 +54,14 @@ function sortTable(n, dir) {
 }
 
 // Attach sorting functionality to all sortable tables
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
     // Find all elements with the class "sortable-header"
     var sortableHeaders = document.querySelectorAll(".sortable-header");
 
-    sortableHeaders.forEach(function(header) {
+    sortableHeaders.forEach(function (header) {
         // Attach click event for ascending sort
         if (header.querySelector(".sort-asc")) {
-            header.querySelector(".sort-asc").addEventListener("click", function() {
+            header.querySelector(".sort-asc").addEventListener("click", function () {
                 var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                 sortTable(columnIndex, "asc");
             });
@@ -72,7 +69,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
         // Attach click event for descending sort
         if (header.querySelector(".sort-desc")) {
-            header.querySelector(".sort-desc").addEventListener("click", function() {
+            header.querySelector(".sort-desc").addEventListener("click", function () {
                 var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                 sortTable(columnIndex, "desc");
             });
@@ -106,3 +103,30 @@ document.addEventListener("DOMContentLoaded", function () {
         addButton.classList.remove("active-button");
     });
 });
+
+document.addEventListener("DOMContentLoaded", function () {
+
+    let tables = document.querySelectorAll("table");
+
+    tables.forEach(table => {
+        let header = table.querySelector("tr:first-child");
+
+        if (header) {
+            header.style.position = "sticky";
+            header.style.top = "0";
+            header.style.background = "#fff";
+            header.style.zIndex = "2";
+        }
+
+        if (!table.parentElement.classList.contains("table-wrapper")) {
+            let wrapper = document.createElement("div");
+            wrapper.classList.add("table-wrapper");
+            wrapper.style.maxHeight = "65vh"
+            wrapper.style.overflowY = "auto";
+
+            table.parentNode.insertBefore(wrapper, table);
+            wrapper.appendChild(table);
+        }
+    });
+
+});

templates/add_gst_release.html

@@ -22,10 +22,14 @@
         <div class="row1">
            <div>
     <label for="subcontractor">Subcontractor Name:</label>
+    <!-- Text input for user-friendly autocomplete -->
     <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id"/>
+    
+    <!-- Hidden input for backend; must match model's Contractor_ID -->
+    <input type="hidden" id="subcontractor_id" name="Contractor_ID"/>
+    
     <div id="subcontractor_list" class="autocomplete-items"></div>
-            </div>
+</div>
         </div>
 
         <label for="PMC_No">PMC No:</label><br>
@@ -37,19 +41,19 @@
         </select><br><br>
 
         <label for="invoice_No">Invoice No:</label><br>
-        <input type="text" id="invoice_No" name="invoice_No" required><br><br>
+        <input type="text" id="invoice_No" name="Invoice_No" required><br><br>
 
         <label for="basic_amount">Basic Amount:</label><br>
-        <input type="number" step="0.01" id="basic_amount" name="basic_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="basic_amount" name="Basic_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="final_amount">Final Amount:</label><br>
-        <input type="number" step="0.01" id="final_amount" name="final_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="final_amount" name="Final_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="total_amount">Total Amount:</label><br>
-        <input type="number" step="0.01" id="total_amount" name="total_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="total_amount" name="Total_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="utr">UTR:</label><br>
-        <input type="text"  id="utr" name="utr"  required><br><br>
+        <input type="text"  id="utr" name="UTR"  required><br><br>
 
         <button type="submit">Submit GST Release</button>
     </form>
@@ -68,10 +72,11 @@
     {% endwith %}
 </div>
 
+<!-- GST Release History Table -->
 <div id="addTable" style="display: none;">
     <div class="search-container">
         <h2>GST Release History</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+        <input type="text" id="searchBar" placeholder="Search..." onkeyup="searchTable()">
     </div>
     <table id="sortableTable" border="1">
         <thead>
@@ -90,24 +95,22 @@
         <tbody>
             {% for gst_rel in gst_releases %}
             <tr>
-            <td>{{ gst_rel[0] }}</td>
+                <td>{{ gst_rel.gst_release_id }}</td>
-            <td>{{ gst_rel[1] }}</td>
+                <td>{{ gst_rel.pmc_no }}</td>
-            <td>{{ gst_rel[2] }}</td>
+                <td>{{ gst_rel.invoice_no }}</td>
-            <td>{{ gst_rel[3] }}</td>
+                <td>{{ gst_rel.basic_amount }}</td>
-            <td>{{ gst_rel[4] }}</td>
+                <td>{{ gst_rel.final_amount }}</td>
-            <td>{{ gst_rel[5] }}</td>
+                <td>{{ gst_rel.total_amount }}</td>
-            <td>{{ gst_rel[6] }}</td>
+                <td>{{ gst_rel.utr }}</td>
                 <td>
-                <a href="/edit_gst_release/{{ gst_rel[0] }}">
+                    <a href="{{ url_for('gst_release_bp.edit_gst_release', gst_release_id=gst_rel.gst_release_id) }}">
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon">
-                         class="icon">
                     </a>
                 </td>
                 <td>
-                <a href="/delete_gst_release/{{ gst_rel[0] }}"
+                    <a href="{{ url_for('gst_release_bp.delete_gst_release', gst_release_id=gst_rel.gst_release_id) }}" 
                        onclick="return confirm('Are you sure you want to delete this GST Release?')">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
-                         class="icon">
                     </a>
                 </td>
             </tr>
@@ -118,46 +121,61 @@
 
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    // Handle subcontractor autocomplete
+
-    document.getElementById("subcontractor").addEventListener("input", function () {
+    const subcontractorInput = document.getElementById("subcontractor");
+    const subcontractorIdInput = document.getElementById("subcontractor_id");
+    const subcontractorList = document.getElementById("subcontractor_list");
+    const pmcDropdown = document.getElementById("PMC_No");
+    const form = document.querySelector('form');
+
+    // --------------------------
+    // Subcontractor autocomplete
+    // --------------------------
+    subcontractorInput.addEventListener("input", function () {
         const query = this.value;
-        const list = document.getElementById("subcontractor_list");
 
         if (query.length < 2) {
-            list.innerHTML = '';
+            subcontractorList.innerHTML = '';
+            subcontractorIdInput.value = ''; // reset hidden id
+            pmcDropdown.innerHTML = '<option value="">Select PMC No</option>'; // reset PMC dropdown
             return;
         }
 
         fetch(`/search_subcontractor?query=${encodeURIComponent(query)}`)
             .then(response => response.json())
             .then(data => {
-                list.innerHTML = '';
+                subcontractorList.innerHTML = '';
                 data.results.forEach(item => {
                     const div = document.createElement("div");
                     div.setAttribute("data-id", item.id);
                     div.textContent = item.name;
-                    list.appendChild(div);
+                    subcontractorList.appendChild(div);
                 });
             });
     });
 
-    // Handle subcontractor selection
+    // --------------------------
-    document.getElementById("subcontractor_list").addEventListener("click", function (e) {
+    // Subcontractor selection
+    // --------------------------
+    subcontractorList.addEventListener("click", function (e) {
         const selectedId = e.target.getAttribute("data-id");
         const selectedName = e.target.textContent;
 
         if (selectedId) {
-            document.getElementById("subcontractor_id").value = selectedId;
+            // Set hidden field for backend
-            document.getElementById("subcontractor").value = selectedName;
+            subcontractorIdInput.value = selectedId;
-            document.getElementById("subcontractor_list").innerHTML = "";
 
-            // Update PMC dropdown for selected subcontractor
+            // Set text input to selected name
+            subcontractorInput.value = selectedName;
+
+            // Clear the autocomplete list
+            subcontractorList.innerHTML = "";
+
+            // Fetch and populate PMC dropdown
             fetch(`/get_pmc_nos_by_subcontractor/${encodeURIComponent(selectedId)}`)
                 .then(response => response.json())
                 .then(data => {
-                    const pmcDropdown = document.getElementById("PMC_No");
                     pmcDropdown.innerHTML = '<option value="">Select PMC No</option>';
-
                     data.pmc_nos.forEach(pmc => {
                         const option = document.createElement("option");
                         option.value = pmc;
@@ -167,6 +185,22 @@ document.addEventListener('DOMContentLoaded', function() {
                 });
         }
     });
+
+    // --------------------------
+    // Form submit validation
+    // --------------------------
+    form.addEventListener('submit', function(e) {
+        if (!subcontractorIdInput.value) {
+            e.preventDefault();
+            alert("Please select a subcontractor from the list.");
+            subcontractorInput.focus();
+        } else if (!pmcDropdown.value) {
+            e.preventDefault();
+            alert("Please select a PMC No.");
+            pmcDropdown.focus();
+        }
+    });
+
 });
 </script>
 

templates/add_hold_type.html

@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <title>Manage Hold Types</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@@ -7,14 +8,15 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
     <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
+
 <body>
 
-<div class="button-container">
+    <div class="button-container">
         <button id="addButton" class="action-button">Add</button>
         <button id="displayButton" class="action-button">Display</button>
-</div>
+    </div>
 
-<div id="addForm">
+    <div id="addForm">
         <h2>Add Hold Types</h2>
         <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
             <label>Enter Hold Amount Type:</label>
@@ -22,9 +24,9 @@
             <span id="holdTypeMessage"></span>
             <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
         </form>
-</div>
+    </div>
 
-<div id="addTable" style="display: none;">
+    <div id="addTable" style="display: none;">
         <div class="search-container">
             <h2>Hold Type List</h2>
             <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
@@ -46,14 +48,26 @@
             <tr>
                 <td>{{ htd['hold_type_id'] }}</td>
                 <td>{{ htd['hold_type'] }}</td>
-            <td><a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">Edit</a></td>
+                <td style="text-align:center;">
-            <td><button class="delete-button" data-id="{{ htd['hold_type_id'] }}">Delete</button></td>
+                    <a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                            class="icon">
+                    </a>
+                </td>
+
+                <td style="text-align:center;">
+                    <a href="{{ url_for('hold_types.delete_hold_type', id=htd['hold_type_id']) }}"
+                        onclick="return confirm('Are you sure you want to delete this hold type?');">
+
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                            class="icon">
+                    </a>
+                </td>
             </tr>
             {% endfor %}
         </table>
 
         <a href="/">Back to Dashboard</a>
-</div>
+    </div>
 </body>
 {% endblock %}
-

templates/add_payment.html

@@ -97,15 +97,13 @@
                     <td><a href="/edit_payment/{{ payment[0] }}"><img
                                 src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
                                 class="icon"></a></td>
+
                     <td>
-                        <form action="{{ url_for('payment_bp.delete_payment', payment_id=payment[0]) }}" method="POST"
+                        <a href="{{ url_for('payment_bp.delete_payment', payment_id=payment[0]) }}"
-                            style="display:inline;">
+                            onclick="return confirm('Are you sure you want to delete this Payment?')">
-                            <button type="submit"
+                            <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
-                                onclick="return confirm('Are you sure you want to delete this payment?')">
+                                class="icon">
-                                <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}"
+                        </a>
-                                    alt="Delete" class="icon">
-                            </button>
-                        </form>
                     </td>
                 </tr>
                 <!-- <tr>

templates/edit_gst_release.html

@@ -9,37 +9,37 @@
 <body>
 <h2>Edit GST Release</h2>
 
-<form action="/edit_gst_release/{{ gst_release_data[0] }}" method="POST">
+<form action="/edit_gst_release/{{ gst_release_data.gst_release_id }}" method="POST">
-    <!--    <label for="invoice_id">Invoice Id:</label><br>-->
-    <!--    <input type="number" id="invoice_id" name="invoice_id" value="{{ gst_release_data[0] }}" required><br><br>-->
 
+    <!-- PMC Number -->
     <label for="PMC_No">PMC No :</label><br>
-    <input type="number" id="PMC_No" name="PMC_No" value="{{ gst_release_data[1] }}" required><br><br>
+    <input type="text" id="PMC_No" name="PMC_No" value="{{ gst_release_data.pmc_no }}" required><br><br>
 
-    <label for="invoice_No">Invoice No:</label><br>
+    <!-- Invoice Number -->
-    <input type="number" step="0.01" id="invoice_No" name="invoice_No" value="{{ gst_release_data[2] }}"
+    <label for="invoice_no">Invoice No:</label><br>
-           required><br><br>
+    <input type="text" id="invoice_no" name="invoice_no" value="{{ gst_release_data.invoice_no }}" required><br><br>
 
+    <!-- Basic Amount -->
+    <label for="Basic_Amount">Basic Amount:</label><br>
+    <input type="number" step="0.01" id="Basic_Amount" name="Basic_Amount" value="{{ gst_release_data.basic_amount }}" required><br><br>
 
-    <label for="basic_amount">Basic Amount:</label><br>
+    <!-- Final Amount -->
-    <input type="number" step="0.01" id="basic_amount" name="basic_amount" value="{{ gst_release_data[3] }}"
+    <label for="Final_Amount">Final Amount:</label><br>
-           required><br><br>
+    <input type="number" step="0.01" id="Final_Amount" name="Final_Amount" value="{{ gst_release_data.final_amount }}" required><br><br>
 
-    <label for="final_amount">Final Amount:</label><br>
+    <!-- Total Amount -->
-    <input type="number" step="0.01" id="final_amount" name="final_amount" value="{{ gst_release_data[4] }}"
+    <label for="Total_Amount">Total Amount:</label><br>
-           required><br><br>
+    <input type="number" step="0.01" id="Total_Amount" name="Total_Amount" value="{{ gst_release_data.total_amount }}" required><br><br>
 
-     <label for="total_amount">Total Amount:</label><br>
+    <!-- UTR -->
-    <input type="number" step="0.01" id="total_amount" name="total_amount" value="{{ gst_release_data[5] }}"
+    <label for="UTR">UTR:</label><br>
-           required><br><br>
+    <input type="text" id="UTR" name="UTR" value="{{ gst_release_data.utr }}" readonly required><br><br>
 
-     <label for="utr">UTR:</label><br>
+    <!-- Hidden Contractor ID -->
-    <input type="text"  id="utr" name="utr" value="{{ gst_release_data[6] }}"
+    <input type="hidden" id="Contractor_ID" name="Contractor_ID" value="{{ gst_release_data.contractor_id }}">
-           required readonly><br><br>
 
     <button type="submit">Update GST Release</button>
 </form>
 
-
 </body>
 {% endblock %}

templates/edit_hold_type.html

@@ -1,7 +1,7 @@
-
 {% extends 'base.html' %}
 
 {% block content %}
+
 <head>
     <title>Edit Hold Type</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
@@ -10,10 +10,10 @@
 
 <body>
     <h2>Edit Hold Type</h2>
-    <form id="updateHoldTypeForm">
+    <form id="updateHoldTypeForm" method="POST">
-        <input type="hidden" id="hold_type_id" value="{{ hold_type[0] }}">
+        <input type="hidden" id="hold_type_id" value="{{ hold_type.hold_type_id }}">
         <label for="edit_hold_type">Hold Type:</label>
-        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type[1] }}" required>
+        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type.hold_type }}" required>
         <button type="submit">Update</button>
         <a href="{{ url_for('hold_types.add_hold_type') }}"></a>
     </form>
@@ -37,7 +37,7 @@
             formData.append('hold_type', newHoldType);
 
             $.ajax({
-                url: '/update_hold_type/' + holdTypeId,
+                url: '/edit_hold_type/' + holdTypeId,
                 method: 'POST',
                 data: formData,
                 processData: false,
@@ -55,8 +55,3 @@
     });
 </script>
 {% endblock %}
-
-
-
-
-

templates/edit_invoice.html

@@ -2,17 +2,18 @@
 {% block content %}
 
 <head>
-    <meta charset="UTF-8"/>
+    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Edit Invoice</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/invoice.css') }}">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style1.css') }}">
+
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 </head>
 
 <body>
 
-<div id="editForm">
+    <div id="editForm">
         <h2>Edit Invoice</h2>
 
         <!-- Success Alert Box -->
@@ -20,7 +21,8 @@
             Invoice successfully updated!
         </div>
 
-    <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}" method="POST">
+        <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}"
+            method="POST">
 
             <!-- Subcontractor Field -->
             <div class="row1">
@@ -28,7 +30,8 @@
                     <label for="subcontractor">Subcontractor Name:</label>
                     <input class="form-control" list="subcontractor_list" id="subcontractor" name="subcontractor"
                         value="{{ invoice.Contractor_Name }}" placeholder="Type to search..." required>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id" value="{{ invoice.Subcontractor_Id }}">
+                    <input type="hidden" id="subcontractor_id" name="subcontractor_id"
+                        value="{{ invoice.Subcontractor_Id }}">
                     <datalist id="subcontractor_list"></datalist>
                 </div>
             </div>
@@ -37,12 +40,12 @@
             <div class="row2">
                 <div>
                     <label for="village">Village Name:</label>
-                <input type="text" id="village" name="village" value="{{ invoice.Village_Name }}" required/>
+                    <input type="text" id="village" name="village" value="{{ invoice.Village_Name }}" required />
                     <datalist id="village_list"></datalist>
                 </div>
                 <div>
                     <label for="pmc_no">PMC No:</label>
-                <input type="text" id="pmc_no" name="pmc_no" value="{{ invoice.PMC_No }}" required/>
+                    <input type="text" id="pmc_no" name="pmc_no" value="{{ invoice.PMC_No }}" required />
                 </div>
             </div>
 
@@ -50,11 +53,12 @@
             <div class="row2">
                 <div>
                     <label for="work_type">Work Type:</label>
-                <input type="text" id="work_type" name="work_type" value="{{ invoice.Work_Type }}" required/>
+                    <input type="text" id="work_type" name="work_type" value="{{ invoice.Work_Type }}" required />
                 </div>
                 <div>
                     <label for="invoice_details">Invoice Details:</label>
-                <textarea id="invoice_details" name="invoice_details" required>{{ invoice.Invoice_Details }}</textarea>
+                    <textarea id="invoice_details" name="invoice_details"
+                        required>{{ invoice.Invoice_Details }}</textarea>
                 </div>
             </div>
 
@@ -62,11 +66,12 @@
             <div class="row2">
                 <div>
                     <label for="invoice_no">Invoice No:</label>
-                <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.Invoice_No }}" required/>
+                    <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.invoice_no }}" required />
                 </div>
                 <div>
                     <label for="invoice_date">Invoice Date:</label>
-                <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}" required/>
+                    <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}"
+                        required />
                 </div>
             </div>
 
@@ -74,15 +79,18 @@
             <div class="row3">
                 <div>
                     <label for="basic_amount">Basic Amount:</label>
-                <input type="number" step="0.01" id="basic_amount" name="basic_amount" value="{{ invoice.Basic_Amount }}" required/>
+                    <input type="number" step="0.01" id="basic_amount" name="basic_amount"
+                        value="{{ invoice.Basic_Amount }}" required />
                 </div>
                 <div>
                     <label for="debit_amount">Debit Amount:</label>
-                <input type="number" step="0.01" id="debit_amount" name="debit_amount" value="{{ invoice.Debit_Amount }}" required/>
+                    <input type="number" step="0.01" id="debit_amount" name="debit_amount"
+                        value="{{ invoice.Debit_Amount }}" required />
                 </div>
                 <div>
                     <label for="after_debit_amount">After Debit Amount:</label>
-                <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount" value="{{ invoice.After_Debit_Amount }}" required/>
+                    <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount"
+                        value="{{ invoice.After_Debit_Amount }}" required />
                 </div>
             </div>
 
@@ -90,15 +98,17 @@
             <div class="row3">
                 <div>
                     <label for="amount">Amount:</label>
-                <input type="number" step="0.01" id="amount" name="amount" value="{{ invoice.Amount }}" required/>
+                    <input type="number" step="0.01" id="amount" name="amount" value="{{ invoice.Amount }}" required />
                 </div>
                 <div>
                     <label for="gst_amount">GST Amount:</label>
-                <input type="number" step="0.01" id="gst_amount" name="gst_amount" value="{{ invoice.GST_Amount }}" required/>
+                    <input type="number" step="0.01" id="gst_amount" name="gst_amount" value="{{ invoice.GST_Amount }}"
+                        required />
                 </div>
                 <div>
                     <label for="tds_amount">TDS Amount:</label>
-                <input type="number" step="0.01" id="tds_amount" name="tds_amount" value="{{ invoice.TDS_Amount }}" required/>
+                    <input type="number" step="0.01" id="tds_amount" name="tds_amount" value="{{ invoice.TDS_Amount }}"
+                        required />
                 </div>
             </div>
 
@@ -106,34 +116,39 @@
             <div class="row3">
                 <div>
                     <label for="sd_amount">SD Amount:</label>
-                <input type="number" step="0.01" id="sd_amount" name="sd_amount" value="{{ invoice.SD_Amount }}" required/>
+                    <input type="number" step="0.01" id="sd_amount" name="sd_amount" value="{{ invoice.SD_Amount }}"
+                        required />
                 </div>
                 <div>
                     <label for="on_commission">On Commission:</label>
-                <input type="number" step="0.01" id="on_commission" name="on_commission" value="{{ invoice.On_Commission }}" required/>
+                    <input type="number" step="0.01" id="on_commission" name="on_commission"
+                        value="{{ invoice.On_Commission }}" required />
                 </div>
                 <div>
                     <label for="hydro_testing">Hydro Testing:</label>
-                <input type="number" step="0.01" id="hydro_testing" name="hydro_testing" value="{{ invoice.Hydro_Testing }}" required/>
+                    <input type="number" step="0.01" id="hydro_testing" name="hydro_testing"
+                        value="{{ invoice.Hydro_Testing }}" required />
                 </div>
             </div>
 
             <!-- Hold Amount Section -->
-<div id="hold_amount_container">
+            <div id="hold_amount_container">
                 {% set seen_types = [] %}
                 {% for hold in invoice.hold_amounts %}
                 {% if hold.hold_type not in seen_types %}
                 {% set _ = seen_types.append(hold.hold_type) %}
                 <div class="hold-amount-row">
                     <label for="hold_type_{{ loop.index }}">Hold Type:</label>
-                <input type="text" id="hold_type_{{ loop.index }}" name="hold_type[]" value="{{ hold.hold_type }}" required/>
+                    <input type="text" id="hold_type_{{ loop.index }}" name="hold_type[]" value="{{ hold.hold_type }}"
+                        required />
                     <label for="hold_amount_{{ loop.index }}">Hold Amount:</label>
-                <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]" value="{{ hold.hold_amount }}" required/>
+                    <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]"
+                        value="{{ hold.hold_amount }}" required />
                     <button type="button" class="remove-hold-amount">Remove</button>
                 </div>
                 {% endif %}
                 {% endfor %}
-</div>
+            </div>
 
 
             <div class="hold-row">
@@ -144,24 +159,26 @@
             <div class="row2">
                 <div>
                     <label for="gst_sd_amount">GST SD Amount:</label>
-                <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount" value="{{ invoice.GST_SD_Amount }}" required/>
+                    <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount"
+                        value="{{ invoice.GST_SD_Amount }}" required />
                 </div>
                 <div>
                     <label for="final_amount">Final Amount:</label>
-                <input type="number" step="0.01" id="final_amount" name="final_amount" value="{{ invoice.Final_Amount }}" required/>
+                    <input type="number" step="0.01" id="final_amount" name="final_amount"
+                        value="{{ invoice.Final_Amount }}" required />
                 </div>
             </div>
 
             <!-- Submit Button -->
             <button type="submit" class="button">Update</button>
         </form>
-</div>
+    </div>
 
-<!-- JS for dynamic hold amount rows -->
+    <!-- JS for dynamic hold amount rows -->
-<script>
+    <script>
-$(document).ready(function() {
+        $(document).ready(function () {
             // Add new hold amount row
-    $("#add_hold_amount").click(function() {
+            $("#add_hold_amount").click(function () {
                 const index = $("#hold_amount_container .hold-amount-row").length;
                 const newRow = `
             <div class="hold-amount-row">
@@ -176,32 +193,34 @@ $(document).ready(function() {
             });
 
             // Remove hold amount row
-    $(document).on("click", ".remove-hold-amount", function() {
+            $(document).on("click", ".remove-hold-amount", function () {
                 $(this).closest(".hold-amount-row").remove();
             });
 
             // Submit form via AJAX
-    $("#invoiceForm").submit(function(e) {
+            $("#invoiceForm").submit(function (e) {
                 e.preventDefault();
 
                 $.ajax({
                     type: "POST",
                     url: $(this).attr("action"),
                     data: $(this).serialize(),
-            success: function(response) {
+                    dataType: 'json',  // ensure JSON is returned
-                if(response.status === "success") {
+                    success: function (response) {
-                $("#invoiceSuccessAlert").fadeIn().delay(3000).fadeOut();
+                        if (response.status === "success") {
                             alert("Invoice updated successfully!");  // <-- Popup alert
-                }
 
+                            // ✅ Redirect to Add Invoice page (table part visible)
+                            window.location.href = "{{ url_for('invoice.add_invoice') }}#addTable";
+                        }
                     },
-            error: function(xhr) {
+                    error: function (xhr) {
-                alert("Error: " + xhr.responseJSON.message);
+                        alert("Error: " + xhr.responseJSON?.message || "Something went wrong!");
                     }
                 });
             });
-});
+        });
-</script>
+    </script>
 
 </body>
 {% endblock %}