fix responsejs

Author: pceuropa

assets/form-builder/js/forms/controller.js

@@ -112,6 +112,7 @@ var quill = new Quill('#textdescription', {
 		field.setDataFieldFrom("data-source")  // class
 		field.render();
 	});
+
     /**
     * Add field to form
     * @param {event} e - event data object

assets/form-builder/js/forms/field.js

@@ -47,7 +47,6 @@ factory.prototype = {
           if (input.value == '') {
             input.value = this.data[prop];
           }
-          console.log(input);
         }
     },
 

assets/form-builder/js/forms/form.js

@@ -259,12 +259,16 @@ MyFORM = (function() {
         * @returm {Boolean}
         */
         add: function(o) {
+          console.log(o);
+
             try {
                 if (o.hasOwnProperty('field')) {
                     var field = this.filter(o);
+                  console.log(field);
 
                     this.model.body.push([field]);
                     this.fields_with_data.push(field.name);
+                  console.log(o);
                     this.post(o);
                     this.render();
 
@@ -274,7 +278,7 @@ MyFORM = (function() {
                 }
             } catch (err) {
                 console.log(err);
-                alert('Error add field to form: uncorrect  data')
+                alert('Error add field to form: uncorrect data')
             }
         },
 
@@ -368,7 +372,7 @@ MyFORM = (function() {
         */
         executeModules: function() {
             for (var prop in this.modules) {
-                    this.modules[prop]();
+                    this.modules[prop](this);
             }
         },
 

assets/form-builder/js/forms/form.module.response.js

@@ -7,27 +7,17 @@
  */	
 
 var MyFORM = MyFORM || {};
-MyFORM.response = function (form, field){
+MyFORM.response = function (){
 
 	var html = '<div class="row form-group-sm"> ' +
 		'<label class="col-sm-3 control-label">Text respond</label> ' +
 		'<div class="col-sm-9"> ' +
 		  '<textarea id="response" class="form-control input-sm" rows="5" disabled>Respond work if in form is field with name email</textarea> ' +
-		'</div> ' +
-	'</div>';
-	field = field || 'email';
+		'</div></div>';
 
 	$("#widget-form-options").append(html);
 
-	return	function(){
-		fields_with_data = h.getAllProperty('name', form.body);
-		
-		for (var i = 0; i < fields_with_data.length; i++) {
-		    
-		    if (fields_with_data[i] === field){
-		    	$('#response').prop('disabled', false); break;
-		    }
-		    $('#response').prop('disabled', true);
-		}
+	return	function(form){
+		$('#response').prop('disabled', form.fields_with_data.indexOf('email') < 0);
 	}
 }

controllers/ModuleController.php

@@ -94,14 +94,12 @@ public function actionView(string $url) {
                 $form->updateCounters(['answer' => 1 ]);
                 Yii::$app->session->setFlash('success', Yii::t('builder', 'Form completed'));
 
-                if ($this->module->sendEmail && is_string($this->module->emailSender) && isset($data['email']) && isset($form['response']) ) {
                     SendEmail::widget([
                                           'from' => $this->module->emailSender,
                                           'to' => $data['email'],
                                           'subject' => 'subject',
-                                          'textBody' => $form['response'],
+                                          'textBody' => 'test',
                                       ]);
-                }
 
 
             } else {

tags

@@ -30,7 +30,7 @@ public function testInit() {
         $this->assertEquals( $this->formBuilder->db, 'db');
         $this->assertFalse( $this->formBuilder->test_mode);
         $this->assertTrue( $this->formBuilder->easy_mode);
-        $this->assertFalse( $this->formBuilder->email_response);
+        $this->assertFalse( $this->formBuilder->send_email);
     }
 
     public function testTableSchema() {

tests/php/unit/FormUpdateTest.php

@@ -73,7 +73,7 @@
 if ($send_email){
   // add module Email send after submit form (work if in forms is field with attribute name 'email')
   // form.modules are initalized each time the form is rendered
-	$this->registerJs("form.modules.response = MyFORM.response(form)", 4);
+	$this->registerJs("form.modules.response = MyFORM.response()", 4);
 }
 $this->registerJs("
   form.init(".Json::encode($jsConfig).");