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

Merge tag 'version/v.0.1.23' into develop

Browse Source 
tag for version v.0.1.23
This commit is contained in:
Roland Schneider 2020-01-07 20:57:54 +01:00
commit e7e4183221
3 changed files with 4 additions and 2 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.23
- fix fingerprint frontend gui
-0.1.22 -0.1.22
- fix fingerprint frontend gui - fix fingerprint frontend gui
-0.1.21 -0.1.21

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.22', 'version' => 'v0.1.23',
'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

2
frontend/controllers/FingerprintController.php
View File

@ -73,7 +73,7 @@ class FingerprintController extends Controller
throw new NotFoundHttpException('Card not found:' . $id_card); throw new NotFoundHttpException('Card not found:' . $id_card);
} }
$customer = Customer::findOne($card->customer); $customer = Customer::findOne($card->customer->id_customer);
if (!isset($customer)) { if (!isset($customer)) {
throw new NotFoundHttpException('Customer not found'); throw new NotFoundHttpException('Customer not found');