Merge branch 'develop' into e2e-alma-payment

.github/pull_request_template.md

@@ -0,0 +1,14 @@
+<!-----------------------------------------------------------------------------
+Thank you for contributing to the project!
+
+Please take the time to edit the "Answers" rows below with the necessary information.
+
+------------------------------------------------------------------------------>
+
+| Questions       | Answers
+|-----------------| -------------------------------------------------------
+| Branch?         | Master/Release
+| Description?    | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
+| Type?           | bug fix / improvement / new feature / refactoring
+| How to test?    | Indicate how to verify that this change works as expected.
+| Fixed issue ?   | If none leave blank

.github/workflows/E2E_On_PR.yml

@@ -1,7 +1,6 @@
 name: Cypress E2E Automation [develop branch]
 on:
   pull_request:
-    types: [opened, reopened]
     branches: [develop, develop**, develop-**]
 
 concurrency:
@@ -59,7 +58,7 @@ jobs:
         run: |
           ${{ matrix.make }}
 
-      - name: Waiting for Ngrok tunnel
+      - name: Waiting for Ngrok
         run: |
           URL="${{ matrix.url }}"
           TIMEOUT=120
@@ -102,7 +101,7 @@ jobs:
 
       - name: Archive videos and screenshots
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Cypress_Mollie_videos_screenshots_${{ matrix.prestashop }}
           retention-days: 2

.github/workflows/create_zip.yml

@@ -0,0 +1,40 @@
+name: Create module ZIP
+
+on:
+  workflow_dispatch:
+
+jobs:
+  prepare-zip:
+    name: Prepare module ZIP artifact
+    runs-on: ubuntu-latest
+    env:
+      MODULE_NAME: mollie
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
+
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build module ZIP
+        run: |
+          composer install --no-dev --optimize-autoloader --classmap-authoritative
+          composer dump-autoload --no-dev --optimize --classmap-authoritative
+          cp .github/.htaccess vendor/.htaccess
+          rm -rf .git .docker .editorconfig .github tests .php-cs-fixer.php Makefile cypress .docker cypress.config.js cypress.env.json docker-compose*.yml .gitignore bin codeception.yml package-lock.json package.json .php_cs.dist .php-cs-fixer.dist .php-cs-fixer.dist.php
+          mv .env.dist .env
+          mkdir ${{ env.MODULE_NAME }}
+          rsync -Rr ./ ./${{ env.MODULE_NAME }}
+          shopt -s extglob
+          rm -r !(${{ env.MODULE_NAME }})
+          find . -maxdepth 1 -type f -exec rm "{}" \;
+          cd ${{ env.MODULE_NAME }} && rm -rf ${{ env.MODULE_NAME }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.MODULE_NAME }}
+          path: ./

.github/workflows/test.yml

@@ -1,6 +1,12 @@
 name: Tests
 
-on: [ pull_request ]
+on:
+  pull_request:
+    branches:
+      - '**'
+  push:
+    branches:
+      - 'master'
 
 jobs:
   php-cs-fixer:
@@ -62,3 +68,33 @@ jobs:
 
       - name: Run PHPStan
         run: docker run --rm --volumes-from temp-ps -v $PWD:/web/module -e _PS_ROOT_DIR_=/var/www/html --workdir=/web/module phpstan/phpstan:0.12 analyse --configuration=/web/module/tests/phpstan/phpstan_base.neon --debug --error-format github
+
+  prepare-zip:
+    name: Prepare module ZIP artifact
+    runs-on: ubuntu-latest
+    needs: [ test ]
+    env:
+      MODULE_NAME: mollie
+    steps:
+      # todo ask for permissions to add cancel previous workflow action
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build module ZIP
+        run: |
+          composer install --no-dev --optimize-autoloader --classmap-authoritative
+          composer dump-autoload --no-dev --optimize --classmap-authoritative
+          rm -rf .git .github tests .php-cs-fixer.php Makefile cypress* docker-compose*.yml package.json package-lock.json .docker
+          mkdir ${{ env.MODULE_NAME }}
+          rsync -Rr ./ ./${{ env.MODULE_NAME }}
+          shopt -s extglob
+          rm -r !(${{ env.MODULE_NAME }})
+          find . -maxdepth 1 -type f -exec rm "{}" \;
+          cd ${{ env.MODULE_NAME }} && rm -rf ${{ env.MODULE_NAME }}
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.MODULE_NAME }}
+          path: ./

Makefile

@@ -3,7 +3,7 @@ module = mollie
 
 # target: fix-lint			- Launch php cs fixer
 fix-lint:
