visit

Anastasia
1 parent 10ec2a3b
Showing 9 changed files with 54 additions and 57 deletions Show diff stats
backend/controllers/VisitController.php
backend/views/feedback/_form.php
backend/views/visit/_form.php
common/models/Feedback.php
common/models/Visit.php
console/migrations/m180712_081623_alter_table_visit.php
frontend/controllers/SiteController.php
frontend/views/layouts/main.php
frontend/views/service/_prices.php
@@ -45,12 +45,6 @@
                 'index'  => [
                     'class'            => Index::className(),
                     'columns'          => [
-                        'name'       => [
-                            'type' => Index::ACTION_COL,
-                        ],
-                        'email'      => [
-                            'type' => Index::STRING_COL
-                        ],
                         'phone'      => [
                             'type' => Index::STRING_COL
                         ],
@@ -11,19 +11,7 @@
 <div class="feedback-form">
     <?php $form = ActiveForm::begin(); ?>
-    <?php
-     switch ($model->time){
-         case 1:
-           echo "<p>В течении 30 минут</p>";
-           break;
-         case 2:
-             echo "<p>C 9.00 до 12.00</p>";
-             break;
-         case 3:
-             echo "<p>C 12.00 до 18.00</p>";
-             break;
-     }
-    ?>
+   
     <?= $form->field($model, 'phone')
              ->textInput([ 'maxlength' => true ]) ?>
@@ -12,17 +12,23 @@
     <?php $form = ActiveForm::begin(); ?>
-    <?= $form->field($model, 'name')
-             ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'email')
-             ->textInput([ 'maxlength' => true ]) ?>
+  
     <?= $form->field($model, 'phone')
              ->textInput([ 'maxlength' => true ]) ?>
-    
-    <?= $form->field($model, 'message')
-             ->textarea([ 'rows' => 6 ]) ?>
+    <?php
+        switch ($model->time){
+            case 1:
+                echo "<p>В течении 30 минут</p>";
+                break;
+            case 2:
+                echo "<p>C 9.00 до 12.00</p>";
+                break;
+            case 3:
+                echo "<p>C 12.00 до 18.00</p>";
+                break;
+        }
+    ?>
     <?= $form->field($model, 'status')
              ->checkbox(
@@ -26,15 +26,11 @@
         const SCENARIO_FEEDBACK = 'feedback';
         const SCENARIO_CALLBACK = 'callback';
-        const DURING_30_MIN = '1';
-    
-        const FROM_9_12 = '2';
-    
-        const FROM_12_18 = '3' ;
+        
         public $returnUrl;
-        public $agree;
+       
         /**
          * @inheritdoc
@@ -165,17 +161,8 @@
                     'returnUrl',
                     'safe',
                 ],
-                [
-                   [ 'time' ], 'integer'
-                ],
-                [
-                    [
-                        'agree',
-                    ],
-                    'in',
-                    'range'      => [ 1 ],
-                    'allowArray' => false,
-                ],
+                
+                
             ];
         }
@@ -17,7 +17,13 @@
      */
     class Visit extends \yii\db\ActiveRecord
     {
-        
+        const DURING_30_MIN = '1';
+    
+        const FROM_9_12 = '2';
+    
+        const FROM_12_18 = '3' ;
+    
+        public $agree;
         /**
          * @inheritdoc
          */
@@ -86,6 +92,17 @@
                     'string',
                     'max' => 255,
                 ],
+                [
+                    [
+                        'agree',
+                    ],
+                    'in',
+                    'range'      => [ 1 ],
+                    'allowArray' => false,
+                ],
+                [
+                    [ 'time' ], 'integer'
+                ],
             ];
         }
