From 5976139e8ae7ea3ebac162c05eddf26f15ac1a22 Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Fri, 7 Oct 2022 16:47:28 +0400
Subject: [PATCH] Fix simc filter

---
 modules/ppcp-compat/services.php                | 3 +--
 modules/ppcp-compat/src/Assets/CompatAssets.php | 8 +++++---
 modules/ppcp-compat/src/CompatModule.php        | 4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-compat/services.php b/modules/ppcp-compat/services.php
index 10ee96c43..320af2c70 100644
--- a/modules/ppcp-compat/services.php
+++ b/modules/ppcp-compat/services.php
@@ -91,9 +91,8 @@ return array(
 
 		$tracking_enabled     = $settings->has( 'tracking_enabled' ) && $settings->get( 'tracking_enabled' );
 		$is_gzd_active        = $container->get( 'compat.gzd.is_supported_plugin_version_active' );
-		$should_sync_shipment = apply_filters( 'woocommerce_paypal_payments_sync_gzd_tracking', true );
 
-		return $tracking_enabled && $is_gzd_active && $should_sync_shipment;
+		return $tracking_enabled && $is_gzd_active;
 	},
 
 );
diff --git a/modules/ppcp-compat/src/Assets/CompatAssets.php b/modules/ppcp-compat/src/Assets/CompatAssets.php
index 0726030b7..8f35c1198 100644
--- a/modules/ppcp-compat/src/Assets/CompatAssets.php
+++ b/modules/ppcp-compat/src/Assets/CompatAssets.php
@@ -53,8 +53,9 @@ class CompatAssets {
 	 * @return void
 	 */
 	public function register(): void {
-		if ( $this->should_enqueue_gzd_scripts ) {
-			wp_register_script(
+        $gzd_sync_enabled = apply_filters( 'woocommerce_paypal_payments_sync_gzd_tracking', true );
+        if ( $this->should_enqueue_gzd_scripts && $gzd_sync_enabled ) {
+            wp_register_script(
 				'ppcp-gzd-compat',
 				untrailingslashit( $this->module_url ) . '/assets/js/gzd-compat.js',
 				array( 'jquery' ),
@@ -70,7 +71,8 @@ class CompatAssets {
 	 * @return void
 	 */
 	public function enqueue(): void {
-		if ( $this->should_enqueue_gzd_scripts ) {
+        $gzd_sync_enabled = apply_filters( 'woocommerce_paypal_payments_sync_gzd_tracking', true );
+		if ( $this->should_enqueue_gzd_scripts && $gzd_sync_enabled ) {
 			wp_enqueue_script( 'ppcp-gzd-compat' );
 		}
 	}
diff --git a/modules/ppcp-compat/src/CompatModule.php b/modules/ppcp-compat/src/CompatModule.php
index 053f1b6e6..395554639 100644
--- a/modules/ppcp-compat/src/CompatModule.php
+++ b/modules/ppcp-compat/src/CompatModule.php
@@ -132,6 +132,10 @@ class CompatModule implements ModuleInterface {
 		add_action(
 			'woocommerce_gzd_shipment_after_save',
 			static function( Shipment $shipment ) use ( $endpoint, $logger, $status_map ) {
+                if ( ! apply_filters( 'woocommerce_paypal_payments_sync_gzd_tracking', true ) ) {
+                    return;
+                }
+
 				$gzd_shipment_status = $shipment->get_status();
 				if ( ! array_key_exists( $gzd_shipment_status, $status_map ) ) {
 					return;