-	docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no"
+	docker compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no"
 
 # Launch the PS build and E2E Cypress app automatically. Eexample: make VERSION=1785 e2eh1785_local, make VERSION=8 e2eh8_local etc.
 # Warning: .env with secrets must be imported if you wanna test locally! This checks the .env existence, ignoring if there is no such on your machine.
@@ -17,9 +17,9 @@ endif
 e2eh$(VERSION)_local:
 	composer install
 	# detaching containers
-	docker-compose -f docker-compose.$(VERSION).yml up -d --force-recreate
+	docker compose -f docker-compose.$(VERSION).yml up -d --force-recreate
 	# sees what containers are running
-	docker-compose -f docker-compose.$(VERSION).yml ps
+	docker compose -f docker-compose.$(VERSION).yml ps
 	make waiting-for-containers-local
 	make seeding-customized-sql
 	make installing-uninstalling-enabling-module
@@ -29,9 +29,9 @@ e2eh$(VERSION)_local:
 # For CI build with PS autoinstall
 e2eh$(VERSION):
 	# detaching containers
-	docker-compose -f docker-compose.$(VERSION).yml up -d --force-recreate
+	docker compose -f docker-compose.$(VERSION).yml up -d --force-recreate
 	# sees what containers are running
-	docker-compose -f docker-compose.$(VERSION).yml ps
+	docker compose -f docker-compose.$(VERSION).yml ps
 	make waiting-for-containers-CI
 	make seeding-customized-sql
 	make installing-uninstalling-enabling-module
@@ -86,3 +86,8 @@ upgrading-module-test-$(VERSION):
 
 npm-package-install:
 	cd views/assets && npm i && npm run build
+
+prepare-zip:
+	composer install --no-dev --optimize-autoloader --classmap-authoritative
+	composer dump-autoload --no-dev --optimize --classmap-authoritative
+	rm -rf .git .docker .editorconfig .github tests .php-cs-fixer.php Makefile cypress .docker cypress.config.js cypress.env.json docker-compose*.yml .gitignore bin codeception.yml package-lock.json package.json .php_cs.dist .php-cs-fixer.dist .php-cs-fixer.dist.php

README.md

