From 3ff7bf1571744c417d9ce8b697cd1a0cb34682fe Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 25 Jul 2022 23:24:45 +1000
Subject: [PATCH] Fixes for error 500 in order and fix layout when updating
 changed services

---
 app/Http/Controllers/OrderController.php             |  3 ++-
 .../adminlte/a/service/change_pending.blade.php      | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php
index 7e97a5e..f5f12a1 100644
--- a/app/Http/Controllers/OrderController.php
+++ b/app/Http/Controllers/OrderController.php
@@ -105,7 +105,8 @@ class OrderController extends Controller
 		$so->site_id = config('site')->site_id;
 		$so->product_id = $po->id;
 		$so->order_status = 'ORDER-SUBMIT';
-		$so->orderby_id = Auth::id();
+		$so->ordered_by = Auth::id();
+		$so->active = FALSE;
 		$so->model = $order ? get_class($order) : NULL;
 
 		if ($order && $order->order_info) {
diff --git a/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php b/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php
index 87a3c05..c49b208 100644
--- a/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php
+++ b/resources/views/theme/backend/adminlte/a/service/change_pending.blade.php
@@ -14,7 +14,7 @@
 <!-- $o = App\Models\Service::class -->
 @section('main-content')
 	<div class="row">
-		<div class="col-6">
+		<div class="col-8">
 			<form role="form" method="POST" enctype="multipart/form-data">
 				<div class="card card-dark">
 					{{ csrf_field() }}
@@ -25,7 +25,7 @@
 
 					<div class="card-body">
 						<div class="row">
-							<div class="col-3">
+							<div class="col-12">
 								<!-- SERVICE NUMBER -->
 								<div class="form-group">
 									<label for="service_number" class="col-form-label text-right">Service Number</label>
@@ -41,7 +41,7 @@
 						</div>
 
 						<div class="row">
-							<div class="col-3">
+							<div class="col-12">
 								<!-- PRODUCT -->
 								<div class="form-group has-validation">
 									<label for="product_id">Type</label>
@@ -70,7 +70,7 @@
 						</div>
 
 						<div class="row">
-							<div class="col-3">
+							<div class="col-12">
 								<!-- CHANGE DATE -->
 								<div class="form-group has-validation">
 									<label for="start_at" class="col-form-label text-right">Change Date</label>
@@ -92,7 +92,7 @@
 						</div>
 
 						<div class="row">
-							<div class="col-3">
+							<div class="col-6">
 								<!-- CHANGE FEE -->
 								<div class="form-group has-validation">
 									<label for="change_fee" class="col-form-label text-right">Change Fee</label>
@@ -123,7 +123,7 @@
 				</div>
 			</form>
 		</div>
-		<div class="col-6">
+		<div class="col-4">
 			@include('a.service.widgets.internal')
 		</div>
 	</div>