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

desta fix for invalid bankaccount numbers; add virtual key object

Browse Source
This commit is contained in:
Schneider Roland
2022-10-26 18:55:27 +02:00
parent 51e328d9d1
commit 821d852d5b
11 changed files with 542 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mobileapi/manager/ApiManager.php
View File

@@ -4,6 +4,7 @@ namespace mobileapi\manager;
use common\components\DateUtil;
use common\components\Helper;
use common\models\VirtualKey;
use Exception;
use Yii;
use common\models\Card;
@@ -72,8 +73,8 @@ class ApiManager
'name' => $ticket->ticketType->name,
],
'usageCount' => $ticket->usage_count,
'start' => DateUtil::parseDateTime( $ticket->start)->getTimestamp(),
'end' => DateUtil::parseDateTime( $ticket->end)->getTimestamp()
'start' => DateUtil::parseDateTime($ticket->start)->getTimestamp(),
'end' => DateUtil::parseDateTime($ticket->end)->getTimestamp()
];
}
return [
@@ -96,19 +97,19 @@ class ApiManager
$keyObject = null;
try {
$keyAssignment = CardKeyAssignment::findOne(['id_card' => $card->id_card]);
if (!isset($keyAssignment)) {
$virtualKey = VirtualKey::findOne(['id_card' => $card->id_card]);
if (!isset($virtualKey)) {
throw new NotFoundHttpException();
}
$key = Key::findOne(['id_key' => $keyAssignment->id_key]);
$key = Key::findOne(['id_key' => $virtualKey->id_key]);
if (!isset($key)) {
throw new NotFoundHttpException();
}
$qrCode = new QrCode($keyAssignment->virtual_key);
$qrCode = new QrCode($virtualKey->number);
$keyObject = [
'qrcode' => $qrCode->writeDataUri(),
@@ -127,7 +128,8 @@ class ApiManager
}
public function getDashboardPage(){
public function getDashboardPage()
{
return [
'virtual-key' => $this->getVirtualKeyPage(),
'card' => $this->getCardPage(),