Merge branch '6334-show-name-to-delete' into 'develop'

Show the client name on the delete confirmation page

Closes #6334

See merge request !1601

interface/web/client/client_del.php

@@ -110,6 +110,11 @@ class page_action extends tform_actions {
 			$table_list = array();
 			$client_group_id = $app->functions->intval($client_group['groupid']);
 			if($client_group_id > 1) {
+
+				$client = $app->db->queryOneRecord("SELECT CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+
+				$app->tpl->setVar('contactname', $client['contactname']);
+
 				foreach($this->tables as $table => $field) {
 					if($table != '') {
 						$records = $app->db->queryAllRecords("SELECT * FROM ?? WHERE sys_groupid = ?", $table, $client_group_id);

interface/web/client/templates/client_del.htm

-<div class='page-header'><h1><tmpl_var name="list_head_txt"></h1></div>
+<div class='page-header'><h1><tmpl_var name="list_head_txt"> <tmpl_var name="contactname"></h1></div>
 <tmpl_if name='number_records'>
 	<tmpl_var name="delete_explanation">:<br /><br />
 	<div class="table-wrapper marginTop15">