diff --git a/custom_ui/api/db/estimates.py b/custom_ui/api/db/estimates.py index c3608b4..25149e3 100644 --- a/custom_ui/api/db/estimates.py +++ b/custom_ui/api/db/estimates.py @@ -15,7 +15,7 @@ def get_estimate_table_data_v2(filters={}, sortings=[], page=1, page_size=10): """Get paginated estimate table data with filtering and sorting.""" print("DEBUG: Raw estimate options received:", filters, sortings, page, page_size) filters, sortings, page, page_size = DbUtils.process_query_conditions(filters, sortings, page, page_size) - + @frappe.whitelist() def get_estimate_table_data(filters={}, sortings=[], page=1, page_size=10): @@ -151,7 +151,7 @@ def send_estimate_email(estimate_name): print("DEBUG: Sending estimate email for:", estimate_name) quotation = frappe.get_doc("Quotation", estimate_name) - + if not DbService.exists("Contact", quotation.contact_person): return build_error_response("No email found for the customer.", 400) party = ContactService.get_or_throw(quotation.contact_person) @@ -414,7 +414,7 @@ def upsert_estimate(data): # estimate.customer_address = data.get("address_name") # estimate.letter_head = data.get("company") # estimate.from_onsite_meeting = data.get("onsite_meeting", None) - + # Clear existing items and add new ones estimate.items = [] for item in data.get("items", []): @@ -481,31 +481,6 @@ def upsert_estimate(data): print(f"DEBUG: Error in upsert_estimate: {str(e)}") return build_error_response(str(e), 500) - -@frappe.whitelist() -def get_unapproved_estimates_count(company): - """Get the number of unapproved estimates.""" - try: - draft_filters = {'status': "Draft", "company": company} - submitted_filters = {'status': "Submitted", "company": company} - draft_count = frappe.db.count("Quotation", filters=draft_filters) - submitted_count = frappe.db.count("Quotation", filters=submitted_filters) - return build_success_response([draft_count, submitted_count]) - except Exception as e: - return build_error_response(str(e), 500) - - -@frappe.whitelist() -def get_estimates_half_down_count(company): - """Get the number unpaid half-down estimates.""" - try: - filters = {'requires_half_payment': True, 'company': company} - count = frappe.db.count("Quotation", filters=filters) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - - def get_estimate_history(estimate_name): """Get the history of changes for a specific estimate.""" pass diff --git a/custom_ui/api/db/invoices.py b/custom_ui/api/db/invoices.py index b024808..4b7c3ef 100644 --- a/custom_ui/api/db/invoices.py +++ b/custom_ui/api/db/invoices.py @@ -1,36 +1,11 @@ import frappe, json from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response, build_error_response -from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice # =============================================================================== # INVOICES API METHODS # =============================================================================== -@frappe.whitelist() -def create_invoice_for_job(job_name): - """Create the invoice from a sales order of a job.""" - try: - project = frappe.get_doc("Project", job_name) - sales_order = project.sales_order - invoice = make_sales_invoice(sales_order) - invoice.save() - return build_success_response(invoice.as_dict()) - except Exception as e: - return build_error_response(str(e), 500) - - -@frappe.whitelist() -def get_invoices_late_count(): - """Return Due, 30-day late, 90-day late, and Lien-worthy late accounts.""" - try: - dummy_result = [10, 4, 5, 1] - print("DEBUG: DUMMY RESULT:", dummy_result) - return build_success_response(dummy_result) - except Exception as e: - return build_error_response(str(e), 500) - - @frappe.whitelist() def get_invoice_table_data(filters={}, sortings=[], page=1, page_size=10): """Get paginated invoice table data with filtering and sorting support.""" @@ -43,7 +18,7 @@ def get_invoice_table_data(filters={}, sortings=[], page=1, page_size=10): else: count = frappe.db.count("Sales Invoice", filters=processed_filters) - print(f"DEBUG: Number of invoices returned: {count}") + print(f"DEBUG: Number of invoice returned: {count}") invoices = frappe.db.get_all( "Sales Invoice", diff --git a/custom_ui/api/db/jobs.py b/custom_ui/api/db/jobs.py index d296fe9..16bd48a 100644 --- a/custom_ui/api/db/jobs.py +++ b/custom_ui/api/db/jobs.py @@ -7,64 +7,6 @@ from frappe.utils import getdate # JOB MANAGEMENT API METHODS # =============================================================================== - -@frappe.whitelist() -def get_jobs_in_queue_count(company): - try: - filters = { - 'company': company, - 'is_scheduled': True, - } - count = frappe.db.count("Project", filters=filters) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - - -@frappe.whitelist() -def get_jobs_in_progress_count(company): - try: - today = getdate() - filters = { - 'company': company, - 'invoice_status': 'Not Ready', - 'expected_start_date': ['<=', today], - 'expected_end_date': ['>=', today], - } - count = frappe.db.count("Project", filters=filters) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - - -@frappe.whitelist() -def get_jobs_late_count(company): - try: - today = getdate() - filters = { - 'company': company, - 'invoice_status': 'Not Ready', - 'expected_end_date': ['<', today] - } - count = frappe.db.count("Project", filters=filters) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - - -@frappe.whitelist() -def get_jobs_to_invoice_count(company): - try: - filters = { - 'company': company, - 'invoice_status': 'Ready to Invoice', - } - count = frappe.db.count("Project", filters=filters) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - - @frappe.whitelist() def get_job_templates(company=None): """Get list of job (project) templates.""" @@ -77,7 +19,6 @@ def get_job_templates(company=None): except Exception as e: return build_error_response(str(e), 500) - @frappe.whitelist() def create_job_from_sales_order(sales_order_name): """Create a Job (Project) from a given Sales Order""" @@ -211,10 +152,9 @@ def get_jobs_table_data(filters={}, sortings=[], page=1, page_size=10): tableRow = {} tableRow["id"] = project["name"] tableRow["name"] = project["name"] - tableRow["job_address"] = project["job_address"] + tableRow["installation_address"] = project.get("custom_installation_address", "") tableRow["customer"] = project.get("customer", "") tableRow["status"] = project.get("status", "") - tableRow["invoice_status"] = project.get("invoice_status") tableRow["percent_complete"] = project.get("percent_complete", 0) tableRows.append(tableRow) @@ -263,7 +203,7 @@ def get_projects_for_calendar(start_date, end_date, company=None, project_templa filters["project_template"] = ["in", project_templates] unscheduled_filters = filters.copy() unscheduled_filters["is_scheduled"] = 0 - + # add to filter for if expected_start_date is between start_date and end_date OR expected_end_date is between start_date and end_date filters["expected_start_date"] = ["<=", getdate(end_date)] filters["expected_end_date"] = [">=", getdate(start_date)] @@ -299,4 +239,4 @@ def update_job_scheduled_dates(job_name: str, new_start_date: str = None, new_en project.save() return build_success_response(project.as_dict()) except Exception as e: - return build_error_response(str(e), 500) + return build_error_response(str(e), 500) \ No newline at end of file diff --git a/custom_ui/api/db/on_site_meetings.py b/custom_ui/api/db/on_site_meetings.py deleted file mode 100644 index fc6d7fa..0000000 --- a/custom_ui/api/db/on_site_meetings.py +++ /dev/null @@ -1,15 +0,0 @@ -import frappe -from custom_ui.db_utils import build_success_response, build_error_response - - -@frappe.whitelist() -def get_incomplete_bids(company): - print("Getting Incomplete Bids") - try: - filters = {'status': "Unscheduled", 'company': company} - count = frappe.db.count("On-Site Meeting", filters=filters) - print("Incomplete Bids:", count) - return build_success_response([count]) - except Exception as e: - return build_error_response(str(e), 500) - diff --git a/custom_ui/api/db/tasks.py b/custom_ui/api/db/tasks.py index a08ba9b..dd6835f 100644 --- a/custom_ui/api/db/tasks.py +++ b/custom_ui/api/db/tasks.py @@ -1,5 +1,4 @@ import frappe -import datetime from custom_ui.db_utils import process_query_conditions, build_datatable_dict, get_count_or_filters, build_success_response, build_error_response from custom_ui.services import DbService @@ -47,26 +46,23 @@ def get_task_status_options(): def get_tasks_due(subject_filter, current_company): """Return the number of items due today of the type of subject_filter""" try: - today = datetime.date.today() + due_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Completed", "Cancelled"]], 'company': current_company, - 'exp_end_date': today, # Add due date filter here } completed_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Cancelled"]], 'company': current_company, - 'exp_end_date': today, # Add due date filter here } overdue_filters = { 'subject': ['like', f'%{subject_filter}%'], 'status': ['not in', ["Template", "Completed", "Cancelled"]], 'company': current_company, - 'exp_end_date': ["<", today] # Add overdue date filtering here } due_count = frappe.db.count("Task", filters=due_filters) diff --git a/custom_ui/fixtures/doctype.json b/custom_ui/fixtures/doctype.json index 2bc4b86..ec218e4 100644 --- a/custom_ui/fixtures/doctype.json +++ b/custom_ui/fixtures/doctype.json @@ -178,8 +178,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:38.816045", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:23.661458", "module": "Custom UI", "name": "Customer Task Link", "naming_rule": "", @@ -396,8 +396,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:38.886150", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:23.730085", "module": "Custom UI", "name": "Address Task Link", "naming_rule": "", @@ -550,8 +550,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:38.953132", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:23.799282", "module": "Custom", "name": "Lead Companies Link", "naming_rule": "", @@ -768,8 +768,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.023393", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:23.867486", "module": "Custom", "name": "Address Project Link", "naming_rule": "", @@ -986,8 +986,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.093123", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:23.934979", "module": "Custom", "name": "Address Quotation Link", "naming_rule": "", @@ -1204,8 +1204,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.163081", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.001835", "module": "Custom", "name": "Address On-Site Meeting Link", "naming_rule": "", @@ -1422,8 +1422,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.236784", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.069255", "module": "Custom", "name": "Address Sales Order Link", "naming_rule": "", @@ -1576,8 +1576,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.305461", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.137117", "module": "Custom", "name": "Contact Address Link", "naming_rule": "", @@ -1730,8 +1730,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.376523", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.201857", "module": "Custom", "name": "Lead On-Site Meeting Link", "naming_rule": "", @@ -2332,8 +2332,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.472141", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.288443", "module": "Selling", "name": "Quotation Template", "naming_rule": "", @@ -2830,8 +2830,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.556506", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.372116", "module": "Selling", "name": "Quotation Template Item", "naming_rule": "", @@ -2984,8 +2984,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.624602", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.439961", "module": "Custom UI", "name": "Customer Company Link", "naming_rule": "", @@ -3138,8 +3138,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.690715", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.506463", "module": "Custom UI", "name": "Customer Address Link", "naming_rule": "", @@ -3292,8 +3292,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.758626", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.575135", "module": "Custom UI", "name": "Customer Contact Link", "naming_rule": "", @@ -3446,8 +3446,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.825642", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.644548", "module": "Custom", "name": "Address Contact Link", "naming_rule": "", @@ -3600,8 +3600,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.896330", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.712407", "module": "Custom", "name": "Customer On-Site Meeting Link", "naming_rule": "", @@ -3754,8 +3754,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:39.967073", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.786735", "module": "Custom", "name": "Customer Project Link", "naming_rule": "", @@ -3908,8 +3908,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.037175", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.856324", "module": "Custom", "name": "Customer Quotation Link", "naming_rule": "", @@ -4062,8 +4062,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.106626", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.924254", "module": "Custom", "name": "Customer Sales Order Link", "naming_rule": "", @@ -4216,8 +4216,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.174670", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:24.990458", "module": "Custom", "name": "Lead Address Link", "naming_rule": "", @@ -4370,8 +4370,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.246628", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:25.058368", "module": "Custom", "name": "Lead Contact Link", "naming_rule": "", @@ -4524,8 +4524,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.318639", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:25.124946", "module": "Custom", "name": "Lead Quotation Link", "naming_rule": "", @@ -4678,8 +4678,8 @@ "make_attachments_public": 0, "max_attachments": 0, "menu_index": null, - "migration_hash": "c40d7d206c7d4601cdb57fde7ab57c12", - "modified": "2026-01-24 11:42:40.390663", + "migration_hash": "5a00edceb2f575ccfc93ed99c01bc0b7", + "modified": "2026-01-22 11:05:25.193024", "module": "Custom", "name": "Address Company Link", "naming_rule": "", diff --git a/custom_ui/install.py b/custom_ui/install.py index fa53153..ab74967 100644 --- a/custom_ui/install.py +++ b/custom_ui/install.py @@ -31,7 +31,7 @@ def after_migrate(): for doctype in doctypes_to_refresh: frappe.clear_cache(doctype=doctype) frappe.reload_doctype(doctype) - + check_and_create_holiday_list() # update_address_fields() @@ -56,7 +56,7 @@ def build_frontend(): frappe.log_error(message="No frontend directory found for custom_ui", title="Frontend Build Skipped") print(f"āš ļø Frontend directory does not exist. Skipping build. Path was {frontend_path}") return - + dist_path = os.path.join(app_root, "custom_ui", "public", "dist") should_build = True @@ -69,10 +69,10 @@ def build_frontend(): except subprocess.CalledProcessError as e: frappe.log_error(message=str(e), title="Frontend Build Failed") print(f"\nāŒ Frontend build failed: {e}\n") - + def add_custom_fields(): from frappe.custom.doctype.custom_field.custom_field import create_custom_fields - + print("\nšŸ”§ Adding custom fields to doctypes...") try: @@ -85,7 +85,7 @@ def add_custom_fields(): print(" āœ… Added 'Service' to Address address_type options.") except Exception as e: print(f" āš ļø Failed to update Address address_type: {e}") - + custom_fields = { "Customer": [ dict( @@ -267,7 +267,7 @@ def add_custom_fields(): insert_after="full_address" ), dict( - fieldname="longitude", + fieldname="longitude", label="Longitude", fieldtype="Float", precision=8, @@ -277,7 +277,7 @@ def add_custom_fields(): fieldname="onsite_meeting_scheduled", label="On-Site Meeting Scheduled", fieldtype="Select", - options="Not Started\nIn Progress\nCompleted", + options="Not Started\nIn Progress\nCompleted", default="Not Started", insert_after="longitude" ), @@ -291,7 +291,7 @@ def add_custom_fields(): ), dict( fieldname="job_status", - label="Job Status", + label="Job Status", fieldtype="Select", options="Not Started\nIn Progress\nCompleted", default="Not Started", @@ -302,7 +302,7 @@ def add_custom_fields(): label="Payment Received Status", fieldtype="Select", options="Not Started\nIn Progress\nCompleted", - default="Not Started", + default="Not Started", insert_after="job_status" ), dict( @@ -588,15 +588,7 @@ def add_custom_fields(): fieldtype="Check", default=0, insert_after="expected_end_time" - ), - dict( - fieldname="invoice_status", - label="Invoice Status", - fieldtype="Select", - default="Not Ready", - options="Not Ready\nReady to Invoice\nInvoice Created\nInvoice Sent", - insert_after="is_scheduled" - ), + ) ], "Project Template": [ dict( @@ -624,15 +616,15 @@ def add_custom_fields(): ) ] } - + print("šŸ”§ Custom fields to check per doctype:") for key, value in custom_fields.items(): print(f" ā€¢ {key}: {len(value)} fields") print(f" Total fields to check: {sum(len(v) for v in custom_fields.values())}\n") - + missing_fields = [] fields_to_update = [] - + for doctype, field_options in custom_fields.items(): meta = frappe.get_meta(doctype) for field_spec in field_options: @@ -645,7 +637,7 @@ def add_custom_fields(): if frappe.db.exists("Custom Field", custom_field_name): custom_field_doc = frappe.get_doc("Custom Field", custom_field_name) needs_update = False - + # Compare important properties for key, desired_value in field_spec.items(): if key == "fieldname": @@ -654,10 +646,10 @@ def add_custom_fields(): if current_value != desired_value: needs_update = True break - + if needs_update: fields_to_update.append((doctype, fieldname, field_spec)) - + if missing_fields: print("\nāŒ Missing custom fields:") for entry in missing_fields: @@ -666,36 +658,36 @@ def add_custom_fields(): missing_field_specs = build_missing_field_specs(custom_fields, missing_fields) create_custom_fields(missing_field_specs) print("āœ… Missing custom fields created.") - + if fields_to_update: print("\nšŸ”§ Updating custom fields with mismatched specs:") for doctype, fieldname, field_spec in fields_to_update: print(f" ā€¢ {doctype}: {fieldname}") custom_field_name = f"{doctype}-{fieldname}" custom_field_doc = frappe.get_doc("Custom Field", custom_field_name) - + # Update all properties from field_spec for key, value in field_spec.items(): if key != "fieldname": setattr(custom_field_doc, key, value) - + custom_field_doc.save(ignore_permissions=True) - + frappe.db.commit() print("āœ… Custom fields updated.") - + if not missing_fields and not fields_to_update: print("āœ… All custom fields verified.") - + def update_onsite_meeting_fields(): """Update On-Site Meeting doctype fields to make start_time and end_time optional.""" print("\nšŸ”§ Updating On-Site Meeting doctype fields...") - + try: # Get the doctype doctype = frappe.get_doc("DocType", "On-Site Meeting") - + # Find and update start_time and end_time fields updated_fields = [] for field in doctype.fields: @@ -703,20 +695,20 @@ def update_onsite_meeting_fields(): if field.reqd == 1: field.reqd = 0 updated_fields.append(field.fieldname) - + if updated_fields: # Save the doctype doctype.save(ignore_permissions=True) print(f"āœ… Updated fields: {', '.join(updated_fields)} (set to not required)") else: print("āœ… Fields already configured correctly") - + print("šŸ”§ On-Site Meeting field update complete.\n") except Exception as e: print(f"āŒ Error updating On-Site Meeting fields: {str(e)}") frappe.log_error(message=str(e), title="On-Site Meeting Field Update Failed") # Don't raise - this is not critical enough to stop migration - + def update_address_fields(): quotations = frappe.get_all("Quotation", pluck="name") addresses = frappe.get_all("Address", pluck="name") @@ -736,9 +728,9 @@ def update_address_fields(): combined_doctypes.append({"doctype": "Address", "name": address}) for task in tasks: combined_doctypes.append({"doctype": "Task", "name": task}) - + print(f"\nšŸ“ Updating field values for {total_addresses} addresses, {total_quotations} quotations, {total_sales_orders} sales orders, and {total_tasks} tasks...") - + # Field update counters field_counters = { 'quotation_addresses_updated': 0, @@ -759,7 +751,7 @@ def update_address_fields(): 'contacts_updated': 0, 'tasks_updated': 0 } - + onsite_meta = frappe.get_meta("On-Site Meeting") onsite_status_field = "custom_status" if onsite_meta.has_field("custom_status") else "status" @@ -769,7 +761,7 @@ def update_address_fields(): bar_length = 30 filled_length = int(bar_length * index // total_doctypes) bar = 'ā–ˆ' * filled_length + 'ā–‘' * (bar_length - filled_length) - + # Print a three-line, refreshing progress block without adding new lines each loop progress_line = f"šŸ“Š Progress: [{bar}] {progress_percentage:3d}% ({index}/{total_doctypes})" counters_line = f" Fields updated: {field_counters['total_field_updates']} | DocTypes updated: {field_counters['addresses_updated'] + field_counters['quotations_updated'] + field_counters['sales_orders_updated'] + field_counters['customers_updated']}" @@ -800,7 +792,7 @@ def update_address_fields(): custom_installation_address = getattr(quotation_doc, 'custom_installation_address', None) custom_job_address = getattr(quotation_doc, 'custom_job_address', None) custom_project_template = getattr(quotation_doc, 'custom_project_template', None) - + updates = {} if custom_installation_address and not custom_job_address: updates['custom_job_address'] = custom_installation_address @@ -810,15 +802,15 @@ def update_address_fields(): updates['custom_project_template'] = "SNW Install" field_counters[f"{dict_field}_project_templates_updated"] += 1 field_counters['total_field_updates'] += 1 - + if updates: frappe.db.set_value(doc['doctype'], doc['name'], updates) field_counters[f"{dict_field}s_updated"] += 1 - + if doc['doctype'] == "Address": address_doc = frappe.get_doc("Address", doc['name']) updates = {} - + # Use getattr with default values instead of direct attribute access if not getattr(address_doc, 'full_address', None): address_parts_1 = [ @@ -830,57 +822,57 @@ def update_address_fields(): address_doc.state or "", address_doc.pincode or "", ] - + full_address = ", ".join([ " ".join(filter(None, address_parts_1)), " ".join(filter(None, address_parts_2)) - ]).strip() + ]).strip() updates['full_address'] = full_address field_counters['full_address'] += 1 field_counters['total_field_updates'] += 1 - + onsite_meeting = "Not Started" estimate_sent = "Not Started" job_status = "Not Started" payment_received = "Not Started" - - + + onsite_meetings = frappe.get_all("On-Site Meeting", fields=[onsite_status_field], filters={"address": address_doc.address_title}) if onsite_meetings and onsite_meetings[0]: status_value = onsite_meetings[0].get(onsite_status_field) onsite_meeting = "Completed" if status_value == "Completed" else "In Progress" - + estimates = frappe.get_all("Quotation", fields=["custom_sent", "docstatus", "custom_response"], filters={"custom_job_address": address_doc.address_title}) if estimates and estimates[0] and estimates[0]["custom_sent"] == 1 and estimates[0]["custom_response"]: estimate_sent = "Completed" elif estimates and estimates[0] and not (estimates[0]["custom_sent"] == 1 and estimates[0]["custom_response"]): estimate_sent = "In Progress" - + jobs = frappe.get_all("Project", fields=["status"], filters={"custom_installation_address": address_doc.address_title, "project_template": "SNW Install"}) if jobs and jobs[0] and jobs[0]["status"] == "Completed": job_status = "Completed" elif jobs and jobs[0]: job_status = "In Progress" - + sales_invoices = frappe.get_all("Sales Invoice", fields=["outstanding_amount"], filters={"custom_installation_address": address_doc.address_title}) # payments = frappe.get_all("Payment Entry", filters={"custom_installation_address": address_doc.address_title}) if sales_invoices and sales_invoices[0] and sales_invoices[0]["outstanding_amount"] == 0: payment_received = "Completed" elif sales_invoices and sales_invoices[0]: payment_received = "In Progress" - + customer_name = getattr(address_doc, 'custom_customer_to_bill', None) links = address_doc.get("links", []) customer_links = [link for link in links if link.link_doctype == "Customer"] needs_link_update = False - + if customer_name and frappe.db.exists("Customer", customer_name): customer_doc = frappe.get_doc("Customer", customer_name) - + # Check if address needs link update if not customer_links: needs_link_update = True - + if not address_doc.name in [link.address_name for link in customer_doc.get("custom_select_address", [])]: customer_doc.append("custom_select_address", { "address_name": address_doc.name @@ -888,7 +880,7 @@ def update_address_fields(): customer_doc.save(ignore_permissions=True) field_counters['customers_updated'] += 1 field_counters['total_field_updates'] += 1 - + if getattr(address_doc, 'custom_onsite_meeting_scheduled', None) != onsite_meeting: updates['custom_onsite_meeting_scheduled'] = onsite_meeting field_counters['custom_onsite_meeting_scheduled'] += 1 @@ -905,11 +897,11 @@ def update_address_fields(): updates['custom_payment_received_status'] = payment_received field_counters['custom_payment_received_status'] += 1 field_counters['total_field_updates'] += 1 - + if updates: frappe.db.set_value("Address", doc['name'], updates) field_counters['addresses_updated'] += 1 - + # Handle address links after db.set_value to avoid timestamp mismatch if needs_link_update: # Reload the document to get the latest version @@ -930,13 +922,13 @@ def update_address_fields(): frappe.db.set_value("Task", doc["name"], "custom_property", project_address if project_address else alt_project_address) field_counters['tasks_updated'] += 1 field_counters['total_field_updates'] += 1 - - - + + + # Commit every 100 records to avoid long transactions if index % 100 == 0: frappe.db.commit() - + # Print completion summary print(f"\n\nāœ… DocType field value update completed!") print(f"šŸ“Š Summary:") @@ -958,7 +950,7 @@ def update_address_fields(): print(f" ā€¢ Sales Order Addresses Updated: {field_counters['sales_order_addresses_updated']:,}") print(f" ā€¢ Sales Order Project Templates Updated: {field_counters['sales_order_project_templates_updated']:,}") print("šŸ“ DocType field value updates complete.\n") - + def build_missing_field_specs(custom_fields, missing_fields): missing_field_specs = {} for entry in missing_fields: @@ -968,14 +960,14 @@ def build_missing_field_specs(custom_fields, missing_fields): if field_spec["fieldname"] == fieldname: missing_field_specs[doctype].append(field_spec) break - + return missing_field_specs def check_and_create_holiday_list(year=2026, country="US", weekly_off="Sunday"): """Check if Holiday List for the given year exists, if not create it.""" print(f"\nšŸ”§ Checking for Holiday List for {country} in {year}...") holiday_list_name = f"{country} Holidays {year}" - + if frappe.db.exists("Holiday List", holiday_list_name): print(f"āœ… Holiday List '{holiday_list_name}' already exists.") return @@ -1007,16 +999,16 @@ def check_and_create_holiday_list(year=2026, country="US", weekly_off="Sunday"): # hl.make_holiday_entries() frappe.db.commit() print(f"āœ… Holiday List '{holiday_list_name}' created successfully.") - + def get_all_sundays(year): sundays = [] d = date(year, 1, 1) - + while d.weekday() != 6: d += timedelta(days=1) - + while d.year == year: sundays.append(d) d += timedelta(days=7) - - return sundays + + return sundays \ No newline at end of file diff --git a/frontend/src/api.js b/frontend/src/api.js index 55d9149..9c71024 100644 --- a/frontend/src/api.js +++ b/frontend/src/api.js @@ -5,8 +5,6 @@ import { useErrorStore } from "./stores/errors"; const ZIPPOPOTAMUS_BASE_URL = "https://api.zippopotam.us/us"; // Proxy method for external API calls const FRAPPE_PROXY_METHOD = "custom_ui.api.proxy.request"; -// On-Site Meeting methods -const FRAPPE_GET_INCOMPLETE_BIDS_METHOD = "custom_ui.api.db.on_site_meetings.get_incomplete_bids"; // Estimate methods const FRAPPE_UPSERT_ESTIMATE_METHOD = "custom_ui.api.db.estimates.upsert_estimate"; const FRAPPE_GET_ESTIMATES_METHOD = "custom_ui.api.db.estimates.get_estimate_table_data"; @@ -16,7 +14,7 @@ const FRAPPE_LOCK_ESTIMATE_METHOD = "custom_ui.api.db.estimates.lock_estimate"; const FRAPPE_ESTIMATE_UPDATE_RESPONSE_METHOD = "custom_ui.api.db.estimates.manual_response"; const FRAPPE_GET_ESTIMATE_TEMPLATES_METHOD = "custom_ui.api.db.estimates.get_estimate_templates"; const FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD = "custom_ui.api.db.estimates.create_estimate_template"; -const FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD = "custom_ui.api.db.estimates.get_unapproved_estimates_count"; +const FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD = "custom_ui.api.db.estimates.get_unnaproved_estimates_count"; const FRAPPE_GET_ESTIMATES_HALF_DOWN_COUNT_METHOD = "custom_ui.api.db.estimates.get_estimates_half_down_count"; // Job methods const FRAPPE_GET_JOB_METHOD = "custom_ui.api.db.jobs.get_job"; @@ -28,10 +26,6 @@ const FRAPPE_GET_INSTALL_PROJECTS_METHOD = "custom_ui.api.db.jobs.get_install_pr const FRAPPE_GET_JOBS_FOR_CALENDAR_METHOD = "custom_ui.api.db.jobs.get_projects_for_calendar"; const FRAPPE_GET_JOB_TEMPLATES_METHOD = "custom_ui.api.db.jobs.get_job_templates"; const FRAPPE_UPDATE_JOB_SCHEDULED_DATES_METHOD = "custom_ui.api.db.jobs.update_job_scheduled_dates"; -const FRAPPE_GET_JOBS_IN_QUEUE_METHOD = "custom_ui.api.db.jobs.get_jobs_in_queue_count"; -const FRAPPE_GET_JOBS_IN_PROGRESS_METHOD = "custom_ui.api.db.jobs.get_jobs_in_progress_count"; -const FRAPPE_GET_JOBS_LATE_METHOD = "custom_ui.api.db.jobs.get_jobs_late_count"; -const FRAPPE_GET_JOBS_TO_INVOICE_METHOD = "custom_ui.api.db.jobs.get_jobs_to_invoice_count"; // Task methods const FRAPPE_GET_TASKS_METHOD = "custom_ui.api.db.tasks.get_tasks_table_data"; const FRAPPE_GET_TASKS_STATUS_OPTIONS = "custom_ui.api.db.tasks.get_task_status_options"; @@ -40,8 +34,6 @@ const FRAPPE_GET_TASKS_DUE_METHOD = "custom_ui.api.db.tasks.get_tasks_due"; // Invoice methods const FRAPPE_GET_INVOICES_METHOD = "custom_ui.api.db.invoices.get_invoice_table_data"; const FRAPPE_UPSERT_INVOICE_METHOD = "custom_ui.api.db.invoices.upsert_invoice"; -const FRAPPE_GET_INVOICES_LATE_METHOD = "custom_ui.api.db.invoices.get_invoices_late_count"; -const FRAPPE_CREATE_INVOICE_FOR_JOB = "custom_ui.api.db.invoices.create_invoice_for_job"; // Warranty methods const FRAPPE_GET_WARRANTY_CLAIMS_METHOD = "custom_ui.api.db.warranties.get_warranty_claims"; // On-Site Meeting methods @@ -248,11 +240,6 @@ class Api { return result; } - static async getIncompleteBidsCount(currentCompany) { - const result = await this.request(FRAPPE_GET_INCOMPLETE_BIDS_METHOD, { company: currentCompany }); - return result; - } - static async createEstimate(estimateData) { const result = await this.request(FRAPPE_UPSERT_ESTIMATE_METHOD, { data: estimateData }); return result; @@ -278,12 +265,12 @@ class Api { return await this.request(FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD, { data }); } - static async getUnapprovedEstimatesCount(currentCompany) { - return await this.request(FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD, {company: currentCompany}); + static async getUnapprovedEstimatesCount() { + return await this.request(FRAPPE_GET_UNAPPROVED_ESTIMATES_COUNT_METHOD, {}); } - static async getEstimatesHalfDownCount(currentCompany) { - return await this.request(FRAPPE_GET_ESTIMATES_HALF_DOWN_COUNT_METHOD, {company: currentCompany}); + static async getEstimatesHalfDownCount() { + return await this.request(FRAPPE_GET_ESTIMATES_HALF_DOWN_COUNT_METHOD, {}); } // ============================================================================ @@ -355,26 +342,6 @@ class Api { }); } - static async getJobsInQueueCount(currentCompany) { - return await this.request(FRAPPE_GET_JOBS_IN_QUEUE_METHOD, {company: currentCompany}); - } - - static async getJobsInProgressCount(currentCompany) { - return await this.request(FRAPPE_GET_JOBS_IN_PROGRESS_METHOD, {company: currentCompany}); - } - - static async getJobsLateCount(currentCompany) { - return await this.request(FRAPPE_GET_JOBS_LATE_METHOD, {company: currentCompany}); - } - - static async getJobsToInvoiceCount(currentCompany) { - return await this.request(FRAPPE_GET_JOBS_TO_INVOICE_METHOD, {company: currentCompany}); - } - - static async setJobCompleted(jobName) { - return await this.request(FRAPPE_SET_JOB_COMPLETE_METHOD, {jobName: jobName}); - } - static async getJob(jobName) { if (frappe.db.exists("Project", jobName)) { const result = await this.request(FRAPPE_GET_JOB_METHOD, { jobId: jobName }) @@ -524,16 +491,6 @@ class Api { return result; } - static async getInvoicesLateCount(currentCompany) { - const result = await this.request(FRAPPE_GET_INVOICES_LATE_METHOD, { company: currentCompany }); - return result; - } - - static async createInvoiceForJob(jobName) { - const result = await this.request(FRAPPE_CREATE_INVOICE_FOR_JOB, { jobName: jobName }); - return result; - } - // ============================================================================ // WARRANTY METHODS // ============================================================================ diff --git a/frontend/src/components/common/TodoChart.vue b/frontend/src/components/common/TodoChart.vue index 776aca2..b55b655 100644 --- a/frontend/src/components/common/TodoChart.vue +++ b/frontend/src/components/common/TodoChart.vue @@ -36,6 +36,9 @@ const props = defineProps({ }, }); +//Constants +//const categories = ["To-do", "Completed"]; + //Reactive data const centerData = ref(null); const hoveredSegment = ref(null); @@ -110,7 +113,7 @@ const updateCenterData = () => { }; } else { centerData.value = { - label: props.categories.labels[0], + label: "To-do", value: todos, percentage: null, }; diff --git a/frontend/src/components/pages/Estimates.vue b/frontend/src/components/pages/Estimates.vue index 86dc4ce..c83ef9d 100644 --- a/frontend/src/components/pages/Estimates.vue +++ b/frontend/src/components/pages/Estimates.vue @@ -15,7 +15,8 @@
-
- - - - -
[ }, ]); -const createInvoiceForJob = async () => { - console.log(job); - await Api.createInvoiceForJob(job.value.name); -} - const handleLazyLoad = async (event) => { console.log("Task list on Job Page - handling lazy load:", event); try { @@ -257,7 +232,7 @@ const handleLazyLoad = async (event) => { onMounted(async () => { console.log("DEBUG: Query params:", route.query); - + try { const optionsResult = await Api.getTaskStatusOptions(); if (optionsResult && optionsResult.length > 0) { diff --git a/frontend/src/components/pages/Jobs.vue b/frontend/src/components/pages/Jobs.vue index 32221b1..879691e 100644 --- a/frontend/src/components/pages/Jobs.vue +++ b/frontend/src/components/pages/Jobs.vue @@ -15,7 +15,8 @@