From a0f29a3a95f926d832617d15e4aba904c3a6c093 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 7 Oct 2024 15:19:24 +0300 Subject: [PATCH 01/22] PIPRES-459: Github workflow improvements --- .github/pull_request_template.md | 26 +++++++++++++++++++ .github/workflows/create_zip.yml | 40 +++++++++++++++++++++++++++++ .github/workflows/test.yml | 44 +++++++++++++++++++++++++++++++- 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/create_zip.yml diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..c76d83d2c --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,26 @@ +**What was implemented/fixed with this PR?** + +--- + + +
+ +**How did I test these changes?** + +--- + + +
+
+ +--- + +[!] Don't forget to include JIRA task number in PR name or branch name. [!] + +[!] Don't forget to update *changelog.md* with new changes. [!] + +- [ ] Verify if the version is correct. +- [ ] Update demo environments used for testing. +- [ ] Ensure changelog contains all changes. +- [ ] Update documentation if needed. +- [ ] Test if everything works properly. diff --git a/.github/workflows/create_zip.yml b/.github/workflows/create_zip.yml new file mode 100644 index 000000000..9b1db3f98 --- /dev/null +++ b/.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/cancel-workflow-action@0.12.0 + 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 + mkdir ${{ env.MODULE_NAME }} + rsync -Rr ./ ./${{ env.MODULE_NAME }} + chmod -R 777 ${{ env.MODULE_NAME }}/var/cache + 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: ./ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d84d2267..9959773e2 100644 --- a/.github/workflows/test.yml +++ b/.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,39 @@ 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: + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.12.0 + 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 .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 }} + chmod -R 777 ${{ env.MODULE_NAME }}/var/cache + 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: ./ \ No newline at end of file From cc8410f5b4892c4aa07ab755328aec623ce864d5 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 7 Oct 2024 15:21:58 +0300 Subject: [PATCH 02/22] changelog added --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index eb2c90030..294ffeec8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,10 @@ ![Mollie](https://www.mollie.nl/files/Mollie-Logo-Style-Small.png) # Changelog # + +## Changes in release 6.2.4 ## ++ Workflow improvements + ## Changes in release 6.2.3 ## + Multi shop improvements with order states + Logging improvements From 1a2c12ca0eacc63f1f6435ae694121b90e197c61 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 7 Oct 2024 15:25:16 +0300 Subject: [PATCH 03/22] cancel workflow removed due to permission issues --- .github/workflows/test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9959773e2..79bc21821 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,11 +76,7 @@ jobs: env: MODULE_NAME: mollie steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.12.0 - with: - access_token: ${{ github.token }} - + # todo ask for permissions to add cancel previous workflow action - name: checkout uses: actions/checkout@v4 with: From 9ec397641840c8a8b35846dc706ff95fef702231 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 7 Oct 2024 15:27:53 +0300 Subject: [PATCH 04/22] htaccess copy removed --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79bc21821..b35333641 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,7 +86,6 @@ jobs: 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 .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 }} From 1e68eff58e946a2371b7dbdc19efb54f8c65b79e Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 7 Oct 2024 15:30:06 +0300 Subject: [PATCH 05/22] removed not needed file from workflow zip creation --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b35333641..32f780890 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,7 +89,6 @@ jobs: 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 }} - chmod -R 777 ${{ env.MODULE_NAME }}/var/cache shopt -s extglob rm -r !(${{ env.MODULE_NAME }}) find . -maxdepth 1 -type f -exec rm "{}" \; From 53ec4d7d33908121c8c86f575c5a800bd426c6e4 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Tue, 5 Nov 2024 16:03:46 +0200 Subject: [PATCH 06/22] PIPRES-483/ satispay payment method added --- src/Config/Config.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Config/Config.php b/src/Config/Config.php index 7bb76294f..be66347a7 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -59,11 +59,16 @@ class Config 'cartesbancaires' => ['fr'], 'directdebit' => [ 'fi', 'at', 'pt', 'be', 'bg', 'es', 'hr', 'cy', 'cz', 'dk', 'ee', 'fr', 'gf', 'de', 'gi', 'gr', 'gp', 'gg', 'hu', - 'is', 'ie', 'im', 'it', 'je', 'lv', 'li', 'lt', 'lu', 'pt', 'mt', 'mq', 'yt', 'mc', 'nl', 'no', 'pl', 'pt', 're', - 'ro', 'bl', 'mf', 'pm', 'sm', 'sk', 'sl', 'es', 'se', 'ch', 'gb', 'uk', + 'is', 'ie', 'im', 'it', 'je', 'lv', 'li', 'lt', 'lu', 'mt', 'mq', 'yt', 'mc', 'nl', 'no', 'pl', 're', + 'ro', 'bl', 'mf', 'pm', 'sm', 'sk', 'sl', 'se', 'ch', 'gb', 'uk', ], 'mybank' => [], 'trustly' => ['at', 'de', 'ee', 'es', 'fi', 'lt', 'lv', 'nl'], + 'satispay' => [ + 'at', 'be', 'bg', 'hr', 'cy', 'cz', 'dk', 'ee', 'fi', 'fr', 'de', 'gr', 'hu', 'is', 'ie', + 'it', 'lv', 'lt', 'lu', 'mt', 'nl', 'no', 'pl', 'pt', 'ro', 'sk', 'si', 'es', 'se', 'ch', + 'li', 'gb', 'tr' + ], 'riverty' => ['nl', 'be', 'de', 'at'], 'payconiq' => [], ]; @@ -327,6 +332,7 @@ class Config 'riverty' => 'Riverty', 'payconiq' => 'Payconiq', 'trustly' => 'Trustly', + 'satispay' => 'Satispay', ]; public const LOG_SEVERITY_LEVEL_INFORMATIVE = 1; From b07edec80be5550ab2a387697d7c028208486d9a Mon Sep 17 00:00:00 2001 From: Gytautas Date: Tue, 5 Nov 2024 16:47:24 +0200 Subject: [PATCH 07/22] PIPRES:482/paybybank payment method added --- src/Config/Config.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Config/Config.php b/src/Config/Config.php index be66347a7..f6efba51f 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -71,6 +71,7 @@ class Config ], 'riverty' => ['nl', 'be', 'de', 'at'], 'payconiq' => [], + 'paybybank' => ['at', 'be', 'cy', 'ee', 'fi', 'fr', 'de', 'gr', 'ie', 'it', 'lv', 'lt', 'lu', 'mt', 'nl', 'pt', 'sk', 'si', 'es', 'uk'], ]; const SUPPORTED_PHP_VERSION = '5.6'; @@ -333,6 +334,7 @@ class Config 'payconiq' => 'Payconiq', 'trustly' => 'Trustly', 'satispay' => 'Satispay', + 'paybybank' => 'Pay by Bank', ]; public const LOG_SEVERITY_LEVEL_INFORMATIVE = 1; From 7a5db6ab66bf267e80f33a83ae01be25ac12ce0e Mon Sep 17 00:00:00 2001 From: Gytautas Date: Tue, 5 Nov 2024 16:55:37 +0200 Subject: [PATCH 08/22] php cs fixer fix --- src/Config/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config/Config.php b/src/Config/Config.php index be66347a7..f7e47583b 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -67,7 +67,7 @@ class Config 'satispay' => [ 'at', 'be', 'bg', 'hr', 'cy', 'cz', 'dk', 'ee', 'fi', 'fr', 'de', 'gr', 'hu', 'is', 'ie', 'it', 'lv', 'lt', 'lu', 'mt', 'nl', 'no', 'pl', 'pt', 'ro', 'sk', 'si', 'es', 'se', 'ch', - 'li', 'gb', 'tr' + 'li', 'gb', 'tr', ], 'riverty' => ['nl', 'be', 'de', 'at'], 'payconiq' => [], From 27fbd81c500f7a057b8feb39d255d0d2418cf56f Mon Sep 17 00:00:00 2001 From: Gytautas Date: Tue, 5 Nov 2024 16:57:23 +0200 Subject: [PATCH 09/22] php cs fixer --- src/Config/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config/Config.php b/src/Config/Config.php index f6efba51f..27abc82aa 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -67,7 +67,7 @@ class Config 'satispay' => [ 'at', 'be', 'bg', 'hr', 'cy', 'cz', 'dk', 'ee', 'fi', 'fr', 'de', 'gr', 'hu', 'is', 'ie', 'it', 'lv', 'lt', 'lu', 'mt', 'nl', 'no', 'pl', 'pt', 'ro', 'sk', 'si', 'es', 'se', 'ch', - 'li', 'gb', 'tr' + 'li', 'gb', 'tr', ], 'riverty' => ['nl', 'be', 'de', 'at'], 'payconiq' => [], From 8efb374bbf37f70453df01dc9b36421f395a2033 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Wed, 6 Nov 2024 12:00:33 +0200 Subject: [PATCH 10/22] updated pull request template --- .github/pull_request_template.md | 35 +++++++++++--------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c76d83d2c..1ee9a406e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,26 +1,15 @@ -**What was implemented/fixed with this PR?** + -
- -**How did I test these changes?** - ---- - - -
-
- ---- - -[!] Don't forget to include JIRA task number in PR name or branch name. [!] - -[!] Don't forget to update *changelog.md* with new changes. [!] - -- [ ] Verify if the version is correct. -- [ ] Update demo environments used for testing. -- [ ] Ensure changelog contains all changes. -- [ ] Update documentation if needed. -- [ ] Test if everything works properly. +| Questions | Answers +|-----------------| ------------------------------------------------------- +| Branch? | Master/Release +| Description? | Please be specific when describing the PR.
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 / refacto +| How to test? | Indicate how to verify that this change works as expected. +| Fixed issue ? | If none leave blank +| Sponsor company | Your company or customer's name goes here (if applicable). \ No newline at end of file From 9da907150e361028edca058f214591886544d0d3 Mon Sep 17 00:00:00 2001 From: Gytautas Zumaras <96050852+GytisZum@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:03:15 +0200 Subject: [PATCH 11/22] Update pull_request_template.md --- .github/pull_request_template.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1ee9a406e..2405b8fb2 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -9,7 +9,6 @@ Please take the time to edit the "Answers" rows below with the necessary informa |-----------------| ------------------------------------------------------- | Branch? | Master/Release | Description? | Please be specific when describing the PR.
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 / refacto +| 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 -| Sponsor company | Your company or customer's name goes here (if applicable). \ No newline at end of file From 78a59b31a7201c73e06f867ce10540e28a8d8e07 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Thu, 7 Nov 2024 10:01:18 +0200 Subject: [PATCH 12/22] changlog and version bump --- changelog.md | 2 ++ mollie.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 294ffeec8..bf7f3bf8f 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,8 @@ ## 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 diff --git a/mollie.php b/mollie.php index 57969e2a2..4e7c91505 100755 --- a/mollie.php +++ b/mollie.php @@ -89,7 +89,7 @@ public function __construct() { $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; From 02aa8a6c116fa2a62a0dc8cc57604fea7548f546 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 11 Nov 2024 09:41:55 +0200 Subject: [PATCH 13/22] removed conflicting dependency --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 4127a996b..9e6cbf27d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "invertus/knapsack": "^10.0" }, "require-dev": { - "roave/security-advisories": "dev-latest", "invertus/prestashop-models": "^1.0", "prestashop/php-dev-tools": "*", "phpunit/phpunit": "~5.7", From d45dd8011721d7996d495bf58a92df13b57c6ea1 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Tue, 12 Nov 2024 11:38:46 +0200 Subject: [PATCH 14/22] modified zip creation --- .github/workflows/create_zip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_zip.yml b/.github/workflows/create_zip.yml index 9b1db3f98..b83d575bd 100644 --- a/.github/workflows/create_zip.yml +++ b/.github/workflows/create_zip.yml @@ -26,9 +26,9 @@ jobs: 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 }} - chmod -R 777 ${{ env.MODULE_NAME }}/var/cache shopt -s extglob rm -r !(${{ env.MODULE_NAME }}) find . -maxdepth 1 -type f -exec rm "{}" \; From 0fd692698e0ea017addfc689c3f2aba9932141ca Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 17:59:13 +0200 Subject: [PATCH 15/22] upload artifact version increase --- .github/workflows/E2E_On_PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 119cf4207..63ca01d8c 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -102,7 +102,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 From 02a0ca4231f5d26671489b84328542dc2860e28d Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 18:08:01 +0200 Subject: [PATCH 16/22] fix --- .github/workflows/E2E_On_PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 63ca01d8c..62eeebda9 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -59,7 +59,7 @@ jobs: run: | ${{ matrix.make }} - - name: Waiting for Ngrok tunnel + - name: Waiting for Ngrok run: | URL="${{ matrix.url }}" TIMEOUT=120 From 874d2b63d7629bcefff67caf1672f9c540c71d77 Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 18:10:09 +0200 Subject: [PATCH 17/22] fix --- .github/workflows/E2E_On_PR.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 62eeebda9..ed658e494 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.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: From 507dcc9045707d601c6f66e60d0e38d7d50e8992 Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 18:15:35 +0200 Subject: [PATCH 18/22] fix --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index de3a68b13..e675d76ee 100755 --- a/Makefile +++ b/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 From a619c24e760da6d8bf1dcd6bd2ae040484834ee3 Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 20:02:32 +0200 Subject: [PATCH 19/22] test przelewy24 update --- cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js index 8b0657a29..227d190c1 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -162,7 +162,6 @@ it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() cy.get('.input-float > input').type('testing@testing.com') - cy.get('[class="button form__button"]').click() cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') From 2501effe6b8fe97fc9dfc02322ffece51d36e34a Mon Sep 17 00:00:00 2001 From: Justas Vaitkus Date: Fri, 15 Nov 2024 20:39:38 +0200 Subject: [PATCH 20/22] fix --- cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js index 227d190c1..2aa23bbc0 100755 --- a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -161,7 +161,6 @@ it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { cy.contains('Przelewy24').click({force:true}) cy.get('.condition-label > .js-terms').click({force:true}) cy.contains('Place order').click() - cy.get('.input-float > input').type('testing@testing.com') cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') From b3f97060446054755b0d7a7ef154c8f8cc283bc5 Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 18 Nov 2024 14:47:58 +0200 Subject: [PATCH 21/22] PIPRES-483 canceled payment error handling --- controllers/front/return.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/controllers/front/return.php b/controllers/front/return.php index d5c664310..76c1b308e 100644 --- a/controllers/front/return.php +++ b/controllers/front/return.php @@ -107,7 +107,12 @@ public function initContent() } if (false === $data['mollie_info']) { $data['mollie_info'] = []; - $data['msg_details'] = $this->module->l('There is no order with this ID.', self::FILE_NAME); + $logger->error(sprintf('There is no order with this order number - %s', (string) $orderNumber)); + + $data['msg_details'] = $this->module->l('Your payment was not successful. Try again.', self::FILE_NAME); + $this->setWarning($data['msg_details']); + + Tools::redirect(Context::getContext()->link->getPageLink('cart', true)); } elseif (PaymentMethod::BANKTRANSFER === $data['mollie_info']['method'] && PaymentStatus::STATUS_OPEN === $data['mollie_info']['bank_status'] ) { From 0559ef8201f9f945dad1f1202c2bae893cc133fa Mon Sep 17 00:00:00 2001 From: Gytautas Date: Mon, 18 Nov 2024 14:51:36 +0200 Subject: [PATCH 22/22] info log instead of error --- controllers/front/return.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/front/return.php b/controllers/front/return.php index 76c1b308e..18783dc22 100644 --- a/controllers/front/return.php +++ b/controllers/front/return.php @@ -107,7 +107,8 @@ public function initContent() } if (false === $data['mollie_info']) { $data['mollie_info'] = []; - $logger->error(sprintf('There is no order with this order number - %s', (string) $orderNumber)); + //NOTE: information instead of error as this might occur due to cancellation of the payment + $logger->info(sprintf('There is no order with this order number - %s', (string) $orderNumber)); $data['msg_details'] = $this->module->l('Your payment was not successful. Try again.', self::FILE_NAME); $this->setWarning($data['msg_details']);