Skip to content

Feature/kustom 78 Skip missing shipping info when not provided #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaimohe wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Feature/kustom 78 Skip missing shipping info when not provided #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6eeed7
KUSTOM-78 Skip sending shipping info when no tracking is provided
vaimohe Jun 2, 2026
51efd2e
KUSTOM-78 Minor cs
vaimohe Jun 2, 2026
b38c5bc
KUSTOM-78 Unify
vaimohe Jun 2, 2026
cd4e1a2
KUSTOM-78 Support for previous format
vaimohe Jun 2, 2026
46d9245
KUSTOM-78 Removed changelog
vaimohe Jun 2, 2026
a2e2d39
KUSTOM-78: Adjusted one of the new integration tests to not use expli…
jooname Jun 8, 2026
00cce33
KUSTOM-78: One more test adjustment, set the test properties as nulla…
jooname Jun 8, 2026
45445c3
KUSTOM-78 Combine messages to support MGO 2.4.9
vaimohe Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions Gateway/Command/Capture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@ public function execute(array $commandSubject)
$this->getValidator()::ACTION_TYPE_CAPTURE
);

$hasTracking = !empty($requestData['tracking']);

// if tracking info is invalid, stop capture
if (!$this->isTrackingInfoValid($requestData['tracking'] ?? null)) {
if ($hasTracking && !$this->isTrackingInfoValid($requestData['tracking'])) {
return null;
}

Expand All @@ -122,7 +124,7 @@ public function execute(array $commandSubject)
$requestData = $requestData->toArray();
}

if ($this->isProcessingShipment($requestData, $response)) {
if ($hasTracking && $this->isProcessingShipment($requestData, $response)) {
$this->addShippingInfoToCapture(
$response->getCaptureId(),
$klarnaOrder->getReservationId(),
Expand Down Expand Up @@ -154,9 +156,20 @@ private function addShippingInfoToCapture($captureId, $klarnaOrderId, $trackingD
$invoice->addComment("Shipping info sent to Klarna API", false, false);
return;
}
foreach ($response->getErrorMessages() as $message) {
$invoice->addComment($message, false, false);

$errorMessages = $response->getErrorMessages();

if (!$errorMessages) {
return;
}

$errorMessages = \implode('. ', $errorMessages);

$invoice->addComment(
"Received error(s) when sending shipping info to Kustom API: {$errorMessages}.",
notify: false,
visibleOnFront: false
);
}

/**
Expand All @@ -166,13 +179,11 @@ private function addShippingInfoToCapture($captureId, $klarnaOrderId, $trackingD
* @param DataObject $response
* @return bool
*/
private function isProcessingShipment(array $requestData, DataObject
$response): bool
private function isProcessingShipment(array $requestData, DataObject $response): bool
{
if (isset($requestData['invoice']['do_shipment'])
&& $requestData['invoice']['do_shipment'] === "1"
&& $response->getCaptureId()
&& $this->isTrackingInfoValid($requestData['tracking'] ?? null)) {
&& $response->getCaptureId()) {
return true;
}
return false;
Expand All @@ -181,15 +192,11 @@ private function isProcessingShipment(array $requestData, DataObject
/**
* Validate tracking info
*
* @param array|null $trackingInformation
* @param array $trackingInformation
* @return bool
*/
private function isTrackingInfoValid(?array $trackingInformation): bool
private function isTrackingInfoValid(array $trackingInformation): bool
{
if ($trackingInformation === null) {
return true;
}

foreach ((array) $trackingInformation as $info) {
if (empty($info['carrier_code'])
|| empty($info['title'])
Expand Down
4 changes: 3 additions & 1 deletion Model/Api/OrderManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,9 @@ private function prepareShippingInfo(array $shippingInfo)
/**
* Get Api Accepted shipping method,For merchant who implement this feature
* Create Plugin to overwrite this default method code
* Allowed values matches (PickUpStore|Home|BoxReg|BoxUnreg|PickUpPoint|Own)
* Allowed values matches (PickUpStore|Home|BoxReg|BoxUnreg|PickUpPoint|Own|Postal|DHLPackstation|Digital
* |Undefined|PickUpWarehouse|ClickCollect|PalletDelivery)
* Doc: https://docs.kustom.co/contents/api/order-management/orders/appendordershippinginfo
*
* @param array $shipping
* @return string
Expand Down
Loading