wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Shelves width fixed

This commit is contained in:
Juan Ferrer 2019-09-13 13:11:15 +02:00
parent 0477449c46
commit 1029660760
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

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

2
debian/postinst vendored
View File

@ -10,6 +10,6 @@ then
apache2_invoke enconf hedera-web.conf apache2_invoke enconf hedera-web.conf
fi fi
#service php7.3-fpm restart service php7.3-fpm restart
service cron restart service cron restart

2
package.json
View File

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

6
reports/shelves-report/shelves-report.js
View File

@ -73,9 +73,9 @@ Hedera.ShelvesReport = new Class({
,name: res.get('Article') ,name: res.get('Article')
,packing: res.get('packing') ,packing: res.get('packing')
,amount: res.get('etiquetas') ,amount: res.get('etiquetas')
,boxHeight: res.get('z') * boxScale ,boxHeight: res.get('height') * boxScale
,boxWidth: res.get('x') * boxScale ,boxWidth: res.get('width') * boxScale
,boxDepth: res.get('y') * boxScale ,boxDepth: res.get('depth') * boxScale
}); });
} else { } else {
remainings.push({ remainings.push({

6
rest/misc/mail.php
View File

@ -24,7 +24,11 @@ class Mail extends Vn\Lib\Method {
try { try {
$mail = $mailer->createObject($row->sender, $row->body, $row->subject); $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)) { if (!empty($row->attachment)) {
$attachment = "$pdfsDir/{$row->attachment}"; $attachment = "$pdfsDir/{$row->attachment}";