Merge branch 'main' of https://gitea.lcepl.org/pjpatil12/Payment_Reconciliation into pankaj-dev
This commit is contained in:
@@ -1,98 +1,101 @@
|
||||
|
||||
|
||||
|
||||
# controllers/invoice_controller.py
|
||||
|
||||
from flask import Blueprint, request, jsonify, render_template
|
||||
from flask_login import login_required, current_user
|
||||
from model.Invoice import *
|
||||
from model.Log import LogHelper
|
||||
from model.Log import LogHelper
|
||||
|
||||
invoice_bp = Blueprint('invoice', __name__)
|
||||
|
||||
# -------------------------------- Add Invoice ---------------------------------
|
||||
@invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def add_invoice():
|
||||
if request.method == 'POST':
|
||||
# ------------------------------- Helpers -------------------------------
|
||||
def handle_exception(func):
|
||||
"""Decorator to handle exceptions and return JSON error responses."""
|
||||
def wrapper(*args, **kwargs):
|
||||
try:
|
||||
village_name = request.form.get('village')
|
||||
village_result = get_village_id(village_name)
|
||||
|
||||
if not village_result:
|
||||
return jsonify({"status": "error", "message": f"Village '{village_name}' not found"}), 400
|
||||
|
||||
village_id = village_result['Village_Id']
|
||||
data = request.form
|
||||
|
||||
invoice_id = insert_invoice(data, village_id)
|
||||
assign_subcontractor(data, village_id)
|
||||
insert_hold_types(data, invoice_id)
|
||||
|
||||
LogHelper.log_action("Add invoice", f"User {current_user.id} Added invoice '{data.get('pmc_no')}'")
|
||||
|
||||
return jsonify({"status": "success", "message": "Invoice added successfully"}), 201
|
||||
|
||||
return func(*args, **kwargs)
|
||||
except Exception as e:
|
||||
return jsonify({"status": "error", "message": str(e)}), 500
|
||||
wrapper.__name__ = func.__name__
|
||||
return wrapper
|
||||
|
||||
def log_action(action: str, detail: str):
|
||||
LogHelper.log_action(action, f"User {current_user.id} {detail}")
|
||||
|
||||
|
||||
# ------------------------------- Add Invoice -------------------------------
|
||||
@invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
@handle_exception
|
||||
def add_invoice():
|
||||
if request.method == 'POST':
|
||||
data = request.form
|
||||
village_name = data.get('village')
|
||||
village_result = get_village_id(village_name)
|
||||
|
||||
if not village_result:
|
||||
return jsonify({"status": "error", "message": f"Village '{village_name}' not found"}), 400
|
||||
|
||||
village_id = village_result['Village_Id']
|
||||
invoice_id = insert_invoice(data, village_id)
|
||||
assign_subcontractor(data, village_id)
|
||||
insert_hold_types(data, invoice_id)
|
||||
|
||||
log_action("Add invoice", f"added invoice '{data.get('pmc_no')}'")
|
||||
return jsonify({"status": "success", "message": "Invoice added successfully"}), 201
|
||||
|
||||
invoices = get_all_invoice_details()
|
||||
villages = get_all_villages()
|
||||
return render_template('add_invoice.html', invoices=invoices, villages=villages)
|
||||
|
||||
|
||||
# ------------------- Search Subcontractor -------------------
|
||||
# ------------------------------- Search Subcontractor -------------------------------
|
||||
@invoice_bp.route('/search_subcontractor', methods=['POST'])
|
||||
@login_required
|
||||
@handle_exception
|
||||
def search_subcontractor():
|
||||
sub_query = request.form.get("query")
|
||||
results = search_contractors(sub_query)
|
||||
query = request.form.get("query", "").strip()
|
||||
results = search_contractors(query)
|
||||
|
||||
if not results:
|
||||
return "<li>No subcontractor found</li>"
|
||||
|
||||
output = "".join(
|
||||
f"<li data-id='{row['Contractor_Id']}'>{row['Contractor_Name']}</li>"
|
||||
for row in results
|
||||
)
|
||||
return output
|
||||
return "".join(f"<li data-id='{r['Contractor_Id']}'>{r['Contractor_Name']}</li>" for r in results)
|
||||
|
||||
|
||||
# ------------------- Get Hold Types -------------------
|
||||
# ------------------------------- Get Hold Types -------------------------------
|
||||
@invoice_bp.route('/get_hold_types', methods=['GET'])
|
||||
@login_required
|
||||
@handle_exception
|
||||
def get_hold_types():
|
||||
hold_types = get_all_hold_types()
|
||||
LogHelper.log_action("Get hold type", f"User {current_user.id} Get hold type '{hold_types}'")
|
||||
log_action("Get hold type", f"retrieved hold types '{hold_types}'")
|
||||
return jsonify(hold_types)
|
||||
|
||||
|
||||
# ------------------- Edit Invoice -------------------
|
||||
# ------------------------------- Edit Invoice -------------------------------
|
||||
@invoice_bp.route('/edit_invoice/<int:invoice_id>', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
@handle_exception
|
||||
def edit_invoice(invoice_id):
|
||||
if request.method == 'POST':
|
||||
data = request.form
|
||||
update_invoice(data, invoice_id)
|
||||
update_inpayment(data)
|
||||
|
||||
LogHelper.log_action("Edit invoice", f"User {current_user.id} Edit invoice '{invoice_id}'")
|
||||
log_action("Edit invoice", f"edited invoice '{invoice_id}'")
|
||||
return jsonify({"status": "success", "message": "Invoice updated successfully"}), 200
|
||||
|
||||
invoice = get_invoice_by_id(invoice_id)
|
||||
return render_template('edit_invoice.html', invoice=invoice)
|
||||
|
||||
|
||||
# ------------------- Delete Invoice -------------------
|
||||
# ------------------------------- Delete Invoice -------------------------------
|
||||
@invoice_bp.route('/delete_invoice/<int:invoice_id>', methods=['GET'])
|
||||
@login_required
|
||||
@handle_exception
|
||||
def delete_invoice_route(invoice_id):
|
||||
try:
|
||||
delete_invoice_data(invoice_id, current_user.id)
|
||||
LogHelper.log_action("Delete Invoice", f"User {current_user.id} deleted Invoice '{invoice_id}'")
|
||||
return jsonify({
|
||||
"message": f"Invoice {invoice_id} deleted successfully.",
|
||||
"status": "success"
|
||||
})
|
||||
except Exception as e:
|
||||
return jsonify({
|
||||
"message": str(e),
|
||||
"status": "error"
|
||||
}), 500
|
||||
delete_invoice_data(invoice_id, current_user.id)
|
||||
log_action("Delete invoice", f"deleted invoice '{invoice_id}'")
|
||||
return jsonify({"status": "success", "message": f"Invoice {invoice_id} deleted successfully."})
|
||||
@@ -1,8 +1,11 @@
|
||||
|
||||
|
||||
|
||||
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify
|
||||
from flask_login import login_required
|
||||
|
||||
import config
|
||||
|
||||
from model.Village import Village
|
||||
from model.State import State
|
||||
|
||||
@@ -23,7 +26,6 @@ def add_village():
|
||||
|
||||
state = State()
|
||||
states = state.GetAllStates(request=request)
|
||||
|
||||
villages = village.GetAllVillages(request=request)
|
||||
|
||||
return render_template(
|
||||
@@ -42,7 +44,6 @@ def get_districts(state_id):
|
||||
cursor = connection.cursor()
|
||||
|
||||
cursor.callproc("GetDistrictByStateID", [state_id])
|
||||
|
||||
districts = []
|
||||
|
||||
for rs in cursor.stored_results():
|
||||
@@ -51,15 +52,7 @@ def get_districts(state_id):
|
||||
cursor.close()
|
||||
connection.close()
|
||||
|
||||
district_list = []
|
||||
|
||||
for d in districts:
|
||||
district_list.append({
|
||||
"id": d[0],
|
||||
"name": d[1]
|
||||
})
|
||||
|
||||
return jsonify(district_list)
|
||||
return jsonify([{"id": d[0], "name": d[1]} for d in districts])
|
||||
|
||||
|
||||
# ------------------------- Fetch Blocks -------------------------
|
||||
@@ -71,7 +64,6 @@ def get_blocks(district_id):
|
||||
cursor = connection.cursor()
|
||||
|
||||
cursor.callproc("GetBlocksByDistrictID", [district_id])
|
||||
|
||||
blocks = []
|
||||
|
||||
for rs in cursor.stored_results():
|
||||
@@ -80,22 +72,13 @@ def get_blocks(district_id):
|
||||
cursor.close()
|
||||
connection.close()
|
||||
|
||||
block_list = []
|
||||
|
||||
for b in blocks:
|
||||
block_list.append({
|
||||
"id": b[0],
|
||||
"name": b[1]
|
||||
})
|
||||
|
||||
return jsonify(block_list)
|
||||
return jsonify([{"id": b[0], "name": b[1]} for b in blocks])
|
||||
|
||||
|
||||
# ------------------------- Check Village -------------------------
|
||||
@village_bp.route('/check_village', methods=['POST'])
|
||||
@login_required
|
||||
def check_village():
|
||||
|
||||
village = Village()
|
||||
return village.CheckVillage(request=request)
|
||||
|
||||
@@ -106,14 +89,9 @@ def check_village():
|
||||
def delete_village(village_id):
|
||||
|
||||
village = Village()
|
||||
|
||||
village.DeleteVillage(request=request, village_id=village_id)
|
||||
|
||||
if not village.isSuccess:
|
||||
flash(village.resultMessage, "error")
|
||||
else:
|
||||
flash(village.resultMessage, "success")
|
||||
|
||||
flash(village.resultMessage, "success" if village.isSuccess else "error")
|
||||
return redirect(url_for('village.add_village'))
|
||||
|
||||
|
||||
@@ -135,8 +113,8 @@ def edit_village(village_id):
|
||||
else:
|
||||
flash(village.resultMessage, "error")
|
||||
|
||||
village_data = village.GetVillageByID(request=request, id=village_id)
|
||||
blocks = village.GetAllBlocks(request=request)
|
||||
village_data = village.GetVillageByID(id=village_id) or []
|
||||
blocks = village.GetAllBlocks() or []
|
||||
|
||||
return render_template(
|
||||
'edit_village.html',
|
||||
@@ -145,23 +123,17 @@ def edit_village(village_id):
|
||||
)
|
||||
|
||||
else:
|
||||
|
||||
village_data = village.GetVillageByID(request=request, id=village_id)
|
||||
# ✅ FIXED HERE (removed request)
|
||||
village_data = village.GetVillageByID(id=village_id)
|
||||
|
||||
if not village.isSuccess:
|
||||
flash(village.resultMessage, "error")
|
||||
return redirect(url_for('village.add_village'))
|
||||
|
||||
blocks = village.GetAllBlocks(request=request)
|
||||
|
||||
if village_data is None:
|
||||
village_data = []
|
||||
|
||||
if blocks is None:
|
||||
blocks = []
|
||||
blocks = village.GetAllBlocks() or []
|
||||
|
||||
return render_template(
|
||||
'edit_village.html',
|
||||
village_data=village_data,
|
||||
village_data=village_data or [],
|
||||
blocks=blocks
|
||||
)
|
||||
Reference in New Issue
Block a user