@@ -26,7 +26,7 @@ $this->params['breadcrumbs'][] = $this->title;
= $form->field($model, 'rememberMe')->checkbox() ?>
- = Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+ = Html::submitButton( Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
diff --git a/common/config/main.php b/common/config/main.php
index cc2b8b8..bbc7e4a 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -19,6 +19,7 @@ return [
'class' => 'yii\i18n\Formatter',
'dateFormat' => 'yyyy.MM.dd',
'datetimeFormat' => 'yyyy.MM.dd HH:mm',
+ 'timeFormat' => 'HH:mm',
'locale' => 'hu-Hu',
'timeZone' => 'UTC',
'defaultTimeZone' => 'UTC' ,
diff --git a/common/messages/hu/common/account-state.php b/common/messages/hu/common/account-state.php
index 8b3c8c4..8cc1f2a 100644
--- a/common/messages/hu/common/account-state.php
+++ b/common/messages/hu/common/account-state.php
@@ -17,6 +17,6 @@
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
- 'Close' => 'Nyitás',
- 'Open' => 'Zárás',
+ 'Close' => 'Zárás',
+ 'Open' => 'Nyitás',
];
diff --git a/common/messages/hu/common/site.php b/common/messages/hu/common/site.php
new file mode 100644
index 0000000..00e5c1b
--- /dev/null
+++ b/common/messages/hu/common/site.php
@@ -0,0 +1,32 @@
+ 'Kijelentkezés',
+ 'Forgot password' => 'Elfelejtett jelszó',
+ 'Login' => 'Bejelentkezés',
+ 'Password' => 'Jelszó',
+ 'Please choose your new password:' => 'Kérem válasszon új jelszót:',
+ 'Please fill out the following fields to login:' => 'Kérem töltse ki a következő mezőket a bejelentkezéshez:',
+ 'Please fill out your email. A link to reset password will be sent there.' => 'Kérem adja meg az email címét.Értesítést fog kapni a jelszava megváltoztatásáról!',
+ 'Remember me' => 'Emlékezz rám',
+ 'Request password reset' => 'Jelszó módosítás kérése',
+ 'Reset password' => 'Jelszó módosítása',
+ 'Send' => 'Küldés',
+ 'Username' => 'Felhasználónév/E-mail',
+];
diff --git a/common/messages/hu/frontend/customer.php b/common/messages/hu/frontend/customer.php
index 7641b8c..65a8ed8 100644
--- a/common/messages/hu/frontend/customer.php
+++ b/common/messages/hu/frontend/customer.php
@@ -17,6 +17,8 @@
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
+ 'Reception' => 'Recepció',
+ 'Reset' => 'Módosítás',
'Adatlap' => 'Adatlap',
'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
'Befizetések' => 'Befizetések',
@@ -24,7 +26,6 @@ return [
'Create Customer' => 'Új vendég',
'Customers' => 'Vendégek',
'Delete' => 'Törlés',
- 'Reset' => '',
'Search' => 'Keresés',
'Update' => 'Módosítás',
];
diff --git a/common/messages/hu/frontend/money-movement.php b/common/messages/hu/frontend/money-movement.php
index f6f0126..2e131b4 100644
--- a/common/messages/hu/frontend/money-movement.php
+++ b/common/messages/hu/frontend/money-movement.php
@@ -17,8 +17,9 @@
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
+ 'Money movements' => 'Pénzmozgások',
'Account' => 'Kassza',
- 'User' => 'Felhasználó',
'End' => 'Időintervallum vége',
'Start' => 'Időintervallum kezdete',
+ 'User' => 'Felhasználó',
];
diff --git a/common/messages/hu/frontend/site.php b/common/messages/hu/frontend/site.php
new file mode 100644
index 0000000..4f3e022
--- /dev/null
+++ b/common/messages/hu/frontend/site.php
@@ -0,0 +1,22 @@
+ 'Bejelentkezés',
+ 'Password' => 'Jelszó',
+];
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index b562ffd..f8379da 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -17,6 +17,7 @@
* NOTE: this file must be saved in UTF-8 encoding.
*/
return [
+ 'Logout' => 'Kijelentkezés',
'Create' => 'Mentés',
'Create Money Movement' => 'Új pénzmozgás',
'Create Transfer' => 'Új pénzmozgás',
diff --git a/common/models/AccountState.php b/common/models/AccountState.php
index ed9e1f1..8368dfd 100644
--- a/common/models/AccountState.php
+++ b/common/models/AccountState.php
@@ -205,7 +205,7 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
public function hasDifferenceToPrevState(){
$result = false;
- if ( isset( $this->prev_state ) ){
+ if ( isset( $this->prev_state ) && $this->type == self::TYPE_OPEN){
$result = $this->prev_money != $this->money;
}
return $result;
diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php
index afc1c23..6dffc8b 100644
--- a/common/models/LoginForm.php
+++ b/common/models/LoginForm.php
@@ -30,6 +30,14 @@ class LoginForm extends Model
['password', 'validatePassword'],
];
}
+
+ public function attributeLabels(){
+ return [
+ 'username' =>Yii::t('common/site', 'Username'),
+ 'password' =>Yii::t('common/site', 'Password'),
+ 'rememberMe' =>Yii::t('common/site', 'Remember me'),
+ ];
+ }
/**
* Validates the password.
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 8d33d9c..e76efaf 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -378,7 +378,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
'money',
'money_currency',
'time' => function ($transfer){
- return Yii::$app->formatter->asTime($transfer->created_at);
+ return Yii::$app->formatter->asDatetime($transfer->created_at);
},
'account_name' => function ($transfer) {
return $transfer->account->name;
diff --git a/environments/prod/common/config/main-local.php b/environments/prod/common/config/main-local.php
index b33a90b..c1b3d97 100644
--- a/environments/prod/common/config/main-local.php
+++ b/environments/prod/common/config/main-local.php
@@ -11,6 +11,8 @@ return [
'mailer' => [
'class' => 'yii\swiftmailer\Mailer',
'viewPath' => '@common/mail',
+ 'fileTransport' => true,
+ 'transport' =>[]
],
],
];
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 9b6f243..f21d05e 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -56,16 +56,16 @@ class FrontendMenuStructure{
protected function addRecepcio(){
if ( $this->isLogged() ){
- $this->menuItems[] = ['label' => 'Recepció', 'url' => ['/customer/reception'] ];
- $this->menuItems[] = ['label' => 'Kassza',
+ $this->menuItems[] = ['label' => Yii::t('frontend/customer','Reception'), 'url' => ['/customer/reception'] ];
+ $this->menuItems[] = ['label' => Yii::t('frontend/account', 'Account'),
'items' => [
['label' => Yii::t('frontend/account-state','Default account'), 'url' => ['/account/select'] ],
['label' => Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index'] ],
['label' => Yii::t('frontend/account-state','Open account state'), 'url' => ['/account-state/open'] ],
['label' => Yii::t('frontend/account-state','Close account state'), 'url' => ['/account-state/close'] ],
- ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ],
+ ['label' => Yii::t('frontend/money-movement','Money movements'), 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ],
['label' => Yii::t('frontend/transfer','Transfers'), 'url' => ['/transfer/index', 'TransferSearch[start]' => $this->start, 'TransferSearch[end]' => $this->tomorrow ] ],
- ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ]
+ ['label' => Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ]
]
];
}
@@ -74,10 +74,10 @@ class FrontendMenuStructure{
protected function addLoginMainMenu(){
if (Yii::$app->user->isGuest) {
- $mainMenuItem= ['label' => 'Login', 'url' => ['/site/login']];
+ $mainMenuItem= ['label' => Yii::t('frontend/site','Login'), 'url' => ['/site/login']];
} else {
$mainMenuItem= [
- 'label' => 'Kijelentkezés (' . Yii::$app->user->identity->username . ')',
+ 'label' => Yii::t('frontend/transfer','Logout'). '(' . Yii::$app->user->identity->username . ')',
'url' => ['/site/logout'],
'linkOptions' => ['data-method' => 'post']
];
diff --git a/frontend/models/ResetPasswordForm.php b/frontend/models/ResetPasswordForm.php
index dd48f52..2cba3b6 100644
--- a/frontend/models/ResetPasswordForm.php
+++ b/frontend/models/ResetPasswordForm.php
@@ -49,6 +49,12 @@ class ResetPasswordForm extends Model
];
}
+ public function attributeLabels(){
+ return [
+ 'passowrd' => Yii::t('frontend/site' , 'Password')
+ ];
+ }
+
/**
* Resets password.
*
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 67ebf81..d07db23 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -1,16 +1,11 @@
params['breadcrumbs'][] = Yii::t('frontend/product', 'Sale');
.table-transfers tbody .product-name,
.table-transfers tbody .product-time
{
- text-align: center;
+ text-align: left;
+ }
+ .table-transfers .product-time{
+ width: 140px;
+ }
+ .table-transfers .product-count{
+ width: 50px;
+ }
+ .table-transfers .sale-price{
+ width: 80px;
+ }
+ .table-transfers .product-money{
+ width: 100px;
}
diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php
index fe67ee0..9e14e0f 100644
--- a/frontend/views/site/login.php
+++ b/frontend/views/site/login.php
@@ -7,7 +7,7 @@
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
-$this->title = 'Login';
+$this->title = Yii::t('common/site' ,'Login');
$this->params['breadcrumbs'][] = $this->title;
?>
@@ -26,11 +26,11 @@ $this->params['breadcrumbs'][] = $this->title;
= $form->field($model, 'rememberMe')->checkbox() ?>
- If you forgot your password you can = Html::a('reset it', ['site/request-password-reset']) ?>.
+ = Html::a(Yii::t('common/site' ,'Forgot password'), ['site/request-password-reset']) ?>.
- = Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+ = Html::submitButton(Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php
index 494ddb3..bf2bc86 100644
--- a/frontend/views/site/requestPasswordResetToken.php
+++ b/frontend/views/site/requestPasswordResetToken.php
@@ -7,13 +7,13 @@
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
-$this->title = 'Request password reset';
+$this->title = Yii::t('common/site' ,'Request password reset');
$this->params['breadcrumbs'][] = $this->title;
?>
= Html::encode($this->title) ?>
-
Please fill out your email. A link to reset password will be sent there.
+
@@ -22,7 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
= $form->field($model, 'email') ?>
- = Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
+ = Html::submitButton( Yii::t('common/site' ,'Send'), ['class' => 'btn btn-primary']) ?>
diff --git a/frontend/views/site/resetPassword.php b/frontend/views/site/resetPassword.php
index 8e6d93f..5bf91f8 100644
--- a/frontend/views/site/resetPassword.php
+++ b/frontend/views/site/resetPassword.php
@@ -7,13 +7,13 @@
use yii\helpers\Html;
use yii\bootstrap\ActiveForm;
-$this->title = 'Reset password';
+$this->title = Yii::t('common/site' ,'Reset password');
$this->params['breadcrumbs'][] = $this->title;
?>
= Html::encode($this->title) ?>
-
Please choose your new password:
+