diff --git a/backend/views/ticket-type/index.php b/backend/views/ticket-type/index.php index 2b16b80..4db42f4 100644 --- a/backend/views/ticket-type/index.php +++ b/backend/views/ticket-type/index.php @@ -23,19 +23,35 @@ $this->params['breadcrumbs'][] = $this->title; 'dataProvider' => $dataProvider, 'columns' => [ 'name', - 'max_usage_count', 'price_brutto', - 'time_unit_type', + 'max_usage_count', 'time_unit_count', - 'id_account', - 'flag_student', - 'status', - 'created_at', - 'updated_at', + [ + + 'attribute' =>'time_unit_type', + 'value' =>'timeUnitHuman', + ], + [ + 'attribute' => 'id_account', + 'value' => 'accountName', + ], + [ + 'attribute' =>'flag_student', + 'value' =>function($model, $key, $index, $column){ + return $model->isStudent() ? Yii::t('common', "Yes") : Yii::t('common', "No") ; + }, + + ], + [ + 'attribute' =>'status', + 'value' =>'statusHuman', + ], + 'created_at:datetime', + 'updated_at:datetime', [ 'class' => 'yii\grid\ActionColumn', - 'template' =>'{view} {edit}' + 'template' =>'{view} {update}' ], ], diff --git a/backend/views/ticket-type/update.php b/backend/views/ticket-type/update.php index 77355d4..efd086d 100644 --- a/backend/views/ticket-type/update.php +++ b/backend/views/ticket-type/update.php @@ -4,10 +4,9 @@ use yii\helpers\Html; /* @var $this yii\web\View */ /* @var $model common\models\TicketType */ +/* @var $accounts common\models\Account[] */ -$this->title = Yii::t('common/ticket_type', 'Update {modelClass}: ', [ - 'modelClass' => 'Ticket Type', -]) . ' ' . $model->name; +$this->title = Yii::t('common/ticket_type', 'Update ticket type:' ) . ' ' . $model->name; $this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Ticket Types'), 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_ticket_type]]; $this->params['breadcrumbs'][] = Yii::t('common/ticket_type', 'Update'); @@ -18,6 +17,8 @@ $this->params['breadcrumbs'][] = Yii::t('common/ticket_type', 'Update'); render('_form', [ 'model' => $model, + 'accounts' => $accounts, + ]) ?> diff --git a/backend/views/ticket-type/view.php b/backend/views/ticket-type/view.php index 2443313..3483836 100644 --- a/backend/views/ticket-type/view.php +++ b/backend/views/ticket-type/view.php @@ -48,10 +48,12 @@ $this->params['breadcrumbs'][] = $this->title; 'price_brutto', [ 'attribute' => 'id_account', - 'value' => $model->account->name, - 'label' => Yii::t('common/ticket_type','Account') + 'value' => $model->accountName, ], - 'flag_student', + [ + 'attribute' => 'flag_student', + 'value' => ( $model->isStudent() ? Yii::t('common', 'Yes' ) : Yii::t('common', 'No' ) ), + ], [ 'attribute' => 'status', 'value' => $model->statusHuman diff --git a/common/messages/hu/app.php b/common/messages/hu/app.php index 7fde174..fc44c90 100644 --- a/common/messages/hu/app.php +++ b/common/messages/hu/app.php @@ -17,18 +17,18 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - 'Aktív' => '', - 'Are you sure you want to delete this item?' => '', - 'Delete' => '', - 'Felhasználók' => '', - 'Inaktív' => '', - 'Jelszó' => '', - 'Jelszó és jelszó újra nem egyezik!' => '', - 'Jelszó újra' => '', - 'Keresés' => '', - 'Mentés' => '', - 'Update' => '', - 'Update {modelClass}: ' => '', - 'Users' => '', - 'Új felhasználó' => '', + 'Aktív' => 'Aktív', + 'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt az element?', + 'Delete' => 'Törlés', + 'Felhasználók' => 'Felhasználók', + 'Inaktív' => 'Inaktív', + 'Jelszó' => 'Jelszó', + 'Jelszó és jelszó újra nem egyezik!' => 'Jelszó és jelszó újra nem egyezik!', + 'Jelszó újra' => 'Jelszó újra', + 'Keresés' => 'Keresés', + 'Mentés' => 'Mentés', + 'Update' => 'Update', + 'Update {modelClass}: ' => '{modelClass} módosítása: ', + 'Users' => 'Felhasználók', + 'Új felhasználó' => 'Új felhasználó', ]; diff --git a/common/messages/hu/common.php b/common/messages/hu/common.php index 565f9e5..0968165 100644 --- a/common/messages/hu/common.php +++ b/common/messages/hu/common.php @@ -17,5 +17,6 @@ * NOTE: this file must be saved in UTF-8 encoding. */ return [ - 'Create' => 'Mentés', + 'No' => 'Nem', + 'Yes' => 'Igen', ]; diff --git a/common/messages/hu/common/product_category.php b/common/messages/hu/common/product_category.php index e804f72..3dab63e 100644 --- a/common/messages/hu/common/product_category.php +++ b/common/messages/hu/common/product_category.php @@ -18,11 +18,9 @@ */ return [ 'Active' => 'Aktív', - 'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a termék kategóriát?', 'Create' => 'Mentés', 'Create Product Category' => 'Új termék kategória', 'Created At' => 'Létrehozás ideje', - 'Delete' => 'Törlés', 'Id Product Category' => 'Azonosító', 'Inactive' => 'Inaktív', 'Name' => 'Név', diff --git a/common/messages/hu/common/ticket_type.php b/common/messages/hu/common/ticket_type.php new file mode 100644 index 0000000..c15f450 --- /dev/null +++ b/common/messages/hu/common/ticket_type.php @@ -0,0 +1,48 @@ + 'Bérlet módosítása: ', + 'Active' => 'Aktív', + 'Create' => 'Mentés', + 'Create Ticket Type' => 'Új bérlet típus', + 'Created At' => 'Létrehozás ideje', + 'Day' => 'Nap', + 'Flag Student' => 'Diák', + 'Id Account' => 'Kassza', + 'Id Ticket Type' => 'Bérlet típus', + 'Inactive' => 'Inaktív', + 'Invalid account (inactive)!' => 'Érvénytelen kassza (inaktív)!', + 'Invalid account!' => 'Érvénytelen kassza!', + 'Max Usage Count' => 'Akalmak', + 'Month' => 'Hónap', + 'Name' => 'Név', + 'Normal' => 'Normál', + 'Price Brutto' => 'Bruttó ár', + 'Reference month' => 'Tárgyhónap', + 'Reset' => 'Reset', + 'Search' => 'Keresés', + 'Status' => 'Státusz', + 'Student' => 'Diák', + 'Ticket Types' => 'Bérlet típusok', + 'Time Unit Count' => 'Idő egység mennyiség', + 'Time Unit Type' => 'Idő egység típus', + 'Type' => 'Típus', + 'Update' => 'Módosítás', + 'Updated At' => 'Módosítás ideje', +]; diff --git a/common/models/Account.php b/common/models/Account.php index 9cc1092..125a73c 100644 --- a/common/models/Account.php +++ b/common/models/Account.php @@ -103,4 +103,9 @@ class Account extends \yii\db\ActiveRecord } return $result; } + + public function isInactive(){ + return $this->status == self::STATUS_DELETED; + } + } diff --git a/common/models/TicketType.php b/common/models/TicketType.php index 4d8a45c..11a86d4 100644 --- a/common/models/TicketType.php +++ b/common/models/TicketType.php @@ -20,37 +20,74 @@ use Yii; * @property string $created_at * @property string $updated_at */ -class TicketType extends \common\models\BaseFitnessActiveRecord -{ - +class TicketType extends \common\models\BaseFitnessActiveRecord { const STATUS_DELETED = 0; const STATUS_ACTIVE = 10; - - CONST TIME_UNIT_DAY = 10; - CONST TIME_UNIT_MONTH = 20; - CONST TIME_UNIT_MONTH_REFERENCE = 30; - + CONST TIME_UNIT_DAY = 10;//nap + CONST TIME_UNIT_MONTH = 20;//hónap + CONST TIME_UNIT_MONTH_REFERENCE = 30; //tárgy hónap const TYPE_NORMAL = 10; const TYPE_DEFAULT = self::TYPE_NORMAL; - /** - * @inheritdoc - */ - public static function tableName() - { - return 'ticket_type'; - } - - /** + const FLAG_STUDENT_OFF = 0; + const FLAG_STUDENT_ON = 1; + + /** + * @inheritdoc + */ + public static function tableName() { + return 'ticket_type'; + } + + /** + * @formatter:off * @inheritdoc */ public function rules() { return [ - [['name', 'id_account'], 'required'], - [['type', 'max_usage_count', 'time_unit_type', 'time_unit_count', 'price_brutto', 'id_account', 'flag_student', 'status'], 'integer'], - [['created_at', 'updated_at'], 'safe'], - [['name'], 'string', 'max' => 64] + [['name', 'id_account','time_unit_count','type' ,'time_unit_type' ,'max_usage_count','price_brutto'], 'required'], + //////////////// + //price brutto + //////////////// + [[ 'price_brutto', ], 'integer'], + //////////////// + //time_unit_type + //////////////// + [['time_unit_type',], 'integer'], + [['time_unit_type',], 'in', 'range' => [ self::TIME_UNIT_DAY,self::TIME_UNIT_MONTH,self::TIME_UNIT_MONTH_REFERENCE] ], + //////////////// + //time_unit_count + //////////////// + [['time_unit_count',], 'integer','min' => 1 , 'max' => 100], + //////////////// + //max_usage_count + //////////////// + [['max_usage_count',], 'integer','min' => 0 , 'max' => 10000], + //////////////// + //flag_student + //////////////// + [['flag_student',], 'integer'], + [['flag_student',], 'in', 'range' => [ self::FLAG_STUDENT_OFF, self::FLAG_STUDENT_ON ]], + //////////////// + //status + //////////////// + [['status',], 'integer'], + [['status',], 'in', 'range' => [ self::STATUS_ACTIVE, self::STATUS_DELETED ]], + //////////////// + //type + //////////////// + [['type',], 'integer'], + [['type',], 'in', 'range' => [ self::TYPE_NORMAL ]], + //////////////// + //name + //////////////// + [['name'], 'string', 'max' => 64], + //////////////// + //id_account + //////////////// + [['id_account',], 'integer'], + [['id_account',], 'validateIdAccount'], ]; } @@ -75,58 +112,86 @@ class TicketType extends \common\models\BaseFitnessActiveRecord ]; } - - static function statuses() { - return [ - self::STATUS_ACTIVE => Yii::t('common/ticket_type', 'Active'), - self::STATUS_DELETED => Yii::t('common/ticket_type', 'Inactive'), - ]; - } - - public function getStatusHuman(){ - $result = null; - $s = self::statuses($this->status); - if ( array_key_exists($this->status, $s)){ - $result = $s[$this->status]; - } - return $result; - } - - - static function timeUnitTypes() { - return [ - self::TIME_UNIT_DAY => Yii::t('common/ticket_type', 'Nap'), - self::TIME_UNIT_MONTH => Yii::t('common/ticket_type', 'Hónap'), - self::TIME_UNIT_MONTH_REFERENCE => Yii::t('common/ticket_type', 'Tárgyhónap'), - ]; - } - - public function getTimeUnitHuman(){ - $result = null; - $s = self::timeUnitTypes($this->time_unit_type); - if ( array_key_exists($this->time_unit_type, $s)){ - $result = $s[$this->time_unit_type]; - } - return $result; - } - static function ticketTypes() { - return [ - self::TYPE_NORMAL => Yii::t('common/ticket_type', 'Normal'), - ]; - } - - public function getTypeHuman(){ - $result = null; - $s = self::ticketTypes( ); - if ( array_key_exists($this->type, $s)){ - $result = $s[$this->type]; - } - return $result; - } - - - public function getAccount(){ - return $this->hasOne(Account::className(), [ 'id_account' => 'id_account' ]); - } - + /** + * @formatter:on + */ + static function statuses() { + return [ + self::STATUS_ACTIVE => Yii::t ( 'common/ticket_type', 'Active' ), + self::STATUS_DELETED => Yii::t ( 'common/ticket_type', 'Inactive' ) + ]; + } + public function getStatusHuman() { + $result = null; + $s = self::statuses ( $this->status ); + if (array_key_exists ( $this->status, $s )) { + $result = $s [$this->status]; + } + return $result; + } + static function timeUnitTypes() { + return [ + self::TIME_UNIT_DAY => Yii::t ( 'common/ticket_type', 'Day' ), + self::TIME_UNIT_MONTH => Yii::t ( 'common/ticket_type', 'Month' ), + self::TIME_UNIT_MONTH_REFERENCE => Yii::t ( 'common/ticket_type', 'Reference month' ) + ]; + } + public function getTimeUnitHuman() { + $result = null; + $s = self::timeUnitTypes ( $this->time_unit_type ); + if (array_key_exists ( $this->time_unit_type, $s )) { + $result = $s [$this->time_unit_type]; + } + return $result; + } + static function ticketTypes() { + return [ + self::TYPE_NORMAL => Yii::t ( 'common/ticket_type', 'Normal' ) + ]; + } + public function getTypeHuman() { + $result = null; + $s = self::ticketTypes (); + if (array_key_exists ( $this->type, $s )) { + $result = $s [$this->type]; + } + return $result; + } + public function getAccount() { + return $this->hasOne ( Account::className (), [ + 'id_account' => 'id_account' + ] ); + } + public function getAccountName() { + return $this->account->name; + } + + public function isStudent(){ + return $this->flag_student == ( self::FLAG_STUDENT_ON); + } + + + public function validateIdAccount($attribute,$params){ + $account = null; + if ( !$this->hasErrors("id_account")){ + $account = Account::findOne($this->$attribute); + + if ( !isset($account)){ + $this->addError($attribute,Yii::t('common/ticket_type','Invalid account!')); + }else{ + + //on update + if ( !$this->isNewRecord ){ + //if selected account is inactive ... + if ( $account->isInactive() ){ + //... and changed + if ( $this->isAttributeChanged('id_account')){ + $this->addError($attribute,Yii::t('common/ticket_type','Invalid account (inactive)!')); + } + } + } + } + } + } + }