diff --git a/debian/changelog b/debian/changelog index a57c1b4a..38df41d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.406.65) stable; urgency=low +hedera-web (1.406.66) stable; urgency=low * Initial Release. diff --git a/debian/postinst b/debian/postinst index 948ee5e9..f9a46109 100755 --- a/debian/postinst +++ b/debian/postinst @@ -10,6 +10,6 @@ then apache2_invoke enconf hedera-web.conf fi -#service php7.3-fpm restart +service php7.3-fpm restart service cron restart diff --git a/package.json b/package.json index 765b98a0..fadd4476 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.406.65", + "version": "1.406.66", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/reports/shelves-report/shelves-report.js b/reports/shelves-report/shelves-report.js index 5819a702..a4a8bab8 100644 --- a/reports/shelves-report/shelves-report.js +++ b/reports/shelves-report/shelves-report.js @@ -73,9 +73,9 @@ Hedera.ShelvesReport = new Class({ ,name: res.get('Article') ,packing: res.get('packing') ,amount: res.get('etiquetas') - ,boxHeight: res.get('z') * boxScale - ,boxWidth: res.get('x') * boxScale - ,boxDepth: res.get('y') * boxScale + ,boxHeight: res.get('height') * boxScale + ,boxWidth: res.get('width') * boxScale + ,boxDepth: res.get('depth') * boxScale }); } else { remainings.push({ diff --git a/rest/misc/mail.php b/rest/misc/mail.php index 57fa6cfd..66913388 100644 --- a/rest/misc/mail.php +++ b/rest/misc/mail.php @@ -24,7 +24,11 @@ class Mail extends Vn\Lib\Method { try { $mail = $mailer->createObject($row->sender, $row->body, $row->subject); - $mail->AddReplyTo($row->replyTo, $row->replyTo); + + if ($row->replyTo) { + $mail->AddReplyTo($row->replyTo, $row->replyTo); + //$mail->ReturnPath = $row->replyTo; + } if (!empty($row->attachment)) { $attachment = "$pdfsDir/{$row->attachment}";