From 73ff8ae980bf4e08e432f18a38105afcdaa873d4 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 24 Jan 2019 21:55:43 +1100
Subject: [PATCH] Added status ORDERED

---
 app/Models/Service.php                               | 6 ++++--
 resources/theme/backend/adminlte/a/service.blade.php | 2 ++
 resources/theme/backend/adminlte/u/service.blade.php | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index 7c324a1..d75d038 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -65,7 +65,9 @@ class Service extends Model
 		// Order Cancelled
 		'ORDER-CANCELLED' => [],
 		// Order Sent to Supplier
-		'ORDER-SENT' => ['update_reference'=>'ORDER-SENT'],
+		'ORDER-SENT' => ['update_reference'=>'ORDER-SENT','confirm'=>'ORDERED'],
+		// Order Confirmed by Supplier
+		'ORDERED' => ['update_reference'=>'ORDER-SENT'],
 	];
 
 	/**
@@ -245,7 +247,7 @@ class Service extends Model
 		if (! $this->order_status)
 			return $this->active ? 'Active' : 'Inactive';
 
-		return $this->order_status=='ORDER-SENT'
+		return in_array($this->order_status,['ORDER-SENT','ORDER-HOLD','ORDERED'])
 			? sprintf('%s: <span class="white-space: nowrap"><small><b>#%s</b></small></span>',$this->order_status,array_get($this->order_info,'order_reference','Unknown'))
 			: $this->order_status;
 	}
diff --git a/resources/theme/backend/adminlte/a/service.blade.php b/resources/theme/backend/adminlte/a/service.blade.php
index fe850ef..5137c4b 100644
--- a/resources/theme/backend/adminlte/a/service.blade.php
+++ b/resources/theme/backend/adminlte/a/service.blade.php
@@ -29,6 +29,7 @@
 								@break
 
 							@case('ORDER-SENT')
+							@case('ORDERED')
 								@include('a.widgets.service.order.sent')
 								@break
 
@@ -52,6 +53,7 @@
 							@break;
 
 						@case('ORDER-SENT')
+						@case('ORDERED')
 							<button type="submit" class="btn btn-info btn-danger" name="action" value="update_reference">Update</button>
 						@break;
 
diff --git a/resources/theme/backend/adminlte/u/service.blade.php b/resources/theme/backend/adminlte/u/service.blade.php
index 7f9dac8..3f5cce0 100644
--- a/resources/theme/backend/adminlte/u/service.blade.php
+++ b/resources/theme/backend/adminlte/u/service.blade.php
@@ -24,6 +24,7 @@
 						@case('ORDER-SUBMIT')
 						@case('ORDER-SENT')
 						@case('ORDER-HOLD')
+						@case('ORDERED')
 							@include('u.widgets.service.order.sent')
 							@break