PIPRES-479: subscription attribute bug fix

changelog.md

@@ -1,6 +1,9 @@
 ![Mollie](https://www.mollie.nl/files/Mollie-Logo-Style-Small.png)
 
 # Changelog #
+## Changes in release 6.2.4 ##
++ Subscription attribute editing fix
+
 ## Changes in release 6.2.3 ##
 + Multi shop improvements with order states
 + Logging improvements

mollie.php

@@ -26,6 +26,7 @@
 use Mollie\Repository\PaymentMethodRepositoryInterface;
 use Mollie\Service\ExceptionService;
 use Mollie\ServiceProvider\LeagueServiceContainerProvider;
+use Mollie\Subscription\Config\Config as SubscriptionConfig;
 use Mollie\Subscription\Handler\CustomerAddressUpdateHandler;
 use Mollie\Subscription\Handler\UpdateSubscriptionCarrierHandler;
 use Mollie\Subscription\Install\AttributeInstaller;
@@ -89,7 +90,7 @@
     {
         $this->name = 'mollie';
         $this->tab = 'payments_gateways';
-        $this->version = '6.2.3';
+        $this->version = '6.2.4';
         $this->author = 'Mollie B.V.';
         $this->need_instance = 1;
         $this->bootstrap = true;
@@ -1404,4 +1405,21 @@
             $this->context->controller->errors[] = $this->l('You can\'t remove address associated with subscription');
         }
     }
+
+    public function hookActionAttributeSave($params): void
+    {
+        if (isset($params['id_attribute']) && (int) $params['id_attribute'] > 0) {
+            $attribute = new ProductAttribute((int) $params['id_attribute']);
+
+            if (Validate::isLoadedObject($attribute)) {
+                /** @var ConfigurationAdapter $configuration */
+                $configuration = $this->getService(ConfigurationAdapter::class);
+
+                if ((int) $attribute->id_attribute_group === (int) $configuration->get(SubscriptionConfig::SUBSCRIPTION_ATTRIBUTE_GROUP)) {
+                    // Add an error message if it's the Mollie group
+                    $this->context->controller->errors[] = $this->l('New attributes are not compatible with Mollie subscription.');
+                }
+            }
+        }
+    }
 }

upgrade/Upgrade-6.2.4.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ */
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_6_2_4(Mollie $module): bool
+{
+    return $module->registerHook('actionAttributeSave');
+}