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

Merge branch 'release/v0.1.14'

Browse Source
This commit is contained in:
Roland Schneider 2019-03-30 20:53:30 +01:00
commit c062c8157b
5 changed files with 13 additions and 3 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.14
- change expires soon warning color
-0.1.13 -0.1.13
- change gitignore - change gitignore
-0.1.12 -0.1.12

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.13', 'version' => 'v0.1.14',
'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

1
common/models/Ticket.php
View File

@ -450,6 +450,7 @@ class Ticket extends \common\models\BaseFitnessActiveRecord
public function getDaysUntilExpire(){ public function getDaysUntilExpire(){
$minutes = $this->getMinutesUntilExpire(); $minutes = $this->getMinutesUntilExpire();
$days = $minutes / 60 /24; $days = $minutes / 60 /24;
$days = ceil($days);
return $days; return $days;
} }

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

@ -88,7 +88,7 @@ if ( isset($model->card)){
/// /////////////////////////////////// /// ///////////////////////////////////
if ( $showWarningExpires || $showWaringUsageCount) { if ( $showWarningExpires || $showWaringUsageCount) {
?> ?>
<div class="alert alert-warning"> <div class="alert alert-warning-expires">
<strong>A bérlet hamarosan lejár</strong> <strong>A bérlet hamarosan lejár</strong>
<?php <?php
if ($showWarningExpires) { if ($showWarningExpires) {

7
frontend/web/css/site.css
View File

@ -89,3 +89,10 @@ a.desc:after {
padding: 10px 20px; padding: 10px 20px;
margin: 0 0 15px 0; margin: 0 0 15px 0;
} }
.alert-warning-expires {
color: #fff;
background-color: #dc500b;
border-color: #faebcc;
}