s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 06:00:28 +01:00
Code Issues Projects Releases Wiki Activity

Sendcloud error handling

Browse Source
This commit is contained in:
Andreas Palm 2023-01-29 21:11:12 +01:00
parent 3fe2c7a5d9
commit 575ab86157
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Carrier/SendCloud/SendCloudApi.php
View File

@ -77,9 +77,9 @@ class SendCloudApi
$response = $this->sendRequest($uri, null, true, ['parcel' => $parcel->toApiRequest()], [200,400]); $response = $this->sendRequest($uri, null, true, ['parcel' => $parcel->toApiRequest()], [200,400]);
switch ($response['code']) { switch ($response['code']) {
case 200: case 200:
if (isset($response->parcel)) if (isset($response['body']->parcel))
try { try {
return ParcelResponse::fromApiResponse($response->parcel); return ParcelResponse::fromApiResponse($response['body']->parcel);
} catch (Exception $e) { } catch (Exception $e) {
throw new SendcloudApiException(previous: $e); throw new SendcloudApiException(previous: $e);
} }

6
classes/Carrier/SendCloud/SendcloudApiException.php
View File

@ -8,11 +8,11 @@ class SendcloudApiException extends Exception
{ {
public static function fromResponse(array $response) : SendcloudApiException { public static function fromResponse(array $response) : SendcloudApiException {
if (!isset($response['body']) || !is_object($response['body'])) if (!isset($response['body']) || !is_object($response['body']))
return new SendcloudApiException(); return new SendcloudApiException(print_r($response,true));
return new SendcloudApiException( return new SendcloudApiException(
$response['body']->error->message ?? '', print_r($response['body'],true),
$response['body']->error->code ?? 0 $response['code']
); );
} }
} }

2
www/lib/class.versanddienstleister.php
View File

@ -353,7 +353,7 @@ abstract class Versanddienstleister
public function Paketmarke(string $target, string $docType, int $docId): void public function Paketmarke(string $target, string $docType, int $docId): void
{ {
$address = $this->GetAdressdaten($docId, $docType); $address = $this->GetAdressdaten($docId, $docType);
if (isset($_SERVER['HTTP_CONTENT_TYPE']) && ($_SERVER['HTTP_CONTENT_TYPE'] === 'application/json')) { if (isset($_SERVER['CONTENT_TYPE']) && ($_SERVER['CONTENT_TYPE'] === 'application/json')) {
$json = json_decode(file_get_contents('php://input')); $json = json_decode(file_get_contents('php://input'));
$ret = []; $ret = [];
if ($json->submit == 'print') { if ($json->submit == 'print') {

2
www/lib/versandarten/sendcloud.php
View File

@ -131,7 +131,7 @@ class Versandart_sendcloud extends Versanddienstleister
$ret->Errors[] = $result; $ret->Errors[] = $result;
} }
} catch (SendcloudApiException $e) { } catch (SendcloudApiException $e) {
$ret->Errors[] = $e->getMessage(); $ret->Errors[] = strval($e);
} }
return $ret; return $ret;
} }