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

add card type : review

Browse Source
This commit is contained in:
Schneider Roland 2022-12-01 20:51:11 +01:00
parent 3424d68a27
commit 5a705f15b0
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/models/Card.php
View File

@ -34,6 +34,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
const TYPE_BARCODE = 30; const TYPE_BARCODE = 30;
const TYPE_OLD = 40; const TYPE_OLD = 40;
const TYPE_EMPLOYEE = 50; const TYPE_EMPLOYEE = 50;
const TYPE_REVIEW = 60;
public static $FLAG_TICKET = 0; //has valid ticket public static $FLAG_TICKET = 0; //has valid ticket
@ -164,6 +165,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
self::TYPE_BARCODE => Yii::t('common/card', 'BARCODE'), self::TYPE_BARCODE => Yii::t('common/card', 'BARCODE'),
self::TYPE_OLD => Yii::t('common/card', 'OLD'), self::TYPE_OLD => Yii::t('common/card', 'OLD'),
self::TYPE_EMPLOYEE => Yii::t('common/card', 'Munkatárs'), self::TYPE_EMPLOYEE => Yii::t('common/card', 'Munkatárs'),
self::TYPE_REVIEW => Yii::t('common/card', 'Review'),
]; ];
} }

9
mobileapi/components/ActivatedFilter.php
View File

@ -3,6 +3,7 @@
namespace mobileapi\components; namespace mobileapi\components;
use common\components\HttpStatus; use common\components\HttpStatus;
use common\models\Card;
use common\models\MobileDevice; use common\models\MobileDevice;
use Yii; use Yii;
@ -35,8 +36,16 @@ class ActivatedFilter extends ActionFilter
if (isset($mobileDevice)) { if (isset($mobileDevice)) {
$deviceId = $mobileDevice->id; $deviceId = $mobileDevice->id;
$idCard = $mobileDevice->id_card; $idCard = $mobileDevice->id_card;
// find out if the device is activated // find out if the device is activated
$activated = $mobileDevice->status === MobileDevice::STATUS_ACTIVE; $activated = $mobileDevice->status === MobileDevice::STATUS_ACTIVE;
// override activated to true, if it is a reviewer card
$card = Card::findOne($idCard);
if ( isset($card) ){
if ( isset($card->type) ){
$activated = true;
}
}
} }
// if device is not activated, throw exception with http status 412 // if device is not activated, throw exception with http status 412
if ($activated === false) { if ($activated === false) {