Skip to content

fix: include conditionally displaying title and description #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnVillalovos merged 3 commits into from
Feb 3, 2026
Merged

fix: include conditionally displaying title and description #941

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c62759
fix: include conditionally displaying title and description
JensWendt Feb 2, 2026
621a429
fix: better NULL check implemented
JensWendt Feb 3, 2026
d783ecf
fix: better NULL check implementation
JensWendt Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tpl/Reservation/pdf.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ function GetSelectedResourceIds() {
});
return resourceIds;
}

function LoadCustomAttributesData() {
var url = 'ajax/reservation_attributes_print.php?uid=' + $('#userId').val() + '&rn=' + $('#referenceNumber').val() + '&ro=' + $('#reservation-box').hasClass('readonly');

var resourceIds = GetSelectedResourceIds();
_.each(resourceIds, function (n) {
url += '&rid[]=' + n;
});

return $.ajax({
global: false,
url: url,
Expand Down Expand Up @@ -97,12 +97,12 @@ $('.btnPDF').click(function (e) {
{ content: '{formatdate date=$EndDate key=embedded_datetime}'},
],
[{ content: '{translate key=ReservationLength}', styles: { fontStyle: 'bold'}},
{ colSpan: 3, content: durationText},
{ colSpan: 3, content: durationText},
],
[{ content: '{translate key=RepeatPrompt}', styles: { fontStyle: 'bold'}},
{if $IsRecurring}
{ content: '{translate key=$RepeatOptions[$RepeatType]['key']}'},
{ content: '{$RepeatInterval}'},
{ content: '{$RepeatInterval}'},
{ content: '{translate key=$RepeatOptions[$RepeatType]['everyKey']}'},
{else}
{ colSpan: 3, content: '{translate key=$RepeatOptions[$RepeatType]['key']}'},
Expand All @@ -122,9 +122,9 @@ $('.btnPDF').click(function (e) {
[{ content: daysText, styles: { fontStyle: 'bold'}},
{ colSpan: 3, content: '{foreach from=$RepeatWeekdays item=day name=weekdaysLoop}{if $smarty.foreach.weekdaysLoop.last}{translate key=$DayNames[$day]}{else}{translate key=$DayNames[$day]},{/if} {/foreach}'},
],
{/if}
{/if}
[{ content: '{{translate key=RepeatUntilPrompt}|escape:'javascript'}', styles: { fontStyle: 'bold'}},
{ colSpan: 3, content: '{formatdate date=$RepeatTerminationDate}'},
{ colSpan: 3, content: '{formatdate date=$RepeatTerminationDate}'},
],
{/if}
],
Expand Down Expand Up @@ -218,11 +218,11 @@ $('.btnPDF').click(function (e) {
body: [
[{ content: '{translate key="ReservationTitle"}', styles: { fontStyle: 'bold'}},
],
[{ content: '{$ReservationTitle|unescape:'html'|escape:'javascript'}'},
[{ content: '{if isset($ReservationTitle)}{$ReservationTitle|unescape:'html'|escape:'javascript'}{/if}'},
],
[{ content: '{translate key="ReservationDescription"}', styles: { fontStyle: 'bold'}},
],
[{ content: '{$Description|unescape:'html'|escape:'javascript'}'},
[{ content: '{if isset($Description)}{$Description|unescape:'html'|escape:'javascript'}{/if}'},
],
]
});
Expand Down