Spaces:

kamau1
/

swiftops-backend

Sleeping

App Files Files Community

kamau1 commited on Dec 10, 2025

Commit

fd7c25c

1 Parent(s): 938ea18

feat: add completion data to the ticket detail endpoint

Browse files

Files changed (4) hide show

docs/devlogs/browser/response.json +286 -44
docs/devlogs/db/logs.sql +1 -1
src/app/api/v1/contractor_invoices.py +5 -1
src/app/schemas/ticket.py +6 -1

docs/devlogs/browser/response.json CHANGED Viewed

@@ -1,48 +1,290 @@
 {
-    "invoice_title": "Invoice for 1 tickets",
-    "billing_period_start": "2025-12-10",
-    "billing_period_end": "2025-12-10",
-    "issue_date": "2025-12-10",
-    "due_date": "2026-01-09",
-    "tax_rate": "0.00",
-    "discount_amount": "0.00",
-    "currency": "KES",
-    "notes": null,
-    "terms_and_conditions": null,
-    "id": "81c96213-485f-4170-92a0-23c08332923b",
-    "contractor_id": "1af9fb24-e5bb-40ac-a748-0997580b4c32",
-    "client_id": "a2455244-d87e-4279-9fca-dc067f06b5c3",
-    "project_id": "0ade6bd1-e492-4e25-b681-59f42058d29a",
-    "invoice_number": "INV-TEL-2025-00001",
-    "subtotal": "0.00",
-    "tax_amount": "0.00",
-    "total_amount": "0.00",
-    "amount_paid": "0.00",
-    "amount_due": "0.00",
-    "line_items": [
-        {
-            "id": "uqtB0XJIJAviIUWq-Ez7dA",
-            "type": "ticket",
-            "ticket_id": "2de41ce7-dff1-4151-9710-87958d18b5c4",
-            "description": "Installation - Elizabeth Muthoni",
-            "quantity": "1",
-            "unit_price": "0.0",
-            "total": "0.0"
         }
     ],
-    "status": "draft",
-    "sent_date": null,
-    "paid_date": null,
-    "payment_method": null,
-    "payment_reference": null,
-    "payment_notes": null,
-    "version": 1,
-    "previous_version_id": null,
-    "is_latest_version": true,
-    "revision_notes": "Initial version - Proof of work invoice",
-    "created_by_user_id": "c5cf92be-4172-4fe2-af5c-f05d83b3a938",
-    "created_at": "2025-12-10T20:08:01.056478Z",
-    "updated_at": "2025-12-10T20:08:01.100142Z",
-    "deleted_at": null,
-    "additional_metadata": {}
 }

 {
+    "ticket": {
+        "id": "2de41ce7-dff1-4151-9710-87958d18b5c4",
+        "project_id": "0ade6bd1-e492-4e25-b681-59f42058d29a",
+        "source": "sales_order",
+        "source_id": "a1d04741-b1b5-4a9e-baf6-d1e186886122",
+        "ticket_name": "Elizabeth Muthoni",
+        "ticket_type": "installation",
+        "service_type": "ftth",
+        "work_description": "Install Premium Fiber 100Mbps for Elizabeth Muthoni",
+        "status": "completed",
+        "priority": "normal",
+        "scheduled_date": "2025-12-11",
+        "scheduled_time_slot": "Anytime",
+        "due_date": "2025-11-29T09:33:10.216625Z",
+        "sla_target_date": "2025-11-29T09:33:10.216625Z",
+        "sla_violated": true,
+        "started_at": "2025-12-03T11:26:46.746725Z",
+        "completed_at": "2025-12-10T12:36:25.444896Z",
+        "is_invoiced": true,
+        "invoiced_at": "2025-12-10T20:08:01.097828Z",
+        "project_region_id": "4cd27765-5720-4cc0-872e-bf0da3cd1898",
+        "work_location_latitude": "-1.2198880",
+        "work_location_longitude": "36.8770130",
+        "work_location_verified": true,
+        "notes": "[COMPLETION] done",
+        "version": 1,
+        "created_at": "2025-11-26T09:33:10.216625Z",
+        "updated_at": "2025-12-10T20:08:01.113908Z",
+        "project_title": null,
+        "region_name": null,
+        "customer_name": null,
+        "is_open": false,
+        "is_assigned": false,
+        "is_in_progress": false,
+        "is_completed": true,
+        "is_cancelled": false,
+        "is_active": false,
+        "is_overdue": false,
+        "has_region": true,
+        "has_schedule": true,
+        "can_be_assigned": false,
+        "can_be_started": false,
+        "can_be_completed": false,
+        "can_be_cancelled": false
+    },
+    "available_actions": [],
+    "current_assignment": null,
+    "team_info": {
+        "required_size": 1,
+        "assigned_size": 0,
+        "is_full": false,
+        "assigned_agents": []
+    },
+    "message": "Ticket TicketStatus.COMPLETED",
+    "source_data": {
+        "type": "sales_order",
+        "id": "a1d04741-b1b5-4a9e-baf6-d1e186886122",
+        "order_number": "ORD-2025-015",
+        "customer_preferred_package": "Premium Fiber 100Mbps",
+        "package_price": 8000.0,
+        "installation_address": "1313 Ridgeways Close, Gate 5",
+        "installation_latitude": -1.215,
+        "installation_longitude": 36.815,
+        "preferred_visit_date": "2025-12-11",
+        "status": "processed"
+    },
+    "customer": {
+        "id": "a9bccac9-1513-412c-be40-71ea7be24e9a",
+        "name": "Elizabeth Muthoni",
+        "phone": "+254756789013",
+        "email": "elizabeth.muthoni@email.com",
+        "address": null,
+        "location_latitude": null,
+        "location_longitude": null
+    },
+    "expenses": [
+        {
+            "id": "35db9201-3c05-4853-be91-5eb6f30782d1",
+            "ticket_assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "incurred_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "incurred_by_user_name": "Viyisa Sasa",
+            "category": "transport",
+            "description": "nganya",
+            "expense_date": "2025-12-10",
+            "quantity": 1.0,
+            "unit": "unit",
+            "unit_cost": 60.0,
+            "total_cost": 60.0,
+            "receipt_document_id": null,
+            "location_verified": false,
+            "verification_notes": "Not verified: No GPS location found for 2025-12-10. Manual review required.",
+            "is_approved": true,
+            "approved_by_user_id": "c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "approved_by_user_name": "Project Manager",
+            "approved_at": "2025-12-10T12:49:31.240803+00:00",
+            "rejection_reason": null,
+            "is_paid": true,
+            "paid_to_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "paid_to_user_name": "Viyisa Sasa",
+            "paid_at": "2025-12-10T13:23:41.579606+00:00",
+            "payment_reference": "CSV_EXPORT_20251210_132341_c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "payment_recipient_type": "agent",
+            "payment_method": "send_money",
+            "payment_details": {
+                "phone_number": "+254799459782",
+                "recipient_name": "Viyisa"
+            },
+            "notes": "",
+            "created_at": "2025-12-10T12:48:01.978430+00:00",
+            "updated_at": "2025-12-10T13:23:41.581979+00:00"
+        },
+        {
+            "id": "d73cb843-e4fb-4200-aa3e-243887714422",
+            "ticket_assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "incurred_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "incurred_by_user_name": "Viyisa Sasa",
+            "category": "transport",
+            "description": "matatu",
+            "expense_date": "2025-12-10",
+            "quantity": 1.0,
+            "unit": "unit",
+            "unit_cost": 30.0,
+            "total_cost": 30.0,
+            "receipt_document_id": null,
+            "location_verified": false,
+            "verification_notes": "Not verified: No GPS location found for 2025-12-10. Manual review required.",
+            "is_approved": true,
+            "approved_by_user_id": "c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "approved_by_user_name": "Project Manager",
+            "approved_at": "2025-12-10T12:49:31.240794+00:00",
+            "rejection_reason": null,
+            "is_paid": true,
+            "paid_to_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "paid_to_user_name": "Viyisa Sasa",
+            "paid_at": "2025-12-10T13:23:41.579593+00:00",
+            "payment_reference": "CSV_EXPORT_20251210_132341_c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "payment_recipient_type": "agent",
+            "payment_method": "send_money",
+            "payment_details": {
+                "phone_number": "+254799459782",
+                "recipient_name": "Viyisa"
+            },
+            "notes": "",
+            "created_at": "2025-12-10T12:47:37.968268+00:00",
+            "updated_at": "2025-12-10T13:23:41.581981+00:00"
+        },
+        {
+            "id": "b8a0bac2-69c0-4218-a565-e1e2b6ce0d4d",
+            "ticket_assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "incurred_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "incurred_by_user_name": "Viyisa Sasa",
+            "category": "transport",
+            "description": "boda boda",
+            "expense_date": "2025-12-10",
+            "quantity": 1.0,
+            "unit": "unit",
+            "unit_cost": 100.0,
+            "total_cost": 100.0,
+            "receipt_document_id": null,
+            "location_verified": false,
+            "verification_notes": "Not verified: No GPS location found for 2025-12-10. Manual review required.",
+            "is_approved": true,
+            "approved_by_user_id": "c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "approved_by_user_name": "Project Manager",
+            "approved_at": "2025-12-10T12:49:31.240785+00:00",
+            "rejection_reason": null,
+            "is_paid": true,
+            "paid_to_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "paid_to_user_name": "Viyisa Sasa",
+            "paid_at": "2025-12-10T13:48:43.261303+00:00",
+            "payment_reference": "CSV_EXPORT_20251210_134843_c5cf92be-4172-4fe2-af5c-f05d83b3a938",
+            "payment_recipient_type": "agent",
+            "payment_method": "send_money",
+            "payment_details": {
+                "phone_number": "+254799459782",
+                "recipient_name": "Viyisa"
+            },
+            "notes": "",
+            "created_at": "2025-12-10T12:32:23.362852+00:00",
+            "updated_at": "2025-12-10T13:48:43.265156+00:00"
+        }
+    ],
+    "images": [
+        {
+            "id": "e37b665d-fd6d-4c77-b39e-a6064cb49d64",
+            "image_url": "https://res.cloudinary.com/dnhajmziu/image/upload/v1765370174/ticket_2de41ce7_ticket_photo_jcc_jcc_20251210_123614_screenshot_2025-09-04_093459.webp",
+            "image_type": "completion",
+            "description": "[JCC] Completion photo for ticket",
+            "captured_at": "2025-12-10T12:36:14.781724+00:00",
+            "uploaded_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "created_at": "2025-12-10T12:36:14.782564+00:00"
+        },
+        {
+            "id": "ecfc24fc-6be0-4888-a65e-7acf83088c2e",
+            "image_url": "https://res.cloudinary.com/dnhajmziu/image/upload/v1765370173/ticket_2de41ce7_ticket_photo_odu_outdoor_image_odu_outdoor_image_20251210_123613_screenshot_2025-09-01_163321.webp",
+            "image_type": "completion",
+            "description": "[ODU outdoor image] Completion photo for ticket",
+            "captured_at": "2025-12-10T12:36:14.128316+00:00",
+            "uploaded_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "created_at": "2025-12-10T12:36:14.129146+00:00"
+        },
+        {
+            "id": "cbbec871-af75-4364-ab34-55272764a415",
+            "image_url": "https://res.cloudinary.com/dnhajmziu/image/upload/v1765370172/ticket_2de41ce7_ticket_photo_speedtest_speedtest_20251210_123611_screenshot_2025-08-19_155834.webp",
+            "image_type": "completion",
+            "description": "[Speedtest] Completion photo for ticket",
+            "captured_at": "2025-12-10T12:36:13.395865+00:00",
+            "uploaded_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "created_at": "2025-12-10T12:36:13.396676+00:00"
+        },
+        {
+            "id": "07674999-1fcd-46e9-86ad-8dae1846a218",
+            "image_url": "https://res.cloudinary.com/dnhajmziu/image/upload/v1765370171/ticket_2de41ce7_ticket_photo_airtel_network_airtel_network_20251210_123610_screenshot_2025-08-25_090418.webp",
+            "image_type": "completion",
+            "description": "[Airtel network] Completion photo for ticket",
+            "captured_at": "2025-12-10T12:36:11.763055+00:00",
+            "uploaded_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "created_at": "2025-12-10T12:36:11.814756+00:00"
+        }
+    ],
+    "comments": [],
+    "assignments": [
+        {
+            "id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "user_name": "Viyisa Sasa",
+            "action": "completed",
+            "status": "CLOSED",
+            "assigned_at": "2025-12-03T11:26:09.556998+00:00",
+            "responded_at": "2025-12-03T11:26:09.557001+00:00",
+            "journey_started_at": "2025-12-03T11:26:46.746692+00:00",
+            "arrived_at": "2025-12-03T12:18:09.241003+00:00",
+            "ended_at": "2025-12-10T12:36:25.458584+00:00"
         }
     ],
+    "status_history": [
+        {
+            "id": "faf96f42-b676-4c03-bf71-895aaace1ca4",
+            "old_status": "in_progress",
+            "new_status": "completed",
+            "changed_at": "2025-12-10T12:36:25.466040+00:00",
+            "changed_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "changed_by_user_name": "viya",
+            "assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "change_reason": "Ticket completed with all requirements satisfied",
+            "notes": "done",
+            "location_latitude": null,
+            "location_longitude": null,
+            "location_accuracy": null,
+            "location_verified": false,
+            "communication_method": "app",
+            "additional_metadata": {}
+        },
+        {
+            "id": "df7dc5a2-273a-4256-8203-5b42ef347da3",
+            "old_status": "assigned",
+            "new_status": "in_progress",
+            "changed_at": "2025-12-03T11:26:46.747547+00:00",
+            "changed_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "changed_by_user_name": "viya",
+            "assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "change_reason": "Agent started journey to site",
+            "notes": null,
+            "location_latitude": -1.219959,
+            "location_longitude": 36.8769753,
+            "location_accuracy": null,
+            "location_verified": false,
+            "communication_method": "app",
+            "additional_metadata": {}
+        },
+        {
+            "id": "2920a339-4a41-4806-bdc4-2a4d846fefb9",
+            "old_status": "open",
+            "new_status": "assigned",
+            "changed_at": "2025-12-03T11:26:09.599984+00:00",
+            "changed_by_user_id": "43b778b0-2062-4724-abbb-916a4835a9b0",
+            "changed_by_user_name": "viya",
+            "assignment_id": "34c2a077-5630-4af8-843d-e125c2497267",
+            "change_reason": "Self-assigned by agent",
+            "notes": null,
+            "location_latitude": null,
+            "location_longitude": null,
+            "location_accuracy": null,
+            "location_verified": false,
+            "communication_method": "app",
+            "additional_metadata": {}
+        }
+    ]
 }

