Improve Event management

backend/controllers/EventController.php

@@ -110,12 +110,12 @@ class EventController extends Controller
      * @param integer $id
      * @return mixed
      * @throws NotFoundHttpException
-     * @throws \yii\db\StaleObjectException
+     * @throws \yii\db\Exception
      */
     public function actionDelete($id)
     {
-        $this->findModel($id)->delete();
+        $manager = new EventRegistrationManager();
-
+        $manager->deleteEvent($this->findModel($id));
         return $this->redirect(['index']);
     }
 
@@ -141,12 +141,35 @@ class EventController extends Controller
             throw $ex;
         }
     }
+
+    /**
+     * @param $id
+     * @return \yii\web\Response
+     * @throws \yii\db\Exception
+     */
+    public function actionDeleteRegistration($id)
+    {
+        $eventRegistrationManager = new EventRegistrationManager();
+        $db = \Yii::$app->db;
+        $tx = $db->beginTransaction();
+        try{
+            $registration = $eventRegistrationManager->loadRegistration($id);
+            $eventRegistrationManager->deleteRegistration($registration);
+            $tx->commit();
+            return $this->redirect(['view', 'id' => $registration->id_event]);
+        }catch (\Exception $ex){
+            $tx->rollBack();
+            throw $ex;
+        }
+    }
+
     /**
      * @param $id
      * @return string|\yii\web\Response
      * @throws NotFoundHttpException
+     * @throws \yii\db\Exception
      */
-    public function actionRegisterCard($id)
+    public function actionReserveCard($id)
     {
 
         $event = $this->findModel($id);

backend/models/EventSearch.php

@@ -21,7 +21,6 @@ class EventSearch extends Event
     public $eventTypeName;
 
 
-
     /**
      * @inheritdoc
      */
@@ -60,6 +59,8 @@ class EventSearch extends Event
             'event.end as event_end',
             'event.created_at as event_created_at',
             'event.updated_at as event_updated_at',
+            'event.deleted_at as event_deleted_at',
+            'event.seat_count as event_seat_count',
             'trainer.name as trainer_name',
             'room.name as  room_name',
             'event_type.name as event_type_name',
@@ -78,6 +79,7 @@ class EventSearch extends Event
                 'event_end',
                 'event_created_at',
                 'event_updated_at',
+                'event_deleted_at',
                 'trainer_name',
                 'room_name',
                 'event_type_name',
@@ -100,7 +102,9 @@ class EventSearch extends Event
                     ['customer_name'],
                     ['event_created_at'],
                     ['event_updated_at'],
+                    ['event_deleted_at'],
                     ['registration_count'],
+                    ['event_seat_count'],
                 ]),
             ]
         ]);

backend/views/event/_view.php

@@ -0,0 +1,74 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Event */
+
+
+?>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">Esemény</h3>
+        </div>
+        <div class="panel-body">
+            <div class="row">
+                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                    <?php try {
+                        echo DetailView::widget([
+                            'model' => $model,
+                            'attributes' => [
+                                'id',
+                                'created_at:datetime',
+                                'updated_at:datetime',
+                                'deleted_at:datetime',
+                            ],
+                        ]);
+                    } catch (Exception $e) {
+                        echo "failed to render event details ";
+                    } ?>
+                </div>
+                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                    <?php  try {
+                        echo DetailView::widget([
+                            'model' => $model,
+                            'attributes' => [
+                                [
+                                    'attribute' => 'eventType.name',
+                                    'label' => $model->getAttributeLabel('id_event_type')
+                                ],
+                                'start:datetime',
+                                'end:datetime',
+                                [
+                                    'attribute' => 'room.name',
+                                    'label' => $model->getAttributeLabel('id_room')
+                                ],
+                                [
+                                    'attribute' => 'trainer.name',
+                                    'label' => $model->getAttributeLabel('id_trainer')
+                                ],
+                            ],
+                        ]);
+                    } catch (Exception $e) {
+                        echo "Failed to render view";
+                    } ?>
+                </div>
+                <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                    <?php  try {
+                        echo DetailView::widget([
+                            'model' => $model,
+                            'attributes' => [
+                                'seat_count',
+                                'eventRegistrationCount',
+                                'openSeatCount',
+                            ],
+                        ]);
+                    } catch (Exception $e) {
+                        echo "Failed to render view";
+                    } ?>
+                </div>
+            </div>
+        </div>
+
+</div>

