Merge pull request #514 from mollie/release/2.10.0

Release/2.10.0
mollie · Apr 14, 2022 · 389f21e · 389f21e
2 parents d0a8faa + 3fdf96b
commit 389f21e
Show file tree

Hide file tree

Showing 12 changed files with 998 additions and 687 deletions.
diff --git a/Config.php b/Config.php
@@ -173,7 +173,7 @@ public function getApiKey($storeId = null)
         }
 
         if (!$this->isProductionMode($storeId)) {
-            $apiKey = trim($this->getPath(static::GENERAL_APIKEY_TEST, $storeId));
+            $apiKey = trim($this->getPath(static::GENERAL_APIKEY_TEST, $storeId) ?? '');
             if (empty($apiKey)) {
                 $this->addToLog('error', 'Mollie API key not set (test modus)');
             }
@@ -186,7 +186,7 @@ public function getApiKey($storeId = null)
             return $decryptedApiKey;
         }
 
-        $apiKey = trim($this->getPath(static::GENERAL_APIKEY_LIVE, $storeId));
+        $apiKey = trim($this->getPath(static::GENERAL_APIKEY_LIVE, $storeId) ?? '');
         if (empty($apiKey)) {
             $this->addToLog('error', 'Mollie API key not set (live modus)');
         }
@@ -628,7 +628,7 @@ private function addMethodToPath($path, $method)
     {
         return sprintf(
             $path,
-            str_replace('mollie_methods_', '', $method)
+            str_replace('mollie_methods_', '', $method ?? '')
         );
     }
 }
diff --git a/GraphQL/Resolver/Checkout/ProcessTransaction.php b/GraphQL/Resolver/Checkout/ProcessTransaction.php
@@ -67,32 +67,34 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $result = $this->mollie->processTransaction($tokenModel->getOrderId(), 'success', $token);
 
-        if (isset($result['error'])) {
-            return ['paymentStatus' => 'ERROR'];
+        $cart = null;
+        if ($tokenModel->getCartId()) {
+            $cart = $this->getCart($result['status'], $tokenModel->getCartId());
         }
 
         return [
             'paymentStatus' => strtoupper($result['status']),
-            'cart' => $this->getCart($result['status'], $tokenModel->getCartId()),
+            'cart' => $cart,
         ];
     }
 
-    private function getCart(string $status, ?string $cartId): ?array
+    private function getCart(string $status, string $cartId): ?array
     {
-        if (!$cartId || !in_array($status, [
+        $restoreCart = in_array($status, [
             PaymentStatus::STATUS_EXPIRED,
             PaymentStatus::STATUS_CANCELED,
             PaymentStatus::STATUS_FAILED,
             PaymentStatus::STATUS_PENDING,
-        ])) {
-            return null;
-        }
+        ]);
 
         try {
             $cart = $this->cartRepository->get($cartId);
-            $cart->setIsActive(1);
-            $cart->setReservedOrderId(null);
-            $this->cartRepository->save($cart);
+
+            if ($restoreCart) {
+                $cart->setIsActive(1);
+                $cart->setReservedOrderId(null);
+                $this->cartRepository->save($cart);
+            }
 
             return ['model' => $cart];
         } catch (NoSuchEntityException $exception) {

diff --git a/Helper/General.php b/Helper/General.php
@@ -301,7 +301,7 @@ public function getApiKey($storeId = null)
         $modus = $this->getModus($storeId);
 
         if ($modus == 'test') {
-            $apiKey = trim($this->getStoreConfig(self::XML_PATH_TEST_APIKEY, $storeId));
+            $apiKey = trim($this->getStoreConfig(self::XML_PATH_TEST_APIKEY, $storeId) ?? '');
             if (empty($apiKey)) {
                 $this->addTolog('error', 'Mollie API key not set (test modus)');
             }
@@ -311,7 +311,7 @@ public function getApiKey($storeId = null)
             }
             $this->apiKey[$storeId] = $decryptedApiKey;
         } else {
-            $apiKey = trim($this->getStoreConfig(self::XML_PATH_LIVE_APIKEY, $storeId));
+            $apiKey = trim($this->getStoreConfig(self::XML_PATH_LIVE_APIKEY, $storeId) ?? '');
             if (empty($apiKey)) {
                 $this->addTolog('error', 'Mollie API key not set (live modus)');
             }

diff --git a/Model/Client/Orders.php b/Model/Client/Orders.php
@@ -268,7 +268,7 @@ public function getAddressLine($address)
     {
         return [
             'organizationName' => $address->getCompany(),
-            'title'            => trim($address->getPrefix()),
+            'title'            => trim($address->getPrefix() ?? ''),
             'givenName'        => $address->getFirstname(),
             'familyName'       => $address->getLastname(),
             'email'            => $address->getEmail(),
@@ -334,9 +334,7 @@ public function processTransaction(Order $order, $mollieApi, $type = 'webhook',
     {
         $result = $this->processTransaction->execute($order, $type);
 
-        return [
-            'success' => $result->isSuccess(),
-        ];
+        return $result->toArray();
     }
 
     public function orderHasUpdate(OrderInterface $order, MollieApiClient $mollieApi)

diff --git a/Service/Mollie/TransactionDescription.php b/Service/Mollie/TransactionDescription.php
@@ -37,7 +37,7 @@ public function forRegularTransaction(OrderInterface $order): string
         $storeId = $order->getStoreId();
         $description = $this->config->paymentMethodDescription($order->getPayment()->getMethod(), $storeId);
 
-        if (!trim($description)) {
+        if (!trim($description ?? '')) {
             $description = '{ordernumber}';
         }
 

diff --git a/Service/Order/Lines/Generator/AheadworksAddFreeGift.php b/Service/Order/Lines/Generator/AheadworksAddFreeGift.php
@@ -24,6 +24,10 @@ public function __construct(
 
     public function process(OrderInterface $order, array $orderLines): array
     {
+        if (!$this->hasAheadworksFreeGiftItems($order)) {
+            return $orderLines;
+        }
+
         $discount = 0;
         foreach ($order->getItems() as $item) {
             $discount += abs($item->getAwAfptcAmount());
@@ -48,4 +52,15 @@ public function process(OrderInterface $order, array $orderLines): array
 
         return $orderLines;
     }
+
+    private function hasAheadworksFreeGiftItems(OrderInterface $order): bool
+    {
+        foreach ($order->getItems() as $item) {
+            if ($item->getAwAfptcAmount() !== null) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mollie/magento2",
   "description": "Mollie Payment Module for Magento 2",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "keywords": [
     "mollie",
     "payment",

diff --git a/etc/config.xml b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <payment>
             <mollie_general>
-                <version>v2.9.0</version>
+                <version>v2.10.0</version>
                 <active>0</active>
                 <enabled>0</enabled>
                 <type>test</type>