Delivery note URL fix, docker fixes

Dockerfile

@@ -1,37 +1,39 @@
 # Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
 FROM debian:stretch-slim
 
-ARG VERSION
-ENV VERSION $VERSION
-
 ARG DEBIAN_FRONTEND=noninteractive
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         curl \
         ca-certificates \
-        gnupg2 \
+        gnupg2
-    && curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
+
-    && echo "deb http://apt.verdnatura.es/ jessie main" \
+# Apache
-        > /etc/apt/sources.list.d/vn.list \
+
-    && apt-get update \
+RUN apt-get install -y --no-install-recommends \
-    && apt-get install -y --no-install-recommends \
         apache2 \
         libapache2-mod-php \
-    && rm -rf /var/lib/apt/lists/* \
     && . /etc/apache2/envvars \
     && ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log" \
     && ln -sfT /dev/stdout "$APACHE_LOG_DIR/access.log" \
     && ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs \
-    && rm -rf /var/lib/apt/lists/*
-
 RUN a2dissite 000-default
 
-# Precaching dependencies
+# NodeJs
-RUN apt-get update \
+
-    && apt-get install -y --no-install-recommends \
+RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs
+
+# Hedera
+
+RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
+    && echo "deb http://apt.verdnatura.es/ jessie main" \
+        > /etc/apt/sources.list.d/vn.list \
+    && apt-get update
+
+RUN apt-get install -y --no-install-recommends \
         php-image-text \
         php-text-captcha \
         php-apcu \
@@ -40,7 +42,10 @@ RUN apt-get update \
         cron
 
 ARG BUILD_ID=unknown
+ARG VERSION
+ENV VERSION $VERSION
 RUN echo $VERSION
+
 RUN apt-get update \
     && apt-get install -y php-vn-lib hedera-web=$VERSION \
     && rm -rf /var/lib/apt/lists/*

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.408.7) stable; urgency=low
+hedera-web (1.408.17) stable; urgency=low
 
   * Initial Release.
 

debian/control

@@ -5,7 +5,7 @@ Build-Depends: build-essential, debhelper, nodejs
 Standards-Version: 3.9.3
 Section: misc
 Homepage: https://verdnatura.es
-Vcs-Git: https://git.verdnatura.es/hedera-web
+Vcs-Git: https://gitea.verdnatura.es/verdnatura/hedera-web
 
 Package: hedera-web
 Architecture: all

debian/copyright

@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
 Name: hedera-web
-Source: git://www.verdnatura.es/var/git/hedera-web
+Source: https://gitea.verdnatura.es/verdnatura/hedera-web
 
 Files: *
 Copyright: 2011-2015 Juan Ferrer Toribio <juan@verdnatura.es>

forms/ecomerce/ticket/ticket.js

@@ -21,11 +21,10 @@ Hedera.Ticket = new Class({
 	onPrintClick: function() {
 		let params = Vn.Url.makeUri({
 			authorization: this.conn.token,
-			ticketId: this.$('ticket-id').value,
 			recipientId: this.gui.user.id,
 			type: 'deliveryNote'
 		});
-		window.open(`/api/report/delivery-note?${params}`);
+		window.open(`/api/Tickets/${this.$('ticket-id').value}/delivery-note-pdf?${params}`);
 	},
 
 	repeaterFunc: function(res, form) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.408.7",
+  "version": "1.408.17",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {