fix: Update order status for failed orders when auto-cancel is disabl…

…ed (#36)
Nofraud · Aug 31, 2023 · 0bb3820 · 0bb3820
1 parent 121e0f3
commit 0bb3820
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/Cron/OrderFraudStatus.php b/Cron/OrderFraudStatus.php
@@ -161,6 +161,17 @@ public function updateOrdersFromNoFraudApiResult($orders, $storeId)
                                 }
                                 continue;
                             }
+                        } else {
+                            if (isset($decision) && ($decision == 'fail' || $decision == "fraudulent")) {
+                                    if (!empty($newStatus)) {
+                                        $this->dataHelper->addDataToLog("Updating Order#" . $order['increment_id'] . " to " . $newStatus);
+                                        $this->orderProcessor->updateOrderStatusFromNoFraudResult($newStatus, $order, $response);
+                                    }
+                                    $order->setNofraudStatus($decision);
+                                    $order->save();
+                                }
+                                continue;
+                            }
                         }
                         if (isset($decision) && ($decision == 'pass')) {
                             if (!empty($newStatus)) {

diff --git a/Observer/SalesOrderPaymentPlaceEnd.php b/Observer/SalesOrderPaymentPlaceEnd.php
@@ -184,17 +184,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $nofraudDecision = $resultMap['http']['response']['body']['decision'] ?? "";
                 if (isset($nofraudDecision) && !empty($nofraudDecision)) {
                     $newStatus = $this->orderProcessor->getCustomOrderStatus($resultMap['http']['response'], $storeId);
-                    if (isset($nofraudDecision) && ($nofraudDecision == 'error')) {
-                        if (!empty($newStatus)) {
-                            $this->orderProcessor->updateOrderStatusFromNoFraudResult($newStatus, $order, $resultMap);
-                        }
-                    }
-                    if (isset($nofraudDecision) && ($nofraudDecision == 'pass')) {
-                        if (!empty($newStatus)) {
-                            $this->orderProcessor->updateOrderStatusFromNoFraudResult($newStatus, $order, $resultMap);
-                        }
-                    }
-                    if (isset($nofraudDecision) && ($nofraudDecision == 'review')) {
+                    if (!empty($newStatus)) {
                         $this->orderProcessor->updateOrderStatusFromNoFraudResult($newStatus, $order, $resultMap);
                     }
                 } else {
@@ -212,10 +202,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $order->save();
 
             // If order fails screening and auto-cancel is enabled in admin config, cancel the order
-            if ($this->configHelper->getAutoCancel($storeId)) {
-                if (isset($nofraudDecision) && $nofraudDecision == 'fail') {
-                    $this->orderProcessor->handleAutocancel($order, $nofraudDecision);
-                }
+            if ($this->configHelper->getAutoCancel($storeId) && isset($nofraudDecision) && $nofraudDecision == 'fail') {
+                $this->orderProcessor->handleAutocancel($order, $nofraudDecision);
             }
         } catch (\Exception $exception) {
             $this->logger->logFailure($order, $exception);