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

Merge branch 'release/v0.1.15'

Browse Source
This commit is contained in:
Roland Schneider 2019-04-01 07:54:52 +02:00
commit 274e0c8c5c
3 changed files with 179 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -1,3 +1,5 @@
-0.1.15
- fix null pointer when displaying warning in reception , when no ticket
-0.1.14 -0.1.14
- change expires soon warning color - change expires soon warning color
-0.1.13 -0.1.13

2
common/config/params.php
View File

@ -5,7 +5,7 @@ return [
'supportEmail' => 'rocho02@gmail.com', 'supportEmail' => 'rocho02@gmail.com',
'infoEmail' => 'info@rocho-net.hu', 'infoEmail' => 'info@rocho-net.hu',
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'version' => 'v0.1.14', 'version' => 'v0.1.15',
'company' => 'movar',//gyor 'company' => 'movar',//gyor
'company_name' => "Freimann Kft.", 'company_name' => "Freimann Kft.",
'product_visiblity' => 'account',// on reception which products to display. account or global 'product_visiblity' => 'account',// on reception which products to display. account or global

5
frontend/views/common/_reception_ticket.php
View File

@ -1,4 +1,5 @@
<?php <?php
use common\components\Helper; use common\components\Helper;
use common\models\DoorLog; use common\models\DoorLog;
use yii\helpers\Html; use yii\helpers\Html;
@ -53,6 +54,7 @@ if ( isset($model->card)){
$showWarningExpires = false; $showWarningExpires = false;
// expires in days // expires in days
if (isset($ticket)) {
if ($propertyWarnTicketExpireInDaysCount > 0) { if ($propertyWarnTicketExpireInDaysCount > 0) {
$warnMessageTicketExpireInDaysCountTemplate = "A bérlet már csak {day} érvényes"; $warnMessageTicketExpireInDaysCountTemplate = "A bérlet már csak {day} érvényes";
$expiresInDays = $ticket->getDaysUntilExpire(); $expiresInDays = $ticket->getDaysUntilExpire();
@ -81,7 +83,6 @@ if ( isset($model->card)){
$warnMessageTicketUsageCount = strtr($warnMessageTicketUsageCountTemplate, $variables); $warnMessageTicketUsageCount = strtr($warnMessageTicketUsageCountTemplate, $variables);
} }
} }
//// ////////////////////////////////// //// //////////////////////////////////
/// if any warning is there, display /// if any warning is there, display
/// the warning box /// the warning box
@ -103,7 +104,7 @@ if ( isset($model->card)){
</div> </div>
<?php <?php
} }
}
} else { } else {
echo Html::beginTag("div", ['class' => "alert alert-danger", "role" => "alert"]); echo Html::beginTag("div", ['class' => "alert alert-danger", "role" => "alert"]);
echo "Kártya korlátozás:"; echo "Kártya korlátozás:";