Changeset 3236147

Timestamp:

02/06/2025 04:42:16 PM (14 months ago)

Author:

gravitywp

Message:

Update to version 1.4.2 from GitHub

Location:

gravitywp-merge-tags

Files:

• tags/1.4.2 (copied) (copied from gravitywp-merge-tags/trunk)
• tags/1.4.2/assets/css/admin.css (modified) (1 diff)
• tags/1.4.2/gravitywp-merge-tags.php (modified) (2 diffs)
• tags/1.4.2/languages/gravitywp-merge-tags-nl_NL.mo (modified) (previous)
• tags/1.4.2/languages/gravitywp-merge-tags-nl_NL.po (modified) (10 diffs)
• tags/1.4.2/phpstan.neon (deleted)
• tags/1.4.2/readme.txt (modified) (2 diffs)
• tags/1.4.2/templates/template-dynamic-population.php (modified) (3 diffs)
• trunk/assets/css/admin.css (modified) (1 diff)
• trunk/gravitywp-merge-tags.php (modified) (2 diffs)
• trunk/languages/gravitywp-merge-tags-nl_NL.mo (modified) (previous)
• trunk/languages/gravitywp-merge-tags-nl_NL.po (modified) (10 diffs)
• trunk/phpstan.neon (deleted)
• trunk/readme.txt (modified) (2 diffs)
• trunk/templates/template-dynamic-population.php (modified) (3 diffs)

gravitywp-merge-tags/tags/1.4.2/assets/css/admin.css

@@ -5 +5 @@
     user-select: all;          /* Likely future */   
 }
+
+.wp-list-table.widefat.break-all {
+    word-break: break-all;
+}
+
+.wp-list-table.widefat .break-word {
+    word-break: break-word;
+}
+
+.wp-list-table .user-select-all {
+    user-select: all;
+}

gravitywp-merge-tags/tags/1.4.2/gravitywp-merge-tags.php

@@ -4 +4 @@
 Plugin URI: https://gravitywp.com/plugin/merge-tags
 Description: Gravity Forms add-on to list all the merge tags from a specific form
-Version: 1.4.1
+Version: 1.4.2
 Author: GravityWP
 Author URI: https://gravitywp.com
@@ -12 +12 @@
 */
 
-define( 'GWP_MERGETAGS_VERSION', '1.4.1' );
+define( 'GWP_MERGETAGS_VERSION', '1.4.2' );
 
 add_action( 'gform_loaded', array( 'GWPMergeTags_AddOn_Bootstrap', 'load' ), 5 );

gravitywp-merge-tags/tags/1.4.2/languages/gravitywp-merge-tags-nl_NL.po

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: GravityWP - Merge Tags\n"
-"POT-Creation-Date: 2024-05-27 13:30-0400\n"
-"PO-Revision-Date: 2024-05-27 13:36-0400\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2025-02-04 12:02+0100\n"
+"PO-Revision-Date: 2025-02-04 12:03+0100\n"
+"Last-Translator: Jurriaan Koops <[email protected]>\n"
 "Language-Team: \n"
 "Language: nl_NL\n"
@@ -51 +51 @@
 msgstr "Workflow"
 
-#: class-gwp-mergetags.php:303 templates/template-all-fields.php:161
-#: templates/template-all-fields.php:164
+#: class-gwp-mergetags.php:303 templates/template-all-fields.php:163
+#: templates/template-all-fields.php:166
 msgid "All Fields"
 msgstr "Alle velden"
@@ -64 +64 @@
 msgstr "Selecteer formulier"
 
-#: templates/template-all-fields.php:54
+#: templates/template-all-fields.php:55
 msgid "Copy"
 msgstr "Kopiëren"
@@ -108 +108 @@
 msgstr ""
 
-#: templates/template-all-fields.php:96
-msgid "Gravity View gvlogic"
-msgstr ""
-
 #: templates/template-all-fields.php:97
+msgid "GravityView gvlogic"
+msgstr ""
+
+#: templates/template-all-fields.php:99
 msgid "Without fileuploads"
 msgstr "Zonder bestanden"
 
