diff --git a/apps/maarch_entreprise/xml/mailevaConfig.xml.default b/apps/maarch_entreprise/xml/mailevaConfig.xml.default index 5db8ce9aca81ee9642709ff46c71c00c5bb26abe..c700a2cc019ee372d15aa85af9645a790b7cf7e9 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 3562bb8276ce14283a56556f9a40200923afb68a..9d5ea91775bfda8f3b1510f7a500bd5f81d737bf 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 08301dff8f4773bd477804c65d0b2183db7f507d..0116319ff72c5f7fa09cc24b40af9e9d4b73f961 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 20acf1ecc0a23bb31301f6fa871202498c137098..5c1780b4998608235c174c18133212f3f63b069b 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 b1f99b5ff8075869e9eeb571d927e8c42030f9f0..6486d2a7d1c1b18c0db43997d8bf70b5435c4f7d 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",