Merge pull request #118 from magebitcom/feature/MB-21905

Feature/mb 21905

Author: heinrikslecis

Controller/AbstractAction.php

@@ -164,18 +164,12 @@ public function __construct(
      */
     public function findOrder(string $id)
     {
-        $filters[] = $this->filterBuilder
-            ->setField('quote_id')
-            ->setConditionType('eq')
-            ->setValue($id)
-            ->create();
-
-        $this->searchCriteriaBuilder->addFilters($filters);
+        $this->searchCriteriaBuilder->addFilter('quote_id', $id)->addFilter('status', 'canceled, closed', 'nin');
 
         $searchCriteria = $this->searchCriteriaBuilder->create();
         $order = $this->orderRepository->getList($searchCriteria)->getItems();
         /** @var Order $order */
-        $order = current($order);
+        $order = end($order);
 
         if (!$order || $order && !$order->getId()) {
             throw new NotFoundException(__('Can\'t find order'));

Controller/Checkout/Api.php

@@ -28,8 +28,8 @@ public function execute()
     {
         $responseBody = $this->driver->fileGetContents('php://input');
         $result = $this->resultRawFactory->create()->setContents('');
-
         if (empty($responseBody)) {
+            $this->logger->error('Response: ' . $responseBody);
             return $result;
         }
 
@@ -43,8 +43,8 @@ public function execute()
         );
 
         if ($leanpayData['md5Signature'] != $md5Secret) {
-            $this->logger->addError('Response: ' . $responseBody);
-            $this->logger->addError('My md5: ' . $md5Secret);
+            $this->logger->error('Response: ' . $responseBody);
+            $this->logger->error('My md5: ' . $md5Secret);
             return $result;
         }
 
@@ -61,7 +61,7 @@ public function execute()
                     break;
             }
         } catch (Exception $exception) {
-            $this->logger->addError(
+            $this->logger->error(
                 'There was error while trying to parse Leanpay API data: ' . $exception->getMessage()
             );
         }

composer.json

@@ -6,7 +6,7 @@
         "magento/framework": ">=103.0.1"
     },
     "type": "magento2-module",
-    "version": "0.5.0",
+    "version": "0.6.0",
     "autoload": {
         "files": [
             "registration.php"