-#: templates/template-all-fields.php:111
+#: templates/template-all-fields.php:113
 msgid "Select all fields"
 msgstr "Selecteer alle velden"
 
-#: templates/template-all-fields.php:113
+#: templates/template-all-fields.php:115
 msgid "Label"
 msgstr "Label"
 
-#: templates/template-all-fields.php:114 templates/template-calculations.php:32
+#: templates/template-all-fields.php:116 templates/template-calculations.php:32
 #: templates/template-conditional-logic.php:16
 #: templates/template-conditional-logic.php:109
@@ -131 +131 @@
 msgstr "Admin beheerder"
 
-#: templates/template-all-fields.php:115 templates/template-all-fields.php:161
-#: templates/template-gravity-flow.php:12
+#: templates/template-all-fields.php:117 templates/template-all-fields.php:163
+#: templates/template-dynamic-population.php:62
+#: templates/template-gravity-flow.php:15
 msgid "Type"
 msgstr "Soort"
 
-#: templates/template-all-fields.php:116
+#: templates/template-all-fields.php:118
 #: templates/template-merge-tags-advanced.php:41
 #: templates/template-merge-tags-advanced.php:73
@@ -142 +143 @@
 msgstr "CSS"
 
-#: templates/template-all-fields.php:164
+#: templates/template-all-fields.php:166
 msgid "Table"
 msgstr "Tabel"
 
-#: templates/template-all-fields.php:173
+#: templates/template-all-fields.php:175
 msgid "Replace All Fields Merge Tag"
 msgstr "Vervang All Fields Merge Tag"
 
-#: templates/template-all-fields.php:216
+#: templates/template-all-fields.php:218
 msgid "Replace All Fields Merge Tag with Gravity Forms shortcode"
 msgstr "Vervang All Fields Merge Tag door de Gravity Forms shortcode"
 
-#: templates/template-all-fields.php:265
+#: templates/template-all-fields.php:267
 msgid "Replace All Fields Merge Tag with Gravity View shortcode"
 msgstr "Vervang All Fields Merge Tag door de Gravity View shortcode"
 
-#: templates/template-all-fields.php:318
+#: templates/template-all-fields.php:320
 msgid "Replace All Fields Merge Tag without fileuploads"
 msgstr "Vervang All Fields Merge Tag zonder bestanduploads"
@@ -169 +170 @@
 #: templates/template-conditional-logic.php:14
 #: templates/template-conditional-logic.php:107
-#: templates/template-gravity-flow.php:11
+#: templates/template-gravity-flow.php:14
 msgid "ID"
 msgstr "ID"
@@ -217 +218 @@
 msgstr "Gebruikt in voorwaardelijke logica van veld met ID"
 
-#: templates/template-dynamic-population.php:33
+#: templates/template-dynamic-population.php:46
+msgid "Dynamic Population Type:"
+msgstr "Dynamisch vullen Type:"
+
+#: templates/template-dynamic-population.php:47
+msgid "URL"
+msgstr ""
+
+#: templates/template-dynamic-population.php:48
+msgid "URL with merge tags"
+msgstr "URL met merge tags"
+
+#: templates/template-dynamic-population.php:49
+msgid "Excel formula (International)"
+msgstr "Excel formule (Internationaal)"
+
+#: templates/template-dynamic-population.php:50
+msgid "Excel formula (Localized)"
+msgstr "Excel formule (Lokaal)"
+
+#: templates/template-dynamic-population.php:52
+#: templates/template-dynamic-population.php:94
+msgid "JWT Prefill"
+msgstr ""
+
+#: templates/template-dynamic-population.php:63
+msgid "Value"
+msgstr "Waarde"
+
+#: templates/template-dynamic-population.php:68
 msgid "Url query string template for dynamic population"
 msgstr "Url-query string sjabloon voor dynamisch vullen"
 
-#: templates/template-dynamic-population.php:41
+#: templates/template-dynamic-population.php:72
 msgid "Url query string template with merge tags for dynamic population"
 msgstr "Url-query string sjabloon met samenvoegtags voor dynamische populatie"
 
-#: templates/template-dynamic-population.php:49
+#: templates/template-dynamic-population.php:76
 msgid "Excel formula for generating url (encoded) query string (International)"
 msgstr ""