docs/devlogs/db/logs.sql CHANGED Viewed

@@ -1 +1 @@

- [{"idx":0,"id":"01d2c337-3104-4723-87cf-7d1de66be823","ticket_assignment_id":"f5b40f0c-bc9c-4904-9ec1-7e570bda34eb","ticket_id":"169eec08-654d-4ffe-bdb3-45fad1101637","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"meals","description":"kwa mathe ","quantity":"1.00","unit":"unit","unit_cost":"70.00","total_cost":"70.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 11:39:05.973838+00","updated_at":"2025-12-10 11:39:05.97384+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":1,"id":"053dbe58-919c-4a11-9ca5-eb2a8384bf66","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"uber ","quantity":"1.00","unit":"unit","unit_cost":"340.00","total_cost":"340.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:25:27.373978+00","updated_at":"2025-12-10 12:25:27.373982+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":2,"id":"0bf05fe1-ea66-4391-9d93-0059164b247a","ticket_assignment_id":"20772cb1-ec31-41dc-9cb0-73649dc6ac55","ticket_id":"70090c47-e9c1-4b0a-add4-69bec53d92f9","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"uber boda","quantity":"1.00","unit":"unit","unit_cost":"70.00","total_cost":"70.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-09. Manual review required.","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-09 08:36:43.568628+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-09 10:17:50.227495+00","payment_reference":"CSV_EXPORT_20251209_101750_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"long jorney","additional_metadata":"{}","created_at":"2025-12-09 07:36:51.915415+00","updated_at":"2025-12-09 10:17:50.232336+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-09"},{"idx":3,"id":"2e21e94f-400e-4ab3-8a0a-b26724227e60","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"other","description":"Toa chai","quantity":"1.00","unit":"unit","unit_cost":"50.00","total_cost":"50.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:22:02.788205+00","updated_at":"2025-12-10 12:22:02.788207+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":4,"id":"35db9201-3c05-4853-be91-5eb6f30782d1","ticket_assignment_id":"34c2a077-5630-4af8-843d-e125c2497267","ticket_id":"2de41ce7-dff1-4151-9710-87958d18b5c4","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"nganya","quantity":"1.00","unit":"unit","unit_cost":"60.00","total_cost":"60.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-10 12:49:31.240803+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-10 13:23:41.579606+00","payment_reference":"CSV_EXPORT_20251210_132341_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:48:01.97843+00","updated_at":"2025-12-10 13:23:41.581979+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":5,"id":"5d0a1d44-0eb4-4b32-90ec-5cbdda883238","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"boda to road","quantity":"1.00","unit":"unit","unit_cost":"150.00","total_cost":"150.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:02:36.66789+00","updated_at":"2025-12-10 12:02:36.667892+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":6,"id":"6d64a8fc-219c-465b-b1a1-7e710b391a70","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"accommodation","description":"Slept","quantity":"1.00","unit":"unit","unit_cost":"2000.00","total_cost":"2000.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 11:53:42.062175+00","updated_at":"2025-12-10 11:53:42.062179+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":7,"id":"6ec9e645-e4ff-4408-ac9f-de41b37e64dc","ticket_assignment_id":"f5b40f0c-bc9c-4904-9ec1-7e570bda34eb","ticket_id":"169eec08-654d-4ffe-bdb3-45fad1101637","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"we move","quantity":"1.00","unit":"unit","unit_cost":"50.00","total_cost":"50.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 11:30:03.835226+00","updated_at":"2025-12-10 11:30:03.835228+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":8,"id":"754be718-8834-4b99-804b-01a3f1974e07","ticket_assignment_id":"a82a3824-f4f1-4283-a2e3-8c348dbb28ce","ticket_id":"f59b29fc-d0b9-4618-b0d1-889e340da612","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"boda boda","quantity":"1.00","unit":"unit","unit_cost":"5000.00","total_cost":"5000.00","receipt_document_id":null,"location_verified":true,"verification_notes":"Verified: Agent arrived at site on 2025-11-30 with GPS location","is_approved":false,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-09 08:51:10.572232+00","rejection_reason":"this is exergrated for the short distance travelled","is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"mpesa message","additional_metadata":"{}","created_at":"2025-11-30 20:52:12.047667+00","updated_at":"2025-12-09 08:51:10.572648+00","deleted_at":null,"payment_recipient_type":null,"payment_method":null,"payment_details":null,"expense_date":"2025-11-30"},{"idx":9,"id":"7b697e88-c4c1-4366-b05e-c0689a90451c","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"bolt","quantity":"1.00","unit":"unit","unit_cost":"210.00","total_cost":"210.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-10 12:49:31.240768+00","rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:31:04.554338+00","updated_at":"2025-12-10 12:49:31.240777+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":10,"id":"b8a0bac2-69c0-4218-a565-e1e2b6ce0d4d","ticket_assignment_id":"34c2a077-5630-4af8-843d-e125c2497267","ticket_id":"2de41ce7-dff1-4151-9710-87958d18b5c4","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"boda boda","quantity":"1.00","unit":"unit","unit_cost":"100.00","total_cost":"100.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-10 12:49:31.240785+00","rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:32:23.362852+00","updated_at":"2025-12-10 12:49:31.240788+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":11,"id":"c466510a-96d8-48e1-82cf-9c6d4ff51fff","ticket_assignment_id":"d6f25868-5117-4b85-8bb3-44314144ef6e","ticket_id":"0fd3ee15-5e7d-465a-b377-155f9bdb7e70","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"boda","quantity":"1.00","unit":"unit","unit_cost":"9.97","total_cost":"9.97","receipt_document_id":null,"location_verified":true,"verification_notes":"Verified: Agent changed ticket status on 2025-12-01 with GPS location","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-08 20:37:52.435561+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-09 10:17:50.227511+00","payment_reference":"CSV_EXPORT_20251209_101750_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"aZfghji","additional_metadata":"{}","created_at":"2025-12-01 09:15:39.988606+00","updated_at":"2025-12-09 10:17:50.232338+00","deleted_at":null,"payment_recipient_type":null,"payment_method":null,"payment_details":null,"expense_date":"2025-12-01"},{"idx":12,"id":"d73cb843-e4fb-4200-aa3e-243887714422","ticket_assignment_id":"34c2a077-5630-4af8-843d-e125c2497267","ticket_id":"2de41ce7-dff1-4151-9710-87958d18b5c4","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"matatu","quantity":"1.00","unit":"unit","unit_cost":"30.00","total_cost":"30.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-10 12:49:31.240794+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-10 13:23:41.579593+00","payment_reference":"CSV_EXPORT_20251210_132341_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"","additional_metadata":"{}","created_at":"2025-12-10 12:47:37.968268+00","updated_at":"2025-12-10 13:23:41.581981+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":13,"id":"db836b45-5d6b-4e67-a12a-4619c0fb3f38","ticket_assignment_id":"4fe9d28c-b657-4672-9138-78edabb9749b","ticket_id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"meals","description":"rice beans na chapo","quantity":"1.00","unit":"unit","unit_cost":"80.00","total_cost":"80.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 11:54:30.892742+00","updated_at":"2025-12-10 12:02:07.865311+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":14,"id":"e5a609ec-eb74-43f0-a7f4-f031accb08fb","ticket_assignment_id":"69a2a4f6-f72a-425c-9f90-4088e074c13b","ticket_id":"1f807cf8-f139-421b-86e3-38c2f8bc7070","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"Boda to trm","quantity":"1.00","unit":"unit","unit_cost":"100.00","total_cost":"100.00","receipt_document_id":null,"location_verified":true,"verification_notes":"Verified: Agent changed ticket status on 2025-12-02 with GPS location","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-09 10:33:11.622869+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-09 10:33:18.098152+00","payment_reference":"CSV_EXPORT_20251209_103318_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"","additional_metadata":"{}","created_at":"2025-12-02 14:48:16.142758+00","updated_at":"2025-12-09 10:33:18.099276+00","deleted_at":null,"payment_recipient_type":null,"payment_method":null,"payment_details":null,"expense_date":"2025-12-02"},{"idx":15,"id":"fac7e155-a8a7-48bd-86f0-d74d8bb21b2a","ticket_assignment_id":"f5b40f0c-bc9c-4904-9ec1-7e570bda34eb","ticket_id":"169eec08-654d-4ffe-bdb3-45fad1101637","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"materials","description":"bought nails","quantity":"1.00","unit":"unit","unit_cost":"200.00","total_cost":"200.00","receipt_document_id":null,"location_verified":false,"verification_notes":"Not verified: No GPS location found for 2025-12-10. Manual review required.","is_approved":false,"approved_by_user_id":null,"approved_at":null,"rejection_reason":null,"is_paid":false,"paid_to_user_id":null,"paid_at":null,"payment_reference":null,"notes":"","additional_metadata":"{}","created_at":"2025-12-10 11:48:49.793431+00","updated_at":"2025-12-10 11:48:49.793435+00","deleted_at":null,"payment_recipient_type":"agent","payment_method":"send_money","payment_details":"{\"phone_number\": \"+2547994597823\", \"recipient_name\": \"Viyisa\"}","expense_date":"2025-12-10"},{"idx":16,"id":"fce5d718-86d5-489e-88cd-f3385f487849","ticket_assignment_id":"f5b40f0c-bc9c-4904-9ec1-7e570bda34eb","ticket_id":"169eec08-654d-4ffe-bdb3-45fad1101637","incurred_by_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","category":"transport","description":"Boda to home ","quantity":"1.00","unit":"unit","unit_cost":"100.00","total_cost":"100.00","receipt_document_id":null,"location_verified":true,"verification_notes":"Verified: Agent changed ticket status on 2025-12-03 with GPS location","is_approved":true,"approved_by_user_id":"c5cf92be-4172-4fe2-af5c-f05d83b3a938","approved_at":"2025-12-08 20:36:14.289213+00","rejection_reason":null,"is_paid":true,"paid_to_user_id":"43b778b0-2062-4724-abbb-916a4835a9b0","paid_at":"2025-12-08 20:58:34.466326+00","payment_reference":"CSV_EXPORT_20251208_205834_c5cf92be-4172-4fe2-af5c-f05d83b3a938","notes":"","additional_metadata":"{}","created_at":"2025-12-03 13:33:10.63594+00","updated_at":"2025-12-08 20:58:34.469281+00","deleted_at":null,"payment_recipient_type":null,"payment_method":null,"payment_details":null,"expense_date":"2025-12-03"}]

