From 2cb7d2eae03490c7d89a087646f762510625cda4 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 18 Feb 2020 09:46:24 +0100
Subject: [PATCH] FEAT #12091 TIME 0:15 Check if maileva is enabled

---
 src/app/action/controllers/PreProcessActionController.php | 2 ++
 src/app/action/controllers/ShippingTrait.php              | 2 ++
 src/frontend/lang/lang-en.ts                              | 1 +
 src/frontend/lang/lang-fr.ts                              | 1 +
 src/frontend/lang/lang-nl.ts                              | 1 +
 5 files changed, 7 insertions(+)

diff --git a/src/app/action/controllers/PreProcessActionController.php b/src/app/action/controllers/PreProcessActionController.php
index 937983f9d9f..39d17eea345 100755
--- a/src/app/action/controllers/PreProcessActionController.php
+++ b/src/app/action/controllers/PreProcessActionController.php
@@ -632,6 +632,8 @@ class PreProcessActionController
         $mailevaConfig = CoreConfigModel::getMailevaConfiguration();
         if (empty($mailevaConfig)) {
             return $response->withStatus(400)->withJson(['errors' => 'Maileva configuration does not exist', 'errorLang' => 'missingMailevaConfig']);
+        } elseif (!$mailevaConfig['enabled']) {
+            return $response->withStatus(400)->withJson(['errors' => 'Maileva configuration is disabled', 'errorLang' => 'disabledMailevaConfig']);
         }
 
         $data = $request->getParsedBody();
diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 186080182e7..4de6d9e7cc9 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -49,6 +49,8 @@ trait ShippingTrait
         $mailevaConfig = CoreConfigModel::getMailevaConfiguration();
         if (empty($mailevaConfig)) {
             return ['errors' => ['Maileva configuration does not exist']];
+        } elseif (!$mailevaConfig['enabled']) {
+            return ['errors' => ['Maileva configuration is disabled']];
         }
         $shippingTemplate = ShippingTemplateModel::getById(['id' => $args['data']['shippingTemplateId']]);
         if (empty($shippingTemplate)) {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 9c2dbd66361..77f41160426 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -539,6 +539,7 @@ export const LANG_EN = {
     "missingBasket"                         : "Select the baskets wish you want to delete the redirection.",
     "missingChoose"                         : "Do you want to reactivate your account ?",
     "missingMailevaConfig"                  : "Maileva configuration does not exist",
+    "disabledMailevaConfig"                 : "Maileva configuration is disabled",
     "modelUpdated"                          : "Model updated",
     "modificationSaved"                     : "Modification has been saved",
     "modifiedBy"                            : "Modified by",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index b20bab02a6f..27d97e54c31 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -565,6 +565,7 @@ export const LANG_FR = {
     "missingBasket"                         : "Sélectionner les bannettes pour lesquelles vous souhaitez supprimer la redirection :",
     "missingChoose"                         : "Souhaitez-vous réactiver votre compte ?",
     "missingMailevaConfig"                  : "La configuration Maileva n'existe pas",
+    "disabledMailevaConfig"                 : "La configuration Maileva est désactivé",
     "modelUpdated"                          : "Le Modèle a été mis à jour",
     "modificationSaved"                     : "Modification enregistrée",
     "modifiedBy"                            : "Modifié par",
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 498ca31249b..20d4bd5e858 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -555,6 +555,7 @@ export const LANG_NL = {
     "missingBasket"                         : "_TO_TRANSLATE",
     "missingChoose"                         : "Wenst u uw account opnieuw te activeren?",
     "missingMailevaConfig"                  : "Maileva configuration does not exist _TO_TRANSLATE",
+    "disabledMailevaConfig"                 : "Maileva configuration is disabled",//TRANSLATE
     "modelUpdated"                          : "Het model werd bijgewerkt",
     "modificationSaved"                     : "Wijziging bewaard",
     "modifiedBy"                            : "Modified by", //_TO_TRANSLATE
-- 
GitLab