Merge pull request #419 from MinnPost/418-ignoring-sf-record-type

Fix missing Record Type when pulled from Salesforce. Thanks to @timnolte for the report.
MinnPost · Sep 10, 2021 · ddcf497 · ddcf497
2 parents 650413e + 019b723
commit ddcf497
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/classes/class-object-sync-sf-mapping.php b/classes/class-object-sync-sf-mapping.php
@@ -1119,12 +1119,12 @@ private function prepare_fieldmap_data( $mappings, $record_type = '' ) {
 			$mappings[ $id ]['salesforce_record_types_allowed'] = isset( $mapping['salesforce_record_types_allowed'] ) ? maybe_unserialize( $mapping['salesforce_record_types_allowed'] ) : array();
 			$mappings[ $id ]['fields']                          = isset( $mapping['fields'] ) ? maybe_unserialize( $mapping['fields'] ) : array();
 			$mappings[ $id ]['sync_triggers']                   = isset( $mapping['sync_triggers'] ) ? maybe_unserialize( $mapping['sync_triggers'] ) : array();
-			if ( '' !== $record_type && ! in_array( $record_type, $mappings[ $id ]['salesforce_record_types_allowed'], true ) ) {
-				unset( $mappings[ $id ] );
-			}
 			// format the sync triggers.
 			$sync_triggers                    = $this->maybe_upgrade_sync_triggers( $mappings[ $id ]['sync_triggers'], $mapping['version'], $mapping['id'] );
 			$mappings[ $id ]['sync_triggers'] = $sync_triggers;
+			if ( '' !== $record_type && ! in_array( $record_type, $mappings[ $id ]['salesforce_record_types_allowed'], true ) ) {
+				unset( $mappings[ $id ] );
+			}
 		}
 		return $mappings;
 	}