From 9277d42196797624cf3f86bc558e9cc9a20e4ac1 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 25 Jul 2024 14:09:24 +1000
Subject: [PATCH] Fix order URL

---
 app/Http/Controllers/OrderController.php             | 12 ------------
 .../theme/frontend/metronic/order/home.blade.php     |  7 +++----
 routes/web.php                                       |  2 +-
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php
index f4fbfab..5de178f 100644
--- a/app/Http/Controllers/OrderController.php
+++ b/app/Http/Controllers/OrderController.php
@@ -13,18 +13,6 @@ use App\Models\{Account,Product,Service,User};
 
 class OrderController extends Controller
 {
-	// @todo To check
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
-
-	// @todo To check
-	public function index()
-	{
-		return view('theme.backend.adminlte.order.home');
-	}
-
 	// @todo To check
 	public function product_order(Product $o)
 	{
diff --git a/resources/views/theme/frontend/metronic/order/home.blade.php b/resources/views/theme/frontend/metronic/order/home.blade.php
index 34c295a..c027bbd 100644
--- a/resources/views/theme/frontend/metronic/order/home.blade.php
+++ b/resources/views/theme/frontend/metronic/order/home.blade.php
@@ -263,11 +263,10 @@ DO NOT request making changes to an active service here, it will not be processe
 @endsection
 
 @section('page-scripts')
-	<!-- @todo change to blade service provider -->
-	@themejs('plugin/jqBootstrapValidation/jqBootstrapValidation.js','jq-validation','jquery')
-	@themejs('//code.jquery.com/ui/1.12.1/jquery-ui.js','jquery-ui-js','jqery')
+	<script type="text/javascript" src="plugin/jqBootstrapValidation/jqBootstrapValidation.js"></script>
+	<script type="text/javascript" src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 
-	<script>
+	<script type="text/javascript">
 		$(function () { $("input,select,textarea").not("[type=submit]").jqBootstrapValidation(); } );
 
 		$(document).ready(function () {
diff --git a/routes/web.php b/routes/web.php
index 06432c5..8f9228e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -213,7 +213,7 @@ Route::group(['prefix'=>'u'],function() {
 });
 
 // Frontend
-Route::get('order',[OrderController::class,'index']);
+Route::view('order','theme.frontend.metronic.order.home');
 Route::post('order',[OrderController::class,'submit']);
 
 Route::get('product_order/{o}',[OrderController::class,'product_order']);