WordPress.org
Get WordPress

Plugin Directory

Changeset 3008589


Ignore:
Timestamp:
12/12/2023 09:17:36 AM (2 years ago)
Author:
gravitywp
Message:

Bump GravityWP - Merge Tags to version 1.3.0. Add Conditional Logic and Calculations tabs.

Location:
gravitywp-merge-tags
Files:
25 added
10 edited

Legend:

Unmodified
Added
Removed

  • gravitywp-merge-tags/trunk/class-gwp-mergetags.php

    r2848029 r3008589  
    7878        parent::init();
    7979        add_filter('wp_before_admin_bar_render', [__CLASS__, 'admin_bar'], 20);
     80
     81        // Enqueue GP Live Preview plugin styles on Merge Tags page of a form.
     82        if ( isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravitywp-merge-tags' && isset( $_GET[ 'id' ] ) )  {
     83       
     84            if ( class_exists( 'GP_Live_Preview' ) ) {
     85                wp_enqueue_style( 'gp-live-preview-admin', plugins_url( '../gp-live-preview/css/gp-live-preview-admin.min.css', __FILE__ ), array(), $this->_version );
     86                wp_enqueue_script( 'gp-live-preview-admin', plugins_url( '../gp-live-preview/js/gp-live-preview-admin.js', __FILE__ ), array( 'jquery' ), $this->_version, true );
     87            }
     88        }
    8089    }
    8190
    … …  
    265274            gwp_create_menu_item( 'merge-tags-advanced', $var_merge_tags_advanced );
    266275
     276            $var_dynamic_population = esc_html__( 'Dynamic Population', 'gravitywp-merge-tags' );
     277            gwp_create_menu_item( 'dynamic-population', $var_dynamic_population );
     278
    267279            $var_conditional_logic = esc_html__( 'Conditional Logic', 'gravitywp-merge-tags' );
    268280            gwp_create_menu_item( 'conditional-logic', $var_conditional_logic );
     281
     282            $var_calculations = esc_html__( 'Calculations', 'gravitywp-merge-tags' );
     283            gwp_create_menu_item( 'calculations', $var_calculations );
    269284
    270285            $var_merge_tags_standard = esc_html__( 'Meta', 'gravitywp-merge-tags' );

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

    r2848029 r3008589  
    44Plugin URI: https://gravitywp.com/plugin/merge-tags
    55Description: Gravity Forms add-on to list all the merge tags from a specific form
    6 Version: 1.2.0
     6Version: 1.3
    77Author: GravityWP
    88Author URI: https://gravitywp.com
    … …  
    1212*/
    1313
    14 define( 'GWP_MERGETAGS_VERSION', '1.2.0' );
     14define( 'GWP_MERGETAGS_VERSION', '1.3' );
    1515
    1616add_action( 'gform_loaded', array( 'GWPMergeTags_AddOn_Bootstrap', 'load' ), 5 );

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

    r2848029 r3008589  
    22msgstr ""
    33"Project-Id-Version: GravityWP - Merge Tags\n"
    4 "POT-Creation-Date: 2022-11-16 13:36+0100\n"
    5 "PO-Revision-Date: 2022-11-16 13:39+0100\n"
     4"POT-Creation-Date: 2023-11-15 16:54-0400\n"
     5"PO-Revision-Date: 2023-11-15 16:54-0400\n"
    66"Last-Translator: \n"
    77"Language-Team: \n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "X-Generator: Poedit 2.4.1\n"
     12"X-Generator: Poedit 2.4.3\n"
    1313"X-Poedit-Basepath: ..\n"
    1414"Plural-Forms: nplurals=2; plural=(n != 1);\n"
    … …  
    2222"X-Poedit-SearchPathExcluded-0: *.js\n"
    2323
    24 #: class-gwp-mergetags.php:212 templates/template-merge-tags.php:6
     24#: class-gwp-mergetags.php:205 class-gwp-mergetags.php:270
     25#: templates/template-merge-tags.php:6
    2526msgid "Merge Tags"
    2627msgstr "Merge Tags"
    2728
    28 #: class-gwp-mergetags.php:215
     29#: class-gwp-mergetags.php:273
    2930msgid "Advanced"
    3031msgstr "Geavanceerd"
    3132
    32 #: class-gwp-mergetags.php:218
     33#: class-gwp-mergetags.php:276
     34msgid "Dynamic Population"
     35msgstr "Dynamisch Vullen"
     36
     37#: class-gwp-mergetags.php:279
    3338msgid "Conditional Logic"
    3439msgstr "Conditionele logica"
    3540
    36 #: class-gwp-mergetags.php:221
     41#: class-gwp-mergetags.php:282
     42msgid "Calculations"
     43msgstr "Berekeningen"
     44
     45#: class-gwp-mergetags.php:285
    3746msgid "Meta"
    3847msgstr ""
    3948
    40 #: class-gwp-mergetags.php:225
     49#: class-gwp-mergetags.php:289
    4150msgid "Workflow"
    4251msgstr ""
    4352
    44 #: class-gwp-mergetags.php:229 templates/template-all-fields.php:9
     53#: class-gwp-mergetags.php:293 templates/template-all-fields.php:9
    4554#: templates/template-all-fields.php:12
    4655msgid "All Fields"
    4756msgstr "Alle Velden"
    4857
    49 #: class-gwp-mergetags.php:238
     58#: class-gwp-mergetags.php:302
    5059msgid "Template not found."
    5160msgstr "Sjabloon niet gevonden."
    5261
    53 #: class-gwp-mergetags.php:260
     62#: class-gwp-mergetags.php:324
    5463msgid "Select Form"
    5564msgstr "Selecteer een formulier"
    … …  
    6372msgstr "Tabel"
    6473
    65 #: templates/template-all-fields.php:18
     74#: templates/template-all-fields.php:21
    6675msgid "Replace All Fields Merge Tag"
    6776msgstr "Vervang de merge tag voor Alle Velden"
    6877
    69 #: templates/template-all-fields.php:60
     78#: templates/template-all-fields.php:64
     79msgid "Replace All Fields Merge Tag with Gravity Forms shortcode"
     80msgstr ""
     81"Vervang de merge tag voor Alle Velden inclusief Gravity Forms shortcode"
     82
     83#: templates/template-all-fields.php:115
     84msgid "Replace All Fields Merge Tag with Gravity View shortcode"
     85msgstr "Vervang de merge tag voor Alle Velden inclusief Gravity View shortcode"
     86
     87#: templates/template-all-fields.php:168
    7088msgid "Replace All Fields Merge Tag without fileuploads"
    7189msgstr "Vervang de merge tag voor Alle Velden zonder bestanduploads"
    7290
     91#: templates/template-calculations.php:10
     92msgid "Fields with calculations"
     93msgstr "Velden met berekeningen"
     94
     95#: templates/template-calculations.php:14
    7396#: templates/template-conditional-logic.php:14
    7497#: templates/template-conditional-logic.php:103
    … …  
    77100msgstr ""
    78101
     102#: templates/template-calculations.php:15
    79103#: templates/template-conditional-logic.php:15
    80104#: templates/template-conditional-logic.php:104
     105#: templates/template-merge-tags-advanced.php:17
    81106#: templates/template-merge-tags-advanced.php:67
    82107msgid "Field Label"
    83108msgstr "Veld Label"
    84109
     110#: templates/template-calculations.php:16
    85111#: templates/template-conditional-logic.php:16
    86112#: templates/template-conditional-logic.php:105
     113#: templates/template-merge-tags-advanced.php:21
    87114msgid "Admin Label"
    88115msgstr "Beheerders Label"
    89116
     117#: templates/template-calculations.php:17
     118msgid "Formula"
     119msgstr "Formule"
     120
     121#: templates/template-calculations.php:18
     122msgid "Number Format"
     123msgstr "Format"
     124
     125#: templates/template-calculations.php:19
     126msgid "Rounding (decimal places)"
     127msgstr "Afronding (aantal decimalen)"
     128
     129#: templates/template-conditional-logic.php:10
     130msgid "Fields with active conditional logic rules"
     131msgstr "Velden met actieve voorwaardelijke logic voorwaarden"
     132
    90133#: templates/template-conditional-logic.php:17
    91134msgid "Show / Hide"
    … …  
    100143msgstr ""
    101144
     145#: templates/template-conditional-logic.php:99
     146msgid "Fields used in conditional logic rules"
     147msgstr "Velden die gebruikt zijn in conditionele voorwaarden"
     148
    102149#: templates/template-conditional-logic.php:106
    103150msgid "Used in conditional logic of field with ID"
    104 msgstr ""
     151msgstr "Gebruikt in conditionele logica van veld met ID"
     152
     153#: templates/template-dynamic-population.php:33
     154msgid "Url query string template for dynamic population"
     155msgstr "Url query string template voor dynamische populatie"
     156
     157#: templates/template-dynamic-population.php:41
     158msgid "Url query string template with merge tags for dynamic population"
     159msgstr "Url query string template met merge tags voor dynamische populatie"
     160
     161#: templates/template-dynamic-population.php:49
     162msgid "Excel formula for generating url (encoded) query string (International)"
     163msgstr ""
     164"Excel-formule voor het genereren van url (gecodeerde) query string "
     165"(internationaal)"
     166
     167#: templates/template-dynamic-population.php:57
     168msgid "Excel formula for generating url (encoded) query string (Localized)"
     169msgstr ""
     170"Excel-formule voor het genereren van url (gecodeerde) query string "
     171"(gelokaliseerd)"
     172
     173#. translators: Translate to localized excel function.
     174#: templates/template-dynamic-population.php:64
     175msgid "ENCODEURL"
     176msgstr "URL.CODEREN"
    105177
    106178#: templates/template-gravity-flow.php:10
    … …  
    124196msgstr ""
    125197
     198#: templates/template-merge-tags-advanced.php:14
     199msgid "Toggle columns:"
     200msgstr "Schakel kolommen:"
     201
     202#: templates/template-merge-tags-advanced.php:25
     203#: templates/template-merge-tags-advanced.php:69
     204msgid "Merge Tag"
     205msgstr "Merge Tag"
     206
     207#: templates/template-merge-tags-advanced.php:29
     208#: templates/template-merge-tags-advanced.php:70
     209msgid "Merge Tag (admin)"
     210msgstr ""
     211
     212#: templates/template-merge-tags-advanced.php:33
     213#, fuzzy
     214#| msgid "Merge Tags (short)"
     215msgid "Merge Tag (short)"
     216msgstr "Merge Tags (kort)"
     217
     218#: templates/template-merge-tags-advanced.php:37
     219#: templates/template-merge-tags-advanced.php:72
     220msgid "Populate"
     221msgstr "Vullen"
     222
     223#: templates/template-merge-tags-advanced.php:41
     224#: templates/template-merge-tags-advanced.php:73
     225msgid "CSS"
     226msgstr ""
     227
     228#: templates/template-merge-tags-advanced.php:45
     229#: templates/template-merge-tags-advanced.php:74
     230msgid "Field Type"
     231msgstr "Veld Type"
     232
     233#: templates/template-merge-tags-advanced.php:49
     234#: templates/template-merge-tags-advanced.php:75
     235msgid "Field ID"
     236msgstr "Veld ID"
     237
     238#: templates/template-merge-tags-advanced.php:53
     239msgid "Toggle field types: "
     240msgstr "Schakel veld type: "
     241
     242#: templates/template-merge-tags-advanced.php:56
     243msgid "Choices"
     244msgstr "Keuzes"
     245
     246#: templates/template-merge-tags-advanced.php:60
     247msgid "Non-input fields"
     248msgstr "Non-invoervelden"
     249
    126250#: templates/template-merge-tags-advanced.php:68
    127251msgid "Admin Label / value"
    128252msgstr "Beheerders label / waarde"
    129253
    130 #: templates/template-merge-tags-advanced.php:69
    131 msgid "Merge Tag"
    132 msgstr "Merge Tag"
    133 
    134 #: templates/template-merge-tags-advanced.php:70
    135 msgid "Merge Tag (admin)"
    136 msgstr ""
    137 
    138254#: templates/template-merge-tags-advanced.php:71
    139255msgid "Merge Tags (short)"
    140256msgstr "Merge Tags (kort)"
    141257
    142 #: templates/template-merge-tags-advanced.php:72
    143 msgid "Populate"
    144 msgstr ""
    145 
    146 #: templates/template-merge-tags-advanced.php:73
    147 msgid "CSS"
    148 msgstr ""
    149 
    150 #: templates/template-merge-tags-advanced.php:74
    151 msgid "Field Type"
    152 msgstr "Veld Type"
    153 
    154 #: templates/template-merge-tags-advanced.php:75
    155 msgid "Field ID"
    156 msgstr "Veld ID"
    157 
    158 #: templates/template-merge-tags-advanced.php:132
    159 msgid "Url query string template for dynamic population"
    160 msgstr "Url-queryreekssjabloon voor dynamisch vullen"
    161 
    162 #: templates/template-merge-tags-advanced.php:140
    163 msgid "Excel formula for generating url (encoded) query string (International)"
    164 msgstr ""
    165 "Excel-formule voor het genereren van url (gecodeerde) queryreeks "
    166 "(internationaal)"
    167 
    168 #: templates/template-merge-tags-advanced.php:148
    169 msgid "Excel formula for generating url (encoded) query string (Localized)"
    170 msgstr ""
    171 "Excel-formule voor het genereren van url (gecodeerde) queryreeks "
    172 "(gelokaliseerd)"
    173 
    174 #. translators: Translate to localized excel function.
    175 #: templates/template-merge-tags-advanced.php:154
    176 msgid "ENCODEURL"
    177 msgstr "URL.CODEREN"
    178 
    179258#. Plugin Name of the plugin/theme
    180259msgid "GravityWP - Merge Tags"

  • gravitywp-merge-tags/trunk/languages/gravitywp-merge-tags.pot

    r2848029 r3008589  
    44"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
    55"Project-Id-Version: GravityWP - Merge Tags\n"
    6 "POT-Creation-Date: 2022-11-16 13:35+0100\n"
     6<<<<<<< HEAD
     7"POT-Creation-Date: 2023-05-22 12:55-0400\n"
     8=======
     9"POT-Creation-Date: 2023-05-18 10:34-0400\n"
     10>>>>>>> dynamic-populate
    711"PO-Revision-Date: 2017-10-01 23:00+0200\n"
    812"Last-Translator: \n"
    … …  
    1115"Content-Type: text/plain; charset=UTF-8\n"
    1216"Content-Transfer-Encoding: 8bit\n"
    13 "X-Generator: Poedit 2.4.1\n"
     17"X-Generator: Poedit 2.4.3\n"
    1418"X-Poedit-Basepath: ..\n"
    1519"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
    … …  
    2226"X-Poedit-SearchPathExcluded-0: *.js\n"
    2327
    24 #: class-gwp-mergetags.php:212 templates/template-merge-tags.php:6
     28#: class-gwp-mergetags.php:205 class-gwp-mergetags.php:270
     29#: templates/template-merge-tags.php:6
    2530msgid "Merge Tags"
    2631msgstr ""
    2732
    28 #: class-gwp-mergetags.php:215
     33#: class-gwp-mergetags.php:273
    2934msgid "Advanced"
    3035msgstr ""
    3136
    32 #: class-gwp-mergetags.php:218
     37#: class-gwp-mergetags.php:276
     38<<<<<<< HEAD
    3339msgid "Conditional Logic"
    3440msgstr ""
    3541
    36 #: class-gwp-mergetags.php:221
     42#: class-gwp-mergetags.php:279
    3743msgid "Meta"
    3844msgstr ""
    3945
    40 #: class-gwp-mergetags.php:225
     46#: class-gwp-mergetags.php:283
    4147msgid "Workflow"
    4248msgstr ""
    4349
    44 #: class-gwp-mergetags.php:229 templates/template-all-fields.php:9
     50#: class-gwp-mergetags.php:287 templates/template-all-fields.php:9
     51=======
     52msgid "Dynamic Population"
     53msgstr ""
     54
     55#: class-gwp-mergetags.php:279
     56msgid "Conditional Logic"
     57msgstr ""
     58
     59#: class-gwp-mergetags.php:282
     60msgid "Meta"
     61msgstr ""
     62
     63#: class-gwp-mergetags.php:286
     64msgid "Workflow"
     65msgstr ""
     66
     67#: class-gwp-mergetags.php:290 templates/template-all-fields.php:9
     68>>>>>>> dynamic-populate
    4569#: templates/template-all-fields.php:12
    4670msgid "All Fields"
    4771msgstr ""
    4872
    49 #: class-gwp-mergetags.php:238
     73<<<<<<< HEAD
     74#: class-gwp-mergetags.php:296
    5075msgid "Template not found."
    5176msgstr ""
    5277
    53 #: class-gwp-mergetags.php:260
     78#: class-gwp-mergetags.php:318
     79=======
     80#: class-gwp-mergetags.php:299
     81msgid "Template not found."
     82msgstr ""
     83
     84#: class-gwp-mergetags.php:321
     85>>>>>>> dynamic-populate
    5486msgid "Select Form"
    5587msgstr ""
    … …  
    6395msgstr ""
    6496
    65 #: templates/template-all-fields.php:18
     97#: templates/template-all-fields.php:21
    6698msgid "Replace All Fields Merge Tag"
    6799msgstr ""
    68100
    69 #: templates/template-all-fields.php:60
     101#: templates/template-all-fields.php:64
     102msgid "Replace All Fields Merge Tag with Gravity Forms shortcode"
     103msgstr ""
     104
     105#: templates/template-all-fields.php:115
     106msgid "Replace All Fields Merge Tag with Gravity View shortcode"
     107msgstr ""
     108
     109#: templates/template-all-fields.php:168
    70110msgid "Replace All Fields Merge Tag without fileuploads"
    71111msgstr ""
    … …  
    104144msgstr ""
    105145
     146#: templates/template-dynamic-population.php:33
     147msgid "Url query string template for dynamic population"
     148msgstr ""
     149
     150#: templates/template-dynamic-population.php:41
     151msgid "Url query string template with merge tags for dynamic population"
     152msgstr ""
     153
     154#: templates/template-dynamic-population.php:49
     155msgid ""
     156"Excel formula for generating url (encoded) query string (International)"
     157msgstr ""
     158
     159#: templates/template-dynamic-population.php:57
     160msgid "Excel formula for generating url (encoded) query string (Localized)"
     161msgstr ""
     162
     163#. translators: Translate to localized excel function.
     164#: templates/template-dynamic-population.php:64
     165msgid "ENCODEURL"
     166msgstr ""
     167
    106168#: templates/template-gravity-flow.php:10
    107169msgid "Gravity Flow Step"
    … …  
    156218msgstr ""
    157219
    158 #: templates/template-merge-tags-advanced.php:132
     220<<<<<<< HEAD
     221#: templates/template-merge-tags-advanced.php:159
    159222msgid "Url query string template for dynamic population"
    160223msgstr ""
    161224
    162 #: templates/template-merge-tags-advanced.php:140
     225#: templates/template-merge-tags-advanced.php:167
    163226msgid ""
    164227"Excel formula for generating url (encoded) query string (International)"
    165228msgstr ""
    166229
    167 #: templates/template-merge-tags-advanced.php:148
     230#: templates/template-merge-tags-advanced.php:175
    168231msgid "Excel formula for generating url (encoded) query string (Localized)"
    169232msgstr ""
    170233
    171234#. translators: Translate to localized excel function.
    172 #: templates/template-merge-tags-advanced.php:154
     235#: templates/template-merge-tags-advanced.php:182
    173236msgid "ENCODEURL"
    174237msgstr ""
    175238
     239=======
     240>>>>>>> dynamic-populate
    176241#. Plugin Name of the plugin/theme
    177242msgid "GravityWP - Merge Tags"

  • gravitywp-merge-tags/trunk/readme.txt

    r2848029 r3008589  
    44Tags: gravity forms, mergetag, merge tag, mergetags, form, forms, gravity form
    55Requires at least: 3.0.1
    6 Tested up to: 6.1
    7 Stable tag: 1.2.0
     6Tested up to: 6.4
     7Stable tag: 1.3.0
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    3434* **Merge Tags**: A simple list of Merge Tags available in the Gravity Form.
    3535* **Advanced**: Field Label, Merge Tag, Short Merge Tag, Field Type.
     36* **Dynamic Population**: Query string templates.
     37* **Conditional Logic**: An overview of all conditional logic rules in the form.
     38* **Calculations**: An overview of all calculations in the form.
    3639* **Meta**: Available Standard (default) Merge Tags from Gravity Forms, GravityView and Gravity Flow.
    3740* **Workflow**:  If you're using Gravity Flow, you'll have an extra tab with information about the Gravity Flow Steps that are configured within your Gravity Form. It provides information about the Step Name, the ID, the Type, if the step is active or not, what conditions are set and an automatically generated GravityWP - Count Shortcode to use as a counter for Gravity Flow steps.
    … …  
    6265== Screenshots ==
    6366
    64 1. List of Merge Tags from your Form
    65 2. Advanced Merge Tags (label, merge tag, short merge tag, field type(like text, radio, hidden, checkbox, select, etc))
    66 3. List of Standard Merge Tags (Gravity Forms, GravityView, Gravity Flow)
     671. List of Merge Tags in your current Gravity Form.
     682. Advanced Merge Tags (label, merge tag, short merge tag, field type like text, radio, hidden, checkbox, select, etc).
     693. List of Standard Merge Tags (Gravity Forms, GravityView, Gravity Flow).
    67704. All Fields Tab. You can replace the all_fields merge tag with this and have full control what is shown.
    68 5. The menu link that gets added in the Gravity Form toolbar
    69 6. The menu link under Forms (admin menu)
    70 7. Gravity Flow Step information for the current form (Step name, ID, Type, Active, Conditions)
     715. The menu link that gets added in the Gravity Form toolbar.
     726. The menu link under Forms (admin menu).
     737. Gravity Flow Step information for the current Gravity Form (Step name, ID, Type, Active, Conditions)
     748. Conditional Logic information for the current Gravity Form (Show or Hide / Match All or Any / Rules). Both and overview which fields have active Conditional Logic rules and which fields are used inside Conditional Logic rules.
     759. Calculations overview for the current Gravity Form (Formula, Number Format).
    7176
    7277== Changelog ==
    73 = 1.2.0 =
     78= 1.3 =
     79* Added tab for Calculations.
     80* Added tab for Dynamic Population.
     81* Added and fixed translations.
     82* Added Gravity Forms conditional shortcode to All Fields tab.
     83* Added GravityView gvlogic shortcode  to All Fields tab.
     84* Added sub-input fields to Advanced tab.
     85
     86= 1.2 =
    7487* Added filter for Meta tab.
    7588* Added quick links to Merge Tags in top admin menu for recent forms.

  • gravitywp-merge-tags/trunk/templates/template-all-fields.php

    r2721960 r3008589  
    1515    </thead>
    1616    <tbody>
     17
     18        <!-- All fields including file upload fields. -->
     19
    1720        <tr>
    1821            <td><?php esc_html_e( 'Replace All Fields Merge Tag', 'gravitywp-merge-tags' ); ?></td>
    … …  
    5558            </td>
    5659        </tr>
     60
     61        <!-- All fields including GF conditional shortcode. -->
     62
     63        <tr>
     64            <td><?php esc_html_e( 'Replace All Fields Merge Tag with Gravity Forms shortcode', 'gravitywp-merge-tags' ); ?></td>
     65            <td>
     66            <?php echo esc_html( '<table><tbody>' ); ?><br>
     67            <?php
     68
     69            if ( is_array( $form['fields'] ) ) {
     70                foreach ( $form['fields'] as $field ) {
     71                    if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
     72
     73                        foreach ( $field['inputs'] as $input ) {
     74                            $mergetag = "{{$field['label']}:{$field['id']}}";
     75                            echo esc_html( '[gravityforms action="conditional" merge_tag="' . $mergetag . '" condition="isnot" value=""]' );
     76                            echo esc_html( "<tr><td class='gwp-allfields-label'>" );
     77                            echo esc_html( GFCommon::get_label( $field, $input['id'] ) );
     78                            echo esc_html( "</td><td class='gwp-allfields-value'>{" . GFCommon::get_label( $field, $input['id'] ) );
     79                            echo esc_html( ':' );
     80                            echo esc_html( $input['id'] );
     81                            echo esc_html( '}</td></tr>[/gravityforms]' );
     82                            ?>
     83                            <br>
     84                            <?php
     85                        }
     86                    } elseif ( ! rgar( $field, 'displayOnly' ) ) {
     87                        $mergetag = "{{$field['label']}:{$field['id']}}";
     88                        echo esc_html( '[gravityforms action="conditional" merge_tag="' . $mergetag . '" condition="isnot" value=""]' );
     89                        echo esc_html( "<tr><td class='gwp-allfields-label'>" );
     90                        echo esc_html( GFCommon::get_label( $field ) );
     91                        echo esc_html( '</td>' );
     92                        echo esc_html( "<td class='gwp-allfields-value'>{" );
     93                        echo esc_html( GFCommon::get_label( $field ) );
     94                        echo esc_html( ':' );
     95                        echo esc_html( $field['id'] );
     96                        echo esc_html( '}</td></tr>[/gravityforms]' );
     97                        ?>
     98                        <br>
     99                        <?php
     100                    }
     101                }
     102            }
     103            echo esc_html( '</tbody></table>' );
     104            ?>
     105            </td>
     106        </tr>
     107
     108
     109
     110        <!-- All fields including GV conditional shortcode. -->
     111
     112        <?php if ( class_exists( 'GravityView_Plugin' ) ) { ?>
     113
     114        <tr>
     115            <td><?php esc_html_e( 'Replace All Fields Merge Tag with Gravity View shortcode', 'gravitywp-merge-tags' ); ?></td>
     116            <td>
     117            <?php echo esc_html( '<table><tbody>' ); ?><br>
     118            <?php
     119
     120            if ( is_array( $form['fields'] ) ) {
     121                foreach ( $form['fields'] as $field ) {
     122                    if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
     123
     124                        foreach ( $field['inputs'] as $input ) {
     125                            $mergetag = "{{$field['label']}:{$field['id']}}";
     126                            echo esc_html( '[gvlogic if="' . $mergetag . '" isnot=""]' );
     127                            echo esc_html( "<tr><td class='gwp-allfields-label'>" );
     128                            echo esc_html( GFCommon::get_label( $field, $input['id'] ) );
     129                            echo esc_html( "</td><td class='gwp-allfields-value'>{" . GFCommon::get_label( $field, $input['id'] ) );
     130                            echo esc_html( ':' );
     131                            echo esc_html( $input['id'] );
     132                            echo esc_html( '}</td></tr>[/gvlogic]' );
     133                            ?>
     134                            <br>
     135                            <?php
     136                        }
     137                    } elseif ( ! rgar( $field, 'displayOnly' ) ) {
     138                        $mergetag = "{{$field['label']}:{$field['id']}}";
     139                        echo esc_html( '[gvlogic if="' . $mergetag . '" isnot=""]' );
     140                        echo esc_html( "<tr><td class='gwp-allfields-label'>" );
     141                        echo esc_html( GFCommon::get_label( $field ) );
     142                        echo esc_html( '</td>' );
     143                        echo esc_html( "<td class='gwp-allfields-value'>{" );
     144                        echo esc_html( GFCommon::get_label( $field ) );
     145                        echo esc_html( ':' );
     146                        echo esc_html( $field['id'] );
     147                        echo esc_html( '}</td></tr>[/gvlogic]' );
     148                        ?>
     149                        <br>
     150                        <?php
     151                    }
     152                }
     153            }
     154            echo esc_html( '</tbody></table>' );
     155            ?>
     156            </td>
     157        </tr>
     158
     159            <?php
     160        }
     161        ?>
     162
     163        <!-- All fields without file upload fields. -->
     164
    57165        <tr>
    58166            <td>
    … …  
    63171            <td>
    64172            <?php
    65                 echo esc_html( '<table><tbody>' );
     173            echo esc_html( '<table><tbody>' );
     174            ?>
     175            <br>
     176            <?php
    66177
    67178            if ( is_array( $form['fields'] ) ) {

  • gravitywp-merge-tags/trunk/templates/template-conditional-logic.php

    r2786840 r3008589  
    88<table class='wp-list-table widefat striped' cellspacing='0' style="margin-bottom: 20px;">
    99<thead>
    10     <tr><th colspan="6"><h4 style="margin:5px auto;">Fields with active conditional logic rules</h4></th></tr>
     10    <tr><th colspan="6"><h4 style="margin:5px auto;"><?php esc_html_e( 'Fields with active conditional logic rules', 'gravitywp-merge-tags' ); ?></h4></th></tr>
    1111    </thead>
    1212            <thead>
    … …  
    9797<table class='wp-list-table widefat striped' cellspacing='0'>
    9898    <thead>
    99     <tr><th colspan="4"><h4 style="margin:5px auto;">Fields used in conditional logic rules</h4></th></tr>
     99    <tr><th colspan="4"><h4 style="margin:5px auto;"><?php esc_html_e( 'Fields used in conditional logic rules', 'gravitywp-merge-tags' ); ?></h4></th></tr>
    100100    </thead>
    101101    <thead>

  • gravitywp-merge-tags/trunk/templates/template-merge-tags-advanced.php

    r2848029 r3008589  
    1212<div id="gwp_toggle_settings" style="margin-bottom:10px; display:flex; flex-wrap: wrap;">
    1313    <div id="gwp_toggle_columns" style="border: 1px solid #c3c4c7; background: white; margin-right:10px; display:flex; flex-wrap: wrap; margin-top:10px;">
    14         <span style="padding:10px;">Toggle columns: </span>
     14        <span style="padding:10px;"><?php esc_html_e( 'Toggle columns:', 'gravitywp-merge-tags'); ?></span>
    1515        <span style="padding:10px;">
    1616            <input type="checkbox" id="checkbox_fieldlabel" name="fieldlabel" checked oninput="gwp_mt_toggle(this)">
    17             <label style="vertical-align: baseline;" for="checkbox_fieldlabel">Field Label</label>
     17            <label style="vertical-align: baseline;" for="checkbox_fieldlabel"><?php esc_html_e( 'Field Label', 'gravitywp-merge-tags' ); ?></label>
    1818        </span>
    1919        <span style="padding:10px;">
    2020            <input type="checkbox" id="checkbox_adminlabel" name="adminlabel" checked oninput="gwp_mt_toggle(this)">
    21             <label style="vertical-align: baseline;" for="checkbox_adminlabel">Admin Label</label>
     21            <label style="vertical-align: baseline;" for="checkbox_adminlabel"><?php esc_html_e( 'Admin Label', 'gravitywp-merge-tags' ); ?></label>
    2222        </span>
    2323        <span style="padding:10px;">
    2424            <input type="checkbox" id="checkbox_mergetag" name="mergetag" checked oninput="gwp_mt_toggle(this)">
    25             <label style="vertical-align: baseline;" for="checkbox_mergetag">Merge Tag</label>
     25            <label style="vertical-align: baseline;" for="checkbox_mergetag"><?php esc_html_e( 'Merge Tag', 'gravitywp-merge-tags' ); ?></label>
    2626        </span>
    2727        <span style="padding:10px;">
    2828            <input type="checkbox" id="checkbox_mergetagadmin" name="mergetagadmin" checked oninput="gwp_mt_toggle(this)">
    29             <label style="vertical-align: baseline;" for="checkbox_mergetagadmin">Merge Tag (admin)</label>
     29            <label style="vertical-align: baseline;" for="checkbox_mergetagadmin"><?php esc_html_e( 'Merge Tag (admin)', 'gravitywp-merge-tags' ); ?></label>
    3030        </span>
    3131        <span style="padding:10px;">
    3232            <input type="checkbox" id="checkbox_mergtagshort" name="mergtagshort" checked oninput="gwp_mt_toggle(this)">
    33             <label style="vertical-align: baseline;" for="checkbox_mergtagshort">Merge Tag (short)</label>
     33            <label style="vertical-align: baseline;" for="checkbox_mergtagshort"><?php esc_html_e( 'Merge Tag (short)', 'gravitywp-merge-tags' ); ?></label>
    3434        </span>
    3535        <span style="padding:10px;">
    3636            <input type="checkbox" id="checkbox_populate" name="populate" checked oninput="gwp_mt_toggle(this)">
    37             <label style="vertical-align: baseline;" for="checkbox_populate">Populate</label>
     37            <label style="vertical-align: baseline;" for="checkbox_populate"><?php esc_html_e( 'Populate', 'gravitywp-merge-tags' ); ?></label>
    3838        </span>
    3939        <span style="padding:10px;">
    4040            <input type="checkbox" id="checkbox_css" name="css" checked oninput="gwp_mt_toggle(this)">
    41             <label style="vertical-align: baseline;" for="checkbox_css">CSS</label>
     41            <label style="vertical-align: baseline;" for="checkbox_css"><?php esc_html_e( 'CSS', 'gravitywp-merge-tags' );?></label>
    4242        </span>
    4343        <span style="padding:10px;">
    4444            <input type="checkbox" id="checkbox_fieldtype" name="fieldtype" checked oninput="gwp_mt_toggle(this)">
    45             <label style="vertical-align: baseline;" for="checkbox_fieldtype">Field Type</label>
     45            <label style="vertical-align: baseline;" for="checkbox_fieldtype"><?php esc_html_e( 'Field Type', 'gravitywp-merge-tags' );?></label>
    4646        </span>
    4747        <span style="padding:10px;">
    4848            <input type="checkbox" id="checkbox_fieldid" name="fieldid" checked oninput="gwp_mt_toggle(this)">
    49             <label style="vertical-align: baseline;" for="checkbox_fieldid">Field ID</label>
     49            <label style="vertical-align: baseline;" for="checkbox_fieldid"><?php esc_html_e( 'Field ID', 'gravitywp-merge-tags' );?></label>
    5050        </span>
    5151    </div>
    5252    <div style="border: 1px solid #c3c4c7; background: white; margin-top:10px; display:flex; flex-wrap: wrap;">
    53         <span style="padding:10px;">Toggle field types: </span>
     53        <span style="padding:10px;"><?php esc_html_e( 'Toggle field types: ', 'gravitywp-merge-tags' ); ?></span>
    5454        <span style="padding:10px;">
    5555            <input type="checkbox" id="checkbox_choice" name="choice" checked oninput="gwp_mt_toggle(this)">
    56             <label style="vertical-align: baseline;" for="checkbox_choice">Choices</label>
     56            <label style="vertical-align: baseline;" for="checkbox_choice"><?php esc_html_e( 'Choices', 'gravitywp-merge-tags' );?></label>
    5757        </span>
    5858        <span style="padding:10px;">
    5959            <input type="checkbox" id="checkbox_displayonly" name="displayonly" checked oninput="gwp_mt_toggle(this)">
    60             <label style="vertical-align: baseline;" for="checkbox_displayonly">Non-input fields</label>
     60            <label style="vertical-align: baseline;" for="checkbox_displayonly"><?php esc_html_e( 'Non-input fields', 'gravitywp-merge-tags' ); ?></label>
    6161        </span>
    6262    </div>
    … …  
    7979    <?php
    8080    if ( is_array( $form['fields'] ) ) {
    81         $pre_fill_url       = '/?';
    82         $pre_fill_url_excel = '"/?';
    8381        foreach ( $form['fields'] as $field ) {
    8482            $displayonly = rgar( $field, 'displayOnly' ) ? 'displayonly' : '';
    … …  
    9694            </tr>
    9795            <?php
    98             if ( isset( $field['choices'] ) && is_array( $field['choices'] ) ) {
     96            if ( isset( $field['choices'] ) && is_array( $field['choices'] ) && ! isset( $field['inputs'] ) ) {
    9997                $num_choices = count( $field['choices'] );
    10098                for ( $i = 0;$i < $num_choices;$i++ ) {
    … …  
    113111                    </tr>
    114112                    <?php
    115 
    116113                }
    117114            }
    118115
    119             if ( ! empty( $field['inputName'] ) ) {
    120                 $pre_fill_url       .= $field['inputName'] . '=MERGETAG&';
    121                 $pre_fill_url_excel .= $field['inputName'] . '="&ENCODEURL(CELL)&"&';
     116            if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
     117                $num_inputs = count( $field['inputs'] );
     118                for ( $i = 0;$i < $num_inputs;$i++ ) {
     119                    if ( ! empty( $field['inputs'][ $i ]['name'] ) ) {
     120                        $pre_fill_url       .= $field['inputs'][ $i ]['name'] . '=MERGETAG&';
     121                        $pre_fill_url_excel .= $field['inputs'][ $i ]['name'] . '="&ENCODEURL(CELL)&"&';
     122                    }
     123                    $inputs_id = $i + 1;
     124                    ?>
     125                    <tr class='input'> 
     126                        <td class=fieldlabel><?php echo isset( $field['inputs'][ $i ]['customLabel'] ) ? esc_html( $field['inputs'][ $i ]['customLabel'] ) : esc_html( $field['inputs'][ $i ]['label'] ); ?></td>
     127                        <td class=adminlabel><?php echo esc_html( $field['inputs'][ $i ]['label'] ); ?></td>
     128                        <td class=mergetag>{
     129                        <?php
     130                        echo isset( $field['inputs'][ $i ]['customLabel'] ) ? esc_html( $field['inputs'][ $i ]['customLabel'] ) : esc_html( $field['inputs'][ $i ]['label'] );
     131                        echo esc_html( ':' . $field['inputs'][ $i ]['id'] );
     132                        ?>
     133                        }</td>
     134                        <td class=mergetagadmin>{<?php echo esc_html( $field['inputs'][ $i ]['label'] . ':' . $field['inputs'][ $i ]['id'] ); ?>}</td>
     135                        <td class=mergtagshort>{:<?php echo esc_html( $field['inputs'][ $i ]['id'] ); ?>}</td>
     136                        <td class=populate><?php echo isset( $field['inputs'][ $i ]['name'] ) ? esc_html( $field['inputs'][ $i ]['name'] ) : ''; ?></td>
     137                        <td class=css></td>
     138                        <td class=fieldtype><?php echo esc_html( RGFormsModel::get_input_type( $field ) . '-input' ); ?></td>
     139                        <td class=fieldid><?php echo esc_html( $field['inputs'][ $i ]['id'] ); ?></td>
     140                    </tr>
     141                    <?php
     142                }
    122143            }
    123144        }
    … …  
    125146    ?>
    126147    </tbody>
    127     </table>
    128 <table class='wp-list-table widefat striped'>
    129     <tbody>
    130 <thead>
    131     <tr>
    132         <th colspan='6'><?php esc_html_e( 'Url query string template for dynamic population', 'gravitywp-merge-tags' ); ?></th>
    133     </tr>
    134 </thead>
    135 <tr>
    136     <td colspan='6'><?php echo esc_html( rtrim( $pre_fill_url, '&' ) ); ?></td>
    137 </tr>
    138 <thead>
    139     <tr>
    140         <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (International)', 'gravitywp-merge-tags' ); ?></th>
    141     </tr>
    142 </thead>
    143     <tr>
    144         <td colspan="6"><?php echo esc_html( rtrim( $pre_fill_url_excel, '&"&' ) ); ?></td>
    145     </tr>
    146 <thead>
    147     <tr>
    148         <th colspan='6'><?php esc_html_e( 'Excel formula for generating url (encoded) query string (Localized)', 'gravitywp-merge-tags' ); ?></th>
    149     </tr>
    150 </thead>
    151     <tr>
    152         <td colspan="6"><?php
    153         /* translators: Translate to localized excel function. */
    154         $excel_replace = esc_html__( 'ENCODEURL', 'gravitywp-merge-tags' );
    155         echo esc_html( str_replace( 'ENCODEURL', $excel_replace, rtrim( $pre_fill_url_excel, '&"&' ) ) ); ?>
    156         </td>
    157     </tr>
    158 </tbody>
    159148</table>

  • gravitywp-merge-tags/trunk/templates/template-standard-merge-tags.php

    r2848029 r3008589  
    6161
    6262$gwp_merge_tags['gravity_view_merge_tags']['name']   = 'Gravity View';
    63 $gwp_merge_tags['gravity_view_merge_tags']['url']    = 'https://gravityview.co/?ref=115';
     63$gwp_merge_tags['gravity_view_merge_tags']['url']    = 'https://gravitykit.com/?ref=115';
    6464$gwp_merge_tags['gravity_view_merge_tags']['values'] = array(
    6565    'get',
    … …  
    9191
    9292$gwp_merge_tags['gravity_view_modifiers']['name']   = 'Gravity View Modifiers';
    93 $gwp_merge_tags['gravity_view_modifiers']['url']    = 'https://gravityview.co/?ref=115';
     93$gwp_merge_tags['gravity_view_modifiers']['url']    = 'https://gravitykit.com/?ref=115';
    9494$gwp_merge_tags['gravity_view_modifiers']['values'] = array(
    9595    ':esc_html',
Note: See TracChangeset for help on using the changeset viewer.