From a52c20993bcd51c6e4e6f87b25a3608f15328d00 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 3 Aug 2022 15:47:09 +1000
Subject: [PATCH] Fix existing cancel workflow

---
 app/Http/Controllers/ServiceController.php | 15 +++++++++++++++
 app/Models/Service.php                     |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
index 8924606..2e9b44d 100644
--- a/app/Http/Controllers/ServiceController.php
+++ b/app/Http/Controllers/ServiceController.php
@@ -40,6 +40,21 @@ class ServiceController extends Controller
 		return $o->save();
 	}
 
+	private function action_cancel_pending_enter(Service $o): bool
+	{
+		$o->order_status = 'CANCEL-PENDING';
+
+		return $o->save();
+	}
+
+	private function action_cancelled(Service $o): bool
+	{
+		$o->order_status = 'CANCELLED';
+		$o->active = FALSE;
+
+		return $o->save();
+	}
+
 	/**
 	 * Cancel a request to change a service
 	 *
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 23554a9..d9d9308 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -263,6 +263,10 @@ class Service extends Model implements IDs
 			'exit_method'=>'action_cancel_pending_exit',
 			'title'=>'Cancel Pending',
 		],
+		'CANCELLED'=> [
+			'title'=>'Service Cancelled',
+			'enter_method'=>'action_cancelled',
+		],
 		// Service to be Upgraded
 		'CHANGE-CANCEL' => [
 			'next'=>[
@@ -280,7 +284,7 @@ class Service extends Model implements IDs
 			'enter_method'=>'action_request_enter_redirect',
 			'title'=>'Change Service',
 		],
-
+		// Service is waiting on a supplier to activate a change
 		'CHANGE-PENDING' => [
 			'next'=>[
 				'ACTIVE'=>['wholesaler'],