Skip to content

Commit

Permalink
Merge pull request #114 from vippsas/publication-2.3.20
Browse files Browse the repository at this point in the history
VIPPS-391: State vs status for cancelled orders
  • Loading branch information
voleye authored Aug 30, 2021
2 parents 1a4ac5b + c272f34 commit f8f54bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Model/TransactionProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ private function cancelOrder($order): void
{
if ($order->getState() === Order::STATE_NEW) {
$this->orderManagement->cancel($order->getEntityId());
} else {
} elseif ($order->getState() === Order::STATE_PAYMENT_REVIEW) {
$connection = $this->resourceConnection->getConnection();
try {
$connection->beginTransaction();
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "magento2-module",
"description": "Vipps Payment Method",
"license": "proprietary",
"version": "2.3.19",
"version": "2.3.20",
"require": {
"magento/framework": "102.0.*",
"magento/module-sales": "102.0.*",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
~ IN THE SOFTWARE.
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Vipps_Payment" setup_version="2.3.19">
<module name="Vipps_Payment" setup_version="2.3.20">
<sequence>
<module name="Magento_Sales" />
<module name="Magento_Payment" />
Expand Down

0 comments on commit f8f54bc

Please sign in to comment.