From 962bcde7541efa633ca164f481399c777f68968e Mon Sep 17 00:00:00 2001
From: matty0501 <17788098+matty0501@users.noreply.github.com>
Date: Fri, 28 Feb 2025 14:46:04 +0000
Subject: [PATCH 1/2] `gpapf-save-national-format.php`: Added new snippet.

---
 .../gpapf-save-national-format.php            | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 gp-advanced-phone-field/gpapf-save-national-format.php

diff --git a/gp-advanced-phone-field/gpapf-save-national-format.php b/gp-advanced-phone-field/gpapf-save-national-format.php
new file mode 100644
index 000000000..33ff8966a
--- /dev/null
+++ b/gp-advanced-phone-field/gpapf-save-national-format.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Gravity Perks // Advanced Phone Field // Save Phone Number In National Format
+ * https://gravitywiz.com/documentation/gravity-forms-advanced-phone-field/
+ *
+ * Save the phone number in the national format, rather than international.
+ * 
+ * For example, rather than a US number saving as +15555551234, the number would be saved as (555) 555-1234.
+ */
+// Update "123" to your form ID and "4" to your Phone field ID.
+add_action( 'gform_save_field_value_123_4', function( $value, $entry, $field, $form, $input_id ) {
+
+	if ( ! is_callable( 'gp_advanced_phone_field' ) || ! class_exists( '\libphonenumber\PhoneNumberUtil' ) ) {
+		return $value;
+	}
+
+	$proto             = gp_advanced_phone_field()->get_phone_number_proto( $value );
+	$phone_number_util = \libphonenumber\PhoneNumberUtil::getInstance();
+	if ( ! $proto ) {
+		return $value;
+	}
+	return $phone_number_util->format( $proto, \libphonenumber\PhoneNumberFormat::NATIONAL );
+
+}, 10, 5 );

From a09d644e0a43e84a94884039d225f4bde0ca2102 Mon Sep 17 00:00:00 2001
From: Saif Sultan <saifsultanc@gmail.com>
Date: Fri, 20 Jun 2025 18:33:48 +0530
Subject: [PATCH 2/2] `gpapf-save-national-format.php`: Added new snippet.

---
 gp-advanced-phone-field/gpapf-save-national-format.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gp-advanced-phone-field/gpapf-save-national-format.php b/gp-advanced-phone-field/gpapf-save-national-format.php
index 33ff8966a..962c54df2 100644
--- a/gp-advanced-phone-field/gpapf-save-national-format.php
+++ b/gp-advanced-phone-field/gpapf-save-national-format.php
@@ -10,7 +10,7 @@
 // Update "123" to your form ID and "4" to your Phone field ID.
 add_action( 'gform_save_field_value_123_4', function( $value, $entry, $field, $form, $input_id ) {
 
-	if ( ! is_callable( 'gp_advanced_phone_field' ) || ! class_exists( '\libphonenumber\PhoneNumberUtil' ) ) {
+	if ( ! is_callable( 'gp_advanced_phone_field' ) || ! class_exists( '\libphonenumber\PhoneNumberUtil' ) || rgget( 'page' ) != 'gf_entries') {
 		return $value;
 	}
 
@@ -19,6 +19,11 @@
 	if ( ! $proto ) {
 		return $value;
 	}
-	return $phone_number_util->format( $proto, \libphonenumber\PhoneNumberFormat::NATIONAL );
+	try {
+		return $phone_number_util->format( $proto, \libphonenumber\PhoneNumberFormat::NATIONAL );
+	} catch ( Exception $e ) {
+		error_log( 'Error formatting phone number: ' . $e->getMessage() );
+		return $value;
+	}
 
 }, 10, 5 );