From 49202167d1390679c3c39d8034dbe2ff62d3af22 Mon Sep 17 00:00:00 2001 From: cats-shadow Date: Mon, 10 Feb 2025 13:30:22 +0300 Subject: [PATCH] Add some flexibility to compose QSL labels --- application/controllers/Labels.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/application/controllers/Labels.php b/application/controllers/Labels.php index 91bc10f5b..5bc40f559 100644 --- a/application/controllers/Labels.php +++ b/application/controllers/Labels.php @@ -297,7 +297,9 @@ class Labels extends CI_Controller { 'sota' => $qso->station_sota ?? '', 'iota' => $qso->station_iota ?? '', 'pota' => $qso->station_pota ?? '', - 'wwff' => $qso->station_wwff ?? '' + 'wwff' => $qso->station_wwff ?? '', + 'qslmsg' => $qso->COL_QSLMSG ?? '', + ]; } if (!empty($qso_data)) { @@ -377,9 +379,12 @@ class Labels extends CI_Controller { if (!empty($qso['wwff'])) { $ref_text .= "WWFF:".$qso['wwff']; $ref_avail = true;} if ($ref_avail == true) {$text .= $ref_text."\n";} } + if (!empty($qso['qslmsg'])) { $text .= $qso['qslmsg'];} + else { $text .= "Thanks for the QSO".($numofqsos>1 ? 's' : ''); - $text .= " | ".($qso['qsl_recvd'] == 'Y' ? 'TNX' : 'PSE')." QSL"; - $pdf->Add_Label($text,$orientation); } + $text .= " | ".($qso['qsl_recvd'] == 'Y' ? 'TNX' : 'PSE')." QSL";} + $pdf->Add_Label($text,$orientation); } + // New End