From d36b72011b27b48428b49a60460afbb637a69a74 Mon Sep 17 00:00:00 2001 From: dozer111 Date: Thu, 17 May 2018 11:36:53 +0200 Subject: [PATCH] Поредактировал формы, сообщения при корректном/некорректном заполнении , вывод дат formatter-а --- frontend/assets/AppAsset.php | 2 +- frontend/config/main.php | 14 +++++++------- frontend/controllers/SiteController.php | 2 +- frontend/models/FeedBack.php | 78 ------------------------------------------------------------------------------ frontend/models/Feedback.php | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/js/script.js | 2 +- 6 files changed, 89 insertions(+), 88 deletions(-) delete mode 100644 frontend/models/FeedBack.php create mode 100644 frontend/models/Feedback.php diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 6aaace0..cbb08d9 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -32,7 +32,7 @@ 'js/owl.carousel.min.js', 'js/script.js', 'js/modal.js', - 'js/jquery.mask.min.js', + 'js/jquery.mask.min.js', ]; public $depends = [ 'yii\web\YiiAsset', diff --git a/frontend/config/main.php b/frontend/config/main.php index 64a80b5..667140d 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -79,9 +79,9 @@ ], 'modules' => [ 'feedback' => [ - 'class' => 'artbox\core\forms\Module', - 'activeRecord' => "artbox\core\models\Feedback", - 'attributes' => [ + 'class' => 'artbox\core\forms\Module', + 'activeRecord' => "frontend\models\Feedback", + 'attributes' => [ 'name', 'email', 'message', @@ -127,16 +127,16 @@ }', ], 'contact' => [ - 'class' => 'artbox\core\forms\Module', - 'activeRecord' => "artbox\core\models\Feedback", + 'class' => 'artbox\core\forms\Module', + 'activeRecord' => "frontend\models\Feedback", 'templateForm' => '
{form}
', - 'attributes' => [ + 'attributes' => [ 'name', 'email', 'phone', 'message', ], - 'rules' => [ + 'rules' => [ [ [ 'email' ], 'email', diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 6fabc06..8521776 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -1,7 +1,7 @@ self::SCENARIO_DEFAULT, - 'message' => \Yii::t('app', 'Empty field'), - ], - [ - [ - 'name', - 'email', - ], - 'required', - 'on' => self::SCENARIO_FEEDBACK, - 'message' => \Yii::t('app', 'Empty field'), - ], - [ - [ - 'phone', - 'name', - ], - 'required', - 'on' => self::SCENARIO_CALLBACK, - ], - [ - [ 'email' ], - 'email', - 'message' => 'Wrong email', - ], - - [ - [ - 'name', - 'phone', - 'email', - ], - 'string', - 'max' => 255, - ], - [ - [ - 'message', - ], - 'string', - ], - [ - [ - 'status', - ], - 'boolean', - ], - [ - 'returnUrl', - 'safe', - ], - ]; - } - -} \ No newline at end of file diff --git a/frontend/models/Feedback.php b/frontend/models/Feedback.php new file mode 100644 index 0000000..dd97e3c --- /dev/null +++ b/frontend/models/Feedback.php @@ -0,0 +1,79 @@ + self::SCENARIO_DEFAULT, + 'message' => \Yii::t('app', 'Empty field'), + ], + [ + [ + 'name', + 'email', + ], + 'required', + 'on' => self::SCENARIO_FEEDBACK, + 'message' => \Yii::t('app', 'Empty field'), + ], + [ + [ + 'phone', + 'name', + ], + 'required', + 'on' => self::SCENARIO_CALLBACK, + + ], + [ + [ 'email' ], + 'email', + 'message' => \Yii::t('app', 'Wrong email'), + ], + + [ + [ + 'name', + 'phone', + 'email', + ], + 'string', + 'max' => 255, + ], + [ + [ + 'message', + ], + 'string', + ], + [ + [ + 'status', + ], + 'boolean', + ], + [ + 'returnUrl', + 'safe', + ], + ]; + } + +} \ No newline at end of file diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 904105c..ab411ac 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -6,7 +6,7 @@ $( // */ // $(document) // .on( - // 'beforeSubmit', '#feedback-form', function(e) { + // 'beforeSubmit', '#feedback-form', function(e) { // var f = this; // var form = $(this); // var formData = form.serialize(); -- libgit2 0.21.4