From 11005fef582ea26f63c7fe0cb2d99aacbad87c89 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Wed, 28 Aug 2024 22:11:04 +0100
Subject: [PATCH] Re-order asset purchase and install date fields to make more
 sense

---
 client_asset_add_modal.php  | 21 ++++++++++++---------
 client_asset_edit_modal.php | 22 ++++++++++++----------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index 57c17188..12b514d9 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -314,6 +314,18 @@
                                 </div>
                             </div>
 
+                            <?php if ($_GET['type'] !== 'virtual') { ?>
+                                <div class="form-group">
+                                    <label>Purchase Date</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                        </div>
+                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Install Date</label>
                                 <div class="input-group">
@@ -325,15 +337,6 @@
                             </div>
 
                             <?php if ($_GET['type'] !== 'virtual') { ?>
-                                <div class="form-group">
-                                    <label>Purchase Date</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                                        </div>
-                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31">
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label>Warranty Expire</label>
                                     <div class="input-group">
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 063a6f78..a013b46e 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -336,6 +336,18 @@
                                 </div>
                             </div>
 
+                            <?php if ($asset_type !== 'Virtual Machine') { ?>
+                                <div class="form-group">
+                                    <label>Purchase Date</label>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
+                                        </div>
+                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
+                                    </div>
+                                </div>
+                            <?php } ?>
+
                             <div class="form-group">
                                 <label>Install Date</label>
                                 <div class="input-group">
@@ -347,16 +359,6 @@
                             </div>
 
                             <?php if ($asset_type !== 'Virtual Machine') { ?>
-                                <div class="form-group">
-                                    <label>Purchase Date</label>
-                                    <div class="input-group">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
-                                        </div>
-                                        <input type="date" class="form-control" name="purchase_date" max="2999-12-31" value="<?php echo $asset_purchase_date; ?>">
-                                    </div>
-                                </div>
-
                                 <div class="form-group">
                                     <label>Warranty Expire</label>
                                     <div class="input-group">