Merge branch 'release/v.0.1.22'

changelog.txt

@@ -1,3 +1,5 @@
+-0.1.22
+    - fix fingerprint frontend gui
 -0.1.21
     - add fingerprint frontend gui
 -0.1.20

common/config/params.php

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

frontend/controllers/FingerprintController.php

@@ -88,6 +88,7 @@ class FingerprintController extends Controller
             return $this->redirect(['index', 'FingerprintSearch[id_card]' => $card->id_card]);
         }
         return $this->render('create', [
+            'card' => $card,
             'model' => $model,
         ]);
 

frontend/models/FingerprintSearch.php

@@ -50,7 +50,7 @@ class FingerprintSearch extends Fingerprint
         }
         $this->card = $card;
 
-        $customer = Customer::findOne($card->customer);
+        $customer = Customer::findOne($card->customer->id_customer);
 
         if ( !isset($customer)){
             throw new NotFoundHttpException('Customer not found');

frontend/views/fingerprint/create.php

@@ -1,5 +1,6 @@
 <?php
 
+use frontend\components\CustomerTabWidget;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
@@ -12,6 +13,8 @@ $this->title = 'Ujjlenyomat hozzáadása';
 $this->params['breadcrumbs'][] = ['label' => 'Ujjlenyomatok', 'url' => ['index', 'id_customer' => $model->id_customer]];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+<?php echo CustomerTabWidget::widget(['card' => $card])?>
+
 <div class="fingerprint-create">
 
     <h1><?= Html::encode($this->title) ?></h1>

frontend/views/fingerprint/index.php

@@ -1,10 +1,11 @@
 <?php
 
+use frontend\components\CustomerTabWidget;
 use yii\grid\GridView;
 use yii\helpers\Html;
 
 ?>
-<h1>Ujjlenyomatok</h1>
+<?php echo CustomerTabWidget::widget(['card' => $card])?>
 
 
 <p>