@@ -231 +261 @@
 "(internationaal)"
 
-#: templates/template-dynamic-population.php:57
+#: templates/template-dynamic-population.php:81
 msgid "Excel formula for generating url (encoded) query string (Localized)"
 msgstr ""
@@ -238 +268 @@
 
 #. translators: Translate to localized excel function.
-#: templates/template-dynamic-population.php:64
+#: templates/template-dynamic-population.php:85
 msgid "ENCODEURL"
 msgstr "URL.CODEREN"
 
-#: templates/template-gravity-flow.php:10
+#: templates/template-dynamic-population.php:94
+msgid "shortcode string for dynamic population"
+msgstr "shortcode string voor dynamisch vullen"
+
+#: templates/template-gravity-flow.php:8
+msgid "Worfklow Status"
+msgstr ""
+
+#: templates/template-gravity-flow.php:13
 msgid "Gravity Flow Step"
 msgstr "GravityFlow Stap"
 
-#: templates/template-gravity-flow.php:13
+#: templates/template-gravity-flow.php:16
 msgid "Active"
 msgstr "Actief"
 
-#: templates/template-gravity-flow.php:14
+#: templates/template-gravity-flow.php:17
 msgid "Conditions"
 msgstr "Voorwaarden"
 
-#: templates/template-gravity-flow.php:15
+#: templates/template-gravity-flow.php:18
 msgid "Next Step (id)"
 msgstr "Volgende Stap (id)"
 
-#: templates/template-gravity-flow.php:16
+#: templates/template-gravity-flow.php:19
 msgid "Count Shortcode"
 msgstr "Count Shortcode"

gravitywp-merge-tags/tags/1.4.2/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 6.7
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -76 +76 @@
 
 == Changelog ==
+
+= 1.4.2 =
+* Added JWT prefill string to Dynamic Population tab.
 
 = 1.4.1 =

gravitywp-merge-tags/tags/1.4.2/templates/template-dynamic-population.php

@@ -5 +5 @@
 
 <?php
