Feature: Redesign and refactor admin settings

.github/workflows/cd.yml

@@ -18,8 +18,9 @@ jobs:
     env:
       # Change these values depending on project.
       ps-module-name: saferpayofficial
-      project-workspace-dir: ${{ github.workspace }}/../workspace
+      container-name: ps-lint
     strategy:
+      fail-fast: false
       matrix:
         PS: [ 1.7.8-7.4 ]
         testsuite: [ lint, phpstan ]
@@ -33,59 +34,28 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set Swap Space
-        uses: Invertus/set-swap-space@master
-        with:
-          swap-size-gb: 10
-
-      - name: Set up workspace
-        shell: bash
-        run: |
-          eval `ssh-agent -s`
-          ssh-add - <<< "${{ secrets.PS_MODULE_WORKSPACE_SAFERPAY_PRIVATE_KEY }}"
-          git clone git@github.com:Invertus/ps-module-workspace.git ${{ env.project-workspace-dir }}
-          cd ${{ env.project-workspace-dir }}
-          sed 's/PROJECT_NAME=.*/PROJECT_NAME=${{ env.ps-module-name }}/g' < .env.dist |
-          sed 's/PS_VERSION_TAG=.*/PS_VERSION_TAG=${{ matrix.PS }}/g' > .env
-          make create-modules-dir
-          cp -R ${{ github.workspace }} ${{ env.project-workspace-dir }}/prestashop/${{ matrix.PS }}/modules/${{ env.ps-module-name }}
-
-      - name: Run PrestaShop
-        run: |
-          (cd ${{ env.project-workspace-dir }} && docker compose up -d)
-
-      - name: Healthcheck
+      # lint and phpstan need the PrestaShop sources on disk and the matching PHP
+      # version, but no running shop, so the public image is started idle with the
+      # checked-out module mounted in place.
+      - name: Start PrestaShop container
         run: |
-          timeout 120s sh -c 'until docker ps | grep ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} | grep -q "(healthy)"; do echo "Waiting for container to be healthy..."; sleep 1; done'
-
-      - name: Cache composer folder
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.project-workspace-dir }}/prestashop/${{ matrix.PS }}/modules/${{ env.ps-module-name }}/vendor
-          key: ${{ github.sha }}
-
-      - name: Install git
-        run: |
-          docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "apt update && apt install -y git"
-
-      - name: Remove old module
-        run: docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "cd /var/www/html/modules && rm -rf ${{ env.ps-module-name }}"
-
-      - name: Install module
-        run: docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "cd /var/www/html/modules && git clone https://github.com/Invertus/${{ env.ps-module-name }}"
+          docker run -d --name ${{ env.container-name }} \
+            -v ${{ github.workspace }}:/var/www/html/modules/${{ env.ps-module-name }} \
+            --entrypoint tail prestashop/prestashop:${{ matrix.PS }} -f /dev/null
 
-      - name: Switch to the correct branch
+      - name: Install git and composer in container
         run: |
-          docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "cd /var/www/html/modules/${{ env.ps-module-name }} && git fetch origin && git checkout ${{ github.head_ref || github.ref_name }}"
+          docker exec -i ${{ env.container-name }} bash -c "apt-get update -qq && apt-get install -y -qq git"
+          docker exec -i ${{ env.container-name }} bash -c "php -r \"copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');\" && php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --quiet && composer --version"
 
       - name: Install composer dependencies
-        run: docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "cd /var/www/html/modules/${{ env.ps-module-name }} && composer install"
+        run: docker exec -i ${{ env.container-name }} bash -c "cd /var/www/html/modules/${{ env.ps-module-name }} && composer install --no-interaction"
 
       - name: PHP version
-        run: docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "php -v"
+        run: docker exec -i ${{ env.container-name }} bash -c "php -v"
 
       - name: Run ${{ matrix.testsuite }} tests
-        run: docker exec -i ${{ env.ps-module-name }}-ps-prestashop-${{ matrix.PS }} bash -c "cd /var/www/html/modules/${{ env.ps-module-name }} && make ci-${{ matrix.testsuite }} ps_version_tag=${{ matrix.PS }}"
+        run: docker exec -i ${{ env.container-name }} bash -c "cd /var/www/html/modules/${{ env.ps-module-name }} && make ci-${{ matrix.testsuite }} ps_version_tag=${{ matrix.PS }}"
 
   prepare-zip:
     name: Prepare module ZIP artifact

.github/workflows/create_zip.yml

@@ -20,6 +20,25 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: views/js/admin/settings-app/pnpm-lock.yaml
+
+      - name: Build React settings app
+        run: |
+          cd views/js/admin/settings-app
+          pnpm install --frozen-lockfile
+          pnpm run build
+          rm -rf node_modules src
+
       - name: Build module ZIP
         run: |
           composer install --no-dev --optimize-autoloader --classmap-authoritative

.github/workflows/deploy.yml

