diff --git a/apps/maarch_entreprise/xml/mailevaConfig.xml.default b/apps/maarch_entreprise/xml/mailevaConfig.xml.default index 81d9a72d4fa84605ecbe283154ba93661104fefe..da2a8eb7a97cfd942b320796ba07a3e814b6ce36 100644 --- a/apps/maarch_entreprise/xml/mailevaConfig.xml.default +++ b/apps/maarch_entreprise/xml/mailevaConfig.xml.default @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <ROOT> <ENABLED>false</ENABLED> - <CONNECTION_URI>https://api.sandbox.aws.maileva.net</CONNECTION_URI> - <URI>https://api.sandbox.aws.maileva.net</URI> + <CONNECTION_URI>https://api.sandbox.maileva.net</CONNECTION_URI> + <URI>https://api.sandbox.maileva.net</URI> <CLIENT_ID>ed7637a582ea422d90a8f8753079a386</CLIENT_ID> <CLIENT_SECRET>abb3ebc779e84291aa4a06e7f36034ec</CLIENT_SECRET> -</ROOT> \ No newline at end of file +</ROOT> diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php index 06987988f115b2459200e421a862e1749f46a4e7..be6bfb6866aa0a977abab286e64fedfcf65ed4a3 100644 --- a/src/app/action/controllers/ShippingTrait.php +++ b/src/app/action/controllers/ShippingTrait.php @@ -178,7 +178,7 @@ trait ShippingTrait $resId = $resource['res_id']; $createSending = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . '/mail/v1/sendings', + 'url' => $mailevaConfig['uri'] . '/registered_mail/v2/sendings', 'bearerAuth' => ['token' => $token], 'headers' => ['Content-Type: application/json'], 'method' => 'POST', @@ -188,13 +188,14 @@ trait ShippingTrait $errors[] = "Maileva sending creation failed for attachment {$resId}"; continue; } - foreach ($createSending['headers'] as $header) { - if (strpos($header, 'Location:') !== false) { - $sendingId = strrchr($header, '/'); - $sendingId = substr($sendingId, 1); - break; - } - } + $sendingId = $createSending['response']['id']; +// foreach ($createSending['headers'] as $header) { +// if (strpos($header, 'Location:') !== false) { +// $sendingId = strrchr($header, '/'); +// $sendingId = substr($sendingId, 1); +// break; +// } +// } if (empty($sendingId)) { $errors[] = "Maileva sending id not found for attachment {$resId}"; continue; @@ -231,7 +232,7 @@ trait ShippingTrait } $createDocument = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . "/mail/v1/sendings/{$sendingId}/documents", + 'url' => $mailevaConfig['uri'] . "/registered_mail/v2/sendings/{$sendingId}/documents", 'bearerAuth' => ['token' => $token], 'method' => 'POST', 'multipartBody' => ['document' => file_get_contents($pathToDocument), 'metadata' => json_encode(['priority' => 0, 'name' => $resource['title']])] @@ -244,7 +245,7 @@ trait ShippingTrait $recipients = []; if ($resource['type'] == 'attachment') { $createRecipient = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . "/mail/v1/sendings/{$sendingId}/recipients", + 'url' => $mailevaConfig['uri'] . "/registered_mail/v2/sendings/{$sendingId}/recipients", 'bearerAuth' => ['token' => $token], 'headers' => ['Content-Type: application/json'], 'method' => 'POST', @@ -266,7 +267,7 @@ trait ShippingTrait } else { foreach ($contacts[$key] as $contact) { $createRecipient = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . "/mail/v1/sendings/{$sendingId}/recipients", + 'url' => $mailevaConfig['uri'] . "/registered_mail/v2/sendings/{$sendingId}/recipients", 'bearerAuth' => ['token' => $token], 'headers' => ['Content-Type: application/json'], 'method' => 'POST', @@ -289,7 +290,7 @@ trait ShippingTrait } $setOptions = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . "/mail/v1/sendings/{$sendingId}/options", + 'url' => $mailevaConfig['uri'] . "/registered_mail/v2/sendings/{$sendingId}", 'bearerAuth' => ['token' => $token], 'headers' => ['Content-Type: application/json'], 'method' => 'PATCH', @@ -306,7 +307,7 @@ trait ShippingTrait } $submit = CurlModel::execSimple([ - 'url' => $mailevaConfig['uri'] . "/mail/v1/sendings/{$sendingId}/submit", + 'url' => $mailevaConfig['uri'] . "/registered_mail/v2/sendings/{$sendingId}/submit", 'bearerAuth' => ['token' => $token], 'headers' => ['Content-Type: application/json'], 'method' => 'POST' diff --git a/src/app/shipping/controllers/ShippingTemplateController.php b/src/app/shipping/controllers/ShippingTemplateController.php index 0d6b2af6a8f9b3b7b954a7e91dd64ff690b25c88..86d0520b4ee2aef8093e6fccdaea9ae822682184 100755 --- a/src/app/shipping/controllers/ShippingTemplateController.php +++ b/src/app/shipping/controllers/ShippingTemplateController.php @@ -152,6 +152,9 @@ class ShippingTemplateController $body['options'] = json_encode($body['options']); $body['fee'] = json_encode($body['fee']); + foreach ($body['entities'] as $key => $entity) { + $body['entities'][$key] = (string)$entity; + } $body['entities'] = json_encode($body['entities']); $body['account'] = json_encode($body['account']);