From 798249d7f0519ccead5d2fa4684d71d46e424427 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 19 Apr 2019 15:02:48 +0200
Subject: [PATCH] FEAT Maileva final flash

---
 apps/maarch_entreprise/xml/mailevaConfig.xml.default | 1 +
 src/app/action/controllers/ShippingTrait.php         | 2 +-
 src/core/models/CoreConfigModel.php                  | 1 +
 src/frontend/lang/lang-en.ts                         | 4 ++--
 src/frontend/lang/lang-fr.ts                         | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/maarch_entreprise/xml/mailevaConfig.xml.default b/apps/maarch_entreprise/xml/mailevaConfig.xml.default
index 5db8ce9aca8..c700a2cc019 100644
--- a/apps/maarch_entreprise/xml/mailevaConfig.xml.default
+++ b/apps/maarch_entreprise/xml/mailevaConfig.xml.default
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ROOT>
+   <CONNECTION_URI>https://api.sandbox.aws.maileva.net</CONNECTION_URI>
    <URI>https://api.sandbox.aws.maileva.net</URI>
    <CLIENT_ID>ed7637a582ea422d90a8f8753079a386</CLIENT_ID>
    <CLIENT_SECRET>abb3ebc779e84291aa4a06e7f36034ec</CLIENT_SECRET>
diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 3562bb8276c..9d5ea91775b 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -101,7 +101,7 @@ trait ShippingTrait
         }
 
         $curlAuth = CurlModel::execSimple([
-            'url'           => $mailevaConfig['uri'] . '/authentication/oauth2/token',
+            'url'           => $mailevaConfig['connectionUri'] . '/authentication/oauth2/token',
             'basicAuth'     => ['user' => $mailevaConfig['clientId'], 'password' => $mailevaConfig['clientSecret']],
             'headers'       => ['Content-Type: application/x-www-form-urlencoded'],
             'method'        => 'POST',
diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php
index 08301dff8f4..0116319ff72 100755
--- a/src/core/models/CoreConfigModel.php
+++ b/src/core/models/CoreConfigModel.php
@@ -193,6 +193,7 @@ class CoreConfigModel
 
         $mailevaConfig = [];
         if ($loadedXml) {
+            $mailevaConfig['connectionUri'] = (string)$loadedXml->CONNECTION_URI;
             $mailevaConfig['uri']           = (string)$loadedXml->URI;
             $mailevaConfig['clientId']      = (string)$loadedXml->CLIENT_ID;
             $mailevaConfig['clientSecret']  = (string)$loadedXml->CLIENT_SECRET;
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 20acf1ecc0a..5c1780b4998 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -897,8 +897,8 @@ export const LANG_EN = {
     "shipping_color"                            : "Color",
     "shipping_duplexPrinting"                   : "Both sides",
     "shipping_addressPage"                      : "Address page",
-    "shipping_fast"                             : "Fast (J+2)",
-    "shipping_economic"                         : "Economic (J+4)",
+    "shipping_fast"                             : "Lettre grand compte (J+2)",
+    "shipping_economic"                         : "Ecopli grand compte (J+4)",
     "shipping_registered_mail"                  : "Registered mail",
     "shipping_registered_mail_ar"               : "Registered mail AR",
     "shipping_firstPagePrice"                   : "1st page",
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index b1f99b5ff80..6486d2a7d1c 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -924,8 +924,8 @@ export const LANG_FR = {
     "shipping_color"                                    : "Couleur",
     "shipping_duplexPrinting"                           : "Recto verso",
     "shipping_addressPage"                              : "Page porte adresse",
-    "shipping_fast"                                     : "Prioritaire (J+2)",
-    "shipping_economic"                                 : "Economique (J+4)",
+    "shipping_fast"                                     : "Lettre grand compte (J+2)",
+    "shipping_economic"                                 : "Ecopli grand compte (J+4)",
     "shipping_registered_mail"                          : "Recommandé",
     "shipping_registered_mail_ar"                       : "Recommandé AR",
     "shipping_firstPagePrice"                           : "1ère page",
-- 
GitLab