rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve event deletion and event registration cancelation

Browse Source
This commit is contained in:
Roland Schneider
2021-10-08 23:15:49 +02:00
parent 09f329050f
commit f0bf8684e4
12 changed files with 96 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customerapi/controllers/EventController.php
View File

@@ -10,6 +10,7 @@ namespace customerapi\controllers;
use common\helpers\AppArrayHelper;
use common\helpers\AppDateTimeHelper;
use common\models\Event;
use common\models\EventRegistration;
use common\models\EventType;
@@ -140,6 +141,7 @@ class EventController extends \customerapi\controllers\CustomerApiController
$result->id = $event->id;
$result->start = $event->start;
$result->end = $event->end;
$result->deleted_at =AppDateTimeHelper::convertMySqlDatetimeToPhpInteger( $event->deleted_at);
$result->seatCount = $event->seat_count;
$result->trainer = TrainerDetailsView::findOne($event->id_trainer);
$result->room = RoomDetailsView::findOne($event->id_room);

2
customerapi/controllers/EventRegistrationController.php
View File

@@ -78,7 +78,7 @@ class EventRegistrationController extends CustomerApiController
public function actionCancel($idRegistration) {
$manager = new \common\manager\EventRegistrationManager();
$registration = $manager->loadRegistration($idRegistration,\Yii::$app->user->id);
$manager->cancelRegistration($registration,\Yii::$app->user->id, EventRegistration::CANCEL_REASON_CUSTOMER);
$manager->cancelRegistrationTX($registration,\Yii::$app->user->id, EventRegistration::CANCEL_REASON_CUSTOMER);
$registration = $manager->loadRegistration($idRegistration,\Yii::$app->user->id);
return $this->asJson($registration);
}

6
customerapi/models/available/EventAvailable.php
View File

@@ -4,6 +4,7 @@
namespace customerapi\models\available;
use common\helpers\AppDateTimeHelper;
use common\models\Event;
use common\models\EventRegistration;
use common\models\EventType;
@@ -41,8 +42,8 @@ class EventAvailable extends Model
$available->end = $event->end;
$available->seat_count = $event->seat_count;
$available->created_at = $event->created_at;
$available->updated_at = $event->updated_at;
$available->deleted_at = $event->deleted_at;
$available->updated_at = AppDateTimeHelper::convertMySqlDatetimeToPhpInteger($event->updated_at);
$available->deleted_at = AppDateTimeHelper::convertMySqlDatetimeToPhpInteger($event->deleted_at);
$available->active = $event->active;
return $available;
@@ -55,6 +56,7 @@ class EventAvailable extends Model
"id" => "id",
"start" => "start",
"end" => "end",
"deleted_at" => "deleted_at",
"seat_count" => "seat_count",
"active" => "active",
"reservationCount" => "registrationCount",

2
customerapi/models/details/EventDetailsView.php
View File

@@ -24,6 +24,7 @@ class EventDetailsView extends Model // extends Event
public $id;
public $start;
public $end;
public $deleted_at;
public $seatCount;
// total count of registrations
public $reservationCount;
@@ -50,6 +51,7 @@ class EventDetailsView extends Model // extends Event
"start" => "start",
"end" => "end",
"seat_count" => "seatCount",
"deleted_at" =>"deleted_at",
"reservationCount" => "reservationCount",
"registrations" => "registrations",
"hasFreeSeats" => "hasFreeSeats"

5
customerapi/models/dto/EventDTO.php
View File

@@ -1,6 +1,7 @@
<?php
namespace customerapi\models\dto;
use common\helpers\AppDateTimeHelper;
use customerapi\models\available\EventAvailable;
class EventDTO extends \yii\base\Model
@@ -28,6 +29,7 @@ class EventDTO extends \yii\base\Model
"id" => "id",
"start" => "start",
"end" => "end",
"deleted_at" => "deleted_at",
"seat_count" => "seat_count",
"active" => "active",
"reservationCount" => "registrationCount",
@@ -53,7 +55,8 @@ class EventDTO extends \yii\base\Model
$dto->seat_count = $event->seat_count;
$dto->created_at = $event->created_at;
$dto->updated_at = $event->updated_at;
$dto->deleted_at = $event->deleted_at;
$dto->deleted_at = AppDateTimeHelper::convertMySqlDatetimeToPhpInteger($event->deleted_at);
$dto->active = $event->active;
return $dto;