Fixes format of entry value if needed

Author: avonville

includes/class-ajax.php

@@ -528,7 +528,7 @@ public function get_entry_detail() {
         $has_empty          = false;
         $answers            = [];
         $respondentPoints   = isset( $form_settings['total_points'] ) ? floatval( $form_settings['total_points'] ) : 0;
-
+        $fields_formatted   = array();
         foreach ( $fields as $key => $field ) {
             if ( $form_settings['quiz_form'] == 'yes' ) {
                 $selectedAnswers    = isset( $field['selected_answers'] ) ? $field['selected_answers'] : '';
@@ -539,7 +539,6 @@ public function get_entry_detail() {
 
                 if ( $template == 'radio_field' || $template == 'dropdown_field' ) {
                     $answers[$field['name']] = true;
-
                     if ( empty( $givenAnswer ) ) {
                         $answers[$field['name']] = false;
                         $respondentPoints -= $fieldPoints;
@@ -576,11 +575,13 @@ public function get_entry_detail() {
             } elseif ( empty( $field['value'] ) ) {
                 $has_empty      = true;
                 break;
+            } else {
+                $field = WeForms_Form_Entry_Manager::format_entry_details( $field );
+                array_push( $fields_formatted, $field );
             }
         }
-
         $response = [
-            'form_fields'       => $fields,
+            'form_fields'       => $fields_formatted,
             'form_settings'     => $form_settings,
             'meta_data'         => $metadata,
             'payment_data'      => $payment,
@@ -589,6 +590,7 @@ public function get_entry_detail() {
             'answers'           => $answers,
         ];
 
+
         wp_send_json_success( $response );
     }
 

includes/class-form-entry-manager.php

@@ -51,4 +51,48 @@ public function all() {
     public function get( $entry_id ) {
         return new WeForms_Form_Entry( $entry_id, $this->form );
     }
+
+    /**
+     * Format Entry Values.
+     *
+     * @static
+     * @param  array $field
+     *
+     * @return array $field
+     */
+    public static function format_entry_details( $field ) {
+        switch ( $field['template'] ) {
+
+            case 'radio_field':
+                $value = array_search( $field['value'], $field['options'] );
+                $field['value'] = esc_html( 'Option: ' . $field['value'] . ' - ' . 'Value: ' . $value );
+
+                break;
+
+            case 'checkbox_field':
+                $field_formatted = array();
+                foreach ( $field['value'] as $option ) {
+                    $value             = array_search( $option, $field['options'] );
+                    $field_formatted[] = esc_html( 'Option: ' . $option . ' - ' . 'Value: ' . $value );
+                }
+                $field['value'] = array_replace( $field['value'], $field_formatted );
+
+                break;
+
+            case 'multiple_select':
+                $field_formatted = array();
+                foreach ( $field['value'] as $option ) {
+                    $value             = array_search( $option, $field['options'] );
+                    $field_formatted[] = esc_html( 'Option: ' . $option . ' - ' . 'Value: ' . $value );
+                }
+                $field['value'] = array_replace( $field['value'], $field_formatted );
+
+                break;
+
+            default:
+                // Do nothing if value format does not need to be changed.
+                break;
+        }
+        return $field;
+    }
 }

includes/fields/class-field-checkbox.php

@@ -118,7 +118,7 @@ public function prepare_entry( $field, $args = [] ) {
             $new_val = [];
 
             foreach ( $entry_value as $option_key ) {
-                $new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] . ' , ' . $option_key : $option_key;
+                $new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] : $option_key;
             }
 
             $entry_value = implode( WeForms::$field_separator, $new_val );

includes/fields/class-field-multidropdown.php

@@ -103,7 +103,7 @@ public function prepare_entry( $field, $args = [] ) {
             $new_val = [];
 
             foreach ( $entry_value as $option_key ) {
-                $new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] . ' , ' . $option_key : $option_key;
+                $new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] : $option_key;
             }
 
             $entry_value = implode( WeForms::$field_separator, $new_val );

includes/fields/class-field-radio.php

@@ -120,6 +120,6 @@ public function prepare_entry( $field, $args = [] ) {
         $args = ! empty( $args ) ? $args : weforms_clean( $_POST );
         $val  = $args[$field['name']];
 
-        return isset( $field['options'][$val] ) ? $field['options'][$val] . ' , ' . $val  : $val;
+        return isset( $field['options'][$val] ) ? $field['options'][$val] : $val;
     }
 }

includes/functions.php

@@ -177,7 +177,7 @@ function weforms_get_entry_payment( $entry_id ) {
     $query = 'SELECT transaction_id FROM ' . $wpdb->prefix . 'weforms_payments' .
         ' WHERE entry_id = ' . $entry_id;
     $payment = $wpdb->get_row( $query, $entry_id );
-    
+
     return $payment;
 }