From 41413a224f3d3f81a3ee017d308157d503d76d1c Mon Sep 17 00:00:00 2001
From: cp6 <cp6@users.noreply.github.com>
Date: Tue, 4 Oct 2022 11:13:57 +1100
Subject: [PATCH] Updated server fixed server_type & virt

Updated server fixed server_type & virt
Merged server_type & virt into just server_type
Updated serviceServerType() for paramater types and a short/long return value
---
 app/Models/Server.php                    | 10 +++-
 resources/views/servers/create.blade.php | 28 ++++------
 resources/views/servers/edit.blade.php   | 66 ++++++++++--------------
 resources/views/servers/show.blade.php   |  2 +-
 4 files changed, 47 insertions(+), 59 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index c19d8d0..0d059ed 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -68,19 +68,27 @@ class Server extends Model
         });
     }
 
-    public static function serviceServerType($type)
+    public static function serviceServerType(int $type, bool $short = true): string
     {
         if ($type === 1) {
             return "KVM";
         } elseif ($type === 2) {
             return "OVZ";
         } elseif ($type === 3) {
+            if (!$short) {
+                return "Dedicated";
+            }
             return "DEDI";
         } elseif ($type === 4) {
             return "LXC";
         } elseif ($type === 6) {
             return "VMware";
+        } elseif ($type === 7) {
+            return "NAT";
         } else {
+            if (!$short) {
+                return "Semi-dedicated";
+            }
             return "SEMI-DEDI";
         }
     }
diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php
index a078c85..4b72fe1 100644
--- a/resources/views/servers/create.blade.php
+++ b/resources/views/servers/create.blade.php
@@ -35,14 +35,16 @@
                     </div>
                     <div class="col-12 col-lg-3 mb-4">
                         <div class="input-group">
-                            <div class="input-group-prepend"><span class="input-group-text">Type</span></div>
+                            <div class="input-group-prepend"><span class="input-group-text">Server type</span></div>
                             <select class="form-control" name="server_type">
-                                <option value="1" selected>VPS</option>
-                                <option value="2">Dedicated</option>
-                                <option value="3">Semi Dedicated</option>
-                                <option value="4">NAT</option>
-                            </select>
-                        </div>
+                                <option value="1" selected>KVM</option>
+                                <option value="2">OVZ</option>
+                                <option value="3">DEDI</option>
+                                <option value="4">LXC</option>
+                                <option value="5">SEMI-DEDI</option>
+                                <option value="6">VMware</option>
+                                <option value="7">NAT</option>
+                            </select></div>
                     </div>
                     <div class="col-12 col-lg-3 mb-4">
                         <x-os-select>
@@ -84,18 +86,6 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div class="col-12 col-lg-3 mb-4">
-                        <div class="input-group">
-                            <div class="input-group-prepend"><span class="input-group-text">Virt</span></div>
-                            <select class="form-control" name="virt">
-                                <option value="1" selected="">KVM</option>
-                                <option value="2">OVZ</option>
-                                <option value="3">DEDI</option>
-                                <option value="4">LXC</option>
-                                <option value="5">SEMI-DEDI</option>
-                                <option value="6">VMware</option>
-                            </select></div>
-                    </div>
                     <div class="col-12 col-lg-3 mb-4">
                         <x-number-input>
                             <x-slot name="title">SSH</x-slot>
diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php
index b39b263..67cada8 100644
--- a/resources/views/servers/edit.blade.php
+++ b/resources/views/servers/edit.blade.php
@@ -31,43 +31,7 @@
                     </div>
                     <div class="col-12 col-lg-3 mb-4">
                         <div class="input-group">
-                            <div class="input-group-prepend"><span class="input-group-text">Type</span></div>
-                            <select class="form-control" name="server_type">
-                                <option value="1" selected>VPS</option>
-                                <option value="2">Dedicated</option>
-                                <option value="3">Semi Dedicated</option>
-                                <option value="4">NAT</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="col-12 col-lg-3 mb-4">
-                        <x-os-select>
-                            <x-slot name="current">{{$server_data->os_id}}</x-slot>
-                        </x-os-select>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-12 col-lg-3 mb-4">
-                        <x-text-input>
-                            <x-slot name="title">NS1</x-slot>
-                            <x-slot name="name">ns1</x-slot>
-                            <x-slot name="max">255</x-slot>
-                            <x-slot name="value">{{ $server_data->ns1 }}</x-slot>
-                        </x-text-input>
-                    </div>
-                    <div class="col-12 col-lg-3 mb-4">
-                        <x-text-input>
-                            <x-slot name="title">NS2</x-slot>
-                            <x-slot name="name">ns2</x-slot>
-                            <x-slot name="max">255</x-slot>
-                            <x-slot name="value">{{ $server_data->ns2 }}</x-slot>
-                        </x-text-input>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-12 col-lg-3 mb-4">
-                        <div class="input-group">
-                            <div class="input-group-prepend"><span class="input-group-text">Virt</span></div>
+                            <div class="input-group-prepend"><span class="input-group-text">Server type</span></div>
                             <select class="form-control" name="server_type">
                                 <option value="1" {{ ($server_data->server_type === 1) ? 'selected' : '' }}>KVM
                                 </option>
@@ -83,9 +47,35 @@
                                 <option value="6" {{ ($server_data->server_type === 6) ? 'selected' : '' }}>
                                     VMware
                                 </option>
+                                <option value="7" {{ ($server_data->server_type === 7) ? 'selected' : '' }}>
+                                    NAT
+                                </option>
                             </select></div>
                     </div>
                     <div class="col-12 col-lg-3 mb-4">
+                        <x-os-select>
+                            <x-slot name="current">{{$server_data->os_id}}</x-slot>
+                        </x-os-select>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12 col-lg-2 mb-4">
+                        <x-text-input>
+                            <x-slot name="title">NS1</x-slot>
+                            <x-slot name="name">ns1</x-slot>
+                            <x-slot name="max">255</x-slot>
+                            <x-slot name="value">{{ $server_data->ns1 }}</x-slot>
+                        </x-text-input>
+                    </div>
+                    <div class="col-12 col-lg-2 mb-4">
+                        <x-text-input>
+                            <x-slot name="title">NS2</x-slot>
+                            <x-slot name="name">ns2</x-slot>
+                            <x-slot name="max">255</x-slot>
+                            <x-slot name="value">{{ $server_data->ns2 }}</x-slot>
+                        </x-text-input>
+                    </div>
+                    <div class="col-12 col-lg-2 mb-4">
                         <x-number-input>
                             <x-slot name="title">SSH</x-slot>
                             <x-slot name="name">ssh_port</x-slot>
@@ -105,7 +95,7 @@
                             <x-slot name="value">{{ $server_data->bandwidth }}</x-slot>
                         </x-number-input>
                     </div>
-                    <div class="col-12 col-lg-3 mb-4">
+                    <div class="col-12 col-lg-2 mb-4">
                         <x-yes-no-select>
                             <x-slot name="title">Promo price</x-slot>
                             <x-slot name="name">was_promo</x-slot>
diff --git a/resources/views/servers/show.blade.php b/resources/views/servers/show.blade.php
index 249667d..9c0f65d 100644
--- a/resources/views/servers/show.blade.php
+++ b/resources/views/servers/show.blade.php
@@ -37,7 +37,7 @@
                             <tr>
                                 <td class="px-2 py-2 font-bold text-muted">Type</td>
                                 <td>
-                                    {{ $server_data->serviceServerType($server_data->server_type) }}
+                                    {{ $server_data->serviceServerType($server_data->server_type, false) }}
                                 </td>
                             </tr>
                             <tr>