Skip to content
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

Do not crash when creditmemo does not exist #2684

Merged
merged 2 commits into from
Nov 7, 2022
Merged

Do not crash when creditmemo does not exist #2684

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
241d4d5
Do not crash when creditmemo does not exist
luigifab Nov 6, 2022
b2c5352
Redirect to grid if credit memo does not exist
kiatng Nov 7, 2022
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
6 changes: 5 additions & 1 deletion app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ protected function _initCreditmemo($update = false)
$orderId = $this->getRequest()->getParam('order_id');
if ($creditmemoId) {
$creditmemo = Mage::getModel('sales/order_creditmemo')->load($creditmemoId);
if (!$creditmemo->getId()) {
$this->_getSession()->addError($this->__('The credit memo no longer exists.'));
return false;
}
} elseif ($orderId) {
$data = $this->getRequest()->getParam('creditmemo');
$order = Mage::getModel('sales/order')->load($orderId);
Expand Down Expand Up @@ -193,7 +197,7 @@ public function viewAction()
$this->_setActiveMenu('sales/order')
->renderLayout();
} else {
$this->_forward('noRoute');
$this->_redirect('*/*');
}
}

Expand Down
1 change: 1 addition & 0 deletions app/locale/en_US/Mage_Adminhtml.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
"Cannot add tracking number.","Cannot add tracking number."
"Cannot create an invoice without products.","Cannot create an invoice without products."
"Cannot create credit memo for the order.","Cannot create credit memo for the order."
"The credit memo no longer exists.","The credit memo no longer exists."
"Cannot delete the design change.","Cannot delete the design change."
"Cannot delete tracking number.","Cannot delete tracking number."
"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
Expand Down