Merge branch 'develop' into e2e-updates-january

.htaccess

@@ -0,0 +1,15 @@
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+    <Files ~ "(?i)^.*\.(jpg|jpeg|gif|png|bmp|tiff|svg|pdf|mov|mpeg|mp4|avi|mpg|wma|flv|webm|ico|webp|woff|woff2|ttf|eot|otf|css|js)$">
+        Allow from all
+    </Files>
+</IfModule>
+# Apache 2.4
+<IfModule mod_authz_core.c>
+    Require all denied
+    <Files ~ "(?i)^.*\.(jpg|jpeg|gif|png|bmp|tiff|svg|pdf|mov|mpeg|mp4|avi|mpg|wma|flv|webm|ico|webp|woff|woff2|ttf|eot|otf|css|js)$">
+        Require all granted
+    </Files>
+</IfModule>

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2020, Mollie B.V. All rights reserved.
+Copyright (c) 2012-2023, Mollie B.V. All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 - Redistributions of source code must retain the above copyright notice,
@@ -17,4 +17,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

changelog.md

@@ -2,6 +2,11 @@
 
 # Changelog #
 
+## Changes in release 6.0.5 ##
++ Recurring order options are now in "Subscriptions" tab
++ Implemented atomic action protection for Mollie API callbacks
++ Overall improvements and bug fixes
+
 ## Changes in release 6.0.4 ##
 + New payment method: Billie.
 + Enabled mixed cart for subscription orders. Various products could be coupled with a single subscription product.

composer.json

@@ -15,7 +15,9 @@
         "webmozart/assert": "^1.11",
         "symfony/http-client": "^4.4",
         "http-interop/http-factory-guzzle": "^1.1",
-        "php-http/message-factory": "^1.1"
+        "php-http/message-factory": "^1.1",
+        "prestashop/prestashop-accounts-installer": "^1.0.4",
+        "prestashop/module-lib-mbo-installer": "^2.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
@@ -41,9 +43,12 @@
     },
     "config": {
         "platform": {
-          "php": "7.2"
+            "php": "7.2.5"
         },
-        "prepend-autoloader": false
+        "prepend-autoloader": false,
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     },
     "type": "prestashop-module",
     "author": "PrestaShop"

config/routes.yml

@@ -14,6 +14,14 @@ admin_subscription_index:
         _legacy_controller: AdminMollieSubscriptionOrders
         _legacy_link: AdminMollieSubscriptionOrders
 
+admin_subscription_options_submit:
+    path: admin-subscription-options-submit
+    methods: POST
+    defaults:
+        _controller: Mollie\Subscription\Controller\Symfony\SubscriptionController::submitOptionsAction
+        _legacy_controller: AdminMollieSubscriptionOrders
+        _legacy_link: AdminMollieSubscriptionOrders
+
 admin_subscription_search:
     path: admin-subscription
     methods: POST

config/services.yml

@@ -41,3 +41,48 @@ services:
 
   Mollie\Subscription\Grid\Accessibility\SubscriptionCancelAccessibility:
     class: Mollie\Subscription\Grid\Accessibility\SubscriptionCancelAccessibility
+
+  carrier_options_provider:
+    class: Mollie\Subscription\Form\ChoiceProvider\CarrierOptionsProvider
+    public: true
+    arguments:
+      - '@Mollie'
+
+  subscription_options_configuration:
+    class: Mollie\Subscription\Form\Options\SubscriptionOptionsConfiguration
+    arguments:
+      - '@prestashop.adapter.legacy.configuration'
+
+  subscription_options_data_provider:
+    class: Mollie\Subscription\Form\Options\SubscriptionOptionsDataProvider
+    arguments:
+      - '@subscription_options_configuration'
+
+  subscription_options_type:
+    class: Mollie\Subscription\Form\Options\SubscriptionOptionsType
+    parent: 'form.type.translatable.aware'
+    public: true
+    arguments:
+      - '@carrier_options_provider'
+      - '@Mollie'
+    tags:
+      - { name: form.type }
+
+  subscription_options_form_handler:
+    class: 'PrestaShop\PrestaShop\Core\Form\Handler'
+    arguments:
+      - '@form.factory'
+      - '@prestashop.core.hook.dispatcher'
+      - '@subscription_options_data_provider'
+      - 'Mollie\Subscription\Form\Options\SubscriptionOptionsType'
+      - 'SubscriptionOptions'
+
+  # NOTE: works for PS < 1.7.8
+  subscription_options_form_handler_deprecated:
+    class: 'PrestaShop\PrestaShop\Core\Form\FormHandler'
+    arguments:
+    - '@=service("form.factory").createBuilder()'
+    - '@prestashop.core.hook.dispatcher'
+    - '@subscription_options_data_provider'
+    - 'subscription_options': 'Mollie\Subscription\Form\Options\SubscriptionOptionsType'
+    - 'SubscriptionOptions'

controllers/admin/AdminMollieAjaxController.php

@@ -20,6 +20,10 @@
 use Mollie\Utility\NumberUtility;
 use Mollie\Utility\TimeUtility;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminMollieAjaxController extends ModuleAdminController
 {
     /** @var Mollie */

controllers/admin/AdminMollieModuleController.php

@@ -9,6 +9,10 @@
  * @see        https://github.com/mollie/PrestaShop
  * @codingStandardsIgnoreStart
  */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AdminMollieModuleController extends ModuleAdminController
 {
     public function init()