Merge pull request #145 from BoldGrid/1.6.10-rc1

Updated Versioning and readme

Author: avonville

README.md

@@ -1,12 +1,12 @@
 # weForms - Easy Drag & Drop Contact Form Builder For WordPress #
-**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu), [boldgrid](https://profiles.wordpress.org/boldgrid), [joemoto](https://profiles.wordpress.org/joemoto), [jamesros161](https://profiles.wordpress.org/jamesros161)
-**Tags:** forms, contact form, contact form plugin, custom form, form builder, form, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation
-**Requires at least:** 4.4
-**Requires PHP:** 5.6.20
-**Tested up to:** 5.7
-**Stable tag:** 1.6.9
-**License:** GPLv2 or later
-**License URI:** https://www.gnu.org/licenses/gpl-2.0.html
+**Contributors:** [tareq1988](https://profiles.wordpress.org/tareq1988), [nizamuddinbabu](https://profiles.wordpress.org/nizamuddinbabu), [boldgrid](https://profiles.wordpress.org/boldgrid), [joemoto](https://profiles.wordpress.org/joemoto), [jamesros161](https://profiles.wordpress.org/jamesros161)  
+**Tags:** forms, contact form, contact form plugin, custom form, form builder, form, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation  
+**Requires at least:** 4.4  
+**Requires PHP:** 5.6.20  
+**Tested up to:** 5.7  
+**Stable tag:** 1.6.10  
+**License:** GPLv2 or later  
+**License URI:** https://www.gnu.org/licenses/gpl-2.0.html  
 
 The easiest & fastest Contact Form on WordPress. Multiple templates, drag-&-drop live builder, submission listing, reCaptcha & more!
 
@@ -21,36 +21,6 @@ Moreover, with more than 20+ custom field, you can swiftly build contact forms,
 
 So weForms is an all-in-one form builder created with the global users in mind. Its minimalistic design is not only modern but also super fast and user-friendly. Everything works on a single page. Feel no delay – because your time is precious!
 
-## Development ##
-
-### Installing Dependencies ###
-Before you can use the development version of this plugin you must install the dependencies.
-
-```
-npm install
-```
-
-### Workflow ###
-Before editing or making changes check to make sure you are not editing any concatenated files. Check the Gruntfile.js in the concat: section for details. If you edit a concatenated file and run the build process any of your changes will be overwritten.
-
-Once you have made the changes and are ready to test run the following command.
-
-```
-grunt concat:(specified source)
-```
-
-#### Minify JS ####
-If you want to test changes with SCRIPT_DEBUG set to false. You will need to make sure the scripts are minified.
-To minify Javascript for testing run the following command.
-
-```
-grunt uglify:main
-```
-
-### Build Process ###
-When you are ready to build for release or QA make sure all branchs are merge that will be in the release and follow:
-[Release Process https://github.com/BoldGrid/weforms/wiki/Release-Process]
-
 ###  Quick Overview of weForms  ###
 [youtube https://www.youtube.com/watch?v=4uYi0833Kjw]
 
@@ -279,6 +249,16 @@ weForms is the most beginner friendly and fastest WordPress contact form plugin
 
 ## Changelog ##
 
+### Version 1.6.10 (05 January, 2022) ###
+* **Update:** Axios from 0.21.1 to 0.21.2.
+* **Update:** Set-value from 3.0.2 to 4.0.1.
+* **Update:** Added data-sytle to all fields.
+* **Fix:** Enforce date format from datepicker.
+* **Fix:** Changed entry after submission to form setting from global setting.
+* **Fix:** Removed id from entry table view.
+* **Fix:** Entry details show option and value selected.
+* **Improvement:** Address fields in notifications now accepts value: tags for selection fields
+
 ### Version 1.6.9 (15 September, 2021) ###
 * **Fix:** PHP 8.0 Emogrifier updates
 * **Fix:** Transaction page link updated to weforms site

assets/js-templates/spa-components.php

@@ -826,7 +826,14 @@
 
                     <div class="inside">
                         <p class="help">
-                            <?php esc_html_e( 'Export your form entries/submissions as a <strong>CSV</strong> file.', 'weforms' ); ?>
+                            <?php
+                                // translators: 1: Opening strong tag. 2: closing strong tag
+                                printf(
+                                    esc_html__( 'Export your form entries/submissions as a %1$sCSV%2$S file.', 'weforms' ),
+                                    '<strong>',
+                                    '</strong>'
+                                );
+                            ?>
                         </p>
 
                         <template v-if="!loading">
@@ -854,7 +861,15 @@
             <h3><?php esc_html_e( 'Import Contact Form', 'weforms' ); ?></h3>
 
             <p><?php esc_html_e( 'Browse and locate a json file you backed up before.', 'weforms' ); ?></p>
-            <p><?php esc_html_e( 'Press <strong>Import</strong> button, we will do the rest for you.', 'weforms' ); ?></p>
+            <p><?php
+                    // translators: 1: Strong tag with text.
+                    printf(
+                        esc_html__( 'Press %1$s Import button, we will do the rest for you.', 'weforms' ),
+                        '<strong>',
+                        '</strong>'
+                    );
+                ?>
+            </p>
 
             <div class="updated-message notice notice-success is-dismissible" v-if="isSuccess">
                 <p>{{ responseMessage }}</p>

assets/js/spa-app.js

@@ -1,6 +1,36 @@
 'use strict';
 
-var _typeof5 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var _typeof10 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var _typeof9 = typeof Symbol === "function" && _typeof10(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof10(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof10(obj);
+};
+
+var _typeof8 = typeof Symbol === "function" && _typeof9(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof9(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof9(obj);
+};
+
+var _typeof7 = typeof Symbol === "function" && _typeof8(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof8(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof8(obj);
+};
+
+var _typeof6 = typeof Symbol === "function" && _typeof7(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof7(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof7(obj);
+};
+
+var _typeof5 = typeof Symbol === "function" && _typeof6(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof6(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof6(obj);
+};
 
 var _typeof4 = typeof Symbol === "function" && _typeof5(Symbol.iterator) === "symbol" ? function (obj) {
     return typeof obj === "undefined" ? "undefined" : _typeof5(obj);

assets/js/spa-app.min.js

@@ -767,20 +767,20 @@ public function handle_frontend_submission() {
             $entry_id = weforms_insert_entry( [
                 'form_id' => $form_id,
             ], $entry_fields );
-        if ( is_wp_error( $entry_id ) ) {
-            wp_send_json( [
-                'success' => false,
-                'error'   => $entry_id->get_error_message(),
+            if ( is_wp_error( $entry_id ) ) {
+                wp_send_json( [
+                    'success' => false,
+                    'error'   => $entry_id->get_error_message(),
+                ] );
+            }
+            // Fire a hook for integration
+            do_action( 'weforms_entry_submission', $entry_id, $form_id, $page_id, $form_settings );
+            $notification = new WeForms_Notification( [
+                'form_id'  => $form_id,
+                'page_id'  => $page_id,
+                'entry_id' => $entry_id,
             ] );
-        }
-        // Fire a hook for integration
-        do_action( 'weforms_entry_submission', $entry_id, $form_id, $page_id, $form_settings );
-        $notification = new WeForms_Notification( [
-            'form_id'  => $form_id,
-            'page_id'  => $page_id,
-            'entry_id' => $entry_id,
-        ] );
-        $notification->send_notifications();
+            $notification->send_notifications();
         }
         // redirect URL
         $show_message = false;

includes/class-ajax.php

@@ -140,8 +140,9 @@ public function get_fields() {
             }
 
             // Check if meta_key has changed when saving form compared current entries
-            $field['original_name'] = $field['name'];
-
+            if ( isset( $field['name'] ) ) {
+                $field['original_name'] = $field['name'];
+            }
             $form_fields[] = apply_filters( 'weforms-get-form-field', $field, $this->id );
         }
 

includes/class-form.php

@@ -12,7 +12,7 @@ public function __construct() {
     }
 
     /**
-     * Render the text field
+     * Render the date field
      *
      * @param array $field_settings
      * @param int   $form_id
@@ -29,7 +29,11 @@ public function render( $field_settings, $form_id ) {
             <div class="wpuf-fields">
                 <input
                     id="wpuf-date-<?php echo esc_attr( $field_settings['name'] ); ?>"
-                    type="text" <?php echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly'; ?>
+                    type="text"
+                    <?php
+                        $field_settings['enforce_format'] = ! isset( $field_settings['enforce_format'] ) ? '' : $field_settings['enforce_format'];
+                        echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly';
+                    ?>
                     class="datepicker <?php echo ' wpuf_'.esc_attr( $field_settings['name'] ).'_'. esc_attr($form_id); ?>"
                     data-required="<?php echo esc_attr($field_settings['required']) ?>"
                     data-type="text"
@@ -71,19 +75,19 @@ public function get_options_settings() {
         $settings = [
             [
                 'name'      => 'format',
-                'title'     => __( 'Date Format', 'weforms' ),
+                'title'     => esc_html__( 'Date Format', 'weforms' ),
                 'type'      => 'text',
                 'section'   => 'advanced',
                 'priority'  => 23,
-                'help_text' => __( 'The date format', 'weforms' ),
+                'help_text' => esc_html__( 'The date format', 'weforms' ),
             ],
             [
                 'name'          => 'time',
                 'title'         => '',
                 'type'          => 'checkbox',
                 'is_single_opt' => true,
                 'options'       => [
-                    'yes'   => __( 'Enable time input', 'weforms' ),
+                    'yes'   => esc_html__( 'Enable time input', 'weforms' ),
                 ],
                 'section'       => 'advanced',
                 'priority'      => 24,
@@ -95,24 +99,25 @@ public function get_options_settings() {
                 'type'          => 'checkbox',
                 'is_single_opt' => true,
                 'options'       => [
-                    'yes'   => __( 'Set this as publish time input', 'weforms' ),
+                    'yes'   => esc_html__( 'Set this as publish time input', 'weforms' ),
                 ],
                 'section'       => 'advanced',
                 'priority'      => 24,
                 'help_text'     => '',
             ],
             [
               'name'            => 'enforce_format',
-              'title'           => '',
+              'title'           => __( 'Toggle Keyboard input for Date', 'weforms' ),
               'type'            => 'checkbox',
               'section'         => 'advanced',
               'is_single_opt'   => true,
               'options'         => [
-                  'yes'   => __( 'Enforce Date Format', 'weforms' ),
+                  'yes'   => esc_html__( 'Force Datepicker Input', 'weforms' ),
               ],
+              'default'         => 'yes',
               'priority'        => 24,
-              'help_text'       => __( 'Disables Keyboard Input and uses the Datepicker Format', 'weforms' ),
-            ]
+              'help_text'       => esc_html__( 'Disables Keyboard Input and uses the Datepicker Format', 'weforms' ),
+            ],
         ];
 
         return array_merge( $default_options, $settings );
@@ -129,6 +134,7 @@ public function get_field_props() {
             'format'            => 'dd/mm/yy',
             'time'              => '',
             'is_publish_time'   => '',
+            'enforce_format'    => '',
         ];
 
         return array_merge( $defaults, $props );

includes/fields/class-field-date.php

@@ -96,7 +96,7 @@ public function create_doc($entry_id, $form_id, $page_id)
                 'country' => isset( $address['country_select'] ) ? $address['country_select'] : '',
             );
         }
-        
+
         preg_match_all("/(?<=:)\w+(?=\})/", $integration->fields->line_items, $matches );
 
         $line_item_data = array_key_exists( $matches[0][0], $form_data['data'] );
@@ -132,7 +132,7 @@ public function create_doc($entry_id, $form_id, $page_id)
                         'qty' => $lineItemsSelected[0]['quantity'],
                     );
                 }
-                
+
             };
             if ( isset( $li_items ) && isset( $li_deposit ) ) {
                 $li = array_merge( $li_items, $li_deposit );
@@ -158,7 +158,7 @@ public function create_doc($entry_id, $form_id, $page_id)
             'vat'          => self::get_value( $integration->fields->vat, $entry_id, $form_id, $page_id ),
             'entry_note'   => self::build_entry_note( $form_id, $entry_id ),
             'entry_id'     => $entry_id,
-            'payment'      => !empty( $li_deposit ) ? 'true' : 'false',
+            'payment'      => !empty( $payment_data ) ? 'true' : 'false',
             'form_id'      => $form_id,
             'page_id'      => $page_id,
             'form_data'    => $form_data['data'],
@@ -167,17 +167,17 @@ public function create_doc($entry_id, $form_id, $page_id)
 
         $doc_id = 0;
         $doctype = $integration->doctype;
-        $create_user_and_client = $integration->create_user_and_client;
+        $create_user_and_client = isset( $integration->create_user_and_client ) ? $integration->create_user_and_client : 'false';
         switch ($doctype) {
             case 'invoice':
                 $doc_id = $this->create_invoice( $submission );
-                if ($create_user_and_client) {
+                if ( 'false' !== $create_user_and_client ) {
                     $this->create_client( $submission, $doc_id );
                 }
                 break;
             case 'estimate':
                 $doc_id = $this->create_estimate( $submission );
-                if ($create_user_and_client) {
+                if ( 'false' !== $create_user_and_client ) {
                     $this->create_client( $submission, $doc_id );
                 }
                 break;
@@ -190,8 +190,8 @@ public function create_doc($entry_id, $form_id, $page_id)
         }
 
         // REDIRECT
-        $redirect = $integration->redirect;
-        if ($redirect && $doc_id) {
+        $redirect = isset( $integration->redirect ) ? $integration->redirect : 'false';
+        if ( 'false' !== $redirect && $doc_id ) {
             $doc = si_get_doc_object( $doc_id );
             $doc->set_pending();
             $url = wp_get_referer();
@@ -342,7 +342,7 @@ public static function build_entry_note($form_id, $entry_id)
         return $table;
     }
 
-    protected function create_invoice($submission = array())
+    protected function create_invoice( $submission = array() )
     {
         $invoice_args = array(
             'subject' => sprintf( apply_filters( 'si_form_submission_title_format', '%1$s (%2$s)', $submission ), $submission['subject'], $submission['client_name'] ),
@@ -357,11 +357,12 @@ protected function create_invoice($submission = array())
          */
         $invoice_id = SI_Invoice::create_invoice( $invoice_args );
         $invoice = SI_Invoice::get_instance( $invoice_id );
-        $status = SI_Payment::STATUS_AUTHORIZED;
-        $invoice_status = SI_Payment::set_status($status);
-        
+
         $invoice->set_line_items( $submission['line_items'] );
         $invoice->set_calculated_total();
+        if ( 'false' === $submission['payment'] ) {
+            $invoice->set_pending();
+        }
 
         // notes
         if (isset( $submission['notes'] ) && '' !== $submission['notes']) {
@@ -377,7 +378,7 @@ protected function create_invoice($submission = array())
         }
 
         // Add Payment from weForms if deposit
-        if ( $submission['payment'] === 'false' ) {
+        if ( 'true' === $submission['payment'] ) {
             SI_PAYMENT::new_payment();
         }