+ [{"idx":0,"id":"0fd3ee15-5e7d-465a-b377-155f9bdb7e70","project_id":"0ade6bd1-e492-4e25-b681-59f42058d29a","source":"sales_order","source_id":"f40b7d15-01f3-4dbc-9fd5-3f9114db5439","ticket_name":"John Kamau","ticket_type":"installation","service_type":"ftth","work_description":"Install Premium Fiber 50Mbps for John Kamau","status":"completed","priority":"normal","scheduled_date":"2025-12-01","scheduled_time_slot":"Morning 9AM-12PM","due_date":"2025-12-01 07:52:17.445636+00","sla_target_date":"2025-12-01 07:52:17.445636+00","sla_violated":false,"started_at":"2025-12-01 05:52:03.358706+00","completed_at":"2025-12-01 05:54:37.178415+00","is_invoiced":false,"invoiced_at":null,"contractor_invoice_id":null,"project_region_id":"4cd27765-5720-4cc0-872e-bf0da3cd1898","work_location_latitude":-1.2200285,"work_location_longitude":36.8770248,"work_location_accuracy":null,"work_location_verified":true,"dedup_key":null,"notes":"[COMPLETION] Hhhdg","additional_metadata":"{}","version":1,"created_at":"2025-11-28 07:52:17.445636+00","updated_at":"2025-12-01 05:54:37.233167+00","deleted_at":null,"required_team_size":1,"completion_data":"{\"odu_serial\": \"55673883987998\", \"ont_serial\": \"87655457889987\"}","completion_photos_verified":true,"completion_data_verified":true},{"idx":1,"id":"113e2c5d-80f3-41fc-98c0-6e16b1a1b049","project_id":"0ade6bd1-e492-4e25-b681-59f42058d29a","source":"sales_order","source_id":"dfd0b969-ca77-4433-9791-9339a79a1807","ticket_name":"Anne Njeri","ticket_type":"installation","service_type":"ftth","work_description":"Install Premium Fiber 100Mbps for Anne Njeri","status":"open","priority":"normal","scheduled_date":null,"scheduled_time_slot":null,"due_date":"2025-11-29 08:33:01.362984+00","sla_target_date":"2025-11-29 08:33:01.362984+00","sla_violated":false,"started_at":null,"completed_at":null,"is_invoiced":false,"invoiced_at":null,"contractor_invoice_id":null,"project_region_id":"4cd27765-5720-4cc0-872e-bf0da3cd1898","work_location_latitude":null,"work_location_longitude":null,"work_location_accuracy":null,"work_location_verified":false,"dedup_key":"548cc2a6d10f83467be48711c77e0c19","notes":null,"additional_metadata":"{}","version":1,"created_at":"2025-11-26 08:33:01.362984+00","updated_at":"2025-11-26 08:33:01.362986+00","deleted_at":null,"required_team_size":1,"completion_data":"{}","completion_photos_verified":false,"completion_data_verified":false},{"idx":2,"id":"169eec08-654d-4ffe-bdb3-45fad1101637","project_id":"0ade6bd1-e492-4e25-b681-59f42058d29a","source":"sales_order","source_id":"16155120-da0c-42c8-99b2-fc2362d7969f","ticket_name":"James Kipchoge","ticket_type":"installation","service_type":"ftth","work_description":"Install Premium Fiber 50Mbps for James Kipchoge","status":"completed","priority":"normal","scheduled_date":"2025-12-12","scheduled_time_slot":"Morning","due_date":"2025-12-06 13:18:49.776345+00","sla_target_date":"2025-12-06 13:18:49.776345+00","sla_violated":true,"started_at":"2025-12-03 13:21:46.868347+00","completed_at":"2025-12-10 11:25:21.683931+00","is_invoiced":false,"invoiced_at":null,"contractor_invoice_id":null,"project_region_id":"4cd27765-5720-4cc0-872e-bf0da3cd1898","work_location_latitude":-1.2200712,"work_location_longitude":36.8770138,"work_location_accuracy":null,"work_location_verified":true,"dedup_key":null,"notes":"[COMPLETION] work was done","additional_metadata":"{}","version":1,"created_at":"2025-12-03 13:18:49.776345+00","updated_at":"2025-12-10 11:25:21.725296+00","deleted_at":null,"required_team_size":1,"completion_data":"{\"odu_serial\": \"etewqyethfds\", \"ont_serial\": \"eter\", \"odu_imei_number\": \"ateywejhthbvrqtewgw\", \"activated_number\": \"999999999\"}","completion_photos_verified":true,"completion_data_verified":true},{"idx":3,"id":"1e622599-1909-49b9-9d8b-4c5cb483b29e","project_id":"0ade6bd1-e492-4e25-b681-59f42058d29a","source":"sales_order","source_id":"b2a47ac2-e779-4479-846b-f350f041dd43","ticket_name":"Nnacy Wanjiru","ticket_type":"installation","service_type":"ftth","work_description":"Install 100 for Nnacy Wanjiru","status":"assigned","priority":"normal","scheduled_date":"2026-01-01","scheduled_time_slot":null,"due_date":"2025-11-28 13:03:13.104571+00","sla_target_date":"2025-11-28 13:03:13.104571+00","sla_violated":true,"started_at":null,"completed_at":null,"is_invoiced":false,"invoiced_at":null,"contractor_invoice_id":null,"project_region_id":"24510a5a-13a6-4334-9055-b4d476aa9e0a","work_location_latitude":null,"work_location_longitude":null,"work_location_accuracy":null,"work_location_verified":false,"dedup_key":"1599426e83e347f0b0a00a1ddef5bcdb","notes":null,"additional_metadata":"{}","version":1,"created_at":"2025-11-25 13:03:13.104571+00","updated_at":"2025-12-10 11:05:29.251274+00","deleted_at":null,"required_team_size":1,"completion_data":"{}","completion_photos_verified":false,"completion_data_verified":false},{"idx":4,"id":"1f807cf8-f139-421b-86e3-38c2f8bc7070","project_id":"0ade6bd1-e492-4e25-b681-59f42058d29a","source":"sales_order","source_id":"7ad1e823-9c68-448c-8d7c-7fdefbf640cb","ticket_name":"Peter Otieno","ticket_type":"installation","service_type":"ftth","work_description":"Install Standard 20Mbps for Peter Otieno","status":"pending_review","priority":"normal","scheduled_date":"2025-12-10","scheduled_time_slot":"10:00-14:00","due_date":"2025-11-30 11:41:47.990551+00","sla_target_date":"2025-11-30 11:41:47.990551+00","sla_violated":true,"started_at":"2025-12-02 14:12:27.929751+00","completed_at":null,"is_invoiced":false,"invoiced_at":null,"contractor_invoice_id":null,"project_region_id":"4cd27765-5720-4cc0-872e-bf0da3cd1898","work_location_latitude":null,"work_location_longitude":null,"work_location_accuracy":null,"work_location_verified":false,"dedup_key":"a5f81226688e1cc667e106d4a52b4838","notes":"Needs router configuration assistance","additional_metadata":"{}","version":1,"created_at":"2025-11-27 11:41:47.990551+00","updated_at":"2025-12-03 11:59:40.306579+00","deleted_at":null,"required_team_size":1,"completion_data":"{}","completion_photos_verified":false,"completion_data_verified":false}]

