Changeset 3429311

Timestamp:

12/29/2025 10:09:46 PM (7 weeks ago)

Author:

maximumsoftware

Message:

Deploy from Git

Location:

pdf-forms-for-woocommerce/trunk

Files:

• pdf-forms-for-woocommerce.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)
• src/integration/wc-placeholder-processor.php (modified) (2 diffs)

pdf-forms-for-woocommerce/trunk/pdf-forms-for-woocommerce.php

@@ -4 +4 @@
  * Plugin URI: https://pdfformsfiller.org/
  * Description: Automatically fill PDF forms with WooCommerce orders and attach generated PDFs to email notifications and order downloads.
- * Version: 1.1.4
+ * Version: 1.1.5
  * Requires at least: 5.4
  * Requires PHP: 5.5
  * Requires Plugins: woocommerce
  * WC requires at least: 7.1.0
- * WC tested up to: 10.3
+ * WC tested up to: 10.4
  * Author: Maximum.Software
  * Author URI: https://maximum.software/
@@ -27 +27 @@
     class Pdf_Forms_For_WooCommerce
     {
-        const VERSION = '1.1.4';
+        const VERSION = '1.1.5';
         const MIN_WC_VERSION = '7.1.0';
-        const MAX_WC_VERSION = '10.3.99';
+        const MAX_WC_VERSION = '10.4.99';
         private static $BLACKLISTED_WC_VERSIONS = array();
         
@@ -934 +934 @@
                     throw new Exception( __( "Invalid order", 'pdf-forms-for-woocommerce' ) );
                 
+                // remove old downloadable files
+                $this->unset_downloadable_files( $order );
+                
                 $this->reset_order_settings( $order );
             }
@@ -971 +974 @@
                 $this->unset_downloadable_files( $order );
                 
-                // refilling is necessary only if PDFs are being saved in wp-uploads
+                // refilling is necessary only if PDFs are being saved in wp-uploads or there are downloadable files
                 $product_settings = $this->get_order_metadata( $order, 'product-settings' );
                 if( is_array( $product_settings ) && ! empty( $product_settings ) )
@@ -1002 +1005 @@
                             if( isset( $attachment['options'] )
                             && is_array( $options = $attachment['options'] )
-                            && isset( $options['save_directory'] )
-                            && $options['save_directory'] !== "" )
+                            && ( ( isset( $options['save_directory'] ) && $options['save_directory'] !== "" )
+                              || ( isset( $options['download_id'] ) && $options['download_id'] !== "" ) ) )
                             {
                                 $this->fill_pdfs( $settings, $placeholder_processor );

pdf-forms-for-woocommerce/trunk/readme.txt

@@ -1 +1 @@
 === PDF Forms Filler for WooCommerce ===
-Version: 1.1.4
-Stable tag: 1.1.4
-Tested up to: 6.7
+Version: 1.1.5
+Stable tag: 1.1.5
+Tested up to: 6.9
 Tags: pdf, form, woocommerce, email, download
 Plugin URI: https://pdfformsfiller.org/
@@ -54 +54 @@
 
 == Changelog ==
+
+= 1.1.5 =
+
+* Release date: December 29, 2025
+
+* Verified support for WC 10.4
+* Other minor bug fixes and improvements
 
 = 1.1.4 =

pdf-forms-for-woocommerce/trunk/src/integration/wc-placeholder-processor.php

@@ -186 +186 @@
             {
                 if( is_a( $this->email, 'WC_Email' ) )
+                {
+                    // ensure {order_billing_full_name} is set if we have an order and it's not already set
+                    if( is_a( $this->order, 'WC_Order' ) && empty( $this->email->placeholders['{order_billing_full_name}'] ) )
+                        $this->email->placeholders['{order_billing_full_name}'] = $this->order->get_formatted_billing_full_name();
+
                     // this will process {blogname} (hardcoded in format_string),
                     // {site_title}, {site_address}, {site_url} (hardcoded in class WC_Email)
                     // and tags from woocommerce_email_format_string, woocommerce_email_format_string_find and woocommerce_email_format_string_replace filters
                     return $this->email->format_string( $content );
+                }
                 
                 if( is_a( $this->order, 'WC_Order' ) )
@@ -239 +245 @@
                         );
                         
-                        $find = array_keys( $placeholders );
-                        $replace = array_values( $placeholders );
-                        
-                        $email->find = array_merge( (array) $email->find, $find );
-                        $email->replace = array_merge( (array) $email->replace, $replace );
+                        $email->placeholders = array_merge( (array) $email->placeholders, $placeholders );
                         
                         return $email->format_string( $content );