From 2ee6e8e76db47c24199cf1092a84ae9de849d978 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 7 Jan 2020 20:46:31 +0100 Subject: [PATCH 1/2] fix frontend fingerprint gui --- frontend/controllers/FingerprintController.php | 1 + frontend/models/FingerprintSearch.php | 2 +- frontend/views/fingerprint/create.php | 3 +++ frontend/views/fingerprint/index.php | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/controllers/FingerprintController.php b/frontend/controllers/FingerprintController.php index f38d0c5..c43b18e 100644 --- a/frontend/controllers/FingerprintController.php +++ b/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, ]); diff --git a/frontend/models/FingerprintSearch.php b/frontend/models/FingerprintSearch.php index a2c2452..2878c0e 100644 --- a/frontend/models/FingerprintSearch.php +++ b/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'); diff --git a/frontend/views/fingerprint/create.php b/frontend/views/fingerprint/create.php index 119dbd1..aa71e69 100644 --- a/frontend/views/fingerprint/create.php +++ b/frontend/views/fingerprint/create.php @@ -1,5 +1,6 @@ title = 'Ujjlenyomat hozzáadása'; $this->params['breadcrumbs'][] = ['label' => 'Ujjlenyomatok', 'url' => ['index', 'id_customer' => $model->id_customer]]; $this->params['breadcrumbs'][] = $this->title; ?> + $card])?> +

title) ?>

diff --git a/frontend/views/fingerprint/index.php b/frontend/views/fingerprint/index.php index 429bf51..845dc18 100644 --- a/frontend/views/fingerprint/index.php +++ b/frontend/views/fingerprint/index.php @@ -1,10 +1,11 @@ -

Ujjlenyomatok

+ $card])?>

From 92919cfbbc87066df2470cac8a9c7585c49231bc Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Tue, 7 Jan 2020 20:50:59 +0100 Subject: [PATCH 2/2] change version to v.0.1.22 --- changelog.txt | 2 ++ common/config/params.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index b6c922b..a7aa94d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,5 @@ +-0.1.22 + - fix fingerprint frontend gui -0.1.21 - add fingerprint frontend gui -0.1.20 diff --git a/common/config/params.php b/common/config/params.php index 4624f53..c059831 100644 --- a/common/config/params.php +++ b/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