From e54b57b4adab8a28c56923b088989841ac82023c Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 16 Apr 2019 16:12:52 +0200
Subject: [PATCH] FIX Imcomplete address
---
src/app/action/controllers/PreProcessActionController.php | 2 +-
src/app/action/controllers/ShippingTrait.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index 3ab23b09af3..98331612fac 100644
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -563,7 +563,7 @@ class PreProcessActionController
break;
}
$afnorAddress = ContactController::getContactAfnor($contact[0]);
- if ((empty($afnorAddress[1]) && empty($afnorAddress[2])) || empty($afnorAddress[6])) {
+ if ((empty($afnorAddress[1]) && empty($afnorAddress[2])) || empty($afnorAddress[6]) || !preg_match("/^\d{5}\s/", $afnorAddress[6])) {
$resInfo = ResModel::getExtById(['select' => ['alt_identifier'], 'resId' => $valueResId]);
$canNotSend[] = ['resId' => $valueResId, 'chrono' => $resInfo['alt_identifier'], 'reason' => 'incompleteAddressForPostal', 'attachmentIdentifier' => $attachment['identifier']];
unset($aAttachments[$key]);
diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 1df2b36114f..34847ee2b4c 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -94,7 +94,7 @@ trait ShippingTrait
return ['errors' => ['Contact country is not France']];
}
$afnorAddress = ContactController::getContactAfnor($contact[0]);
- if ((empty($afnorAddress[1]) && empty($afnorAddress[2])) || empty($afnorAddress[6])) {
+ if ((empty($afnorAddress[1]) && empty($afnorAddress[2])) || empty($afnorAddress[6]) || !preg_match("/^\d{5}\s/", $afnorAddress[6])) {
return ['errors' => ['Contact is not fill enough for attachment']];
}
$contacts[] = $afnorAddress;
--
GitLab