backend/views/event/index.php

@@ -38,7 +38,11 @@ $this->params['breadcrumbs'][] = $this->title;
             [
                 'attribute' => 'event_end',
                 'label' => \Yii::t('event', 'End'),
-                'format' => 'datetime'
+                'format' => 'time'
+            ],
+            [
+                'attribute' => 'event_seat_count',
+                'label' => \Yii::t('event', 'Seat Count')
             ],
             [
                 'attribute' => 'registration_count',
@@ -62,9 +66,14 @@ $this->params['breadcrumbs'][] = $this->title;
                 'label' => \Yii::t('event', 'Updated At'),
                 'format' => 'datetime'
             ],
+            [
+                'attribute' => 'event_deleted_at',
+                'label' => \Yii::t('event', 'Deleted At'),
+                'format' => 'datetime'
+            ],
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => '{view} {update} {delete} {register-card}',
+                'template' => '{view} {update}   {reserve-card}',
                 'urlCreator' => function ($action, $model, $key, $index) {
                     $params = ['id' => $model['event_id']];
                     $params[0] = "event" . '/' . $action;
@@ -97,7 +106,7 @@ $this->params['breadcrumbs'][] = $this->title;
                         ];
                         return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, $options);
                     },
-                    'register-card' => function ($url, $model, $key) {
+                    'reserve-card' => function ($url, $model, $key) {
                         $options = [
                             'title' => Yii::t('yii', 'Register'),
                             'aria-label' => Yii::t('yii', 'Register'),

backend/views/event/register_card.php

@@ -14,30 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <h2>Esemény</h2>
+    <?php echo $this->render('_view', ['model' => $event]); ?>
-    <?= /** @var \common\models\Event $event */
-    /** @noinspection PhpUnhandledExceptionInspection */
-    \yii\widgets\DetailView::widget([
-        'model' => $event,
-        'attributes' => [
-            'id',
-            'start:datetime',
-            'end:datetime',
-            [
-                'attribute' => 'room.name',
-                'label' => $model->getAttributeLabel('id_room')
-            ],
-            [
-                'attribute' => 'trainer.name',
-                'label' => $model->getAttributeLabel('id_trainer')
-            ],
-            [
-                'attribute' => 'eventType.name',
-                'label' => $model->getAttributeLabel('id_event_type')
-            ],
-            'seat_count',
-        ],
-    ]) ?>
 
     <?= $this->render('_form_register_card', [
         'model' => $model,

backend/views/event/view.php

@@ -6,9 +6,27 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\models\Event */
 
-$this->title = $model->trainer->name . "/" . $model->eventType->name . "/" . $model->room->name;
+$this->title = \Yii::t('event', 'Event Details');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('event', 'Events'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
+
+function isReservationOpen($model)
+{
+    $canceled = isset($model['event_registration_canceled_at']);
+    $deleted = isset($model['event_registration_deleted_at']);
+    return !$canceled && !$deleted;
+}
+
+
+function getCommonColumnsHtmlOptions($model)
+{
+    $options = [];
+    if (!isReservationOpen($model)) {
+        $options['style'] = 'text-decoration: line-through;';
+    }
+    return $options;
+}
+
 ?>
 <div class="event-view">
 
@@ -16,60 +34,31 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <p>
         <?= Html::a(Yii::t('event', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('event', 'Register'), ['register-card', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?php
-        <?= Html::a(Yii::t('event', 'Delete'), ['delete', 'id' => $model->id], [
+        if ( $model->canReserve()){
+            echo Html::a(Yii::t('event', 'Reservation'), ['reserve-card', 'id' => $model->id], ['class' => 'btn btn-primary']);
+        }
+        ?>
+        <?php
+        if ($model->canDelete()) {
+            echo Html::a(Yii::t('event', 'Delete'), ['delete', 'id' => $model->id], [
                 'class' => 'btn btn-danger pull-right',
                 'data' => [
                     'confirm' => Yii::t('event', 'Are you sure you want to delete this item?'),
                     'method' => 'post',
                 ],
-        ]) ?>
+            ]);
+        }
+        ?>
     </p>
 
-    <div class="row">
+    <?php echo $this->render('_view', ['model' => $model]); ?>
-        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
-            <?php try {
-                echo DetailView::widget([
-                    'model' => $model,
-                    'attributes' => [
-                        'id',
-                        'start:datetime',
-                        'end:datetime',
-                        [
-                            'attribute' => 'room.name',
-                            'label' => $model->getAttributeLabel('id_room')
-                        ],
-                        [
-                            'attribute' => 'trainer.name',
-                            'label' => $model->getAttributeLabel('id_trainer')
-                        ],
-                    ],
-                ]);
-            } catch (Exception $e) {
-                echo "failed to render event details ";
-            } ?>
-        </div>
-        <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
-            <?php  try {
-                echo DetailView::widget([
-                    'model' => $model,
-                    'attributes' => [
-                        [
-                            'attribute' => 'eventType.name',
-                            'label' => $model->getAttributeLabel('id_event_type')
-                        ],
-                        'seat_count',
-                        'created_at:datetime',
-                        'updated_at:datetime',
-                    ],
-                ]);
-            } catch (Exception $e) {
-                echo "Failed to render view";
-            } ?>
-        </div>
-    </div>
-    <h2>Regisztrációk</h2>
 
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">Foglalások</h3>
+        </div>
+        <div class="panel-body">
             <?php try {
                 echo \yii\grid\GridView::widget([
                     'dataProvider' => $dataProvider,
@@ -78,65 +67,59 @@ $this->params['breadcrumbs'][] = $this->title;
                             'attribute' => 'card_number',
                             'label' => \Yii::t('event', 'Card Number'),
                             'contentOptions' => function ($model) {
-                        $options = [];
+                                return getCommonColumnsHtmlOptions($model);
-
+                            },
-                        if (isset($model['event_registration_canceled_at'])) {
+                            'format' => 'raw',
-                            $options['style'] = 'text-decoration: line-through;';
+                            'value' => function ($model, $key, $index, $column) {
-                        }
+                                return Html::a($model['card_number'], ['card/view', 'id' => $model['card_id_card']]);
-
-                        return $options;
                             }
                         ],
                         [
                             'attribute' => 'customer_name',
                             'label' => \Yii::t('event', 'Customer Name'),
                             'contentOptions' => function ($model) {
-                        $options = [];
+                                return getCommonColumnsHtmlOptions($model);
-
+                            },
-                        if (isset($model['event_registration_canceled_at'])) {
+                            'format' => 'raw',
-                            $options['style'] = 'text-decoration: line-through;';
+                            'value' => function ($model, $key, $index, $column) {
-                        }
+                                return Html::a($model['customer_name'], ['customer/view', 'id' => $model['customer_id_customer']]);
-
-                        return $options;
                             }
                         ],
                         [
                             'attribute' => 'customer_email',
                             'label' => \Yii::t('event', 'Customer Email'),
                             'contentOptions' => function ($model) {
-                        $options = [];
+                                return getCommonColumnsHtmlOptions($model);
-
-                        if (isset($model['event_registration_canceled_at'])) {
-                            $options['style'] = 'text-decoration: line-through;';
-                        }
-
-                        return $options;
                             }
                         ],
                         [
                             'attribute' => 'event_registration_created_at',
                             'label' => \Yii::t('event', 'Event Registration Created At'),
                             'contentOptions' => function ($model) {
-                        $options = [];
+                                return getCommonColumnsHtmlOptions($model);
-
-                        if (isset($model['event_registration_canceled_at'])) {
-                            $options['style'] = 'text-decoration: line-through;';
-                        }
-
-                        return $options;
                             }
                         ],
                         [
                             'attribute' => 'event_registration_canceled_at',
+                            'format' => 'datetime',
                             'label' => \Yii::t('event', 'Canceled At'),
                             'contentOptions' => function () {
                                 $options = [];
                                 return $options;
                             }
                         ],
+                        [
+                            'attribute' => 'event_registration_deleted_at',
+                            'format' => 'datetime',
+                            'label' => \Yii::t('event', 'Deleted At'),
+                            'contentOptions' => function () {
+                                $options = [];
+                                return $options;
+                            },
+                        ],
                         [
                             'class' => 'yii\grid\ActionColumn',
-                    'template' => '{cancel-registration}',
+                            'template' => '{cancel-registration} {delete-registration}',
                             'urlCreator' => function ($action, $model) {
                                 $params = ['id' => $model['event_registration_id']];
                                 $params[0] = "event" . '/' . $action;
@@ -148,14 +131,27 @@ $this->params['breadcrumbs'][] = $this->title;
                                         return "";
                                     }
                                     $options = [
-                                'title' => Yii::t('yii', 'Delete'),
+                                        'title' => Yii::t('event', 'Cancel'),
-                                'aria-label' => Yii::t('yii', 'Delete'),
+                                        'aria-label' => Yii::t('event', 'Cancel'),
-                                'data-confirm' => Yii::t('yii', 'Are you sure you want to delete this item?'),
+                                        'data-confirm' => Yii::t('event', 'Are you sure you want to cancel this item? Usage count won\'t be restored!'),
                                         'data-method' => 'post',
                                         'data-pjax' => '0',
                                     ];
                                     return Html::a('<span class="glyphicon glyphicon-ban-circle"></span>', $url, $options);
                                 },
+                                'delete-registration' => function ($url, $model) {
+                                    if (isset($model['event_registration_canceled_at'])) {
+                                        return "";
+                                    }
+                                    $options = [
+                                        'title' => Yii::t('yii', 'Delete'),
+                                        'aria-label' => Yii::t('yii', 'Delete'),
+                                        'data-confirm' => Yii::t('event', 'Are you sure you want to delete this item? Usage count will be restored!'),
+                                        'data-method' => 'post',
+                                        'data-pjax' => '0',
+                                    ];
+                                    return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, $options);
+                                },
                             ]
 
                         ],
@@ -165,5 +161,8 @@ $this->params['breadcrumbs'][] = $this->title;
                 echo "Failed to render registrations";
             }
             ?>
+        </div>
+    </div>
+
 
 </div>

common/manager/EventRegistrationManager.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace common\manager;
+
 use common\models\Card;
 use common\models\Customer;
 use common\models\Event;
@@ -16,7 +18,6 @@ use yii\web\ServerErrorHttpException;
  * Date: 2018.12.17.
  * Time: 6:12
  */
-
 class EventRegistrationManager extends \yii\base\Object
 {
     const CARD_NOT_FOUND = 1;
@@ -27,6 +28,7 @@ class EventRegistrationManager extends \yii\base\Object
     const TICKET_INSUFFICIENT = 6;
     const UNKNOWN_ERROR = 7;
     const MAX_SEAT_COUNT_EXCEEDED = 8;
+    const EVENT_UNAVAILABLE = 9;
 
     public static $STATES = [
         self::CARD_NOT_FOUND => "CARD_NOT_FOUND",
@@ -37,19 +39,20 @@ class EventRegistrationManager extends \yii\base\Object
         self::TICKET_INSUFFICIENT => "TICKET_INSUFFICIENT",
         self::UNKNOWN_ERROR => "UNKNOWN_ERROR",
         self::MAX_SEAT_COUNT_EXCEEDED => "MAX_SEAT_COUNT_EXCEEDED",
+        self::EVENT_UNAVAILABLE => "EVENT_UNAVAILABLE",
 
 
     ];
 
     /**
      * @param \common\models\CardEventRegistrationForm $cardEventForm
-     * @throws NotFoundHttpException
+     * @throws \yii\db\Exception
-     * @throws BadRequestHttpException
-     * @throws ServerErrorHttpException
-     * @throws \yii\web\HttpException
      */
-    public function registerCard($cardEventForm){
+    public function registerCard($cardEventForm)
-
+    {
+        $db = \Yii::$app->db;
+        $tx = $db->beginTransaction();
+        try {
             if ($cardEventForm->validate()) {
 
                 /** @var \common\models\Card $card */
@@ -73,6 +76,10 @@ class EventRegistrationManager extends \yii\base\Object
                     throw new NotFoundHttpException("Event not found: " . $cardEventForm->event_id);
                 }
 
+                if ( isset($event->deleted_at)){
+                    throw new BadRequestHttpException("Event deleted", self::EVENT_UNAVAILABLE);
+                }
+
                 if (!$event->hasFreeSeats()) {
                     throw new BadRequestHttpException("No free seats", self::NO_FREE_SEATS);
                 }
@@ -107,17 +114,24 @@ class EventRegistrationManager extends \yii\base\Object
 
                 $cardEventForm->registration = $registration;
             }
+            $tx->commit();
+        } catch (\Exception $exception) {
+            $tx->rollBack();
+        }
 
     }
 
-    public function createFindRegistrationsQuery($idEvent){
+    public function createFindRegistrationsQuery($idEvent)
+    {
         $query = new Query();
         $query->select([
             "event_registration.id as event_registration_id",
             "event_registration.created_at as event_registration_created_at",
             "event_registration.canceled_at as event_registration_canceled_at",
+            "event_registration.deleted_at as event_registration_deleted_at",
+            "card.id_card as card_id_card",
             "card.number as card_number",
-            "card.number as card_number",
+            "customer.id_customer as customer_id_customer",
             "customer.name as customer_name",
             "customer.email as customer_email",
         ]);
@@ -136,7 +150,8 @@ class EventRegistrationManager extends \yii\base\Object
      * @return array|EventRegistration|\yii\db\ActiveRecord|null
      * @throws NotFoundHttpException
      */
-    public function loadRegistration($idRegistration) {
+    public function loadRegistration($idRegistration)
+    {
 
         $registration = EventRegistration::find()->andWhere(['id' => $idRegistration])->one();
         if ($registration == null) {
@@ -149,21 +164,77 @@ class EventRegistrationManager extends \yii\base\Object
      * @param \common\models\EventRegistration $registration
      * @throws ServerErrorHttpException
      */
-    public function cancelRegistration($registration){
+    public function cancelRegistration($registration)
+    {
         if (isset($registration->canceled_at)) {
             throw new ServerErrorHttpException('The registration is already canceled');
         }
 
-        $ticket = Ticket::findOne(['id' => $registration->id_ticket ]);
+        if (isset($registration->deleted_at)) {
-
+            throw new ServerErrorHttpException('The reservation is already deleted');
-        $ticket->restoreReservationCount(1);
+        }
-        $ticket->save(false);
 
         $registration->canceled_at = date('Y-m-d H:i:s');
         $registration->save(false);
 
     }
 
+    /**
+     * @param \common\models\EventRegistration $registration
+     * @throws ServerErrorHttpException
+     */
+    public function deleteRegistration($registration)
+    {
+        if (isset($registration->deleted_at)) {
+            throw new ServerErrorHttpException('The reservation is already deleted');
+        }
+
+        $ticket = Ticket::findOne(['id_ticket' => $registration->id_ticket]);
+
+        $ticket->restoreReservationCount(1);
+        $ticket->save(false);
+
+        $registration->deleted_at = date('Y-m-d H:i:s');
+        $registration->save(false);
+
+    }
+
+    /**
+     * Delete an event
+     * @param \common\models\Event $event
+     * @throws \yii\db\Exception
+     * @throws \Exception
+     */
+    public function deleteEvent($event)
+    {
+        $db = \Yii::$app->db;
+        $tx = $db->beginTransaction();
+        try {
+
+            $registrations = $event->getEventRegistrations()->all();
+            // ////////////////////////////////
+            // if even has no registrations
+            // we can simply delete it from db
+            // ////////////////////////////////
+            if (count($registrations) == 0) {
+                $event->delete();
+            } else {
+                $event->deleted_at = date('Y-m-d H:i:s');
+                $event->save(false);
+                foreach ($registrations as $registration) {
+                    if (!isset($registration->deleted_at)) {
+                        /** @var \common\models\EventRegistration $registration */
+                        $this->deleteRegistration($registration);
+                    }
+                }
+            }
+            $tx->commit();
+        } catch (\Exception $e) {
+            $tx->rollBack();
+            throw $e;
+        }
+
+    }
 
 
 }

common/messages/hu/event.php

@@ -39,5 +39,12 @@ return [
     'Canceled At' => 'Sztornó dátum, idő',
     'Register' => 'Regisztráció',
     'Event Registration Created At' => 'Regisztráció dátum, idő',
-
+    'Event Registration Count' => 'Foglalások száma',
+    'Open Seat Count' => 'Szabad helyek száma',
+    'Cancel' => 'Lemond',
+    'Deleted At' => 'Törlés dátum, idő',
+    'Are you sure you want to cancel this item? Usage count won\'t be restored!' => 'Biztos benne, hogy lemondja ezt az foglalást? A foglalás nem kerül vissza a bérletre!',
+    'Are you sure you want to delete this item? Usage count will be restored!' => 'Biztos benne, hogy törli ezt az foglalást? A foglalás vissza fog kerülni a bérletre!',
+    'Reservation' => 'Foglalás',
+    'Event Details' => "Esemény részletei"
 ];

common/models/Event.php

@@ -18,6 +18,7 @@ use yii\helpers\ArrayHelper;
  * @property integer $seat_count
  * @property string $created_at
  * @property string $updated_at
+ * @property string $deleted_at
  * @property \common\models\EventType $eventType
  * @property \common\models\Trainer $trainer
  * @property \common\models\Room $room
@@ -67,6 +68,7 @@ class Event extends \yii\db\ActiveRecord
             'id_event_type' => Yii::t('event', 'Id Event Type'),
             'created_at' => Yii::t('event', 'Created At'),
             'updated_at' => Yii::t('event', 'Updated At'),
+            'deleted_at' => Yii::t('event', 'Deleted At'),
             'trainerName' => Yii::t('event', 'Trainer Name'),
             'roomName' => Yii::t('event', 'Room Name'),
             'eventTypeName' => Yii::t('event', 'Típus'),
@@ -77,6 +79,8 @@ class Event extends \yii\db\ActiveRecord
             'endDateString' => Yii::t('event', 'End'),
             'status' => Yii::t('event', 'Status'),
             'seat_count' => Yii::t('event', 'Seat Count'),
+            'eventRegistrationCount' => Yii::t('event', 'Event Registration Count'),
+            'openSeatCount' => Yii::t('event', 'Open Seat Count'),
         ];
     }
 
@@ -132,7 +136,16 @@ class Event extends \yii\db\ActiveRecord
      * @return  \common\models\EventRegistration[]|\yii\db\ActiveQuery
      */
     public function getEventRegistrationCount(){
-        return sizeof($this->eventRegistrations);
+        return sizeof($this->getEventRegistrations()
+            ->andWhere( [
+                'canceled_at' => null,
+                'deleted_at' => null,
+            ])
+            ->all());
+    }
+
+    public function getOpenSeatCount(){
+        return $this->seat_count - $this->getEventRegistrationCount();
     }
 
     public function hasFreeSeats(){
@@ -146,4 +159,21 @@ class Event extends \yii\db\ActiveRecord
         return  $registrationCount <   $seatCount ;
     }
 
+    public function canReserve(){
+        if ( isset($this->deleted_at)){
+            return false;
+        }
+        if ( !$this->hasFreeSeats()){
+            return false;
+        }
+        return true;
+    }
+
+    public function canDelete(){
+        if ( isset($this->deleted_at)){
+            return false;
+        }
+        return true;
+    }
+
 }

common/models/EventRegistration.php

@@ -17,6 +17,7 @@ use yii\helpers\ArrayHelper;
  * @property string $created_at
  * @property string $updated_at
  * @property string $canceled_at
+ * @property string $deleted_at
  */
 class EventRegistration extends \yii\db\ActiveRecord
 {
@@ -50,6 +51,7 @@ class EventRegistration extends \yii\db\ActiveRecord
             'created_at' => Yii::t('event-registration', 'Created At'),
             'updated_at' => Yii::t('event-registration', 'Updated At'),
             'canceled_at' => Yii::t('event-registration', 'Canceled At'),
+            'deleted_at' => Yii::t('event-registration', 'Deleted At'),
         ];
     }
 

console/migrations/m190109_055105_alter_table_event_registration_add_column_deleted_at.php

@@ -0,0 +1,29 @@
+<?php
+
+use yii\db\Migration;
+
+class m190109_055105_alter_table_event_registration_add_column_deleted_at extends Migration
+{
+    public function up()
+    {
+        $this->addColumn("event_registration","deleted_at",$this->dateTime() );
+    }
+
+    public function down()
+    {
+        echo "m190109_055105_alter_table_event_registration_add_column_deleted_at cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

console/migrations/m190109_055110_alter_table_event_add_column_deleted_at.php

@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Migration;
+
+class m190109_055110_alter_table_event_add_column_deleted_at extends Migration
+{
+    public function up()
+    {
+        $this->addColumn("event","deleted_at",$this->dateTime() );
+        $this->addColumn("event","active",$this->integer()->defaultValue(1) );
+    }
+
+    public function down()
+    {
+        echo "m190109_055105_alter_table_event_registration_add_column_deleted_at cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

frontend/controllers/InventoryItemController.php

@@ -32,7 +32,12 @@ class InventoryItemController extends Controller
 
     /**
      * Lists all InventoryItem models.
+     * @param $id
      * @return mixed
+     * @throws NotFoundHttpException
+     * @throws \PHPExcel_Exception
+     * @throws \PHPExcel_Reader_Exception
+     * @throws \PHPExcel_Writer_Exception
      */
     public function actionIndex($id)
     {
@@ -63,6 +68,12 @@ class InventoryItemController extends Controller
     }
 
 
+    /**
+     * @param $dataProvider
+     * @throws \PHPExcel_Exception
+     * @throws \PHPExcel_Reader_Exception
+     * @throws \PHPExcel_Writer_Exception
+     */
     protected function downloadIndexXls($dataProvider){
     	
     	
@@ -137,6 +148,7 @@ class InventoryItemController extends Controller
      * Displays a single InventoryItem model.
      * @param integer $id
      * @return mixed
+     * @throws NotFoundHttpException
      */
     public function actionView($id)
     {
@@ -149,6 +161,7 @@ class InventoryItemController extends Controller
      * Creates a new InventoryItem model.
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
+     * @throws \Exception
      */
     public function actionCreate($id)
     {
@@ -172,6 +185,7 @@ class InventoryItemController extends Controller
      * If update is successful, the browser will be redirected to the 'view' page.
      * @param integer $id
      * @return mixed
+     * @throws NotFoundHttpException
      */
     public function actionUpdate($id)
     {
@@ -200,6 +214,8 @@ class InventoryItemController extends Controller
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
      * @return mixed
+     * @throws NotFoundHttpException
+     * @throws \yii\db\StaleObjectException
      */
     public function actionDelete($id)
     {

frontend/models/EventSearch.php

@@ -0,0 +1,157 @@
+<?php
+
+namespace frontend\models;
+
+use common\components\Helper;
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Event;
+use yii\db\Expression;
+use yii\db\Query;
+
+/**
+ * EventSearch represents the model behind the search form about `common\models\Event`.
+ */
+class EventSearch extends Event
+{
+
+    public $roomName;
+    public $trainerName;
+    public $eventTypeName;
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'roomName', 'trainerName', 'eventTypeName'], 'string', 'max' => 250],
+            [['startDateString',], 'date', 'format' => Yii::$app->formatter->datetimeFormat, 'timestampAttribute' => 'start', 'timeZone' => 'UTC'],
+            [['endDateString',], 'date', 'format' => Yii::$app->formatter->datetimeFormat, 'timestampAttribute' => 'end', 'timeZone' => 'UTC'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = new Query();
+
+        $query->select([
+            'event.id as event_id',
+            'event.start as event_start',
+            'event.end as event_end',
+            'event.created_at as event_created_at',
+            'event.updated_at as event_updated_at',
+            'event.deleted_at as event_deleted_at',
+            'event.seat_count as event_seat_count',
+            'trainer.name as trainer_name',
+            'room.name as  room_name',
+            'event_type.name as event_type_name',
+            new Expression('count(event_registration.id) as registration_count')
+        ]);
+
+        $query->from("event");
+        $query->innerJoin('trainer', 'event.id_trainer = trainer.id');
+        $query->innerJoin('room', 'event.id_room = room.id');
+        $query->innerJoin('event_type', 'event_type.id = event.id_event_type');
+        $query->leftJoin('event_registration', 'event_registration.id_event = event.id');
+        $query->groupBy(
+            [
+                'event_id',
+                'event_start',
+                'event_end',
+                'event_created_at',
+                'event_updated_at',
+                'event_deleted_at',
+                'trainer_name',
+                'room_name',
+                'event_type_name',
+            ]
+        );
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'sort' => [
+                'defaultOrder' => [
+                    'event_start' => SORT_DESC
+                ],
+                'attributes' => Helper::mkYiiSortItems([
+                    ['event_id'],
+                    ['event_start'],
+                    ['event_end'],
+                    ['trainer_name'],
+                    ['room_name'],
+                    ['event_type_name'],
+                    ['customer_name'],
+                    ['event_created_at'],
+                    ['event_updated_at'],
+                    ['event_deleted_at'],
+                    ['registration_count'],
+                    ['event_seat_count'],
+                ]),
+            ]
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'event.id' => $this->id,
+        ]);
+        $query->andFilterWhere(
+            ['room.id' => $this->roomName]
+        );
+
+        $query->andFilterWhere(
+            ['trainer.id' => $this->trainerName]
+        );
+
+        $query->andFilterWhere(
+            ['event_type.id' => $this->eventTypeName]
+        );
+
+        if (isset($this->start)) {
+            $query->andWhere(
+                [
+                    '>=',
+                    'start',
+                    $this->start
+                ]
+            );
+        }
+
+        if (isset($this->end)) {
+            $query->andWhere(
+                [
+                    '<=',
+                    'end',
+                    $this->end
+                ]
+            );
+        }
+
+        return $dataProvider;
+    }
+}

rest/controllers/CustomerController.php

@@ -26,28 +26,22 @@ class CustomerController extends RestController
      */
     public function actionDiscountStatus($number, $lastXDays = null)
     {
-
         $number = Helper::fixAsciiChars($number);
-
         $query = Card::find();
         $query->andWhere(['or',
             ['and', ['in', 'card.number', [$number]], "trim(coalesce(card.number, '')) <>'' "],
             ['and', ['in', 'card.rfid_key', [$number]], "trim(coalesce(card.rfid_key, '')) <>'' "],
 
         ]);
-
+        /** @var \common\models\Card $card */
         $card = $query->one();
-
         if (!isset($card)) {
             throw new NotFoundHttpException("Kártya nem található");
         }
-
         $customer = $card->customer;
-
         if (!isset($customer)) {
             throw new NotFoundHttpException("Vendég nem található");
         }
-
         if (isset($lastXDays)) {
             if (!is_numeric($lastXDays)) {
                 throw new BadRequestHttpException("lastXDays paraméter hibás");
@@ -56,12 +50,10 @@ class CustomerController extends RestController
                 throw new BadRequestHttpException("lastXDays paraméter érték hibás");
             }
         }
-
         // check if has valid ticket today
         /** @var \common\models\Card $card */
         $tickets = Ticket::readActive($card);
         $hasValidTicket = count($tickets) > 0;
-
         if (isset($lastXDays)) {
             // try to find any valid ticket in the lastXDays
             $minusDay = 1;
@@ -73,17 +65,14 @@ class CustomerController extends RestController
                 $minusDay = $minusDay + 1;
             }
         }
-
         $result = [
             'discount' => $hasValidTicket
         ];
-
         if (isset($customer)) {
             $result['card_number'] = $card->number;
             $result['name'] = $customer->name;
             $result['provider'] = \Yii::$app->id;
         }
-
         return $result;
     }