Merge branch 'release/v0.1.15'

changelog.txt

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

common/config/params.php

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

frontend/views/common/_reception_ticket.php

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