Changeset 2720557

Timestamp:

05/09/2022 10:19:52 AM (4 years ago)

Author:

pomegranate

Message:

v2.14.5

Location:

woocommerce-pdf-invoices-packing-slips/trunk

Files:

• includes/documents/abstract-wcpdf-order-document.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• woocommerce-pdf-invoices-packingslips.php (modified) (3 diffs)

woocommerce-pdf-invoices-packing-slips/trunk/includes/documents/abstract-wcpdf-order-document.php

@@ -131 +131 @@
         $settings = (array) $document_settings + (array) $common_settings;
 
-        // return only most current if forced
-        if ( $latest == true ) {
-            return $settings;
-        }
-
-        // get historical settings if enabled
-        if ( ! empty( $this->order ) && $this->use_historical_settings() == true ) {
-            $order_settings = WCX_Order::get_meta( $this->order, "_wcpdf_{$this->slug}_settings" );
-            if ( ! empty( $order_settings ) && ! is_array( $order_settings ) ) {
-                $order_settings = maybe_unserialize( $order_settings );
-            }
-            if ( ! empty( $order_settings ) && is_array( $order_settings ) ) {
-                // ideally we should combine the order settings with the latest settings, so that new settings will
-                // automatically be applied to existing orders too. However, doing this by combining arrays is not
-                // possible because the way settings are currently stored means unchecked options are not included.
-                // This means there is no way to tell whether an option didn't exist yet (in which case the new
-                // option should be added) or whether the option was simly unchecked (in which case it should not
-                // be overwritten). This can only be address by storing unchecked checkboxes too.
-                $settings = (array) $order_settings + array_intersect_key( (array) $settings, array_flip( $this->get_non_historical_settings() ) );
-            }
-        }
-        if ( $this->storing_settings_enabled() && empty( $order_settings ) && ! empty( $this->order ) ) {
-            // this is either the first time the document is generated, or historical settings are disabled
-            // in both cases, we store the document settings
-            // exclude non historical settings from being saved in order meta
-            WCX_Order::update_meta_data( $this->order, "_wcpdf_{$this->slug}_settings", array_diff_key( $settings, array_flip( $this->get_non_historical_settings() ) ) );
+        if ( $latest != true ) {
+            // get historical settings if enabled
+            if ( ! empty( $this->order ) && $this->use_historical_settings() == true ) {
+                $order_settings = WCX_Order::get_meta( $this->order, "_wcpdf_{$this->slug}_settings" );
+                if ( ! empty( $order_settings ) && ! is_array( $order_settings ) ) {
+                    $order_settings = maybe_unserialize( $order_settings );
+                }
+                if ( ! empty( $order_settings ) && is_array( $order_settings ) ) {
+                    // ideally we should combine the order settings with the latest settings, so that new settings will
+                    // automatically be applied to existing orders too. However, doing this by combining arrays is not
+                    // possible because the way settings are currently stored means unchecked options are not included.
+                    // This means there is no way to tell whether an option didn't exist yet (in which case the new
+                    // option should be added) or whether the option was simly unchecked (in which case it should not
+                    // be overwritten). This can only be address by storing unchecked checkboxes too.
+                    $settings = (array) $order_settings + array_intersect_key( (array) $settings, array_flip( $this->get_non_historical_settings() ) );
+                }
+            }
+            if ( $this->storing_settings_enabled() && empty( $order_settings ) && ! empty( $this->order ) ) {
+                // this is either the first time the document is generated, or historical settings are disabled
+                // in both cases, we store the document settings
+                // exclude non historical settings from being saved in order meta
+                WCX_Order::update_meta_data( $this->order, "_wcpdf_{$this->slug}_settings", array_diff_key( $settings, array_flip( $this->get_non_historical_settings() ) ) );
+            }
         }
 

woocommerce-pdf-invoices-packing-slips/trunk/readme.txt

@@ -4 +4 @@
 Tags: woocommerce, pdf, invoices, packing slips, print, delivery notes, invoice, packing slip, export, email, bulk, automatic
 Requires at least: 3.5
-Tested up to: 5.9
+Tested up to: 
 Requires PHP: 7.1
-Stable tag: 2.14.4
+Stable tag: 2.14.
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -102 +102 @@
 
 == Changelog ==
+
+
+
+
 
 = 2.14.4 =

woocommerce-pdf-invoices-packing-slips/trunk/woocommerce-pdf-invoices-packingslips.php

@@ -4 +4 @@
  * Plugin URI: https://wpovernight.com/downloads/woocommerce-pdf-invoices-packing-slips-bundle/
  * Description: Create, print & email PDF invoices & packing slips for WooCommerce orders.
- * Version: 2.14.4
+ * Version: 2.14.
  * Author: WP Overnight
  * Author URI: https://www.wpovernight.com
@@ -11 +11 @@
  * Text Domain: woocommerce-pdf-invoices-packing-slips
  * WC requires at least: 2.2.0
- * WC tested up to: 6.4
+ * WC tested up to: 6.
  */
 
@@ -22 +22 @@
 class WPO_WCPDF {
 
-    public $version = '2.14.4';
+    public $version = '2.14.';
     public $plugin_basename;
     public $legacy_mode;