Merge pull request #36 from bluem-development/fix-requests-view

fix: update bluem_requests_view function for improved request handling

Author: DaanRijpkema

.github/copilot-instructions.md

@@ -0,0 +1,58 @@
+# Copilot Instructions — bluem-woocommerce
+
+## Project overview
+
+WordPress + WooCommerce plugin providing Bluem payment, eMandates and iDIN identity services.  
+PHP 8.0+, using the `bluem-development/bluem-php` SDK. Licensed GPL v3.
+
+## Repository layout
+
+| Path | Purpose |
+|---|---|
+| `bluem.php` | Main plugin entry point (WP plugin header) |
+| `bluem-*.php` | Feature modules (payments, mandates, iDIN, login, etc.) |
+| `gateways/` | WooCommerce payment gateway classes |
+| `src/` | Namespaced PHP classes (`Bluem\Wordpress\…`) |
+| `views/` | Admin page templates |
+| `css/`, `js/` | Front-end assets |
+| `tests/Unit/`, `tests/Acceptance/` | PHPUnit + Codeception tests |
+| `docker-compose.yml` | Local dev env (MySQL 5.7, WordPress, phpMyAdmin) |
+| `svn-directory/` | WordPress.org SVN checkout for plugin releases |
+| `build/` | Generated build output (do **not** edit directly) |
+| `Makefile` | Dev & release tasks (see below) |
+
+## Key commands
+
+```sh
+make install            # composer install
+make unit_test          # PHPUnit
+make acceptance_test    # Codeception
+make lint               # php-cs-fixer check
+make lint_fix           # php-cs-fixer fix
+make copy-to-docker     # build & copy plugin into Docker env
+make prepare-release NEW_TAG=x.y.z   # build, tag, update trunk (SVN)
+make release            # commit prepared release to WP SVN
+```
+
+## Coding conventions
+
+- `declare(strict_types=1);` in all PHP files.
+- Follow WordPress Coding Standards (WPCS) and PSR-12 where compatible.
+- Use typed properties, return types, union types, readonly, enums (PHP 8.x).
+- WordPress globals and hooks: use `add_action` / `add_filter`; avoid direct DB queries — use `$wpdb` with prepared statements.
+- WooCommerce gateway classes extend `WC_Payment_Gateway`.
+- Escape all output (`esc_html`, `esc_attr`, `wp_kses_post`). Sanitise all input (`sanitize_text_field`, `absint`, etc.).
+
+## Release workflow
+
+1. Bump version in `bluem.php` plugin header and `build.env`.
+2. `make prepare-release NEW_TAG=x.y.z` — builds into `build/`, copies to `svn-directory/tags/` and `svn-directory/trunk/`.
+3. `make release` — commits tag + trunk to WordPress.org SVN.
+
+## Things to watch out for
+
+- `build/` and `svn-directory/` are deployment artifacts; never edit them directly.
+- Docker volumes live under `docker/`; plugin code is mounted via `docker/plugins/`.
+- The plugin depends on `bluem-development/bluem-php` — check its API when suggesting SDK calls.
+- Keep WP compatibility ≥ 5.0 and WC compatibility reasonable.
+

Makefile

@@ -178,6 +178,10 @@ clean-up:
 copy-to-docker:
 	make pre-deployment;
 	@echo "$(BLUE)Copying all from build to docker/plugins/bluem directory...$(NC)"
+	# create docker/plugins/bluem if it doesn't exist
+	if [ ! -d "./docker/plugins/bluem" ]; then \
+		mkdir -p "./docker/plugins/bluem"; \
+	fi
 	cp -r ./build/* ./docker/plugins/bluem/.
 
 

bluem.php

@@ -2,7 +2,7 @@
 
 /**
  * Plugin Name: Bluem ePayments, eMandates & iDIN
- * Version: 1.3.32
+ * Version: 1.3.34
  * Plugin URI: https://bluem.nl/en/
  * Description: Bluem integration for WordPress and WooCommerce for Payments, eMandates, iDIN identity verification and much, much more
  * Author: Bluem Payment Services
@@ -293,7 +293,7 @@ function bluem_woocommerce_no_woocommerce_notice() {
             /* translators: %s: the link to settings page   */
             printf( wp_kses_post( 'De Bluem integratie is grotendeels afhankelijk van WooCommerce - installeer en/of activeer deze plug-in. <br/>
             Gebruik je geen WooCommerce? Dan kan je deze melding en WooCommerce gerelateerde functionaliteiten uitzetten bij de %s.', 'bluem' ),
-                    '<a href="' . esc_url( admin_url( 'admin.php?page=)bluem-settings' ) ) . '">' . esc_html__( 'Instellingen', 'bluem' ) . '</a>' );
+                    '<a href="' . esc_url( admin_url( 'admin.php?page=bluem-settings' ) ) . '">' . esc_html__( 'Instellingen', 'bluem' ) . '</a>' );
             echo '</p>
             </div>';
         }