@@ -12,7 +12,7 @@ class m180712_081623_alter_table_visit extends Migration
      */
     public function safeUp()
     {
-        $this->addColumn('feedback', 'time', $this->integer());
+        $this->addColumn('visit', 'time', $this->integer());
     }
     /**
@@ -20,7 +20,7 @@ class m180712_081623_alter_table_visit extends Migration
      */
     public function safeDown()
     {
-       $this->dropColumn('feedback', 'time');
+       $this->dropColumn('visit', 'time');
     }
     /*
@@ -11,6 +11,7 @@
     use common\models\Service;
     use common\models\Settings;
     use common\models\slider\Slide;
+    use common\models\Visit;
     use Yii;
     use yii\data\ActiveDataProvider;
     use yii\db\ActiveQuery;
@@ -178,8 +179,7 @@
         public function actionCallback(){
             \Yii::$app->response->format = Response::FORMAT_JSON;
-            $model = new Feedback();
-            $model->scenario = Feedback::SCENARIO_CALLBACK;
+            $model = new Visit();
             if ($model->load(\Yii::$app->request->post()) && $model->save()){
                 return ['success' => true];
             }else{
@@ -20,6 +20,7 @@
     use artbox\core\seo\widgets\SeoBreadcrumbs;
     use common\models\Service;
     use common\models\Settings;
+    use common\models\Visit;
     use frontend\assets\AppAsset;
     use frontend\assets\SliderAsset;
     use frontend\widgets\ArtboxModalWidget;
@@ -318,7 +319,7 @@
                 </div>
                 <div class="hidden-xs btn-header-wr">
-                  <span class="btn_ modal-link" data-form="write-to"><?= \Yii::t('app', 'Make an appointment') ?></span>
+                  <span class="btn_ modal-link" data-form="callback"><?= \Yii::t('app', 'Make an appointment') ?></span>
                 </div>
                 <ul class="hidden-xs hidden-sm">
@@ -650,8 +651,7 @@
       <div id="callback" class=" forms_ " style="display: none;">
         <div class="style title-callback">Записаться на прием</div>
           <?php
-              $model = new Feedback(['agree' => 1, 'time' => 1]);
-              $model->scenario = Feedback::SCENARIO_CALLBACK;
+              $model = new Visit(['agree' => 1, 'time' => 1]);
               $form = ActiveForm::begin([ 'action' => 'site/callback', 'id' => 'callback-form' ]); ?>
         <div class="input-wr phones_mask required">
             <?= $form->field($model, 'phone')
@@ -663,9 +663,9 @@
             <?= $form->field($model, 'time')
                      ->radioList(
                          [
-                             Feedback::DURING_30_MIN => 'В течение 30 минут',
-                             Feedback::FROM_9_12     => 'с 9:00 до 12:00',
-                             Feedback::FROM_12_18    => 'с 12:00 до 18:00',
+                             Visit::DURING_30_MIN => 'В течение 30 минут',
+                             Visit::FROM_9_12     => 'с 9:00 до 12:00',
+                             Visit::FROM_12_18    => 'с 12:00 до 18:00',
                          ],
                          [
                              'item' => function ($index, $label, $name, $checked, $value) {
@@ -673,7 +673,12 @@
                                  return '<div class="style radio_custom"><input id="time_'.$value.'" type="radio" name="'.$name.'" value="'.$value.'" '.$check.'><label for="time_'.$value.'">'.$label.'</label></div>';
                              },
                          ]
-                     )->label(false); ?>
+                     )->label(false);
+            
+            echo $form->field($model, 'entity')->hiddenInput(['value' => (isset($this->params['entity']) ? $this->params['entity'] : null)])->label(false);
+            echo $form->field($model, 'entity_id')->hiddenInput(['value' => (isset($this->params['entity_id']) ? $this->params['entity_id'] : null)])->label(false)
+            
+            ?>
           <!--                <div class="style radio_custom">-->
           <!--                    <input type="radio" id="order-delivery_id1" name="qwerty" value="1" checked="">-->
@@ -23,7 +23,7 @@
   <div class="style new-price-write-txt-btn">
       <div class="new-price-write-txt"><span>Точную стоимость лечения узнавайте на консультации с доктором</span></div>
       <div class="new-price-write-btn">
-          <span class="btn_ modal-link" data-form="write-to"><?=\Yii::t('app','Make an appointment');?></span>
+          <span class="btn_ modal-link" data-form="callback"><?=\Yii::t('app','Make an appointment');?></span>
       </div>
   </div>
 <?php } ?>