Custom fields

- added listing of custom fields in form editor
- ability to delete a custom field
- mades changes to the form editor in order to accomodate for the new custom fields system
- fix form editor bugs
- cleanup

lib/Router/CustomFields.php

@@ -0,0 +1,164 @@
+<?php
+namespace MailPoet\Router;
+use \MailPoet\Models\CustomField;
+
+if(!defined('ABSPATH')) exit;
+
+class CustomFields {
+  function __construct() {
+  }
+
+  function getAll() {
+    $collection = CustomField::findMany();
+    $custom_fields = array_map(function($custom_field) {
+      return $custom_field->asArray();
+    }, $collection);
+
+    wp_send_json($custom_fields);
+  }
+
+  function delete($id) {
+    $result = false;
+
+    $custom_field = CustomField::findOne($id);
+    if($custom_field !== false) {
+      $custom_field->delete();
+      $result = true;
+    }
+
+    wp_send_json($result);
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  function get($id) {
+    $custom_field = CustomField::findOne($id);
+    if($custom_field === false) {
+      wp_send_json(false);
+    } else {
+      $custom_field = $custom_field->asArray();
+      wp_send_json($custom_field);
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  function create() {
+    // create new form
+    $custom_field_data = array(
+      'name' => __('New form'),
+      'body' => array(
+        array(
+          'name' => __('Email'),
+          'type' => 'input',
+          'field' => 'email',
+          'static' => true,
+          'params' => array(
+            'label' => __('Email'),
+            'required' => true
+          )
+        ),
+        array(
+          'name' => __('Submit'),
+          'type' => 'submit',
+          'field' => 'submit',
+          'static' => true,
+          'params' => array(
+            'label' => __('Subscribe!')
+          )
+        )
+      ),
+      'settings' => array(
+        'on_success' => 'message',
+        'success_message' => __('Check your inbox or spam folder now to confirm your subscription.'),
+        'segments' => null,
+        'segments_selected_by' => 'admin'
+      )
+    );
+
+    $custom_field = CustomField::createOrUpdate($custom_field_data);
+
+    if($custom_field !== false && $custom_field->id()) {
+      wp_send_json(
+        admin_url('admin.php?page=mailpoet-form-editor&id='.$custom_field->id())
+      );
+    } else {
+      wp_send_json(false);
+    }
+  }
+
+  function save($data = array()) {
+    $custom_field = CustomField::createOrUpdate($data);
+
+    if($custom_field !== false && $custom_field->id()) {
+      wp_send_json($custom_field->id());
+    } else {
+      wp_send_json($custom_field);
+    }
+  }
+
+
+  function restore($id) {
+    $result = false;
+
+    $custom_field = CustomField::findOne($id);
+    if($custom_field !== false) {
+      $result = $custom_field->restore();
+    }
+
+    wp_send_json($result);
+  }
+
+  function trash($id) {
+    $result = false;
+
+    $custom_field = CustomField::findOne($id);
+    if($custom_field !== false) {
+      $result = $custom_field->trash();
+    }
+
+    wp_send_json($result);
+  }
+
+
+}

lib/Router/Forms.php

@@ -61,9 +61,9 @@ class Forms {
       'name' => __('New form'),
       'body' => array(
         array(
+          'id' => 'email',
           'name' => __('Email'),
           'type' => 'input',
-          'field' => 'email',
           'static' => true,
           'params' => array(
             'label' => __('Email'),
@@ -71,9 +71,9 @@ class Forms {
           )
         ),
         array(
+          'id' => 'submit',
           'name' => __('Submit'),
           'type' => 'submit',
-          'field' => 'submit',
           'static' => true,
           'params' => array(
             'label' => __('Subscribe!')
@@ -109,27 +109,32 @@ class Forms {
     }
   }
 
-  function preview($id) {
+  function previewEditor($data = array()) {
+    // html
+    $html = FormRenderer::renderHTML($data);
+
+    // convert shortcodes
+    $html = do_shortcode($html);
+
+    // styles
+    $css = new Util\Styles(FormRenderer::getStyles($data));
+
+    wp_send_json(array(
+      'html' => $html,
+      'css' => $css->render()
+    ));
+  }
+
+  function exportsEditor($id) {
+    $exports = false;
+
     $form = Form::findOne($id);
-    if($form === false) {
-      wp_send_json(false);
-    } else {
-      $form = $form->asArray();
 
-      // html
-      $html = FormRenderer::renderHTML($form);
-
-      // convert shortcodes
-      $html = do_shortcode($html);
-
-      // styles
-      $css = new Util\Styles(FormRenderer::getStyles($form));
-
-      wp_send_json(array(
-        'html' => $html,
-        'css' => $css->render()
-      ));
+    if($form !== false) {
+      $exports = Util\Export::getAll($form->asArray());
     }
+
+    wp_send_json($exports);
   }
 
   function saveEditor($data = array()) {
@@ -192,7 +197,7 @@ class Forms {
       'result' => ($form !== false),
       'is_widget' => $is_widget
     ));
-}
+  }
 
   function restore($id) {
     $result = false;
@@ -242,15 +247,6 @@ class Forms {
     wp_send_json($result);
   }
 
-  function itemAction($data = array()) {
-    $item_action = new Listing\ItemAction(
-      '\MailPoet\Models\Form',
-      $data
-    );
-
-    wp_send_json($item_action->apply());
-  }
-
   function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Form',

lib/Router/Newsletters.php

@@ -204,14 +204,6 @@ class Newsletters {
     wp_send_json($listing_data);
   }
 
-  function itemAction($data = array()) {
-    $item_action = new Listing\ItemAction(
-      '\MailPoet\Models\Newsletter',
-      $data
-    );
-    wp_send_json($item_action->apply());
-  }
-
   function bulkAction($data = array()) {
     $bulk_action = new Listing\BulkAction(
       '\MailPoet\Models\Newsletter',

lib/Router/Subscribers.php

@@ -88,10 +88,13 @@ class Subscribers {
       $errors[] = __('You need to select a list');
     }
 
+    $subscriber = false;
     if(!empty($errors)) {
       wp_send_json(array('errors' => $errors));
     } else {
-      $subscriber = Subscriber::where('email', $data['email'])->findOne();
+      if(!empty($data['email'])) {
+        $subscriber = Subscriber::where('email', $data['email'])->findOne();
+      }
     }
 
     $signup_confirmation = Setting::getValue('signup_confirmation', array());
@@ -180,14 +183,17 @@ class Subscribers {
       ? unserialize($form->settings) : null
     );
 
-    if($subscriber !== null && empty($errors)) {
-      $result = true;
-      $message = $form_settings['success_message'];
+    if(!empty($errors)) {
+      wp_send_json(array(
+        'result' => false,
+        'errors' => $errors
+      ));
     } else {
-      $result = false;
+      $result = true;
     }
 
     if($form_settings !== null) {
+      $message = $form_settings['success_message'];
 
       // url params for non ajax requests
       if($doing_ajax === false) {