diff --git a/server/AyaNova/Controllers/CustomerServiceRequestController.cs b/server/AyaNova/Controllers/CustomerServiceRequestController.cs index 7664a4b0..0661b18c 100644 --- a/server/AyaNova/Controllers/CustomerServiceRequestController.cs +++ b/server/AyaNova/Controllers/CustomerServiceRequestController.cs @@ -177,11 +177,11 @@ namespace AyaNova.Api.Controllers /// Accept CustomerServiceRequest /// /// Source object id - /// Existing WorkOrder to accept to, if left empty creates new workorder + /// Existing WorkOrder to accept to, 0 creates new workorder /// From route path /// CustomerServiceRequest with WorkOrderItemId set [HttpPost("accept/{id}/{workorderid}")] - public async Task AcceptCustomerServiceRequest([FromRoute] long id, [FromRoute] long? workorderid, ApiVersion apiVersion) + public async Task AcceptCustomerServiceRequest([FromRoute] long id, [FromRoute] long workorderid, ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/biz/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index 22b70bce..8a8fbdcc 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -187,7 +187,7 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //ACCEPT // - internal async Task AcceptAsync(long csrId, long? workorderId) //MIGRATE_OUTSTANDING waiting for workorder to be completed or at least have a customerid which it currently doesn't + internal async Task AcceptAsync(long csrId, long workorderId) //MIGRATE_OUTSTANDING waiting for workorder to be completed or at least have a customerid which it currently doesn't { CustomerServiceRequest dbObject = await ct.CustomerServiceRequest.SingleOrDefaultAsync(m => m.Id == csrId); if (dbObject == null) @@ -197,11 +197,9 @@ namespace AyaNova.Biz } throw new System.NotImplementedException("//MIGRATE_OUTSTANDING CustomerServiceRequestBiz::AcceptAsync - awaiting workorder completion "); +// WorkOrder w=null; + //if (workorderId==0){WorkOrderBiz.GenerateWorkOrder()} //this is how it would work in theory - // WorkOrder w=null; - // if(workorderId==null){ - // w=WorkOrderBiz.; - // } // CustomerServiceRequest SnapshotOfOriginalDBObj = new CustomerServiceRequest(); // CopyObject.Copy(dbObject, SnapshotOfOriginalDBObj);