diff --git a/composer.json b/composer.json index ef46d42..c08476d 100755 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "artweb/artbox-core": "@dev", "artweb/artbox-weblog": "@dev", "artweb/artbox-webcomment": "@dev", - "modernkernel/yii2-photoswipe": "*" + "modernkernel/yii2-photoswipe": "*", + "udokmeci/yii2-phone-validator" : "dev-master" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 60ed009..d005f40 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -128,6 +128,13 @@ } else { $model = new Feedback(); if ($model->load(Yii::$app->request->post()) && $model->save()) { + + $pattern = '/([a-zA-Z0-9\._-]*@[a-zA-Z0-9\._-]*)([;\s,:]*)/'; + $replacement = '$1; '; + $emailStr = preg_replace($pattern, $replacement, $settings->email); + $emailStr = mb_substr($emailStr, 0, -2); // remove last "; " 2 symbols + + $emails = explode("; ", $emailStr); $mailer->compose( 'feedback', @@ -136,19 +143,21 @@ ] ) ->setFrom('artbox@domain.com') - ->setTo($settings->email) + ->setTo($emails) ->setSubject(\Yii::t('app', 'Feedback')) ->send(); + $alert = "
+

Success

+

+ Success text +

+
"; + return [ 'success' => true, 'message' => 'Success message', - 'alert' => '
-

Success

-

- Success text -

-
', + 'alert' => $alert, ]; } else { return [ diff --git a/frontend/models/Feedback.php b/frontend/models/Feedback.php new file mode 100644 index 0000000..9d18162 --- /dev/null +++ b/frontend/models/Feedback.php @@ -0,0 +1,94 @@ +[ + 'name', + 'phone', + 'date', + 'time', + 'service', + 'url' + ], + + self::SCENARIO_WRITE_US => [ + 'name', + 'email', + 'phone', + 'message', + 'url' + ] + ] + ); + + return $scenarios; + } + + public function rules() + { + return [ + [ + [ + 'name', + 'phone', + 'date', + 'url' + ], + 'required', + 'on' => self::SCENARIO_APPOINTMENT, + ], + [ + [ + 'name', + 'email', + 'phone', + 'url', + ], + 'required', + 'on' => self::SCENARIO_WRITE_US, + ], + [ + [ 'email' ], + 'email', + ], + [ + [ + 'name', + 'date', + 'phone', + ], + 'string', + 'max' => 255, + ], + [ + [ 'url' ], + 'url' + ], + [ + [ 'message' ], + 'string', + ], + [ + [ 'status', ], + 'boolean', + ], + ]; + } + + } \ No newline at end of file diff --git a/frontend/views/site/comment/artbox_comment_item.php b/frontend/views/site/comment/artbox_comment_item.php index 2c7d1c6..1b30082 100755 --- a/frontend/views/site/comment/artbox_comment_item.php +++ b/frontend/views/site/comment/artbox_comment_item.php @@ -30,7 +30,7 @@