Changeset 3468545

Timestamp:

02/24/2026 10:32:48 AM (2 months ago)

Author:

theogk

Message:

version 3.0.4 into truck

Location:

paybybank/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-dc-paybybank-admin.php (modified) (1 diff)
• dc-paybybank.php (modified) (2 diffs)
• public/class-dc-paybybank-public.php (modified) (15 diffs)

paybybank/trunk/README.txt

@@ -6 +6 @@
 Stable tag: 3.0.1
 Requires at least: 5.6
-Tested up to: 6.9
+Tested up to: 6.9.1
 WC requires at least: 5.6.0
-WC tested up to: 10.3.6
+WC tested up to: 10.5.2
 Requires PHP: 7.4
 License: GPLv2 or later
@@ -118 +118 @@
 == Changelog ==
 
+= 3.0.4 =
+*Release Date - 24 Feb 2026*
+* Checked compatibility with the latest WordPress and WooCommerce versions.
+* Compatibility improvement for newer mySQL versions.
+
+= 3.0.3 =
+*Release Date - 29 Jan 2026*
+* Improved cached order data handling.
+
+= 3.0.2 =
+*Release Date - 28 Jan 2026*
+* Checked compatibility with the latest WordPress and WooCommerce versions.
+* Minor fix in email instructions logic.
+
 = 3.0.1 =
 *Release Date - 05 Dec 2025*

paybybank/trunk/admin/class-dc-paybybank-admin.php

@@ -459 +459 @@
                 // An INSERT ON DUPLICATE KEY UPDATE is performed as a hack to quickly mass update multiple records with a single SQL query.
                 $values = implode( ", ", $values );
-                $sql    = "INSERT INTO {$pbb_table_name} (order_id, pbb_id, rf_code, pbb_status, update_pending) VALUES {$values} AS newval ON DUPLICATE KEY UPDATE pbb_status = newval.pbb_status, update_pending = newval.update_pending";
+                $sql    = "INSERT INTO {$pbb_table_name} (order_id, pbb_id, rf_code, pbb_status, update_pending) VALUES {$values} ON DUPLICATE KEY UPDATE pbb_status = VALUES(pbb_status), update_pending = VALUES(update_pending)";
                 $res    = $wpdb->query( $sql );
             }

paybybank/trunk/dc-paybybank.php

@@ -8 +8 @@
  * Author:            PayByBank
  * Author URI:        https://www.paybybank.eu/
- * Version:           3.0.1
+ * Version:           3.0.4
  * Text Domain:       paybybank
  * Domain Path:       /languages
  * Requires at least: 5.6
- * Tested up to:      6.9
+ * Tested up to:      6.9.1
  * WC requires at least: 5.6.0
- * WC tested up to:   10.3.6
+ * WC tested up to:   10.5.2
  * Requires PHP:      7.4
  * Requires Plugins:  woocommerce
@@ -34 +34 @@
      * Plugin constants.
      */
-    define( 'DC_PAYBYBANK_VERSION', '3.0.1' );
+    define( 'DC_PAYBYBANK_VERSION', '3.0.4' );
     define( 'DC_PAYBYBANK_SLUG', 'paybybank' );
     define( 'DC_PAYBYBANK_BASE_TEST_PATH', 'https://testapi.e-paylink.com/gateway/rest/api/v1' );

paybybank/trunk/public/class-dc-paybybank-public.php

@@ -29 +29 @@
     private string $payment_code_life;
     private string $order_status;
-    private string $order_status_success;
+    // private string $order_status_success;
     private string $extra_fee;
-    private string $paid_email;
+    // private string $paid_email;
     private $logger;
 
@@ -54 +54 @@
         $this->payment_code_life    = $gateway_settings['payment_code_life'] ?? '720';
         $this->order_status         = $gateway_settings['order_status'] ?? 'wc-on-hold';