@@ -18,6 +18,25 @@ jobs:
         with:
           php-version: '5.6'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: views/js/admin/settings-app/pnpm-lock.yaml
+
+      - name: Build React settings app
+        run: |
+          cd views/js/admin/settings-app
+          pnpm install --frozen-lockfile
+          pnpm run build
+          rm -rf node_modules src
+
       - name: Build module ZIP
         # IF YOU EDIT THIS, DON'T FORGET TO EDIT release.yml
         run: |

.github/workflows/release.yml

@@ -19,6 +19,25 @@ jobs:
         with:
           php-version: '5.6'
 
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: views/js/admin/settings-app/pnpm-lock.yaml
+
+      - name: Build React settings app
+        run: |
+          cd views/js/admin/settings-app
+          pnpm install --frozen-lockfile
+          pnpm run build
+          rm -rf node_modules src
+
       - name: build
         # IF YOU EDIT THIS, DON'T FORGET TO EDIT deploy.yml
         run: |

.gitignore

@@ -1,10 +1,11 @@
 /.idea
 /config*.xml
 /vendor
-composer.lock
 .php_cs.cache
 tests/.env
 /node_modules
 var/cache/*
 !var/cache/index.php
 .DS_Store
+views/js/admin/settings-app/node_modules/
+views/js/admin/dist/

Makefile

@@ -144,11 +144,29 @@ e2eh1786: test-e2e-headless-1786
 test-e2e-headless-1786:
 	make e2e1786p
 
+# target: build-react			- Install deps and build the React admin settings app
+build-react:
+	cd views/js/admin/settings-app && pnpm install && pnpm run build
+
+# target: dev-react			- Start React dev server with HMR
+dev-react:
+	cd views/js/admin/settings-app && pnpm dev
+
+# target: watch-react			- Build React app and watch for changes
+watch-react:
+	cd views/js/admin/settings-app && pnpm run build --watch
+
+# target: lint-react			- Run TypeScript type check
+lint-react:
+	cd views/js/admin/settings-app && pnpm run tsc --noEmit
+
 prepare-zip:
 	rm -rf vendor && \
 	composer install --no-dev --optimize-autoloader && \
 	cp .github/.htaccess vendor/.htaccess && \
+	cd views/js/admin/settings-app && pnpm install && pnpm run build && cd ../../../.. && \
 	rm -rf .git .github tests cypress .docker && \
+	rm -rf views/js/admin/settings-app && \
 	mkdir saferpayofficial && \
 	rsync -Rr ./ ./saferpayofficial && \
 	find . -maxdepth 1 ! -name saferpayofficial -exec mv {} saferpayofficial/ \; && \

changelog.md

@@ -197,9 +197,24 @@
 - Remove WL Crypto payment method
 - Added setting to toggle order confirmation email sending
 - Added feature to group card payment methods into unified "Card" payment method
+- Fixed issue when newly enabled payment methods did not appear in checkout because default "all countries/currencies" restriction was not created on save
+- Fixed issue when payment method country/currency dropdowns showed "0" instead of indicating that all countries/currencies are allowed
+- BO : Added validation for Merchant Emails field (frontend + backend) to prevent saving invalid addresses
 
 ## [2.0.3]
 - Optimized database performance
 - Dynamic termimal selection
 - Removed uneccesary inputs from admin settings
-- Checked overall module stability
+- Checked overall module stability
+
+## [2.1.0]
+- BO : Redesigned back-office settings into a React single-page admin
+- BO : Conditionally show/hide Saferpay Fields settings based on account license
+- BO : Renamed the "Custom form" column in Payment methods to "Saferpay Fields"
+- BO/FO : Accessibility improvements for EAA / WCAG 2.1 AA compliance
+- Added configurable payment description and order reference on payment page
+- API update to V1.50: added WERO and GIFTCARD payment methods, removed deprecated GIROPAY/PAYDIREKT/SOFORT
+- BO : Fixed issue when a freshly installed module logged an account error before any API credentials were entered
+- BO : Fixed issue when the "Could not reach your Saferpay account" warning kept showing after payment methods had loaded successfully
+- Fixed issue when files removed in this version stayed on disk after an upgrade, leaving obsolete iframe checkout controllers reachable and re-creating obsolete menu tabs on module reset
+- BO : Fixed issue when a saved API password offered no visible way to enter a new one, and browser password manager icons covered the show/hide password control

composer.json

@@ -22,6 +22,18 @@
         },
         "audit": {
             "ignore": ["PKSA-wws7-mr54-jsny"]
+        },
+        "policy": {
+            "advisories": {
+                "ignore-id": [
+                    "PKSA-v5yj-8nmz-sk2q",
+                    "PKSA-ft77-7h5f-p3r6",
+                    "PKSA-b14r-zh1d-vdrc",
+                    "PKSA-z3gr-8qht-p93v",
+                    "PKSA-rkkf-636k-qjb3",
+                    "PKSA-wws7-mr54-jsny"
+                ]
+            }
         }
     },
     "repositories": {