Merge branch 'bugfix' into RC

LibreBooking · Feb 19, 2021 · 3e0f02a · 3e0f02a
2 parents 937eed3 + 70847bd
commit 3e0f02a
Show file tree

Hide file tree

Showing 6 changed files with 548 additions and 300 deletions.
diff --git a/Web/scripts/jsPDF/jspdf.min.js b/Web/scripts/jsPDF/jspdf.min.js
diff --git a/Web/scripts/jsPDF/jspdf.plugin.autotable.min.js b/Web/scripts/jsPDF/jspdf.plugin.autotable.min.js
diff --git a/Web/scripts/jsPDF/jspdf.umd.min.js b/Web/scripts/jsPDF/jspdf.umd.min.js
diff --git a/Web/scripts/jsPDF/jspdf.umd.min.js.map b/Web/scripts/jsPDF/jspdf.umd.min.js.map
diff --git a/tpl/Reservation/pdf.tpl b/tpl/Reservation/pdf.tpl
@@ -1,3 +1,5 @@
+window.jsPDF = window.jspdf.jsPDF;
+
 var pdfDocument = new jsPDF();
 
 var logo = new Image();
@@ -87,7 +89,7 @@ pdfDocument.autoTable({
 			{ 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}	
-		[{ content: '{translate key=RepeatUntilPrompt}', styles: { fontStyle: 'bold'}},
+		[{ content: '{translate key=RepeatUntilPrompt|escape:'javascript'}', styles: { fontStyle: 'bold'}},
 		 { colSpan: 3, content: '{formatdate date=$RepeatTerminationDate}'},	 
 		],
 	{/if}
@@ -262,7 +264,7 @@ pdfDocument.autoTable({
   styles: { lineWidth: 0.02},
   theme: 'plain',
     body: [
-	[{ content: '{translate key=Attachments} ({$Attachments|count})', styles: { fontStyle: 'bold'}},
+	[{ content: '{translate key=Attachments|escape:'javascript'} ({$Attachments|count})', styles: { fontStyle: 'bold'}},
 	],
 	{foreach from=$Attachments item=attachment}
 	[{ content: '{$attachment->FileName()|escape:'javascript'}'},
@@ -278,7 +280,7 @@ pdfDocument.autoTable({
   columnStyles: { 1: { cellWidth: 10}},
   theme: 'plain',
     body: [
-	[{ content: '{translate key=IAccept} {translate key=TheTermsOfService}', styles: { fontStyle: 'bold'}},
+	[{ content: '{translate key=IAccept|escape:'javascript'} {translate key=TheTermsOfService}', styles: { fontStyle: 'bold'}},
 	 { content: 'X', styles: { fontStyle: 'bold', halign: 'center'}},
 	],
 	]

diff --git a/tpl/Reservation/pdf_libraries.tpl b/tpl/Reservation/pdf_libraries.tpl
@@ -1,2 +1,2 @@
-{jsfile src="jsPDF/jspdf.min.js"}
+{jsfile src="jsPDF/jspdf.umd.min.js"}
 {jsfile src="jsPDF/jspdf.plugin.autotable.min.js"}