From 72d69f6d885d6040b7b9458fe44dcd18926c40ad Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 14 Dec 2023 07:10:24 +0000
Subject: [PATCH] Fixed "mark as sent" to not overwrite the method (only if
 empty)

---
 application/models/Logbook_model.php    | 34 +++++++++++++++----------
 application/views/qslprint/qslprint.php |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index a58d3111..a9adb4db 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1483,22 +1483,28 @@ class Logbook_model extends CI_Model {
 
 
   // Set Paper to sent
-  function paperqsl_update_sent($qso_id, $method) {
-	  if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
+	function paperqsl_update_sent($qso_id, $method) {
+		if ($this->logbook_model->check_qso_is_accessible($qso_id)) {
+			if ($method != '') {
+				$data = array(
+					'COL_QSLSDATE' => date('Y-m-d H:i:s'),
+					'COL_QSL_SENT' => 'Y',
+					'COL_QSL_SENT_VIA' => $method
+				);
+			} else {
+				$data = array(
+					'COL_QSLSDATE' => date('Y-m-d H:i:s'),
+					'COL_QSL_SENT' => 'Y'
+				);
+			}
 
-		  $data = array(
-			  'COL_QSLSDATE' => date('Y-m-d H:i:s'),
-			  'COL_QSL_SENT' => 'Y',
-			  'COL_QSL_SENT_VIA' => $method
-		  );
+			$this->db->where('COL_PRIMARY_KEY', $qso_id);
 
-		  $this->db->where('COL_PRIMARY_KEY', $qso_id);
-
-		  $this->db->update($this->config->item('table_name'), $data);
-	  } else {
-		  return;
-	  }
-  }
+			$this->db->update($this->config->item('table_name'), $data);
+		} else {
+			return;
+		}
+	}
 
 
   // Set Paper to requested
diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php
index 4ed37517..e4dd681a 100644
--- a/application/views/qslprint/qslprint.php
+++ b/application/views/qslprint/qslprint.php
@@ -56,7 +56,7 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
 		echo '<td style=\'text-align: center\'><span class="badge text-bg-light">' . $qsl->station_callsign . '</span></td>';
 		echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
-		echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \'B\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
+		echo '<td style=\'text-align: center\'><button onclick="mark_qsl_sent(\''.$qsl->COL_PRIMARY_KEY.'\', \''. $qsl->COL_QSL_SENT_VIA. '\')" class="btn btn-sm btn-success"><i class="fa fa-check"></i></button></td>';
 		echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>';
 		echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
 		echo '</tr>';