From 288749773027f31c292909afe47527f8e06b74d1 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 7 Jul 2022 23:46:18 +0200 Subject: [PATCH] edi/load: fixes --- debian/changelog | 2 +- package.json | 2 +- rest/edi/load.php | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 398de8b7..bb92f91d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.408.5) stable; urgency=low +hedera-web (1.408.6) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index aa6e35e4..767a0a84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.408.5", + "version": "1.408.6", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/edi/load.php b/rest/edi/load.php index 581a222b..4bf49597 100644 --- a/rest/edi/load.php +++ b/rest/edi/load.php @@ -206,25 +206,25 @@ class Load extends Edi\Method { } if ($update) { - $updateExistent = $db->getValue( + $ektFk = $db->getValue( + "SELECT id + FROM ekt + WHERE deliveryNumber = #deliveryNumber + AND entryYear = YEAR(#fec)", + $ediValues + ); + + $canUpdate = $ektFk && $db->getValue( "SELECT COUNT(*) = 0 FROM ekt t JOIN `exchange` b ON b.ektFk = t.id JOIN exchangeConfig c - WHERE t.deliveryNumber = #deliveryNumber - AND t.entryYear = YEAR(#fec) + WHERE t.id = # AND b.typeFk != c.presaleFk", - $ediValues + $ektFk ); - if ($updateExistent) { - $ektFk = $db->getValue( - "SELECT id - FROM ekt - WHERE deliveryNumber = #deliveryNumber - AND entryYear = YEAR(#fec)", - $ediValues - ); + if ($canUpdate) { $db->update('ekt', $insertValues, ['id' => $ektFk]