-$pre_fill_url       = '/?';
-$pre_fill_url_excel = '"/?';
-$pre_fill_url_mergetags = '/?';
+$gwp_prefill_plugin_activated = class_exists( '\GravityWP\Prefill\GWP_Prefill' );
+$pre_fill_url                 = '/?';
+$pre_fill_url_excel           = '"/?';
+$pre_fill_url_mergetags       = '/?';
+$pre_fill_url_jwt             = '';
+$gwp_prefill_plugin_activated = class_exists( '\GravityWP\Prefill\GWP_Prefill' );
+$pre_fill_url                 = '/?';
+$pre_fill_url_excel           = '"/?';
+$pre_fill_url_mergetags       = '/?';
+$pre_fill_url_jwt             = '';
 if ( isset( $form['fields'] ) && is_array( $form['fields'] ) ) {
     foreach ( $form['fields'] as $field ) {
@@ -19 +26 @@
 
         if ( ! empty( $field['inputName'] ) && property_exists( $field, 'allowsPrepopulate' ) && $field['allowsPrepopulate'] === true ) {
-            $pre_fill_url       .= $field['inputName'] . '=MERGETAG&';
-            $pre_fill_url_excel .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
+            $pre_fill_url           .= $field['inputName'] . '=MERGETAG&';
+            $pre_fill_url_excel     .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
+            $pre_fill_url           .= $field['inputName'] . '=MERGETAG&';
+            $pre_fill_url_excel     .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
             $pre_fill_url_mergetags .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '={' . $field['adminLabel'] . ':' . $field['id'] . '}&' : $field['inputName'] . '={' . $field['label'] . ':' . $field['id'] . '}&';
+            if ( $gwp_prefill_plugin_activated ) {
+                $pre_fill_url_jwt .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '=\'{' . $field['adminLabel'] . ':' . $field['id'] . '}\' ' : $field['inputName'] . '=\'{' . $field['label'] . ':' . $field['id'] . '}\' ';
+            }
+            if ( $gwp_prefill_plugin_activated ) {
+                $pre_fill_url_jwt .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '=\'{' . $field['adminLabel'] . ':' . $field['id'] . '}\' ' : $field['inputName'] . '=\'{' . $field['label'] . ':' . $field['id'] . '}\' ';
+            }
         }
     }
@@ -27 +42 @@
 ?>
 
-<table class='wp-list-table widefat striped'>
+<div id="gwp-dynamic-population-anchor-links-wrapper" style="margin-bottom:10px; display:flex; flex-wrap: wrap; justify-content: space-between;">
+    <div id="gwp-dynamic-population-anchor-links" style="flex-grow: 1; border: 1px solid #c3c4c7; background: white; display:flex; flex-wrap: wrap; align-items:center;">
+        <span style="padding:10px;"><?php esc_html_e( 'Dynamic Population Type:', 'gravitywp-merge-tags' ); ?></span>
+        <a style="padding:10px;" href="#gwp-dynamic-population-url-no-mt"><?php esc_html_e( 'URL', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-url-mt"><?php esc_html_e( 'URL with merge tags', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-excel-international"><?php esc_html_e( 'Excel formula (International)', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-excel-localized"><?php esc_html_e( 'Excel formula (Localized)', 'gravitywp-merge-tags' ); ?></a>
+        <?php if ( $gwp_prefill_plugin_activated ) { ?>
+        <a style="padding:10px;" href="#gwp-dynamic-population-hwt-prefill"><?php esc_html_e( 'JWT Prefill', 'gravitywp-merge-tags' ); ?></a>
+        <?php } ?> 
+        
+    </div>
+</div>
+
+<table class='wp-list-table widefat break-all striped'>
     <tbody>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Url query string template for dynamic population', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-<tr>
-    <td colspan='6'><?php echo esc_html( rtrim( $pre_fill_url, '&' ) ); ?></td>
-</tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Url query string template with merge tags for dynamic population', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-<tr>
-    <td colspan='6'><?php echo esc_html( rtrim( $pre_fill_url_mergetags, '&' ) ); ?></td>
-</tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (International)', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-    <tr>
-        <td colspan="6"><?php echo esc_html( rtrim( $pre_fill_url_excel, '&"&' ) ); ?></td>
-    </tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (Localized)', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-    <tr>
-        <td colspan="6">
+        <thead>
+            <tr>
+                <th style="width:15%"><?php esc_html_e( 'Type', 'gravitywp-merge-tags' ); ?></th>
+                <th><?php esc_html_e( 'Value', 'gravitywp-merge-tags' ); ?></th>
+            </tr>
+        </thead>
+
+        <tr>
+            <td id="gwp-dynamic-population-url-no-mt" class="break-word"><?php esc_html_e( 'Url query string template for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url, '&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-url-mt" class="break-word"><?php esc_html_e( 'Url query string template with merge tags for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_mergetags, '&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-excel-international" class="break-word"><?php esc_html_e( 'Excel formula for generating url (encoded) query string (International)', 'gravitywp-merge-tags' ); ?></td>
+        
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_excel, '&"&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-excel-localized" class="break-word"><?php esc_html_e( 'Excel formula for generating url (encoded) query string (Localized)', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'>
+            <?php
+            /* translators: Translate to localized excel function. */
+            $excel_replace = esc_html__( 'ENCODEURL', 'gravitywp-merge-tags' );
+            echo esc_html( str_replace( 'ENCODEURL', $excel_replace, rtrim( $pre_fill_url_excel, '&"&' ) ) );
+            ?>
+            </td>
+        </tr>
         <?php
-        /* translators: Translate to localized excel function. */
-        $excel_replace = esc_html__( 'ENCODEURL', 'gravitywp-merge-tags' );
-        echo esc_html( str_replace( 'ENCODEURL', $excel_replace, rtrim( $pre_fill_url_excel, '&"&' ) ) );
+        if ( $gwp_prefill_plugin_activated ) {
+            ?>
+        <tr>
+            <td id="gwp-dynamic-population-hwt-prefill" class="break-word"><a href="https://gravitywp.com/add-on/jwt-prefill/?utm_source=merge-tags-plugin-page&utm_medium=display&utm_campaign=prefill-string"><?php echo esc_html__( 'JWT Prefill', 'gravitywp-merge-tags' ); ?></a><?php echo ' ' . esc_html__( 'shortcode string for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_jwt, '&"&' ) ); ?></td>
+        </tr>
+            <?php
+        }
         ?>
-        </td>
-    </tr>
-</tbody>
+    </tbody>
 </table>

gravitywp-merge-tags/trunk/assets/css/admin.css

@@ -5 +5 @@
     user-select: all;          /* Likely future */   
 }
+
+.wp-list-table.widefat.break-all {
+    word-break: break-all;
+}
+
+.wp-list-table.widefat .break-word {
+    word-break: break-word;
+}
+
+.wp-list-table .user-select-all {
+    user-select: all;
+}

gravitywp-merge-tags/trunk/gravitywp-merge-tags.php

@@ -4 +4 @@
 Plugin URI: https://gravitywp.com/plugin/merge-tags
 Description: Gravity Forms add-on to list all the merge tags from a specific form
-Version: 1.4.1
+Version: 1.4.2
 Author: GravityWP
 Author URI: https://gravitywp.com
@@ -12 +12 @@
 */
 
-define( 'GWP_MERGETAGS_VERSION', '1.4.1' );
+define( 'GWP_MERGETAGS_VERSION', '1.4.2' );
 
 add_action( 'gform_loaded', array( 'GWPMergeTags_AddOn_Bootstrap', 'load' ), 5 );

gravitywp-merge-tags/trunk/languages/gravitywp-merge-tags-nl_NL.po

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: GravityWP - Merge Tags\n"
-"POT-Creation-Date: 2024-05-27 13:30-0400\n"
-"PO-Revision-Date: 2024-05-27 13:36-0400\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2025-02-04 12:02+0100\n"
+"PO-Revision-Date: 2025-02-04 12:03+0100\n"
+"Last-Translator: Jurriaan Koops <[email protected]>\n"
 "Language-Team: \n"
 "Language: nl_NL\n"
@@ -51 +51 @@
 msgstr "Workflow"
 
-#: class-gwp-mergetags.php:303 templates/template-all-fields.php:161
-#: templates/template-all-fields.php:164
+#: class-gwp-mergetags.php:303 templates/template-all-fields.php:163
+#: templates/template-all-fields.php:166
 msgid "All Fields"
 msgstr "Alle velden"
@@ -64 +64 @@
 msgstr "Selecteer formulier"
 
-#: templates/template-all-fields.php:54
+#: templates/template-all-fields.php:55
 msgid "Copy"
 msgstr "Kopiëren"
@@ -108 +108 @@
 msgstr ""
 
-#: templates/template-all-fields.php:96
-msgid "Gravity View gvlogic"
-msgstr ""
-
 #: templates/template-all-fields.php:97
+msgid "GravityView gvlogic"
+msgstr ""
+
+#: templates/template-all-fields.php:99
 msgid "Without fileuploads"
 msgstr "Zonder bestanden"
 
-#: templates/template-all-fields.php:111
+#: templates/template-all-fields.php:113
 msgid "Select all fields"
 msgstr "Selecteer alle velden"
 
-#: templates/template-all-fields.php:113
+#: templates/template-all-fields.php:115
 msgid "Label"
 msgstr "Label"
 
-#: templates/template-all-fields.php:114 templates/template-calculations.php:32
+#: templates/template-all-fields.php:116 templates/template-calculations.php:32
 #: templates/template-conditional-logic.php:16
 #: templates/template-conditional-logic.php:109
@@ -131 +131 @@
 msgstr "Admin beheerder"
 
-#: templates/template-all-fields.php:115 templates/template-all-fields.php:161
-#: templates/template-gravity-flow.php:12
+#: templates/template-all-fields.php:117 templates/template-all-fields.php:163
+#: templates/template-dynamic-population.php:62
+#: templates/template-gravity-flow.php:15
 msgid "Type"
 msgstr "Soort"
 
-#: templates/template-all-fields.php:116
+#: templates/template-all-fields.php:118
 #: templates/template-merge-tags-advanced.php:41
 #: templates/template-merge-tags-advanced.php:73
@@ -142 +143 @@
 msgstr "CSS"
 
-#: templates/template-all-fields.php:164
+#: templates/template-all-fields.php:166
 msgid "Table"
 msgstr "Tabel"
 
-#: templates/template-all-fields.php:173
+#: templates/template-all-fields.php:175
 msgid "Replace All Fields Merge Tag"
 msgstr "Vervang All Fields Merge Tag"
 
-#: templates/template-all-fields.php:216
+#: templates/template-all-fields.php:218
 msgid "Replace All Fields Merge Tag with Gravity Forms shortcode"
 msgstr "Vervang All Fields Merge Tag door de Gravity Forms shortcode"
 
-#: templates/template-all-fields.php:265
+#: templates/template-all-fields.php:267
 msgid "Replace All Fields Merge Tag with Gravity View shortcode"
 msgstr "Vervang All Fields Merge Tag door de Gravity View shortcode"
 
-#: templates/template-all-fields.php:318
+#: templates/template-all-fields.php:320
 msgid "Replace All Fields Merge Tag without fileuploads"
 msgstr "Vervang All Fields Merge Tag zonder bestanduploads"
@@ -169 +170 @@
 #: templates/template-conditional-logic.php:14
 #: templates/template-conditional-logic.php:107
-#: templates/template-gravity-flow.php:11
+#: templates/template-gravity-flow.php:14
 msgid "ID"
 msgstr "ID"
@@ -217 +218 @@
 msgstr "Gebruikt in voorwaardelijke logica van veld met ID"
 
-#: templates/template-dynamic-population.php:33
+#: templates/template-dynamic-population.php:46
+msgid "Dynamic Population Type:"
+msgstr "Dynamisch vullen Type:"
+
+#: templates/template-dynamic-population.php:47
+msgid "URL"
+msgstr ""
+
+#: templates/template-dynamic-population.php:48
+msgid "URL with merge tags"
+msgstr "URL met merge tags"
+
+#: templates/template-dynamic-population.php:49
+msgid "Excel formula (International)"
+msgstr "Excel formule (Internationaal)"
+
+#: templates/template-dynamic-population.php:50
+msgid "Excel formula (Localized)"
+msgstr "Excel formule (Lokaal)"
+
+#: templates/template-dynamic-population.php:52
+#: templates/template-dynamic-population.php:94
+msgid "JWT Prefill"
+msgstr ""
+
+#: templates/template-dynamic-population.php:63
+msgid "Value"
+msgstr "Waarde"
+
+#: templates/template-dynamic-population.php:68
 msgid "Url query string template for dynamic population"
 msgstr "Url-query string sjabloon voor dynamisch vullen"
 
-#: templates/template-dynamic-population.php:41
+#: templates/template-dynamic-population.php:72
 msgid "Url query string template with merge tags for dynamic population"
 msgstr "Url-query string sjabloon met samenvoegtags voor dynamische populatie"
 
-#: templates/template-dynamic-population.php:49
+#: templates/template-dynamic-population.php:76
 msgid "Excel formula for generating url (encoded) query string (International)"
 msgstr ""
@@ -231 +261 @@
 "(internationaal)"
 
-#: templates/template-dynamic-population.php:57
+#: templates/template-dynamic-population.php:81
 msgid "Excel formula for generating url (encoded) query string (Localized)"
 msgstr ""
@@ -238 +268 @@
 
 #. translators: Translate to localized excel function.
-#: templates/template-dynamic-population.php:64
+#: templates/template-dynamic-population.php:85
 msgid "ENCODEURL"
 msgstr "URL.CODEREN"
 
-#: templates/template-gravity-flow.php:10
+#: templates/template-dynamic-population.php:94
+msgid "shortcode string for dynamic population"
+msgstr "shortcode string voor dynamisch vullen"
+
+#: templates/template-gravity-flow.php:8
+msgid "Worfklow Status"
+msgstr ""
+
+#: templates/template-gravity-flow.php:13
 msgid "Gravity Flow Step"
 msgstr "GravityFlow Stap"
 
-#: templates/template-gravity-flow.php:13
+#: templates/template-gravity-flow.php:16
 msgid "Active"
 msgstr "Actief"
 
-#: templates/template-gravity-flow.php:14
+#: templates/template-gravity-flow.php:17
 msgid "Conditions"
 msgstr "Voorwaarden"
 
-#: templates/template-gravity-flow.php:15
+#: templates/template-gravity-flow.php:18
 msgid "Next Step (id)"
 msgstr "Volgende Stap (id)"
 
-#: templates/template-gravity-flow.php:16
+#: templates/template-gravity-flow.php:19
 msgid "Count Shortcode"
 msgstr "Count Shortcode"

gravitywp-merge-tags/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 6.7
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -76 +76 @@
 
 == Changelog ==
+
+= 1.4.2 =
+* Added JWT prefill string to Dynamic Population tab.
 
 = 1.4.1 =

gravitywp-merge-tags/trunk/templates/template-dynamic-population.php

@@ -5 +5 @@
 
 <?php
-$pre_fill_url       = '/?';
-$pre_fill_url_excel = '"/?';
-$pre_fill_url_mergetags = '/?';
+$gwp_prefill_plugin_activated = class_exists( '\GravityWP\Prefill\GWP_Prefill' );
+$pre_fill_url                 = '/?';
+$pre_fill_url_excel           = '"/?';
+$pre_fill_url_mergetags       = '/?';
+$pre_fill_url_jwt             = '';
+$gwp_prefill_plugin_activated = class_exists( '\GravityWP\Prefill\GWP_Prefill' );
+$pre_fill_url                 = '/?';
+$pre_fill_url_excel           = '"/?';
+$pre_fill_url_mergetags       = '/?';
+$pre_fill_url_jwt             = '';
 if ( isset( $form['fields'] ) && is_array( $form['fields'] ) ) {
     foreach ( $form['fields'] as $field ) {
@@ -19 +26 @@
 
         if ( ! empty( $field['inputName'] ) && property_exists( $field, 'allowsPrepopulate' ) && $field['allowsPrepopulate'] === true ) {
-            $pre_fill_url       .= $field['inputName'] . '=MERGETAG&';
-            $pre_fill_url_excel .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
+            $pre_fill_url           .= $field['inputName'] . '=MERGETAG&';
+            $pre_fill_url_excel     .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
+            $pre_fill_url           .= $field['inputName'] . '=MERGETAG&';
+            $pre_fill_url_excel     .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
             $pre_fill_url_mergetags .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '={' . $field['adminLabel'] . ':' . $field['id'] . '}&' : $field['inputName'] . '={' . $field['label'] . ':' . $field['id'] . '}&';
+            if ( $gwp_prefill_plugin_activated ) {
+                $pre_fill_url_jwt .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '=\'{' . $field['adminLabel'] . ':' . $field['id'] . '}\' ' : $field['inputName'] . '=\'{' . $field['label'] . ':' . $field['id'] . '}\' ';
+            }
+            if ( $gwp_prefill_plugin_activated ) {
+                $pre_fill_url_jwt .= ( strlen( $field['adminLabel'] ) > 0 ) ? $field['inputName'] . '=\'{' . $field['adminLabel'] . ':' . $field['id'] . '}\' ' : $field['inputName'] . '=\'{' . $field['label'] . ':' . $field['id'] . '}\' ';
+            }
         }
     }
@@ -27 +42 @@
 ?>
 
-<table class='wp-list-table widefat striped'>
+<div id="gwp-dynamic-population-anchor-links-wrapper" style="margin-bottom:10px; display:flex; flex-wrap: wrap; justify-content: space-between;">
+    <div id="gwp-dynamic-population-anchor-links" style="flex-grow: 1; border: 1px solid #c3c4c7; background: white; display:flex; flex-wrap: wrap; align-items:center;">
+        <span style="padding:10px;"><?php esc_html_e( 'Dynamic Population Type:', 'gravitywp-merge-tags' ); ?></span>
+        <a style="padding:10px;" href="#gwp-dynamic-population-url-no-mt"><?php esc_html_e( 'URL', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-url-mt"><?php esc_html_e( 'URL with merge tags', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-excel-international"><?php esc_html_e( 'Excel formula (International)', 'gravitywp-merge-tags' ); ?></a>
+        <a style="padding:10px;" href="#gwp-dynamic-population-excel-localized"><?php esc_html_e( 'Excel formula (Localized)', 'gravitywp-merge-tags' ); ?></a>
+        <?php if ( $gwp_prefill_plugin_activated ) { ?>
+        <a style="padding:10px;" href="#gwp-dynamic-population-hwt-prefill"><?php esc_html_e( 'JWT Prefill', 'gravitywp-merge-tags' ); ?></a>
+        <?php } ?> 
+        
+    </div>
+</div>
+
+<table class='wp-list-table widefat break-all striped'>
     <tbody>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Url query string template for dynamic population', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-<tr>
-    <td colspan='6'><?php echo esc_html( rtrim( $pre_fill_url, '&' ) ); ?></td>
-</tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Url query string template with merge tags for dynamic population', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-<tr>
-    <td colspan='6'><?php echo esc_html( rtrim( $pre_fill_url_mergetags, '&' ) ); ?></td>
-</tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (International)', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-    <tr>
-        <td colspan="6"><?php echo esc_html( rtrim( $pre_fill_url_excel, '&"&' ) ); ?></td>
-    </tr>
-<thead>
-    <tr>
-        <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (Localized)', 'gravitywp-merge-tags' ); ?></th>
-    </tr>
-</thead>
-    <tr>
-        <td colspan="6">
+        <thead>
+            <tr>
+                <th style="width:15%"><?php esc_html_e( 'Type', 'gravitywp-merge-tags' ); ?></th>
+                <th><?php esc_html_e( 'Value', 'gravitywp-merge-tags' ); ?></th>
+            </tr>
+        </thead>
+
+        <tr>
+            <td id="gwp-dynamic-population-url-no-mt" class="break-word"><?php esc_html_e( 'Url query string template for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url, '&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-url-mt" class="break-word"><?php esc_html_e( 'Url query string template with merge tags for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_mergetags, '&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-excel-international" class="break-word"><?php esc_html_e( 'Excel formula for generating url (encoded) query string (International)', 'gravitywp-merge-tags' ); ?></td>
+        
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_excel, '&"&' ) ); ?></td>
+        </tr>
+        <tr>
+            <td id="gwp-dynamic-population-excel-localized" class="break-word"><?php esc_html_e( 'Excel formula for generating url (encoded) query string (Localized)', 'gravitywp-merge-tags' ); ?></td>
+            <td class='user-select-all'>
+            <?php
+            /* translators: Translate to localized excel function. */
+            $excel_replace = esc_html__( 'ENCODEURL', 'gravitywp-merge-tags' );
+            echo esc_html( str_replace( 'ENCODEURL', $excel_replace, rtrim( $pre_fill_url_excel, '&"&' ) ) );
+            ?>
+            </td>
+        </tr>
         <?php
-        /* translators: Translate to localized excel function. */
-        $excel_replace = esc_html__( 'ENCODEURL', 'gravitywp-merge-tags' );
-        echo esc_html( str_replace( 'ENCODEURL', $excel_replace, rtrim( $pre_fill_url_excel, '&"&' ) ) );
+        if ( $gwp_prefill_plugin_activated ) {
+            ?>
+        <tr>
+            <td id="gwp-dynamic-population-hwt-prefill" class="break-word"><a href="https://gravitywp.com/add-on/jwt-prefill/?utm_source=merge-tags-plugin-page&utm_medium=display&utm_campaign=prefill-string"><?php echo esc_html__( 'JWT Prefill', 'gravitywp-merge-tags' ); ?></a><?php echo ' ' . esc_html__( 'shortcode string for dynamic population', 'gravitywp-merge-tags' ); ?></td>
+
+            <td class='user-select-all'><?php echo esc_html( rtrim( $pre_fill_url_jwt, '&"&' ) ); ?></td>
+        </tr>
+            <?php
+        }
         ?>
-        </td>
-    </tr>
-</tbody>
+    </tbody>
 </table>