Release/1.17.1

Observer/CatalogProductSaveAfter/UpdateSubscriptionProduct.php

@@ -48,8 +48,11 @@ public function execute(Observer $observer)
 
     private function subscriptionTableHasPriceUpdate(ProductInterface $product): bool
     {
-        $old = $this->serializer->unserialize($product->getOrigData('mollie_subscription_table'));
-        $new = $this->serializer->unserialize($product->getData('mollie_subscription_table'));
+        $oldRaw = $product->getOrigData('mollie_subscription_table');
+        $newRaw = $product->getData('mollie_subscription_table');
+
+        $old = $this->safeUnserializeToArray($oldRaw);
+        $new = $this->safeUnserializeToArray($newRaw);
 
         $oldMapping = $this->getIdentifierToPriceMapping($old);
         $newMapping = $this->getIdentifierToPriceMapping($new);
@@ -63,11 +66,46 @@ private function subscriptionTableHasPriceUpdate(ProductInterface $product): boo
         return false;
     }
 
+    /**
+     * Safely convert a serialized value or array into a normalized array.
+     * - Null/empty/false values are treated as empty arrays
+     * - Already-array values are returned as-is
+     * - Any unserialize errors result in an empty array
+     *
+     * @param mixed $value
+     */
+    private function safeUnserializeToArray($value): array
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+
+        if ($value === null || $value === '' || $value === false) {
+            return [];
+        }
+
+        try {
+            $result = $this->serializer->unserialize($value);
+            return is_array($result) ? $result : [];
+        } catch (\InvalidArgumentException $e) {
+            return [];
+        } catch (\Throwable $e) {
+            return [];
+        }
+    }
+
     private function getIdentifierToPriceMapping(array $table): array
     {
         $output = [];
         foreach ($table as $row) {
-            $output[$row['identifier']] = $row['price'];
+            if (!is_array($row)) {
+                continue;
+            }
+            if (!isset($row['identifier']) || $row['identifier'] === '' || $row['identifier'] === null) {
+                continue;
+            }
+            $price = $row['price'] ?? null; // Price is optional
+            $output[$row['identifier']] = $price;
         }
 
         return $output;

Service/Email/SubscriptionToProductEmailVariables.php

@@ -96,17 +96,22 @@ public function get(SubscriptionToProductInterface $subscriptionToProduct): arra
             $subscriptionToProduct->getStoreId()
         );
 
-        $date = $this->formatDate($subscription->nextPaymentDate, $subscriptionToProduct->getStoreId());
-
-        return [
+        $variables = [
             'subscription_id' => $subscriptionToProduct->getSubscriptionId(),
             'subscription_description' => $subscription->description,
-            'subscription_nextPaymentDate' => $date,
+            'subscription_nextPaymentDate' => null,
             'subscription_amount' => $amount,
             'customer_name' => $customer->name,
             'customer_email' => $customer->email,
             'product' => $product,
         ];
+
+        if ($subscription->nextPaymentDate !== null) {
+            $date = $this->formatDate($subscription->nextPaymentDate, $subscriptionToProduct->getStoreId());
+            $variables['subscription_nextPaymentDate'] = $date;
+        }
+
+        return $variables;
     }
 
     private function getApiForStore($storeId): MollieApiClient

Service/Magento/SubscriptionAddProductToCart.php

@@ -82,7 +82,8 @@ private function setSubscriptionPrice(CartInterface $cart, Item $item, Subscript
         $request->setProductClassId($item->getTaxClassId());
         $taxRate = $this->taxCalculation->getRate($request);
 
-        $priceIncl = $subscription->amount->value;
+        $quantity = (float)($subscription->metadata->quantity ?? 1);
+        $priceIncl = $subscription->amount->value / $quantity;
         $newPrice = $priceIncl;
 
         if ($taxRate !== 0.0) {

composer.json

@@ -2,7 +2,7 @@
     "name": "mollie/magento2-subscriptions",
     "description": "Mollie subscriptions extension for Magento 2",
     "type": "magento2-module",
-    "version": "1.17.0",
+    "version": "1.17.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

etc/config.xml

@@ -8,7 +8,7 @@
     <default>
         <mollie_subscriptions>
             <general>
-                <version>v1.17.0</version>
+                <version>v1.17.1</version>
                 <enable>0</enable>
                 <debug>1</debug>
                 <update_subscription_when_price_changes>0</update_subscription_when_price_changes>