src/app/api/v1/contractor_invoices.py CHANGED Viewed

@@ -183,7 +183,11 @@ def get_invoice(
 ):
     """
     Get invoice by ID.
-    Returns latest version by default with enriched data (names, viewing link).
     """
     import os
     from app.models.contractor import Contractor

 ):
     """
     Get invoice by ID.
+    Returns latest version with enriched data (names, viewing link).
+    For ticket details with completion data, use:
+    - Public viewing: GET /api/v1/invoices/view?token={token}
+    - Individual tickets: GET /api/v1/tickets/{id}/detail
     """
     import os
     from app.models.contractor import Contractor

src/app/schemas/ticket.py CHANGED Viewed

@@ -8,7 +8,7 @@ Request/response schemas for ticket management including:
 - Ticket list/filter/analytics
 """
 from pydantic import BaseModel, Field, field_validator, ConfigDict
-from typing import Optional, List
 from datetime import datetime, date
 from uuid import UUID
 from decimal import Decimal
@@ -150,6 +150,11 @@ class TicketResponse(BaseModel):
     work_location_longitude: Optional[Decimal]
     work_location_verified: bool
     # Metadata
     notes: Optional[str]
     version: int

 - Ticket list/filter/analytics
 """
 from pydantic import BaseModel, Field, field_validator, ConfigDict
+from typing import Optional, List, Dict, Any
 from datetime import datetime, date
 from uuid import UUID
 from decimal import Decimal
     work_location_longitude: Optional[Decimal]
     work_location_verified: bool
+    # Completion data
+    completion_data: Optional[Dict[str, Any]] = Field(default_factory=dict, description="Completion data (ONT serial, ODU serial, etc.)")
+    completion_photos_verified: bool = False
+    completion_data_verified: bool = False
     # Metadata
     notes: Optional[str]
     version: int