-        $this->order_status_success = $gateway_settings['order_status_success'] ?? 'wc-paybybank-paid';
+        // $this->order_status_success = $gateway_settings['order_status_success'] ?? 'wc-paybybank-paid';
         $this->extra_fee            = $gateway_settings['extra_fee'] ?? '';
-        $this->paid_email           = $gateway_settings['paid_email'] ?? '';
+        // $this->paid_email           = $gateway_settings['paid_email'] ?? '';
         $this->logger               = wc_string_to_bool( $gateway_settings['enable_log'] ?? false ) ? wc_get_logger() : false;
     }
 
-    
+
 
     /**
@@ -109 +109 @@
         if ( empty( $reference_code ) ) {
             esc_html_e( 'An error occurred with your RF Code. Please contact us to help you complete your order.', 'paybybank' );
+
             return;
         }
 
-        $instructions        = trim( $this->instructions );
-        $open_banking_result = $order->get_meta( 'dc_pbb_ob_result' );
-
-        // special messages when redirected from open banking - skip default instructions
-        if ( ! empty( $open_banking_result ) ) {
+        $instructions         = trim( $this->instructions );
+        $open_banking_result  = $order->get_meta( 'dc_pbb_ob_result' );
+        $open_banking_bank_id = $order->get_meta( 'dc_pbb_selected_bank' );
+
+        // special messages when redirected from open banking - skip default instructions, hide RF
+        if ( is_numeric( $open_banking_bank_id ) && $open_banking_bank_id >= 0 ) {
+
+            // it should not be empty in any case, probably an object cache issue
+            // try to clear the cache, give it some time, and then refetch order
+            if ( empty( $open_banking_result ) ) {
+
+                if ( $this->logger ) {
+                    $this->logger->error( 'Open banking result is missing from Open banking order #' . $order_id, [ 'source' => DC_PAYBYBANK_SLUG ] );
+                }
+
+                // Clear legacy post cache (covers CPT mode and HPOS Sync mode)
+                clean_post_cache( $order_id );
+
+                // Clear WooCommerce specific order caches (covers HPOS and Object Caching)
+                wp_cache_delete( $order_id, 'orders' );
+                wp_cache_delete( $order_id, 'order_objects' );
+
+                // Clear internal PHP Order Data Cache
+                try {
+                    if ( class_exists( 'Automattic\WooCommerce\Internal\DataStores\Orders\OrdersTableDataStore' )
+                         && class_exists( 'Automattic\WooCommerce\Caches\OrderCache' ) ) {
+                        $order_cache = wc_get_container()->get( \Automattic\WooCommerce\Caches\OrderCache::class );
+                        $order_cache->remove( $order_id );
+                    }
+                }
+                catch ( \Exception $e ) {
+                }
+
+                sleep( 0.5 );
+
+                $fresh_order = wc_get_order( $order_id );
+
+                if ( $order instanceof WC_Order ) {
+                    $order = $fresh_order;
+                }
+
+                $open_banking_result = $order->get_meta( 'dc_pbb_ob_result' );
+            }
 
             if ( 'success' === $open_banking_result ) {
                 $ob_message = __( 'Your order is on hold until we confirm your payment. You will be updated about the status of your order via e-mail soon.', 'paybybank' );
             }
+            elseif ( 'failure' === $open_banking_result ) {
+                $ob_message = __( 'Your payment has failed. You can still get your products. You will receive an e-mail in a few minutes with an RF-code and instructions to complete the payment.', 'paybybank' );
+            }
             else {
-                $ob_message = __( 'Your payment has failed. You can still get your products. You will receive an e-mail in a few minutes with an RF-code and instructions to complete the payment.', 'paybybank' );
+                // if the result is still empty, show a generic message
+                $ob_message = __( 'Your order is on hold until we confirm your payment. You will be updated about the status of your order via e-mail soon.', 'paybybank' );
             }
 
@@ -128 +171 @@
         }
         else {
+            // classic RF flow (show RF in thank-you page)
             if ( empty( $instructions ) ) return;
 
@@ -144 +188 @@
 
             $instructions = str_replace( '{pbb_rf_code}', $reference_code_html, $instructions );
-            $instructions = str_replace( '{pbb_rf_amount}', wc_price( $order->get_total() ), $instructions ) ;
+            $instructions = str_replace( '{pbb_rf_amount}', wc_price( $order->get_total() ), $instructions );
 
             echo wpautop( wptexturize( wp_kses_post( $instructions ) ) );
@@ -171 +215 @@
         if ( empty( $reference_code ) ) {
             esc_html_e( 'An error occurred with your PayByBank payment. Please contact us to help you complete your order.', 'paybybank' );
+
             return;
         }
@@ -180 +225 @@
         // Don't show any special message if the order was created via open banking
         // and the user is redirected to his e-banking (we have no result yet).
-        if ( empty( $open_banking_result ) && is_numeric( $open_banking_bank_id ) && $open_banking_bank_id >= 0 ) {
-
-            $instructions = __( 'You will receive an e-mail in a few minutes, as soon as we confirm your payment with PayByBank service.', 'paybybank' );
+        if ( is_numeric( $open_banking_bank_id ) && $open_banking_bank_id >= 0 ) {
+
+            if ( empty( $open_banking_result ) ) {
+                $instructions = __( 'You will receive an e-mail in a few minutes, as soon as we confirm your payment with PayByBank service.', 'paybybank' );
+            }
         }
         else { // classic payment with RF
@@ -193 +240 @@
                 }
 
-                $instructions = str_replace( '{pbb_rf_code}', $reference_code_html, $this->email_instructions ) ;
-                $instructions = str_replace( '{pbb_rf_amount}', wc_price( $order->get_total() ), $instructions ) ;
+                $instructions = str_replace( '{pbb_rf_code}', $reference_code_html, $this->email_instructions );
+                $instructions = str_replace( '{pbb_rf_amount}', wc_price( $order->get_total() ), $instructions );
             }
             else {
@@ -300 +347 @@
             '1'  => 'alphabank.png',
             '2'  => 'nbg.png',
-            '3' => 'piraeus.png',
+            '3'  => 'piraeus.png',
             '6'  => 'nbg.png',
             '8'  => 'alphabank.png',
@@ -354 +401 @@
         if ( is_wp_error( $bank_options ) ) {
             echo '<div class="dc-paybybank-error-message">' . esc_html( $bank_options->get_error_message() ) . '</div>';
+
             return;
         }
@@ -401 +449 @@
             wp_send_json_error( [
                 'redirect_url' => wc_get_checkout_url()
-            ]);
+            ] );
         }
 
@@ -412 +460 @@
             wp_send_json_error( [
                 'redirect_url' => wc_get_checkout_url()
-            ]);
+            ] );
         }
 
@@ -474 +522 @@
                     $order->set_transaction_id( $transaction_id );
                 }
-                catch ( WC_Data_Exception $e ) {}
+                catch ( WC_Data_Exception $e ) {
+                }
             }
 
             // Set order status for the new created order
             $status_for_created_order = 'wc-' === substr( $this->order_status, 0, 3 ) ? substr( $this->order_status, 3 ) : $this->order_status;
-            $order_note = $bank_id >= 0 ? __( 'Checkout with PayByBank. Payment via e-banking.', 'paybybank' ) : __( 'Checkout with PayByBank. Payment via manual RF code.', 'paybybank' );
+            $order_note               = $bank_id >= 0 ? __( 'Checkout with PayByBank. Payment via e-banking.', 'paybybank' ) : __( 'Checkout with PayByBank. Payment via manual RF code.', 'paybybank' );
             $order->update_status( $status_for_created_order, esc_html( $order_note ) );
 
@@ -502 +551 @@
             wp_send_json_success( [
                 'redirect_url' => $redirect_url ?? $order->get_checkout_order_received_url()
-            ]);
+            ] );
         }
 
@@ -514 +563 @@
         wp_send_json_error( [
             'redirect_url' => wc_get_checkout_url()
-        ]);
+        ] );
     }