From 4f0e74520ceeac45771e946860d53499fa708701 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 24 Sep 2024 16:17:02 -0400
Subject: [PATCH] Removed Destructive delete option in assets, Added Delete to
 assets if archived

---
 client_assets.php  | 8 +++-----
 client_vendors.php | 6 +++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client_assets.php b/client_assets.php
index 530490a0..7c3569ee 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -592,6 +592,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                     <a class="dropdown-item text-info" href="post.php?unarchive_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
                                                         <i class="fas fa-fw fa-redo mr-2"></i>Unarchive
                                                     </a>
+                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
+                                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                                    </a>
                                                     <?php } else { ?>
                                                     <a class="dropdown-item" href="#" data-toggle="modal" data-target="#transferAssetModal<?php echo $asset_id; ?>">
                                                         <i class="fas fa-fw fa-arrow-right mr-2"></i>Transfer
@@ -600,11 +603,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                                         <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                                     </a>
                                                     <?php } ?>
-                                                    <?php if ($config_destructive_deletes_enable) { ?>
-                                                    <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_asset=<?php echo $asset_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                                        <i class="fas fa-fw fa-archive mr-2"></i>Delete
-                                                    </a>
-                                                    <?php } ?>
 
                                                 <?php } ?>
                                             </div>
diff --git a/client_vendors.php b/client_vendors.php
index 8fedb10c..20268f8a 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -121,7 +121,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Description <?php if ($sort == 'vendor_description') { echo $order_icon; } ?>
                                 </a>
                             </th>
-                            <th>Contact</th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_contact_name&order=<?php echo $disp; ?>">
+                                    Contact <?php if ($sort == 'vendor_contact_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_website&order=<?php echo $disp; ?>">
                                     Website <?php if ($sort == 'vendor_website') { echo $order_icon; } ?>