Skip to content

B 7.0.x psapc 336 can delete method #268

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
fatchip-Stefan wants to merge 2 commits into
base: b-7.0.x_PSAPC-327
Choose a base branch
from
Open

B 7.0.x psapc 336 can delete method #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888263a
0131999: fixed canDelete returning only false
fatchip-Stefan Apr 8, 2026
bcbe11d
0131999: fixed canDelete returning only false
fatchip-Stefan Apr 10, 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
3 changes: 1 addition & 2 deletions src/Core/AmazonService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,8 +785,7 @@ public function processCancel(string $orderId)
if ($result['status'] !== 200) {
$exception = oxNew(InputException::class, 'AmazonPay: ' . $response['message']);
Registry::getUtilsView()->addErrorToDisplay($exception, false, false, '', 'order_overview');

return;
throw $exception;
}

if ($response['statusDetails']['state'] === 'Canceled') {
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Repository/LogRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public function findLogMessageForChargePermissionId(
public function findLogMessageForOrderId(string $orderId): array
{
return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getAll(
'SELECT * FROM ' . self::TABLE_NAME . ' WHERE OSC_AMAZON_OXORDERID = ? ORDER BY OXTIMESTAMP',
'SELECT * FROM ' . self::TABLE_NAME . ' WHERE OSC_AMAZON_OXORDERID = ? ORDER BY OXTIMESTAMP DESC',
[$orderId]
);
}
Expand Down Expand Up @@ -228,7 +228,7 @@ public function updateOrderStatus(string $orderId, string $transStatus = 'OK', s
*/
public function deleteLogMessageByOrderId(string $orderId)
{
$sql = 'DELETE FROM ' . self::TABLE_NAME . ' WHERE OSC_AMAZON_OXORDERID =' . $orderId;
$sql = 'DELETE FROM ' . self::TABLE_NAME . ' WHERE OSC_AMAZON_OXORDERID = "' . $orderId . '"';
DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->execute(
$sql
);
Expand Down
13 changes: 9 additions & 4 deletions src/Model/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,11 @@ public function delete($oxid = null)
if (!$this->canDeleteAmazonOrder($oxid)) {
return false;
}

OxidServiceProvider::getAmazonService()->processCancel($oxid);
try {
OxidServiceProvider::getAmazonService()->processCancel($oxid);
} catch (InputException $e) {
return;
}
$repository = oxNew(LogRepository::class);
$repository->deleteLogMessageByOrderId($oxid);
}
Expand Down Expand Up @@ -304,7 +307,9 @@ private function canDeleteAmazonOrder(string $oxid = ''): bool
[
'Captured',
'Completed & Captured',
'Refunded'
'Refunded',
// leading to errors when 2 step capture is active
'RefundInitiated',
]
)
) {
Expand All @@ -313,6 +318,6 @@ private function canDeleteAmazonOrder(string $oxid = ''): bool
Registry::getUtilsView()->addErrorToDisplay($deleteError);
return false;
}
return false;
return true;
}
}
Loading