@@ -11,7 +11,7 @@ Receive payments from European customers with ease. Mollie provides payment meth
 
 Choose the best payment provider available for your online PrestaShop store. Create your merchant account at [Mollie.com](https://www.mollie.com/). 
 
-Mollie supports the following payment methods: iDEAL, Credit card, Bancontact, SOFORT Banking, ING Home’Pay, Bank transfers, PayPal, KBC / CBC Payment Button, Belfius, CartaSi, Cartes Bancaires, EPS, Giropay, Klarna: Pay later, Klarna: Slice it
+Mollie supports the following payment methods: iDEAL, Credit card, Bancontact, SOFORT Banking, ING Home’Pay, Bank transfers, PayPal, KBC / CBC Payment Button, Belfius, CartaSi, Cartes Bancaires, EPS, Klarna: Pay later, Klarna: Slice it
 
 [![Build Status](https://travis-ci.org/mollie/PrestaShop.svg?branch=master)](https://travis-ci.org/mollie/PrestaShop)
 [![Greenkeeper badge](https://badges.greenkeeper.io/mollie/PrestaShop.svg)](https://greenkeeper.io/)

README_DE.md

@@ -128,11 +128,6 @@ Die Karten tragen ebenfalls das Markenzeichen von Visa.
 
 Dies macht sie zur wichtigsten Zahlungsmethode in Österreich, die bei österreichischen Konsumenten hohe Beliebtheit genießt.
 
-### Giropay
-[Giropay](https://www.mollie.com/de/payments/giropay). Giropay ist eine der beliebtesten Überweisungsmethoden Deutschlands. 
-
-Deutsche Kunden schenken dieser Zahlungsmethode ihr Vertrauen, da sie von über 1.500 Banken landesweit unterstützt wird.
-
 ### Klarna: Rechnung
 [Klarna: Rechnung](https://www.mollie.com/de/payments/klarna-pay-later). Klarna ist eine flexible Zahlungslösung, die Ihren Kunden verschiedene, flexible Zahlungsmöglichkeiten zur Verfügung stellt. 
 

README_ES.md

@@ -128,11 +128,6 @@ Las tarjetas que comparten marca con Visa.
 
 Esto hace que el EPS sea el principal tipo de pago por transferencia bancaria en Austria y muy popular entre los compradores austriacos.
 
-### Giropay
-[Giropay](https://www.mollie.com/es/payments/giropay). Giropay es un tipo de pago por transferencia bancaria, popular en Alemania.
-
-Utiliza más de 1.500 bancos alemanes, lo que lo convierte en un tipo de pago confiable para los clientes alemanes.
-
 ### Klarna: Pay later
 [Klarna: Pay later](https://www.mollie.com/es/payments/klarna-pay-later). Klarna es una solución de pago flexible que les permite a sus clientes diversas formas de pago flexibles. 
 

README_FR.md

@@ -128,11 +128,6 @@ Les cartes sont co-marquées avec Visa.
 
 Devenue très populaire auprès des consommateurs autrichiens, EPS est la référence en matière de virement bancaire en Autriche.
 
-### Giropay
-[Giropay](https://www.mollie.com/fr/payments/giropay). Giropay est une méthode de paiement très populaire de virement bancaire en Allemagne. 
-
-Utilisé par plus de 15000 à travers le pays, cela en fait un moyen de paiement fiable, réputé auprès des consommateurs allemands.
-
 ### Klarna : Pay later
 [Klarna : Pay later](https://www.mollie.com/fr/payments/klarna-pay-later). Klarna est une solution de paiement flexible, qui permet à vos clients des modes de paiement variés. 
 

README_NL.md

@@ -117,11 +117,6 @@ De kaarten zijn co-branded met Visa.
 
 Dit maakt EPS de belangrijkste betaalmethode voor bankoverboekingen in Oostenrijk en zeer populair bij Oostenrijkse klanten.
 
-### Giropay
-[Giropay](https://www.mollie.com/nl/payments/giropay). Giropay is een populaire bankoverboeking betaalmethode in Duitsland. 
-
-Het maakt gebruik van meer dan 1.500 Duitse banken, waardoor het een vertrouwde betaalmethode is onder Duitse klanten.
-
 ### Klarna: Achteraf betalen
 [Klarna: Achteraf betalen](https://www.mollie.com/nl/payments/klarna-pay-later). Klarna is een flexibele betaaloplossing, waarmee je je klanten diverse mogelijkheden voor uitgestelde betaling biedt. 
 

changelog.md

@@ -2,6 +2,38 @@
 
 # Changelog #
 
+## Changes in release 6.2.4 ##
++ Workflow improvements
++ Satispay payment method added
++ Pay by Bank payment method added
+
+## Changes in release 6.2.3 ##
++ Multi shop improvements with order states
++ Logging improvements
++ Phone field validation improvements
++ Italian language compatibility
+
+## Changes in release 6.2.2 ##
++ Error handling improvements
++ Mobile phone fix then field is removed
++ Riverty, Trustly, Payconiq payment methods added and GiroPay removed
++ HTTP status
++ Dependencies version bump
++ Improved installation process
+
+## Changes in release 6.2.1 ##
++ Ideal v2 payment method improvement
+
+## Changes in release 6.2.0 ##
++ New payment methods: Bancomat and Alma
++ Apple certificate update
++ Conflicting services fix
++ Bootstrap 5 compatibility improved
++ Maximum fee field
++ Multi carrier for subscription orders added
++ Design improvements in BO
++ Improved subscription creation logic
+
 ## Changes in release 6.1.1 ##
 + Updated translations for Dutch, German, English and French languages
 + Added credit card translations for Italian and Spanish languages

composer.json

@@ -2,6 +2,12 @@
     "name": "mollie/prestashop",
     "license": "AFL-3.0",
     "description": "Mollie module for PrestaShop",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/Invertus/Knapsack.git"
+        }
+    ],
     "require": {
         "ext-curl": "*",
         "ext-json": "*",
@@ -10,19 +16,21 @@
         "mollie/mollie-api-php": "v2.65.0",
         "segmentio/analytics-php": "^1.5",
         "sentry/sentry": "3.17.0",
-        "league/container": "2.5.0",
+        "league/container": "3.3.3",
         "prestashop/module-lib-service-container": "v2.0",
         "webmozart/assert": "^1.11",
         "symfony/http-client": "^4.4",
         "http-interop/http-factory-guzzle": "^1.1",
         "php-http/message-factory": "^1.1",
         "prestashop/prestashop-accounts-installer": "^1.0.4",
-        "prestashop/module-lib-mbo-installer": "^2.0"
+        "prestashop/module-lib-mbo-installer": "^2.0",
+        "invertus/knapsack": "^10.0"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-latest",
+        "invertus/prestashop-models": "^1.0",
         "prestashop/php-dev-tools": "*",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~5.7",
+        "friendsofphp/php-cs-fixer": "^2.19"
     },
     "autoload-dev": {
         "psr-4": {
@@ -32,7 +40,8 @@
     "autoload": {
         "psr-4": {
             "Mollie\\": "src/",
-            "Mollie\\Subscription\\": "subscription/"
+            "Mollie\\Subscription\\": "subscription/",
+            "Mollie\\Shared\\": "shared/"
         },
         "classmap": [
             "mollie.php",