mailing and phone validator

Timur Kastemirov
1 parent 0f67e06b
Showing 4 changed files with 113 additions and 9 deletions Show diff stats
composer.json
frontend/controllers/SiteController.php
frontend/models/Feedback.php
frontend/views/site/comment/artbox_comment_item.php
@@ -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",
@@ -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 = "<div class=\"alert alert-success\">
+                                <h3>Success</h3>
+                                <p>
+                                    Success text
+                                </p>
+                            </div>";
+                    
                     return [
                         'success' => true,
                         'message' => 'Success message',
-                        'alert'   => '<div class="alert alert-success">
-            <h3>Success</h3>
-            <p>
-              Success text
-            </p>
-          </div>',
+                        'alert'   => $alert,
                     ];
                 } else {
                     return [
+<?php
+    namespace frontend\models;
+    
+    /**
+     * Created by PhpStorm.
+     * User: timur
+     * Date: 09.11.17
+     * Time: 14:50
+     */
+    
+    class Feedback extends \artbox\core\models\Feedback
+    {
+        const SCENARIO_WRITE_US = "write_us";
+        const SCENARIO_APPOINTMENT = "appointment";
+        
+        public function scenarios()
+        {
+            $scenarios = array_merge(
+                parent::scenarios(),
+                [
+                    self::SCENARIO_APPOINTMENT=>[
+                        '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
@@ -30,7 +30,7 @@
     <div class="user_name" itemprop="author">
         <?php
           $nameField = $display_name;
-                echo $model->username . ' (' . Yii::t('artbox-comment', 'Guest') . ')';
+                echo $model->username;
         ?>
     </div>
       <?php