upgrade file, version increase, changelog update

changelog.md

@@ -2,6 +2,9 @@
 
 # Changelog #
 
+## Changes in release 6.0.2 ##
++ Decoupled Apple Pay direct feature flag into product and cart separate settings.
+
 ## Changes in release 6.0.1 ##
 + Fixed payment fee tax problems and improved fee set-up process.
 + Sync Mollie components and Single click flag to the environment selected.

mollie.php

@@ -80,7 +80,7 @@ public function __construct()
     {
         $this->name = 'mollie';
         $this->tab = 'payments_gateways';
-        $this->version = '6.0.1';
+        $this->version = '6.0.2';
         $this->author = 'Mollie B.V.';
         $this->need_instance = 1;
         $this->bootstrap = true;

src/Service/SettingsSaveService.php

@@ -221,7 +221,8 @@ public function saveSettings(&$errors = [])
             try {
                 $this->applePayDirectCertificateHandler->handle();
             } catch (ApplePayDirectCertificateCreation $e) {
-                $isApplePayDirectProductEnabled = $isApplePayDirectCartEnabled = false;
+                $isApplePayDirectProductEnabled = false;
+                $isApplePayDirectCartEnabled = false;
 
                 $errors[] = $e->getMessage();
                 $errors[] = TagsUtility::ppTags(

upgrade/Upgrade-6.0.2.php

@@ -0,0 +1,31 @@
+<?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
+ */
+
+use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Config\Config;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_6_0_2(Mollie $module): bool
+{
+    /** @var ConfigurationAdapter $configuration */
+    $configuration = $module->getService(ConfigurationAdapter::class);
+
+    $configuration->updateValue(Config::MOLLIE_APPLE_PAY_DIRECT_PRODUCT, Configuration::get('MOLLIE_APPLE_PAY_DIRECT'));
+    $configuration->updateValue(Config::MOLLIE_APPLE_PAY_DIRECT_PRODUCT, Configuration::get('MOLLIE_APPLE_PAY_DIRECT'));
+
+    $configuration->delete('MOLLIE_APPLE_PAY_DIRECT');
+
+    return true;
+}