@@ -535,44 +535,51 @@ function bluem_plugin_activation() {
 }
 
 
-function bluem_requests_view() {
+function bluem_requests_view(): void
+{
     if ( isset( $_GET['request_id'] ) && $_GET['request_id'] !== "" ) {
         if ( isset( $_GET['admin_action'] ) && $_GET['admin_action'] === "delete" ) {
             bluem_db_delete_request_by_id( sanitize_text_field( wp_unslash( $_GET['request_id'] ) ) );
             wp_redirect(
                     esc_url( admin_url( "admin.php?page=bluem-transactions" ) )
             );
-        } elseif ( isset( $_GET['admin_action'] ) && $_GET['admin_action'] === "status-update" ) {
-            bluem_update_request_by_id( sanitize_text_field( wp_unslash( $_GET['request_id'] ) ) );
+            return;
+        }
 
-            bluem_requests_view_request();
-        } else {
-            bluem_requests_view_request();
+        if ( isset( $_GET['admin_action'] ) && $_GET['admin_action'] === "status-update" ) {
+            bluem_update_request_by_id( sanitize_text_field( wp_unslash( $_GET['request_id'] ) ) );
         }
-    } else {
-        $filters         = [];
-        $enabled_modules = bluem_filter_request_types_enabled( BLUEM_TRANSACTION_REQUEST_TYPES );
-        if ( str_contains( $_GET['request_type'], ',' ) ) {
-            $multiple_filters = explode( ',', $_GET['request_type'] );
-            $filters          = array_intersect( $multiple_filters, BLUEM_TRANSACTION_REQUEST_TYPES );
-
-            // fallback to first enabled module if no valid filter found
-            if ( count( $filters ) === 0 ) {
-                $filters = $enabled_modules[0];
-            }
 
-            $current_category = $filters[0];
-        } else if ( isset( $_GET['request_type'] ) && in_array( $_GET['request_type'], BLUEM_TRANSACTION_REQUEST_TYPES, true ) ) {
-            $filters          = [ $_GET['request_type'] ];
-            $current_category = $_GET['request_type'];
-        } else {
-            $filters          = $enabled_modules[0];
-            $current_category = $enabled_modules[0];
+        bluem_requests_view_request();
+        return;
+    }
+
+    $filters         = [];
+    $enabled_modules = bluem_filter_request_types_enabled( BLUEM_TRANSACTION_REQUEST_TYPES );
+    if ( str_contains( $_GET['request_type'], ',' ) ) {
+        $multiple_filters = explode(',', $_GET['request_type']);
+        $filters = array_intersect($multiple_filters, BLUEM_TRANSACTION_REQUEST_TYPES);
+
+        // fallback to first enabled module if no valid filter found
+        if (count($filters) === 0) {
+            $filters = $enabled_modules[0];
         }
+    }
 
-        var_dump( $current_category );
-        bluem_requests_view_with_filter( $filters, $current_category );
+
+    if (count($filters) > 0) {
+        $current_category = $filters[0] ?? '';
+    } else if ( isset( $_GET['request_type'] ) && in_array( $_GET['request_type'], BLUEM_TRANSACTION_REQUEST_TYPES, true ) ) {
+        $filters          = [ $_GET['request_type'] ];
+        $current_category = $_GET['request_type'] ?? '';
+    } else if(!empty($enabled_modules[0])) {
+        $filters          = $enabled_modules[0];
+        $current_category = $enabled_modules[0];
+    } else {
+        $current_category = '';
     }
+
+    bluem_requests_view_with_filter( $filters, $current_category ?? '' );
 }
 
 function bluem_filter_request_types_enabled( array $types ): array {

build.env

@@ -1 +1 @@
-PLUGIN_VERSION=1.3.32
+PLUGIN_VERSION=1.3.34

readme.txt

@@ -4,7 +4,7 @@ Tags: Bluem,Payments,iDIN,iDEAL,eMandates
 Requires at least: 5.0
 Tested up to: 6.6
 Requires PHP: 8.0
-Stable tag: 1.3.32
+Stable tag: 1.3.34
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -77,6 +77,7 @@ Shortcode: `[bluem_identificatieformulier]`
 It is possible to programmatically block display and functionality on your site based on the verification status. Please contact us if you are interested in developing this in your site.
 
 == Changelog ==
+- 1.3.34: Fixed issue with Request viewing in admin interface
 - 1.3.32: Fixed payment callback status atomicity issue
 - 1.3.31: Ensure rewrite rules are registered on init
 - 1.3.30: Fixed eMandates return bug; improved error messages in UI