From 271835ae6b98ec8cb91cb96c1851ddd698d4c626 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 18 Sep 2015 21:12:08 +0200
Subject: [PATCH 001/100] add version param and change log

---
 changelog.txt                   | 2 ++
 common/config/params.php        | 1 +
 frontend/views/layouts/main.php | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 changelog.txt

diff --git a/changelog.txt b/changelog.txt
new file mode 100644
index 0000000..d69e9d9
--- /dev/null
+++ b/changelog.txt
@@ -0,0 +1,2 @@
+-0.0.1
+	alap alkalmazás
\ No newline at end of file
diff --git a/common/config/params.php b/common/config/params.php
index 4ec9ba6..a7b1ac3 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,4 +3,5 @@ return [
     'adminEmail' => 'admin@example.com',
     'supportEmail' => 'support@example.com',
     'user.passwordResetTokenExpire' => 3600,
+	'version' => 'v0.0.2'
 ];
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 3e09838..3258889 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -67,7 +67,7 @@ AppAsset::register($this);
 
 <footer class="footer">
     <div class="container">
-        <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
+        <p class="pull-left">&copy;  <?= Yii::$app->name ?> <?= Yii::$app->params['version']  ?> Fitness - WebAdmin <?= date('Y') ?></p>
 
         <p class="pull-right"><?= Yii::powered() ?></p>
     </div>

From 5163f1a9a91062518ee4596dce6227b0ac0b7ec7 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sat, 19 Sep 2015 08:29:47 +0200
Subject: [PATCH 002/100] add user CRUD

---
 backend/components/AdminMenuStructure.php     |  74 ++++++++++
 backend/controllers/UserController.php        | 132 ++++++++++++++++++
 backend/models/UserCreate.php                 |  67 +++++++++
 backend/models/UserSearch.php                 |  73 ++++++++++
 backend/models/UserUpdate.php                 |  69 +++++++++
 backend/views/layouts/main.php                |  20 +--
 backend/views/user/_form.php                  |  28 ++++
 backend/views/user/_search.php                |  35 +++++
 backend/views/user/create.php                 |  21 +++
 backend/views/user/index.php                  |  35 +++++
 backend/views/user/update.php                 |  23 +++
 backend/views/user/view.php                   |  38 +++++
 common/config/main.php                        |   2 +
 common/models/User.php                        |  16 +++
 .../m150828_200317_add_default_admin_user.php |  34 +++++
 15 files changed, 653 insertions(+), 14 deletions(-)
 create mode 100644 backend/components/AdminMenuStructure.php
 create mode 100644 backend/controllers/UserController.php
 create mode 100644 backend/models/UserCreate.php
 create mode 100644 backend/models/UserSearch.php
 create mode 100644 backend/models/UserUpdate.php
 create mode 100644 backend/views/user/_form.php
 create mode 100644 backend/views/user/_search.php
 create mode 100644 backend/views/user/create.php
 create mode 100644 backend/views/user/index.php
 create mode 100644 backend/views/user/update.php
 create mode 100644 backend/views/user/view.php
 create mode 100644 console/migrations/m150828_200317_add_default_admin_user.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
new file mode 100644
index 0000000..505192e
--- /dev/null
+++ b/backend/components/AdminMenuStructure.php
@@ -0,0 +1,74 @@
+<?php
+namespace backend\components;
+
+use Yii;
+use common\models\Order;
+use yii\helpers\Html;
+
+class AdminMenuStructure{
+	
+	public $menuItems;
+	
+	public function AdminMenu(){
+		$this->menuItems = [];
+	}
+	
+	protected function can($authItem){
+		$result = false;
+		if (\Yii::$app->user->can($authItem)) {
+			$result = true;
+		}
+		return $result;
+	}
+	
+	
+	
+	
+	
+	protected function addUserMainMenu(){
+		
+		$userMainMenu = null;
+		$items = [];
+		
+		
+// 		if ( $this->can('backend.user.index')){
+			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
+// 		}
+		
+		
+		if ( count($items) > 0 ){
+			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
+				'items' =>  $items
+			];
+		}
+		
+		if ( isset($userMainMenu)){
+			$this->menuItems[]  = $userMainMenu;
+		}
+		
+		
+	}
+	
+	
+	protected function addLoginMainMenu(){
+		if (Yii::$app->user->isGuest) {
+			$mainMenuItem= ['label' => 'Login', 'url' => ['/site/login']];
+		} else {
+			$mainMenuItem= [
+					'label' => 'Kijelentkezés (' . Yii::$app->user->identity->username . ')',
+					'url' => ['/site/logout'],
+					'linkOptions' => ['data-method' => 'post']
+			];
+		}
+		$this->menuItems[] = $mainMenuItem;
+	}
+	
+	
+	public function run(){
+		$this->addUserMainMenu();
+		$this->addLoginMainMenu();
+		return $this->menuItems;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
new file mode 100644
index 0000000..6fff26f
--- /dev/null
+++ b/backend/controllers/UserController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\User;
+use backend\models\UserSearch;
+use backend\models\UserCreate;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use backend\models\UserUpdate;
+
+/**
+ * UserController implements the CRUD actions for User model.
+ */
+class UserController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all User models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new UserSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single User model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new User model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new UserCreate();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing User model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model =  UserUpdate::findOne(['id' => $id]);
+        
+        if ( $model == null ){
+        	throw new NotFoundHttpException('The requested page does not exist.');
+        }
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing User model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+//         $this->findModel($id)->delete();
+
+    	$user = $this->findModel($id);
+    	
+    	$user->updateAttributes(['status' => User::STATUS_DELETED]);
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the User model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return User the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = User::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/UserCreate.php b/backend/models/UserCreate.php
new file mode 100644
index 0000000..2e59786
--- /dev/null
+++ b/backend/models/UserCreate.php
@@ -0,0 +1,67 @@
+<?php
+namespace backend\models;
+
+use Yii;
+use common\models\User;
+
+class UserCreate extends User{
+
+	public $password_plain;
+	public $password_repeat;
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function rules()
+	{
+		return [
+				[['username','email','password_plain','password_repeat'], 'required' ],
+				['email' ,'email' ],
+				['email' ,'unique' ],
+				['username' ,'unique' ],
+				[['password_plain' ,'password_repeat'] ,'string','min' =>6 ],
+				[['password_repeat']   ,'validatePasswordRepeat' ]
+		];
+	}
+	
+	public function validatePasswordRepeat($attribute,$params){
+		
+		if ( !$this->hasErrors()){
+			if ( $this->password_plain != $this->password_repeat ){
+				$this->addError($attribute, Yii::t('app', 'Jelszó és jelszó újra nem egyezik!') );
+			}
+		}
+	}
+	
+	public function attributeLabels(){
+		return [
+	
+				'email' =>'E-mail',
+				'username' =>'Felhasználónév',
+				'created_at' =>'Létrehozás dátuma',
+				'password_plain' => Yii::t('app','Jelszó'),
+				'password_repeat' => Yii::t('app','Jelszó újra'),
+				 
+		];
+	}
+	
+	public function beforeSave($insert){
+		if ( parent::beforeSave($insert)){
+			if ( $insert ){
+				$this->setPassword($this->password_plain);
+				$this->generateAuthKey();
+				return true;
+			}
+		}else{
+			return false;
+		}
+	}
+	
+	public function afterSave($insert, $changedAttributes){
+	 	parent::afterSave($insert, $changedAttributes); 
+// 		$am = Yii::$app->authManager;
+//     	$role = $am->getRole('admin');
+// 		Yii::$app->authManager->assign($role, $this->id);
+	}
+	
+}
\ No newline at end of file
diff --git a/backend/models/UserSearch.php b/backend/models/UserSearch.php
new file mode 100644
index 0000000..553b9e0
--- /dev/null
+++ b/backend/models/UserSearch.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\User;
+
+/**
+ * UserSearch represents the model behind the search form about `common\models\User`.
+ */
+class UserSearch extends User
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id', 'status', 'created_at', 'updated_at'], 'integer'],
+            [['username', 'auth_key', 'password_hash', 'password_reset_token', 'email'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = User::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id' => $this->id,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'username', $this->username])
+            ->andFilterWhere(['like', 'auth_key', $this->auth_key])
+            ->andFilterWhere(['like', 'password_hash', $this->password_hash])
+            ->andFilterWhere(['like', 'password_reset_token', $this->password_reset_token])
+            ->andFilterWhere(['like', 'email', $this->email]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/models/UserUpdate.php b/backend/models/UserUpdate.php
new file mode 100644
index 0000000..077d07a
--- /dev/null
+++ b/backend/models/UserUpdate.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use common\models\User;
+
+class UserUpdate extends User {
+	public $password_plain;
+	public $password_repeat;
+	
+	/**
+	 * @inheritdoc
+	 * @formatter:off
+	 */
+	public function rules()
+	{
+		return [
+				[['username','email'], 'required' ],
+				['email' ,'email' ],
+				['email' ,'unique' , 'targetClass' => User::className(), 'targetAttribute' => 'email'],
+				['username' ,'unique', 'targetClass' => User::className(), 'targetAttribute' => 'username'],
+				[['password_plain' ,'password_repeat'] ,'string','min' =>6 ],
+				[['password_repeat']   ,'validatePasswordRepeat' ]
+		];
+	}
+	/**
+	 * @formatter:on
+	 */
+	public function validatePasswordRepeat($attribute, $params) {
+		if (! $this->hasErrors ()) {
+			if ( !empty($this->password_plain) || !empty($this->password_repeat) ){
+				if ($this->password_plain != $this->password_repeat) {
+					$this->addError ( $attribute, Yii::t ( 'app', 'Jelszó és jelszó újra nem egyezik!' ) );
+				}
+			}
+		}
+	}
+	public function attributeLabels() {
+		return [ 
+				
+				'email' => 'E-mail',
+				'username' => 'Felhasználónév',
+				'created_at' => 'Létrehozás dátuma',
+				'password_plain' => Yii::t ( 'app', 'Jelszó' ),
+				'password_repeat' => Yii::t ( 'app', 'Jelszó újra' ) 
+		]
+		;
+	}
+	public function beforeSave($insert) {
+		if (parent::beforeSave ( $insert )) {
+			if (! $insert) {
+				if ( !empty( $this->password_plain ) ) {
+					$this->setPassword($this->password_plain);
+					return true;
+				}
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+	public function afterSave($insert, $changedAttributes) {
+		parent::afterSave ( $insert, $changedAttributes );
+		// $am = Yii::$app->authManager;
+		// $role = $am->getRole('admin');
+		// Yii::$app->authManager->assign($role, $this->id);
+	}
+}
\ No newline at end of file
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index d5ded73..a466606 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -9,8 +9,12 @@ use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 use common\widgets\Alert;
+use backend\components\AdminMenuStructure;
 
 AppAsset::register($this);
+
+$adminMenu = new AdminMenuStructure();
+$items = $adminMenu->run();
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html>
@@ -28,27 +32,15 @@ AppAsset::register($this);
 <div class="wrap">
     <?php
     NavBar::begin([
-        'brandLabel' => 'My Company',
+        'brandLabel' => 'Botond Fitness WebAdmin',
         'brandUrl' => Yii::$app->homeUrl,
         'options' => [
             'class' => 'navbar-inverse navbar-fixed-top',
         ],
     ]);
-    $menuItems = [
-        ['label' => 'Home', 'url' => ['/site/index']],
-    ];
-    if (Yii::$app->user->isGuest) {
-        $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
-    } else {
-        $menuItems[] = [
-            'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
-            'url' => ['/site/logout'],
-            'linkOptions' => ['data-method' => 'post']
-        ];
-    }
     echo Nav::widget([
         'options' => ['class' => 'navbar-nav navbar-right'],
-        'items' => $menuItems,
+        'items' => $items,
     ]);
     NavBar::end();
     ?>
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
new file mode 100644
index 0000000..e31eb2b
--- /dev/null
+++ b/backend/views/user/_form.php
@@ -0,0 +1,28 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\User */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="user-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+	<?php echo Yii::t('common', 'Create')?>
+
+    <?= $form->field($model, 'username')->textInput() ?>
+    <?= $form->field($model, 'email')->textInput() ?>
+    <?= $form->field($model, 'password_plain')->passwordInput() ?>
+    <?= $form->field($model, 'password_repeat')->passwordInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Mentés') : Yii::t('app', 'Mentés'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/user/_search.php b/backend/views/user/_search.php
new file mode 100644
index 0000000..77b0399
--- /dev/null
+++ b/backend/views/user/_search.php
@@ -0,0 +1,35 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\UserSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="panel panel-default"> 
+	<div class="panel-heading">
+		<?= Yii::t('app','Keresés')?>
+	</div>
+	<div class="panel-body">
+		<div class="user-search">
+		
+		    <?php $form = ActiveForm::begin([
+		        'action' => ['index'],
+		        'method' => 'get',
+		    ]); ?>
+		
+		    <?= $form->field($model, 'username') ?>
+		
+		    <?php  echo $form->field($model, 'email') ?>
+		
+		    <div class="form-group">
+		        <?= Html::submitButton(Yii::t('app', 'Keresés'), ['class' => 'btn btn-primary']) ?>
+		    </div>
+		
+		    <?php ActiveForm::end(); ?>
+		
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/backend/views/user/create.php b/backend/views/user/create.php
new file mode 100644
index 0000000..04a8d93
--- /dev/null
+++ b/backend/views/user/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\User */
+
+$this->title = Yii::t('app', 'Új felhasználó');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Felhasználók'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
new file mode 100644
index 0000000..30e1329
--- /dev/null
+++ b/backend/views/user/index.php
@@ -0,0 +1,35 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\UserSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Felhasználók');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Új felhasználó'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'username',
+            'email:email',
+            'created_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
new file mode 100644
index 0000000..2e03759
--- /dev/null
+++ b/backend/views/user/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\User */
+
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'User',
+]) . ' ' . $model->id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="user-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
new file mode 100644
index 0000000..f5494f3
--- /dev/null
+++ b/backend/views/user/view.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\User */
+
+$this->title = $model->id;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Felhasználók'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="user-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'username',
+            'email:email',
+            'statusHuman',
+            'created_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/config/main.php b/common/config/main.php
index c9071d1..de8ff7c 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -1,6 +1,8 @@
 <?php
 return [
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
+// 	'language' => 'hu-HU',
+	'language' => 'hu',
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',
diff --git a/common/models/User.php b/common/models/User.php
index ce78fcd..2ab5921 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -185,4 +185,20 @@ class User extends ActiveRecord implements IdentityInterface
     {
         $this->password_reset_token = null;
     }
+    
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t('app', 'Aktív'),
+    			self::STATUS_DELETED => Yii::t('app', 'Inaktív'),
+    	]    ;
+    }
+    
+    public function getStatusHuman(){
+    	$result = null;
+    	$s = self::statuses($this->status);
+    	if ( array_key_exists($this->status, $s)){
+    		$result = $s[$this->status];
+    	}
+    	return $result;
+    }
 }
diff --git a/console/migrations/m150828_200317_add_default_admin_user.php b/console/migrations/m150828_200317_add_default_admin_user.php
new file mode 100644
index 0000000..7555455
--- /dev/null
+++ b/console/migrations/m150828_200317_add_default_admin_user.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+use yii\base\Object;
+use common\models\User;
+
+class m150828_200317_add_default_admin_user extends Migration
+{
+    public function up()
+    {
+    	$user = new User();
+    	$user->username = "admin";
+    	$user->email = "admin@rocho-net.hu";
+    	$user->setPassword("test");
+    	$user->generateAuthKey();
+    	$user->save();
+    }
+
+    public function down()
+    {
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From fd181e580f82863e46a39552721d63a2a2c90db1 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sat, 19 Sep 2015 08:57:45 +0200
Subject: [PATCH 003/100] add i18n

---
 backend/views/user/_form.php  |  1 -
 common/config/i18n.php        | 81 +++++++++++++++++++++++++++++++++++
 common/config/main.php        |  8 ++++
 common/messages/hu/app.php    | 34 +++++++++++++++
 common/messages/hu/common.php | 21 +++++++++
 5 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 common/config/i18n.php
 create mode 100644 common/messages/hu/app.php
 create mode 100644 common/messages/hu/common.php

diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index e31eb2b..fd35256 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -12,7 +12,6 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(); ?>
 
-	<?php echo Yii::t('common', 'Create')?>
 
     <?= $form->field($model, 'username')->textInput() ?>
     <?= $form->field($model, 'email')->textInput() ?>
diff --git a/common/config/i18n.php b/common/config/i18n.php
new file mode 100644
index 0000000..df77983
--- /dev/null
+++ b/common/config/i18n.php
@@ -0,0 +1,81 @@
+<?php
+/**
+yii message/config @common/config/i18n.php // generate i18n.php
+yii message/extract @common/config/i18n.php //generate message files
+ * 
+ * */
+return [
+    // string, required, root directory of all source files
+    'sourcePath' => __DIR__. '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR,
+    // array, required, list of language codes that the extracted messages
+    // should be translated to. For example, ['zh-CN', 'de'].
+    'languages' => ['hu'],
+    // string, the name of the function for translating messages.
+    // Defaults to 'Yii::t'. This is used as a mark to find the messages to be
+    // translated. You may use a string for single function name or an array for
+    // multiple function names.
+    'translator' => 'Yii::t',
+    // boolean, whether to sort messages by keys when merging new messages
+    // with the existing ones. Defaults to false, which means the new (untranslated)
+    // messages will be separated from the old (translated) ones.
+    'sort' => false,
+    // boolean, whether to remove messages that no longer appear in the source code.
+    // Defaults to false, which means each of these messages will be enclosed with a pair of '@@' marks.
+    'removeUnused' => false,
+    // array, list of patterns that specify which files (not directories) should be processed.
+    // If empty or not set, all files will be processed.
+    // Please refer to "except" for details about the patterns.
+    'only' => ['*.php'],
+    // array, list of patterns that specify which files/directories should NOT be processed.
+    // If empty or not set, all files/directories will be processed.
+    // A path matches a pattern if it contains the pattern string at its end. For example,
+    // '/a/b' will match all files and directories ending with '/a/b';
+    // the '*.svn' will match all files and directories whose name ends with '.svn'.
+    // and the '.svn' will match all files and directories named exactly '.svn'.
+    // Note, the '/' characters in a pattern matches both '/' and '\'.
+    // See helpers/FileHelper::findFiles() description for more details on pattern matching rules.
+    // If a file/directory matches both a pattern in "only" and "except", it will NOT be processed.
+    'except' => [
+        '.svn',
+        '.git',
+        '.gitignore',
+        '.gitkeep',
+        '.hgignore',
+        '.hgkeep',
+        '/messages',
+    ],
+
+    // 'php' output format is for saving messages to php files.
+    'format' => 'php',
+    // Root directory containing message translations.
+ 	'messagePath' => __DIR__ . DIRECTORY_SEPARATOR .'..'. DIRECTORY_SEPARATOR . 'messages',
+    // boolean, whether the message file should be overwritten with the merged messages
+    'overwrite' => true,
+
+    // Message categories to ignore
+    'ignoreCategories' => [
+        'yii',
+    ],
+
+    /*
+    // 'db' output format is for saving messages to database.
+    'format' => 'db',
+    // Connection component to use. Optional.
+    'db' => 'db',
+    // Custom source message table. Optional.
+    // 'sourceMessageTable' => '{{%source_message}}',
+    // Custom name for translation message table. Optional.
+    // 'messageTable' => '{{%message}}',
+    */
+
+    /*
+    // 'po' output format is for saving messages to gettext po files.
+    'format' => 'po',
+    // Root directory containing message translations.
+    'messagePath' => __DIR__ . DIRECTORY_SEPARATOR . 'messages',
+    // Name of the file that will be used for translations.
+    'catalog' => 'messages',
+    // boolean, whether the message file should be overwritten with the merged messages
+    'overwrite' => true,
+    */
+];
diff --git a/common/config/main.php b/common/config/main.php
index de8ff7c..be6a945 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -7,5 +7,13 @@ return [
         'cache' => [
             'class' => 'yii\caching\FileCache',
         ],
+    		'i18n' => [
+    				'translations' => [
+    						'*' => [
+    								'class' => 'yii\i18n\PhpMessageSource',
+    								'basePath' => '@common/messages',
+    						],
+    				],
+    		],
     ],
 ];
diff --git a/common/messages/hu/app.php b/common/messages/hu/app.php
new file mode 100644
index 0000000..7fde174
--- /dev/null
+++ b/common/messages/hu/app.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * 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ó' => '',
+];
diff --git a/common/messages/hu/common.php b/common/messages/hu/common.php
new file mode 100644
index 0000000..565f9e5
--- /dev/null
+++ b/common/messages/hu/common.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Create' => 'Mentés',
+];

From 7a48ac9d5186afa49c94ff7aea4e4568400b92ad Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sat, 19 Sep 2015 16:07:52 +0200
Subject: [PATCH 004/100] finish feature #26

---
 backend/controllers/UserController.php | 1 -
 backend/models/UserSearch.php          | 4 ++++
 common/models/User.php                 | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index 6fff26f..88a61e5 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -105,7 +105,6 @@ class UserController extends Controller
      */
     public function actionDelete($id)
     {
-//         $this->findModel($id)->delete();
 
     	$user = $this->findModel($id);
     	
diff --git a/backend/models/UserSearch.php b/backend/models/UserSearch.php
index 553b9e0..bbf528d 100644
--- a/backend/models/UserSearch.php
+++ b/backend/models/UserSearch.php
@@ -46,6 +46,8 @@ class UserSearch extends User
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
+        
+        $query->andWhere(['status' => User::STATUS_ACTIVE]);
 
         $this->load($params);
 
@@ -54,6 +56,8 @@ class UserSearch extends User
             // $query->where('0=1');
             return $dataProvider;
         }
+        
+        
 
         $query->andFilterWhere([
             'id' => $this->id,
diff --git a/common/models/User.php b/common/models/User.php
index 2ab5921..dce1b33 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -201,4 +201,12 @@ class User extends ActiveRecord implements IdentityInterface
     	}
     	return $result;
     }
+    
+    
+    public function attributeLabels(){
+    	return [
+    			
+    	];
+    }
+    
 }

From 381aea4f2b48b2e9193a1ebe54778349c7f224ab Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sat, 19 Sep 2015 21:25:41 +0200
Subject: [PATCH 005/100] add rbac roles, and and admin role to admin user

---
 common/config/main.php                        | 12 +++
 .../migrations/m140506_102106_rbac_init.php   | 92 +++++++++++++++++++
 .../m150919_181709_add_basic_roles.php        | 44 +++++++++
 ...2054_add__admin__role__to__admin__user.php | 34 +++++++
 4 files changed, 182 insertions(+)
 create mode 100644 console/migrations/m140506_102106_rbac_init.php
 create mode 100644 console/migrations/m150919_181709_add_basic_roles.php
 create mode 100644 console/migrations/m150919_192054_add__admin__role__to__admin__user.php

diff --git a/common/config/main.php b/common/config/main.php
index be6a945..cc2b8b8 100644
--- a/common/config/main.php
+++ b/common/config/main.php
@@ -15,5 +15,17 @@ return [
     						],
     				],
     		],
+    		'formatter' => [
+    				'class' => 'yii\i18n\Formatter',
+    				'dateFormat' => 'yyyy.MM.dd',
+    				'datetimeFormat' => 'yyyy.MM.dd HH:mm',
+    				'locale' => 'hu-Hu',
+    				'timeZone' => 'UTC',
+    				'defaultTimeZone' => 'UTC' ,
+    				'nullDisplay' => "-",
+    		],
+    		'authManager' => [
+    				'class' => 'yii\rbac\DbManager'
+    		],
     ],
 ];
diff --git a/console/migrations/m140506_102106_rbac_init.php b/console/migrations/m140506_102106_rbac_init.php
new file mode 100644
index 0000000..cc92edc
--- /dev/null
+++ b/console/migrations/m140506_102106_rbac_init.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+use yii\base\InvalidConfigException;
+use yii\db\Schema;
+use yii\rbac\DbManager;
+
+/**
+ * Initializes RBAC tables
+ *
+ * @author Alexander Kochetov <creocoder@gmail.com>
+ * @since 2.0
+ */
+class m140506_102106_rbac_init extends \yii\db\Migration
+{
+    /**
+     * @throws yii\base\InvalidConfigException
+     * @return DbManager
+     */
+    protected function getAuthManager()
+    {
+        $authManager = Yii::$app->getAuthManager();
+        if (!$authManager instanceof DbManager) {
+            throw new InvalidConfigException('You should configure "authManager" component to use database before executing this migration.');
+        }
+        return $authManager;
+    }
+
+    public function up()
+    {
+        $authManager = $this->getAuthManager();
+        $this->db = $authManager->db;
+
+        $tableOptions = null;
+        if ($this->db->driverName === 'mysql') {
+            // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+        }
+
+        $this->createTable($authManager->ruleTable, [
+            'name' => $this->string(64)->notNull(),
+            'data' => $this->text(),
+            'created_at' => $this->integer(),
+            'updated_at' => $this->integer(),
+            'PRIMARY KEY (name)',
+        ], $tableOptions);
+
+        $this->createTable($authManager->itemTable, [
+            'name' => $this->string(64)->notNull(),
+            'type' => $this->integer()->notNull(),
+            'description' => $this->text(),
+            'rule_name' => $this->string(64),
+            'data' => $this->text(),
+            'created_at' => $this->integer(),
+            'updated_at' => $this->integer(),
+            'PRIMARY KEY (name)',
+            'FOREIGN KEY (rule_name) REFERENCES ' . $authManager->ruleTable . ' (name) ON DELETE SET NULL ON UPDATE CASCADE',
+        ], $tableOptions);
+        $this->createIndex('idx-auth_item-type', $authManager->itemTable, 'type');
+
+        $this->createTable($authManager->itemChildTable, [
+            'parent' => $this->string(64)->notNull(),
+            'child' => $this->string(64)->notNull(),
+            'PRIMARY KEY (parent, child)',
+            'FOREIGN KEY (parent) REFERENCES ' . $authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+            'FOREIGN KEY (child) REFERENCES ' . $authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+        ], $tableOptions);
+
+        $this->createTable($authManager->assignmentTable, [
+            'item_name' => $this->string(64)->notNull(),
+            'user_id' => $this->string(64)->notNull(),
+            'created_at' => $this->integer(),
+            'PRIMARY KEY (item_name, user_id)',
+            'FOREIGN KEY (item_name) REFERENCES ' . $authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+        ], $tableOptions);
+    }
+
+    public function down()
+    {
+        $authManager = $this->getAuthManager();
+        $this->db = $authManager->db;
+
+        $this->dropTable($authManager->assignmentTable);
+        $this->dropTable($authManager->itemChildTable);
+        $this->dropTable($authManager->itemTable);
+        $this->dropTable($authManager->ruleTable);
+    }
+}
diff --git a/console/migrations/m150919_181709_add_basic_roles.php b/console/migrations/m150919_181709_add_basic_roles.php
new file mode 100644
index 0000000..79e7565
--- /dev/null
+++ b/console/migrations/m150919_181709_add_basic_roles.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150919_181709_add_basic_roles extends Migration
+{
+    public function up()
+    {
+    	$role = Yii::$app->authManager->createRole('developer');
+    	Yii::$app->authManager->add($role);
+    	
+    	$role = Yii::$app->authManager->createRole('admin');
+    	Yii::$app->authManager->add($role);
+    	
+
+    	$role = Yii::$app->authManager->createRole('group_admin');
+    	Yii::$app->authManager->add($role);
+    	
+    	$role = Yii::$app->authManager->createRole('shop_admin');
+    	Yii::$app->authManager->add($role);
+    	
+    	$role = Yii::$app->authManager->createRole('receptionist');
+    	Yii::$app->authManager->add($role);
+    }
+
+    public function down()
+    {
+        echo "m150919_181709_add_basic_roles cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m150919_192054_add__admin__role__to__admin__user.php b/console/migrations/m150919_192054_add__admin__role__to__admin__user.php
new file mode 100644
index 0000000..afcc64d
--- /dev/null
+++ b/console/migrations/m150919_192054_add__admin__role__to__admin__user.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+use common\models\User;
+
+class m150919_192054_add__admin__role__to__admin__user extends Migration
+{
+    public function up()
+    {
+    	$am = Yii::$app->authManager;
+    	$user = User::find()->where('username = :name',[':name' => 'admin'])->one();
+    	$role = $am->getRole('admin');
+    	Yii::$app->authManager->assign($role, $user->id);
+    }
+
+    public function down()
+    {
+        echo "m150919_192054_add__admin__role__to__admin__user cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 47341b63969310fcbaea98d1dc915856fa94422c Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sun, 20 Sep 2015 14:55:05 +0200
Subject: [PATCH 006/100] =?UTF-8?q?add=20Rakt=C3=A1r=20model=20+=20crud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/WarehouseController.php   | 125 ++++++++++++++++++
 backend/models/WarehouseSearch.php            |  69 ++++++++++
 backend/views/warehouse/_form.php             |  24 ++++
 backend/views/warehouse/_search.php           |  35 +++++
 backend/views/warehouse/create.php            |  21 +++
 backend/views/warehouse/index.php             |  40 ++++++
 backend/views/warehouse/update.php            |  23 ++++
 backend/views/warehouse/view.php              |  44 ++++++
 common/messages/hu/common/warehouse.php       |  34 +++++
 common/models/Warehouse.php                   |  86 ++++++++++++
 .../m150919_200109_add__table__warehouse.php  |  42 ++++++
 12 files changed, 544 insertions(+)
 create mode 100644 backend/controllers/WarehouseController.php
 create mode 100644 backend/models/WarehouseSearch.php
 create mode 100644 backend/views/warehouse/_form.php
 create mode 100644 backend/views/warehouse/_search.php
 create mode 100644 backend/views/warehouse/create.php
 create mode 100644 backend/views/warehouse/index.php
 create mode 100644 backend/views/warehouse/update.php
 create mode 100644 backend/views/warehouse/view.php
 create mode 100644 common/messages/hu/common/warehouse.php
 create mode 100644 common/models/Warehouse.php
 create mode 100644 console/migrations/m150919_200109_add__table__warehouse.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 505192e..9c6cc74 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -35,6 +35,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
 // 		}
 		
+		$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php
new file mode 100644
index 0000000..72358a6
--- /dev/null
+++ b/backend/controllers/WarehouseController.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Warehouse;
+use backend\models\WarehouseSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+
+/**
+ * WarehouseController implements the CRUD actions for Warehouse model.
+ */
+class WarehouseController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Warehouse models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new WarehouseSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Warehouse model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Warehouse model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Warehouse();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Warehouse model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Warehouse model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+		$warehouse = $this->findModel($id);
+    	
+    	$warehouse->updateAttributes(['status' => Warehouse::STATUS_DELETED]);
+    	
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Warehouse model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Warehouse the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Warehouse::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/WarehouseSearch.php b/backend/models/WarehouseSearch.php
new file mode 100644
index 0000000..18aa9f6
--- /dev/null
+++ b/backend/models/WarehouseSearch.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Warehouse as WarehouseModel;
+
+/**
+ * Warehouse represents the model behind the search form about `common\models\Warehouse`.
+ */
+class WarehouseSearch extends WarehouseModel
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_warehouse', 'status', 'created_at', 'updated_at'], 'integer'],
+            [['name'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = WarehouseModel::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_warehouse' => $this->id_warehouse,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/warehouse/_form.php b/backend/views/warehouse/_form.php
new file mode 100644
index 0000000..64299eb
--- /dev/null
+++ b/backend/views/warehouse/_form.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Warehouse */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="warehouse-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/warehouse', "Active") 	]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/warehouse', 'Create') : Yii::t('common/warehouse', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/warehouse/_search.php b/backend/views/warehouse/_search.php
new file mode 100644
index 0000000..d7c2548
--- /dev/null
+++ b/backend/views/warehouse/_search.php
@@ -0,0 +1,35 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\Warehouse */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="warehouse-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_warehouse') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?= $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/warehouse', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/warehouse', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/warehouse/create.php b/backend/views/warehouse/create.php
new file mode 100644
index 0000000..f387718
--- /dev/null
+++ b/backend/views/warehouse/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Warehouse */
+
+$this->title = Yii::t('common/warehouse', 'Create Warehouse');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/warehouse', 'Warehouses'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="warehouse-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/warehouse/index.php b/backend/views/warehouse/index.php
new file mode 100644
index 0000000..c983bb0
--- /dev/null
+++ b/backend/views/warehouse/index.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\Warehouse */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/warehouse', 'Warehouses');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="warehouse-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/warehouse', 'Create Warehouse'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'name',
+        	[
+        		'attribute' => 'status',		
+        		'value' => 'statusHuman',		
+    		],
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            [
+            	'class' => 'yii\grid\ActionColumn',
+            	 'template' => '{view} {update}'
+    		],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/warehouse/update.php b/backend/views/warehouse/update.php
new file mode 100644
index 0000000..f66f77e
--- /dev/null
+++ b/backend/views/warehouse/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Warehouse */
+
+$this->title = Yii::t('common/warehouse', 'Update {modelClass}: ', [
+    'modelClass' => 'Warehouse',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/warehouse', 'Warehouses'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_warehouse]];
+$this->params['breadcrumbs'][] = Yii::t('common/warehouse', 'Update');
+?>
+<div class="warehouse-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/warehouse/view.php b/backend/views/warehouse/view.php
new file mode 100644
index 0000000..b8e7612
--- /dev/null
+++ b/backend/views/warehouse/view.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Warehouse */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/warehouse', 'Warehouses'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="warehouse-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/warehouse', 'Update'), ['update', 'id' => $model->id_warehouse], ['class' => 'btn btn-primary']) ?>
+        <?php
+        /* echo  Html::a(Yii::t('common/warehouse', 'Delete'), ['delete', 'id' => $model->id_warehouse], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/warehouse', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) */
+	?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'name',
+            [
+		    	'attribute' => 'status',
+            	'label' => Yii::t('common/warehouse', "Active"),
+            	'value' => $model->statusHuman	
+    		],		
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/messages/hu/common/warehouse.php b/common/messages/hu/common/warehouse.php
new file mode 100644
index 0000000..e3f71d8
--- /dev/null
+++ b/common/messages/hu/common/warehouse.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Active' => 'Aktív',
+    'Inactive' => 'Inaktív',
+    'Reset' => '',
+    'Create' => 'Mentés',
+    'Create Warehouse' => 'Új raktár',
+    'Created At' => 'Létrehozás ideje',
+    'Id Warehouse' => 'Azonosító',
+    'Name' => 'Név',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása: ',
+    'Updated At' => 'Módosítás ideje',
+    'Warehouses' => 'Raktárak',
+];
diff --git a/common/models/Warehouse.php b/common/models/Warehouse.php
new file mode 100644
index 0000000..db5006b
--- /dev/null
+++ b/common/models/Warehouse.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "warehouse".
+ *
+ * @property integer $id_warehouse
+ * @property string $name
+ * @property integer $status
+ * @property integer $created_at
+ * @property integer $updated_at
+ */
+class Warehouse extends \yii\db\ActiveRecord
+{
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'warehouse';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name',  ], 'required'],
+            [['name',  ], 'unique'],
+            [['status',  ], 'integer'],
+            [['name'], 'string', 'max' => 64]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return [
+    			[	'class' => TimestampBehavior::className(),
+    					'value' => function(){ return date('Y-m-d H:i' ); }
+    			]
+    			];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_warehouse' => Yii::t('common/warehouse', 'Id Warehouse'),
+            'name' => Yii::t('common/warehouse', 'Name'),
+            'status' => Yii::t('common/warehouse', 'Status'),
+            'created_at' => Yii::t('common/warehouse', 'Created At'),
+            'updated_at' => Yii::t('common/warehouse', 'Updated At'),
+        ];
+    }
+    
+
+    static function statuses() {
+		return [
+			self::STATUS_ACTIVE => Yii::t('common/warehouse', 'Active'),	
+			self::STATUS_DELETED => Yii::t('common/warehouse', 'Inactive'),	
+		];	
+    }
+    
+    public function getStatusHuman(){
+    	$result = null;
+    	$s = self::statuses($this->status);
+    	if ( array_key_exists($this->status, $s)){
+    		$result = $s[$this->status];
+    	}
+    	return $result;
+    }
+    
+}
diff --git a/console/migrations/m150919_200109_add__table__warehouse.php b/console/migrations/m150919_200109_add__table__warehouse.php
new file mode 100644
index 0000000..d324a74
--- /dev/null
+++ b/console/migrations/m150919_200109_add__table__warehouse.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150919_200109_add__table__warehouse extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%warehouse}}', [
+    			'id_warehouse' => $this->primaryKey(),
+    			'name' => $this->string(64)->notNull(),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+//         echo "m150919_200109_add__table__warehouse cannot be reverted.\n";
+
+//         return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 6163163b1cb07fb295b1420781fa8dae1fa36b26 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sun, 20 Sep 2015 22:02:02 +0200
Subject: [PATCH 007/100] add account model + crud ( kassza )

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/AccountController.php     | 121 ++++++++++++++++++
 backend/controllers/WarehouseController.php   |  12 +-
 backend/models/AccountController.php          | 121 ++++++++++++++++++
 backend/models/AccountSearch.php              |  70 ++++++++++
 backend/views/account/_form.php               |  29 +++++
 backend/views/account/_search.php             |  37 ++++++
 backend/views/account/create.php              |  21 +++
 backend/views/account/index.php               |  44 +++++++
 backend/views/account/update.php              |  23 ++++
 backend/views/account/view.php                |  48 +++++++
 backend/views/warehouse/update.php            |   2 +-
 common/messages/hu/common/account.php         |  38 ++++++
 common/messages/hu/common/warehouse.php       |   1 +
 common/models/Account.php                     | 106 +++++++++++++++
 .../m150920_191201_add__table__account.php    |  40 ++++++
 16 files changed, 707 insertions(+), 7 deletions(-)
 create mode 100644 backend/controllers/AccountController.php
 create mode 100644 backend/models/AccountController.php
 create mode 100644 backend/models/AccountSearch.php
 create mode 100644 backend/views/account/_form.php
 create mode 100644 backend/views/account/_search.php
 create mode 100644 backend/views/account/create.php
 create mode 100644 backend/views/account/index.php
 create mode 100644 backend/views/account/update.php
 create mode 100644 backend/views/account/view.php
 create mode 100644 common/messages/hu/common/account.php
 create mode 100644 common/models/Account.php
 create mode 100644 console/migrations/m150920_191201_add__table__account.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 9c6cc74..1461ab4 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -36,6 +36,7 @@ class AdminMenuStructure{
 // 		}
 		
 		$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
+		$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/AccountController.php b/backend/controllers/AccountController.php
new file mode 100644
index 0000000..eae1482
--- /dev/null
+++ b/backend/controllers/AccountController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Account;
+use backend\models\AccountSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * AccountController implements the CRUD actions for Account model.
+ */
+class AccountController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Account models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new AccountSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Account model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Account model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Account();
+		$model->status = Account::STATUS_ACTIVE;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Account model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Account model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+//     public function actionDelete($id)
+//     {
+//         $this->findModel($id)->delete();
+
+//         return $this->redirect(['index']);
+//     }
+
+    /**
+     * Finds the Account model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Account the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Account::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php
index 72358a6..f4097d4 100644
--- a/backend/controllers/WarehouseController.php
+++ b/backend/controllers/WarehouseController.php
@@ -97,15 +97,15 @@ class WarehouseController extends Controller
      * @param integer $id
      * @return mixed
      */
-    public function actionDelete($id)
-    {
-		$warehouse = $this->findModel($id);
+//     public function actionDelete($id)
+//     {
+// 		$warehouse = $this->findModel($id);
     	
-    	$warehouse->updateAttributes(['status' => Warehouse::STATUS_DELETED]);
+//     	$warehouse->updateAttributes(['status' => Warehouse::STATUS_DELETED]);
     	
 
-        return $this->redirect(['index']);
-    }
+//         return $this->redirect(['index']);
+//     }
 
     /**
      * Finds the Warehouse model based on its primary key value.
diff --git a/backend/models/AccountController.php b/backend/models/AccountController.php
new file mode 100644
index 0000000..dadd3eb
--- /dev/null
+++ b/backend/models/AccountController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use common\models\Account;
+use backend\models\AccountSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * AccountController implements the CRUD actions for Account model.
+ */
+class AccountController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Account models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new AccountSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Account model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Account model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Account();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Account model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Account model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Account model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Account the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Account::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/AccountSearch.php b/backend/models/AccountSearch.php
new file mode 100644
index 0000000..7543b38
--- /dev/null
+++ b/backend/models/AccountSearch.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Account;
+
+/**
+ * AccountSearch represents the model behind the search form about `common\models\Account`.
+ */
+class AccountSearch extends Account
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_account', 'status', 'type'], 'integer'],
+            [['name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Account::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_account' => $this->id_account,
+            'status' => $this->status,
+            'type' => $this->type,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/account/_form.php b/backend/views/account/_form.php
new file mode 100644
index 0000000..a4c110a
--- /dev/null
+++ b/backend/views/account/_form.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Account;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+   <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/account', "Active") 	]) ?>
+
+	<?= $form->field($model, 'type')->dropDownList(Account::types())  ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/account', 'Create') : Yii::t('common/account', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/account/_search.php b/backend/views/account/_search.php
new file mode 100644
index 0000000..35b39c8
--- /dev/null
+++ b/backend/views/account/_search.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AccountSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/account', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/account', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/account/create.php b/backend/views/account/create.php
new file mode 100644
index 0000000..c30047a
--- /dev/null
+++ b/backend/views/account/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = Yii::t('common/account', 'Create Account');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/account/index.php b/backend/views/account/index.php
new file mode 100644
index 0000000..e6405a1
--- /dev/null
+++ b/backend/views/account/index.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\AccountSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/account', 'Accounts');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/account', 'Create Account'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'name',
+           [
+        		'attribute' => 'status',		
+        		'value' => 'statusHuman',		
+    		],
+            [
+        		'attribute' => 'type',		
+        		'value' => 'typeHuman',		
+    		],
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn',
+             'template' => '{view} {update}'
+            		
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/account/update.php b/backend/views/account/update.php
new file mode 100644
index 0000000..3510e0c
--- /dev/null
+++ b/backend/views/account/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = Yii::t('common/account', 'Update {modelClass}: ', [
+    'modelClass' => Yii::t('common/account', 'Account'),
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_account]];
+$this->params['breadcrumbs'][] = Yii::t('common/account', 'Update');
+?>
+<div class="account-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/account/view.php b/backend/views/account/view.php
new file mode 100644
index 0000000..16a1f80
--- /dev/null
+++ b/backend/views/account/view.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/account', 'Update'), ['update', 'id' => $model->id_account], ['class' => 'btn btn-primary']) ?>
+        <?php
+        /*Html::a(Yii::t('common/account', 'Delete'), ['delete', 'id' => $model->id_account], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/account', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) */
+        ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'name',
+                [
+		    	'attribute' => 'status',
+            	'label' => Yii::t('common/account', "Active"),
+            	'value' => $model->statusHuman	
+    		],		
+        		[
+        		'attribute' => 'type',
+        		'value' => $model->typeHuman
+        		],
+            'created_at:datetime',
+            'updated_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/warehouse/update.php b/backend/views/warehouse/update.php
index f66f77e..96f31aa 100644
--- a/backend/views/warehouse/update.php
+++ b/backend/views/warehouse/update.php
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $model common\models\Warehouse */
 
 $this->title = Yii::t('common/warehouse', 'Update {modelClass}: ', [
-    'modelClass' => 'Warehouse',
+    'modelClass' => Yii::t("common/warehouse", "Warehouse"),
 ]) . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/warehouse', 'Warehouses'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_warehouse]];
diff --git a/common/messages/hu/common/account.php b/common/messages/hu/common/account.php
new file mode 100644
index 0000000..ada5708
--- /dev/null
+++ b/common/messages/hu/common/account.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Accounts' => 'Kasszák',
+    'Account' => 'Kassza',
+    'Active' => 'Aktív',
+    'Create' => 'Inaktív',
+    'Create Account' => 'Új kassza',
+    'Created At' => 'Létrehozás ideje',
+    'Id Account' => 'Azonosító',
+    'Inactive' => 'Inaktív',
+    'Name' => 'Név',
+    'Only the name is visible' => 'Csak a név látható',
+    'Reset' => '',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Type' => 'Típus',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása: ',
+    'Updated At' => 'Módosítás ideje',
+    'Visible for all' => 'Mindenkinek látható',
+];
diff --git a/common/messages/hu/common/warehouse.php b/common/messages/hu/common/warehouse.php
index e3f71d8..264d8f3 100644
--- a/common/messages/hu/common/warehouse.php
+++ b/common/messages/hu/common/warehouse.php
@@ -31,4 +31,5 @@ return [
     'Update {modelClass}: ' => '{modelClass} módosítása: ',
     'Updated At' => 'Módosítás ideje',
     'Warehouses' => 'Raktárak',
+    'Warehouse' => 'Raktár',
 ];
diff --git a/common/models/Account.php b/common/models/Account.php
new file mode 100644
index 0000000..d4db0bd
--- /dev/null
+++ b/common/models/Account.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "account".
+ *
+ * @property integer $id_account
+ * @property string $name
+ * @property integer $status
+ * @property integer $type
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Account extends \yii\db\ActiveRecord
+{
+	
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+	const TYPE_ALL = 0;
+	const TYPE_VALUE_HIDDEN = 10;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'account';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return [
+    			[	'class' => TimestampBehavior::className(),
+    					'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			]
+    			];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'type'], 'required'],
+        	[['name',  ], 'unique'],
+            [['status', 'type'], 'integer'],
+            [['name'], 'string', 'max' => 64]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_account' => Yii::t('common/account', 'Id Account'),
+            'name' => Yii::t('common/account', 'Name'),
+            'status' => Yii::t('common/account', 'Status'),
+            'type' => Yii::t('common/account', 'Type'),
+            'created_at' => Yii::t('common/account', 'Created At'),
+            'updated_at' => Yii::t('common/account', 'Updated At'),
+        ];
+    }
+    
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t('common/account', 'Active'),
+    			self::STATUS_DELETED => Yii::t('common/account', '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 types() {
+    	return [
+    			self::TYPE_ALL => Yii::t('common/account', 'Visible for all'),
+    			self::TYPE_VALUE_HIDDEN => Yii::t('common/account', 'Only the name is visible'),
+    	];
+    }
+    
+    public function getTypeHuman(){
+    	$result = null;
+    	$s = self::types($this->type);
+    	if ( array_key_exists($this->type, $s)){
+    		$result = $s[$this->status];
+    	}
+    	return $result;
+    }
+}
diff --git a/console/migrations/m150920_191201_add__table__account.php b/console/migrations/m150920_191201_add__table__account.php
new file mode 100644
index 0000000..02c766c
--- /dev/null
+++ b/console/migrations/m150920_191201_add__table__account.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150920_191201_add__table__account extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%account}}', [
+    			'id_account' => $this->primaryKey(),
+    			'name' => $this->string(64)->notNull(),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'type' => $this->integer(11)->notNull(),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+	    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 2e7b52e5a34aae6a6db4f4fe97e11926e9ebb977 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 21 Sep 2015 08:45:41 +0200
Subject: [PATCH 008/100] =?UTF-8?q?add=20discount=20crud=20+=20model=20(ke?=
 =?UTF-8?q?dvezm=C3=A9ny)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/DiscountController.php    | 123 ++++++++++++++++++
 backend/models/DiscountSearch.php             |  71 ++++++++++
 backend/views/discount/_form.php              |  32 +++++
 backend/views/discount/_search.php            |  38 ++++++
 backend/views/discount/create.php             |  21 +++
 backend/views/discount/index.php              |  43 ++++++
 backend/views/discount/update.php             |  23 ++++
 backend/views/discount/view.php               |  43 ++++++
 common/messages/hu/common/discount.php        |  36 +++++
 common/models/Discount.php                    | 106 +++++++++++++++
 .../m150921_044020_add__table__discount.php   |  44 +++++++
 12 files changed, 581 insertions(+)
 create mode 100644 backend/controllers/DiscountController.php
 create mode 100644 backend/models/DiscountSearch.php
 create mode 100644 backend/views/discount/_form.php
 create mode 100644 backend/views/discount/_search.php
 create mode 100644 backend/views/discount/create.php
 create mode 100644 backend/views/discount/index.php
 create mode 100644 backend/views/discount/update.php
 create mode 100644 backend/views/discount/view.php
 create mode 100644 common/messages/hu/common/discount.php
 create mode 100644 common/models/Discount.php
 create mode 100644 console/migrations/m150921_044020_add__table__discount.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 1461ab4..1ff13bb 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -37,6 +37,7 @@ class AdminMenuStructure{
 		
 		$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
 		$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
+		$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
new file mode 100644
index 0000000..ec82815
--- /dev/null
+++ b/backend/controllers/DiscountController.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Discount;
+use backend\models\DiscountSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * DiscountController implements the CRUD actions for Discount model.
+ */
+class DiscountController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Discount models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new DiscountSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Discount model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Discount model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Discount();
+
+        $model->status = Discount::STATUS_ACTIVE;
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Discount model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Discount model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Discount model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Discount the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Discount::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/DiscountSearch.php b/backend/models/DiscountSearch.php
new file mode 100644
index 0000000..8c97f7f
--- /dev/null
+++ b/backend/models/DiscountSearch.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Discount;
+
+/**
+ * DiscountSearch represents the model behind the search form about `common\models\Discount`.
+ */
+class DiscountSearch extends Discount
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_warehouse', 'status', 'type', 'value'], 'integer'],
+            [['name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Discount::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_warehouse' => $this->id_warehouse,
+            'status' => $this->status,
+            'type' => $this->type,
+            'value' => $this->value,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/discount/_form.php b/backend/views/discount/_form.php
new file mode 100644
index 0000000..971db92
--- /dev/null
+++ b/backend/views/discount/_form.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Discount;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Discount */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="discount-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+   <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/discount', "Active") 	]) ?>
+
+	<?= $form->field($model, 'type')->dropDownList(Discount::types())  ?>
+
+
+    <?= $form->field($model, 'value')->textInput() ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/discount', 'Create') : Yii::t('common/discount', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/discount/_search.php b/backend/views/discount/_search.php
new file mode 100644
index 0000000..6a49578
--- /dev/null
+++ b/backend/views/discount/_search.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\DiscountSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="discount-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_warehouse') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'value') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/discount', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/discount/create.php b/backend/views/discount/create.php
new file mode 100644
index 0000000..b8a7e00
--- /dev/null
+++ b/backend/views/discount/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Discount */
+
+$this->title = Yii::t('common/discount', 'Create Discount');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/discount', 'Discounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="discount-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/discount/index.php b/backend/views/discount/index.php
new file mode 100644
index 0000000..a7eba8f
--- /dev/null
+++ b/backend/views/discount/index.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\DiscountSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/discount', 'Discounts');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="discount-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/discount', 'Create Discount'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            'name',
+            [
+        		'attribute' => 'status',		
+        		'value' => 'statusHuman',		
+    		],
+            [
+        		'attribute' => 'type',		
+        		'value' => 'typeHuman',		
+    		],
+            'value',
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/discount/update.php b/backend/views/discount/update.php
new file mode 100644
index 0000000..8fc2572
--- /dev/null
+++ b/backend/views/discount/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Discount */
+
+$this->title = Yii::t('common/discount', 'Update {modelClass}: ', [
+    'modelClass' => 'Discount',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/discount', 'Discounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_warehouse]];
+$this->params['breadcrumbs'][] = Yii::t('common/discount', 'Update');
+?>
+<div class="discount-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/discount/view.php b/backend/views/discount/view.php
new file mode 100644
index 0000000..75091c1
--- /dev/null
+++ b/backend/views/discount/view.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Discount */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/discount', 'Discounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="discount-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_warehouse], ['class' => 'btn btn-primary']) ?>
+        <?= 
+/*        Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_warehouse], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/discount', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ])*/
+        ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_warehouse',
+            'name',
+            'status',
+            'type',
+            'value',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/messages/hu/common/discount.php b/common/messages/hu/common/discount.php
new file mode 100644
index 0000000..9001980
--- /dev/null
+++ b/common/messages/hu/common/discount.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Active' => 'Aktív',
+    'Create' => 'Mentés',
+    'Create Discount' => 'Új kedvezmény',
+    'Created At' => 'Létrehozás ideje',
+    'Discounts' => 'Kedvezmények',
+    'Discount' => 'Kedvezmény',
+    'Id Warehouse' => 'Azonosító',
+    'Inactive' => 'Inaktív',
+    'Name' => 'Név',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Type' => 'Típus',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+    'Updated At' => 'Módosítás ideje',
+    'Value' => 'Kedvezmény mérétke',
+];
diff --git a/common/models/Discount.php b/common/models/Discount.php
new file mode 100644
index 0000000..9e6bb4c
--- /dev/null
+++ b/common/models/Discount.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "discount".
+ *
+ * @property integer $id_warehouse
+ * @property string $name
+ * @property integer $status
+ * @property integer $type
+ * @property integer $value
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Discount extends \yii\db\ActiveRecord
+{
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+	const TYPE_DEFAULT = 0;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'discount';
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return [
+    			[	'class' => TimestampBehavior::className(),
+    					'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			]
+    			];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name','value'], 'required'],
+            [['status', 'type', 'value'], 'integer'],
+            [['name'], 'string', 'max' => 64]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_warehouse' => Yii::t('common/discount', 'Id Warehouse'),
+            'name' => Yii::t('common/discount', 'Name'),
+            'status' => Yii::t('common/discount', 'Status'),
+            'type' => Yii::t('common/discount', 'Type'),
+            'value' => Yii::t('common/discount', 'Value'),
+            'created_at' => Yii::t('common/discount', 'Created At'),
+            'updated_at' => Yii::t('common/discount', 'Updated At'),
+        ];
+    }
+    
+    
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t('common/discount', 'Active'),
+    			self::STATUS_DELETED => Yii::t('common/discount', '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 types() {
+    	return [
+    			self::TYPE_DEFAULT => Yii::t('common/discount', 'Discount'),
+    	];
+    }
+    
+    public function getTypeHuman(){
+    	$result = null;
+    	$s = self::types($this->type);
+    	if ( array_key_exists($this->type, $s)){
+    		$result = $s[$this->status];
+    	}
+    	return $result;
+    }
+    
+}
diff --git a/console/migrations/m150921_044020_add__table__discount.php b/console/migrations/m150921_044020_add__table__discount.php
new file mode 100644
index 0000000..1de2054
--- /dev/null
+++ b/console/migrations/m150921_044020_add__table__discount.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150921_044020_add__table__discount extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%discount}}', [
+    			'id_warehouse' => $this->primaryKey(),
+    			'name' => $this->string(64)->notNull(),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'type' => $this->integer()->notNull()->defaultValue(10),
+    			'value' => $this->integer()->notNull()->defaultValue(10),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150921_044020_add__table__discount cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 889072786248048d0b08350a5b07361de4d482b8 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 21 Sep 2015 09:36:44 +0200
Subject: [PATCH 009/100] small fixes

---
 backend/controllers/DiscountController.php  | 12 ------------
 backend/controllers/WarehouseController.php |  2 +-
 backend/views/discount/index.php            |  6 ++++--
 backend/views/discount/view.php             | 16 ++++++++++++----
 common/models/Account.php                   |  2 +-
 common/models/Discount.php                  |  2 +-
 composer.lock                               |  2 +-
 7 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
index ec82815..91a75b8 100644
--- a/backend/controllers/DiscountController.php
+++ b/backend/controllers/DiscountController.php
@@ -92,18 +92,6 @@ class DiscountController extends Controller
         }
     }
 
-    /**
-     * Deletes an existing Discount model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
 
     /**
      * Finds the Discount model based on its primary key value.
diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php
index f4097d4..325c8fc 100644
--- a/backend/controllers/WarehouseController.php
+++ b/backend/controllers/WarehouseController.php
@@ -62,7 +62,7 @@ class WarehouseController extends Controller
     public function actionCreate()
     {
         $model = new Warehouse();
-
+		$model->status = Warehouse::STATUS_ACTIVE;
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_warehouse]);
         } else {
diff --git a/backend/views/discount/index.php b/backend/views/discount/index.php
index a7eba8f..ea37fc9 100644
--- a/backend/views/discount/index.php
+++ b/backend/views/discount/index.php
@@ -21,7 +21,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
             'name',
             [
@@ -36,7 +35,10 @@ $this->params['breadcrumbs'][] = $this->title;
             'created_at:datetime',
             'updated_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            [
+				'class' => 'yii\grid\ActionColumn',
+				'template' => '{view} {update}'
+			],
         ],
     ]); ?>
 
diff --git a/backend/views/discount/view.php b/backend/views/discount/view.php
index 75091c1..1365857 100644
--- a/backend/views/discount/view.php
+++ b/backend/views/discount/view.php
@@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <p>
         <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_warehouse], ['class' => 'btn btn-primary']) ?>
-        <?= 
+        <?php 
 /*        Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_warehouse], [
             'class' => 'btn btn-danger',
             'data' => [
@@ -30,10 +30,18 @@ $this->params['breadcrumbs'][] = $this->title;
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id_warehouse',
             'name',
-            'status',
-            'type',
+			[
+			'attribute' => 'status',
+			'label' => Yii::t('common/discount', "Active"),
+			'value' => $model->statusHuman
+			],
+			[
+			'attribute' => 'type',
+			'value' => $model->typeHuman
+			],
+//             'status',
+//             'type',
             'value',
             'created_at',
             'updated_at',
diff --git a/common/models/Account.php b/common/models/Account.php
index d4db0bd..291465e 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -99,7 +99,7 @@ class Account extends \yii\db\ActiveRecord
     	$result = null;
     	$s = self::types($this->type);
     	if ( array_key_exists($this->type, $s)){
-    		$result = $s[$this->status];
+    		$result = $s[$this->type];
     	}
     	return $result;
     }
diff --git a/common/models/Discount.php b/common/models/Discount.php
index 9e6bb4c..6d2350d 100644
--- a/common/models/Discount.php
+++ b/common/models/Discount.php
@@ -98,7 +98,7 @@ class Discount extends \yii\db\ActiveRecord
     	$result = null;
     	$s = self::types($this->type);
     	if ( array_key_exists($this->type, $s)){
-    		$result = $s[$this->status];
+    		$result = $s[$this->type];
     	}
     	return $result;
     }
diff --git a/composer.lock b/composer.lock
index 6a29fb3..e7e2ee1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8580bd82955b1fbb80d47024e184056e",
+    "hash": "5fe15fcdcc6c43b39968ffd29104ac62",
     "packages": [
         {
             "name": "bower-asset/bootstrap",

From 6b81ced4bafb258afcf33b72d85d1ef02231c05c Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 21 Sep 2015 10:35:15 +0200
Subject: [PATCH 010/100] =?UTF-8?q?add=20product=20category=20crud=20+=20m?=
 =?UTF-8?q?odel=20(=20term=C3=A9k=20kateg=C3=B3ria=20)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/components/AdminMenuStructure.php     |   1 +
 .../controllers/ProductCategoryController.php | 109 ++++++++++++++++++
 backend/models/ProductCategorySearch.php      |  69 +++++++++++
 backend/views/product-category/_form.php      |  26 +++++
 backend/views/product-category/_search.php    |  34 ++++++
 backend/views/product-category/create.php     |  21 ++++
 backend/views/product-category/index.php      |  39 +++++++
 backend/views/product-category/update.php     |  23 ++++
 backend/views/product-category/view.php       |  44 +++++++
 .../messages/hu/common/product_category.php   |  36 ++++++
 common/models/BaseFitnessActiveRecord.php     |  21 ++++
 common/models/ProductCategory.php             |  72 ++++++++++++
 ...21_080440_add__table__product_category.php |  42 +++++++
 13 files changed, 537 insertions(+)
 create mode 100644 backend/controllers/ProductCategoryController.php
 create mode 100644 backend/models/ProductCategorySearch.php
 create mode 100644 backend/views/product-category/_form.php
 create mode 100644 backend/views/product-category/_search.php
 create mode 100644 backend/views/product-category/create.php
 create mode 100644 backend/views/product-category/index.php
 create mode 100644 backend/views/product-category/update.php
 create mode 100644 backend/views/product-category/view.php
 create mode 100644 common/messages/hu/common/product_category.php
 create mode 100644 common/models/BaseFitnessActiveRecord.php
 create mode 100644 common/models/ProductCategory.php
 create mode 100644 console/migrations/m150921_080440_add__table__product_category.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 1ff13bb..baac8d3 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -38,6 +38,7 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
 		$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
 		$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
+		$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/ProductCategoryController.php b/backend/controllers/ProductCategoryController.php
new file mode 100644
index 0000000..5bf3544
--- /dev/null
+++ b/backend/controllers/ProductCategoryController.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\ProductCategory;
+use backend\models\ProductCategorySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * ProductCategoryController implements the CRUD actions for ProductCategory model.
+ */
+class ProductCategoryController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all ProductCategory models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProductCategorySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single ProductCategory model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new ProductCategory model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new ProductCategory();
+		$model->status = ProductCategory::STATUS_ACTIVE;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product_category]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing ProductCategory model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product_category]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+
+    /**
+     * Finds the ProductCategory model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return ProductCategory the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = ProductCategory::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/ProductCategorySearch.php b/backend/models/ProductCategorySearch.php
new file mode 100644
index 0000000..ff747f3
--- /dev/null
+++ b/backend/models/ProductCategorySearch.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\ProductCategory;
+
+/**
+ * ProductCategorySearch represents the model behind the search form about `common\models\ProductCategory`.
+ */
+class ProductCategorySearch extends ProductCategory
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_product_category', 'status'], 'integer'],
+            [['name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = ProductCategory::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_product_category' => $this->id_product_category,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/product-category/_form.php b/backend/views/product-category/_form.php
new file mode 100644
index 0000000..ca9f350
--- /dev/null
+++ b/backend/views/product-category/_form.php
@@ -0,0 +1,26 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\ProductCategory */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-category-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/product_category', "Active") 	]) ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/product_category', 'Create') : Yii::t('common/product_category', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/product-category/_search.php b/backend/views/product-category/_search.php
new file mode 100644
index 0000000..8878ddc
--- /dev/null
+++ b/backend/views/product-category/_search.php
@@ -0,0 +1,34 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ProductCategorySearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-category-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_product_category') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?= $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/product_category', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/product-category/create.php b/backend/views/product-category/create.php
new file mode 100644
index 0000000..19898e4
--- /dev/null
+++ b/backend/views/product-category/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\ProductCategory */
+
+$this->title = Yii::t('common/product_category', 'Create Product Category');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product_category', 'Product Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-category-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/product-category/index.php b/backend/views/product-category/index.php
new file mode 100644
index 0000000..600c78b
--- /dev/null
+++ b/backend/views/product-category/index.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\ProductCategorySearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/product_category', 'Product Categories');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-category-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/product_category', 'Create Product Category'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'name',
+            [
+				'attribute' => 'status',
+				'value' => 'statusHuman',
+			],
+            'created_at:datetime',
+            'updated_at:datetime',
+            [
+				'class' => 'yii\grid\ActionColumn',
+				'template' => '{view} {update}'
+			],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/product-category/update.php b/backend/views/product-category/update.php
new file mode 100644
index 0000000..74d3635
--- /dev/null
+++ b/backend/views/product-category/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\ProductCategory */
+
+$this->title = Yii::t('common/product_category', 'Update {modelClass}: ', [
+    'modelClass' =>Yii::t('common/product_category',  'Product Category'),
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product_category', 'Product Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_product_category]];
+$this->params['breadcrumbs'][] = Yii::t('common/product_category', 'Update');
+?>
+<div class="product-category-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/product-category/view.php b/backend/views/product-category/view.php
new file mode 100644
index 0000000..741d37e
--- /dev/null
+++ b/backend/views/product-category/view.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\ProductCategory */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product_category', 'Product Categories'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-category-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/product_category', 'Update'), ['update', 'id' => $model->id_product_category], ['class' => 'btn btn-primary']) ?>
+        <?php
+        	/*
+        	 * 
+        	 echo Html::a(Yii::t('common/product_category', 'Delete'), ['delete', 'id' => $model->id_product_category], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/product_category', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) 
+        */
+			?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_product_category',
+            'name',
+            'status',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/messages/hu/common/product_category.php b/common/messages/hu/common/product_category.php
new file mode 100644
index 0000000..e804f72
--- /dev/null
+++ b/common/messages/hu/common/product_category.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+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',
+    'Product Categories' => 'Termék kategóriák',
+    'Product Category' => 'Termék kategória',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/models/BaseFitnessActiveRecord.php b/common/models/BaseFitnessActiveRecord.php
new file mode 100644
index 0000000..8482072
--- /dev/null
+++ b/common/models/BaseFitnessActiveRecord.php
@@ -0,0 +1,21 @@
+<?php
+namespace common\models;
+
+use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
+
+class BaseFitnessActiveRecord extends \yii\db\ActiveRecord{
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function behaviors()
+	{
+		return ArrayHelper::merge(  [
+		[	
+			'class' => TimestampBehavior::className(),
+			'value' => function(){ return date('Y-m-d H:i:s' ); }
+		]
+		], parent::behaviors());
+	}
+}
\ No newline at end of file
diff --git a/common/models/ProductCategory.php b/common/models/ProductCategory.php
new file mode 100644
index 0000000..70b255a
--- /dev/null
+++ b/common/models/ProductCategory.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "product_category".
+ *
+ * @property integer $id_product_category
+ * @property string $name
+ * @property integer $status
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class ProductCategory extends \common\models\BaseFitnessActiveRecord
+{
+	
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'product_category';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['status'], 'integer'],
+            [['name'], 'string', 'max' => 64]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_product_category' => Yii::t('common/product_category', 'Id Product Category'),
+            'name' => Yii::t('common/product_category', 'Name'),
+            'status' => Yii::t('common/product_category', 'Status'),
+            'created_at' => Yii::t('common/product_category', 'Created At'),
+            'updated_at' => Yii::t('common/product_category', 'Updated At'),
+        ];
+    }
+    
+    static function statuses() {
+    	return [
+    	self::STATUS_ACTIVE => Yii::t('common/product_category', 'Active'),
+    	self::STATUS_DELETED => Yii::t('common/product_category', 'Inactive'),
+    	];
+    }
+    
+    public function getStatusHuman(){
+    	$result = null;
+    	$s = self::statuses($this->status);
+    	if ( array_key_exists($this->status, $s)){
+    		$result = $s[$this->status];
+    	}
+    	return $result;
+    }
+    
+}
diff --git a/console/migrations/m150921_080440_add__table__product_category.php b/console/migrations/m150921_080440_add__table__product_category.php
new file mode 100644
index 0000000..4628bd6
--- /dev/null
+++ b/console/migrations/m150921_080440_add__table__product_category.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150921_080440_add__table__product_category extends Migration
+{
+    public function up()
+    {
+    		$tableOptions = null;
+    		if ($this->db->driverName === 'mysql') {
+    			// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    			$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    		}
+    		 
+    		$this->createTable('{{%product_category}}', [
+    				'id_product_category' => $this->primaryKey(),
+    				'name' => $this->string(64)->notNull(),
+    				'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    				'created_at' => $this->timestamp()->notNull(),
+    				'updated_at' =>  $this->timestamp()->notNull(),
+    				], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150921_080440_add__table__product_category cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From ab885b13e9ee681b9fdbf17b71f406e2bd3ef5d6 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 22 Sep 2015 09:19:46 +0200
Subject: [PATCH 011/100] add changes to ticket_type

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/TicketTypeController.php  | 119 ++++++++++++++++
 backend/models/TicketTypeSearch.php           |  76 ++++++++++
 backend/views/ticket-type/_form.php           |  68 +++++++++
 backend/views/ticket-type/_search.php         |  49 +++++++
 backend/views/ticket-type/create.php          |  22 +++
 backend/views/ticket-type/index.php           |  44 ++++++
 backend/views/ticket-type/update.php          |  23 +++
 backend/views/ticket-type/view.php            |  64 +++++++++
 common/models/Account.php                     |   2 +-
 common/models/TicketType.php                  | 132 ++++++++++++++++++
 ...m150921_162327_add__table__ticket_type.php |  49 +++++++
 12 files changed, 648 insertions(+), 1 deletion(-)
 create mode 100644 backend/controllers/TicketTypeController.php
 create mode 100644 backend/models/TicketTypeSearch.php
 create mode 100644 backend/views/ticket-type/_form.php
 create mode 100644 backend/views/ticket-type/_search.php
 create mode 100644 backend/views/ticket-type/create.php
 create mode 100644 backend/views/ticket-type/index.php
 create mode 100644 backend/views/ticket-type/update.php
 create mode 100644 backend/views/ticket-type/view.php
 create mode 100644 common/models/TicketType.php
 create mode 100644 console/migrations/m150921_162327_add__table__ticket_type.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index baac8d3..ae957ec 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -39,6 +39,7 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
 		$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 		$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
+		$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/TicketTypeController.php b/backend/controllers/TicketTypeController.php
new file mode 100644
index 0000000..4f98888
--- /dev/null
+++ b/backend/controllers/TicketTypeController.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\TicketType;
+use backend\models\TicketTypeSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\Account;
+
+/**
+ * TicketTypeController implements the CRUD actions for TicketType model.
+ */
+class TicketTypeController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all TicketType models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TicketTypeSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single TicketType model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new TicketType model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new TicketType();
+
+        $model->type = TicketType::TYPE_DEFAULT;
+        $model->status = TicketType::STATUS_ACTIVE;
+        $model->time_unit_type = TicketType::TIME_UNIT_MONTH;
+        $model->time_unit_count = 1;
+        $model->max_usage_count = 0;
+        $accounts = Account::find()->andWhere(['status' => Account::STATUS_ACTIVE])->all();
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket_type]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            	'accounts' => $accounts
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing TicketType model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+        $accounts = Account::find()->andWhere( ['or', ['status' => Account::STATUS_ACTIVE], ['id_account' => $model->id_account] ])->all();
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket_type]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            	'accounts' => $accounts
+            ]);
+        }
+    }
+
+
+    /**
+     * Finds the TicketType model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return TicketType the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = TicketType::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/TicketTypeSearch.php b/backend/models/TicketTypeSearch.php
new file mode 100644
index 0000000..5749c34
--- /dev/null
+++ b/backend/models/TicketTypeSearch.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\TicketType;
+
+/**
+ * TicketTypeSearch represents the model behind the search form about `common\models\TicketType`.
+ */
+class TicketTypeSearch extends TicketType
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_ticket_type', 'type', 'max_usage_count', 'time_unit_type', 'time_unit_count', 'price_brutto', 'id_account', 'flag_student', 'status'], 'integer'],
+            [['name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = TicketType::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_ticket_type' => $this->id_ticket_type,
+            'type' => $this->type,
+            'max_usage_count' => $this->max_usage_count,
+            'time_unit_type' => $this->time_unit_type,
+            'time_unit_count' => $this->time_unit_count,
+            'price_brutto' => $this->price_brutto,
+            'id_account' => $this->id_account,
+            'flag_student' => $this->flag_student,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/ticket-type/_form.php b/backend/views/ticket-type/_form.php
new file mode 100644
index 0000000..330979d
--- /dev/null
+++ b/backend/views/ticket-type/_form.php
@@ -0,0 +1,68 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\TicketType;
+use yii\helpers\ArrayHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\TicketType */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+	function mkTitle($name){
+		$s = "";
+		$tag = "h4";
+		$s .= "<hr>";
+		$s .= Html::beginTag($tag);
+		$s .= $name;
+		$s .= Html::endTag($tag);
+		$s .= "<hr>";
+		return $s;
+	}
+	$account_options = ArrayHelper::map($accounts, 'id_account', 'name');
+?>
+<div class="ticket-type-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+	
+	<?= mkTitle("Általános")?>
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'type')->dropDownList(TicketType::ticketTypes() )  ?>
+
+	<?= mkTitle("Alkalmak")?>
+    <?= $form->field($model, 'max_usage_count')->textInput() ?>
+
+	<?= mkTitle("Érvényességi idő belállítások")?>
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'time_unit_count')->textInput() ?>
+		</div>
+		<div class="col-md-4">
+			<?= $form->field($model, 'time_unit_type')->dropDownList(TicketType::timeUnitTypes())  ?>
+		</div>
+	</div>
+
+
+	<?= mkTitle("Ár és kassza")?>
+    <?= $form->field($model, 'price_brutto')->textInput() ?>
+
+
+	<?= $form->field($model, 'id_account')->dropDownList($account_options)  ?>
+
+	<?= mkTitle("További beállítások")?>
+	
+    <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/ticket_type', "Active") 	])  ?>
+
+    <?= $form->field($model, 'flag_student')->checkbox( ['value' => 1, 'label' =>    Yii::t('common/ticket_type', "Student") 	])  ?>
+
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket_type', 'Create') : Yii::t('common/ticket_type', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/ticket-type/_search.php b/backend/views/ticket-type/_search.php
new file mode 100644
index 0000000..e1b5e0b
--- /dev/null
+++ b/backend/views/ticket-type/_search.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\TicketTypeSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-type-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_ticket_type') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'max_usage_count') ?>
+
+    <?= $form->field($model, 'time_unit_type') ?>
+
+    <?php // echo $form->field($model, 'time_unit_count') ?>
+
+    <?php // echo $form->field($model, 'price_brutto') ?>
+
+    <?php // echo $form->field($model, 'id_account') ?>
+
+    <?php // echo $form->field($model, 'flag_student') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/ticket_type', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/ticket_type', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/ticket-type/create.php b/backend/views/ticket-type/create.php
new file mode 100644
index 0000000..3b1eaa2
--- /dev/null
+++ b/backend/views/ticket-type/create.php
@@ -0,0 +1,22 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\TicketType */
+
+$this->title = Yii::t('common/ticket_type', 'Create Ticket Type');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Ticket Types'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-type-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'accounts' => $accounts,
+    ]) ?>
+
+</div>
diff --git a/backend/views/ticket-type/index.php b/backend/views/ticket-type/index.php
new file mode 100644
index 0000000..2b16b80
--- /dev/null
+++ b/backend/views/ticket-type/index.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\TicketTypeSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/ticket_type', 'Ticket Types');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-type-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket_type', 'Create Ticket Type'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'name',
+            'max_usage_count',
+            'price_brutto',
+            'time_unit_type',
+            'time_unit_count',
+            'id_account',
+            'flag_student',
+            'status',
+            'created_at',
+            'updated_at',
+
+            [
+            	'class' => 'yii\grid\ActionColumn',
+            	'template' =>'{view} {edit}'
+            		
+    		],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/ticket-type/update.php b/backend/views/ticket-type/update.php
new file mode 100644
index 0000000..77355d4
--- /dev/null
+++ b/backend/views/ticket-type/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\TicketType */
+
+$this->title = Yii::t('common/ticket_type', 'Update {modelClass}: ', [
+    'modelClass' => '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');
+?>
+<div class="ticket-type-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/ticket-type/view.php b/backend/views/ticket-type/view.php
new file mode 100644
index 0000000..2443313
--- /dev/null
+++ b/backend/views/ticket-type/view.php
@@ -0,0 +1,64 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\TicketType */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Ticket Types'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-type-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket_type', 'Update'), ['update', 'id' => $model->id_ticket_type], ['class' => 'btn btn-primary']) ?>
+        <?php
+	/*        	
+        	echo Html::a(Yii::t('common/ticket_type', 'Delete'), ['delete', 'id' => $model->id_ticket_type], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/ticket_type', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) 
+      */  	
+        	?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'name',
+            [
+        		'attribute' => 'type',
+        		'value' => $model->typeHuman
+        	],
+            'max_usage_count',
+        	[
+        		'attribute' => 'time_unit_count',
+        	],
+        	[
+        		'attribute' => 'time_unit_type',
+        		'value' => $model->timeUnitHuman
+        	],
+            'price_brutto',
+        		[
+        		'attribute' => 'id_account',
+        		'value' => $model->account->name,
+        		'label' => Yii::t('common/ticket_type','Account')
+        		],
+            'flag_student',
+            [
+        		'attribute' => 'status',
+        		'value' => $model->statusHuman
+        		],
+            'created_at:datetime',
+            'updated_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Account.php b/common/models/Account.php
index 291465e..9cc1092 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -72,7 +72,7 @@ class Account extends \yii\db\ActiveRecord
         ];
     }
     
-    static function statuses() {
+   static function statuses() {
     	return [
     			self::STATUS_ACTIVE => Yii::t('common/account', 'Active'),
     			self::STATUS_DELETED => Yii::t('common/account', 'Inactive'),
diff --git a/common/models/TicketType.php b/common/models/TicketType.php
new file mode 100644
index 0000000..4d8a45c
--- /dev/null
+++ b/common/models/TicketType.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "ticket_type".
+ *
+ * @property integer $id_ticket_type
+ * @property string $name
+ * @property integer $type
+ * @property integer $max_usage_count
+ * @property integer $time_unit_type
+ * @property integer $time_unit_count
+ * @property integer $price_brutto
+ * @property integer $id_account
+ * @property integer $flag_student
+ * @property integer $status
+ * @property string $created_at
+ * @property string $updated_at
+ */
+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 TYPE_NORMAL = 10;
+	const TYPE_DEFAULT = self::TYPE_NORMAL;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'ticket_type';
+    }
+
+    /**
+     * @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]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_ticket_type' => Yii::t('common/ticket_type', 'Id Ticket Type'),
+            'name' => Yii::t('common/ticket_type', 'Name'),
+            'type' => Yii::t('common/ticket_type', 'Type'),
+            'max_usage_count' => Yii::t('common/ticket_type', 'Max Usage Count'),
+            'time_unit_type' => Yii::t('common/ticket_type', 'Time Unit Type'),
+            'time_unit_count' => Yii::t('common/ticket_type', 'Time Unit Count'),
+            'price_brutto' => Yii::t('common/ticket_type', 'Price Brutto'),
+            'id_account' => Yii::t('common/ticket_type', 'Id Account'),
+            'flag_student' => Yii::t('common/ticket_type', 'Flag Student'),
+            'status' => Yii::t('common/ticket_type', 'Status'),
+            'created_at' => Yii::t('common/ticket_type', 'Created At'),
+            'updated_at' => Yii::t('common/ticket_type', 'Updated At'),
+        ];
+    }
+    
+    
+    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' ]);
+    }
+    
+}
diff --git a/console/migrations/m150921_162327_add__table__ticket_type.php b/console/migrations/m150921_162327_add__table__ticket_type.php
new file mode 100644
index 0000000..eea0236
--- /dev/null
+++ b/console/migrations/m150921_162327_add__table__ticket_type.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150921_162327_add__table__ticket_type extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%ticket_type}}', [
+    			'id_ticket_type' => $this->primaryKey(),
+    			'name' => $this->string(64)->notNull(),
+    			'type' => $this->integer(),
+    			'max_usage_count' => $this->integer(),
+    			'time_unit_type' => $this->integer(),
+    			'time_unit_count' => $this->integer(),
+    			'price_brutto' => $this->integer(),
+    			'id_account' => $this->integer()->notNull(),
+    			'flag_student' => $this->smallInteger()->notNull()->defaultValue(0),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions );
+    }
+
+    public function down()
+    {
+        echo "m150921_162327_add__table__ticket_type cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From db8fca563083eade16b9bc3b52e7ef78ca199a56 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 22 Sep 2015 11:59:58 +0200
Subject: [PATCH 012/100] =?UTF-8?q?add=20ticket=20type=20model=20+=20crud?=
 =?UTF-8?q?=20(=20b=C3=A9rlet=20t=C3=ADpus)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/views/ticket-type/index.php           |  32 ++-
 backend/views/ticket-type/update.php          |   7 +-
 backend/views/ticket-type/view.php            |   8 +-
 common/messages/hu/app.php                    |  28 +--
 common/messages/hu/common.php                 |   3 +-
 .../messages/hu/common/product_category.php   |   2 -
 common/messages/hu/common/ticket_type.php     |  48 ++++
 common/models/Account.php                     |   5 +
 common/models/TicketType.php                  | 215 ++++++++++++------
 9 files changed, 242 insertions(+), 106 deletions(-)
 create mode 100644 common/messages/hu/common/ticket_type.php

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');
 
     <?= $this->render('_form', [
         'model' => $model,
+        'accounts' => $accounts,
+    		
     ]) ?>
 
 </div>
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 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Update ticket type:' => '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)!'));
+						 }
+					}
+				}
+			}
+		}
+	}
+	
 }

From 1eae1b3000d2c2cf132afcca9c82bd69d1b09d66 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 22 Sep 2015 17:04:43 +0200
Subject: [PATCH 013/100] add migrateion add_table_product

---
 .../m150922_133505_add__table__product.php    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 console/migrations/m150922_133505_add__table__product.php

diff --git a/console/migrations/m150922_133505_add__table__product.php b/console/migrations/m150922_133505_add__table__product.php
new file mode 100644
index 0000000..4e5bb00
--- /dev/null
+++ b/console/migrations/m150922_133505_add__table__product.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150922_133505_add__table__product extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%product}}', [
+    			'id_product' => $this->primaryKey(),
+    			'id_product_type' => $this->integer()->notNull(),
+    			'id_account' => $this->integer()->notNull(),
+    			'product_number' => $this->string(20),
+    			'barcode' => $this->string(20),
+    			'purchase_price' => $this->integer(),
+    			'sale_price' => $this->integer(),
+    			'profit_margins' => $this->integer(),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'description' => $this->string(255),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    			], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150922_133505_add__table__product cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From fcc18d79f65400ee004d80df1374c287dc6e6621 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 24 Sep 2015 10:06:10 +0200
Subject: [PATCH 014/100] add changes feature/33

---
 Gruntfile.coffee                          |  62 +++++++++++
 backend/components/AdminMenuStructure.php |   1 +
 backend/controllers/ProductController.php | 125 ++++++++++++++++++++++
 backend/models/ProductSearch.php          |  76 +++++++++++++
 backend/views/product/_form.php           |  42 ++++++++
 backend/views/product/_search.php         |  49 +++++++++
 backend/views/product/create.php          |  23 ++++
 backend/views/product/index.php           |  47 ++++++++
 backend/views/product/update.php          |  23 ++++
 backend/views/product/view.php            |  46 ++++++++
 common/models/Account.php                 |  17 +++
 common/models/Product.php                 | 107 ++++++++++++++++++
 common/models/TicketType.php              |   2 +-
 composer.json                             |   3 +-
 14 files changed, 621 insertions(+), 2 deletions(-)
 create mode 100644 Gruntfile.coffee
 create mode 100644 backend/controllers/ProductController.php
 create mode 100644 backend/models/ProductSearch.php
 create mode 100644 backend/views/product/_form.php
 create mode 100644 backend/views/product/_search.php
 create mode 100644 backend/views/product/create.php
 create mode 100644 backend/views/product/index.php
 create mode 100644 backend/views/product/update.php
 create mode 100644 backend/views/product/view.php
 create mode 100644 common/models/Product.php

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
new file mode 100644
index 0000000..c663c91
--- /dev/null
+++ b/Gruntfile.coffee
@@ -0,0 +1,62 @@
+module.exports = (grunt) ->
+
+	# Project configuration.
+	grunt.initConfig
+		pkg: grunt.file.readJSON('package.json')
+
+		config:
+			src: 'assets/coffee'
+			dest: 'assets/js'
+
+		clean:
+			build:
+				src: [  'frontend/web/stylesheet','backend/web/stylesheet' ]
+	
+		compass:
+			frontend:
+				options:
+					sassDir: 'frontend/web/scss'
+					cssDir: 'frontend/web/stylesheet'
+			backend:
+				options:
+					sassDir: 'backend/web/scss'
+					cssDir: 'backend/web/stylesheet'
+					
+		coffee:
+			frontend:
+				options:
+					sourceMap: true
+					bare: false
+					join: true
+				files:
+					'frontend/web/js/frontend.js': ['frontend/web/coffee/**/*.coffee']	
+			backend:
+				options:
+					sourceMap: true
+					bare: false
+					join: true
+				files:
+					'backend/web/js/backend.js': ['backend/web/coffee/**/*.coffee']
+					
+		watch:
+			options:
+				spawn: false
+				interrupt: true
+				atBegin: true
+				interval: 500
+			coffeewatch:
+        		files: ['frontend/web/coffee/**/*.coffee','backend/web/coffee/**/*.coffee']
+        		tasks: ['any-newer:coffee']
+			sasswatch:
+				files: ['frontend/web/scss/*.scss','backend/web/scss/*.scss']
+				tasks: ['compass']	
+				
+					
+	#grunt.loadNpmTasks 'grunt-contrib-compass'
+
+	require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks
+	
+	# Tasks
+	#grunt.registerTask 'default', ['concurrent:compile']
+	grunt.registerTask 'default', ['compass','coffee']
+	#grunt.registerTask 'production', ['clean', 'concurrent:compile', 'concurrent:optimize']
\ No newline at end of file
diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index ae957ec..153b0ff 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -40,6 +40,7 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 		$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 		$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
+		$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php
new file mode 100644
index 0000000..3ce635f
--- /dev/null
+++ b/backend/controllers/ProductController.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Product;
+use backend\models\ProductSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\Account;
+
+/**
+ * ProductController implements the CRUD actions for Product model.
+ */
+class ProductController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Product models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProductSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Product model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Product model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Product();
+		$accounts = Account::readAccounts(null);
+        
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+                'accounts' => $accounts,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Product model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Product model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Product model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Product the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Product::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/ProductSearch.php b/backend/models/ProductSearch.php
new file mode 100644
index 0000000..a528662
--- /dev/null
+++ b/backend/models/ProductSearch.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Product;
+
+/**
+ * ProductSearch represents the model behind the search form about `common\models\Product`.
+ */
+class ProductSearch extends Product
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_product', 'id_product_type', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
+            [['product_number', 'barcode', 'description', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Product::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_product' => $this->id_product,
+            'id_product_type' => $this->id_product_type,
+            'id_account' => $this->id_account,
+            'purchase_price' => $this->purchase_price,
+            'sale_price' => $this->sale_price,
+            'profit_margins' => $this->profit_margins,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'product_number', $this->product_number])
+            ->andFilterWhere(['like', 'barcode', $this->barcode])
+            ->andFilterWhere(['like', 'description', $this->description]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/product/_form.php b/backend/views/product/_form.php
new file mode 100644
index 0000000..941c04d
--- /dev/null
+++ b/backend/views/product/_form.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+/* @var $accounts common\models\Account[] */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+$account_options = ArrayHelper::map($accounts, 'id_account', 'name');
+?>
+<div class="product-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+    <?= $form->field($model, 'id_account')->dropDownList($account_options)  ?>
+
+    <?= $form->field($model, 'product_number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'barcode')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'purchase_price')->input('number') ?>
+
+    <?= $form->field($model, 'sale_price')->input('number')?>
+
+    <?= $form->field($model, 'profit_margins')->textInput() ?>
+
+    <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/product', "Active") 	])  ?>
+
+    <?= $form->field($model, 'description')->textarea(['maxlength' => true])->hint( Yii::t( 'common/prodcut', "Max 255 character")) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket_type', 'Create') : Yii::t('common/ticket_type', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/product/_search.php b/backend/views/product/_search.php
new file mode 100644
index 0000000..aba1bcc
--- /dev/null
+++ b/backend/views/product/_search.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ProductSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_product') ?>
+
+    <?= $form->field($model, 'id_product_type') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'product_number') ?>
+
+    <?= $form->field($model, 'barcode') ?>
+
+    <?php // echo $form->field($model, 'purchase_price') ?>
+
+    <?php // echo $form->field($model, 'sale_price') ?>
+
+    <?php // echo $form->field($model, 'profit_margins') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'description') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/ticket_type', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/ticket_type', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/product/create.php b/backend/views/product/create.php
new file mode 100644
index 0000000..c9d4e28
--- /dev/null
+++ b/backend/views/product/create.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+/* @var $accounts common\models\Account[] */
+
+$this->title = Yii::t('common/ticket_type', 'Create Product');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'accounts' => $accounts,
+    ]) ?>
+
+</div>
diff --git a/backend/views/product/index.php b/backend/views/product/index.php
new file mode 100644
index 0000000..41ee9c3
--- /dev/null
+++ b/backend/views/product/index.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\ProductSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/ticket_type', 'Products');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket_type', 'Create Product'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+              [
+    			'attribute' =>	'id_product_type',
+    			'value' =>	'productCategoryName',
+			],
+             [
+    			'attribute' =>	'id_account',
+    			'value' =>	'accountName',
+			],
+            'product_number',
+            'barcode',
+            'purchase_price',
+            'sale_price',
+            'profit_margins',
+            'status',
+            'description',
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/product/update.php b/backend/views/product/update.php
new file mode 100644
index 0000000..2b6f0a3
--- /dev/null
+++ b/backend/views/product/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+
+$this->title = Yii::t('common/ticket_type', 'Update {modelClass}: ', [
+    'modelClass' => 'Product',
+]) . ' ' . $model->id_product;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_product, 'url' => ['view', 'id' => $model->id_product]];
+$this->params['breadcrumbs'][] = Yii::t('common/ticket_type', 'Update');
+?>
+<div class="product-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/product/view.php b/backend/views/product/view.php
new file mode 100644
index 0000000..214365d
--- /dev/null
+++ b/backend/views/product/view.php
@@ -0,0 +1,46 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+
+$this->title = $model->id_product;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket_type', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/ticket_type', 'Delete'), ['delete', 'id' => $model->id_product], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/ticket_type', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_product',
+            'id_product_type',
+            'id_account',
+            'product_number',
+            'barcode',
+            'purchase_price',
+            'sale_price',
+            'profit_margins',
+            'status',
+            'description',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Account.php b/common/models/Account.php
index 125a73c..b50733f 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -108,4 +108,21 @@ class Account extends \yii\db\ActiveRecord
     	return $this->status == self::STATUS_DELETED;
     }
     
+    /**
+     * $param int $forceIncludeAccount id account, that should be included in list, even if it is inactive
+     * */
+    public static  function readAccounts($forceIncludeAccount = null){
+    	$accounts = null;
+    	
+    	if ( $forceIncludeAccount  == null){
+    		$accounts = Account::find()->andWhere(['status' => Account::STATUS_ACTIVE])->all();
+    	}else{
+	    	$accounts = Account::find()->andWhere( ['or', ['status' => Account::STATUS_ACTIVE], ['id_account' =>  $forceIncludeAccount ] ])->all();
+    	}
+    	
+    	return $accounts;
+    }
+    
+    
+    
 }
diff --git a/common/models/Product.php b/common/models/Product.php
new file mode 100644
index 0000000..41600ab
--- /dev/null
+++ b/common/models/Product.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "product".
+ *
+ * @property integer $id_product
+ * @property integer $id_product_type
+ * @property integer $id_account
+ * @property string $product_number
+ * @property string $barcode
+ * @property integer $purchase_price
+ * @property integer $sale_price
+ * @property integer $profit_margins
+ * @property integer $status
+ * @property string $description
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Product extends \common\models\BaseFitnessActiveRecord {
+
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'product';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_product_type', 'id_account'], 'required'],
+            [['id_product_type', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
+            [['product_number', 'barcode'], 'string', 'max' => 20],
+            [['description'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_product' => Yii::t('common/product', 'Id Product'),
+            'id_product_type' => Yii::t('common/product', 'Id Product Type'),
+            'id_account' => Yii::t('common/product', 'Id Account'),
+            'product_number' => Yii::t('common/product', 'Product Number'),
+            'barcode' => Yii::t('common/product', 'Barcode'),
+            'purchase_price' => Yii::t('common/product', 'Purchase Price'),
+            'sale_price' => Yii::t('common/product', 'Sale Price'),
+            'profit_margins' => Yii::t('common/product', 'Profit Margins'),
+            'status' => Yii::t('common/product', 'Status'),
+            'description' => Yii::t('common/product', 'Description'),
+            'created_at' => Yii::t('common/product', 'Created At'),
+            'updated_at' => Yii::t('common/product', 'Updated At'),
+        ];
+    }
+    
+    
+    public function getAccount() {
+    	return $this->hasOne ( Account::className (), [
+    			'id_account' => 'id_account'
+    	] );
+    }
+    public function getAccountName() {
+    	return $this->account->name;
+    }
+    
+    public function getProductCategory() {
+    	return $this->hasOne ( ProductCategory::className (), [
+    			'id_product_category' => 'id_product_category'
+    	] );
+    }
+    public function getProductCategoryName() {
+    	return $this->productCategory->name;
+    }
+    
+    /**
+     * @formatter:on
+     */
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t ( 'common/product', 'Active' ),
+    			self::STATUS_DELETED => Yii::t ( 'common/product', 'Inactive' )
+    	];
+    }
+    public function getStatusHuman() {
+    	$result = null;
+    	$s = self::statuses (  );
+    	if (array_key_exists ( $this->status, $s )) {
+    		$result = $s [$this->status];
+    	}
+    	return $result;
+    }
+    
+}
diff --git a/common/models/TicketType.php b/common/models/TicketType.php
index 11a86d4..ed620c9 100644
--- a/common/models/TicketType.php
+++ b/common/models/TicketType.php
@@ -123,7 +123,7 @@ class TicketType extends \common\models\BaseFitnessActiveRecord {
 	}
 	public function getStatusHuman() {
 		$result = null;
-		$s = self::statuses ( $this->status );
+		$s = self::statuses (  );
 		if (array_key_exists ( $this->status, $s )) {
 			$result = $s [$this->status];
 		}
diff --git a/composer.json b/composer.json
index 22993b0..4ef624f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,8 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2-swiftmailer": "*",
+        "npm-asset/grunt": "^0.4.5"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

From a2b835225a9c27d7f711322bd052a36ff74909af Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 24 Sep 2015 22:14:09 +0200
Subject: [PATCH 015/100] add product

---
 backend/controllers/ProductController.php     | 12 +++-
 backend/models/ProductSearch.php              | 15 ++---
 backend/views/product/_form.php               |  9 ++-
 backend/views/product/_search.php             | 58 ++++++++++++-------
 backend/views/product/create.php              |  5 +-
 backend/views/product/index.php               | 26 +++++----
 backend/views/product/update.php              | 12 ++--
 backend/views/product/view.php                | 30 +++++-----
 common/messages/hu/common/product.php         | 43 ++++++++++++++
 common/models/Product.php                     | 16 +++--
 common/models/ProductCategory.php             | 16 +++++
 composer.json                                 |  3 +-
 composer.lock                                 |  2 +-
 ...2425_alter__table__product_fix_columns.php | 32 ++++++++++
 ...ter__table__product__add__column__name.php | 30 ++++++++++
 15 files changed, 229 insertions(+), 80 deletions(-)
 create mode 100644 common/messages/hu/common/product.php
 create mode 100644 console/migrations/m150924_162425_alter__table__product_fix_columns.php
 create mode 100644 console/migrations/m150924_170806_alter__table__product__add__column__name.php

diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php
index 3ce635f..24da95f 100644
--- a/backend/controllers/ProductController.php
+++ b/backend/controllers/ProductController.php
@@ -9,6 +9,7 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use common\models\Account;
+use common\models\ProductCategory;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -62,8 +63,10 @@ class ProductController extends Controller
     public function actionCreate()
     {
         $model = new Product();
+        $model->stock = 0;
+        $model->status = Product::STATUS_ACTIVE;
 		$accounts = Account::readAccounts(null);
-        
+		$categories = ProductCategory::read(null);
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_product]);
@@ -71,6 +74,8 @@ class ProductController extends Controller
             return $this->render('create', [
                 'model' => $model,
                 'accounts' => $accounts,
+                'categories' => $categories ,
+            		
             ]);
         }
     }
@@ -85,11 +90,16 @@ class ProductController extends Controller
     {
         $model = $this->findModel($id);
 
+        $accounts = Account::readAccounts($model->id_account);
+        $categories = ProductCategory::read($model->id_product_category);
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_product]);
         } else {
             return $this->render('update', [
                 'model' => $model,
+            	'accounts' => $accounts,
+            	'categories' => $categories ,
             ]);
         }
     }
diff --git a/backend/models/ProductSearch.php b/backend/models/ProductSearch.php
index a528662..a74a216 100644
--- a/backend/models/ProductSearch.php
+++ b/backend/models/ProductSearch.php
@@ -18,8 +18,8 @@ class ProductSearch extends Product
     public function rules()
     {
         return [
-            [['id_product', 'id_product_type', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
-            [['product_number', 'barcode', 'description', 'created_at', 'updated_at'], 'safe'],
+            [[  'id_product_category', 'id_account',   'status'], 'integer'],
+            [['product_number', 'barcode' ], 'safe'],
         ];
     }
 
@@ -56,20 +56,13 @@ class ProductSearch extends Product
         }
 
         $query->andFilterWhere([
-            'id_product' => $this->id_product,
-            'id_product_type' => $this->id_product_type,
+            'id_product_category' => $this->id_product_category,
             'id_account' => $this->id_account,
-            'purchase_price' => $this->purchase_price,
-            'sale_price' => $this->sale_price,
-            'profit_margins' => $this->profit_margins,
             'status' => $this->status,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
 
         $query->andFilterWhere(['like', 'product_number', $this->product_number])
-            ->andFilterWhere(['like', 'barcode', $this->barcode])
-            ->andFilterWhere(['like', 'description', $this->description]);
+            ->andFilterWhere(['like', 'barcode', $this->barcode]);
 
         return $dataProvider;
     }
diff --git a/backend/views/product/_form.php b/backend/views/product/_form.php
index 941c04d..182b4b5 100644
--- a/backend/views/product/_form.php
+++ b/backend/views/product/_form.php
@@ -11,13 +11,18 @@ use yii\helpers\ArrayHelper;
 ?>
 <?php 
 $account_options = ArrayHelper::map($accounts, 'id_account', 'name');
+$product_category_options = ArrayHelper::map($categories, 'id_product_category', 'name');
+
 ?>
 <div class="product-form">
 
     <?php $form = ActiveForm::begin(); ?>
 
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'id_account')->dropDownList($account_options)  ?>
+    
+    <?= $form->field($model, 'id_product_category')->dropDownList($product_category_options)  ?>
 
     <?= $form->field($model, 'product_number')->textInput(['maxlength' => true]) ?>
 
@@ -31,10 +36,10 @@ $account_options = ArrayHelper::map($accounts, 'id_account', 'name');
 
     <?= $form->field($model, 'status')->checkbox( ['value' => 10, 'label' =>    Yii::t('common/product', "Active") 	])  ?>
 
-    <?= $form->field($model, 'description')->textarea(['maxlength' => true])->hint( Yii::t( 'common/prodcut', "Max 255 character")) ?>
+    <?= $form->field($model, 'description')->textarea(['maxlength' => true])->hint( Yii::t( 'common/product', "Max 255 character")) ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket_type', 'Create') : Yii::t('common/ticket_type', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/product', 'Create') : Yii::t('common/product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/product/_search.php b/backend/views/product/_search.php
index aba1bcc..0ce8aa3 100644
--- a/backend/views/product/_search.php
+++ b/backend/views/product/_search.php
@@ -2,12 +2,30 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use common\models\Product;
+use common\models\ProductCategory;
+use yii\helpers\ArrayHelper;
+use common\models\Account;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\ProductSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
+<?php 
 
+function mkOptions($options){
+	$o = $options;
+	$o[''] =   Yii::t('common/product','All' ) ;
+	return $o;
+}
+
+$statusOptions = mkOptions( Product::statuses() );
+
+$productCategories =  mkOptions(  ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') );
+
+$accounts =  mkOptions( ArrayHelper::map( Account::readAccounts(null) ,'id_account','name'));
+
+?>
 <div class="product-search">
 
     <?php $form = ActiveForm::begin([
@@ -15,33 +33,29 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_product') ?>
-
-    <?= $form->field($model, 'id_product_type') ?>
-
-    <?= $form->field($model, 'id_account') ?>
-
+	<div class="row">
+	<div class="col-md-4">
+    <?= $form->field($model, 'id_product_category')->dropDownList($productCategories) ?>
+	</div>
+	<div class="col-md-4">
+    <?= $form->field($model, 'id_account')->dropDownList($accounts) ?>
+	</div>
+	<div class="col-md-4">
+    <?php  echo $form->field($model, 'status')->dropDownList($statusOptions) ?>
+	</div>
+	<div class="col-md-4">
     <?= $form->field($model, 'product_number') ?>
-
+	</div>
+	<div class="col-md-4">
     <?= $form->field($model, 'barcode') ?>
+	</div>
+	<div class="col-md-4">
+	</div>
+	</div>
 
-    <?php // echo $form->field($model, 'purchase_price') ?>
-
-    <?php // echo $form->field($model, 'sale_price') ?>
-
-    <?php // echo $form->field($model, 'profit_margins') ?>
-
-    <?php // echo $form->field($model, 'status') ?>
-
-    <?php // echo $form->field($model, 'description') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
 
     <div class="form-group">
-        <?= Html::submitButton(Yii::t('common/ticket_type', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('common/ticket_type', 'Reset'), ['class' => 'btn btn-default']) ?>
+        <?= Html::submitButton(Yii::t('common/product', 'Search'), ['class' => 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/product/create.php b/backend/views/product/create.php
index c9d4e28..dd4afce 100644
--- a/backend/views/product/create.php
+++ b/backend/views/product/create.php
@@ -7,8 +7,8 @@ use yii\helpers\Html;
 /* @var $model common\models\Product */
 /* @var $accounts common\models\Account[] */
 
-$this->title = Yii::t('common/ticket_type', 'Create Product');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
+$this->title = Yii::t('common/product', 'Create Product');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product', 'Products'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="product-create">
@@ -18,6 +18,7 @@ $this->params['breadcrumbs'][] = $this->title;
     <?= $this->render('_form', [
         'model' => $model,
         'accounts' => $accounts,
+    	'categories' => $categories ,
     ]) ?>
 
 </div>
diff --git a/backend/views/product/index.php b/backend/views/product/index.php
index 41ee9c3..87893bc 100644
--- a/backend/views/product/index.php
+++ b/backend/views/product/index.php
@@ -7,23 +7,26 @@ use yii\grid\GridView;
 /* @var $searchModel backend\models\ProductSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
 
-$this->title = Yii::t('common/ticket_type', 'Products');
+$this->title = Yii::t('common/product', 'Products');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="product-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a(Yii::t('common/ticket_type', 'Create Product'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('common/product', 'Create Product'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
               [
-    			'attribute' =>	'id_product_type',
+    			'attribute' =>	'name',
+			],
+              [
+    			'attribute' =>	'id_product_category',
     			'value' =>	'productCategoryName',
 			],
              [
@@ -32,15 +35,16 @@ $this->params['breadcrumbs'][] = $this->title;
 			],
             'product_number',
             'barcode',
-            'purchase_price',
             'sale_price',
-            'profit_margins',
-            'status',
-            'description',
-            'created_at:datetime',
-            'updated_at:datetime',
+            [ 
+            	'attribute' => 'status',
+            	'value' => 'statusHuman',
+            		
+              ],
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+             'template' => '{view} {update}'
+        ],
         ],
     ]); ?>
 
diff --git a/backend/views/product/update.php b/backend/views/product/update.php
index 2b6f0a3..30cf1f0 100644
--- a/backend/views/product/update.php
+++ b/backend/views/product/update.php
@@ -5,12 +5,10 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Product */
 
-$this->title = Yii::t('common/ticket_type', 'Update {modelClass}: ', [
-    'modelClass' => 'Product',
-]) . ' ' . $model->id_product;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->id_product, 'url' => ['view', 'id' => $model->id_product]];
-$this->params['breadcrumbs'][] = Yii::t('common/ticket_type', 'Update');
+$this->title = Yii::t('common/product', 'Update product:'  ) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_product]];
+$this->params['breadcrumbs'][] = Yii::t('common/product', 'Update');
 ?>
 <div class="product-update">
 
@@ -18,6 +16,8 @@ $this->params['breadcrumbs'][] = Yii::t('common/ticket_type', 'Update');
 
     <?= $this->render('_form', [
         'model' => $model,
+    	'accounts' => $accounts,
+    	'categories' => $categories ,
     ]) ?>
 
 </div>
diff --git a/backend/views/product/view.php b/backend/views/product/view.php
index 214365d..ac32061 100644
--- a/backend/views/product/view.php
+++ b/backend/views/product/view.php
@@ -6,8 +6,8 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\models\Product */
 
-$this->title = $model->id_product;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket_type', 'Products'), 'url' => ['index']];
+$this->title = $model->name ;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/product', 'Products'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="product-view">
@@ -15,31 +15,27 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a(Yii::t('common/ticket_type', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('common/ticket_type', 'Delete'), ['delete', 'id' => $model->id_product], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/ticket_type', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
+        <?= Html::a(Yii::t('common/product', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?>
     </p>
 
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id_product',
-            'id_product_type',
-            'id_account',
+            'productCategoryName',
+            'accountName',
             'product_number',
             'barcode',
             'purchase_price',
             'sale_price',
             'profit_margins',
-            'status',
-            'description',
-            'created_at',
-            'updated_at',
+            'statusHuman',
+        	[
+            'attribute' => 'description',
+        	'value' => nl2br($model->description),
+        	'format' => 'raw'
+		    ],
+            'created_at:datetime',
+            'updated_at:datetime',
         ],
     ]) ?>
 
diff --git a/common/messages/hu/common/product.php b/common/messages/hu/common/product.php
new file mode 100644
index 0000000..da3e15f
--- /dev/null
+++ b/common/messages/hu/common/product.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Active' => 'Aktív',
+    'All' => 'Mind',
+    'Barcode' => 'Vonalkód',
+    'Create' => 'Mentés',
+    'Create Product' => 'Új termék',
+    'Created At' => 'Létrehozás ideje',
+    'Description' => 'Leírás',
+    'Id Account' => 'Kassza',
+    'Id Product' => 'Termék',
+    'Id Product Category' => 'Termék kategória',
+    'Inactive' => 'Inaktív',
+    'Max 255 character' => 'Max 255 karakter',
+    'Name' => 'Név',
+    'Product Number' => 'Termék szám',
+    'Products' => 'Termékek',
+    'Profit Margins' => 'Haszonkulcs',
+    'Purchase Price' => 'Beszerzési ár',
+    'Sale Price' => 'Eladási ár',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Update' => 'Módosítás',
+    'Update product:' => 'Termék módosítása:',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/models/Product.php b/common/models/Product.php
index 41600ab..6410e4f 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -8,7 +8,8 @@ use Yii;
  * This is the model class for table "product".
  *
  * @property integer $id_product
- * @property integer $id_product_type
+ * @property string $name length 64
+ * @property integer $id_product_category
  * @property integer $id_account
  * @property string $product_number
  * @property string $barcode
@@ -16,6 +17,7 @@ use Yii;
  * @property integer $sale_price
  * @property integer $profit_margins
  * @property integer $status
+ * @property integer $stock
  * @property string $description
  * @property string $created_at
  * @property string $updated_at
@@ -39,10 +41,13 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     public function rules()
     {
         return [
-            [['id_product_type', 'id_account'], 'required'],
-            [['id_product_type', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
+            [['id_product_category', 'id_account', 'name'], 'required'],
+            [['id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status'], 'integer'],
             [['product_number', 'barcode'], 'string', 'max' => 20],
-            [['description'], 'string', 'max' => 255]
+            [['name'], 'string', 'max' => 128],
+            [['description'], 'string', 'max' => 255],
+            [['product_number'], 'unique' ],
+            [['barcode'], 'unique' ],
         ];
     }
 
@@ -53,7 +58,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     {
         return [
             'id_product' => Yii::t('common/product', 'Id Product'),
-            'id_product_type' => Yii::t('common/product', 'Id Product Type'),
+            'id_product_category' => Yii::t('common/product', 'Id Product Category'),
             'id_account' => Yii::t('common/product', 'Id Account'),
             'product_number' => Yii::t('common/product', 'Product Number'),
             'barcode' => Yii::t('common/product', 'Barcode'),
@@ -61,6 +66,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
             'sale_price' => Yii::t('common/product', 'Sale Price'),
             'profit_margins' => Yii::t('common/product', 'Profit Margins'),
             'status' => Yii::t('common/product', 'Status'),
+            'name' => Yii::t('common/product', 'Name'),
             'description' => Yii::t('common/product', 'Description'),
             'created_at' => Yii::t('common/product', 'Created At'),
             'updated_at' => Yii::t('common/product', 'Updated At'),
diff --git a/common/models/ProductCategory.php b/common/models/ProductCategory.php
index 70b255a..cb5dd4d 100644
--- a/common/models/ProductCategory.php
+++ b/common/models/ProductCategory.php
@@ -69,4 +69,20 @@ class ProductCategory extends \common\models\BaseFitnessActiveRecord
     	return $result;
     }
     
+    
+    /**
+     * $param int $forceIncludeAccount id account, that should be included in list, even if it is inactive
+     * */
+    public static  function read($forceIncludeObjectWithId = null){
+    	$categories = null;
+    	 
+    	if ( $forceIncludeObjectWithId  == null){
+    		$categories = ProductCategory::find()->andWhere(['status' => ProductCategory::STATUS_ACTIVE])->all();
+    	}else{
+    		$categories = ProductCategory::find()->andWhere( ['or', ['status' => ProductCategory::STATUS_ACTIVE], ['id_product_category' =>  $forceIncludeObjectWithId ] ])->all();
+    	}
+    	 
+    	return $categories;
+    }
+    
 }
diff --git a/composer.json b/composer.json
index 4ef624f..22993b0 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
-        "npm-asset/grunt": "^0.4.5"
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index e7e2ee1..6a29fb3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5fe15fcdcc6c43b39968ffd29104ac62",
+    "hash": "8580bd82955b1fbb80d47024e184056e",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
diff --git a/console/migrations/m150924_162425_alter__table__product_fix_columns.php b/console/migrations/m150924_162425_alter__table__product_fix_columns.php
new file mode 100644
index 0000000..475db33
--- /dev/null
+++ b/console/migrations/m150924_162425_alter__table__product_fix_columns.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+use common\models\Product;
+
+class m150924_162425_alter__table__product_fix_columns extends Migration
+{
+    public function up()
+    {
+		$this->renameColumn('product','id_product_type','id_product_category');
+		$this->addColumn('product','stock',  'int(11)' );
+    }
+
+    public function down()
+    {
+        echo "m150924_162425_alter__table__product_fix_columns cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m150924_170806_alter__table__product__add__column__name.php b/console/migrations/m150924_170806_alter__table__product__add__column__name.php
new file mode 100644
index 0000000..8dac7a9
--- /dev/null
+++ b/console/migrations/m150924_170806_alter__table__product__add__column__name.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150924_170806_alter__table__product__add__column__name extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn('product','name',  'varchar(128)' );
+    }
+
+    public function down()
+    {
+        echo "m150924_170806_alter__table__product__add__column__name cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 28caac03dc8980e17c465525c61e2189c90fafde Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 08:57:05 +0200
Subject: [PATCH 016/100] add changes to procurement

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/ProcurementController.php | 127 ++++++++++++++++++
 backend/models/ProcurementSearch.php          |  74 ++++++++++
 backend/views/procurement/_form.php           |  38 ++++++
 backend/views/procurement/_search.php         |  45 +++++++
 backend/views/procurement/create.php          |  23 ++++
 backend/views/procurement/index.php           |  49 +++++++
 backend/views/procurement/update.php          |  23 ++++
 backend/views/procurement/view.php            |  44 ++++++
 common/models/Procurement.php                 | 122 +++++++++++++++++
 common/models/Warehouse.php                   |  16 +++
 .../m150925_055052_add__table_procurement.php |  47 +++++++
 12 files changed, 609 insertions(+)
 create mode 100644 backend/controllers/ProcurementController.php
 create mode 100644 backend/models/ProcurementSearch.php
 create mode 100644 backend/views/procurement/_form.php
 create mode 100644 backend/views/procurement/_search.php
 create mode 100644 backend/views/procurement/create.php
 create mode 100644 backend/views/procurement/index.php
 create mode 100644 backend/views/procurement/update.php
 create mode 100644 backend/views/procurement/view.php
 create mode 100644 common/models/Procurement.php
 create mode 100644 console/migrations/m150925_055052_add__table_procurement.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 153b0ff..47b26a8 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -41,6 +41,7 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 		$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
 		$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
+		$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
new file mode 100644
index 0000000..31019fd
--- /dev/null
+++ b/backend/controllers/ProcurementController.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Procurement;
+use backend\models\ProcurementSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\Warehouse;
+
+/**
+ * ProcurementController implements the CRUD actions for Procurement model.
+ */
+class ProcurementController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Procurement models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProcurementSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Procurement model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Procurement model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Procurement();
+        
+        $model->id_user = Yii::$app->user->id;
+
+        $warehouses = Warehouse::read(null);
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_procurement]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            	'warehouses' =>$warehouses
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Procurement model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_procurement]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Procurement model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Procurement model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Procurement the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Procurement::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/ProcurementSearch.php b/backend/models/ProcurementSearch.php
new file mode 100644
index 0000000..203745b
--- /dev/null
+++ b/backend/models/ProcurementSearch.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Procurement;
+
+/**
+ * ProcurementSearch represents the model behind the search form about `common\models\Procurement`.
+ */
+class ProcurementSearch extends Procurement
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_procurement', 'id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price'], 'integer'],
+            [['description', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Procurement::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_procurement' => $this->id_procurement,
+            'id_warehouse' => $this->id_warehouse,
+            'id_user' => $this->id_user,
+            'id_product' => $this->id_product,
+            'count' => $this->count,
+            'stock' => $this->stock,
+            'purchase_price' => $this->purchase_price,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'description', $this->description]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/procurement/_form.php b/backend/views/procurement/_form.php
new file mode 100644
index 0000000..b402e8a
--- /dev/null
+++ b/backend/views/procurement/_form.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+/* @var $warehouses common\models\Warehouse[] */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+
+$warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ;
+
+?>
+<div class="procurement-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'productIdentifier')->textInput()->hint(Yii::t('common/procurement', "Product name, product number or barcode")) ?>
+
+    <?= $form->field($model, 'id_warehouse')->dropDownList($warehouseOptions) ?>
+
+    <?= $form->field($model, 'count')->textInput() ?>
+
+    <?= $form->field($model, 'purchase_price')->textInput() ?>
+
+    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/procurement', 'Create') : Yii::t('common/procurement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/procurement/_search.php b/backend/views/procurement/_search.php
new file mode 100644
index 0000000..85badf8
--- /dev/null
+++ b/backend/views/procurement/_search.php
@@ -0,0 +1,45 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\ProcurementSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="procurement-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_procurement') ?>
+
+    <?= $form->field($model, 'id_warehouse') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'id_product') ?>
+
+    <?= $form->field($model, 'count') ?>
+
+    <?php // echo $form->field($model, 'stock') ?>
+
+    <?php // echo $form->field($model, 'purchase_price') ?>
+
+    <?php // echo $form->field($model, 'description') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/procurement', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/procurement', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/procurement/create.php b/backend/views/procurement/create.php
new file mode 100644
index 0000000..415e4aa
--- /dev/null
+++ b/backend/views/procurement/create.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+/* @var $warehouses common\models\Warehouse[] */
+
+$this->title = Yii::t('common/procurement', 'Create Procurement');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/procurement', 'Procurements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="procurement-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    	'warehouses' => $warehouses
+    ]) ?>
+
+</div>
diff --git a/backend/views/procurement/index.php b/backend/views/procurement/index.php
new file mode 100644
index 0000000..c2c7b85
--- /dev/null
+++ b/backend/views/procurement/index.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\ProcurementSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/procurement', 'Procurements');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="procurement-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/procurement', 'Create Procurement'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+        	[
+        		'attribute' => 'id_warehouse',
+        		'value' => 'wareHouseName'
+        			
+    		],
+            'id_user',
+            'id_product',
+            'count',
+            'stock',
+            'purchase_price',
+            // 'description',
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            [
+            	'class' => 'yii\grid\ActionColumn',
+            	'template' => '{view}'
+            		
+    		],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/procurement/update.php b/backend/views/procurement/update.php
new file mode 100644
index 0000000..6e0d44e
--- /dev/null
+++ b/backend/views/procurement/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+
+$this->title = Yii::t('common/procurement', 'Update {modelClass}: ', [
+    'modelClass' => 'Procurement',
+]) . ' ' . $model->id_procurement;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/procurement', 'Procurements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_procurement, 'url' => ['view', 'id' => $model->id_procurement]];
+$this->params['breadcrumbs'][] = Yii::t('common/procurement', 'Update');
+?>
+<div class="procurement-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/procurement/view.php b/backend/views/procurement/view.php
new file mode 100644
index 0000000..2366b40
--- /dev/null
+++ b/backend/views/procurement/view.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+
+$this->title = $model->id_procurement;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/procurement', 'Procurements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="procurement-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/procurement', 'Update'), ['update', 'id' => $model->id_procurement], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/procurement', 'Delete'), ['delete', 'id' => $model->id_procurement], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/procurement', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_procurement',
+            'id_warehouse',
+            'id_user',
+            'id_product',
+            'count',
+            'stock',
+            'purchase_price',
+            'description',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Procurement.php b/common/models/Procurement.php
new file mode 100644
index 0000000..ae04358
--- /dev/null
+++ b/common/models/Procurement.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "procurement".
+ *
+ * @property integer $id_procurement
+ * @property integer $id_warehouse
+ * @property integer $id_user
+ * @property integer $id_product
+ * @property integer $count
+ * @property integer $stock
+ * @property integer $purchase_price
+ * @property string $description
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Procurement extends \common\models\BaseFitnessActiveRecord 
+{
+	
+	public $productIdentifier;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'procurement';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_warehouse', 'id_user', 'id_product', 'count'], 'required'],
+            [['id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price'], 'integer'],
+            [['created_at', 'updated_at'], 'safe'],
+            [['description'], 'string', 'max' => 255],
+        	[['productIdentifier']  ,'validateProductIdentifier', 'on' => 'create_general']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_procurement' => Yii::t('common/procurement', 'Id Procurement'),
+            'id_warehouse' => Yii::t('common/procurement', 'Id Warehouse'),
+            'id_user' => Yii::t('common/procurement', 'Id User'),
+            'id_product' => Yii::t('common/procurement', 'Id Product'),
+            'count' => Yii::t('common/procurement', 'Count'),
+            'stock' => Yii::t('common/procurement', 'Stock'),
+            'purchase_price' => Yii::t('common/procurement', 'Purchase Price'),
+            'description' => Yii::t('common/procurement', 'Description'),
+            'created_at' => Yii::t('common/procurement', 'Created At'),
+            'updated_at' => Yii::t('common/procurement', 'Updated At'),
+        ];
+    }
+    
+    
+    public function validateProductIdentifier($attribute,$params){
+    	$product = null;
+    	
+    	if ( isset($this->attribute)){
+	    	$id = $this->$attribute;
+	    	$conditionProductName = ['name' =>$id];
+	    	$conditionProductNumber = ['product_number' =>$id];
+	    	$conditionBarcode= ['barcode' =>$id];
+	    	$product = Product::findOne(['or',[ $conditionProductName,$conditionProductNumber,$conditionBarcode ]]);
+    	}
+    	
+    	if ( $product == null ){
+    		$this->addError('productIdentifier' , Yii::t("common/procurement", "Invalid product"));
+    	}
+    	
+    }
+    
+    ////////////////////////////////
+    // PRODUCT
+    ////////////////////////////////
+    public function getProduct() {
+    	return $this->hasOne ( Product::className (), [
+    			'id_product' => 'id_product'
+    	] );
+    }
+    public function getProductName() {
+    	return $this->product->name;
+    }
+    
+    ////////////////////////////////
+    // WAREHOUSE
+    ////////////////////////////////
+    public function getWarehouse() {
+    	return $this->hasOne ( Warehouse::className (), [
+    			'id_warehouse' => 'id_warehouse'
+    	] );
+    }
+    
+    public function getWarehouseName(){
+    	return $this->warehouse->name;
+    }
+    ////////////////////////////////
+    // USER
+    ////////////////////////////////
+    public function getUser() {
+    	return $this->hasOne ( User::className (), [
+    			'id_user' => 'id_user'
+    	] );
+    }
+    
+    public function getUserName(){
+    	return $this->user->username;
+    }
+    
+}
diff --git a/common/models/Warehouse.php b/common/models/Warehouse.php
index db5006b..bf40ca9 100644
--- a/common/models/Warehouse.php
+++ b/common/models/Warehouse.php
@@ -82,5 +82,21 @@ class Warehouse extends \yii\db\ActiveRecord
     	}
     	return $result;
     }
+
+    
+    /**
+     * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
+     * */
+    public static  function read($forceIncludeObjectWithId = null){
+    	$warehouses = null;
+    
+    	if ( $forceIncludeObjectWithId  == null){
+    		$warehouses = Warehouse::find()->andWhere(['status' => Warehouse::STATUS_ACTIVE])->all();
+    	}else{
+    		$warehouses = Warehouse::find()->andWhere( ['or', ['status' => Warehouse::STATUS_ACTIVE], ['id_warehouse' =>  $forceIncludeObjectWithId ] ])->all();
+    	}
+    
+    	return $warehouses;
+    }
     
 }
diff --git a/console/migrations/m150925_055052_add__table_procurement.php b/console/migrations/m150925_055052_add__table_procurement.php
new file mode 100644
index 0000000..e27047a
--- /dev/null
+++ b/console/migrations/m150925_055052_add__table_procurement.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150925_055052_add__table_procurement extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%procurement}}', [
+    			'id_procurement' => $this->primaryKey(),
+    			'id_warehouse' => $this->integer()->notNull(),
+    			'id_user' => $this->integer()->notNull(),
+    			'id_product' => $this->integer()->notNull(),
+    			'count' => $this->integer()->notNull(),
+    			'stock' => $this->integer(),
+    			'purchase_price' => $this->integer(),
+    			'description' => $this->string(255),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150925_055052_add__table_procurement cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 620198d835845fe467577a231bd686e8f441b813 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 09:27:11 +0200
Subject: [PATCH 017/100] remove grunt from composer

---
 composer.json |  3 +--
 composer.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 4ef624f..22993b0 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
-        "npm-asset/grunt": "^0.4.5"
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index e7e2ee1..d09a533 100644
--- a/composer.lock
+++ b/composer.lock
@@ -459,21 +459,21 @@
         },
         {
             "name": "yiisoft/yii2-bootstrap",
-            "version": "2.0.4",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-bootstrap.git",
-                "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0"
+                "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
-                "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
+                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
+                "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
                 "shasum": ""
             },
             "require": {
                 "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
-                "yiisoft/yii2": ">=2.0.4"
+                "yiisoft/yii2": ">=2.0.6"
             },
             "type": "yii2-extension",
             "extra": {
@@ -505,7 +505,7 @@
                 "bootstrap",
                 "yii2"
             ],
-            "time": "2015-05-10 22:08:17"
+            "time": "2015-09-23 17:48:24"
         },
         {
             "name": "yiisoft/yii2-composer",

From 5c9db9811092fed424e36cbc1a49c2eab069d0d4 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 17:25:16 +0200
Subject: [PATCH 018/100] add changes to procurement

---
 backend/controllers/ProcurementController.php |  124 +-
 backend/models/ProcurementSearch.php          |   22 +-
 backend/views/procurement/_form_product.php   |   54 +
 backend/views/procurement/_search.php         |   71 +-
 backend/views/procurement/create_product.php  |   24 +
 backend/views/procurement/index.php           |   25 +-
 backend/views/procurement/view.php            |   39 +-
 backend/views/product/index.php               |   29 +-
 backend/views/product/view.php                |    1 +
 common/models/Procurement.php                 |   17 +-
 common/models/Product.php                     |   15 +
 common/models/User.php                        |   17 +
 composer.json                                 |    3 +-
 composer.lock                                 | 1124 ++++++++++++++++-
 14 files changed, 1478 insertions(+), 87 deletions(-)
 create mode 100644 backend/views/procurement/_form_product.php
 create mode 100644 backend/views/procurement/create_product.php

diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
index 31019fd..d5dd603 100644
--- a/backend/controllers/ProcurementController.php
+++ b/backend/controllers/ProcurementController.php
@@ -9,6 +9,8 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use common\models\Warehouse;
+use common\models\Product;
+use common\models\User;
 
 /**
  * ProcurementController implements the CRUD actions for Procurement model.
@@ -33,12 +35,20 @@ class ProcurementController extends Controller
      */
     public function actionIndex()
     {
+    	
+    	$warehouses = Warehouse::read(null);
+    	$products = Product::read(null);
+    	$users = User::read(null);
+    	
         $searchModel = new ProcurementSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+        	'users' => $users,
+        	'products' => $products,
+        	'warehouses' => $warehouses,
         ]);
     }
 
@@ -62,12 +72,42 @@ class ProcurementController extends Controller
     public function actionCreate()
     {
         $model = new Procurement();
+        $model->scenario = 'create_general';
         
         $model->id_user = Yii::$app->user->id;
 
         $warehouses = Warehouse::read(null);
         
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ( count($warehouses) <= 0 ){
+        	 throw new NotFoundHttpException( Yii::t('common/procurement' ,'No active warehouse found.' ));
+        }
+        
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+        	
+        	$connection = \Yii::$app->db;
+        	
+        	$transaction = $connection->beginTransaction();
+        	
+        	try {
+				
+        		$product = Product::findOne( $model->id_product );
+        		$model->stock = $product->stock;
+        		$result = $model->save(false);
+        		
+        		$product->stock = $product->stock + $model->count;
+        		$result &= $product->save(false);
+        		
+        		if ($result) {
+        			$transaction->commit();
+        		} else {
+        			$transaction->rollback();
+        		}
+        	} catch (\Exception $e) {
+        		$transaction->rollback();
+        		throw $e;
+        	}
+        	
+        	
             return $this->redirect(['view', 'id' => $model->id_procurement]);
         } else {
             return $this->render('create', [
@@ -76,39 +116,64 @@ class ProcurementController extends Controller
             ]);
         }
     }
-
     /**
-     * Updates an existing Procurement model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
+     * Creates a new Procurement model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionUpdate($id)
+    public function actionCreateProduct($id)
     {
-        $model = $this->findModel($id);
+    	
+    	$product = $this->findProduct($id);
+    	
+        $model = new Procurement();
+        
+        $warehouses = Warehouse::read(null);
+        
+        $model->id_user = Yii::$app->user->id;
+        $model->id_product = $product->id_product;
+        $model->stock = $product->stock;
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        $warehouses = Warehouse::read(null);
+        
+        if ( count($warehouses) <= 0 ){
+        	 throw new NotFoundHttpException( Yii::t('common/procurement' ,'No active warehouse found.' ));
+        }
+        
+        if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+        	
+        	$connection = \Yii::$app->db;
+        	
+        	$transaction = $connection->beginTransaction();
+        	
+        	try {
+				
+        		$result = $model->save(false);
+        		
+        		$product->stock = $product->stock + $model->count;
+        		$result &= $product->save(false);
+        		
+        		if ($result) {
+        			$transaction->commit();
+        		} else {
+        			$transaction->rollback();
+        		}
+        	} catch (\Exception $e) {
+        		$transaction->rollback();
+        		throw $e;
+        	}
+        	
+        	
             return $this->redirect(['view', 'id' => $model->id_procurement]);
         } else {
-            return $this->render('update', [
+            return $this->render('create_product', [
                 'model' => $model,
+            	'warehouses' =>$warehouses,
+            	'product' => $product
             ]);
         }
     }
 
-    /**
-     * Deletes an existing Procurement model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-
     /**
      * Finds the Procurement model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
@@ -124,4 +189,19 @@ class ProcurementController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+    /**
+     * Finds the Product model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Procurement the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findProduct($id)
+    {
+        if (($model = Product::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
 }
diff --git a/backend/models/ProcurementSearch.php b/backend/models/ProcurementSearch.php
index 203745b..82ab42b 100644
--- a/backend/models/ProcurementSearch.php
+++ b/backend/models/ProcurementSearch.php
@@ -12,14 +12,22 @@ use common\models\Procurement;
  */
 class ProcurementSearch extends Procurement
 {
+	
+	public $date_start;
+	public $date_end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['id_procurement', 'id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price'], 'integer'],
-            [['description', 'created_at', 'updated_at'], 'safe'],
+            [[ 'id_warehouse', 'id_user', 'id_product', ], 'integer'],
+            [[ 'date_start',  ], 'date'  , 'timestampAttribute' => 'timestampStart'   ],
+            [[ 'date_end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         ];
     }
 
@@ -56,18 +64,14 @@ class ProcurementSearch extends Procurement
         }
 
         $query->andFilterWhere([
-            'id_procurement' => $this->id_procurement,
             'id_warehouse' => $this->id_warehouse,
             'id_user' => $this->id_user,
             'id_product' => $this->id_product,
-            'count' => $this->count,
-            'stock' => $this->stock,
-            'purchase_price' => $this->purchase_price,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
+        
+        $query->andFilterWhere([ '>=', 'created_at', $this->date_start ]   );
+        $query->andFilterWhere([ '<', 'created_at', $this->timestampEnd ]   );
 
-        $query->andFilterWhere(['like', 'description', $this->description]);
 
         return $dataProvider;
     }
diff --git a/backend/views/procurement/_form_product.php b/backend/views/procurement/_form_product.php
new file mode 100644
index 0000000..725492d
--- /dev/null
+++ b/backend/views/procurement/_form_product.php
@@ -0,0 +1,54 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+/* @var $warehouses common\models\Warehouse[] */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+
+$warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ;
+
+?>
+
+<h3><?=  Yii::t('common/product', 'Product') ?> </h3>
+<?php 
+
+echo DetailView::widget([
+	'model' => $product,
+	'attributes' =>[
+		'productCategoryName',
+		'accountName',
+		'product_number',
+		'barcode',	
+		'stock',	
+	]
+]);
+
+?>
+
+<div class="procurement-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+    <?= $form->field($model, 'id_warehouse')->dropDownList($warehouseOptions) ?>
+
+    <?= $form->field($model, 'count')->textInput() ?>
+
+    <?= $form->field($model, 'purchase_price')->textInput() ?>
+
+    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/procurement', 'Create') : Yii::t('common/procurement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/procurement/_search.php b/backend/views/procurement/_search.php
index 85badf8..f5d80c8 100644
--- a/backend/views/procurement/_search.php
+++ b/backend/views/procurement/_search.php
@@ -2,12 +2,35 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+use kartik\widgets\DatePicker;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\ProcurementSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<?php 
+
+function mkOptions($options){
+// 	$o = $options;
+	
+	$all = ['' => Yii::t('common/product','All' ) ];
+	
+// 	$o[''] =   Yii::t('common/product','All' ) ;
+	
+	$o =  $all + $options;
+	
+	return $o;
+}
+
+$products =  mkOptions(  ArrayHelper::map( $products ,'id_product','name') );
+$users =  mkOptions(  ArrayHelper::map( $users ,'id','username') );
+$warehouses =  mkOptions(  ArrayHelper::map( $warehouses ,'id_warehouse','name') );
+
+?>
+
+
 <div class="procurement-search">
 
     <?php $form = ActiveForm::begin([
@@ -15,29 +38,39 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_procurement') ?>
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'id_warehouse')->dropDownList($warehouses) ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'id_user')->dropDownList($users) ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'id_product')->dropDownList($products) ?>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'date_start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'date_end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
 
-    <?= $form->field($model, 'id_warehouse') ?>
-
-    <?= $form->field($model, 'id_user') ?>
-
-    <?= $form->field($model, 'id_product') ?>
-
-    <?= $form->field($model, 'count') ?>
-
-    <?php // echo $form->field($model, 'stock') ?>
-
-    <?php // echo $form->field($model, 'purchase_price') ?>
-
-    <?php // echo $form->field($model, 'description') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('common/procurement', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('common/procurement', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/procurement/create_product.php b/backend/views/procurement/create_product.php
new file mode 100644
index 0000000..6d47d0e
--- /dev/null
+++ b/backend/views/procurement/create_product.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Procurement */
+/* @var $warehouses common\models\Warehouse[] */
+
+$this->title = Yii::t('common/procurement', 'Create Procurement');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/procurement', 'Procurements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="procurement-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_product', [
+    	'product' => $product,
+        'model' => $model,
+    	'warehouses' => $warehouses
+    ]) ?>
+
+</div>
diff --git a/backend/views/procurement/index.php b/backend/views/procurement/index.php
index c2c7b85..4581096 100644
--- a/backend/views/procurement/index.php
+++ b/backend/views/procurement/index.php
@@ -13,7 +13,11 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="procurement-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php echo $this->render('_search', [
+    		'model' => $searchModel, 
+    		'users' => $users,
+        	'products' => $products,
+        	'warehouses' => $warehouses,]); ?>
 
     <p>
         <?= Html::a(Yii::t('common/procurement', 'Create Procurement'), ['create'], ['class' => 'btn btn-success']) ?>
@@ -22,26 +26,29 @@ $this->params['breadcrumbs'][] = $this->title;
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
         	[
         		'attribute' => 'id_warehouse',
         		'value' => 'wareHouseName'
         			
     		],
-            'id_user',
-            'id_product',
+        	[
+        		'attribute' => 'id_user',
+        		'value' => 'userName'
+        			
+    		],
+        	[
+        		'attribute' => 'id_product',
+        		'value' => 'productName'
+        			
+    		],
             'count',
             'stock',
             'purchase_price',
-            // 'description',
             'created_at:datetime',
-            'updated_at:datetime',
 
             [
             	'class' => 'yii\grid\ActionColumn',
-            	'template' => '{view}'
-            		
+            	'template' => '{view}',
     		],
         ],
     ]); ?>
diff --git a/backend/views/procurement/view.php b/backend/views/procurement/view.php
index 2366b40..d29613a 100644
--- a/backend/views/procurement/view.php
+++ b/backend/views/procurement/view.php
@@ -14,30 +14,35 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('common/procurement', 'Update'), ['update', 'id' => $model->id_procurement], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('common/procurement', 'Delete'), ['delete', 'id' => $model->id_procurement], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/procurement', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
             'id_procurement',
-            'id_warehouse',
-            'id_user',
-            'id_product',
+			[
+            	'attribute' => 'id_warehouse',
+            	'value' => $model->warehouseName,
+	
+			],
+			[
+            	'attribute' => 'id_user',
+            	'value' => $model->userName,
+	
+			],
+			[
+            	'attribute' => 'id_product',
+            	'value' => $model->productName,
+	
+			],
             'count',
             'stock',
             'purchase_price',
-            'description',
-            'created_at',
-            'updated_at',
+			[
+				'attribute' => 'description',
+				'value' => nl2br($model->description),
+				'format' => 'raw'
+			],
+            'created_at:datetime',
+            'updated_at:datetime',
         ],
     ]) ?>
 
diff --git a/backend/views/product/index.php b/backend/views/product/index.php
index 87893bc..fb624d8 100644
--- a/backend/views/product/index.php
+++ b/backend/views/product/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\ProductSearch */
@@ -41,9 +42,31 @@ $this->params['breadcrumbs'][] = $this->title;
             	'value' => 'statusHuman',
             		
               ],
-
-            ['class' => 'yii\grid\ActionColumn',
-             'template' => '{view} {update}'
+			'stock',
+            [
+    		 'class' => 'yii\grid\ActionColumn',
+             'template' => '{view} {update} {procurement}',
+    		 'buttons' =>[
+					'view' => function ($url, $model, $key) {
+						return   Html::a( Yii::t('common/product', 'Details' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+					},
+					'update' => function ($url, $model, $key) {
+						return   Html::a( Yii::t('common/product', 'Update' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+					},
+					'procurement' => function ($url, $model, $key) {
+						return   Html::a( Yii::t('common/product', 'Procurement' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+					},
+				],
+				'urlCreator' => function ( $action, $model, $key, $index ){
+					$result = '';
+					if ( $action == 'procurement' ){
+						$result = Url::toRoute(['procurement/create-product' , 'id' => $model->id_product]);
+                    }else{
+						$result = Url::toRoute(['product/'.$action , 'id' => $model->id_product]);
+					}
+			
+					return $result;
+				}
         ],
         ],
     ]); ?>
diff --git a/backend/views/product/view.php b/backend/views/product/view.php
index ac32061..5bda8de 100644
--- a/backend/views/product/view.php
+++ b/backend/views/product/view.php
@@ -29,6 +29,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'sale_price',
             'profit_margins',
             'statusHuman',
+            'stock',
         	[
             'attribute' => 'description',
         	'value' => nl2br($model->description),
diff --git a/common/models/Procurement.php b/common/models/Procurement.php
index ae04358..6a2b5b7 100644
--- a/common/models/Procurement.php
+++ b/common/models/Procurement.php
@@ -37,10 +37,11 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
     public function rules()
     {
         return [
-            [['id_warehouse', 'id_user', 'id_product', 'count'], 'required'],
+            [['id_warehouse', 'count', 'purchase_price' ], 'required'],
+            [['id_warehouse', 'count', 'productIdentifier', 'purchase_price' ], 'required'  , 'on' => 'create_general'],
             [['id_warehouse', 'id_user', 'id_product', 'count', 'stock', 'purchase_price'], 'integer'],
-            [['created_at', 'updated_at'], 'safe'],
             [['description'], 'string', 'max' => 255],
+            [['productIdentifier'], 'string', 'max' => 128],
         	[['productIdentifier']  ,'validateProductIdentifier', 'on' => 'create_general']
         ];
     }
@@ -68,12 +69,16 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
     public function validateProductIdentifier($attribute,$params){
     	$product = null;
     	
-    	if ( isset($this->attribute)){
-	    	$id = $this->$attribute;
+    	if ( isset($this->productIdentifier)){
+	    	$id = $this->productIdentifier;
 	    	$conditionProductName = ['name' =>$id];
 	    	$conditionProductNumber = ['product_number' =>$id];
 	    	$conditionBarcode= ['barcode' =>$id];
-	    	$product = Product::findOne(['or',[ $conditionProductName,$conditionProductNumber,$conditionBarcode ]]);
+	    	$products = Product::find()->andWhere(['or', ['name' =>$id] , ['product_number' =>$id] ,['barcode' =>$id] ] )->all();
+	    	if ( count($products) == 1 ){
+	    		$product = $products[0];
+	    		$this->id_product = $product->id_product;
+	    	}
     	}
     	
     	if ( $product == null ){
@@ -111,7 +116,7 @@ class Procurement extends \common\models\BaseFitnessActiveRecord
     ////////////////////////////////
     public function getUser() {
     	return $this->hasOne ( User::className (), [
-    			'id_user' => 'id_user'
+    			'id' => 'id_user'
     	] );
     }
     
diff --git a/common/models/Product.php b/common/models/Product.php
index 6410e4f..0b1bbd5 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -110,4 +110,19 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	return $result;
     }
     
+    /**
+     * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
+     * */
+    public static  function read($forceIncludeObjectWithId = null){
+    	$warehouses = null;
+    
+    	if ( $forceIncludeObjectWithId  == null){
+    		$warehouses = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->all();
+    	}else{
+    		$warehouses = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' =>  $forceIncludeObjectWithId ] ])->all();
+    	}
+    
+    	return $warehouses;
+    }
+    
 }
diff --git a/common/models/User.php b/common/models/User.php
index dce1b33..d8108ef 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -209,4 +209,21 @@ class User extends ActiveRecord implements IdentityInterface
     	];
     }
     
+    
+    
+    /**
+     * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
+     * */
+    public static  function read($forceIncludeObjectWithId = null){
+    	$warehouses = null;
+    
+    	if ( $forceIncludeObjectWithId  == null){
+    		$warehouses = User::find()->andWhere(['status' => User::STATUS_ACTIVE])->all();
+    	}else{
+    		$warehouses = User::find()->andWhere( ['or', ['status' => User::STATUS_ACTIVE], ['id' =>  $forceIncludeObjectWithId ] ])->all();
+    	}
+    
+    	return $warehouses;
+    }
+    
 }
diff --git a/composer.json b/composer.json
index 22993b0..b9decd9 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,8 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2-swiftmailer": "*",
+        "kartik-v/yii2-widgets": "^3.4"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index 6a29fb3..3c5cad6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8580bd82955b1fbb80d47024e184056e",
+    "hash": "123abf1f9516a179624bd311ea413a81",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -316,6 +316,1128 @@
             ],
             "time": "2013-11-30 08:25:19"
         },
+        {
+            "name": "kartik-v/bootstrap-fileinput",
+            "version": "v4.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
+                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/0468bbba9c28c1250aca83eba9b33e32ec135f78",
+                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\plugins\\fileinput\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An enhanced HTML 5 file input for Bootstrap 3.x with features for file preview for many file types, multiple selection, ajax uploads, and more.",
+            "homepage": "https://github.com/kartik-v/bootstrap-fileinput",
+            "keywords": [
+                "ajax",
+                "bootstrap",
+                "delete",
+                "file",
+                "image",
+                "input",
+                "jquery",
+                "multiple",
+                "preview",
+                "progress",
+                "upload"
+            ],
+            "time": "2015-09-13 17:39:44"
+        },
+        {
+            "name": "kartik-v/bootstrap-star-rating",
+            "version": "v3.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/bootstrap-star-rating.git",
+                "reference": "987777ee21a599bebbc545c743063fcee9833842"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/987777ee21a599bebbc545c743063fcee9833842",
+                "reference": "987777ee21a599bebbc545c743063fcee9833842",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\plugins\\rating\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A simple yet powerful JQuery star rating plugin for Bootstrap.",
+            "homepage": "https://github.com/kartik-v/bootstrap-star-rating",
+            "keywords": [
+                "Rating",
+                "bootstrap",
+                "jquery",
+                "star"
+            ],
+            "time": "2015-09-21 09:06:33"
+        },
+        {
+            "name": "kartik-v/dependent-dropdown",
+            "version": "v1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/dependent-dropdown.git",
+                "reference": "03b086d7ec51fc773aab064d7204adbbaa807ec4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/dependent-dropdown/zipball/03b086d7ec51fc773aab064d7204adbbaa807ec4",
+                "reference": "03b086d7ec51fc773aab064d7204adbbaa807ec4",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\plugins\\depdrop\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A multi level dependent dropdown JQuery plugin that allows nested dependencies.",
+            "homepage": "https://github.com/kartik-v/dependent-dropdown",
+            "keywords": [
+                "dependent",
+                "dropdown",
+                "jquery",
+                "option",
+                "select"
+            ],
+            "time": "2015-07-14 09:54:25"
+        },
+        {
+            "name": "kartik-v/yii2-krajee-base",
+            "version": "v1.7.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-krajee-base.git",
+                "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19",
+                "reference": "c0adff9d9762f4fd3bf0e7cd0000fcab0bf00f19",
+                "shasum": ""
+            },
+            "require": {
+                "yiisoft/yii2-bootstrap": "@dev"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\base\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Base library and foundation components for all Yii2 Krajee extensions.",
+            "homepage": "https://github.com/kartik-v/yii2-krajee-base",
+            "keywords": [
+                "base",
+                "extension",
+                "foundation",
+                "krajee",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-06-16 05:19:57"
+        },
+        {
+            "name": "kartik-v/yii2-widget-activeform",
+            "version": "v1.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-activeform.git",
+                "reference": "c62c8b92e8ee38892cc4e2b29851864a7a20ee01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/c62c8b92e8ee38892cc4e2b29851864a7a20ee01",
+                "reference": "c62c8b92e8ee38892cc4e2b29851864a7a20ee01",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\form\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 active-form and active-field with full bootstrap styling support (sub repo split from yii2-widgets).",
+            "homepage": "https://github.com/kartik-v/yii2-widget-activeform",
+            "keywords": [
+                "activefield",
+                "activeform",
+                "extension",
+                "field",
+                "form",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-07-08 11:36:38"
+        },
+        {
+            "name": "kartik-v/yii2-widget-affix",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-affix.git",
+                "reference": "2184119bfa518c285406156f744769b13b861712"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-affix/zipball/2184119bfa518c285406156f744769b13b861712",
+                "reference": "2184119bfa518c285406156f744769b13b861712",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\affix\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A scrollspy and affixed enhanced navigation to highlight page sections (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-affix",
+            "keywords": [
+                "affix",
+                "bootstrap",
+                "extension",
+                "jquery",
+                "navigation",
+                "plugin",
+                "scrollspy",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-09 04:56:27"
+        },
+        {
+            "name": "kartik-v/yii2-widget-alert",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-alert.git",
+                "reference": "5b312eeaf429c2affe6a96217d79f0c761159643"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-alert/zipball/5b312eeaf429c2affe6a96217d79f0c761159643",
+                "reference": "5b312eeaf429c2affe6a96217d79f0c761159643",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\alert\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A widget to generate alert based notifications using bootstrap-alert plugin (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-alert",
+            "keywords": [
+                "alert",
+                "block",
+                "bootstrap",
+                "extension",
+                "flash",
+                "jquery",
+                "notification",
+                "plugin",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-19 06:44:12"
+        },
+        {
+            "name": "kartik-v/yii2-widget-colorinput",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-colorinput.git",
+                "reference": "1f3e3dc32a7dae0c83623fbda8e0dd77b84771b1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/1f3e3dc32a7dae0c83623fbda8e0dd77b84771b1",
+                "reference": "1f3e3dc32a7dae0c83623fbda8e0dd77b84771b1",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\color\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An enhanced Yii 2 widget encapsulating the HTML 5 color input (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-colorinput",
+            "keywords": [
+                "HTML5",
+                "color",
+                "extension",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-08 21:10:18"
+        },
+        {
+            "name": "kartik-v/yii2-widget-datepicker",
+            "version": "v1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-datepicker.git",
+                "reference": "368b181ef658c05707fe41dd16eee4d9ffd9da38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/368b181ef658c05707fe41dd16eee4d9ffd9da38",
+                "reference": "368b181ef658c05707fe41dd16eee4d9ffd9da38",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\date\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the bootstrap datepicker plugin (sub repo split from yii2-widgets).",
+            "homepage": "https://github.com/kartik-v/yii2-widget-datepicker",
+            "keywords": [
+                "date",
+                "extension",
+                "form",
+                "jquery",
+                "picker",
+                "plugin",
+                "select2",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-07-19 04:49:03"
+        },
+        {
+            "name": "kartik-v/yii2-widget-datetimepicker",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-datetimepicker.git",
+                "reference": "3e59cc0f074df3b883c045395c6814506e4db7c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datetimepicker/zipball/3e59cc0f074df3b883c045395c6814506e4db7c6",
+                "reference": "3e59cc0f074df3b883c045395c6814506e4db7c6",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\datetime\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the bootstrap datetimepicker plugin (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-datetimepicker",
+            "keywords": [
+                "datetime",
+                "extension",
+                "form",
+                "jquery",
+                "picker",
+                "plugin",
+                "select2",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-01-25 16:36:55"
+        },
+        {
+            "name": "kartik-v/yii2-widget-depdrop",
+            "version": "v1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-depdrop.git",
+                "reference": "40bbe95d8d5afe4eef5eecc4c2f1a5a21f9edf43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-depdrop/zipball/40bbe95d8d5afe4eef5eecc4c2f1a5a21f9edf43",
+                "reference": "40bbe95d8d5afe4eef5eecc4c2f1a5a21f9edf43",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/dependent-dropdown": "~1.4",
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\depdrop\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Widget that enables setting up dependent dropdowns with nested dependencies (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-depdrop",
+            "keywords": [
+                "dependent",
+                "dropdown",
+                "extension",
+                "form",
+                "jquery",
+                "plugin",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-06-26 20:20:32"
+        },
+        {
+            "name": "kartik-v/yii2-widget-fileinput",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-fileinput.git",
+                "reference": "bfed1b4201cc5fb3ac11563e1269f0ca64071e0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-fileinput/zipball/bfed1b4201cc5fb3ac11563e1269f0ca64071e0b",
+                "reference": "bfed1b4201cc5fb3ac11563e1269f0ca64071e0b",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/bootstrap-fileinput": "~4.2",
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\file\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An enhanced FileInput widget for Bootstrap 3.x with file preview, multiple selection, and more features (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-fileinput",
+            "keywords": [
+                "extension",
+                "file",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "upload",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-06-26 20:23:24"
+        },
+        {
+            "name": "kartik-v/yii2-widget-growl",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-growl.git",
+                "reference": "c79abaa47e9103e93345cd1eca7bc75e17e9a92e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-growl/zipball/c79abaa47e9103e93345cd1eca7bc75e17e9a92e",
+                "reference": "c79abaa47e9103e93345cd1eca7bc75e17e9a92e",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\growl\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A widget to generate growl based notifications using bootstrap-growl plugin (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-growl",
+            "keywords": [
+                "alert",
+                "bootstrap",
+                "extension",
+                "growl",
+                "jquery",
+                "notification",
+                "plugin",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-05-03 08:23:04"
+        },
+        {
+            "name": "kartik-v/yii2-widget-rangeinput",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-rangeinput.git",
+                "reference": "b7a0b1eb627a3d6d99bad3d8ff31b28259f9e987"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-rangeinput/zipball/b7a0b1eb627a3d6d99bad3d8ff31b28259f9e987",
+                "reference": "b7a0b1eb627a3d6d99bad3d8ff31b28259f9e987",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\range\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An enhanced Yii 2 widget encapsulating the HTML 5 range input (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-rangeinput",
+            "keywords": [
+                "HTML5",
+                "extension",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "range",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-08 21:15:27"
+        },
+        {
+            "name": "kartik-v/yii2-widget-rating",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-rating.git",
+                "reference": "902f73385e6ed42d65576b8fd6e97889c3c18e65"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-rating/zipball/902f73385e6ed42d65576b8fd6e97889c3c18e65",
+                "reference": "902f73385e6ed42d65576b8fd6e97889c3c18e65",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/bootstrap-star-rating": "*",
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\rating\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A Yii2 widget for the simple yet powerful bootstrap-star-rating plugin with fractional rating support (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-rating",
+            "keywords": [
+                "Rating",
+                "bootstrap",
+                "extension",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "star",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-08 19:30:37"
+        },
+        {
+            "name": "kartik-v/yii2-widget-select2",
+            "version": "v2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-select2.git",
+                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/e72880e7e8dfc845c112ed7df275bf1c929be6db",
+                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\select2\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the Select2 jQuery plugin (sub repo split from yii2-widgets).",
+            "homepage": "https://github.com/kartik-v/yii2-widget-select2",
+            "keywords": [
+                "dropdown",
+                "extension",
+                "form",
+                "jquery",
+                "plugin",
+                "select2",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-09-12 19:56:48"
+        },
+        {
+            "name": "kartik-v/yii2-widget-sidenav",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-sidenav.git",
+                "reference": "02ee4f142d7dfbb316f878e538cc7b946f4502d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-sidenav/zipball/02ee4f142d7dfbb316f878e538cc7b946f4502d2",
+                "reference": "02ee4f142d7dfbb316f878e538cc7b946f4502d2",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\sidenav\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "An enhanced side navigation menu styled for bootstrap (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-sidenav",
+            "keywords": [
+                "bootstrap",
+                "extension",
+                "jquery",
+                "menu",
+                "navigation",
+                "plugin",
+                "sidenav",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-09 08:07:23"
+        },
+        {
+            "name": "kartik-v/yii2-widget-spinner",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-spinner.git",
+                "reference": "3132ba14d58e0564d17f3b846b04c42aa72bdde3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-spinner/zipball/3132ba14d58e0564d17f3b846b04c42aa72bdde3",
+                "reference": "3132ba14d58e0564d17f3b846b04c42aa72bdde3",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\spinner\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A widget to render animated CSS3 loading spinners with VML fallback for IE (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-spinner",
+            "keywords": [
+                "CSS3",
+                "extension",
+                "jquery",
+                "loading",
+                "plugin",
+                "spinner",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-09 05:02:05"
+        },
+        {
+            "name": "kartik-v/yii2-widget-switchinput",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-switchinput.git",
+                "reference": "f6fd88e978b526323538b62ffd9d8845a9799758"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-switchinput/zipball/f6fd88e978b526323538b62ffd9d8845a9799758",
+                "reference": "f6fd88e978b526323538b62ffd9d8845a9799758",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\switchinput\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A Yii2 wrapper widget for the Bootstrap Switch plugin to use checkboxes & radios as toggle switchinputes (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-switchinput",
+            "keywords": [
+                "bootstrap",
+                "extension",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "switchinput",
+                "toggle",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-01-14 16:27:26"
+        },
+        {
+            "name": "kartik-v/yii2-widget-timepicker",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-timepicker.git",
+                "reference": "432a8e166f89c2172fd5b86f6badcd943dbd3bc2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-timepicker/zipball/432a8e166f89c2172fd5b86f6badcd943dbd3bc2",
+                "reference": "432a8e166f89c2172fd5b86f6badcd943dbd3bc2",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\time\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the bootstrap timepicker plugin (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-timepicker",
+            "keywords": [
+                "bootstrap",
+                "extension",
+                "form",
+                "jquery",
+                "picker",
+                "plugin",
+                "time",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-08 20:01:29"
+        },
+        {
+            "name": "kartik-v/yii2-widget-touchspin",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-touchspin.git",
+                "reference": "fd117e07c5dab1e5308cb8d75431269effb66212"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-touchspin/zipball/fd117e07c5dab1e5308cb8d75431269effb66212",
+                "reference": "fd117e07c5dab1e5308cb8d75431269effb66212",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\touchspin\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "A Yii2 wrapper widget for the Bootstrap Switch plugin to use checkboxes & radios as toggle touchspines (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-touchspin",
+            "keywords": [
+                "bootstrap",
+                "extension",
+                "form",
+                "input",
+                "jquery",
+                "plugin",
+                "spinner",
+                "touch",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-12-04 12:53:04"
+        },
+        {
+            "name": "kartik-v/yii2-widget-typeahead",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-typeahead.git",
+                "reference": "e369cd55cb2fb9d3a82b57ea6c9a62d69f14fb94"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-typeahead/zipball/e369cd55cb2fb9d3a82b57ea6c9a62d69f14fb94",
+                "reference": "e369cd55cb2fb9d3a82b57ea6c9a62d69f14fb94",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "~1.7"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\typeahead\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the Twitter Typeahead plugin (sub repo split from yii2-widgets).",
+            "homepage": "https://github.com/kartik-v/yii2-widget-typeahead",
+            "keywords": [
+                "dropdown",
+                "extension",
+                "form",
+                "jquery",
+                "plugin",
+                "typeahead",
+                "widget",
+                "yii2"
+            ],
+            "time": "2015-06-28 18:05:41"
+        },
+        {
+            "name": "kartik-v/yii2-widgets",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widgets.git",
+                "reference": "f435d5e96c4848844bdfa9cee58249ccfb3e2dd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widgets/zipball/f435d5e96c4848844bdfa9cee58249ccfb3e2dd2",
+                "reference": "f435d5e96c4848844bdfa9cee58249ccfb3e2dd2",
+                "shasum": ""
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": "*",
+                "kartik-v/yii2-widget-activeform": "*",
+                "kartik-v/yii2-widget-affix": "*",
+                "kartik-v/yii2-widget-alert": "*",
+                "kartik-v/yii2-widget-colorinput": "*",
+                "kartik-v/yii2-widget-datepicker": "*",
+                "kartik-v/yii2-widget-datetimepicker": "*",
+                "kartik-v/yii2-widget-depdrop": "*",
+                "kartik-v/yii2-widget-fileinput": "*",
+                "kartik-v/yii2-widget-growl": "*",
+                "kartik-v/yii2-widget-rangeinput": "*",
+                "kartik-v/yii2-widget-rating": "*",
+                "kartik-v/yii2-widget-select2": "*",
+                "kartik-v/yii2-widget-sidenav": "*",
+                "kartik-v/yii2-widget-spinner": "*",
+                "kartik-v/yii2-widget-switchinput": "*",
+                "kartik-v/yii2-widget-timepicker": "*",
+                "kartik-v/yii2-widget-touchspin": "*",
+                "kartik-v/yii2-widget-typeahead": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-4": {
+                    "kartik\\widgets\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD 3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Collection of useful widgets for Yii Framework 2.0 extending functionalities for Bootstrap",
+            "homepage": "https://github.com/kartik-v/yii2-widgets",
+            "keywords": [
+                "extension",
+                "form",
+                "widget",
+                "yii2"
+            ],
+            "time": "2014-11-09 19:54:17"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.1",

From fe61803670d6049dd6cee5f97b1b91eccff53c07 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 18:43:23 +0200
Subject: [PATCH 019/100] add changes procurement

---
 backend/controllers/ProcurementController.php | 10 ++++-
 backend/models/ProcurementSearch.php          | 10 ++++-
 backend/views/procurement/_search.php         |  2 -
 backend/views/product/index.php               |  6 +--
 composer.lock                                 | 42 +++++++++----------
 5 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
index d5dd603..dc86e98 100644
--- a/backend/controllers/ProcurementController.php
+++ b/backend/controllers/ProcurementController.php
@@ -41,6 +41,14 @@ class ProcurementController extends Controller
     	$users = User::read(null);
     	
         $searchModel = new ProcurementSearch();
+
+        $today = time();
+        $tomorrow = time()+86400;
+        $searchModel->timestampStart = date("Y-m-d" , $today  );
+        $searchModel->timestampEnd = date("Y-m-d"   , $tomorrow );
+        $searchModel->date_start = Yii::$app->formatter->asDate($today);
+        $searchModel->date_end = Yii::$app->formatter->asDate($tomorrow);
+        
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
         return $this->render('index', [
@@ -108,7 +116,7 @@ class ProcurementController extends Controller
         	}
         	
         	
-            return $this->redirect(['view', 'id' => $model->id_procurement]);
+            return $this->redirect(['index' ]);
         } else {
             return $this->render('create', [
                 'model' => $model,
diff --git a/backend/models/ProcurementSearch.php b/backend/models/ProcurementSearch.php
index 82ab42b..ef371da 100644
--- a/backend/models/ProcurementSearch.php
+++ b/backend/models/ProcurementSearch.php
@@ -26,7 +26,7 @@ class ProcurementSearch extends Procurement
     {
         return [
             [[ 'id_warehouse', 'id_user', 'id_product', ], 'integer'],
-            [[ 'date_start',  ], 'date'  , 'timestampAttribute' => 'timestampStart'   ],
+            [[ 'date_start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
             [[ 'date_end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         ];
     }
@@ -63,6 +63,14 @@ class ProcurementSearch extends Procurement
             return $dataProvider;
         }
 
+        
+        if ( empty($this->date_start) ){
+        	$this->timestampStart = '';
+        }
+        if ( empty($this->date_end) ){
+        	$this->timestampEnd = '';
+        }
+        
         $query->andFilterWhere([
             'id_warehouse' => $this->id_warehouse,
             'id_user' => $this->id_user,
diff --git a/backend/views/procurement/_search.php b/backend/views/procurement/_search.php
index f5d80c8..77846ad 100644
--- a/backend/views/procurement/_search.php
+++ b/backend/views/procurement/_search.php
@@ -17,8 +17,6 @@ function mkOptions($options){
 	
 	$all = ['' => Yii::t('common/product','All' ) ];
 	
-// 	$o[''] =   Yii::t('common/product','All' ) ;
-	
 	$o =  $all + $options;
 	
 	return $o;
diff --git a/backend/views/product/index.php b/backend/views/product/index.php
index fb624d8..6a6023e 100644
--- a/backend/views/product/index.php
+++ b/backend/views/product/index.php
@@ -48,13 +48,13 @@ $this->params['breadcrumbs'][] = $this->title;
              'template' => '{view} {update} {procurement}',
     		 'buttons' =>[
 					'view' => function ($url, $model, $key) {
-						return   Html::a( Yii::t('common/product', 'Details' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+						return   Html::a( Yii::t('common/product', 'Details' ), $url,[ 'class' => 'btn btn-xs btn-primary' ])  ;
 					},
 					'update' => function ($url, $model, $key) {
-						return   Html::a( Yii::t('common/product', 'Update' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+						return   Html::a( Yii::t('common/product', 'Update' ), $url,[ 'class' => 'btn btn-xs btn-primary' ])  ;
 					},
 					'procurement' => function ($url, $model, $key) {
-						return   Html::a( Yii::t('common/product', 'Procurement' ), $url,[ 'class' => 'btn btn-xs btn-success' ])  ;
+						return   Html::a( Yii::t('common/product', 'Procurement' ), $url,[ 'class' => 'btn btn-xs btn-primary' ])  ;
 					},
 				],
 				'urlCreator' => function ( $action, $model, $key, $index ){
diff --git a/composer.lock b/composer.lock
index 3c5cad6..a743e28 100644
--- a/composer.lock
+++ b/composer.lock
@@ -318,16 +318,16 @@
         },
         {
             "name": "kartik-v/bootstrap-fileinput",
-            "version": "v4.2.7",
+            "version": "v4.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
-                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78"
+                "reference": "e4906dd5ee852a5333d3ce4d19f69ee855efe844"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/0468bbba9c28c1250aca83eba9b33e32ec135f78",
-                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/e4906dd5ee852a5333d3ce4d19f69ee855efe844",
+                "reference": "e4906dd5ee852a5333d3ce4d19f69ee855efe844",
                 "shasum": ""
             },
             "type": "library",
@@ -362,20 +362,20 @@
                 "progress",
                 "upload"
             ],
-            "time": "2015-09-13 17:39:44"
+            "time": "2015-08-26 18:42:44"
         },
         {
             "name": "kartik-v/bootstrap-star-rating",
-            "version": "v3.5.4",
+            "version": "v3.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-star-rating.git",
-                "reference": "987777ee21a599bebbc545c743063fcee9833842"
+                "reference": "bd9c52db6ac71cb270620c1aee601d142ab2cc00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/987777ee21a599bebbc545c743063fcee9833842",
-                "reference": "987777ee21a599bebbc545c743063fcee9833842",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/bd9c52db6ac71cb270620c1aee601d142ab2cc00",
+                "reference": "bd9c52db6ac71cb270620c1aee601d142ab2cc00",
                 "shasum": ""
             },
             "type": "library",
@@ -403,7 +403,7 @@
                 "jquery",
                 "star"
             ],
-            "time": "2015-09-21 09:06:33"
+            "time": "2015-06-18 14:42:46"
         },
         {
             "name": "kartik-v/dependent-dropdown",
@@ -1036,16 +1036,16 @@
         },
         {
             "name": "kartik-v/yii2-widget-select2",
-            "version": "v2.0.3",
+            "version": "v2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-select2.git",
-                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db"
+                "reference": "585e8797d7982e0c9d09370b98b451a028a59439"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/e72880e7e8dfc845c112ed7df275bf1c929be6db",
-                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/585e8797d7982e0c9d09370b98b451a028a59439",
+                "reference": "585e8797d7982e0c9d09370b98b451a028a59439",
                 "shasum": ""
             },
             "require": {
@@ -1080,7 +1080,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2015-09-12 19:56:48"
+            "time": "2015-07-01 15:20:59"
         },
         {
             "name": "kartik-v/yii2-widget-sidenav",
@@ -1581,21 +1581,21 @@
         },
         {
             "name": "yiisoft/yii2-bootstrap",
-            "version": "2.0.4",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-bootstrap.git",
-                "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0"
+                "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
-                "reference": "1b6b1e61cf91c3cdd517d6a7e71d30bb212e4af0",
+                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
+                "reference": "1464f93834b1d5edb1f5625f7ffd6c3723fa4923",
                 "shasum": ""
             },
             "require": {
                 "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
-                "yiisoft/yii2": ">=2.0.4"
+                "yiisoft/yii2": ">=2.0.6"
             },
             "type": "yii2-extension",
             "extra": {
@@ -1627,7 +1627,7 @@
                 "bootstrap",
                 "yii2"
             ],
-            "time": "2015-05-10 22:08:17"
+            "time": "2015-09-23 17:48:24"
         },
         {
             "name": "yiisoft/yii2-composer",

From cdb77b7a4919b7752797078f787c8d49d6bffe3d Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 19:06:24 +0200
Subject: [PATCH 020/100] add procurement translatiosn

---
 backend/views/procurement/view.php        |  3 +-
 common/config/i18n.php                    |  3 ++
 common/messages/hu/app.php                |  1 +
 common/messages/hu/common/procurement.php | 40 +++++++++++++++++++++++
 common/messages/hu/common/product.php     |  3 ++
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 common/messages/hu/common/procurement.php

diff --git a/backend/views/procurement/view.php b/backend/views/procurement/view.php
index d29613a..ec2370b 100644
--- a/backend/views/procurement/view.php
+++ b/backend/views/procurement/view.php
@@ -6,7 +6,7 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\models\Procurement */
 
-$this->title = $model->id_procurement;
+$this->title = Yii::t('common/procurement','Procurement') .' ' .  $model->id_procurement;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/procurement', 'Procurements'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -42,7 +42,6 @@ $this->params['breadcrumbs'][] = $this->title;
 				'format' => 'raw'
 			],
             'created_at:datetime',
-            'updated_at:datetime',
         ],
     ]) ?>
 
diff --git a/common/config/i18n.php b/common/config/i18n.php
index df77983..1366edf 100644
--- a/common/config/i18n.php
+++ b/common/config/i18n.php
@@ -55,6 +55,9 @@ return [
     // Message categories to ignore
     'ignoreCategories' => [
         'yii',
+    	'fileinput',
+    	'kvdate',
+    	'kvdatetime',
     ],
 
     /*
diff --git a/common/messages/hu/app.php b/common/messages/hu/app.php
index fc44c90..fa06131 100644
--- a/common/messages/hu/app.php
+++ b/common/messages/hu/app.php
@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'It is recommended you use an upgraded browser to display the {type} control properly.' => 'Ajánlott újabb böngésző verziót használni!',
     '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',
diff --git a/common/messages/hu/common/procurement.php b/common/messages/hu/common/procurement.php
new file mode 100644
index 0000000..42fd7bc
--- /dev/null
+++ b/common/messages/hu/common/procurement.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Count' => 'Beszerzett mennyiség',
+    'Create' => 'Mentés',
+    'Create Procurement' => 'Új beszerzés',
+    'Created At' => 'Beszerzés ideje',
+    'Description' => 'Megjegyzés',
+    'Id Procurement' => 'Beszerzés azonosító',
+    'Id Product' => 'Termék',
+    'Id User' => 'Felhasználó',
+    'Id Warehouse' => 'Raktár',
+    'Invalid product' => 'Termék nincs megadva',
+    'No active warehouse found.' => 'Nem találtam aktív raktárat',
+    'Procurement' => 'Beszerzés',
+    'Procurements' => 'Beszerzések',
+    'Product name, product number or barcode' => 'Termék neve, termék száma vagy vonalkód',
+    'Purchase Price' => 'Beszerzési ár',
+    'Search' => 'Keresés',
+    'Stock' => 'Beszerzés előtti raktárkészlet',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása: ',
+    'Updated At' => 'Módosítva',
+];
diff --git a/common/messages/hu/common/product.php b/common/messages/hu/common/product.php
index da3e15f..9afa7e9 100644
--- a/common/messages/hu/common/product.php
+++ b/common/messages/hu/common/product.php
@@ -17,6 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Details' => 'Részletek',
+    'Procurement' => 'Beszerzés',
+    'Product' => 'Termék',
     'Active' => 'Aktív',
     'All' => 'Mind',
     'Barcode' => 'Vonalkód',

From 35e03b8f1d01d0f7029951290fe0426b5754c6b5 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 25 Sep 2015 19:19:08 +0200
Subject: [PATCH 021/100] add small chages

---
 common/messages/hu/common/procurement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/messages/hu/common/procurement.php b/common/messages/hu/common/procurement.php
index 42fd7bc..032889e 100644
--- a/common/messages/hu/common/procurement.php
+++ b/common/messages/hu/common/procurement.php
@@ -37,4 +37,4 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítása: ',
     'Updated At' => 'Módosítva',
-];
+];
\ No newline at end of file

From 7df9800fec5d9940e877c49428f1e62929251710 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sun, 27 Sep 2015 21:35:31 +0200
Subject: [PATCH 022/100] add city, customer and card model + crud

---
 backend/components/AdminMenuStructure.php     |    2 +
 backend/controllers/CardController.php        |  159 +
 backend/controllers/CityController.php        |  172 +
 backend/controllers/CustomerController.php    |  131 +
 backend/models/CardSearch.php                 |   88 +
 backend/models/CitySearch.php                 |   76 +
 backend/models/CustomerCreate.php             |  117 +
 backend/models/CustomerSearch.php             |  117 +
 backend/models/CustomerUpdate.php             |   96 +
 backend/views/card/_form.php                  |   29 +
 backend/views/card/_search.php                |   60 +
 backend/views/card/create.php                 |   21 +
 backend/views/card/index.php                  |   52 +
 backend/views/card/update.php                 |   23 +
 backend/views/card/view.php                   |   32 +
 backend/views/city/_form.php                  |   41 +
 backend/views/city/_search.php                |   47 +
 backend/views/city/create.php                 |   21 +
 backend/views/city/index.php                  |   44 +
 backend/views/city/update.php                 |   23 +
 backend/views/city/view.php                   |   45 +
 backend/views/customer/_form.php              |   61 +
 backend/views/customer/_form_create.php       |  128 +
 backend/views/customer/_form_update.php       |  132 +
 backend/views/customer/_search.php            |   38 +
 backend/views/customer/create.php             |   21 +
 backend/views/customer/index.php              |   56 +
 backend/views/customer/update.php             |   23 +
 backend/views/customer/view.php               |   56 +
 common/components/CardNumberTypeahead.php     |   52 +
 common/components/CityNameTypeahead.php       |   50 +
 common/components/CityZipTypeahead.php        |   50 +
 common/data/telepulesek.txt                   | 4154 +++++++++++++++++
 common/models/Card.php                        |  137 +
 common/models/City.php                        |   66 +
 common/models/Customer.php                    |  168 +
 composer.json                                 |    3 +-
 composer.lock                                 |    2 +-
 .../m150925_194508_add__table__customer.php   |   48 +
 .../m150925_201715_add__table__card.php       |   43 +
 .../m150926_123638_add__table__city.php       |   59 +
 ...50926_175400_add__data__to__city_table.php |   24 +
 42 files changed, 6765 insertions(+), 2 deletions(-)
 create mode 100644 backend/controllers/CardController.php
 create mode 100644 backend/controllers/CityController.php
 create mode 100644 backend/controllers/CustomerController.php
 create mode 100644 backend/models/CardSearch.php
 create mode 100644 backend/models/CitySearch.php
 create mode 100644 backend/models/CustomerCreate.php
 create mode 100644 backend/models/CustomerSearch.php
 create mode 100644 backend/models/CustomerUpdate.php
 create mode 100644 backend/views/card/_form.php
 create mode 100644 backend/views/card/_search.php
 create mode 100644 backend/views/card/create.php
 create mode 100644 backend/views/card/index.php
 create mode 100644 backend/views/card/update.php
 create mode 100644 backend/views/card/view.php
 create mode 100644 backend/views/city/_form.php
 create mode 100644 backend/views/city/_search.php
 create mode 100644 backend/views/city/create.php
 create mode 100644 backend/views/city/index.php
 create mode 100644 backend/views/city/update.php
 create mode 100644 backend/views/city/view.php
 create mode 100644 backend/views/customer/_form.php
 create mode 100644 backend/views/customer/_form_create.php
 create mode 100644 backend/views/customer/_form_update.php
 create mode 100644 backend/views/customer/_search.php
 create mode 100644 backend/views/customer/create.php
 create mode 100644 backend/views/customer/index.php
 create mode 100644 backend/views/customer/update.php
 create mode 100644 backend/views/customer/view.php
 create mode 100644 common/components/CardNumberTypeahead.php
 create mode 100644 common/components/CityNameTypeahead.php
 create mode 100644 common/components/CityZipTypeahead.php
 create mode 100644 common/data/telepulesek.txt
 create mode 100644 common/models/Card.php
 create mode 100644 common/models/City.php
 create mode 100644 common/models/Customer.php
 create mode 100644 console/migrations/m150925_194508_add__table__customer.php
 create mode 100644 console/migrations/m150925_201715_add__table__card.php
 create mode 100644 console/migrations/m150926_123638_add__table__city.php
 create mode 100644 console/migrations/m150926_175400_add__data__to__city_table.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 47b26a8..9611261 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -42,6 +42,8 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
 		$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
 		$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
+		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
+		$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/CardController.php b/backend/controllers/CardController.php
new file mode 100644
index 0000000..eb5777d
--- /dev/null
+++ b/backend/controllers/CardController.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Card;
+use backend\models\CardSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use yii\db\Query;
+use common\models\Customer;
+use yii\helpers\Json;
+
+/**
+ * CardController implements the CRUD actions for Card model.
+ */
+class CardController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Card models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CardSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Card model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Card model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Card();
+		$model->status = Card::STATUS_ACTIVE;
+		$model->type = Card::TYPE_RFID;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_card]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Card model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_card]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Card model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Card model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Card the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Card::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+    
+    
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'card.number as number',
+    			'customer.name as name',
+    			"concat( card.number , case when  customer.name is null then  '' else customer.name end  ) as txt ",
+    	] )->from (Card::tableName() )->join("left join", Customer::tableName(), 'card.id_card = customer.id_customer_card')->where ( ' lower(number) LIKE "%' . strtolower ( $search ) . '%"' )->orderBy ( 'number' ) ;
+    
+    	if ( isset($_GET['onlyFree'])  && $_GET['onlyFree'] == '1'){
+    		$query->andWhere( 'customer.id_customer is null' );
+    	}
+    	
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'number' => $d ['number'],
+    				'name' => $d ['name'],
+    				'txt' => $d ['txt'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+    
+    
+    
+}
diff --git a/backend/controllers/CityController.php b/backend/controllers/CityController.php
new file mode 100644
index 0000000..4a22b53
--- /dev/null
+++ b/backend/controllers/CityController.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\City;
+use backend\models\CitySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use yii\db\Query;
+use yii\helpers\Json;
+
+/**
+ * CityController implements the CRUD actions for City model.
+ */
+class CityController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all City models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CitySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single City model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new City model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new City();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_city]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing City model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_city]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing City model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the City model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return City the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = City::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+    
+    
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionNameList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'name',
+    			'min(zip) as zip',
+    			'concat( zip, \' \', name) as fullname'
+    	] )->from (City::tableName() )->where ( ' lower(name) LIKE "%' . strtolower ( $search ) . '%"' )->orderBy ( 'name' )->groupBy('name')->limit(20);
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'name' => $d ['name'],
+    				'zip' => $d ['zip'],
+    				'fullname' => $d ['fullname'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionZipList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'name',
+    			'min(zip) as zip',
+    			'concat( zip, \' \', name) as fullname'
+    	] )->from (City::tableName() )->where ( ' lower(zip) LIKE "%' . strtolower ( $search ) . '%"' )->orderBy ( 'name' )->groupBy('name')->limit(20);
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'name' => $d ['name'],
+    				'zip' => $d ['zip'],
+    				'fullname' => $d ['fullname'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+}
diff --git a/backend/controllers/CustomerController.php b/backend/controllers/CustomerController.php
new file mode 100644
index 0000000..e6e23e5
--- /dev/null
+++ b/backend/controllers/CustomerController.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Customer;
+use backend\models\CustomerSearch;
+use backend\models\CustomerCreate;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use backend\models\CustomerUpdate;
+
+/**
+ * CustomerController implements the CRUD actions for Customer model.
+ */
+class CustomerController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Customer models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CustomerSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Customer model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Customer model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new CustomerCreate();
+        
+        $model->country = "Magyarország";
+        $model->id_user = Yii::$app->user->id;
+        
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_customer]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Customer model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+   	   if (($model = CustomerUpdate::findOne($id))  == null) {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+        
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_customer]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Customer model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Customer model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Customer the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Customer::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/CardSearch.php b/backend/models/CardSearch.php
new file mode 100644
index 0000000..3ae466e
--- /dev/null
+++ b/backend/models/CardSearch.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Card;
+use common\models\Customer;
+
+/**
+ * CardSearch represents the model behind the search form about `common\models\Card`.
+ */
+class CardSearch extends Card
+{
+	
+	public $searchCustomerName;
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_card', 'status', 'type'], 'integer'],
+            [[ 'searchCustomerName', 'number', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Card::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+        
+        $dataProvider->sort ->attributes['customerName'] =[
+        		'asc' => ['customer.name' => SORT_ASC ],
+        		'desc' => ['customer.name' => SORT_DESC ],
+        ];
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->leftJoin(Customer::tableName(), 'customer.id_customer_card = card.id_card');
+        
+        $query->andFilterWhere([
+            'card.status' => $this->status,
+            'card.type' => $this->type,
+        ]);
+
+        $query->andFilterWhere(['like', 'card.number', $this->number]);
+        $query->andFilterWhere(['like', 'customer.name', $this->searchCustomerName]);
+
+        return $dataProvider;
+    }
+    
+    public function attributeLabels(){
+    	$result = parent::attributeLabels();
+    	$result +=[
+    		'searchCustomerName' => Yii::t('common/card','Customer')
+    	];
+    	return $result;
+    }
+    
+}
diff --git a/backend/models/CitySearch.php b/backend/models/CitySearch.php
new file mode 100644
index 0000000..8b49ee4
--- /dev/null
+++ b/backend/models/CitySearch.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\City;
+
+/**
+ * CitySearch represents the model behind the search form about `common\models\City`.
+ */
+class CitySearch extends City
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_city', 'cso_code', 'rig_id', 'population', 'homes'], 'integer'],
+            [['zip', 'name', 'city_code'], 'safe'],
+            [['latitude', 'longitude', 'range'], 'number'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = City::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_city' => $this->id_city,
+            'latitude' => $this->latitude,
+            'longitude' => $this->longitude,
+            'cso_code' => $this->cso_code,
+            'rig_id' => $this->rig_id,
+            'range' => $this->range,
+            'population' => $this->population,
+            'homes' => $this->homes,
+        ]);
+
+        $query->andFilterWhere(['like', 'zip', $this->zip])
+            ->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'city_code', $this->city_code]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/models/CustomerCreate.php b/backend/models/CustomerCreate.php
new file mode 100644
index 0000000..1e6cb40
--- /dev/null
+++ b/backend/models/CustomerCreate.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use common\models\Customer;
+use common\models\Card;
+
+/**
+ * This is the model class for table "customer".
+ *
+ * @property integer $id_customer
+ * @property integer $id_customer_card
+ * @property integer $id_user
+ * @property integer $id_partner_card
+ * @property integer $id_proposer
+ * @property string $name
+ * @property string $email
+ * @property string $password
+ * @property string $phone
+ * @property integer $sex
+ * @property string $date_stundent_card_expire
+ * @property string $birthdate
+ * @property string $image
+ * @property string $description
+ * @property string $tax_number
+ * @property string $country
+ * @property string $zip
+ * @property string $city
+ * @property string $address
+ * @property string $created_at
+ * @property string $updated_at
+ * @property string $cardNumber
+ */
+class CustomerCreate extends \common\models\Customer
+{
+	
+	public $cardNumber;
+	public $partnerCardNumber;
+	
+	public $password_plain;
+	public $password_repeat;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        		[['cardNumber'], 'required' ],
+        		[['cardNumber'], 'string', 'max' => 10],
+        		[['cardNumber'], 'validateCustomerCard' ],
+        		
+        		[['partnerCardNumber'], 'string', 'max' => 10],
+        		[['partnerCardNumber'], 'validatePartnerCard' ],
+        		
+        		[['name'], 'required' ],
+        		[['name'], 'string', 'max' => 128],
+
+        		[['email'], 'string', 'max' => 255],
+        		[['email'], 'email' ],
+        		[['email'], 'unique' ],
+        		
+        		[['password_plain','password_repeat'], 'string', 'max' => 32],
+        		
+        		[['sex'], 'integer'],
+        		
+        		[[ 'birthdate',  ], 'date'     ],
+        		[[ 'date_stundent_card_expire',  ], 'date'     ],
+        		
+        		[[ 'description', 'address'], 'string', 'max' => 255],
+        		
+        		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
+        		
+        		[['zip'], 'string', 'max' => 8],
+        		
+        		[['city'], 'string', 'max' => 30]
+        ];
+    }
+
+    
+    public function validateCustomerCard($a,$p){
+    	$card =  null;
+    	
+    	if ( !empty($this->cardNumber)){
+    	 	$card = Card::readCard($this->cardNumber,true);
+    	}
+    	 
+    	if ( $card == null ){
+    	 	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+    	}else{
+    	 	$this->id_customer_card = $card->id_card;
+    	 }
+    	 
+//     	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+    }
+    
+    public function validatePartnerCard($a,$p){
+    	if ( !empty($this->partnerCardNumber) ){
+	    	$card = Card::readCard($this->partnerCardNumber,true);
+	    	 if ( $card == null ){
+	    	 	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+	    	 }else{
+	    	 	$this->id_partner_card = $card->id_card;
+	    	 }
+    	}
+    }
+    
+}
diff --git a/backend/models/CustomerSearch.php b/backend/models/CustomerSearch.php
new file mode 100644
index 0000000..199fd04
--- /dev/null
+++ b/backend/models/CustomerSearch.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Customer;
+use common\models\Card;
+
+/**
+ * CustomerSearch represents the model behind the search form about `common\models\Customer`.
+ */
+class CustomerSearch extends Customer
+{
+	
+	public $cardNumber;
+	
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        		[['cardNumber', 'name', 'email'] ,'safe']
+//             [['id_customer', 'id_customer_card', 'id_user', 'id_partner_card', 'id_proposer', 'sex'], 'integer'],
+//             [['name', 'email', 'password', 'phone', 'date_stundent_card_expire', 'birthdate', 'image', 'description', 'tax_number', 'country', 'zip', 'city', 'address', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Customer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $dataProvider->sort ->attributes['customerCardNumber'] =[
+        		'asc' => ['card.number' => SORT_ASC ],
+        		'desc' => ['card.number' => SORT_DESC ],
+        ];
+        $dataProvider->sort->defaultOrder = [
+        		 'name' => SORT_ASC, 
+        ];
+        
+        
+//         $dataProvider->setSort(
+        		
+        		
+//         		[
+//         		'attributes' => [
+//         				'id',
+//         				'fullName' => [
+//         						'asc' => ['first_name' => SORT_ASC, 'last_name' => SORT_ASC],
+//         						'desc' => ['first_name' => SORT_DESC, 'last_name' => SORT_DESC],
+//         						'label' => 'Full Name',
+//         						'default' => SORT_ASC
+//         				],
+//         				'country_id'
+//         		]
+//         ]);
+        
+        
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->leftJoin(Card::tableName(), " customer.id_customer_card = card.id_card" );
+        
+//         $query->andFilterWhere([
+//             'id_customer' => $this->id_customer,
+//             'id_customer_card' => $this->id_customer_card,
+//             'id_user' => $this->id_user,
+//             'id_partner_card' => $this->id_partner_card,
+//             'id_proposer' => $this->id_proposer,
+//             'sex' => $this->sex,
+//             'date_stundent_card_expire' => $this->date_stundent_card_expire,
+//             'birthdate' => $this->birthdate,
+//             'created_at' => $this->created_at,
+//             'updated_at' => $this->updated_at,
+//         ]);
+
+        $query->andFilterWhere(['like', 'customer.name', $this->name])
+            ->andFilterWhere(['like', 'customer.email', $this->email])
+            ->andFilterWhere(['like', 'card.number', $this->cardNumber])
+            ->andFilterWhere(['like', 'address', $this->address]);
+
+        return $dataProvider;
+    }
+    
+    public function attributeLabels( ) {
+    	$labels = parent::attributeLabels();
+    	return $labels;
+    }
+}
diff --git a/backend/models/CustomerUpdate.php b/backend/models/CustomerUpdate.php
new file mode 100644
index 0000000..c715954
--- /dev/null
+++ b/backend/models/CustomerUpdate.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use common\models\Customer;
+
+/**
+ * This is the model class for table "customer".
+ *
+ * @property integer $id_customer
+ * @property integer $id_customer_card
+ * @property integer $id_user
+ * @property integer $id_partner_card
+ * @property integer $id_proposer
+ * @property string $name
+ * @property string $email
+ * @property string $password
+ * @property string $phone
+ * @property integer $sex
+ * @property string $date_stundent_card_expire
+ * @property string $birthdate
+ * @property string $image
+ * @property string $description
+ * @property string $tax_number
+ * @property string $country
+ * @property string $zip
+ * @property string $city
+ * @property string $address
+ * @property string $created_at
+ * @property string $updated_at
+ * @property string $cardNumber
+ */
+class CustomerUpdate extends \common\models\Customer
+{
+	
+	public $cardNumber;
+	public $partnerCardNumber;
+	
+	public $password_plain;
+	public $password_repeat;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+//         		[['cardNumber'], 'required' ],
+//         		[['cardNumber'], 'string', 'max' => 10],
+//         		[['cardNumber'], 'validateCustomerCard' ],
+        		
+        		[['partnerCardNumber'], 'string', 'max' => 10],
+        		[['partnerCardNumber'], 'validatePartnerCard' ],
+        		
+        		[['name'], 'required' ],
+        		[['name'], 'string', 'max' => 128],
+
+        		[['email'], 'string', 'max' => 255],
+        		[['email'], 'email' ],
+        		[['email'], 'unique' ],
+        		
+        		[['password_plain','password_repeat'], 'string', 'max' => 32],
+        		
+        		[['sex'], 'integer'],
+        		
+        		[[ 'birthdate',  ], 'date'     ],
+        		[[ 'date_stundent_card_expire',  ], 'date'     ],
+        		
+        		[[ 'description', 'address'], 'string', 'max' => 255],
+        		
+        		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
+        		
+        		[['zip'], 'string', 'max' => 8],
+        		
+        		[['city'], 'string', 'max' => 30]
+        ];
+    }
+
+    
+    public function validateCustomerCard($a,$p){
+//     	 Customer::find()->andWhere(  [$this->cardNumber )
+    }
+    public function validatePartnerCard($a,$p){
+//     	 Customer::find()->andWhere(  [$this->cardNumber )
+    }
+    
+}
diff --git a/backend/views/card/_form.php b/backend/views/card/_form.php
new file mode 100644
index 0000000..df5a94b
--- /dev/null
+++ b/backend/views/card/_form.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Card;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Card */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="card-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'status')->dropDownList(Card::statuses()) ?>
+
+    <?= $form->field($model, 'type')->dropDownList(Card::types()) ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/card', 'Create') : Yii::t('common/card', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/card/_search.php b/backend/views/card/_search.php
new file mode 100644
index 0000000..cf109b4
--- /dev/null
+++ b/backend/views/card/_search.php
@@ -0,0 +1,60 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Card;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\CardSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+
+function mkOptions($options){
+
+	$all = ['' => Yii::t('common/product','All' ) ];
+
+	$o =  $all + $options;
+
+	return $o;
+}
+
+
+$typeOptions = mkOptions(Card::types());
+$statusOptions = mkOptions(Card::statuses());
+
+
+?>
+<div class="card-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'number') ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'status')->dropDownList($statusOptions) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'type')->dropDownList($typeOptions) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'searchCustomerName')->textInput() ?>
+		</div>
+	</div>	
+	
+
+
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/card', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/card/create.php b/backend/views/card/create.php
new file mode 100644
index 0000000..ffe65db
--- /dev/null
+++ b/backend/views/card/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Card */
+
+$this->title = Yii::t('common/card', 'Create Card');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/card', 'Cards'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="card-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/card/index.php b/backend/views/card/index.php
new file mode 100644
index 0000000..94d6086
--- /dev/null
+++ b/backend/views/card/index.php
@@ -0,0 +1,52 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\CardSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/card', 'Cards');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="card-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/card', 'Create Card'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            [ 
+            		'attribute' => 'number',
+            		'value' => 'number'	
+    		],
+            [ 
+            		'attribute' => 'status',
+            		'value' => 'statusHuman'	
+    		],
+        	[
+        		'attribute' => 'type',
+        		'value' => 'typeHuman'
+        	],
+        	[
+        		'attribute' => 'customerName',
+        		'value' => 'customerName'
+        	],
+            'updated_at:datetime',
+
+            [
+            		'class' => 'yii\grid\ActionColumn',
+            		'template' => '{view}{update}'
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/card/update.php b/backend/views/card/update.php
new file mode 100644
index 0000000..81ef1b8
--- /dev/null
+++ b/backend/views/card/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Card */
+
+$this->title = Yii::t('common/card', 'Update {modelClass}: ', [
+    'modelClass' => 'Card',
+]) . ' ' . $model->id_card;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/card', 'Cards'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->number, 'url' => ['view', 'id' => $model->id_card]];
+$this->params['breadcrumbs'][] = Yii::t('common/card', 'Update');
+?>
+<div class="card-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/card/view.php b/backend/views/card/view.php
new file mode 100644
index 0000000..4ab4efd
--- /dev/null
+++ b/backend/views/card/view.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Card */
+
+$this->title = Yii::t('common/card','Card: ').$model->number;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/card', 'Cards'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="card-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/card', 'Update'), ['update', 'id' => $model->id_card], ['class' => 'btn btn-primary']) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'number',
+            ['attribute' => 'status', 'value' => $model->statusHuman],
+            ['attribute' => 'type', 'value' => $model->typeHuman],
+            'created_at:datetime',
+            'updated_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/city/_form.php b/backend/views/city/_form.php
new file mode 100644
index 0000000..2bf34fb
--- /dev/null
+++ b/backend/views/city/_form.php
@@ -0,0 +1,41 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\City */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="city-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'zip')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'city_code')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'latitude')->textInput() ?>
+
+    <?= $form->field($model, 'longitude')->textInput() ?>
+
+    <?= $form->field($model, 'cso_code')->textInput() ?>
+
+    <?= $form->field($model, 'rig_id')->textInput() ?>
+
+    <?= $form->field($model, 'range')->textInput() ?>
+
+    <?= $form->field($model, 'population')->textInput() ?>
+
+    <?= $form->field($model, 'homes')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/city', 'Create') : Yii::t('common/city', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/city/_search.php b/backend/views/city/_search.php
new file mode 100644
index 0000000..79776f9
--- /dev/null
+++ b/backend/views/city/_search.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\CitySearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="city-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_city') ?>
+
+    <?= $form->field($model, 'zip') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'city_code') ?>
+
+    <?= $form->field($model, 'latitude') ?>
+
+    <?php // echo $form->field($model, 'longitude') ?>
+
+    <?php // echo $form->field($model, 'cso_code') ?>
+
+    <?php // echo $form->field($model, 'rig_id') ?>
+
+    <?php // echo $form->field($model, 'range') ?>
+
+    <?php // echo $form->field($model, 'population') ?>
+
+    <?php // echo $form->field($model, 'homes') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/city', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/city', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/city/create.php b/backend/views/city/create.php
new file mode 100644
index 0000000..7ea4e8f
--- /dev/null
+++ b/backend/views/city/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\City */
+
+$this->title = Yii::t('common/city', 'Create City');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/city', 'Cities'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="city-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/city/index.php b/backend/views/city/index.php
new file mode 100644
index 0000000..da501fb
--- /dev/null
+++ b/backend/views/city/index.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\CitySearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/city', 'Cities');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="city-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/city', 'Create City'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_city',
+            'zip',
+            'name',
+            'city_code',
+            'latitude',
+            // 'longitude',
+            // 'cso_code',
+            // 'rig_id',
+            // 'range',
+            // 'population',
+            // 'homes',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/city/update.php b/backend/views/city/update.php
new file mode 100644
index 0000000..6d35cc1
--- /dev/null
+++ b/backend/views/city/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\City */
+
+$this->title = Yii::t('common/city', 'Update {modelClass}: ', [
+    'modelClass' => 'City',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/city', 'Cities'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_city]];
+$this->params['breadcrumbs'][] = Yii::t('common/city', 'Update');
+?>
+<div class="city-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/city/view.php b/backend/views/city/view.php
new file mode 100644
index 0000000..7d2b8e9
--- /dev/null
+++ b/backend/views/city/view.php
@@ -0,0 +1,45 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\City */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/city', 'Cities'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="city-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/city', 'Update'), ['update', 'id' => $model->id_city], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/city', 'Delete'), ['delete', 'id' => $model->id_city], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/city', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_city',
+            'zip',
+            'name',
+            'city_code',
+            'latitude',
+            'longitude',
+            'cso_code',
+            'rig_id',
+            'range',
+            'population',
+            'homes',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/customer/_form.php b/backend/views/customer/_form.php
new file mode 100644
index 0000000..004376f
--- /dev/null
+++ b/backend/views/customer/_form.php
@@ -0,0 +1,61 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_customer_card')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'id_partner_card')->textInput() ?>
+
+    <?= $form->field($model, 'id_proposer')->textInput() ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'sex')->textInput() ?>
+
+    <?= $form->field($model, 'date_stundent_card_expire')->textInput() ?>
+
+    <?= $form->field($model, 'birthdate')->textInput() ?>
+
+    <?= $form->field($model, 'image')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'description')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'zip')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'city')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/customer', 'Create') : Yii::t('common/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/customer/_form_create.php b/backend/views/customer/_form_create.php
new file mode 100644
index 0000000..036d453
--- /dev/null
+++ b/backend/views/customer/_form_create.php
@@ -0,0 +1,128 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Customer;
+use common\components\CityNameTypeahead;
+use common\components\CityZipTypeahead;
+use common\components\CardNumberTypeahead;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+	<div class='row'>
+		<div class='col-md-3'>
+		     <?php echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		</div>
+	</div>
+
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+   
+
+	<div class='row'>
+		<div class='col-md-3'>
+		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'birthdate')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'date_stundent_card_expire')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-2'>
+		    <?= $form->field($model, 'zip')->widget(CityZipTypeahead::className(),[
+		    		'pluginEvents' =>[
+		    				"typeahead:select" => "function(a,b) {
+		    			$('#customercreate-city').typeahead( 'val', b.name );
+				}",]
+		    ])?>
+		</div>
+		<div class='col-md-4'>
+		    <?php echo $form->field($model, 'city')->widget(CityNameTypeahead::className(),[
+		    	'pluginEvents' =>[	
+		    	"typeahead:select" => "function(a,b) {  
+		    			$('#customercreate-zip').typeahead( 'val', b.zip );
+				}",]
+		    		
+		    ])?>
+		</div>
+	</div>
+
+
+
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/customer', 'Create') : Yii::t('common/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/customer/_form_update.php b/backend/views/customer/_form_update.php
new file mode 100644
index 0000000..020ed85
--- /dev/null
+++ b/backend/views/customer/_form_update.php
@@ -0,0 +1,132 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Customer;
+use common\components\CityNameTypeahead;
+use common\components\CityZipTypeahead;
+use common\components\CardNumberTypeahead;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+	<div class='row'>
+		<div class='col-md-3'>
+		     <?php //echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
+		     <label><?php echo $model->getAttributeLabel('id_customer_card')?></label>
+		     <div>
+		     <?php echo $model->customerCardNumber ?>
+		     </div>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		</div>
+	</div>
+
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+   
+
+	<div class='row'>
+		<div class='col-md-3'>
+		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'birthdate')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'date_stundent_card_expire')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-2'>
+		    <?= $form->field($model, 'zip')->widget(CityZipTypeahead::className(),[
+		    		'pluginEvents' =>[
+		    				"typeahead:select" => "function(a,b) {
+		    			$('#customercreate-city').typeahead( 'val', b.name );
+				}",]
+		    ])?>
+		</div>
+		<div class='col-md-4'>
+		    <?php echo $form->field($model, 'city')->widget(CityNameTypeahead::className(),[
+		    	'pluginEvents' =>[	
+		    	"typeahead:select" => "function(a,b) {  
+		    			$('#customercreate-zip').typeahead( 'val', b.zip );
+				}",]
+		    		
+		    ])?>
+		</div>
+	</div>
+
+
+
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/customer', 'Create') : Yii::t('common/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/customer/_search.php b/backend/views/customer/_search.php
new file mode 100644
index 0000000..f455272
--- /dev/null
+++ b/backend/views/customer/_search.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\CustomerSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+	<div class='row'>
+		<div class='col-md-4'>
+    		<?= $form->field($model, 'cardNumber') ?>
+		</div>
+		<div class='col-md-4'>
+    	<?php echo $form->field($model, 'name') ?>
+		</div>
+		<div class='col-md-4'>
+	    <?php  echo $form->field($model, 'email') ?>
+		</div>
+	</div>
+
+
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/customer', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/customer/create.php b/backend/views/customer/create.php
new file mode 100644
index 0000000..eff48d7
--- /dev/null
+++ b/backend/views/customer/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = Yii::t('common/customer', 'Create Customer');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_create', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/customer/index.php b/backend/views/customer/index.php
new file mode 100644
index 0000000..db4c9e4
--- /dev/null
+++ b/backend/views/customer/index.php
@@ -0,0 +1,56 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\CustomerSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/customer', 'Customers');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/customer', 'Create Customer'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+			[
+				'attribute' => 'customerCardNumber'	,
+// 				'value' => 'customerCardNumber'
+			],
+//             'id_user',
+//             'id_partner_card',
+//             'id_proposer',
+            'name',
+            'email:email',
+            // 'password',
+            'phone',
+            // 'sex',
+            // 'date_stundent_card_expire',
+            // 'birthdate',
+            // 'image',
+            // 'description',
+            // 'tax_number',
+            // 'country',
+            // 'zip',
+            // 'city',
+            // 'address',
+            'created_at:datetime',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn',
+             'template' =>'{view}{update}'		
+            		
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/customer/update.php b/backend/views/customer/update.php
new file mode 100644
index 0000000..b0e396a
--- /dev/null
+++ b/backend/views/customer/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = Yii::t('common/customer', 'Update {modelClass}: ', [
+    'modelClass' => 'Customer',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_customer]];
+$this->params['breadcrumbs'][] = Yii::t('common/customer', 'Update');
+?>
+<div class="customer-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_update', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/customer/view.php b/backend/views/customer/view.php
new file mode 100644
index 0000000..7029491
--- /dev/null
+++ b/backend/views/customer/view.php
@@ -0,0 +1,56 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/customer', 'Update'), ['update', 'id' => $model->id_customer], ['class' => 'btn btn-primary']) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+        	[
+        		'attribute' => 'id_customer_card',
+        		'value' => $model->customerCardNumber
+        	],
+        	[
+        		'attribute' => 'id_user',
+        		'value' => $model->username
+        	],
+            'id_partner_card',
+            'id_proposer',
+            'name',
+            'email:email',
+            'password',
+            'phone',
+        		[
+        		'attribute' => 'sex',
+        		'value' => $model->sexHuman
+        		],
+            'date_stundent_card_expire',
+            'birthdate:date',
+            'image',
+            'description',
+            'tax_number',
+            'country',
+            'zip',
+            'city',
+            'address',
+            'created_at:datetime',
+            'updated_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/components/CardNumberTypeahead.php b/common/components/CardNumberTypeahead.php
new file mode 100644
index 0000000..8f805a7
--- /dev/null
+++ b/common/components/CardNumberTypeahead.php
@@ -0,0 +1,52 @@
+<?php
+namespace common\components;
+
+use Yii;
+use kartik\widgets\Typeahead;
+use yii\helpers\Url;
+use yii\web\JsExpression;
+
+
+class CardNumberTypeahead extends Typeahead{
+	
+	public $item_template = '<div><p class="">{{txt}}</p></div>';
+	
+	public $options = ['placeholder' => 'Válassz bérletkártyát!'];
+	
+	public $pluginOptions = ['highlight'=>true , 'minLength' => 3 ];
+	
+	public $scrollable = true;
+	
+	public $display = 'number';
+	
+	public $pluginEvents = [	"typeahead:select" => "function(a,b) {   }",];
+	
+	public $onlyFreeCards = true;
+			 
+	
+	
+	public function init(){
+		parent::init();
+		$this->dataset = $this->createDefaultDataset();
+	}
+	
+	protected function createDefaultDataset(){
+		return [
+    				[
+    					'limit' => 20,
+    					'remote' => [
+    							'ttl' => 1,
+    							'url' => Url::to(['card/list']) . '&onlyFree='.($this->onlyFreeCards ?  '1' :'0').'&search=%QUERY&' . rand(0, 100000000),
+    							'wildcard' => '%QUERY'
+    						],
+    						'limit' => 10,
+    						'display' => $this->display,
+    						'templates' => [
+	    						'notFound' => '<div class="text-danger" style="padding:0 8px">Unable to find number for selected query.</div>',
+	    						'suggestion' => new JsExpression("Handlebars.compile('{$this->item_template}')")
+    						]
+    			]
+		];
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/CityNameTypeahead.php b/common/components/CityNameTypeahead.php
new file mode 100644
index 0000000..f427580
--- /dev/null
+++ b/common/components/CityNameTypeahead.php
@@ -0,0 +1,50 @@
+<?php
+namespace common\components;
+
+use Yii;
+use kartik\widgets\Typeahead;
+use yii\helpers\Url;
+use yii\web\JsExpression;
+
+
+class CityNameTypeahead extends Typeahead{
+	
+	public $item_template = '<div><p class="">{{fullname}}</p></div>';
+	
+	public $options = ['placeholder' => 'Válassz várost'];
+	
+	public $pluginOptions = ['highlight'=>true];
+	
+	public $scrollable = true;
+	
+	public $display = 'name';
+	
+	public $pluginEvents = [	"typeahead:select" => "function(a,b) {   }",];
+			 
+	
+	
+	public function init(){
+		parent::init();
+		$this->dataset = $this->createDefaultDataset();
+	}
+	
+	protected function createDefaultDataset(){
+		return [
+    				[
+    					'limit' => 20,
+    					'remote' => [
+    							'ttl' => 1,
+    							'url' => Url::to(['city/name-list']) . '&search=%QUERY&' . rand(0, 100000000),
+    							'wildcard' => '%QUERY'
+    						],
+    						'limit' => 10,
+    						'display' => $this->display,
+    						'templates' => [
+	    						'notFound' => '<div class="text-danger" style="padding:0 8px">Unable to find repositories for selected query.</div>',
+	    						'suggestion' => new JsExpression("Handlebars.compile('{$this->item_template}')")
+    						]
+    			]
+		];
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/CityZipTypeahead.php b/common/components/CityZipTypeahead.php
new file mode 100644
index 0000000..24397d7
--- /dev/null
+++ b/common/components/CityZipTypeahead.php
@@ -0,0 +1,50 @@
+<?php
+namespace common\components;
+
+use Yii;
+use kartik\widgets\Typeahead;
+use yii\helpers\Url;
+use yii\web\JsExpression;
+
+
+class CityZipTypeahead extends Typeahead{
+	
+	public $item_template = '<div><p class="">{{fullname}}</p></div>';
+	
+	public $options = ['placeholder' => 'Válassz irányítószám'];
+	
+	public $pluginOptions = ['highlight'=>true];
+	
+	public $scrollable = true;
+	
+	public $display = 'zip';
+	
+	public $pluginEvents = [	"typeahead:select" => "function(a,b) {   }",];
+			 
+	
+	
+	public function init(){
+		parent::init();
+		$this->dataset = $this->createDefaultDataset();
+	}
+	
+	protected function createDefaultDataset(){
+		return [
+    				[
+    					'limit' => 20,
+    					'remote' => [
+    							'ttl' => 1,
+    							'url' => Url::to(['city/zip-list']) . '&search=%QUERY&' . rand(0, 100000000),
+    							'wildcard' => '%QUERY'
+    						],
+    						'limit' => 10,
+    						'display' => $this->display,
+    						'templates' => [
+	    						'notFound' => '<div class="text-danger" style="padding:0 8px">Unable to find repositories for selected query.</div>',
+	    						'suggestion' => new JsExpression("Handlebars.compile('{$this->item_template}')")
+    						]
+    			]
+		];
+	}
+	
+}
\ No newline at end of file
diff --git a/common/data/telepulesek.txt b/common/data/telepulesek.txt
new file mode 100644
index 0000000..31a57f0
--- /dev/null
+++ b/common/data/telepulesek.txt
@@ -0,0 +1,4154 @@
+1011	Budapest I. kerület	BU	47.5011	19.0469	09566	2	341	24728	16600
+1012	Budapest I. kerület	BU	47.5	19.0833	09566	2	341	24728	16600
+1013	Budapest I. kerület	BU	47.4961	19.0309	09566	2	341	24728	16600
+1014	Budapest I. kerület	BU	47.5034	19.0349	09566	2	341	24728	16600
+1015	Budapest I. kerület	BU	47.5	19.0833	09566	2	341	24728	16600
+1016	Budapest I. kerület	BU	47.48	19.02	09566	2	341	24728	16600
+1021	Budapest II. kerület	BU	47.496	19.0771	03179	2	3634	88729	47668
+1022	Budapest II. kerület	BU	47.5	19.0833	03179	2	3634	88729	47668
+1023	Budapest II. kerület	BU	47.521	19.0347	03179	2	3634	88729	47668
+1024	Budapest II. kerület	BU	47.507	19.0569	03179	2	3634	88729	47668
+1025	Budapest II. kerület	BU	47.403	19.0915	03179	2	3634	88729	47668
+1026	Budapest II. kerület	BU	47.5117	19.0131	03179	2	3634	88729	47668
+1027	Budapest II. kerület	BU	47.5083	19.0386	03179	2	3634	88729	47668
+1028	Budapest II. kerület	BU	47.5	19.0833	03179	2	3634	88729	47668
+1029	Budapest II. kerület	BU	47.5	19.0833	03179	2	3634	88729	47668
+1031	Budapest III. kerület	BU	47.5729	19.0538	18069	2	3970	123723	61137
+1032	Budapest III. kerület	BU	47.5	19.0833	18069	2	3970	123723	61137
+1033	Budapest III. kerület	BU	47.5	19.0833	18069	2	3970	123723	61137
+1034	Budapest III. kerület	BU	47.5	19.0833	18069	2	3970	123723	61137
+1035	Budapest III. kerület	BU	47.5	19.0833	18069	2	3970	123723	61137
+1036	Budapest III. kerület	BU	47.5328	19.0419	18069	2	3970	123723	61137
+1037	Budapest III. kerület	BU	47.5	19.0833	18069	2	3970	123723	61137
+1038	Budapest III. kerület	BU	47.5915	19.0486	18069	2	3970	123723	61137
+1039	Budapest III. kerület	BU	47.5562	19.0684	18069	2	3970	123723	61137
+1041	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1042	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1043	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1044	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1045	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1046	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1047	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1048	Budapest IV. kerület	BU	47.5	19.0833	05467	2	1882	98374	47019
+1051	Budapest V. kerület	BU	47.4986	19.0499	13392	2	259	27283	19250
+1052	Budapest V. kerület	BU	47.4968	19.0555	13392	2	259	27283	19250
+1053	Budapest V. kerület	BU	47.4839	19.0597	13392	2	259	27283	19250
+1054	Budapest V. kerület	BU	47.5068	19.0526	13392	2	259	27283	19250
+1055	Budapest V. kerület	BU	47.5	19.0833	13392	2	259	27283	19250
+1056	Budapest V. kerület	BU	47.4926	19.0516	13392	2	259	27283	19250
+1061	Budapest VI. kerület	BU	47.4996	19.0574	16586	2	238	42120	26049
+1062	Budapest VI. kerület	BU	47.525	19.0766	16586	2	238	42120	26049
+1063	Budapest VI. kerület	BU	47.5102	19.0702	16586	2	238	42120	26049
+1064	Budapest VI. kerület	BU	47.5062	19.069	16586	2	238	42120	26049
+1065	Budapest VI. kerület	BU	47.4767	19.0851	16586	2	238	42120	26049
+1066	Budapest VI. kerület	BU	47.5075	19.0589	16586	2	238	42120	26049
+1067	Budapest VI. kerület	BU	47.5077	19.0602	16586	2	238	42120	26049
+1068	Budapest VI. kerület	BU	47.5096	19.0717	16586	2	238	42120	26049
+1071	Budapest VII. kerület	BU	47.5	19.0833	29744	2	209	62530	36577
+1072	Budapest VII. kerület	BU	47.4997	19.0716	29744	2	209	62530	36577
+1073	Budapest VII. kerület	BU	47.4992	19.0718	29744	2	209	62530	36577
+1074	Budapest VII. kerület	BU	47.4768	19.071	29744	2	209	62530	36577
+1075	Budapest VII. kerület	BU	47.4971	19.0566	29744	2	209	62530	36577
+1076	Budapest VII. kerület	BU	47.5	19.0833	29744	2	209	62530	36577
+1077	Budapest VII. kerület	BU	47.5007	19.0786	29744	2	209	62530	36577
+1078	Budapest VII. kerület	BU	47.5034	19.0821	29744	2	209	62530	36577
+1081	Budapest VIII. kerület	BU	47.4946	19.0776	25405	2	685	82222	41816
+1082	Budapest VIII. kerület	BU	47.514	19.0788	25405	2	685	82222	41816
+1083	Budapest VIII. kerület	BU	47.5	19.0833	25405	2	685	82222	41816
+1084	Budapest VIII. kerület	BU	47.5	19.0833	25405	2	685	82222	41816
+1085	Budapest VIII. kerület	BU	47.497	19.0756	25405	2	685	82222	41816
+1086	Budapest VIII. kerület	BU	47.5	19.0833	25405	2	685	82222	41816
+1087	Budapest VIII. kerület	BU	47.4996	19.0817	25405	2	685	82222	41816
+1088	Budapest VIII. kerület	BU	47.4902	19.0905	25405	2	685	82222	41816
+1089	Budapest VIII. kerület	BU	47.4935	19.0882	25405	2	685	82222	41816
+1091	Budapest IX. kerület	BU	47.5	19.0833	29586	2	1253	61576	38982
+1092	Budapest IX. kerület	BU	47.5	19.0833	29586	2	1253	61576	38982
+1093	Budapest IX. kerület	BU	47.4919	19.0691	29586	2	1253	61576	38982
+1094	Budapest IX. kerület	BU	47.481	19.0724	29586	2	1253	61576	38982
+1095	Budapest IX. kerület	BU	47.4845	19.0492	29586	2	1253	61576	38982
+1096	Budapest IX. kerület	BU	47.5	19.0833	29586	2	1253	61576	38982
+1097	Budapest IX. kerület	BU	47.4892	19.074	29586	2	1253	61576	38982
+1098	Budapest IX. kerület	BU	47.5	19.0833	29586	2	1253	61576	38982
+1101	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1102	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1103	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1104	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1105	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1106	Budapest X. kerület	BU	47.5032	19.1367	10700	2	3249	79270	37353
+1107	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1108	Budapest X. kerület	BU	47.5	19.0833	10700	2	3249	79270	37353
+1111	Budapest XI. kerület	BU	47.482	19.0536	14216	2	3349	139049	73690
+1112	Budapest XI. kerület	BU	47.4734	19.0076	14216	2	3349	139049	73690
+1113	Budapest XI. kerület	BU	47.4748	19.037	14216	2	3349	139049	73690
+1114	Budapest XI. kerület	BU	47.5	19.0833	14216	2	3349	139049	73690
+1115	Budapest XI. kerület	BU	47.5	19.0833	14216	2	3349	139049	73690
+1116	Budapest XI. kerület	BU	47.444	19.041	14216	2	3349	139049	73690
+1117	Budapest XI. kerület	BU	47.501	19.038	14216	2	3349	139049	73690
+1118	Budapest XI. kerület	BU	47.4846	19.0334	14216	2	3349	139049	73690
+1119	Budapest XI. kerület	BU	47.4571	19.0402	14216	2	3349	139049	73690
+1121	Budapest XII. kerület	BU	47.5014	19.0078	24697	2	2667	56544	33468
+1122	Budapest XII. kerület	BU	47.5	19.0833	24697	2	2667	56544	33468
+1123	Budapest XII. kerület	BU	47.4942	19.024	24697	2	2667	56544	33468
+1124	Budapest XII. kerület	BU	47.5	19.0833	24697	2	2667	56544	33468
+1125	Budapest XII. kerület	BU	47.5	19.0833	24697	2	2667	56544	33468
+1126	Budapest XII. kerület	BU	47.5	19.0833	24697	2	2667	56544	33468
+1131	Budapest XIII. kerület	BU	47.5	19.0833	24299	2	1344	113531	70249
+1132	Budapest XIII. kerület	BU	47.4968	19.0776	24299	2	1344	113531	70249
+1133	Budapest XIII. kerület	BU	47.5223	19.0564	24299	2	1344	113531	70249
+1134	Budapest XIII. kerület	BU	47.5243	19.0647	24299	2	1344	113531	70249
+1135	Budapest XIII. kerület	BU	47.5354	19.0818	24299	2	1344	113531	70249
+1136	Budapest XIII. kerület	BU	47.5	19.0833	24299	2	1344	113531	70249
+1137	Budapest XIII. kerület	BU	47.5086	19.0624	24299	2	1344	113531	70249
+1138	Budapest XIII. kerület	BU	47.5239	19.0455	24299	2	1344	113531	70249
+1139	Budapest XIII. kerület	BU	47.5	19.0833	24299	2	1344	113531	70249
+1141	Budapest XIV. kerület	BU	47.4992	19.0688	16337	2	1813	120148	70146
+1142	Budapest XIV. kerület	BU	47.515	19.0936	16337	2	1813	120148	70146
+1143	Budapest XIV. kerület	BU	47.5139	19.1268	16337	2	1813	120148	70146
+1144	Budapest XIV. kerület	BU	47.5	19.0833	16337	2	1813	120148	70146
+1145	Budapest XIV. kerület	BU	47.5141	19.1038	16337	2	1813	120148	70146
+1146	Budapest XIV. kerület	BU	47.5067	19.0836	16337	2	1813	120148	70146
+1147	Budapest XIV. kerület	BU	47.5	19.0833	16337	2	1813	120148	70146
+1148	Budapest XIV. kerület	BU	47.504	19.1192	16337	2	1813	120148	70146
+1149	Budapest XIV. kerület	BU	47.5139	19.1268	16337	2	1813	120148	70146
+1151	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1152	Budapest XV. kerület	BU	47.5481	19.1306	11314	2	2694	80218	38177
+1153	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1154	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1155	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1156	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1157	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1158	Budapest XV. kerület	BU	47.5	19.0833	11314	2	2694	80218	38177
+1161	Budapest XVI. kerület	BU	47.5	19.0833	08208	2	3351	68484	29383
+1162	Budapest XVI. kerület	BU	47.5	19.0833	08208	2	3351	68484	29383
+1163	Budapest XVI. kerület	BU	47.5	19.0833	08208	2	3351	68484	29383
+1164	Budapest XVI. kerület	BU	47.5	19.0833	08208	2	3351	68484	29383
+1165	Budapest XVI. kerület	BU	47.5	19.0833	08208	2	3351	68484	29383
+1171	Budapest XVII. kerület	BU	47.5	19.0833	02112	2	5482	78250	30971
+1172	Budapest XVII. kerület	BU	47.5	19.0833	02112	2	5482	78250	30971
+1173	Budapest XVII. kerület	BU	47.5231	19.0554	02112	2	5482	78250	30971
+1174	Budapest XVII. kerület	BU	47.5	19.0833	02112	2	5482	78250	30971
+1181	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1182	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1183	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1184	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1185	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1186	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1188	Budapest XVIII. kerület	BU	47.5	19.0833	29285	2	3860	93225	42467
+1191	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1192	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1193	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1194	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1195	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1196	Budapest XIX. kerület	BU	47.5	19.0833	04011	2	938	61610	27225
+1201	Budapest XX. kerület	BU	47.5	19.0833	06026	2	1218	63371	30299
+1202	Budapest XX. kerület	BU	47.5	19.0833	06026	2	1218	63371	30299
+1203	Budapest XX. kerület	BU	47.5	19.0833	06026	2	1218	63371	30299
+1204	Budapest XX. kerület	BU	47.5	19.0833	06026	2	1218	63371	30299
+1205	Budapest XX. kerület	BU	47.5	19.0833	06026	2	1218	63371	30299
+1211	Budapest XXI. kerület	BU	47.5	19.0833	13189	2	2575	76339	32634
+1212	Budapest XXI. kerület	BU	47.484	19.123	13189	2	2575	76339	32634
+1213	Budapest XXI. kerület	BU	47.5	19.0833	13189	2	2575	76339	32634
+1214	Budapest XXI. kerület	BU	47.5	19.0833	13189	2	2575	76339	32634
+1215	Budapest XXI. kerület	BU	47.5	19.0833	13189	2	2575	76339	32634
+1221	Budapest XXII. kerület	BU	47.5	19.0833	10214	2	3425	50499	21248
+1222	Budapest XXII. kerület	BU	47.5	19.0833	10214	2	3425	50499	21248
+1223	Budapest XXII. kerület	BU	47.5	19.0833	10214	2	3425	50499	21248
+1224	Budapest XXII. kerület	BU	47.5	19.0833	10214	2	3425	50499	21248
+1225	Budapest XXII. kerület	BU	47.5	19.0833	10214	2	3425	50499	21248
+1237	Budapest XXIII. kerület	BU	47.5	19.0833	34139	2	4077	20387	8592
+1238	Budapest XXIII. kerület	BU	47.5	19.0833	34139	2	4077	20387	8592
+1239	Budapest XXIII. kerület	BU	47.5	19.0833	34139	2	4077	20387	8592
+1529	Budapest XII. kerület	BU	47.5	19.0833	24697	2	2667	56544	33468
+2000	Szentendre	PE	47.6667	19.0833	15440	4	4382	25401	9519
+2001	Szentendre	PE	47.6667	19.0833	15440	4	4382	25401	9519
+2002	Szentendre	PE	47.6667	19.0833	15440	4	4382	25401	9519
+2003	Szentendre	PE	47.6667	19.0833	15440	4	4382	25401	9519
+2009	Pilisszentlászló	PE	47.7167	19	08457	6	1775	1123	427
+2011	Budakalász	PE	47.6167	19.05	23463	5	1517	10299	3638
+2012	Budakalász	PE	47.6167	19.05	23463	5	1517	10299	3638
+2013	Budakalász	PE	47.6167	19.05	23463	5	1517	10299	3638
+2014	Csobánka	PE	47.6333	18.9667	06822	6	2276	3169	989
+2015	Szigetmonostor	PE	47.6833	19.1167	26213	6	2351	2213	708
+2016	Leányfalu	PE	47.7167	19.0833	30809	5	1537	3475	1153
+2017	Pócsmegyer	PE	47.7167	19.1	04905	6	1308	1733	566
+2019	Pomáz	PE	47.65	19.0333	06372	4	4903	16677	5685
+2021	Tahitótfalu	PE	47.75	19.1	31963	6	3917	5404	1971
+2022	Tahitótfalu	PE	47.75	19.1	31963	6	3917	5404	1971
+2023	Dunabogdány	PE	47.7833	19.0333	25362	6	2550	3143	1116
+2024	Kisoroszi	PE	47.8	19.0167	29850	6	1094	938	411
+2025	Visegrád	PE	47.7833	18.9833	28413	4	3327	1831	718
+2026	Visegrád	PE	47.7833	18.9833	28413	4	3327	1831	718
+2027	Dömös	KE	47.7667	18.9167	06594	6	2398	1167	486
+2028	Pilismarót	KE	47.7833	18.8833	14669	6	4459	2072	738
+2030	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2031	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2032	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2033	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2035	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2036	Érd	PE	47.3667	18.9333	30988	3	6054	63669	21993
+2038	Sóskút	PE	47.4	18.8333	06840	6	2767	3160	1109
+2039	Pusztazámor	PE	47.4	18.7833	15583	6	927	1166	437
+2040	Budaörs	PE	47.4531	18.9602	23278	4	2359	28272	10269
+2041	Budaörs	PE	47.45	18.9667	23278	4	2359	28272	10269
+2042	Budaörs	PE	47.45	18.9667	23278	4	2359	28272	10269
+2043	Budaörs	PE	47.45	18.9667	23278	4	2359	28272	10269
+2044	Budaörs	PE	47.45	18.9667	23278	4	2359	28272	10269
+2045	Törökbálint	PE	47.4333	18.9167	06859	4	2940	13010	4507
+2046	Törökbálint	PE	47.4333	18.9167	06859	4	2940	13010	4507
+2047	Törökbálint	PE	47.4333	18.9167	06859	4	2940	13010	4507
+2049	Diósd	PE	47.4	18.95	24013	6	575	8612	3105
+2050	Diósd	PE	47.4	18.95	24013	6	575	8612	3105
+2051	Biatorbágy	PE	47.4667	18.8167	08891	4	4380	11769	4082
+2052	Biatorbágy	PE	47.4667	18.8167	08891	4	4380	11769	4082
+2053	Herceghalom	PE	47.5	18.75	33552	6	734	1883	616
+2055	Herceghalom	PE	47.5	18.75	33552	6	734	1883	616
+2056	Herceghalom	PE	47.5	18.75	33552	6	734	1883	616
+2060	Bicske	FE	47.4833	18.6333	10481	4	7708	11552	3997
+2061	Bicske	FE	47.4833	18.6333	10481	4	7708	11552	3997
+2063	Bicske	FE	47.4833	18.6333	10481	4	7708	11552	3997
+2064	Csabdi	FE	47.5167	18.6167	30544	6	1702	1205	432
+2065	Mány	FE	47.5333	18.6667	23490	6	4472	2372	781
+2066	Újbarok	FE	47.4833	18.5667	17482	6	149	415	143
+2066	Szár	FE	47.4833	18.5167	19549	6	2263	1675	580
+2067	Szárliget	FE	47.4952	18.6095	33491	6	1456	2328	809
+2071	Páty	PE	47.5167	18.8333	15024	6	3930	6773	2011
+2072	Zsámbék	PE	47.55	18.7167	25034	5	3366	5284	1640
+2073	Tök	PE	47.5667	18.7333	24527	6	2473	1384	532
+2074	Perbál	PE	47.6	18.7667	28185	6	2565	2192	748
+2080	Pilisjászfalu	PE	47.6042	18.8521	34148	6	697	1435	467
+2081	Piliscsaba	PE	47.6167	18.8333	07144	5	2557	7873	2468
+2082	Piliscsaba	PE	47.6167	18.8333	07144	5	2557	7873	2468
+2083	Solymár	PE	47.5833	18.9333	07384	5	1786	10043	3711
+2084	Pilisszentiván	PE	47.6167	18.9	11396	6	812	4303	1589
+2085	Pilisvörösvár	PE	47.6167	18.9167	14340	4	2430	13463	4565
+2086	Tinnye	PE	47.6167	18.7833	07108	6	1610	1576	559
+2087	Tinnye	PE	47.6167	18.7833	07108	6	1610	1576	559
+2089	Telki	PE	47.55	18.8333	08280	6	1047	3448	1062
+2090	Remeteszőlős	PE	47.6	18.8981	34315	6	56	651	206
+2091	Etyek	FE	47.45	18.75	02316	6	5327	4236	1469
+2092	Budakeszi	PE	47.5167	18.9333	12052	4	3710	13933	5382
+2093	Budajenő	PE	47.55	18.8	03407	6	1242	1701	570
+2094	Nagykovácsi	PE	47.5833	18.8833	09991	5	3001	6310	2175
+2095	Pilisszántó	PE	47.6667	18.9	05290	6	1596	2467	817
+2096	Üröm	PE	47.6	19.0167	11934	6	668	6937	2429
+2097	Pilisborosjenő	PE	47.6167	19	29601	6	927	3453	1226
+2098	Pilisszentkereszt	PE	47.7	18.9	18731	6	1721	2270	788
+2099	Dobogókő	PE	47.7167	18.9	18731	6	1721	2270	788
+2100	Gödöllő	PE	47.6	19.3667	32559	4	6197	33575	12070
+2101	Gödöllő	PE	47.6	19.3667	32559	4	6197	33575	12070
+2102	Gödöllő	PE	47.6	19.3667	32559	4	6197	33575	12070
+2103	Gödöllő	PE	47.6	19.3667	32559	4	6197	33575	12070
+2105	Gödöllő	PE	47.6	19.3667	32559	4	6197	33575	12070
+2111	Szada	PE	47.6333	19.3167	21458	6	1671	4355	1630
+2112	Veresegyház	PE	47.65	19.2833	18342	4	2856	15633	5149
+2113	Erdőkertes	PE	47.6667	19.3167	13480	6	575	7437	2591
+2114	Valkó	PE	47.5667	19.5167	17598	5	3759	2541	827
+2115	Vácszentlászló	PE	47.5833	19.5333	09104	6	2987	2115	730
+2116	Zsámbok	PE	47.55	19.6167	22035	6	2335	2414	995
+2117	Isaszeg	PE	47.5333	19.4	07807	4	5483	11214	3641
+2118	Dány	PE	47.5167	19.55	18397	6	4301	4364	1463
+2119	Pécel	PE	47.4833	19.35	04057	4	4364	14868	4839
+2120	Dunakeszi	PE	47.6333	19.1333	18616	4	3106	37153	14715
+2121	Dunakeszi	PE	47.6333	19.1333	18616	4	3106	37153	14715
+2122	Dunakeszi	PE	47.6333	19.1333	18616	4	3106	37153	14715
+2123	Dunakeszi	PE	47.6333	19.1333	18616	4	3106	37153	14715
+2131	Göd	PE	47.7	19.1333	23649	4	2224	17587	6531
+2132	Göd	PE	47.6976	19.1539	23649	4	2224	17587	6531
+2133	Sződliget	PE	47.7333	19.15	28866	6	731	4552	1501
+2134	Sződ	PE	47.7167	19.2	12690	6	1576	3270	1145
+2135	Csörög	PE	47.7333	19.1833	34333	6	504	2174	583
+2141	Csömör	PE	47.55	19.2333	22804	5	2270	8904	3043
+2142	Nagytarcsa	PE	47.5333	19.2833	23409	6	1214	3539	1110
+2143	Kistarcsa	PE	47.5333	19.2667	34157	4	1102	10986	3715
+2144	Kerepes	PE	47.5333	19.2667	34166	5	2408	9960	3304
+2145	Kerepes	PE	47.5333	19.2667	34166	5	2408	9960	3304
+2146	Mogyoród	PE	47.6	19.25	17783	5	3448	6018	1971
+2151	Fót	PE	47.6167	19.2	32610	4	3740	18365	6119
+2152	Fót	PE	47.6167	19.2	32610	4	3740	18365	6119
+2153	Fót	PE	47.6167	19.2	32610	4	3740	18365	6119
+2161	Csomád	PE	47.6667	19.2333	33118	6	1239	1405	506
+2162	Őrbottyán	PE	47.6833	19.2667	08545	5	2737	7109	2365
+2163	Vácrátót	PE	47.7167	19.2333	17668	6	1805	1864	644
+2164	Váchartyán	PE	47.7333	19.2667	19886	6	1213	1835	641
+2165	Kisnémedi	PE	47.7333	19.3	05227	6	1383	681	302
+2166	Püspökszilágy	PE	47.7333	19.3167	04303	6	2530	767	294
+2167	Vácduka	PE	47.75	19.2167	05917	6	840	1284	448
+2170	Aszód	PE	47.65	19.5	16188	4	1620	6324	2399
+2173	Kartal	PE	47.6667	19.55	30696	5	2911	5923	1870
+2174	Verseg	PE	47.7167	19.55	22488	6	2958	1351	534
+2175	Kálló	NO	47.75	19.5	08642	6	3697	1507	535
+2176	Erdőkürt	NO	47.7667	19.4667	22655	6	2172	580	264
+2177	Erdőtarcsa	NO	47.7667	19.55	21795	6	1507	534	246
+2181	Iklad	PE	47.6667	19.45	03300	6	1121	2125	672
+2182	Domony	PE	47.65	19.4333	04808	6	2180	2139	628
+2183	Galgamácsa	PE	47.7	19.3833	27128	6	4331	1986	739
+2184	Vácegres	PE	47.6833	19.3667	30331	6	1367	887	294
+2185	Váckisújfalu	PE	47.7	19.35	05698	6	1069	472	156
+2191	Bag	PE	47.6333	19.4833	09131	5	2355	3987	1314
+2192	Hévízgyörk	PE	47.6333	19.5167	13949	6	2284	3130	1099
+2193	Galgahévíz	PE	47.6167	19.5667	19503	6	3118	2527	982
+2194	Tura	PE	47.6167	19.6	09593	4	5592	7945	2974
+2200	Monor	PE	47.35	19.45	10551	4	4829	18526	6430
+2201	Monor	PE	47.35	19.45	10551	4	4829	18526	6430
+2202	Monor	PE	47.35	19.45	10551	4	4829	18526	6430
+2209	Péteri	PE	47.3833	19.4167	21847	6	1189	2153	742
+2211	Vasad	PE	47.3167	19.4	22585	6	3341	1781	734
+2212	Csévharaszt	PE	47.3	19.4333	18476	6	4922	1953	690
+2213	Csévharaszt	PE	47.3	19.4333	18476	6	4922	1953	690
+2214	Pánd	PE	47.35	19.6333	22248	6	2221	2103	720
+2215	Káva	PE	47.35	19.5833	27827	6	1131	607	276
+2216	Bénye	PE	47.35	19.55	25098	6	1652	1268	498
+2217	Gomba	PE	47.3667	19.5333	09441	6	3971	3030	1037
+2220	Vecsés	PE	47.4018	19.2458	26815	4	3616	20550	7662
+2221	Vecsés	PE	47.4	19.2833	26815	4	3616	20550	7662
+2222	Vecsés	PE	47.4	19.2833	26815	4	3616	20550	7662
+2225	Üllő	PE	47.3833	19.35	12894	4	4810	10924	3920
+2230	Gyömrő	PE	47.4167	19.4	29735	4	2651	15714	5525
+2233	Ecser	PE	47.45	19.3333	24518	6	1310	3589	1391
+2234	Maglód	PE	47.45	19.3667	10922	4	2236	11319	3717
+2235	Mende	PE	47.4167	19.45	03692	6	2717	4325	1485
+2241	Sülysáp	PE	47.45	19.5583	21713	5	4719	8258	2888
+2242	Sülysáp	PE	47.45	19.5583	21713	5	4719	8258	2888
+2243	Kóka	PE	47.4833	19.5833	31361	6	4436	4530	1706
+2244	Úri	PE	47.4167	19.5333	28644	6	2219	2713	957
+2251	Tápiószecső	PE	47.45	19.6	31796	5	3838	6434	2323
+2252	Tóalmás	PE	47.5167	19.6667	21467	6	3935	3407	1349
+2253	Tápióság	PE	47.4	19.6167	09405	6	3354	2705	1136
+2254	Szentmártonkáta	PE	47.45	19.7	28653	6	5220	4999	1927
+2255	Szentlőrinckáta	PE	47.5167	19.75	07542	6	2015	1962	824
+2300	Ráckeve	PE	47.1667	18.95	17260	4	6409	9842	3692
+2301	Ráckeve	PE	47.1667	18.95	17260	4	6409	9842	3692
+2309	Lórév	PE	47.1167	18.9	09140	6	988	315	126
+2310	Szigetszentmiklós	PE	47.35	19.05	28954	4	4565	32340	11485
+2311	Szigetszentmiklós	PE	47.35	19.05	28954	4	4565	32340	11485
+2313	Szigetszentmiklós	PE	47.35	19.05	28954	4	4565	32340	11485
+2314	Halásztelek	PE	47.3667	18.9833	09690	4	864	8620	3104
+2315	Szigethalom	PE	47.3333	19	13277	4	912	16477	5236
+2316	Tököl	PE	47.3104	19.0021	29823	4	3849	10164	3699
+2317	Szigetcsép	PE	47.2667	18.9833	07870	6	1820	2354	901
+2318	Szigetszentmárton	PE	47.2333	18.9667	15185	6	1073	2083	815
+2319	Szigetújfalu	PE	47.2333	18.9333	22114	6	1083	2087	839
+2321	Szigetbecse	PE	47.1333	18.95	26259	6	1712	1346	511
+2322	Makád	PE	47.0833	18.9333	04394	6	3177	1252	528
+2330	Dunaharaszti	PE	47.35	19.0833	09584	4	2917	19491	7467
+2331	Dunaharaszti	PE	47.35	19.0833	09584	4	2917	19491	7467
+2332	Dunaharaszti	PE	47.35	19.0833	09584	4	2917	19491	7467
+2335	Taksony	PE	47.3333	19.0833	30720	5	2085	6369	2062
+2336	Dunavarsány	PE	47.2833	19.0667	20534	4	2252	7112	2350
+2337	Délegyháza	PE	47.25	19.0667	09973	6	2542	3187	1118
+2338	Áporka	PE	47.2333	19.0167	10108	6	1747	1155	479
+2339	Majosháza	PE	47.2667	19	10755	6	1142	1486	527
+2340	Kiskunlacháza	PE	47.2	19.0167	10816	5	9350	9080	3351
+2341	Kiskunlacháza	PE	47.2	19.0167	10816	5	9350	9080	3351
+2342	Kiskunlacháza	PE	47.2	19.0167	10816	5	9350	9080	3351
+2344	Dömsöd	PE	47.0833	19	29647	5	7242	5745	2336
+2345	Apaj	PE	47.1167	19.1	33561	6	7104	1251	437
+2347	Bugyi	PE	47.2167	19.15	32027	5	11555	5338	2026
+2351	Alsónémedi	PE	47.3167	19.1667	23199	5	4907	4982	2037
+2360	Gyál	PE	47.3833	19.2333	25627	4	2493	23220	8128
+2363	Felsőpakony	PE	47.35	19.25	06035	6	1533	3415	1167
+2364	Ócsa	PE	47.3	19.2333	04075	4	8166	8989	3249
+2365	Inárcs	PE	47.2667	19.3333	32106	6	2253	4448	1533
+2366	Kakucs	PE	47.25	19.3667	32230	6	2180	2729	966
+2367	Újhartyán	PE	47.2167	19.3833	06293	6	2243	2755	1069
+2370	Dabas	PE	47.1833	19.3167	09247	4	16599	16671	6007
+2371	Dabas	PE	47.1833	19.3167	09247	4	16599	16671	6007
+2372	Dabas	PE	47.1833	19.3167	09247	4	16599	16671	6007
+2373	Dabas	PE	47.1833	19.3167	09247	4	16599	16671	6007
+2374	Dabas	PE	47.1833	19.3167	09247	4	16599	16671	6007
+2375	Tatárszentgyörgy	PE	47.0667	19.3833	27386	6	5506	1966	676
+2376	Hernád	PE	47.1667	19.4333	09849	6	2706	4077	1411
+2377	Örkény	PE	47.1333	19.4333	05281	4	3644	4924	1728
+2378	Pusztavacs	PE	47.1667	19.5	23083	6	7907	1427	567
+2381	Táborfalva	PE	47.0833	19.4667	08332	6	4205	3429	1380
+2400	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2401	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2402	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2403	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2404	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2405	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2406	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2407	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2408	Dunaújváros	FE	46.9833	18.9333	03115	3	5267	48562	22831
+2421	Nagyvenyim	FE	46.9667	18.85	26134	6	4368	4156	1469
+2422	Mezőfalva	FE	46.9333	18.7667	17552	5	8042	4908	1724
+2423	Daruszentmiklós	FE	46.8952	18.8452	34342	6	1912	1642	573
+2424	Előszállás	FE	46.8333	18.8167	20358	5	3998	2233	952
+2425	Nagykarácsony	FE	46.8667	18.7833	07001	6	3046	1433	589
+2426	Baracs	FE	46.8833	18.8833	07047	6	5518	3573	1294
+2427	Baracs	FE	46.8833	18.8833	07047	6	5518	3573	1294
+2428	Kisapostag	FE	46.9	18.9333	12636	6	958	1448	508
+2431	Perkáta	FE	47.05	18.8	19354	5	7452	4047	1564
+2432	Szabadegyháza	FE	47.0667	18.6833	13259	6	4164	2216	788
+2433	Sárosd	FE	47.05	18.65	25140	5	4812	3397	1126
+2434	Hantos	FE	47	18.7	23427	6	3696	950	373
+2435	Nagylók	FE	46.9667	18.6667	32364	6	3244	1081	461
+2440	Százhalombatta	PE	47.3333	18.9333	17312	4	2806	18226	7187
+2441	Százhalombatta	PE	47.3333	18.9333	17312	4	2806	18226	7187
+2442	Százhalombatta	PE	47.3333	18.9333	17312	4	2806	18226	7187
+2443	Százhalombatta	PE	47.3333	18.9333	17312	4	2806	18226	7187
+2444	Százhalombatta	PE	47.3333	18.9333	17312	4	2806	18226	7187
+2451	Ercsi	FE	47.25	18.9	23603	4	6531	8426	3142
+2453	Ercsi	FE	47.25	18.9	23603	4	6531	8426	3142
+2454	Iváncsa	FE	47.15	18.8167	13462	6	2517	2932	1009
+2455	Beloiannisz	FE	47.1667	18.8333	08466	6	454	1161	436
+2456	Besnyő	FE	47.1833	18.8167	16346	6	4464	1808	659
+2457	Adony	FE	47.1167	18.8667	08925	4	6105	3839	1458
+2458	Kulcs	FE	47.05	18.9167	34209	6	1673	2503	792
+2459	Rácalmás	FE	47.0167	18.95	09900	5	4064	4461	1417
+2461	Tárnok	PE	47.3667	18.85	04154	5	2360	9029	3320
+2462	Martonvásár	FE	47.3167	18.7833	04659	4	3125	5702	1927
+2463	Tordas	FE	47.35	18.75	21005	6	1676	2000	613
+2464	Gyúró	FE	47.3833	18.7333	15918	6	2437	1287	439
+2465	Ráckeresztúr	FE	47.2667	18.8333	02015	6	3530	3296	1253
+2471	Baracska	FE	47.2833	18.7667	08581	6	3968	2723	975
+2472	Kajászó	FE	47.3167	18.7333	21342	6	2398	1054	392
+2473	Vál	FE	47.3667	18.6833	05829	6	4048	2494	890
+2475	Kápolnásnyék	FE	47.2333	18.6833	21926	6	4150	3483	1421
+2476	Pázmánd	FE	47.2833	18.6667	21786	6	2714	2054	883
+2477	Vereb	FE	47.3167	18.6167	03498	6	2232	801	310
+2481	Velence	FE	47.2333	18.65	25016	4	3337	5173	2084
+2482	Velence	FE	47.2333	18.65	25016	4	3337	5173	2084
+2483	Gárdony	FE	47.2	18.65	10296	4	6350	9303	3707
+2484	Gárdony	FE	47.2	18.65	10296	4	6350	9303	3707
+2485	Gárdony	FE	47.2	18.65	10296	4	6350	9303	3707
+2490	Pusztaszabolcs	FE	47.1333	18.7667	29018	4	5167	6192	2229
+2500	Esztergom	KE	47.8	18.75	25131	4	10035	30928	11930
+2501	Esztergom	KE	47.8	18.75	25131	4	10035	30928	11930
+2503	Esztergom	KE	47.8	18.75	25131	4	10035	30928	11930
+2508	Esztergom	KE	47.8	18.75	25131	4	10035	30928	11930
+2509	Esztergom	KE	47.8	18.75	25131	4	10035	30928	11930
+2510	Dorog	KE	47.7167	18.7333	10490	4	1155	12262	4949
+2511	Dorog	KE	47.7167	18.7333	10490	4	1155	12262	4949
+2512	Dorog	KE	47.7167	18.7333	10490	4	1155	12262	4949
+2517	Kesztölc	KE	47.7167	18.8	29577	6	2200	2669	984
+2518	Leányvár	KE	47.6833	18.7833	25487	6	725	1721	647
+2519	Piliscsév	KE	47.6833	18.8167	21874	6	2490	2378	919
+2521	Csolnok	KE	47.7	18.7167	18926	6	1871	3377	1234
+2522	Dág	KE	47.6667	18.7167	22910	6	1189	990	387
+2523	Sárisáp	KE	47.6833	18.6833	26903	6	1448	2885	1102
+2524	Nagysáp	KE	47.6833	18.6	27076	6	2477	1556	513
+2525	Bajna	KE	47.65	18.6	16744	6	3727	1955	758
+2526	Epöl	KE	47.65	18.65	29638	6	1253	610	258
+2527	Máriahalom	KE	47.6333	18.7167	22637	6	1085	663	237
+2528	Úny	KE	47.6333	18.7333	27632	6	1158	743	311
+2529	Annavölgy	KE	47.6625	18.6771	34227	6	460	958	402
+2531	Tokod	KE	47.7167	18.6667	14155	5	1491	4280	1593
+2532	Tokodaltáró	KE	47.7444	18.5972	34023	6	527	3111	1055
+2533	Bajót	KE	47.7333	18.5667	29355	6	1644	1567	537
+2534	Tát	KE	47.75	18.65	08758	5	1177	5437	2011
+2535	Mogyorósbánya	KE	47.7333	18.6	28255	6	732	870	313
+2536	Nyergesújfalu	KE	47.7667	18.55	15352	4	3950	7660	2896
+2537	Nyergesújfalu	KE	47.7667	18.55	15352	4	3950	7660	2896
+2541	Lábatlan	KE	47.75	18.5	15255	4	2635	5115	2085
+2542	Lábatlan	KE	47.75	18.5	15255	4	2635	5115	2085
+2543	Süttő	KE	47.75	18.45	08688	6	3436	2024	789
+2544	Neszmély	KE	47.7333	18.3667	33826	6	2776	1385	568
+2545	Dunaalmás	KE	47.7333	18.3333	33835	6	1477	1639	599
+2600	Vác	PE	47.7833	19.1333	24934	4	6160	33381	14210
+2601	Vác	PE	47.7833	19.1333	24934	4	6160	33381	14210
+2602	Vác	PE	47.7833	19.1333	24934	4	6160	33381	14210
+2603	Vác	PE	47.7833	19.1333	24934	4	6160	33381	14210
+2610	Nőtincs	NO	47.8833	19.15	29425	6	2047	1169	490
+2611	Felsőpetény	NO	47.8833	19.2	24323	6	1450	735	266
+2612	Kosd	PE	47.8	19.1833	27687	6	3408	2507	894
+2613	Rád	PE	47.8	19.2333	02370	6	1774	1870	635
+2614	Penc	PE	47.8	19.25	18689	6	2134	1476	532
+2615	Csővár	PE	47.8167	19.3333	26985	6	1717	671	254
+2616	Ősagárd	NO	47.8667	19.2	19318	6	1092	329	160
+2616	Keszeg	NO	47.8333	19.25	31413	6	995	702	285
+2617	Alsópetény	NO	47.8833	19.25	16425	6	1968	734	315
+2618	Nézsa	NO	47.85	19.3	09797	6	1868	1091	471
+2619	Legénd	NO	47.8833	19.3167	30395	6	1841	504	236
+2621	Verőce	PE	47.8333	19.0333	33729	6	2019	3486	1142
+2623	Kismaros	PE	47.8333	19.0333	33738	6	1211	2009	680
+2624	Szokolya	PE	47.8667	19.0167	06947	6	5905	1791	688
+2625	Kóspallag	PE	47.8833	18.9333	24679	6	1277	783	306
+2626	Nagymaros	PE	47.7833	18.9667	31732	4	3437	4691	1802
+2627	Zebegény	PE	47.8	18.9167	14960	6	964	1181	474
+2628	Szob	PE	47.8167	18.8667	24916	4	1797	2986	1103
+2629	Márianosztra	PE	47.8667	18.8833	04570	6	2026	937	397
+2631	Ipolydamásd	PE	47.85	18.8333	28097	6	1160	354	210
+2632	Letkés	PE	47.8833	18.7833	22682	6	2455	1153	456
+2633	Ipolytölgyes	PE	47.9167	18.7833	04978	6	1366	476	129
+2634	Nagybörzsöny	PE	47.9333	18.8333	14775	6	5069	784	354
+2635	Vámosmikola	PE	47.9833	18.7833	10737	6	2529	1648	632
+2636	Tésa	PE	48.0333	18.85	19248	6	438	84	61
+2637	Perőcsény	PE	48	18.8667	04181	6	4140	349	211
+2638	Kemence	PE	48.0167	18.9	22345	6	4275	1010	558
+2639	Bernecebaráti	PE	48.0333	18.9167	18777	6	3769	860	456
+2640	Szendehely	NO	47.85	19.1167	04507	6	1004	1629	628
+2641	Berkenye	NO	47.8833	19.0833	09034	6	1346	670	253
+2642	Nógrád	NO	47.9167	19.05	04358	6	2954	1572	677
+2643	Diósjenő	NO	47.95	19.05	06743	6	5750	2937	1065
+2644	Borsosberény	NO	47.9667	19.1167	09894	6	2026	1034	396
+2645	Nagyoroszi	NO	48	19.1	23986	6	4003	2149	849
+2646	Drégelypalánk	NO	48.05	19.05	08156	6	2218	1580	679
+2647	Hont	NO	48.05	19	13204	6	2413	532	313
+2648	Patak	NO	48.0333	19.15	07199	6	1622	925	427
+2649	Dejtár	NO	48.0333	19.1667	12511	6	2174	1472	601
+2651	Rétság	NO	47.9333	19.1333	23825	4	1978	2987	1150
+2652	Tereske	NO	47.95	19.2	24174	6	1703	730	320
+2653	Bánk	NO	47.9333	19.1833	24341	6	990	691	269
+2654	Romhány	NO	47.9333	19.2667	12195	6	2547	2282	942
+2655	Kétbodony	NO	47.9333	19.2667	11846	6	1305	484	234
+2655	Kisecset	NO	47.9333	19.3167	33206	6	862	176	141
+2655	Szente	NO	47.9667	19.2833	09043	6	753	357	158
+2656	Szátok	NO	47.95	19.2333	15325	6	895	581	167
+2657	Tolmács	NO	47.9333	19.1333	06381	6	1224	721	337
+2658	Horpács	NO	48	19.1333	13718	6	672	178	92
+2658	Pusztaberki	NO	47.9667	19.1667	17862	6	685	129	106
+2659	Érsekvadkert	NO	48	19.2	21582	6	5537	3650	1391
+2660	Balassagyarmat	NO	48.0833	19.3	13657	4	2374	16580	6730
+2661	Balassagyarmat	NO	48.0833	19.3	13657	4	2374	16580	6730
+2662	Balassagyarmat	NO	48.0833	19.3	13657	4	2374	16580	6730
+2668	Patvarc	NO	48.0667	19.35	33880	6	784	645	270
+2669	Ipolyvece	NO	48.0667	19.1167	29319	6	1390	879	366
+2671	Őrhalom	NO	48.0833	19.4167	03249	6	1746	1076	403
+2672	Hugyag	NO	48.0833	19.4333	16878	6	1090	886	336
+2673	Csitár	NO	48.05	19.4333	05050	6	1685	398	209
+2675	Iliny	NO	48.0333	19.4333	26833	6	646	170	92
+2675	Nógrádmarcal	NO	48.0333	19.4	29832	6	1994	555	216
+2676	Cserhátsurány	NO	47.9833	19.4333	22594	6	1880	857	364
+2677	Herencsény	NO	47.9833	19.4833	05324	6	3318	653	298
+2678	Csesztve	NO	48.0167	19.2833	20145	6	1625	327	170
+2681	Galgagyörk	PE	47.7333	19.3833	13295	6	1471	1075	346
+2682	Püspökhatvan	PE	47.7667	19.3667	21388	6	2472	1525	503
+2683	Acsa	PE	47.8	19.3833	18573	6	2694	1513	473
+2685	Nógrádsáp	NO	47.8333	19.35	08387	6	1546	855	367
+2686	Galgaguta	NO	47.85	19.4	25663	6	1589	659	303
+2687	Bercel	NO	47.8667	19.4167	02389	6	3588	2020	739
+2688	Vanyarc	NO	47.8333	19.45	30915	6	3222	1306	505
+2691	Nógrádkövesd	NO	47.8667	19.3833	32300	6	880	713	291
+2692	Szécsénke	NO	47.9	19.3333	23047	6	978	226	125
+2693	Becske	NO	47.9167	19.3833	12016	6	1566	574	286
+2694	Magyarnándor	NO	47.9667	19.35	32407	6	1867	1127	466
+2694	Debercsény	NO	47.9667	19.3167	07320	6	543	77	51
+2694	Cserháthaláp	NO	47.9833	19.3667	21935	6	1047	371	179
+2696	Terény	NO	47.95	19.45	04844	6	2435	435	252
+2697	Szanda	NO	47.9333	19.45	13754	6	2149	622	418
+2698	Mohora	NO	47.9833	19.3333	27915	6	1595	968	379
+2699	Szügy	NO	48.0333	19.3333	18786	6	1951	1425	534
+2700	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2701	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2702	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2703	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2704	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2711	Tápiószentmárton	PE	47.3333	19.75	14571	5	10291	5505	2449
+2712	Nyársapát	PE	47.1	19.8	20066	6	5403	1828	814
+2713	Csemő	PE	47.1167	19.7	05184	6	7944	4298	1882
+2721	Pilis	PE	47.2833	19.55	09821	4	4730	11410	4045
+2723	Nyáregyháza	PE	47.25	19.5	23038	6	3199	3957	1393
+2724	Újlengyel	PE	47.2167	19.45	19682	6	2625	1757	675
+2730	Albertirsa	PE	47.25	19.6167	31653	4	7296	12348	4802
+2735	Dánszentmiklós	PE	47.2167	19.55	31811	6	3801	2869	1058
+2736	Mikebuda	PE	47.1667	19.6333	24466	6	4217	732	351
+2737	Ceglédbercel	PE	47.2167	19.6833	20640	6	2815	4440	1655
+2738	Ceglédbercel	PE	47.2167	19.6833	20640	6	2815	4440	1655
+2740	Abony	PE	47.1833	20	27872	4	12797	15498	6143
+2745	Kőröstetétlen	PE	47.1	20.0333	32975	6	3265	844	363
+2746	Jászkarajenő	PE	47.05	20.0667	11004	6	6515	2811	1427
+2747	Törtel	PE	47.1167	19.9333	22008	6	8416	4367	1872
+2750	Nagykőrös	PE	47.0333	19.7833	19716	4	22794	25105	10392
+2751	Nagykőrös	PE	47.0333	19.7833	19716	4	22794	25105	10392
+2752	Nagykőrös	PE	47.0333	19.7833	19716	4	22794	25105	10392
+2755	Kocsér	PE	47.0053	19.9114	32771	6	6728	1947	1011
+2760	Nagykáta	PE	47.4167	19.75	13435	4	8161	12739	5001
+2761	Nagykáta	PE	47.4167	19.75	13435	4	8161	12739	5001
+2764	Tápióbicske	PE	47.3667	19.6833	15015	6	4848	3512	1512
+2765	Farmos	PE	47.3667	19.85	09122	6	4012	3754	1551
+2766	Tápiószele	PE	47.3333	19.8833	14146	5	3699	6207	2418
+2767	Tápiógyörgye	PE	47.3333	19.95	17303	6	5331	3756	1569
+2768	Újszilvás	PE	47.2833	19.9333	17808	6	3898	2708	1200
+2769	Tápiószőlős	PE	47.3	19.85	02769	6	3179	3036	1314
+2800	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2801	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2802	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2803	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2804	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2805	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2806	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2807	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2808	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2809	Tatabánya	KE	47.5667	18.4167	18157	1	9143	70333	29978
+2821	Gyermely	KE	47.6	18.65	06521	6	4545	1454	519
+2822	Szomor	KE	47.5833	18.6667	21421	6	1319	1135	396
+2823	Vértessomló	KE	47.5167	18.3667	15282	6	2229	1348	499
+2824	Várgesztes	KE	47.4667	18.4	17251	6	1204	569	250
+2831	Tarján	KE	47.6167	18.5167	18935	6	4307	2744	1074
+2832	Héreg	KE	47.65	18.5167	11891	6	2713	1030	443
+2833	Vértestolna	KE	47.6333	18.45	29629	6	1695	548	217
+2834	Tardos	KE	47.6667	18.45	30225	6	2332	1630	680
+2835	Tardos	KE	47.6667	18.45	30225	6	2332	1630	680
+2836	Baj	KE	47.65	18.3667	29212	6	2113	2838	1043
+2837	Vértesszőlős	KE	47.6167	18.3833	31264	6	1713	3059	977
+2840	Oroszlány	KE	47.4833	18.3167	30766	4	7586	18968	7905
+2841	Oroszlány	KE	47.4833	18.3167	30766	4	7586	18968	7905
+2842	Oroszlány	KE	47.4833	18.3167	30766	4	7586	18968	7905
+2851	Környe	KE	47.55	18.3333	30553	6	4534	4454	1643
+2852	Kecskéd	KE	47.5167	18.3167	04525	6	1108	2021	667
+2853	Kömlőd	KE	47.55	18.2667	07630	6	2284	1249	378
+2854	Dad	KE	47.5167	18.2333	33163	6	2375	1019	389
+2855	Bokod	KE	47.5	18.25	07311	6	2992	2245	807
+2856	Szákszend	KE	47.55	18.1667	33516	6	3593	1534	643
+2858	Császár	KE	47.5	18.15	16416	6	6780	1777	717
+2859	Vérteskethely	KE	47.4833	18.0833	32586	6	1747	576	235
+2861	Bakonysárkány	KE	47.45	18.1	25229	6	1413	953	389
+2862	Aka	KE	47.4	18.0667	06682	6	1811	257	132
+2870	Kisbér	KE	47.5	18.0333	17330	4	5218	5516	2181
+2879	Kisbér	KE	47.5	18.0333	17330	4	5218	5516	2181
+2881	Ászár	KE	47.5042	18	23852	6	1869	1946	703
+2882	Kerékteleki	KE	47.5167	17.9333	10995	6	2946	675	280
+2883	Bársonyos	KE	47.5167	17.9167	08624	6	1687	761	303
+2884	Bakonyszombathely	KE	47.4667	17.9667	22381	6	3653	1460	607
+2885	Bakonybánk	KE	47.4667	17.9	24244	6	1507	457	219
+2886	Réde	KE	47.4333	17.9167	30012	6	4588	1405	566
+2887	Ácsteszér	KE	47.4	18.0167	18139	6	1773	708	286
+2888	Csatka	KE	47.3667	17.9833	33109	6	1777	265	171
+2889	Súr	KE	47.3667	18.0333	31990	6	3736	1274	517
+2890	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2891	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2892	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2893	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2894	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2896	Szomód	KE	47.6833	18.35	22619	6	2835	2104	722
+2897	Dunaszentmiklós	KE	47.7	18.3833	24101	6	777	452	178
+2898	Kocs	KE	47.6	18.2167	02510	6	5826	2636	960
+2899	Naszály	KE	47.7	18.2667	20163	6	3023	2359	835
+2900	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+2901	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+2902	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+2903	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+2904	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+2911	Mocsa	KE	47.6667	18.1833	26930	6	6722	2257	832
+2921	Mocsa	KE	47.6667	18.1833	26930	6	6722	2257	832
+2922	Mocsa	KE	47.6667	18.1833	26930	6	6722	2257	832
+2931	Almásfüzitő	KE	47.7167	18.2667	32346	6	819	2246	1146
+2932	Almásfüzitő	KE	47.7167	18.2667	32346	6	819	2246	1146
+2941	Ács	KE	47.7	18.0167	04428	4	10384	7156	2675
+2942	Nagyigmánd	KE	47.6333	18.0833	22372	5	5139	3014	1178
+2943	Bábolna	KE	47.6333	17.9833	19363	4	3359	3756	1366
+2944	Bana	KE	47.65	17.9167	31422	6	2514	1685	564
+2945	Tárkány	KE	47.5833	18	20987	6	6498	1620	627
+2946	Csép	KE	47.5833	18.0667	18272	6	2006	366	157
+2947	Ete	KE	47.5	18.0333	06664	6	2061	591	248
+2948	Kisigmánd	KE	47.65	18.1	20923	6	1314	524	203
+2949	Csém	KE	47.6833	18.1	33640	6	629	477	169
+3000	Hatvan	HE	47.6667	19.6833	22309	4	6617	20949	8949
+3001	Hatvan	HE	47.6667	19.6833	22309	4	6617	20949	8949
+3002	Hatvan	HE	47.6667	19.6833	22309	4	6617	20949	8949
+3003	Hatvan	HE	47.6667	19.6833	22309	4	6617	20949	8949
+3009	Hatvan	HE	47.6667	19.6833	22309	4	6617	20949	8949
+3011	Heréd	HE	47.7	19.6333	20242	6	1396	2074	777
+3012	Nagykökényes	HE	47.7333	19.6	24943	6	1728	606	259
+3013	Ecséd	HE	47.7333	19.7833	17181	6	4160	3335	1450
+3014	Hort	HE	47.7	19.7833	04145	6	4309	3839	1602
+3015	Csány	HE	47.65	19.8333	16841	6	4789	2308	987
+3016	Boldog	HE	47.6	19.7	03452	6	2674	3067	1174
+3021	Lőrinci	HE	47.7333	19.6833	30401	4	2353	6126	2318
+3022	Lőrinci	HE	47.7333	19.6833	30401	4	2353	6126	2318
+3023	Petőfibánya	HE	47.7667	19.7167	33686	6	1111	2869	1357
+3024	Petőfibánya	HE	47.7667	19.7167	33686	6	1111	2869	1357
+3031	Zagyvaszántó	HE	47.7833	19.6833	21722	6	952	2014	777
+3032	Apc	HE	47.8	19.7	07241	6	2046	2655	1106
+3033	Rózsaszentmárton	HE	47.7833	19.75	27650	6	1631	2043	890
+3034	Szűcsi	HE	47.8	19.7667	09982	6	1738	1605	663
+3035	Gyöngyöspata	HE	47.8167	19.8	08323	6	6075	2583	1069
+3036	Gyöngyöstarján	HE	47.8	19.8667	28088	6	4639	2514	983
+3041	Héhalom	NO	47.8	19.6	03993	6	1867	1011	407
+3042	Palotás	NO	47.8	19.6	05883	6	1707	1667	665
+3043	Egyházasdengeleg	NO	47.8	19.5667	17659	6	1575	480	219
+3044	Szirák	NO	47.8333	19.5333	21634	6	1909	1141	456
+3045	Bér	NO	47.8667	19.5	32911	6	2549	399	212
+3046	Kisbágyon	NO	47.8167	19.5833	27243	6	1024	445	205
+3047	Buják	NO	47.8833	19.55	14234	6	5304	2238	921
+3051	Szarvasgede	NO	47.8167	19.65	10199	6	999	432	213
+3052	Csécse	NO	47.8667	19.6333	30270	6	2173	901	423
+3053	Kozárd	NO	47.9167	19.6167	13842	6	644	171	130
+3053	Ecseg	NO	47.9	19.6	04251	6	2410	1243	542
+3060	Pásztó	NO	47.9167	19.7	07409	4	7260	9880	4108
+3061	Pásztó	NO	47.9167	19.7	07409	4	7260	9880	4108
+3062	Pásztó	NO	47.9167	19.7	07409	4	7260	9880	4108
+3063	Jobbágyi	NO	47.8333	19.6833	08712	6	1783	2289	874
+3064	Szurdokpüspöki	NO	47.85	19.6833	19044	6	2671	1905	896
+3065	Szurdokpüspöki	NO	47.85	19.6833	19044	6	2671	1905	896
+3066	Kutasó	NO	47.95	19.55	19451	6	605	122	78
+3066	Bokor	NO	47.9333	19.55	03841	6	675	115	74
+3066	Cserhátszentiván	NO	47.9333	19.5833	32319	6	1066	148	130
+3067	Felsőtold	NO	47.9667	19.6167	33312	6	1083	152	107
+3067	Garáb	NO	47.9833	19.65	18494	6	820	61	68
+3068	Mátraszőlős	NO	47.9667	19.6833	04330	6	2916	1621	678
+3069	Alsótold	NO	47.95	19.6	07621	6	786	257	109
+3070	Bátonyterenye	NO	47.9667	19.8333	33534	4	7892	13270	5820
+3071	Bátonyterenye	NO	47.9667	19.8333	33534	4	7892	13270	5820
+3072	Bátonyterenye	NO	47.9667	19.8333	33534	4	7892	13270	5820
+3073	Tar	NO	47.95	19.75	32896	6	2734	1933	864
+3074	Sámsonháza	NO	47.9833	19.7333	24572	6	1271	273	156
+3075	Márkháza	NO	48.0167	19.7333	14641	6	631	236	115
+3075	Kisbárkány	NO	48.0167	19.6833	26295	6	803	214	107
+3075	Nagybárkány	NO	48	19.7	16391	6	884	671	246
+3077	Mátraverebély	NO	47.9833	19.7833	30100	6	1840	2159	875
+3078	Mátraverebély	NO	47.9833	19.7833	30100	6	1840	2159	875
+3082	Mátraverebély	NO	47.9833	19.7833	30100	6	1840	2159	875
+3100	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3101	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3102	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3103	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3104	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3107	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3109	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3110	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3121	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3123	Cered	NO	48.15	19.9667	03665	6	3858	1162	561
+3124	Zabar	NO	48.1333	20.05	21661	6	1817	556	258
+3125	Szilaspogony	NO	48.1167	20.0333	07959	6	1440	341	177
+3126	Bárna	NO	48.1	19.9333	20048	6	1539	1130	456
+3127	Kazár	NO	48.05	19.8667	28389	6	3039	2066	804
+3128	Vizslás	NO	48.05	19.8167	10320	6	1012	1333	546
+3129	Lucfalva	NO	48.0333	19.7	20190	6	1410	628	234
+3131	Sóshartyán	NO	48.0667	19.6833	14881	6	1214	941	301
+3132	Nógrádmegyer	NO	48.0667	19.6333	12131	6	2277	1707	573
+3133	Magyargéc	NO	48.0833	19.6167	26967	6	1235	888	300
+3134	Piliny	NO	48.15	19.6	11590	6	1604	596	282
+3135	Szécsényfelfalu	NO	48.15	19.5667	33011	6	822	462	226
+3136	Etes	NO	48.1167	19.7167	15370	6	1580	1493	720
+3137	Karancsberény	NO	48.1833	19.75	25548	6	2314	955	380
+3138	Ipolytarnóc	NO	48.2333	19.6333	03328	6	1366	481	213
+3141	Ipolytarnóc	NO	48.2333	19.6333	03328	6	1366	481	213
+3142	Mátraszele	NO	48.05	19.9	24332	6	1697	1050	470
+3143	Mátranovák	NO	48.0333	19.9833	19372	6	2697	1779	1112
+3144	Mátranovák	NO	48.0333	19.9833	19372	6	2697	1779	1112
+3145	Mátraterenye	NO	48.0333	19.95	33525	6	2813	1861	897
+3146	Mátraterenye	NO	48.0333	19.95	33525	6	2813	1861	897
+3147	Mátraterenye	NO	48.0333	19.95	33525	6	2813	1861	897
+3151	Rákóczibánya	NO	47.9875	19.9125	34360	6	457	787	307
+3152	Nemti	NO	48.0167	19.9	27580	6	1106	776	432
+3153	Dorogháza	NO	47.9833	19.9	24439	6	1768	1143	568
+3154	Szuha	NO	47.9833	19.9167	28194	6	1756	658	358
+3155	Mátramindszent	NO	47.9667	19.9333	20075	6	1673	854	446
+3161	Kishartyán	NO	48.0833	19.7167	33400	6	895	606	264
+3162	Ságújfalu	NO	48.1	19.6833	12520	6	1203	1084	395
+3163	Karancsság	NO	48.1167	19.6667	26897	6	2139	1190	417
+3163	Szalmatercs	NO	48.1167	19.6333	19798	6	758	490	194
+3165	Endrefalva	NO	48.1333	19.5833	25496	6	1323	1321	455
+3170	Szécsény	NO	48.0833	19.5167	06628	4	4583	5917	2528
+3175	Nagylóc	NO	48.0333	19.5833	21102	6	3912	1618	719
+3176	Hollókő	NO	48	19.6	33242	6	518	374	224
+3177	Rimóc	NO	48.0333	19.5333	28884	6	2926	1829	695
+3178	Varsány	NO	48.0333	19.5	29498	6	2558	1705	638
+3179	Nógrádsipek	NO	48.0167	19.5	19497	6	2012	667	305
+3181	Karancsalja	NO	48.1333	19.75	18625	6	1254	1597	636
+3182	Karancslapujtő	NO	48.15	19.7333	21041	6	1935	2719	1068
+3183	Karancskeszi	NO	48.1667	19.7	08855	6	3169	1907	828
+3184	Mihálygerge	NO	48.2	19.6333	13222	6	1106	612	309
+3185	Egyházasgerge	NO	48.1833	19.65	05980	6	1537	763	370
+3186	Litke	NO	48.2167	19.6	04871	6	1816	867	362
+3187	Nógrádszakál	NO	48.1833	19.5333	27340	6	1879	580	258
+3188	Ludányhalászi	NO	48.1333	19.5167	02778	6	2120	1589	502
+3200	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3201	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3202	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3211	Gyöngyösoroszi	HE	47.8333	19.9	13338	6	2139	1533	576
+3212	Gyöngyöshalász	HE	47.7333	19.9333	17534	6	2713	2579	1032
+3213	Atkár	HE	47.7167	19.9	16090	6	3376	1726	724
+3214	Nagyréde	HE	47.7667	19.85	31486	6	3434	3211	1239
+3221	Nagyréde	HE	47.7667	19.85	31486	6	3434	3211	1239
+3231	Gyöngyössolymos	HE	47.8167	19.9333	19123	6	6485	3085	1291
+3232	Gyöngyössolymos	HE	47.8167	19.9333	19123	6	6485	3085	1291
+3233	Gyöngyössolymos	HE	47.8167	19.9333	19123	6	6485	3085	1291
+3234	Gyöngyössolymos	HE	47.8167	19.9333	19123	6	6485	3085	1291
+3235	Mátraszentimre	HE	47.9167	19.8833	29045	6	2129	501	271
+3240	Parád	HE	47.9167	20.0333	07436	5	3720	1961	1011
+3242	Parádsasvár	HE	47.9167	19.9833	20215	6	1694	416	239
+3243	Bodony	HE	47.95	20.0333	14933	6	2897	770	459
+3244	Bodony	HE	47.95	20.0333	14933	6	2897	770	459
+3245	Recsk	HE	47.9333	20.1167	09609	5	4537	2782	1318
+3246	Mátraderecske	HE	47.95	20.0833	14872	6	1399	2000	992
+3247	Mátraballa	HE	47.9833	20.0333	19965	6	2636	768	424
+3248	Ivád	HE	48.0167	20.0667	13879	6	1194	361	202
+3250	Pétervására	HE	48.0167	20.1	12070	4	3387	2534	927
+3252	Erdőkövesd	HE	48.0333	20.1	28556	6	1718	636	304
+3253	Istenmezeje	HE	48.0833	20.05	10074	6	3279	1615	720
+3254	Váraszó	HE	48.0333	20.1167	27012	6	2705	522	256
+3255	Fedémes	HE	48.0333	20.2	12432	6	862	315	175
+3256	Kisfüzes	HE	47.9833	20.1333	22460	6	481	132	88
+3257	Bükkszenterzsébet	HE	48.05	20.1667	10621	6	2486	1119	489
+3258	Tarnalelesz	HE	48.05	20.1833	13240	6	3713	1715	694
+3259	Szentdomonkos	HE	48.0667	20.2	13231	6	1840	464	222
+3261	Abasár	HE	47.8	20	24554	6	2082	2562	1151
+3262	Markaz	HE	47.8167	20.0667	16540	6	2561	1826	798
+3263	Domoszló	HE	47.8333	20.1167	07515	6	4022	2108	960
+3264	Kisnána	HE	47.85	20.15	12502	6	2260	1016	521
+3265	Vécs	HE	47.8167	20.1667	05759	6	2566	638	385
+3271	Visonta	HE	47.7833	20.0333	31246	6	2529	1091	491
+3272	Visonta	HE	47.7833	20.0333	31246	6	2529	1091	491
+3273	Halmajugra	HE	47.7667	20.0667	11411	6	2168	1306	443
+3274	Ludas	HE	47.7333	20.1	15796	6	1079	855	382
+3275	Detk	HE	47.75	20.1	09201	6	2808	1192	523
+3281	Karácsond	HE	47.7333	20.0333	05935	6	3160	3178	1266
+3282	Nagyfüged	HE	47.6833	20.1167	26879	6	2751	1929	749
+3283	Tarnazsadány	HE	47.6667	20.1667	17163	6	2519	1188	513
+3284	Tarnaméra	HE	47.65	20.1667	23348	6	2826	1656	707
+3291	Vámosgyörk	HE	47.6833	19.9333	14580	6	2182	2012	783
+3292	Adács	HE	47.7	19.9833	23241	6	3794	2820	1228
+3293	Visznek	HE	47.65	20.0333	03513	6	2273	1135	535
+3294	Tarnaörs	HE	47.66	20.03	14128	6	3028	1857	755
+3295	Erk	HE	47.6167	20.0833	20118	6	2168	881	371
+3296	Zaránk	HE	47.65	20.1167	23445	6	1453	469	305
+3300	Eger	HE	47.9058	20.3709	20491	1	9224	56429	25295
+3301	Eger	HE	47.9	20.3833	20491	1	9224	56429	25295
+3302	Eger	HE	47.9	20.3833	20491	1	9224	56429	25295
+3303	Eger	HE	47.9	20.3833	20491	1	9224	56429	25295
+3304	Eger	HE	47.9	20.3833	20491	1	9224	56429	25295
+3305	Eger	HE	47.9	20.3833	20491	1	9224	56429	25295
+3321	Egerbakta	HE	47.9333	20.3	12821	6	3237	1504	501
+3322	Hevesaranyos	HE	48.0167	20.2333	10241	6	1702	659	280
+3323	Szarvaskő	HE	47.9	20.3833	03382	6	1259	374	154
+3324	Felsőtárkány	HE	47.9667	20.4167	16328	6	7732	3468	1232
+3325	Noszvaj	HE	47.9333	20.4833	18810	6	1884	1821	696
+3326	Ostoros	HE	47.8667	20.4333	27216	6	2351	2737	943
+3327	Novaj	HE	47.85	20.4833	29276	6	1852	1463	557
+3328	Egerszólát	HE	47.8833	20.2667	13648	6	2610	1090	441
+3331	Tarnaszentmária	HE	47.8833	20.2	09052	6	1100	249	183
+3332	Sirok	HE	47.9333	20.2	08527	6	6339	1903	957
+3333	Terpes	HE	47.9667	20.15	12229	6	220	204	103
+3334	Szajla	HE	47.9667	20.15	16063	6	870	658	272
+3335	Bükkszék	HE	47.9833	20.1833	02963	6	1530	758	404
+3336	Bátor	HE	47.9833	20.2667	24022	6	2732	437	195
+3337	Egerbocs	HE	48.0333	20.2667	26019	6	1595	559	269
+3341	Szúcs	HE	48.05	20.25	13523	6	849	413	158
+3341	Egercsehi	HE	48.05	20.2833	16610	6	1039	1467	648
+3343	Bekölce	HE	48.0833	20.2833	04400	6	1377	688	368
+3344	Mikófalva	HE	48.05	20.3167	31282	6	1441	764	317
+3345	Mónosbél	HE	48.0333	20.35	31565	6	1378	440	148
+3346	Bélapátfalva	HE	48.05	20.3667	33260	4	3663	3215	1154
+3346	Bükkszentmárton	HE	48.0667	20.35	22099	6	826	331	131
+3347	Balaton	HE	48.1	20.3167	11527	6	1320	1162	456
+3348	Szilvásvárad	HE	48.1	20.4	05643	6	3782	1742	745
+3349	Nagyvisnyó	HE	48.1333	20.4333	28282	6	4302	977	491
+3350	Kál	HE	47.7333	20.2667	32179	5	3481	3645	1365
+3351	Verpelét	HE	47.85	20.2333	24147	5	5318	3931	1599
+3352	Feldebrő	HE	47.8167	20.25	20747	6	2652	1112	554
+3353	Aldebrő	HE	47.8	20.2333	06345	6	2178	696	354
+3354	Tófalu	HE	47.7833	20.25	09964	6	1448	570	284
+3355	Kápolna	HE	47.7667	20.25	15307	6	2151	1602	556
+3356	Kompolt	HE	47.7333	20.25	23995	6	2273	2174	789
+3357	Nagyút	HE	47.7167	20.1667	10418	6	1894	729	337
+3358	Erdőtelek	HE	47.6833	20.3167	24235	6	4490	3306	1379
+3359	Tenk	HE	47.65	20.35	14076	6	1234	1189	455
+3360	Heves	HE	47.6	20.2833	14526	4	9931	10804	4178
+3368	Boconád	HE	47.6333	20.2	22354	6	2956	1350	628
+3369	Tarnabod	HE	47.6833	20.2333	32966	6	1033	718	280
+3371	Átány	HE	47.6167	20.3667	06503	6	5044	1394	587
+3372	Kömlő	HE	47.6	20.45	14535	6	4922	1820	679
+3373	Besenyőtelek	HE	47.7	20.4333	27517	6	4910	2710	1108
+3374	Dormánd	HE	47.7167	20.4167	30261	6	2006	1061	382
+3375	Mezőtárkány	HE	47.7167	20.4833	31662	6	4064	1646	738
+3377	Szihalom	HE	47.7667	20.4833	11013	6	3417	2073	972
+3378	Mezőszemere	HE	47.75	20.5333	25089	6	2148	1336	613
+3379	Egerfarmos	HE	47.7167	20.55	02981	6	2380	730	338
+3381	Pély	HE	47.4833	20.35	19567	6	9030	1434	666
+3382	Tarnaszentmiklós	HE	47.5333	20.3833	16160	6	3500	901	445
+3383	Hevesvezekény	HE	47.55	20.3667	04084	6	1978	638	313
+3384	Kisköre	HE	47.5	20.5	18281	4	6842	2892	1227
+3385	Tiszanána	HE	47.5667	20.5333	07083	6	6814	2425	1016
+3386	Sarud	HE	47.5833	20.6	07180	6	5162	1183	557
+3387	Újlőrincfalva	HE	47.6333	20.6	27623	6	4809	271	151
+3388	Poroszló	HE	47.65	20.6667	22196	6	10904	2773	1368
+3390	Füzesabony	HE	47.75	20.4167	03276	4	4634	7963	3081
+3392	Füzesabony	HE	47.75	20.4167	03276	4	4634	7963	3081
+3393	Füzesabony	HE	47.75	20.4167	03276	4	4634	7963	3081
+3394	Egerszalók	HE	47.8667	20.3333	24758	6	2311	1908	797
+3395	Demjén	HE	47.8333	20.3333	08660	6	2508	615	307
+3396	Kerecsend	HE	47.8	20.35	28079	6	2458	2289	737
+3397	Maklár	HE	47.8	20.4167	27696	6	2801	2415	965
+3398	Nagytálya	HE	47.8167	20.4167	27605	6	1319	872	338
+3399	Andornaktálya	HE	47.85	20.4167	17987	6	1675	2743	1015
+3400	Mezőkövesd	BZ	47.8167	20.5833	19433	4	10056	16905	7539
+3401	Mezőkövesd	BZ	47.8167	20.5833	19433	4	10056	16905	7539
+3402	Mezőkövesd	BZ	47.8167	20.5833	19433	4	10056	16905	7539
+3411	Szomolya	BZ	47.9	20.5	18892	6	2269	1613	707
+3412	Bogács	BZ	47.9	20.5333	25195	6	2470	2011	973
+3413	Cserépfalu	BZ	47.9333	20.5333	06974	6	4466	1049	555
+3414	Bükkzsérc	BZ	47.9667	20.5	32887	6	3725	1009	495
+3416	Tard	BZ	47.8833	20.6167	08165	6	4050	1331	579
+3417	Cserépváralja	BZ	47.9333	20.5667	25575	6	1462	470	213
+3418	Szentistván	BZ	47.7667	20.6667	22169	5	5129	2479	1141
+3421	Mezőnyárád	BZ	47.8667	20.6833	11749	6	1408	1597	689
+3422	Bükkábrány	BZ	47.8833	20.6833	13596	6	1803	1590	699
+3423	Tibolddaróc	BZ	47.9167	20.6333	30447	6	3034	1479	665
+3424	Kács	BZ	47.95	20.6167	32993	6	1670	541	335
+3425	Sály	BZ	47.95	20.6667	04729	6	2558	2187	739
+3426	Borsodgeszt	BZ	47.95	20.7	16124	6	1508	263	180
+3431	Vatta	BZ	47.9167	20.75	30076	6	2334	919	376
+3432	Emőd	BZ	47.9333	20.8167	04677	4	4938	5203	1983
+3433	Nyékládháza	BZ	47.9833	20.8333	12885	4	2467	4950	1756
+3434	Mályi	BZ	48.0167	20.8333	27395	6	1128	4252	1369
+3435	Mályi	BZ	48.0167	20.8333	27395	6	1128	4252	1369
+3441	Mezőkeresztes	BZ	47.8333	20.7	11323	5	7426	4089	1760
+3442	Csincse	BZ	47.8833	20.7667	34111	6	1134	560	212
+3443	Mezőnagymihály	BZ	47.8167	20.7333	18379	6	6188	1064	539
+3444	Gelej	BZ	47.8333	20.7833	23719	6	3211	632	303
+3450	Mezőcsát	BZ	47.8167	20.9167	13833	4	10309	6214	2492
+3458	Tiszakeszi	BZ	47.7833	21	13888	6	4618	2515	1056
+3459	Igrici	BZ	47.8667	20.8833	25399	6	1947	1247	478
+3461	Egerlövő	BZ	47.7167	20.6333	05865	6	1984	583	294
+3462	Borsodivánka	BZ	47.7	20.6667	06707	6	1591	753	241
+3463	Négyes	BZ	47.7	20.7167	24156	6	1734	259	217
+3464	Tiszavalk	BZ	47.6833	20.75	10977	6	1155	322	179
+3465	Tiszabábolna	BZ	47.6833	20.8167	02291	6	3271	393	269
+3466	Tiszadorogma	BZ	47.6833	20.8667	03717	6	4664	389	258
+3467	Ároktő	BZ	47.7333	20.95	03823	6	4641	1128	529
+3500	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3501	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3502	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3503	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3504	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3505	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3506	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3507	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3508	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3509	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3510	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3511	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3513	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3514	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3515	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3516	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3517	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3518	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3519	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3521	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3523	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3524	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3525	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3526	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3527	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3528	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3529	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3530	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3531	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3532	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3533	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3534	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3535	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3542	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3543	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3544	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3545	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3546	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3547	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3548	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3549	Miskolc	BZ	47.9804	20.9354	30456	1	23666	170234	75747
+3551	Ónod	BZ	48	20.9167	22628	6	1773	2625	835
+3552	Muhi	BZ	47.9833	20.9333	02158	6	962	549	209
+3553	Kistokaj	BZ	48.05	20.85	12399	6	976	2010	688
+3554	Bükkaranyos	BZ	47.9833	20.7833	27890	6	2620	1525	528
+3555	Harsány	BZ	47.9667	20.75	05847	6	3653	2058	794
+3556	Kisgyőr	BZ	48.0167	20.7	22840	6	7113	1703	638
+3557	Bükkszentkereszt	BZ	48.0667	20.6333	08022	6	2697	1209	508
+3559	Répáshuta	BZ	48.05	20.5333	31884	6	1679	467	181
+3561	Felsőzsolca	BZ	48.1	20.8667	02848	4	1625	7043	2237
+3562	Onga	BZ	48.1167	20.9167	22558	5	3149	4826	1524
+3563	Hernádkak	BZ	48.0833	20.9667	24165	6	1090	1655	484
+3564	Hernádnémeti	BZ	48.0667	20.9833	31200	6	2876	3617	1191
+3565	Tiszalúc	BZ	48.0333	21.0833	28398	5	4488	5481	1926
+3571	Alsózsolca	BZ	48.0667	20.8833	21032	4	2602	6044	1839
+3572	Sajólád	BZ	48.05	20.9	27173	6	1268	3127	1002
+3573	Sajópetri	BZ	48.0333	20.9	16638	6	928	1569	490
+3574	Bőcs	BZ	48.05	20.9667	05306	6	2432	2793	952
+3575	Berzék	BZ	48.0167	20.95	26356	6	1059	1118	347
+3576	Sajóhídvég	BZ	48	20.95	03081	6	1344	1065	346
+3577	Köröm	BZ	47.9833	20.95	26602	6	834	1366	353
+3578	Girincs	BZ	47.9667	20.9833	21564	6	1120	890	294
+3578	Kiscsécs	BZ	47.9667	21.0167	17349	6	413	208	54
+3579	Kesznyéten	BZ	47.9667	21.05	29249	6	3640	1912	655
+3580	Tiszaújváros	BZ	47.9333	21.0833	28352	4	4604	16641	7023
+3581	Tiszaújváros	BZ	47.9333	21.0833	28352	4	4604	16641	7023
+3582	Tiszaújváros	BZ	47.9333	21.0833	28352	4	4604	16641	7023
+3585	Tiszaújváros	BZ	47.9333	21.0833	28352	4	4604	16641	7023
+3586	Sajóörös	BZ	47.95	21.0333	08129	6	844	1304	467
+3587	Tiszapalkonya	BZ	47.8833	21.0667	08633	6	1349	1480	631
+3588	Hejőkürt	BZ	47.8667	21	02282	6	1490	332	151
+3589	Tiszatarján	BZ	47.8333	21.0167	30377	6	4039	1433	532
+3591	Oszlár	BZ	47.8833	21.0333	02866	6	571	425	183
+3592	Nemesbikk	BZ	47.8833	20.9667	05245	6	2410	1043	380
+3593	Hejőbába	BZ	47.9	20.95	06655	6	1872	1970	550
+3594	Hejőpapi	BZ	47.9	20.9167	16780	6	1702	1219	427
+3595	Hejőszalonta	BZ	47.9333	20.8833	12159	6	1097	852	244
+3596	Szakáld	BZ	47.95	20.9167	03805	6	1140	558	227
+3597	Hejőkeresztúr	BZ	47.9667	20.8833	04604	6	1028	998	404
+3598	Nagycsécs	BZ	47.9667	20.95	05582	6	983	835	292
+3599	Sajószöged	BZ	47.95	21	30340	6	1362	2372	893
+3600	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3601	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3603	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3604	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3607	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3608	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3621	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3622	Uppony	BZ	48.2167	20.4333	18351	6	1281	319	191
+3623	Borsodszentgyörgy	BZ	48.1833	20.2	30207	6	2152	1188	483
+3625	Borsodszentgyörgy	BZ	48.1833	20.2	30207	6	2152	1188	483
+3626	Hangony	BZ	48.2333	20.2	25104	6	3915	1561	616
+3627	Kissikátor	BZ	48.2	20.1333	14702	6	1038	340	128
+3627	Domaháza	BZ	48.1833	20.1167	25690	6	2883	872	345
+3630	Putnok	BZ	48.3	20.4333	27410	4	3473	7038	2598
+3635	Dubicsány	BZ	48.2833	20.5	27669	6	1300	309	119
+3636	Sajógalgóc	BZ	48.3	20.5333	10171	6	1012	382	137
+3636	Vadna	BZ	48.2667	20.5667	07223	6	782	617	222
+3641	Nagybarca	BZ	48.25	20.5333	29188	6	1439	1104	354
+3642	Bánhorváti	BZ	48.2333	20.5167	25159	6	2848	1409	592
+3643	Dédestapolcsány	BZ	48.1833	20.4833	04686	6	2943	1475	769
+3644	Tardona	BZ	48.1667	20.5333	14784	6	1223	1056	433
+3645	Mályinka	BZ	48.15	20.5	14915	6	2421	484	236
+3646	Nekézseny	BZ	48.1667	20.4333	28033	6	1410	810	343
+3647	Csokvaomány	BZ	48.1667	20.3833	14289	6	1499	858	450
+3648	Lénárddaróc	BZ	48.15	20.3833	07038	6	516	305	170
+3648	Bükkmogyorósd	BZ	48.1333	20.3667	19406	6	990	141	107
+3648	Csernely	BZ	48.15	20.35	28459	6	2062	819	459
+3651	Lénárddaróc	BZ	48.15	20.3833	07038	6	516	305	170
+3652	Sajónémeti	BZ	48.2667	20.3833	11332	6	738	533	249
+3653	Sajópüspöki	BZ	48.2833	20.35	23782	6	945	540	205
+3654	Bánréve	BZ	48.3	20.3667	21953	6	663	1376	556
+3655	Hét	BZ	48.2833	20.3833	08004	6	371	543	214
+3656	Sajómercse	BZ	48.25	20.4167	15945	6	1118	224	130
+3656	Sajóvelezd	BZ	48.2667	20.4667	27757	6	2302	849	317
+3657	Királd	BZ	48.25	20.4	32090	6	788	896	413
+3658	Borsodbóta	BZ	48.2167	20.4	30669	6	814	901	357
+3659	Sáta	BZ	48.1833	20.4	02875	6	1651	1142	544
+3661	Sáta	BZ	48.1833	20.4	02875	6	1651	1142	544
+3662	Sáta	BZ	48.1833	20.4	02875	6	1651	1142	544
+3663	Arló	BZ	48.1833	20.2667	14331	5	4687	3785	1170
+3664	Járdánháza	BZ	48.15	20.25	26657	6	1125	1867	652
+3671	Borsodnádasd	BZ	48.1167	20.25	05315	4	2807	3146	1382
+3672	Borsodnádasd	BZ	48.1167	20.25	05315	4	2807	3146	1382
+3700	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3701	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3702	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3703	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3704	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3705	Kazincbarcika	BZ	48.25	20.6333	06691	4	3667	29695	12616
+3711	Szirmabesenyő	BZ	48.15	20.8	09496	5	1575	4531	1612
+3712	Sajósenye	BZ	48.2	20.8333	08970	6	847	470	135
+3712	Sajóvámos	BZ	48.1833	20.85	20738	6	3122	2247	778
+3713	Arnót	BZ	48.1333	20.8667	03771	6	1754	2607	806
+3714	Sajópálfala	BZ	48.1667	20.85	18537	6	711	792	282
+3715	Gesztely	BZ	48.1	20.9667	15608	6	2882	2826	951
+3716	Újcsanálos	BZ	48.1333	21.0167	12487	6	1218	905	335
+3716	Sóstófalva	BZ	48.15	21	13268	6	728	301	112
+3717	Alsódobsza	BZ	48.1833	21	19664	6	1069	344	163
+3718	Megyaszó	BZ	48.1833	21.05	21768	6	5342	2875	920
+3720	Sajókaza	BZ	48.2833	20.5833	14313	6	3072	3489	1053
+3720	Sajóivánka	BZ	48.2667	20.5833	03212	6	1023	592	220
+3721	Felsőnyárád	BZ	48.3333	20.6	32762	6	1167	1049	394
+3721	Jákfalva	BZ	48.3333	20.5833	20233	6	906	513	149
+3721	Dövény	BZ	48.35	20.55	06123	6	1165	289	115
+3722	Felsőkelecsény	BZ	48.3667	20.6	31723	6	799	407	144
+3723	Zubogy	BZ	48.3833	20.5833	19105	6	1143	601	233
+3724	Imola	BZ	48.4167	20.55	16577	6	1812	101	70
+3724	Ragály	BZ	48.4	20.5167	06053	6	1554	664	253
+3724	Trizs	BZ	48.4333	20.5	04914	6	1025	227	113
+3726	Alsószuha	BZ	48.3667	20.5167	28839	6	2242	459	183
+3726	Szuhafő	BZ	48.4167	20.45	03160	6	1605	156	91
+3726	Zádorfalva	BZ	48.3833	20.4833	03063	6	1375	475	179
+3728	Gömörszőlős	BZ	48.3833	20.4333	09706	6	878	69	47
+3728	Kelemér	BZ	48.35	20.4333	12034	6	1881	539	181
+3729	Serényfalva	BZ	48.3167	20.4	32531	6	1964	998	369
+3731	Szuhakálló	BZ	48.2833	20.6667	11110	6	696	1037	393
+3732	Kurityán	BZ	48.3167	20.6333	11819	6	754	1712	603
+3733	Rudabánya	BZ	48.3833	20.6333	23029	4	1646	2668	1151
+3734	Szuhogy	BZ	48.3833	20.6833	24606	6	1700	1243	448
+3735	Kánó	BZ	48.4333	20.6	07764	6	1377	164	95
+3735	Felsőtelekes	BZ	48.4	20.6333	31671	6	845	762	288
+3735	Alsótelekes	BZ	48.4167	20.6667	08217	6	644	137	93
+3741	Izsófalva	BZ	48.3	20.6667	05591	5	941	1763	617
+3742	Rudolftelep	BZ	48.3167	20.6833	34120	6	439	746	294
+3743	Ormosbánya	BZ	48.35	20.65	34069	6	755	1779	701
+3744	Múcsony	BZ	48.2667	20.6833	21546	5	1754	3210	1209
+3751	Szendrőlád	BZ	48.35	20.75	27456	6	1770	1933	440
+3752	Galvács	BZ	48.4167	20.7833	19293	6	1504	91	79
+3752	Szendrő	BZ	48.4	20.7333	08077	4	5356	4177	1454
+3753	Abod	BZ	48.4	20.8	10357	6	3117	228	126
+3754	Szalonna	BZ	48.45	20.75	16753	6	2008	1023	364
+3754	Meszes	BZ	48.4333	20.8	11758	6	1140	169	117
+3755	Martonyi	BZ	48.4667	20.7667	02024	6	1757	424	182
+3756	Varbóc	BZ	48.4667	20.65	10144	6	1010	48	60
+3756	Perkupa	BZ	48.4667	20.7	33419	6	1940	854	357
+3757	Égerszög	BZ	48.45	20.5833	13356	6	1077	52	46
+3757	Teresztenye	BZ	48.45	20.6167	28635	6	869	27	23
+3757	Szőlősardó	BZ	48.45	20.6333	07889	6	1066	109	84
+3758	Jósvafő	BZ	48.4833	20.5667	15680	6	2155	256	176
+3759	Aggtelek	BZ	48.4667	20.5167	09362	6	4382	569	247
+3761	Szin	BZ	48.5	20.6667	20871	6	1810	751	256
+3761	Tornakápolna	BZ	48.4667	20.6167	10375	6	402	29	34
+3761	Szinpetri	BZ	48.4833	20.6333	11493	6	971	228	100
+3762	Szögliget	BZ	48.5167	20.6833	16179	6	3474	641	395
+3763	Bódvaszilas	BZ	48.5333	20.7333	05926	6	1922	1067	484
+3764	Bódvarákó	BZ	48.5167	20.75	33303	6	922	109	82
+3765	Tornaszentandrás	BZ	48.5167	20.7833	27836	6	1565	224	135
+3765	Komjáti	BZ	48.55	20.7667	10612	6	1108	290	143
+3765	Tornabarakony	BZ	48.5	20.8167	16902	6	820	15	29
+3767	Tornanádaska	BZ	48.5667	20.7833	18801	6	783	595	134
+3768	Hidvégardó	BZ	48.5667	20.85	25672	6	1699	575	298
+3768	Bódvalenke	BZ	48.55	20.8167	27429	6	663	182	62
+3768	Becskeháza	BZ	48.5333	20.85	27049	6	500	40	40
+3769	Tornaszentjakab	BZ	48.5167	20.8833	30517	6	2822	205	135
+3770	Sajószentpéter	BZ	48.2167	20.7167	16054	4	3485	12453	4579
+3773	Sajókápolna	BZ	48.2	20.7	21670	6	1051	409	165
+3773	Sajólászlófalva	BZ	48.1833	20.6833	22479	6	662	438	166
+3775	Kondó	BZ	48.2	20.65	32498	6	1963	607	222
+3776	Radostyán	BZ	48.1833	20.6667	21193	6	810	627	223
+3777	Parasznya	BZ	48.1667	20.65	26745	6	1676	1208	438
+3778	Varbó	BZ	48.1667	20.6333	21810	6	2588	1105	404
+3779	Alacska	BZ	48.2167	20.65	33093	6	856	812	281
+3780	Ládbesenyő	BZ	48.3	20.7333	26231	6	1040	285	127
+3780	Damak	BZ	48.3167	20.8333	11350	6	752	264	104
+3780	Balajt	BZ	48.3	20.7333	22521	6	903	465	149
+3780	Edelény	BZ	48.3	20.7333	10728	4	5684	10372	3567
+3783	Ládbesenyő	BZ	48.3	20.7333	26231	6	1040	285	127
+3786	Irota	BZ	48.4	20.8833	05005	6	1234	70	64
+3786	Szakácsi	BZ	48.3833	20.8667	32258	6	862	139	81
+3786	Hegymeg	BZ	48.3333	20.8667	02468	6	570	110	57
+3786	Lak	BZ	48.35	20.8667	15857	6	1976	606	209
+3787	Tomor	BZ	48.3333	20.8833	14890	6	1289	230	124
+3791	Sajókeresztúr	BZ	48.1667	20.7833	26949	6	1639	1541	570
+3792	Sajóbábony	BZ	48.1667	20.7333	03504	5	1343	2877	1144
+3793	Sajóecseg	BZ	48.2	20.7833	27331	6	794	1024	433
+3794	Boldva	BZ	48.2167	20.8	08396	6	2834	2384	801
+3794	Ziliz	BZ	48.25	20.8	19275	6	925	369	137
+3795	Hangács	BZ	48.3	20.8333	11226	6	2253	623	256
+3795	Nyomár	BZ	48.2833	20.8167	04215	6	1046	332	133
+3796	Borsodszirák	BZ	48.2667	20.7667	16799	6	1101	1228	390
+3800	Szikszó	BZ	48.2	20.9333	21351	4	3623	5637	2212
+3809	Abaújszolnok	BZ	48.3667	20.9833	26338	6	866	164	70
+3809	Nyésta	BZ	48.3667	20.95	04419	6	693	53	36
+3809	Selyeb	BZ	48.3333	20.9667	25380	6	1668	497	186
+3811	Alsóvadász	BZ	48.25	20.9167	29814	6	2291	1554	457
+3812	Monaj	BZ	48.3	20.95	09016	6	1155	265	107
+3812	Homrogd	BZ	48.2833	20.9167	21236	6	1347	986	327
+3813	Kupa	BZ	48.3333	20.9167	18722	6	784	144	79
+3814	Felsővadász	BZ	48.3667	20.9333	23533	6	1866	549	186
+3815	Gadna	BZ	48.4	20.9333	05494	6	809	260	83
+3815	Abaújlak	BZ	48.4	20.9667	02820	6	706	114	86
+3816	Gagyvendégi	BZ	48.4333	20.9833	03744	6	1232	188	108
+3817	Gagybátor	BZ	48.4333	20.95	28307	6	1877	238	118
+3821	Pamlény	BZ	48.5	20.9333	12371	6	1243	58	55
+3821	Büttös	BZ	48.4833	21.0167	23977	6	1822	188	108
+3821	Szászfa	BZ	48.4667	20.95	08147	6	1213	155	85
+3821	Kány	BZ	48.5167	21.0167	25742	6	925	61	57
+3821	Perecse	BZ	48.5	21	32683	6	1257	33	38
+3821	Krasznokvajda	BZ	48.4667	20.9833	19576	6	1144	503	202
+3821	Keresztéte	BZ	48.5	20.95	17066	6	401	31	27
+3825	Debréte	BZ	48.5	20.8667	31954	6	962	19	28
+3825	Rakaca	BZ	48.4667	20.9	29717	6	1900	763	262
+3825	Viszló	BZ	48.5	20.9	03957	6	1110	72	58
+3826	Rakacaszend	BZ	48.4667	20.85	16133	6	1571	352	166
+3831	Kázsmárk	BZ	48.2833	20.9833	13374	6	1252	958	266
+3832	Léh	BZ	48.2833	20.9833	03531	6	845	452	153
+3833	Rásonysápberencs	BZ	48.3167	21	31909	6	916	591	197
+3834	Beret	BZ	48.35	21.0333	29674	6	682	273	93
+3834	Detek	BZ	48.3333	21.0333	10524	6	970	279	135
+3836	Baktakék	BZ	48.3833	21.0333	18184	6	1885	700	294
+3837	Felsőgagy	BZ	48.4333	21.0167	29708	6	1447	161	89
+3837	Gagyapáti	BZ	48.4167	21	28732	6	326	24	14
+3837	Alsógagy	BZ	48.4	21.0333	14429	6	628	100	56
+3837	Csenyéte	BZ	48.4333	21.05	08493	6	1000	454	83
+3841	Aszaló	BZ	48.2167	20.9667	04233	6	2540	1960	644
+3842	Halmaj	BZ	48.25	21	27942	6	1263	1885	600
+3843	Kiskinizs	BZ	48.25	21.05	03762	6	718	339	130
+3844	Szentistvánbaksa	BZ	48.2167	21.0333	08484	6	656	277	140
+3844	Nagykinizs	BZ	48.2333	21.0333	26505	6	662	350	138
+3846	Hernádkércs	BZ	48.25	21.05	21829	6	741	267	151
+3847	Felsődobsza	BZ	48.2667	21.0667	09742	6	1527	933	343
+3848	Csobád	BZ	48.2833	21.0333	05333	6	1186	697	265
+3849	Forró	BZ	48.3167	21.0833	30483	6	1903	2476	859
+3851	Ináncs	BZ	48.2833	21.0667	08086	6	1098	1278	437
+3852	Hernádszentandrás	BZ	48.2833	21.1	17136	6	704	475	165
+3853	Pere	BZ	48.2833	21.1333	24420	6	956	357	182
+3853	Hernádbűd	BZ	48.3	21.1333	15839	6	591	142	79
+3854	Hernádbűd	BZ	48.3	21.1333	15839	6	591	142	79
+3855	Fancsal	BZ	48.35	21.0667	12557	6	981	317	146
+3860	Encs	BZ	48.3333	21.1333	33048	4	2580	6396	2274
+3861	Encs	BZ	48.3333	21.1333	33048	4	2580	6396	2274
+3863	Szalaszend	BZ	48.3833	21.1333	31015	6	1826	1117	380
+3864	Fulókércs	BZ	48.4333	21.1167	22123	6	1863	387	120
+3865	Fáj	BZ	48.4167	21.0833	02741	6	1932	358	100
+3866	Szemere	BZ	48.4667	21.1	09830	6	2630	386	157
+3866	Litka	BZ	48.45	21.0667	28219	6	670	56	49
+3871	Méra	BZ	48.35	21.15	25618	6	1511	1775	596
+3872	Novajidrány	BZ	48.4	21.1833	27191	6	1435	1428	465
+3873	Garadna	BZ	48.4167	21.1833	10904	6	978	458	194
+3874	Pusztaradvány	BZ	48.4667	21.1333	15413	6	718	232	66
+3874	Hernádvécse	BZ	48.45	21.1667	19840	6	1694	978	288
+3874	Hernádpetri	BZ	48.4833	21.1667	24882	6	1711	270	103
+3875	Hernádszurdok	BZ	48.4833	21.2167	24970	6	448	197	97
+3876	Hidasnémeti	BZ	48.5	21.2333	11697	6	1611	1115	442
+3877	Tornyosnémeti	BZ	48.5167	21.2667	29054	6	1404	510	273
+3881	Abaújszántó	BZ	48.2833	21.2	03595	4	4736	3169	1306
+3881	Sima	BZ	48.3	21.3	23418	6	488	23	16
+3881	Baskó	BZ	48.3333	21.3333	08846	6	2963	186	116
+3882	Abaújalpár	BZ	48.3167	21.2333	15662	6	848	77	61
+3882	Abaújkér	BZ	48.3	21.2	26718	6	1727	692	300
+3884	Boldogkőújfalu	BZ	48.3167	21.25	18944	6	1102	534	214
+3885	Boldogkőváralja	BZ	48.3333	21.2333	14474	6	2203	1160	435
+3885	Arka	BZ	48.35	21.25	26198	6	953	81	65
+3886	Korlát	BZ	48.3833	21.25	22956	6	794	293	143
+3887	Hernádcéce	BZ	48.35	21.2	09399	6	994	206	122
+3888	Vizsoly	BZ	48.3833	21.2167	21087	6	1841	878	359
+3891	Vilmány	BZ	48.4167	21.2333	11581	6	1258	1375	460
+3892	Hejce	BZ	48.4333	21.2833	22187	6	953	267	113
+3893	Regéc	BZ	48.4	21.35	08402	6	2721	99	62
+3893	Fony	BZ	48.4	21.3	17932	6	4058	368	210
+3893	Mogyoróska	BZ	48.3833	21.3333	10968	6	1917	75	70
+3894	Göncruszka	BZ	48.45	21.25	18643	6	1673	623	324
+3895	Gönc	BZ	48.4667	21.2833	15936	4	3730	2060	950
+3896	Telkibánya	BZ	48.4833	21.3667	13763	6	4686	634	342
+3897	Zsujta	BZ	48.5	21.2833	11022	6	677	173	88
+3898	Abaújvár	BZ	48.5333	21.3167	02273	6	736	232	159
+3898	Pányok	BZ	48.5333	21.3667	24730	6	850	53	81
+3899	Kéked	BZ	48.55	21.35	15264	6	1305	193	139
+3900	Szerencs	BZ	48.1667	21.2	30739	4	3668	9444	3869
+3901	Szerencs	BZ	48.1667	21.2	30739	4	3668	9444	3869
+3903	Bekecs	BZ	48.15	21.1833	06929	6	2572	2486	928
+3904	Legyesbénye	BZ	48.1667	21.15	11660	6	2031	1593	630
+3905	Monok	BZ	48.2167	21.15	07825	6	4198	1606	806
+3906	Golop	BZ	48.2333	21.2	13134	6	943	585	301
+3907	Tállya	BZ	48.2333	21.2333	12210	6	3795	2025	1019
+3908	Rátka	BZ	48.2167	21.2333	12469	6	1177	975	432
+3909	Mád	BZ	48.2	21.2833	03902	6	3186	2251	1211
+3910	Tokaj	BZ	48.1167	21.4167	18306	4	2819	4747	1707
+3911	Tokaj	BZ	48.1167	21.4167	18306	4	2819	4747	1707
+3915	Tarcal	BZ	48.1333	21.35	21740	6	5373	3006	1353
+3916	Bodrogkeresztúr	BZ	48.1667	21.3667	30784	6	2987	1157	560
+3917	Bodrogkisfalud	BZ	48.1833	21.3667	33808	6	1468	891	432
+3918	Szegi	BZ	48.2	21.3833	33817	6	905	323	138
+3918	Szegilong	BZ	48.2167	21.4	31510	6	694	231	120
+3921	Taktaszada	BZ	48.1167	21.1833	03133	6	2574	1947	682
+3922	Taktaharkány	BZ	48.0833	21.1333	18245	5	3913	3853	1343
+3923	Taktaharkány	BZ	48.0833	21.1333	18245	5	3913	3853	1343
+3924	Taktakenéz	BZ	48.05	21.2167	28787	6	1974	1268	436
+3925	Prügy	BZ	48.0833	21.25	21272	6	3139	2454	837
+3926	Taktabáj	BZ	48.0667	21.3167	03708	6	1682	597	239
+3927	Csobaj	BZ	48.05	21.35	20774	6	1959	767	345
+3928	Tiszatardos	BZ	48.05	21.3833	30298	6	893	240	146
+3929	Tiszaladány	BZ	48.0667	21.4167	19381	6	2221	704	330
+3931	Mezőzombor	BZ	48.15	21.2667	03443	6	3878	2475	902
+3932	Erdőbénye	BZ	48.2667	21.3667	25326	6	4579	1099	699
+3933	Olaszliszka	BZ	48.25	21.4333	31778	6	3949	1672	791
+3934	Tolcsva	BZ	48.2833	21.45	28051	6	1649	1756	805
+3935	Erdőhorváti	BZ	48.3167	21.4333	22503	6	5011	604	319
+3936	Háromhuta	BZ	48.3833	21.4333	12706	6	3780	132	89
+3937	Komlóska	BZ	48.3333	21.4667	16559	6	2986	268	179
+3941	Vámosújfalu	BZ	48.2667	21.4667	15149	6	1065	863	331
+3942	Sárazsadány	BZ	48.2667	21.5	20516	6	1533	260	181
+3943	Bodrogolaszi	BZ	48.2833	21.5167	14401	6	2061	942	400
+3944	Bodrogolaszi	BZ	48.2833	21.5167	14401	6	2061	942	400
+3945	Bodrogolaszi	BZ	48.2833	21.5167	14401	6	2061	942	400
+3950	Sárospatak	BZ	48.3167	21.5833	27474	4	13919	13357	5323
+3954	Györgytarló	BZ	48.2	21.6667	05069	6	3019	578	224
+3955	Kenézlő	BZ	48.2	21.5333	05458	6	2296	1261	566
+3956	Viss	BZ	48.2167	21.5167	05096	6	1392	672	353
+3957	Zalkod	BZ	48.1833	21.4667	15617	6	1022	244	215
+3958	Hercegkút	BZ	48.3333	21.5333	30137	6	782	634	258
+3959	Makkoshotyka	BZ	48.35	21.5167	19600	6	1041	905	310
+3961	Vajdácska	BZ	48.3167	21.6667	30003	6	2278	1343	468
+3962	Karos	BZ	48.3333	21.75	30508	6	1532	508	206
+3963	Karcsa	BZ	48.3167	21.8	21218	6	4370	1806	665
+3964	Pácin	BZ	48.3333	21.8333	15893	6	3394	1421	622
+3965	Kisrozvágy	BZ	48.35	21.95	11448	6	834	150	87
+3965	Nagyrozvágy	BZ	48.3333	21.9167	33181	6	2682	642	292
+3967	Lácacséke	BZ	48.3667	22	20844	6	1637	291	208
+3971	Tiszakarád	BZ	48.2	21.7167	13976	6	4757	2373	929
+3972	Tiszacsermely	BZ	48.2333	21.7833	29133	6	2028	629	254
+3973	Cigánd	BZ	48.25	21.9	03939	4	5676	2820	1170
+3974	Ricse	BZ	48.3333	21.9667	19220	5	2476	1737	660
+3974	Semjén	BZ	48.35	21.9667	23755	6	784	461	168
+3976	Révleányvár	BZ	48.3167	22.05	09317	6	1649	521	320
+3977	Zemplénagárd	BZ	48.35	22.0833	31608	6	2911	775	430
+3978	Dámóc	BZ	48.3667	22.0333	07719	6	1599	392	201
+3980	Sátoraljaújhely	BZ	48.4	21.6667	05120	4	7347	16299	6875
+3981	Sátoraljaújhely	BZ	48.4	21.6667	05120	4	7347	16299	6875
+3985	Felsőberecki	BZ	48.3667	21.7	08174	6	353	296	117
+3985	Alsóberecki	BZ	48.35	21.7	20482	6	686	795	288
+3987	Bodroghalom	BZ	48.3	21.7167	23737	6	2687	1355	564
+3988	Bodroghalom	BZ	48.3	21.7167	23737	6	2687	1355	564
+3989	Mikóháza	BZ	48.475	21.6167	24253	6	1692	578	228
+3989	Felsőregmec	BZ	48.4833	21.6167	07588	6	1075	309	103
+3989	Alsóregmec	BZ	48.4667	21.6167	23223	6	1539	202	92
+3991	Vilyvitány	BZ	48.5	21.5667	12982	6	1313	249	177
+3992	Vágáshuta	BZ	48.4167	21.55	29151	6	200	99	70
+3992	Kovácsvágás	BZ	48.45	21.5333	28547	6	2113	632	238
+3993	Füzérradvány	BZ	48.4833	21.5333	10366	6	986	390	209
+3994	Kishuta	BZ	48.45	21.4833	28875	6	518	293	133
+3994	Filkeháza	BZ	48.5	21.5	25238	6	441	102	42
+3994	Nagyhuta	BZ	48.4333	21.5	15468	6	3506	73	80
+3994	Füzérkajata	BZ	48.5167	21.5	06460	6	1145	116	77
+3994	Pálháza	BZ	48.4667	21.5167	12362	4	676	1062	416
+3994	Bózsva	BZ	48.4667	21.4667	31006	6	1639	197	124
+3995	Pusztafalu	BZ	48.55	21.5	17048	6	700	213	106
+3996	Füzér	BZ	48.55	21.4667	17109	6	3750	477	228
+3997	Füzérkomlós	BZ	48.5167	21.4667	11378	6	587	340	139
+3998	Nyíri	BZ	48.5	21.45	26435	6	1647	426	177
+3999	Hollóháza	BZ	48.55	21.4167	31167	6	236	885	433
+4000	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4001	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4002	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4003	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4004	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4005	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4006	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4007	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4008	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4009	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4010	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4011	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4012	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4013	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4014	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4015	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4017	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4021	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4022	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4024	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4025	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4026	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4027	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4028	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4029	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4030	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4031	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4032	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4033	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4034	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4040	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4041	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4042	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4044	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4045	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4046	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4047	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4048	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4060	Balmazújváros	HB	47.6167	21.35	02918	4	20545	17575	6669
+4063	Balmazújváros	HB	47.6167	21.35	02918	4	20545	17575	6669
+4063	Debrecen	HB	47.6167	21.35	15130	1	46165	206225	89716
+4064	Nagyhegyes	HB	47.5167	21.4167	09478	6	13276	2752	990
+4065	Újszentmargita	HB	47.7333	21.1	32568	6	9622	1442	652
+4066	Tiszacsege	HB	47.7	21	15644	4	13640	4705	2101
+4067	Tiszacsege	HB	47.7	21	15644	4	13640	4705	2101
+4069	Egyek	HB	47.6333	20.9	15741	5	10479	5071	2392
+4071	Hortobágy	HB	47.5833	21.1667	04118	6	28458	1553	651
+4074	Tarnalelesz	HB	47.7708	21.2167	13240	6	3713	1715	694
+4075	Görbeháza	HB	47.8333	21.2333	16568	6	8020	2463	1071
+4078	Görbeháza	HB	47.8333	21.2333	16568	6	8020	2463	1071
+4079	Görbeháza	HB	47.8333	21.2333	16568	6	8020	2463	1071
+4080	Hajdúnánás	HB	47.85	21.4333	22406	4	25962	17498	7027
+4081	Hajdúnánás	HB	47.85	21.4333	22406	4	25962	17498	7027
+4085	Hajdúnánás	HB	47.85	21.4333	22406	4	25962	17498	7027
+4086	Hajdúnánás	HB	47.85	21.4333	22406	4	25962	17498	7027
+4087	Hajdúdorog	HB	47.8167	21.5	12803	4	10065	9070	3562
+4090	Polgár	HB	47.8667	21.1167	23117	4	9746	8133	3364
+4090	Folyás	HB	47.8	21.1333	34014	6	5392	352	154
+4096	Újtikos	HB	47.9167	21.1833	11925	6	3529	905	386
+4097	Tiszagyulaháza	HB	47.95	21.15	30845	6	2078	768	373
+4100	Berettyóújfalu	HB	47.2167	21.55	12788	4	17098	15427	6308
+4101	Berettyóújfalu	HB	47.2167	21.55	12788	4	17098	15427	6308
+4103	Berettyóújfalu	HB	47.2167	21.55	12788	4	17098	15427	6308
+4110	Biharkeresztes	HB	47.1333	21.7167	19956	4	4926	3819	1655
+4114	Bojt	HB	47.2	21.7333	14137	6	2688	501	246
+4115	Ártánd	HB	47.1167	21.7667	03319	6	1982	506	240
+4116	Berekböszörmény	HB	47.0667	21.6833	18467	6	4284	1707	785
+4117	Told	HB	47.1167	21.65	25876	6	1491	312	150
+4118	Mezőpeterd	HB	47.1667	21.6167	31033	6	1823	500	269
+4119	Váncsod	HB	47.2	21.65	16762	6	3443	1241	543
+4121	Szentpéterszeg	HB	47.2333	21.6167	19099	6	2551	1111	477
+4122	Gáborján	HB	47.2333	21.6667	18175	6	2646	898	386
+4123	Hencida	HB	47.25	21.7	29391	6	3479	1280	484
+4124	Esztár	HB	47.2833	21.7833	25469	6	3171	1351	525
+4125	Pocsaj	HB	47.2833	21.8167	11837	5	4955	2588	1033
+4126	Kismarja	HB	47.25	21.8333	15477	6	4716	1239	535
+4127	Nagykereki	HB	47.1833	21.8	08907	6	3727	1185	530
+4128	Bedő	HB	47.1667	21.75	33446	6	1020	252	142
+4130	Derecske	HB	47.35	21.5667	05573	4	10358	9116	3315
+4131	Derecske	HB	47.35	21.5667	05573	4	10358	9116	3315
+4132	Tépe	HB	47.3167	21.5833	31042	6	2322	1116	420
+4133	Konyár	HB	47.3167	21.6667	25964	6	4170	2099	857
+4134	Mezősas	HB	47.1167	21.5667	18847	6	2639	635	310
+4135	Körösszegapáti	HB	47.0333	21.6333	08943	6	4585	862	500
+4136	Körösszakál	HB	47.0167	21.6	31130	6	1502	828	391
+4137	Magyarhomorog	HB	47.0167	21.55	03683	6	3956	861	453
+4138	Komádi	HB	47	21.5	02167	4	14465	5407	2604
+4141	Furta	HB	47.1333	21.4667	16993	6	4285	1151	599
+4142	Zsáka	HB	47.1333	21.4333	04817	5	7881	1622	764
+4143	Vekerd	HB	47.1	21.4	11138	6	741	119	114
+4144	Darvas	HB	47.1	21.35	14678	6	4231	574	284
+4145	Csökmő	HB	47.0333	21.3	12450	5	6897	1885	916
+4146	Újiráz	HB	46.9833	21.3667	23393	6	1547	543	275
+4150	Püspökladány	HB	47.3167	21.1167	10162	4	18695	15117	5964
+4151	Püspökladány	HB	47.3167	21.1167	10162	4	18695	15117	5964
+4152	Püspökladány	HB	47.3167	21.1167	10162	4	18695	15117	5964
+4155	Püspökladány	HB	47.3167	21.1167	10162	4	18695	15117	5964
+4161	Báránd	HB	47.3	21.2333	26693	6	4257	2624	1183
+4162	Báránd	HB	47.3	21.2333	26693	6	4257	2624	1183
+4163	Szerep	HB	47.2333	21.15	33437	6	5604	1604	571
+4164	Bakonszeg	HB	47.1833	21.45	15167	6	3503	1176	584
+4171	Sárrétudvari	HB	47.2333	21.2	23940	5	5442	2870	1251
+4172	Biharnagybajom	HB	47.2167	21.2333	24828	6	6135	2801	1145
+4173	Nagyrábé	HB	47.2	21.3333	06309	5	8542	2102	964
+4174	Bihartorda	HB	47.2167	21.3667	29887	6	2238	905	435
+4175	Bihardancsháza	HB	47.2333	21.3167	25256	6	831	193	104
+4176	Sáp	HB	47.25	21.3667	26116	6	1922	980	410
+4177	Földes	HB	47.3	21.3667	03258	5	6524	4092	1753
+4181	Nádudvar	HB	47.4167	21.1667	28103	4	22591	8995	3728
+4183	Kaba	HB	47.35	21.2833	02307	4	9504	6087	2369
+4184	Tetétlen	HB	47.3167	21.3	19691	6	3211	1397	558
+4200	Hajdúszoboszló	HB	47.4467	21.3924	05175	4	23870	23296	10524
+4201	Hajdúszoboszló	HB	47.45	21.4	05175	4	23870	23296	10524
+4202	Hajdúszoboszló	HB	47.45	21.4	05175	4	23870	23296	10524
+4211	Ebes	HB	47.4667	21.5	14614	6	7727	4407	1579
+4212	Hajdúszovát	HB	47.3833	21.4833	17473	6	5801	3087	1101
+4220	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4221	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4224	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4225	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4225	Debrecen	HB	47.6667	21.5167	15130	1	46165	206225	89716
+4231	Bököny	SZ	47.7333	21.75	11299	6	3547	3272	1267
+4232	Geszteréd	SZ	47.7667	21.7833	28893	6	3352	1709	798
+4233	Balkány	SZ	47.7667	21.8667	26958	4	8999	6442	2494
+4234	Szakoly	SZ	47.7667	21.9167	04774	6	4144	2847	1028
+4235	Biri	SZ	47.8167	21.85	02945	6	2259	1356	495
+4241	Bocskaikert	HB	47.4333	21.9167	34102	6	1089	2964	1059
+4242	Hajdúhadház	HB	47.6833	21.6667	10393	4	8780	12650	4203
+4243	Téglás	HB	47.7167	21.6833	23214	4	3833	6624	2337
+4244	Újfehértó	SZ	47.8	21.6833	26611	4	14088	13335	4971
+4245	Érpatak	SZ	47.8	21.7667	10852	6	3133	1749	735
+4246	Érpatak	SZ	47.8	21.7667	10852	6	3133	1749	735
+4251	Hajdúsámson	HB	47.6	21.7667	31097	4	6947	12846	4103
+4252	Hajdúsámson	HB	47.6	21.7667	31097	4	6947	12846	4103
+4253	Hajdúsámson	HB	47.6	21.7667	31097	4	6947	12846	4103
+4254	Nyíradony	HB	47.6833	21.9167	06187	4	9659	7874	2796
+4262	Nyíracsád	HB	47.6	21.9833	14003	6	7492	3873	1482
+4263	Nyírmártonfalva	HB	47.5833	21.9	32382	6	5748	2075	818
+4264	Nyírábrány	HB	47.55	22.0333	32294	5	5562	3854	1545
+4266	Fülöp	HB	47.6	22.0667	22150	6	5595	1767	784
+4267	Penészlek	SZ	47.6333	22.15	17084	6	3692	959	503
+4271	Mikepércs	HB	47.45	21.6333	24217	6	3693	4177	1221
+4272	Sáránd	HB	47.4	21.6333	25007	6	2268	2338	831
+4273	Hajdúbagos	HB	47.4	21.6667	26170	6	3744	1995	854
+4274	Hosszúpályi	HB	47.4	21.75	06266	5	7918	5839	2045
+4275	Monostorpályi	HB	47.4	21.7833	25894	6	4444	2217	954
+4281	Létavértes	HB	47.3833	21.9	05768	4	11662	7165	2724
+4283	Létavértes	HB	47.3833	21.9	05768	4	11662	7165	2724
+4284	Kokad	HB	47.4	21.95	17455	6	1610	596	302
+4285	Álmosd	HB	47.4167	21.9833	27641	6	3413	1602	725
+4286	Bagamér	HB	47.45	22	20011	5	4702	2553	1023
+4287	Vámospércs	HB	47.5333	21.9	08989	4	5819	5347	2146
+4288	Újléta	HB	47.4667	21.8833	20419	6	3041	1063	445
+4300	Nyírbátor	SZ	47.8333	22.1333	14845	4	6673	12522	4764
+4301	Nyírbátor	SZ	47.8333	22.1333	14845	4	6673	12522	4764
+4311	Nyírgyulaj	SZ	47.8833	22.1	09238	6	3576	2000	786
+4320	Nagykálló	SZ	47.8833	21.85	24785	4	6855	10064	3653
+4321	Nagykálló	SZ	47.8833	21.85	24785	4	6855	10064	3653
+4324	Kállósemjén	SZ	47.8667	21.9333	31404	5	5452	3820	1570
+4325	Kisléta	SZ	47.8333	22.0167	28477	6	2200	1896	574
+4326	Máriapócs	SZ	47.8833	22.0333	19655	4	2209	2130	728
+4327	Pócspetri	SZ	47.8833	22	11244	6	2637	1762	669
+4331	Nyírcsászári	SZ	47.8667	22.1833	25973	6	1323	1166	430
+4332	Nyírderzs	SZ	47.9	22.1667	05041	6	1701	598	266
+4333	Nyírkáta	SZ	47.8667	22.2667	32452	6	3863	1816	661
+4334	Hodász	SZ	47.9167	22.2167	13019	5	2649	3399	1134
+4335	Kántorjánosi	SZ	47.9333	22.15	02671	6	4162	2183	883
+4336	Őr	SZ	47.9833	22.2	09025	6	1778	1447	544
+4337	Jármi	SZ	47.9667	22.25	17589	6	1237	1267	482
+4338	Papos	SZ	47.9833	22.25	32577	6	1067	837	320
+4341	Nyírvasvári	SZ	47.8167	22.1833	16522	6	2843	1944	743
+4342	Terem	SZ	47.8	22.3167	33358	6	4951	650	306
+4343	Bátorliget	SZ	47.8083	22.25	02990	6	3330	710	353
+4351	Vállaj	SZ	47.7667	22.3833	06938	6	2227	867	456
+4352	Mérk	SZ	47.7833	22.3667	07463	5	2508	2118	817
+4353	Tiborszállás	SZ	47.8167	22.4167	08952	6	2552	1003	373
+4354	Fábiánháza	SZ	47.8333	22.3667	23250	6	2735	1730	777
+4355	Nagyecsed	SZ	47.8667	22.4	06488	4	4387	6306	2391
+4356	Nyírcsaholy	SZ	47.9	22.3333	07904	6	3434	2172	833
+4361	Nyírbogát	SZ	47.8	22.0667	31158	5	5536	3279	1287
+4362	Nyírgelse	SZ	47.75	21.9833	28440	6	2761	1117	504
+4363	Nyírmihálydi	SZ	47.7333	21.9833	26365	6	2548	2005	638
+4371	Nyírlugos	SZ	47.7	22.05	11271	4	5838	2837	1226
+4372	Nyírbéltek	SZ	47.7	22.1333	15802	5	6217	2815	1119
+4373	Ömböly	SZ	47.7	22.2167	26550	6	3035	425	200
+4374	Encsencs	SZ	47.7333	22.1167	32328	6	3191	1986	678
+4375	Piricse	SZ	47.7667	22.15	03391	6	3699	1891	642
+4376	Nyírpilis	SZ	47.7833	22.1833	03878	6	1634	836	243
+4400	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4401	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4402	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4403	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4404	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4405	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4406	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4407	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4410	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4411	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4412	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4413	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4431	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4432	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4433	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4434	Kálmánháza	SZ	47.8833	21.5833	27225	6	3724	2051	762
+4435	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4440	Tiszavasvári	SZ	47.9667	21.35	07597	4	12659	13012	4559
+4441	Szorgalmatos	SZ	47.9667	21.4875	34388	6	1038	1070	330
+4444	Szorgalmatos	SZ	47.9667	21.4875	34388	6	1038	1070	330
+4445	Nagycserkesz	SZ	47.9667	21.5333	22743	6	4151	1800	684
+4446	Nagycserkesz	SZ	47.9667	21.5333	22743	6	4151	1800	684
+4447	Nagycserkesz	SZ	47.9667	21.5333	22743	6	4151	1800	684
+4450	Tiszalök	SZ	48.0167	21.3833	23524	4	5872	5768	2262
+4455	Tiszadada	SZ	48.0333	21.25	06433	6	4877	2327	977
+4456	Tiszadob	SZ	48.0167	21.1667	12593	5	8261	3071	1233
+4461	Nyírtelek	SZ	48.0167	21.6333	13550	4	6792	7001	2552
+4463	Tiszanagyfalu	SZ	48.1	21.4833	27252	6	2705	1904	707
+4464	Tiszaeszlár	SZ	48.05	21.4667	09113	6	5460	2676	1097
+4465	Rakamaz	SZ	48.1333	21.4667	14739	4	4264	4910	1893
+4466	Timár	SZ	48.1667	21.4667	24475	6	2182	1350	533
+4467	Szabolcs	SZ	48.1833	21.5	19169	6	588	423	201
+4468	Balsa	SZ	48.1833	21.55	15963	6	2251	856	433
+4471	Gávavencsellő	SZ	48.1667	21.6	05801	5	6683	3596	1662
+4472	Gávavencsellő	SZ	48.1667	21.6	05801	5	6683	3596	1662
+4474	Tiszabercel	SZ	48.15	21.65	03850	6	3138	1957	754
+4475	Paszab	SZ	48.15	21.6833	31972	6	1296	1306	434
+4481	Paszab	SZ	48.15	21.6833	31972	6	1296	1306	434
+4482	Kótaj	SZ	48.05	21.7167	23728	6	2593	4542	1523
+4483	Buj	SZ	48.1	21.65	19707	6	3276	2305	978
+4484	Ibrány	SZ	48.1333	21.7167	25636	4	6048	6955	2369
+4485	Nagyhalász	SZ	48.1333	21.7667	27155	4	4431	5715	1963
+4486	Nagyhalász	SZ	48.1333	21.7667	27155	4	4431	5715	1963
+4487	Tiszatelek	SZ	48.2	21.8	14447	6	3378	1473	541
+4488	Beszterec	SZ	48.15	21.85	21227	6	1159	1044	379
+4491	Újdombrád	SZ	48.2333	21.9333	33659	6	1078	703	220
+4492	Dombrád	SZ	48.2333	21.9333	14508	4	5184	4069	1484
+4493	Tiszakanyár	SZ	48.25	21.9667	08554	6	1551	1630	551
+4494	Kékcse	SZ	48.25	22	14359	6	1823	1568	493
+4495	Döge	SZ	48.2667	22.0833	03647	6	1654	2115	743
+4496	Szabolcsveresmart	SZ	48.3	22.0167	03586	6	2295	1708	578
+4501	Kemecse	SZ	48.0667	21.8	19992	4	3894	4840	1673
+4502	Vasmegyer	SZ	48.1167	21.8167	27100	6	2273	1726	584
+4503	Tiszarád	SZ	48.1167	21.8	10205	6	923	603	209
+4511	Nyírbogdány	SZ	48.05	21.8833	28802	6	3503	2985	1046
+4512	Nyírbogdány	SZ	48.05	21.8833	28802	6	3503	2985	1046
+4515	Kék	SZ	48.1167	21.8833	28431	6	2205	1966	670
+4516	Demecser	SZ	48.1167	21.9167	17756	4	3698	4368	1524
+4517	Gégény	SZ	48.15	21.95	05670	6	2344	1981	733
+4521	Berkesz	SZ	48.1	21.9833	07472	6	1318	900	345
+4522	Nyírtass	SZ	48.1167	22.0333	28060	6	3795	2034	832
+4523	Pátroha	SZ	48.1667	22	12186	6	3922	2939	1032
+4524	Ajak	SZ	48.1833	22.0667	08776	5	2476	3691	1297
+4525	Rétközberencs	SZ	48.2	22.0167	21573	6	1580	1171	403
+4531	Nyírpazony	SZ	47.9833	21.8	33145	6	1505	3396	1220
+4532	Nyírtura	SZ	48.0167	21.8333	12098	6	2148	1872	659
+4533	Sényő	SZ	48	21.8833	04491	6	1830	1439	463
+4534	Székely	SZ	48.0667	21.95	31088	6	1608	1076	363
+4535	Nyíribrony	SZ	48.0167	21.9667	14696	6	2009	1118	429
+4536	Ramocsaháza	SZ	48.05	22	31857	6	1811	1493	547
+4537	Nyírkércs	SZ	48.0167	22.05	25928	6	1428	799	321
+4541	Nyírjákó	SZ	48.0333	22.0833	31477	6	1034	927	365
+4542	Petneháza	SZ	48.0667	22.0833	17224	6	2420	1849	703
+4543	Laskod	SZ	48.05	22.05	21290	6	1359	1006	415
+4544	Nyírkarász	SZ	48.1	22.1	18290	6	4143	2360	872
+4545	Gyulaháza	SZ	48.1333	22.1167	07676	6	2209	1970	691
+4546	Anarcs	SZ	48.1833	22.1167	29975	6	1706	1977	682
+4547	Szabolcsbáka	SZ	48.15	22.15	22053	6	1984	1215	464
+4551	Szabolcsbáka	SZ	48.15	22.15	22053	6	1984	1215	464
+4552	Napkor	SZ	47.9333	21.8833	08420	6	3735	3844	1336
+4553	Apagy	SZ	47.9667	21.9333	20303	6	3204	2269	862
+4554	Nyírtét	SZ	48.0167	21.9333	09256	6	1717	1080	375
+4555	Levelek	SZ	47.9667	22	30979	5	2573	2898	953
+4556	Magy	SZ	47.9333	21.9833	16629	6	2070	987	332
+4557	Besenyőd	SZ	47.9667	22.0167	13639	6	945	642	254
+4558	Ófehértó	SZ	47.9333	22.05	22284	6	4317	2614	1020
+4561	Baktalórántháza	SZ	48	22.0833	02325	4	3525	4306	1204
+4562	Vaja	SZ	48	22.1667	18591	5	2861	3625	1171
+4563	Rohod	SZ	48.0333	22.1333	24581	6	1956	1225	434
+4564	Nyírmada	SZ	48.0667	22.2	12274	5	3882	4866	1568
+4565	Pusztadobos	SZ	48.0667	22.2333	13860	6	1669	1330	511
+4566	Ilk	SZ	48.1167	22.2333	09654	6	1456	1234	418
+4567	Gemzse	SZ	48.1333	22.2	13000	6	1360	829	302
+4600	Kisvárda	SZ	48.2167	22.0833	09265	4	3591	17097	6915
+4601	Kisvárda	SZ	48.2167	22.0833	09265	4	3591	17097	6915
+4603	Kisvárda	SZ	48.2167	22.0833	09265	4	3591	17097	6915
+4611	Jéke	SZ	48.2333	22.1667	13143	6	632	736	278
+4621	Fényeslitke	SZ	48.2667	22.1	22415	6	2515	2409	868
+4622	Komoró	SZ	48.3	22.1167	27146	6	1169	1318	459
+4623	Tuzsér	SZ	48.35	22.1333	09919	5	1551	3360	1016
+4624	Tiszabezdéd	SZ	48.3667	22.15	20172	6	1860	1961	674
+4625	Győröcske	SZ	48.3833	22.15	28945	6	213	136	55
+4625	Záhony	SZ	48.4167	22.1833	16203	4	687	4279	1800
+4627	Zsurk	SZ	48.4167	22.2167	13037	6	1539	751	278
+4628	Tiszaszentmárton	SZ	48.3833	22.2333	27544	6	1455	1190	414
+4631	Pap	SZ	48.2167	22.15	27748	6	1715	1829	635
+4632	Nyírlövő	SZ	48.2	22.1833	11095	6	791	707	258
+4633	Lövőpetri	SZ	48.1833	22.2	07995	6	926	460	220
+4634	Aranyosapáti	SZ	48.2	22.2667	09353	6	2136	1993	711
+4635	Újkenéz	SZ	48.25	22.2333	10117	6	969	1047	382
+4641	Mezőladány	SZ	48.2833	22.2167	32656	6	1404	1009	363
+4642	Tornyospálca	SZ	48.2667	22.1833	16957	6	4366	2542	960
+4643	Benk	SZ	48.3	22.2333	25441	6	850	452	189
+4644	Mándok	SZ	48.3167	22.2	17826	4	2891	4366	1486
+4645	Tiszamogyorós	SZ	48.3167	22.2333	11907	6	1025	680	252
+4646	Eperjeske	SZ	48.35	22.2167	18528	6	1357	1155	379
+4700	Mátészalka	SZ	47.95	22.3333	18874	4	4140	17436	7015
+4701	Mátészalka	SZ	47.95	22.3333	18874	4	4140	17436	7015
+4702	Mátészalka	SZ	47.95	22.3333	18874	4	4140	17436	7015
+4721	Szamoskér	SZ	48.0167	22.4167	16300	6	971	426	190
+4722	Nyírmeggyes	SZ	47.9167	22.2667	23269	6	2879	2599	1045
+4731	Tunyogmatolcs	SZ	47.9667	22.4667	13213	6	2628	2464	935
+4732	Cégénydányád	SZ	47.9333	22.55	09681	6	1220	706	285
+4733	Gyügye	SZ	47.9333	22.5667	19558	6	433	240	138
+4734	Szamosújlak	SZ	47.9167	22.6	31273	6	527	419	197
+4735	Hermánszeg	SZ	47.9	22.6333	12061	6	520	248	141
+4735	Szamossályi	SZ	47.9	22.6167	10436	6	1157	672	343
+4737	Darnó	SZ	47.9667	22.6667	18795	6	464	177	76
+4737	Kisnamény	SZ	47.95	22.7	16036	6	1801	322	155
+4741	Jánkmajtis	SZ	47.95	22.65	07843	6	2503	1690	646
+4742	Csegöld	SZ	47.8875	22.6875	26107	6	1935	602	257
+4743	Csengersima	SZ	47.8667	22.7333	24095	6	2380	634	288
+4745	Szamosbecs	SZ	47.8667	22.7	22017	6	671	340	167
+4746	Szamostatárfalva	SZ	47.8667	22.6667	30085	6	450	312	132
+4751	Kocsord	SZ	47.95	22.3833	07445	6	2547	2883	1025
+4752	Győrtelek	SZ	47.9333	22.4333	10126	6	1478	1630	475
+4754	Géberjén	SZ	47.9333	22.4667	03629	6	538	546	207
+4754	Fülpösdaróc	SZ	47.9333	22.5	14377	6	425	330	117
+4755	Ököritófülpös	SZ	47.9167	22.5167	31769	5	3342	1800	685
+4756	Rápolt	SZ	47.9167	22.5667	09061	6	323	146	86
+4761	Porcsalma	SZ	47.8833	22.5667	17215	5	3110	2575	1002
+4762	Tyukod	SZ	47.85	22.55	31398	5	6222	1901	927
+4763	Ura	SZ	47.8167	22.6167	28981	6	3234	646	280
+4764	Csengerújfalu	SZ	47.8	22.6333	26851	6	2561	820	350
+4765	Komlódtótfalu	SZ	47.85	22.7	22336	6	697	115	62
+4765	Csenger	SZ	47.8333	22.6833	30641	4	3616	4824	1924
+4766	Pátyod	SZ	47.8667	22.6167	23685	6	905	640	295
+4767	Szamosangyalos	SZ	47.8667	22.6667	18005	6	809	505	206
+4800	Vásárosnamény	SZ	48.1333	22.3167	18324	4	6566	8917	3319
+4801	Vásárosnamény	SZ	48.1333	22.3167	18324	4	6566	8917	3319
+4803	Vásárosnamény	SZ	48.1333	22.3167	18324	4	6566	8917	3319
+4804	Vásárosnamény	SZ	48.1333	22.3167	18324	4	6566	8917	3319
+4811	Kisvarsány	SZ	48.15	22.3	12672	6	1283	963	383
+4812	Nagyvarsány	SZ	48.1667	22.2833	33783	6	1254	1501	546
+4813	Gyüre	SZ	48.1833	22.2833	33774	6	1587	1259	449
+4821	Ópályi	SZ	48	22.3167	27924	6	2672	2873	898
+4822	Nyírparasznya	SZ	48.0333	22.2833	10807	6	1476	970	330
+4823	Nagydobos	SZ	48.05	22.3167	21485	6	2693	2194	752
+4824	Szamosszeg	SZ	48.05	22.3667	13046	6	3530	1883	734
+4826	Olcsva	SZ	48.0833	22.3333	11129	6	996	644	259
+4831	Tiszaszalka	SZ	48.1833	22.3167	13541	6	1495	851	369
+4832	Tiszavid	SZ	48.2	22.3	33747	6	1075	491	197
+4833	Tiszaadony	SZ	48.2333	22.3	09423	6	1563	627	265
+4834	Tiszakerecseny	SZ	48.2667	22.3	04446	6	2387	869	407
+4835	Mátyus	SZ	48.2833	22.2833	20668	6	1103	327	145
+4836	Lónya	SZ	48.3167	22.2833	26091	6	3549	723	420
+4841	Jánd	SZ	48.1167	22.3833	17075	6	1654	794	278
+4842	Gulács	SZ	48.0833	22.4667	29443	6	2335	814	341
+4843	Hetefejércse	SZ	48.1167	22.4833	05616	6	1545	267	158
+4844	Csaroda	SZ	48.1667	22.4667	29416	6	2468	595	260
+4845	Tákos	SZ	48.15	22.4333	29911	6	1082	382	162
+4900	Fehérgyarmat	SZ	47.9833	22.5167	18971	4	5246	8180	3247
+4901	Fehérgyarmat	SZ	47.9833	22.5167	18971	4	5246	8180	3247
+4911	Nábrád	SZ	48	22.45	19211	6	1769	895	365
+4912	Kérsemjén	SZ	48.0167	22.4167	32869	6	708	289	123
+4913	Panyola	SZ	48.05	22.4	29559	6	1223	591	292
+4914	Olcsvaapáti	SZ	48.0833	22.35	10834	6	1100	312	153
+4921	Tivadar	SZ	48.0667	22.5167	20260	6	480	197	88
+4921	Kisar	SZ	48.05	22.5167	19424	6	1543	1077	374
+4922	Nagyar	SZ	48.05	22.5667	04710	6	1599	687	280
+4931	Tarpa	SZ	48.1	22.5333	04312	5	4973	2141	902
+4932	Márokpapi	SZ	48.15	22.5167	33224	6	2118	441	222
+4933	Beregsurány	SZ	48.1667	22.55	20677	6	1600	633	237
+4934	Beregdaróc	SZ	48.2	22.5333	28246	6	2382	755	364
+4935	Gelénes	SZ	48.2	22.45	04613	6	2055	534	243
+4936	Vámosatya	SZ	48.2	22.4167	27322	6	2429	549	259
+4937	Barabás	SZ	48.2333	22.4333	26480	6	3819	769	382
+4941	Penyige	SZ	47.9833	22.5667	32692	6	1889	742	289
+4942	Mánd	SZ	48	22.6167	02088	6	517	258	107
+4942	Nemesborzova	SZ	47.9833	22.6333	27119	6	220	82	45
+4943	Kömörő	SZ	48.0167	22.5833	23612	6	1637	532	246
+4944	Túristvándi	SZ	48.05	22.65	13602	6	1522	699	261
+4945	Szatmárcseke	SZ	48.0833	22.6333	31237	6	3631	1429	600
+4946	Tiszakóród	SZ	48.1	22.7167	08794	6	1669	749	321
+4947	Tiszacsécse	SZ	48.1	22.75	24448	6	482	247	118
+4948	Milota	SZ	48.1	22.7833	31750	6	1539	829	321
+4951	Tiszabecs	SZ	48.1	22.8167	17817	5	1714	998	418
+4952	Uszka	SZ	48.0667	22.8667	31820	6	736	369	109
+4953	Magosliget	SZ	48.05	22.8667	29984	6	518	248	92
+4954	Sonkád	SZ	48.05	22.75	23889	6	1981	705	247
+4955	Botpalád	SZ	48.0333	22.8	22239	6	1650	591	247
+4956	Kispalád	SZ	48.0167	22.8333	29300	6	1674	538	191
+4961	Zsarolyán	SZ	47.95	22.6	28750	6	639	387	154
+4962	Nagyszekeres	SZ	47.9667	22.6167	27988	6	1052	545	209
+4963	Kisszekeres	SZ	47.9667	22.6333	09751	6	1467	555	213
+4964	Fülesd	SZ	48.0167	22.6833	10791	6	1505	477	176
+4965	Kölcse	SZ	48.05	22.7167	16665	5	2824	1276	560
+4966	Vámosoroszi	SZ	47.9833	22.6833	08934	6	1316	530	181
+4967	Csaholc	SZ	47.9833	22.7333	12928	6	1935	486	180
+4968	Túrricse	SZ	47.9667	22.7667	08998	6	1299	606	233
+4969	Tisztaberek	SZ	47.95	22.8	27261	6	1822	608	213
+4971	Rozsály	SZ	47.9167	22.8	17428	6	1487	763	258
+4972	Gacsály	SZ	47.9333	22.7667	13727	6	1982	890	307
+4973	Császló	SZ	47.9167	22.7333	09715	6	1018	373	152
+4974	Zajta	SZ	47.9	22.8	06275	6	917	419	176
+4975	Méhtelek	SZ	47.9333	22.85	29799	6	862	702	280
+4976	Garbolc	SZ	47.95	22.8667	04996	6	726	144	71
+4977	Kishódos	SZ	47.9667	22.8333	08509	6	892	96	35
+4977	Nagyhódos	SZ	47.9667	22.85	26976	6	765	115	83
+5000	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5001	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5002	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5003	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5004	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5005	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5006	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5007	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5008	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5009	Szolnok	JN	47.1833	20.2	27854	1	18724	74885	33758
+5051	Zagyvarékas	JN	47.2667	20.1333	14836	6	3171	3729	1494
+5052	Újszász	JN	47.3	20.0833	15291	4	5820	6598	2558
+5053	Szászberek	JN	47.3167	20.1	05777	6	3922	994	415
+5054	Jászalsószentgyörgy	JN	47.3667	20.1	30711	6	4767	3640	1575
+5055	Jászladány	JN	47.3667	20.1667	21111	5	9273	5922	2404
+5061	Tiszasüly	JN	47.3833	20.4	17695	6	9177	1470	788
+5062	Kőtelek	JN	47.3333	20.45	11235	6	4514	1631	868
+5063	Hunyadfalva	JN	47.3167	20.3833	34050	6	535	191	106
+5064	Csataszög	JN	47.2833	20.4	34175	6	1121	315	132
+5065	Nagykörű	JN	47.2667	20.45	15574	6	4281	1636	925
+5071	Besenyszög	JN	47.3	20.2667	11305	6	13808	3452	1426
+5081	Szajol	JN	47.1833	20.3	05874	6	3697	3942	1554
+5082	Tiszatenyő	JN	47.1333	20.3833	09627	6	2355	1705	666
+5083	Kengyel	JN	47.0833	20.3333	07418	6	7914	4037	1413
+5084	Rákócziújfalu	JN	47.0667	20.2667	12423	6	1961	2039	722
+5085	Rákóczifalva	JN	47.0833	20.2333	14207	5	3594	5440	2175
+5091	Tószeg	JN	47.1	20.15	07490	6	5917	4602	1791
+5092	Tiszavárkony	JN	47.0667	20.1833	31866	6	3562	1598	693
+5093	Vezseny	JN	47.0333	20.2167	21157	6	2517	690	320
+5094	Tiszajenő	JN	47.0333	20.15	29346	6	2819	1656	791
+5095	Tiszajenő	JN	47.0333	20.15	29346	6	2819	1656	791
+5100	Jászberény	JN	47.5	19.9167	18209	4	22135	27134	11771
+5101	Jászberény	JN	47.5	19.9167	18209	4	22135	27134	11771
+5102	Jászberény	JN	47.5	19.9167	18209	4	22135	27134	11771
+5111	Jászfelsőszentgyörgy	JN	47.5	19.8	23579	6	3928	1925	784
+5121	Jászjákóhalma	JN	47.5167	20	25186	6	4504	3105	1375
+5122	Jászdózsa	JN	47.5667	20.0167	17978	6	4286	2174	1143
+5123	Jászárokszállás	JN	47.6333	19.9833	22105	4	7717	8041	3734
+5124	Jászágó	JN	47.6	19.8667	22929	6	3693	738	421
+5125	Pusztamonostor	JN	47.55	19.8	15246	6	2462	1615	738
+5126	Jászfényszaru	JN	47.5667	19.7167	23339	4	7616	5755	2613
+5130	Jászapáti	JN	47.5167	20.15	22202	4	7816	9217	3666
+5131	Jászapáti	JN	47.5167	20.15	22202	4	7816	9217	3666
+5135	Jászivány	JN	47.5333	20.25	24086	6	3951	392	212
+5136	Jászszentandrás	JN	47.5833	20.1833	13514	6	4433	2479	1567
+5137	Jászkisér	JN	47.45	20.2167	22798	5	13011	5427	2251
+5141	Jásztelek	JN	47.4833	20	23135	6	4115	1656	735
+5142	Alattyán	JN	47.4333	20.05	25265	6	3429	2145	917
+5143	Jánoshida	JN	47.3833	20.0667	22859	6	3479	2585	1157
+5144	Jászboldogháza	JN	47.3667	20	15811	6	5531	1668	821
+5152	Jászboldogháza	JN	47.3667	20	15811	6	5531	1668	821
+5200	Törökszentmiklós	JN	47.1833	20.4167	27313	4	18516	21758	8989
+5201	Törökszentmiklós	JN	47.1833	20.4167	27313	4	18516	21758	8989
+5211	Tiszapüspöki	JN	47.2167	20.3167	03373	6	3745	2099	836
+5212	Tiszapüspöki	JN	47.2167	20.3167	03373	6	3745	2099	836
+5213	Tiszapüspöki	JN	47.2167	20.3167	03373	6	3745	2099	836
+5222	Örményes	JN	47.2	20.5833	29382	6	3413	1105	460
+5231	Fegyvernek	JN	47.2667	20.5333	16647	5	7148	6629	2680
+5232	Tiszabő	JN	47.3	20.4833	10773	6	3504	1936	572
+5233	Tiszagyenda	JN	47.3833	20.5167	30304	6	3693	1001	542
+5234	Tiszaroff	JN	47.4	20.45	20181	6	5249	1674	977
+5235	Tiszabura	JN	47.45	20.4667	22770	6	4520	2801	833
+5241	Abádszalók	JN	47.4667	20.6	12441	4	13223	4276	2101
+5243	Tiszaderzs	JN	47.5167	20.65	16230	6	2719	1101	644
+5244	Tiszaszőlős	JN	47.6167	20.7667	07852	6	4779	1949	742
+5300	Karcag	JN	47.3167	20.9333	04923	4	36863	20872	8219
+5301	Karcag	JN	47.3167	20.9333	04923	4	36863	20872	8219
+5302	Karcag	JN	47.3167	20.9333	04923	4	36863	20872	8219
+5309	Berekfürdő	JN	47.3833	20.85	34005	6	1857	956	474
+5310	Kisújszállás	JN	47.2167	20.7667	25919	4	20527	11738	4767
+5311	Kisújszállás	JN	47.2167	20.7667	25919	4	20527	11738	4767
+5321	Kunmadaras	JN	47.4333	20.8	23171	5	15355	5507	2083
+5322	Tiszaszentimre	JN	47.4833	20.7333	22789	6	6561	2140	1042
+5323	Tiszaszentimre	JN	47.4833	20.7333	22789	6	6561	2140	1042
+5324	Tomajmonostora	JN	47.4333	20.7167	09557	6	1376	680	360
+5331	Kenderes	JN	47.25	20.6833	17145	4	11124	4917	2013
+5340	Kunhegyes	JN	47.3667	20.6333	22567	4	14894	7866	3388
+5341	Kunhegyes	JN	47.3667	20.6333	22567	4	14894	7866	3388
+5349	Kunhegyes	JN	47.3667	20.6333	22567	4	14894	7866	3388
+5350	Tiszafüred	JN	47.6167	20.7667	29726	4	16218	11136	5277
+5351	Tiszafüred	JN	47.6167	20.7667	29726	4	16218	11136	5277
+5358	Tiszafüred	JN	47.6167	20.7667	29726	4	16218	11136	5277
+5359	Tiszafüred	JN	47.6167	20.7667	29726	4	16218	11136	5277
+5361	Tiszaigar	JN	47.5333	20.8	28699	6	3402	817	409
+5362	Tiszaörs	JN	47.5167	20.8333	15787	6	3710	1291	672
+5363	Nagyiván	JN	47.4833	20.9333	21689	6	4316	1168	517
+5400	Mezőtúr	JN	47	20.6333	04260	4	28972	18176	7759
+5401	Mezőtúr	JN	47	20.6333	04260	4	28972	18176	7759
+5403	Mezőtúr	JN	47	20.6333	04260	4	28972	18176	7759
+5404	Mezőtúr	JN	47	20.6333	04260	4	28972	18176	7759
+5411	Kétpó	JN	47.0833	20.4667	19813	6	6676	723	324
+5412	Kuncsorba	JN	47.1333	20.5667	05254	6	3363	637	305
+5420	Túrkeve	JN	47.1	20.75	28228	4	23652	9215	3995
+5421	Túrkeve	JN	47.1	20.75	28228	4	23652	9215	3995
+5430	Tiszaföldvár	JN	46.9833	20.25	13815	4	8034	11548	4724
+5431	Tiszaföldvár	JN	46.9833	20.25	13815	4	8034	11548	4724
+5432	Tiszaföldvár	JN	46.9833	20.25	13815	4	8034	11548	4724
+5435	Martfű	JN	47.0167	20.2833	02626	4	2308	6715	2919
+5440	Kunszentmárton	JN	46.8333	20.2833	32504	4	14365	8850	3969
+5441	Kunszentmárton	JN	46.8333	20.2833	32504	4	14365	8850	3969
+5449	Kunszentmárton	JN	46.8333	20.2833	32504	4	14365	8850	3969
+5451	Öcsöd	JN	46.9	20.4	28006	5	10366	3390	1754
+5452	Mesterszállás	JN	46.95	20.4333	30234	6	4292	711	393
+5453	Mezőhék	JN	47	20.4	26286	6	8982	327	203
+5461	Mezőhék	JN	47	20.4	26286	6	8982	327	203
+5462	Cibakháza	JN	46.9667	20.2	22938	5	3821	4439	1924
+5463	Nagyrév	JN	46.95	20.15	06318	6	2979	726	432
+5464	Tiszainoka	JN	46.9	20.15	20446	6	1792	406	220
+5465	Cserkeszőlő	JN	46.8667	20.1833	05795	6	3070	2119	1385
+5471	Tiszakürt	JN	46.8833	20.1167	30386	6	2837	1463	783
+5473	Tiszaug	JN	46.8333	20.1542	14094	6	2504	908	432
+5474	Tiszasas	JN	46.8167	20.0833	21494	6	2879	1061	586
+5475	Csépa	JN	46.8	20.1333	13170	6	2967	1667	902
+5476	Szelevény	JN	46.8333	20.2833	20428	6	4539	1073	588
+5500	Gyomaendrőd	BE	46.9333	20.8333	33455	4	30394	14375	6479
+5501	Gyomaendrőd	BE	46.9333	20.8333	33455	4	30394	14375	6479
+5502	Gyomaendrőd	BE	46.9333	20.8333	33455	4	30394	14375	6479
+5510	Dévaványa	BE	47.0333	20.9667	24819	4	21655	8067	3287
+5515	Ecsegfalva	BE	47.15	20.9167	09432	6	7899	1232	555
+5516	Körösladány	BE	46.9667	21.0833	11615	4	12379	4788	2034
+5520	Szeghalom	BE	47.0333	21.1667	21883	4	21713	9314	3899
+5521	Szeghalom	BE	47.0333	21.1667	21883	4	21713	9314	3899
+5525	Füzesgyarmat	BE	47.1	21.2167	12256	4	12734	5981	2414
+5526	Kertészsziget	BE	47.15	21.0667	12618	6	3911	401	189
+5527	Bucsa	BE	47.2	21	13471	6	5582	2251	993
+5530	Vésztő	BE	46.9167	21.2667	29531	4	12570	7094	3089
+5534	Okány	BE	46.9	21.35	19257	6	7062	2688	1267
+5536	Körösújfalu	BE	46.9667	21.4	30164	6	2530	610	281
+5537	Zsadány	BE	46.9167	21.5	06257	6	6584	1649	768
+5538	Biharugra	BE	46.9667	21.6	29610	6	5284	899	579
+5539	Körösnagyharsány	BE	47	21.65	10764	6	1991	560	351
+5540	Szarvas	BE	46.8667	20.55	23870	4	16157	17557	7531
+5541	Szarvas	BE	46.8667	20.55	23870	4	16157	17557	7531
+5551	Csabacsűd	BE	46.8333	20.65	31334	5	6685	1879	857
+5552	Kardos	BE	46.8167	20.7708	24794	6	4279	654	389
+5553	Kondoros	BE	46.7667	20.8	10287	5	8184	5355	2529
+5555	Hunya	BE	46.8167	20.85	33297	6	3257	694	423
+5556	Örménykút	BE	46.85	20.7833	27438	6	5456	417	217
+5561	Békésszentandrás	BE	46.8667	20.4833	02680	5	7745	3909	1928
+5600	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5601	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5602	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5603	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5604	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5605	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5609	Csabaszabadi	BE	46.6833	21.0833	34078	6	3271	344	186
+5621	Csárdaszállás	BE	46.8667	20.9333	25502	6	5416	468	244
+5622	Köröstarcsa	BE	46.8833	21.0333	12900	6	6280	2585	1244
+5623	Köröstarcsa	BE	46.8833	21.0333	12900	6	6280	2585	1244
+5624	Doboz	BE	46.7333	21.25	33190	5	5447	4345	1898
+5630	Békés	BE	46.7667	21.1333	09760	4	12723	20465	8266
+5631	Békés	BE	46.7667	21.1333	09760	4	12723	20465	8266
+5641	Tarhos	BE	46.8167	21.2167	33075	6	5745	968	378
+5643	Bélmegyer	BE	46.8667	21.1833	19390	6	6305	1064	575
+5650	Mezőberény	BE	46.8167	21.0333	19628	4	11853	11241	4618
+5661	Újkígyós	BE	46.5833	21.0333	02352	5	5492	5436	2251
+5662	Csanádapáca	BE	46.55	20.8833	20455	6	5130	2729	1388
+5663	Medgyesbodzás	BE	46.5167	20.9667	20765	6	3167	1089	595
+5664	Medgyesbodzás	BE	46.5167	20.9667	20765	6	3167	1089	595
+5665	Pusztaottlaka	BE	46.55	20.9833	19594	6	1887	374	237
+5666	Medgyesegyháza	BE	46.5	21.0333	30128	5	6429	3848	1873
+5667	Magyarbánhegyes	BE	46.45	20.9667	27906	6	3656	2462	1101
+5668	Nagybánhegyes	BE	46.4667	20.9	26028	6	4224	1223	796
+5671	Nagybánhegyes	BE	46.4667	20.9	26028	6	4224	1223	796
+5672	Murony	BE	46.7667	21.05	11989	6	3568	1307	575
+5673	Kamut	BE	46.7667	20.9833	04279	6	6048	1053	529
+5674	Kétsoprony	BE	46.7167	20.8667	03106	6	5124	1507	600
+5675	Telekgerendás	BE	46.65	20.9667	12681	6	7237	1599	703
+5700	Gyula	BE	46.6474	21.2773	05032	4	25580	32055	13642
+5701	Gyula	BE	46.65	21.2833	05032	4	25580	32055	13642
+5702	Gyula	BE	46.65	21.2833	05032	4	25580	32055	13642
+5703	Gyula	BE	46.65	21.2833	05032	4	25580	32055	13642
+5711	Gyula	BE	46.65	21.2833	05032	4	25580	32055	13642
+5712	Szabadkígyós	BE	46.6167	21.1	31325	6	4556	2809	1092
+5720	Sarkad	BE	46.75	21.3833	28565	4	12557	10463	4323
+5721	Sarkad	BE	46.75	21.3833	28565	4	12557	10463	4323
+5722	Sarkad	BE	46.75	21.3833	28565	4	12557	10463	4323
+5725	Kötegyán	BE	46.7333	21.4833	06804	6	4295	1402	737
+5726	Méhkerék	BE	46.7833	21.45	23931	6	2585	2125	878
+5727	Újszalonta	BE	46.8	21.5	24350	6	2083	112	75
+5731	Sarkadkeresztúr	BE	46.8	21.3833	25168	6	3530	1598	800
+5732	Mezőgyán	BE	46.8667	21.5333	04206	6	5986	1119	549
+5734	Geszt	BE	46.8833	21.5833	17394	6	5139	756	364
+5741	Kétegyháza	BE	46.5333	21.1833	03461	5	5049	4197	1746
+5742	Elek	BE	46.5333	21.25	32957	4	5491	5048	1995
+5743	Lőkösháza	BE	46.4333	21.2333	21209	6	5202	1868	831
+5744	Kevermes	BE	46.4167	21.1833	31574	5	4334	2136	1160
+5745	Dombiratos	BE	46.4167	21.1167	22132	6	1830	584	406
+5746	Kunágota	BE	46.4333	21.05	16045	6	6396	2685	1390
+5747	Almáskamarás	BE	46.4667	21.1	29595	6	1475	869	466
+5751	Nagykamarás	BE	46.4667	21.1167	04242	6	4305	1493	858
+5752	Nagykamarás	BE	46.4667	21.1167	04242	6	4305	1493	858
+5800	Mezőkovácsháza	BE	46.4	20.9167	30322	4	6259	6304	2961
+5801	Mezőkovácsháza	BE	46.4	20.9167	30322	4	6259	6304	2961
+5802	Mezőkovácsháza	BE	46.4	20.9167	30322	4	6259	6304	2961
+5811	Végegyháza	BE	46.3833	20.8667	31228	6	2894	1455	764
+5820	Mezőhegyes	BE	46.3167	20.8167	11873	4	15544	5408	2899
+5830	Battonya	BE	46.2833	21.0167	18102	4	14571	5838	3099
+5836	Dombegyház	BE	46.3333	21.1333	24031	5	5794	2064	1083
+5837	Kisdombegyház	BE	46.3667	21.1	18838	6	1261	478	279
+5838	Magyardombegyház	BE	46.3833	21.0667	11536	6	765	259	168
+5900	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5901	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5902	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5903	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5904	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5905	Orosháza	BE	46.5667	20.6667	23065	4	20222	30032	14030
+5919	Pusztaföldvár	BE	46.5333	20.8	05397	6	5713	1752	905
+5920	Csorvás	BE	46.6333	20.8333	26709	4	9018	5302	2393
+5925	Gerendás	BE	46.6	20.8667	07393	6	4078	1397	719
+5931	Nagyszénás	BE	46.6833	20.6667	08244	5	9556	5256	2366
+5932	Gádoros	BE	46.6667	20.6	09511	5	3813	3833	1880
+5940	Tótkomlós	BE	46.4167	20.7333	16434	4	12505	6049	2952
+5945	Kardoskút	BE	46.4833	20.6667	12177	6	7658	917	429
+5946	Békéssámson	BE	46.4167	20.6333	26189	6	7121	2434	1135
+5948	Kaszaper	BE	46.4667	20.8333	22752	6	3357	1960	892
+6000	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6001	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6002	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6003	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6004	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6005	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6006	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6007	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6008	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6010	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6031	Szentkirály	BK	46.9167	19.9333	21120	6	10189	1958	914
+6032	Nyárlőrinc	BK	46.8622	19.8733	23056	6	6636	2364	1013
+6033	Városföld	BK	46.8167	19.7667	10667	6	6287	2186	807
+6034	Helvécia	BK	46.8333	19.6167	04093	6	5647	4362	1588
+6035	Ballószög	BK	46.8667	19.5833	13408	6	3500	3356	1060
+6041	Kerekegyháza	BK	46.9372	19.4781	22530	4	8128	6225	2736
+6042	Fülöpháza	BK	46.8833	19.4167	31468	6	4706	862	479
+6043	Kunbaracs	BK	46.9833	19.4167	07728	6	5511	655	328
+6044	Kunbaracs	BK	46.9833	19.4167	07728	6	5511	655	328
+6045	Ladánybene	BK	47.0333	19.45	05786	6	4074	1688	801
+6050	Lajosmizse	BK	47.0167	19.55	17677	4	16466	11053	4886
+6055	Felsőlajos	BK	47.0667	19.5167	33598	6	1141	1003	409
+6060	Tiszakécske	BK	46.9333	20.1	30623	4	13327	11504	5206
+6061	Tiszakécske	BK	46.9333	20.1	30623	4	13327	11504	5206
+6062	Tiszakécske	BK	46.9333	20.1	30623	4	13327	11504	5206
+6063	Tiszakécske	BK	46.9333	20.1	30623	4	13327	11504	5206
+6064	Tiszaug	BK	46.8515	20.0553	14094	6	2504	908	432
+6065	Lakitelek	BK	46.8761	19.9889	06202	5	5466	4449	1966
+6066	Tiszaalpár	BK	46.8217	19.9842	24545	5	9113	5031	2314
+6067	Tiszaalpár	BK	46.8217	19.9842	24545	5	9113	5031	2314
+6070	Izsák	BK	46.8014	19.3547	21999	4	11376	6004	2904
+6075	Páhi	BK	46.7167	19.4	18670	6	3896	1213	688
+6076	Ágasegyháza	BK	46.8333	19.45	17686	6	5587	1912	898
+6077	Orgovány	BK	46.7486	19.4736	16939	6	9916	3282	1656
+6078	Jakabszállás	BK	46.7603	19.6072	17923	6	7086	2645	1235
+6080	Szabadszállás	BK	46.8728	19.2242	25061	4	16462	6221	3083
+6085	Fülöpszállás	BK	46.8178	19.2386	14058	6	9132	2357	1287
+6086	Szalkszentmárton	BK	46.9742	19.02	19947	6	8208	2948	1279
+6087	Dunavecse	BK	46.9167	18.9833	07612	4	6677	4026	1714
+6088	Apostag	BK	46.8833	18.95	21148	6	3194	2035	971
+6090	Kunszentmiklós	BK	47.0333	19.1333	28130	4	17211	8704	3545
+6093	Kunszentmiklós	BK	47.0333	19.1333	28130	4	17211	8704	3545
+6096	Kunpeszér	BK	47.0667	19.2833	31918	6	7755	641	306
+6097	Kunadacs	BK	46.95	19.3167	05856	6	8990	1612	770
+6098	Tass	BK	47.0167	19.0333	20525	6	7472	2957	1143
+6100	Kiskunfélegyháza	BK	46.7136	19.8522	20297	4	25630	30523	14644
+6101	Kiskunfélegyháza	BK	46.7136	19.8522	20297	4	25630	30523	14644
+6102	Kiskunfélegyháza	BK	46.7136	19.8522	20297	4	25630	30523	14644
+6111	Gátér	BK	46.6833	19.9667	26383	6	3089	989	492
+6112	Pálmonostora	BK	46.6278	19.9422	02705	6	5328	1818	1094
+6113	Petőfiszállás	BK	46.6167	19.8333	15431	6	6779	1495	915
+6114	Bugac	BK	46.6889	19.6794	32823	5	13111	2869	1481
+6114	Bugacpusztaháza	BK	46.6889	19.6794	33631	6	4300	307	143
+6115	Kunszállás	BK	46.7667	19.75	31893	6	2085	1660	743
+6116	Fülöpjakab	BK	46.6767	19.8343	33622	6	2316	1169	494
+6120	Kiskunmajsa	BK	46.4903	19.74	24396	4	22199	11707	5434
+6131	Szank	BK	46.5544	19.6722	11794	6	7483	2472	1167
+6132	Móricgát	BK	46.4915	19.7487	34096	6	3289	490	378
+6133	Jászszentlászló	BK	46.5681	19.7611	08378	6	6034	2537	1299
+6134	Kömpöc	BK	46.4667	19.8667	13806	6	2998	744	396
+6135	Csólyospálos	BK	46.4183	19.8436	12025	6	6510	1699	1087
+6136	Harkakötöny	BK	46.45	19.6	08350	6	5270	932	395
+6200	Kiskőrös	BK	46.6206	19.2886	09344	4	10223	14452	6770
+6201	Kiskőrös	BK	46.6206	19.2886	09344	4	10223	14452	6770
+6211	Kaskantyú	BK	46.6667	19.4	30605	6	5828	937	559
+6221	Akasztó	BK	46.6917	19.2081	21944	6	6488	3367	1557
+6222	Csengőd	BK	46.7167	19.2667	12344	6	4889	2176	1180
+6223	Soltszentimre	BK	46.7697	19.2831	18218	6	4449	1302	668
+6224	Tabdi	BK	46.6833	19.3	25432	6	2139	1127	549
+6230	Soltvadkert	BK	46.5781	19.3958	19983	4	10886	7519	3369
+6235	Bócsa	BK	46.6	19.5	08305	6	9704	1816	945
+6236	Tázlár	BK	46.5486	19.5203	24998	6	7338	1782	911
+6237	Kecel	BK	46.5253	19.2519	19789	4	11448	8892	3787
+6238	Imrehegy	BK	46.4833	19.3167	08095	6	7031	738	355
+6239	Császártöltés	BK	46.4219	19.1836	10472	6	8206	2457	1055
+6300	Kalocsa	BK	46.5339	18.9861	06442	4	5318	17492	7737
+6301	Kalocsa	BK	46.5264	18.9858	06442	4	5318	17492	7737
+6311	Öregcsertő	BK	46.5139	19.1117	08679	6	4306	888	423
+6320	Solt	BK	46.7997	19.0161	29115	4	13267	6632	3000
+6321	Újsolt	BK	46.8667	19.1167	08785	6	3298	152	127
+6323	Dunaegyháza	BK	46.8333	18.95	21069	6	1012	1543	728
+6325	Dunatetétlen	BK	46.75	19.1167	14766	6	4319	549	283
+6326	Harta	BK	46.6936	19.0314	18458	5	12968	3414	1664
+6327	Harta	BK	46.6936	19.0314	18458	5	12968	3414	1664
+6328	Dunapataj	BK	46.64	19.0022	07861	5	9047	3347	1655
+6331	Foktő	BK	46.5167	18.9167	02149	6	3146	1646	757
+6332	Uszód	BK	46.5667	18.9167	16294	6	2446	1068	488
+6333	Dunaszentbenedek	BK	46.6	18.9	11606	6	2324	847	434
+6334	Géderlak	BK	46.6167	18.9167	03577	6	1874	1041	480
+6335	Ordas	BK	46.6333	18.95	16276	6	1652	446	265
+6336	Szakmár	BK	46.5522	19.0742	19530	6	7464	1246	618
+6337	Újtelek	BK	46.59	19.0586	33604	6	956	404	253
+6341	Homokmégy	BK	46.4869	19.0744	27845	6	7032	1387	760
+6342	Drágszél	BK	46.4667	19.05	07524	6	1259	362	174
+6343	Miske	BK	46.4417	19.0322	30632	6	4227	1789	757
+6344	Hajós	BK	46.3986	19.1206	18759	4	8992	3262	1418
+6345	Nemesnádudvar	BK	46.3356	19.0531	32540	6	5878	1885	727
+6346	Sükösd	BK	46.2833	19	21245	5	9418	3816	1549
+6347	Érsekcsanád	BK	46.25	18.9833	11864	6	5830	2831	978
+6348	Érsekhalma	BK	46.35	19.1167	33589	6	2756	657	293
+6351	Bátya	BK	46.4833	18.95	11961	6	3386	2132	970
+6352	Fajsz	BK	46.4167	18.9167	03230	6	3199	1759	884
+6353	Dusnok	BK	46.3833	18.9667	04109	6	5747	3022	1246
+6400	Kiskunhalas	BK	46.4314	19.4875	32434	4	22758	28997	12208
+6401	Kiskunhalas	BK	46.4314	19.4875	32434	4	22758	28997	12208
+6402	Kiskunhalas	BK	46.4314	19.4875	32434	4	22758	28997	12208
+6411	Zsana	BK	46.4167	19.6833	15158	6	8794	811	448
+6412	Balotaszállás	BK	46.35	19.5333	25937	6	10494	1541	821
+6413	Kunfehértó	BK	46.35	19.4167	29027	6	7837	2089	911
+6414	Pirtó	BK	46.5167	19.4333	15398	6	3448	976	440
+6421	Kisszállás	BK	46.2783	19.4961	28158	6	9205	2558	1212
+6422	Tompa	BK	46.2178	19.5422	28486	4	8157	4689	2081
+6423	Kelebia	BK	46.1939	19.6119	27571	6	6670	2774	1320
+6424	Csikéria	BK	46.1222	19.4789	15699	6	2581	952	501
+6425	Bácsszőlős	BK	46.15	19.45	30155	6	3883	388	272
+6430	Bácsalmás	BK	46.1253	19.3361	10719	4	10832	7045	3287
+6435	Kunbaja	BK	46.0836	19.4278	06044	6	3372	1598	757
+6440	Jánoshalma	BK	46.2986	19.3258	09469	4	13221	9343	4476
+6444	Kéleshalom	BK	46.3667	19.25	18166	6	6163	451	336
+6445	Borota	BK	46.2631	19.2253	19327	6	8180	1365	739
+6446	Rém	BK	46.2431	19.1461	26310	6	3993	1371	576
+6447	Felsőszentiván	BK	46.195	19.1903	02954	6	5354	1990	882
+6448	Csávoly	BK	46.1892	19.1467	16373	6	4742	1927	824
+6449	Mélykút	BK	46.2111	19.3869	16018	5	12346	5403	2918
+6451	Tataháza	BK	46.1742	19.3061	14544	6	2610	1300	688
+6452	Mátételke	BK	46.1667	19.2833	27809	6	2793	549	298
+6453	Bácsbokod	BK	46.1219	19.1589	10180	5	6393	2804	1248
+6454	Bácsborsód	BK	46.0964	19.1581	27234	6	7752	1238	427
+6455	Katymár	BK	46.0322	19.2108	11280	6	7108	2229	991
+6456	Madaras	BK	46.055	19.2667	23357	6	4930	3046	1558
+6500	Baja	BK	46.1833	18.9667	03522	4	17761	37707	15969
+6501	Baja	BK	46.1833	18.9667	03522	4	17761	37707	15969
+6502	Baja	BK	46.1833	18.9667	03522	4	17761	37707	15969
+6503	Baja	BK	46.1833	18.9667	03522	4	17761	37707	15969
+6511	Bácsszentgyörgy	BK	45.9722	19.0389	08697	6	1473	159	98
+6512	Szeremle	BK	46.15	18.8833	28820	6	3464	1511	627
+6513	Dunafalva	BK	46.0611	18.9611	12566	6	5789	876	581
+6521	Vaskút	BK	46.1167	18.9833	28343	6	7149	3506	1363
+6522	Gara	BK	46.0319	19.0428	31848	6	5996	2556	953
+6523	Csátalja	BK	46.0333	18.95	26471	6	3905	1557	668
+6524	Dávod	BK	45.995	18.9172	10533	6	6921	1984	1078
+6525	Hercegszántó	BK	45.95	18.9392	12937	6	6855	2008	1150
+6527	Nagybaracska	BK	46.05	18.9	25955	6	3795	2325	1030
+6528	Bátmonostor	BK	46.1	18.9333	03656	6	3795	1574	699
+6600	Szentes	CS	46.65	20.2667	14456	4	35325	29117	12722
+6601	Szentes	CS	46.65	20.2667	14456	4	35325	29117	12722
+6602	Szentes	CS	46.65	20.2667	14456	4	35325	29117	12722
+6603	Szentes	CS	46.65	20.2667	14456	4	35325	29117	12722
+6612	Nagytőke	CS	46.7	20.2833	29179	6	5468	455	233
+6621	Derekegyház	CS	46.5833	20.3667	07834	6	5378	1670	678
+6622	Nagymágocs	CS	46.5833	20.5	17233	5	7509	3152	1249
+6623	Árpádhalom	CS	46.6167	20.55	19062	6	4520	529	259
+6624	Eperjes	CS	46.6833	20.5667	22992	6	7389	547	349
+6625	Fábiánsebestyén	CS	46.6833	20.4667	19974	6	7173	2134	895
+6630	Mindszent	CS	46.5333	20.2	21555	4	5935	6909	3187
+6635	Szegvár	CS	46.5833	20.2333	32489	5	8622	4673	2096
+6636	Mártély	CS	46.4833	20.2167	25733	6	3645	1368	568
+6640	Csongrád	CS	46.7	20.15	05111	4	17389	17686	8468
+6641	Csongrád	CS	46.7	20.15	05111	4	17389	17686	8468
+6642	Csongrád	CS	46.7	20.15	05111	4	17389	17686	8468
+6645	Felgyő	CS	46.65	20.1	22646	6	7673	1324	616
+6646	Tömörkény	CS	46.6167	20.0333	25900	6	5391	1836	1034
+6647	Csanytelek	CS	46.6	20.1167	22293	6	3471	2848	1408
+6648	Csanytelek	CS	46.6	20.1167	22293	6	3471	2848	1408
+6700	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6701	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6702	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6703	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6704	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6705	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6706	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6707	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6708	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6709	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6710	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6712	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6713	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6717	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6718	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6719	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6720	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6721	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6722	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6723	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6724	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6725	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6726	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6727	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6728	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6729	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6740	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6741	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6742	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6743	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6744	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6745	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6746	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6747	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6748	Szeged	CS	46.318	20.027	33367	1	28100	169030	75739
+6750	Algyő	CS	46.17	20.17	34245	5	7577	5247	2018
+6750	Szeged	CS	46.17	20.17	33367	1	28100	169030	75739
+6753	Algyő	CS	46.17	20.17	34245	5	7577	5247	2018
+6753	Szeged	CS	46.17	20.17	33367	1	28100	169030	75739
+6754	Újszentiván	CS	46.1833	20.1833	14924	6	1549	1657	542
+6755	Kübekháza	CS	46.15	20.2833	14410	6	2731	1561	592
+6756	Tiszasziget	CS	46.1667	20.1667	16966	6	2689	1767	614
+6757	Tiszasziget	CS	46.1667	20.1667	16966	6	2689	1767	614
+6757	Szeged	CS	46.1667	20.1667	33367	1	28100	169030	75739
+6758	Röszke	CS	46.1833	20.05	13161	6	3663	3269	1410
+6760	Kistelek	CS	46.4725	19.9797	31024	4	6919	7198	3405
+6762	Sándorfalva	CS	46.3667	20.1	31705	4	5577	8042	3073
+6763	Szatymaz	CS	46.35	20.05	12007	6	5372	4593	1932
+6764	Balástya	CS	46.4167	20.0167	23676	6	11000	3450	1929
+6765	Csengele	CS	46.5333	19.8667	32285	6	6066	1958	991
+6766	Dóc	CS	46.4333	20.1333	30535	6	4943	786	326
+6767	Ópusztaszer	CS	46.4833	20.0833	12797	6	5950	2236	941
+6768	Baks	CS	46.55	20.1	29106	6	6192	2141	881
+6769	Pusztaszer	CS	46.55	19.9833	28592	6	4893	1520	785
+6771	Pusztaszer	CS	46.55	19.9833	28592	6	4893	1520	785
+6771	Szeged	CS	46.55	19.9833	33367	1	28100	169030	75739
+6772	Deszk	CS	46.2167	20.25	24077	6	5205	3584	1233
+6773	Klárafalva	CS	46.2167	20.3333	08253	6	910	513	199
+6774	Ferencszállás	CS	46.2167	20.35	18999	6	579	619	272
+6775	Kiszombor	CS	46.1833	20.4333	26666	6	6581	3970	1651
+6781	Domaszék	CS	46.2492	20.0111	13383	6	5215	4851	1900
+6782	Mórahalom	CS	46.2194	19.8911	04349	4	8315	6007	2549
+6783	Ásotthalom	CS	46.2006	19.7906	10339	6	12254	4063	1988
+6784	Öttömös	CS	46.2833	19.6833	31079	6	3091	782	426
+6785	Pusztamérges	CS	46.3333	19.6833	06354	6	2439	1261	613
+6786	Ruzsa	CS	46.2897	19.7544	03966	6	8468	2578	1439
+6787	Zákányszék	CS	46.2667	19.9167	05546	6	6607	2793	1447
+6791	Szeged	CS	46.2667	19.9167	33367	1	28100	169030	75739
+6791	Zákányszék	CS	46.2667	19.9167	05546	6	6607	2793	1447
+6792	Zsombó	CS	46.3333	19.9833	17765	6	2689	3475	1340
+6793	Forráskút	CS	46.3667	19.9167	33020	6	3667	2335	1044
+6794	Üllés	CS	46.3381	19.8519	21412	6	4988	3217	1520
+6795	Bordány	CS	46.3217	19.925	08192	6	3648	3155	1421
+6800	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6801	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6802	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6803	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6804	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6806	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6808	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6811	Hódmezővásárhely	CS	46.4167	20.3333	08314	3	48798	47258	19616
+6821	Székkutas	CS	46.5	20.5333	12265	6	12399	2422	1080
+6900	Makó	CS	46.2167	20.4833	07357	4	22923	24403	11422
+6901	Makó	CS	46.2167	20.4833	07357	4	22923	24403	11422
+6902	Makó	CS	46.2167	20.4833	07357	4	22923	24403	11422
+6903	Makó	CS	46.2167	20.4833	07357	4	22923	24403	11422
+6911	Királyhegyes	CS	46.2667	20.6167	13666	6	2980	664	373
+6912	Kövegy	CS	46.2167	20.6833	09955	6	971	411	254
+6913	Csanádpalota	CS	46.25	20.7333	05379	5	7776	3064	1680
+6914	Pitvaros	CS	46.2972	20.7028	06284	6	1314	1417	677
+6915	Csanádalberti	CS	46.3333	20.7167	02121	6	1532	440	261
+6916	Ambrózfalva	CS	46.35	20.7333	16197	6	1122	509	247
+6917	Nagyér	CS	46.3667	20.7333	20914	6	1229	526	269
+6921	Maroslele	CS	46.2667	20.35	10515	6	4656	2084	937
+6922	Földeák	CS	46.3167	20.5	09210	6	3637	3199	1478
+6923	Óföldeák	CS	46.3	20.45	07755	6	3509	454	192
+6931	Apátfalva	CS	46.1667	20.5833	14252	6	5377	3065	1597
+6932	Magyarcsanád	CS	46.1667	20.6167	05962	6	4819	1525	752
+6933	Nagylak	CS	46.1667	20.7167	12779	6	470	479	296
+7000	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7001	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7002	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7003	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7011	Alap	FE	46.8	18.7	26824	6	4829	2005	902
+7012	Alsószentiván	FE	46.7833	18.7333	25283	6	3965	650	289
+7013	Cece	FE	46.7667	18.65	13152	5	5885	2644	1137
+7014	Sáregres	FE	46.7833	18.6	02723	6	2616	812	356
+7015	Igar	FE	46.7833	18.5167	17738	6	4119	1022	526
+7016	Igar	FE	46.7833	18.5167	17738	6	4119	1022	526
+7017	Mezőszilas	FE	46.8167	18.4833	29036	6	6497	2157	840
+7018	Mezőszilas	FE	46.8167	18.4833	29036	6	6497	2157	840
+7019	Mezőszilas	FE	46.8167	18.4833	29036	6	6497	2157	840
+7020	Dunaföldvár	TO	46.8	18.9333	31501	4	11142	9003	4039
+7021	Dunaföldvár	TO	46.8	18.9333	31501	4	11142	9003	4039
+7025	Bölcske	TO	46.7333	18.9667	06558	6	5878	2914	1268
+7026	Madocsa	TO	46.6833	18.9667	29337	6	4333	1920	841
+7027	Madocsa	TO	46.6833	18.9667	29337	6	4333	1920	841
+7030	Paks	TO	46.6333	18.8667	04862	4	15408	19833	8241
+7031	Paks	TO	46.6333	18.8667	04862	4	15408	19833	8241
+7032	Paks	TO	46.6333	18.8667	04862	4	15408	19833	8241
+7038	Pusztahencse	TO	46.6	18.7167	19938	6	3171	1031	411
+7039	Németkér	TO	46.7167	18.7667	15006	6	6497	1771	754
+7041	Vajta	FE	46.7167	18.6667	02459	6	2343	1004	370
+7042	Pálfa	TO	46.7167	18.6333	09371	6	3474	1592	670
+7043	Bikács	TO	46.6833	18.6667	11970	6	3467	443	220
+7044	Nagydorog	TO	46.6333	18.6667	18388	5	4144	2711	1113
+7045	Györköny	TO	46.6333	18.7	12326	6	3160	922	469
+7047	Sárszentlőrinc	TO	46.6333	18.6167	20817	6	3845	960	460
+7051	Kajdacs	TO	46.5667	18.6333	14100	6	3773	1277	551
+7052	Kölesd	TO	46.5167	18.5833	10463	6	3813	1562	613
+7054	Tengelic	TO	46.5333	18.7167	06901	6	7093	2401	1002
+7056	Szedres	TO	46.4833	18.6833	16814	6	4631	2324	800
+7057	Medina	TO	46.4667	18.65	30562	6	2224	849	351
+7061	Belecska	TO	46.65	18.4167	28662	6	1439	432	142
+7062	Keszőhidegkút	TO	46.6167	18.4333	17640	6	1033	210	115
+7063	Szárazd	TO	46.5667	18.4333	18263	6	778	230	136
+7064	Gyönk	TO	46.55	18.4833	30289	5	3812	2051	704
+7065	Miszla	TO	46.6333	18.4833	02811	6	3471	280	185
+7066	Udvari	TO	46.6	18.5167	21360	6	2765	441	216
+7067	Varsád	TO	46.5333	18.5167	06637	6	2156	397	182
+7068	Kistormás	TO	46.5	18.5667	03869	6	1135	336	128
+7071	Szakadát	TO	46.5333	18.4833	15316	6	1070	268	146
+7072	Diósberény	TO	46.5333	18.45	11688	6	1775	361	179
+7081	Simontornya	TO	46.75	18.55	20783	4	3383	4220	1883
+7082	Kisszékely	TO	46.6833	18.55	27766	6	2830	336	222
+7083	Tolnanémedi	TO	46.7167	18.4833	11031	6	2195	1146	534
+7084	Pincehely	TO	46.6833	18.45	19585	5	5008	2371	1071
+7085	Nagyszékely	TO	46.65	18.5333	06761	6	3670	437	232
+7086	Ozora	TO	46.75	18.4	05661	6	5958	1666	764
+7087	Fürged	TO	46.7167	18.3	17950	6	2676	722	252
+7090	Tamási	TO	46.6333	18.2833	24563	4	11196	8592	3717
+7091	Tamási	TO	46.6333	18.2833	24563	4	11196	8592	3717
+7092	Nagykónyi	TO	46.5833	18.2	27182	6	4788	1149	545
+7093	Értény	TO	46.6167	18.1333	08448	6	2995	773	277
+7094	Koppányszántó	TO	46.6	18.1167	21184	6	2255	340	220
+7095	Iregszemcse	TO	46.7	18.1833	04701	6	5833	2680	1075
+7095	Újireg	TO	46.65	18.1833	20561	6	1090	296	126
+7097	Nagyszokoly	TO	46.7167	18.2167	13709	6	2799	878	434
+7098	Magyarkeszi	TO	46.75	18.2333	06017	6	3816	1269	643
+7099	Felsőnyék	TO	46.7833	18.3	17914	6	3202	1036	505
+7100	Szekszárd	TO	46.35	18.7167	22761	1	9628	33883	14923
+7101	Szekszárd	TO	46.35	18.7167	22761	1	9628	33883	14923
+7102	Szekszárd	TO	46.35	18.7167	22761	1	9628	33883	14923
+7103	Szekszárd	TO	46.35	18.7167	22761	1	9628	33883	14923
+7121	Szálka	TO	46.2833	18.6333	14711	6	1708	593	261
+7122	Kakasd	TO	46.35	18.6	02033	6	2079	1633	609
+7130	Tolna	TO	46.4333	18.7833	25274	4	7108	11637	4483
+7131	Tolna	TO	46.4333	18.7833	25274	4	7108	11637	4483
+7132	Bogyiszló	TO	46.3833	18.8333	03425	6	5593	2231	912
+7133	Fadd	TO	46.4667	18.8333	18980	5	6753	4501	1567
+7134	Gerjen	TO	46.5	18.9	05731	6	3628	1235	534
+7135	Dunaszentgyörgy	TO	46.5333	18.8333	09539	6	3763	2531	1020
+7136	Fácánkert	TO	46.45	18.7333	24192	6	1070	676	292
+7140	Bátaszék	TO	46.1833	18.7333	08864	4	6354	6607	2569
+7142	Pörböly	TO	46.2	18.8167	33570	6	1111	555	244
+7143	Őcsény	TO	46.3167	18.7667	08961	6	7261	2445	945
+7144	Decs	TO	46.2833	18.7667	24989	5	9468	4164	1550
+7145	Sárpilis	TO	46.25	18.75	04747	6	2170	694	218
+7146	Várdomb	TO	46.25	18.7	09414	6	955	1212	437
+7147	Alsónána	TO	46.25	18.6667	29665	6	1314	690	279
+7148	Alsónyék	TO	46.2	18.7333	11563	6	3205	778	307
+7149	Báta	TO	46.1333	18.7833	11712	6	6617	1758	822
+7150	Bonyhád	TO	46.3	18.5333	06497	4	7213	13957	5592
+7151	Bonyhád	TO	46.3	18.5333	06497	4	7213	13957	5592
+7153	Bonyhád	TO	46.3	18.5333	06497	4	7213	13957	5592
+7158	Bonyhádvarasd	TO	46.3667	18.4833	14818	6	1045	421	159
+7159	Kisdorog	TO	46.3833	18.5	17710	6	2000	755	286
+7161	Cikó	TO	46.25	18.5667	19284	6	1986	885	352
+7162	Grábóc	TO	46.2833	18.6167	26727	6	1373	172	92
+7163	Mőcsény	TO	46.2667	18.6	33349	6	1215	367	148
+7164	Bátaapáti	TO	46.2167	18.6	28909	6	2044	405	136
+7165	Mórágy	TO	46.2167	18.65	20701	6	1762	735	279
+7171	Sióagárd	TO	46.4	18.65	25645	6	2440	1312	518
+7172	Harc	TO	46.4	18.6333	14164	6	1586	903	317
+7173	Zomba	TO	46.4	18.5667	21625	6	5729	2185	851
+7174	Kéty	TO	46.4333	18.5333	21731	6	1656	705	265
+7175	Felsőnána	TO	46.4667	18.5333	15820	6	1890	612	242
+7176	Murga	TO	46.4667	18.4833	18917	6	659	75	56
+7181	Tevel	TO	46.4167	18.45	31459	6	2527	1537	570
+7182	Závod	TO	46.4	18.4167	14304	6	1291	306	140
+7183	Kisvejke	TO	46.3833	18.4167	31185	6	1133	423	139
+7184	Lengyel	BA	46.3786	18.4357	24411	6	2003	536	241
+7184	Szárász	TO	46.3786	18.4357	07366	6	598	34	37
+7185	Mucsfa	TO	46.35	18.4167	13620	6	1275	398	150
+7186	Aparhant	TO	46.3333	18.45	26125	6	1796	1070	385
+7186	Nagyvejke	TO	46.3833	18.45	16452	6	777	161	80
+7187	Nagyvejke	TO	46.3833	18.45	16452	6	777	161	80
+7188	Szárász	BA	46.3400	18.4046	07366	6	598	34	37
+7191	Hőgyész	TO	46.4833	18.4167	26055	5	3715	2962	1126
+7192	Szakály	TO	46.5333	18.3833	04464	6	4101	1548	627
+7193	Regöly	TO	46.5833	18.4167	15459	6	6267	1177	546
+7194	Kalaznó	TO	46.5	18.4833	23791	6	1835	172	111
+7195	Mucsi	TO	46.4333	18.4	07029	6	2476	485	219
+7200	Dombóvár	TO	46.3833	18.1167	07685	4	7848	20084	8374
+7201	Dombóvár	TO	46.3833	18.1167	07685	4	7848	20084	8374
+7202	Dombóvár	TO	46.3833	18.1167	07685	4	7848	20084	8374
+7203	Dombóvár	TO	46.3833	18.1167	07685	4	7848	20084	8374
+7211	Dalmand	TO	46.5	18.1833	29230	6	4877	1353	519
+7212	Kocsola	TO	46.5333	18.1833	22433	6	3334	1258	527
+7213	Szakcs	TO	46.5133	18.11	10083	6	5579	929	488
+7214	Várong	TO	46.5333	18.05	29124	6	663	164	91
+7214	Lápafő	TO	46.5167	18.0667	14605	6	931	161	84
+7215	Nak	TO	46.4833	18.0667	02796	6	2778	580	299
+7224	Dúzs	TO	46.4833	18.3833	19202	6	1127	273	120
+7225	Csibrák	TO	46.4667	18.35	11998	6	1462	355	156
+7226	Kurd	TO	46.45	18.3167	20507	6	3119	1244	509
+7227	Gyulaj	TO	46.5	18.3	30359	6	7082	991	367
+7228	Döbrököz	TO	46.4167	18.25	02565	6	4313	2007	983
+7251	Kapospula	TO	46.3524	18.0143	23296	6	1980	928	352
+7252	Attala	TO	46.3524	18.0143	32735	6	2064	869	378
+7253	Csoma	SO	46.3667	18.05	08040	6	843	440	184
+7253	Szabadi	SO	46.3667	18.0333	14854	6	823	294	127
+7255	Nagyberki	SO	46.3667	18.0167	21449	6	2174	1480	529
+7256	Kercseliget	SO	46.3333	18.0667	14386	6	1947	388	182
+7257	Mosdós	SO	46.35	18	31343	6	1695	1036	330
+7258	Kaposkeresztúr	SO	46.3333	17.9667	12663	6	1980	341	137
+7258	Baté	SO	46.35	17.9667	32337	6	1028	834	297
+7261	Kaposhomok	SO	46.3667	17.9167	25867	6	1148	496	153
+7261	Taszár	SO	46.3667	17.9167	04932	6	1729	1982	800
+7271	Fonó	SO	46.4	17.95	22026	6	1061	325	155
+7272	Gölle	SO	46.4333	18.0167	30571	6	4469	996	436
+7273	Büssü	SO	46.4667	17.9667	08703	6	1719	336	160
+7274	Kazsok	SO	46.4833	17.9667	26888	6	1071	321	123
+7275	Igal	SO	46.5333	17.95	11192	5	3606	1243	579
+7276	Somogyszil	SO	46.5167	18	03416	6	3846	754	369
+7276	Gadács	SO	46.5333	18.0167	28264	6	386	91	63
+7279	Kisgyalán	SO	46.4167	17.9833	04826	6	941	188	103
+7281	Bonnya	SO	46.5833	17.9	22673	6	1462	269	150
+7282	Kisbárapáti	SO	46.6	17.8667	24493	6	2871	467	235
+7282	Fiad	SO	46.6333	17.85	31644	6	1491	162	79
+7283	Somogyacsa	SO	46.5833	17.95	30580	6	2446	150	182
+7284	Somogydöröcske	SO	46.5833	18	15981	6	1083	151	102
+7285	Kára	SO	46.6167	18.0167	05351	6	537	54	46
+7285	Szorosad	SO	46.6	18.0333	05193	6	648	93	59
+7285	Törökkoppány	SO	46.6	18.05	20093	6	2580	481	239
+7286	Miklósi	SO	46.65	18	33376	6	1047	234	124
+7300	Mecsekpölöske	BA	46.2167	18.2167	11402	6	731	450	154
+7300	Komló	BA	46.2	18.2667	26408	4	4655	25881	11198
+7301	Mecsekpölöske	BA	46.2167	18.2167	11402	6	731	450	154
+7302	Mecsekpölöske	BA	46.2167	18.2167	11402	6	731	450	154
+7303	Mecsekpölöske	BA	46.2167	18.2167	11402	6	731	450	154
+7304	Mánfa	BA	46.1667	18.25	33923	6	2770	875	331
+7305	Mánfa	BA	46.1667	18.25	33923	6	2770	875	331
+7306	Mánfa	BA	46.1667	18.25	33923	6	2770	875	331
+7309	Mánfa	BA	46.1667	18.25	33923	6	2770	875	331
+7331	Liget	BA	46.2333	18.2	17604	6	1207	446	142
+7332	Magyaregregy	BA	46.25	18.3167	29753	6	2681	752	341
+7333	Kárász	BA	46.2667	18.3167	05999	6	802	336	145
+7333	Vékény	BA	46.2667	18.35	24402	6	936	155	65
+7334	Köblény	BA	46.3	18.3	25247	6	804	249	106
+7334	Szalatnak	BA	46.2833	18.2833	09007	6	1028	348	171
+7341	Csikóstőttős	TO	46.3333	18.1667	30094	6	1770	882	371
+7342	Mágocs	BA	46.35	18.2333	06813	5	4254	2483	975
+7343	Nagyhajmás	BA	46.3278	18.2944	12858	6	1801	359	148
+7344	Mekényes	BA	46.3833	18.3333	30492	6	1777	277	145
+7345	Alsómocsolád	BA	46.3167	18.25	17385	6	1300	349	141
+7346	Bikal	BA	46.3333	18.2833	04899	6	1703	763	336
+7347	Egyházaskozár	BA	46.3333	18.3167	27401	6	2431	801	348
+7348	Tófű	BA	46.3167	18.3667	04048	6	434	117	58
+7348	Hegyhátmaróc	BA	46.3167	18.3333	30951	6	759	154	86
+7349	Szászvár	BA	46.2667	18.3667	33765	5	2117	2428	1037
+7351	Máza	BA	46.2667	18.4	33756	6	1069	1269	485
+7352	Györe	TO	46.3	18.4	25539	6	1131	667	253
+7353	Izmény	TO	46.3167	18.4167	27711	6	1373	519	204
+7354	Váralja	TO	46.2667	18.4333	32850	6	2113	927	372
+7355	Nagymányok	TO	46.2833	18.4667	14030	5	1068	2357	923
+7356	Kismányok	TO	46.2667	18.4833	06512	6	543	357	134
+7357	Jágónak	TO	46.3167	18.0833	09326	6	1540	261	118
+7361	Kaposszekcső	TO	46.3333	18.1333	18962	6	1562	1549	645
+7362	Gerényes	BA	46.3	18.1833	13347	6	1234	250	99
+7362	Vásárosdombó	BA	46.3	18.15	02264	6	1174	1160	397
+7362	Tarrós	TO	46.3056	18.1389	15635	6	529	117	52
+7362	Jágónak	TO	46.3167	18.0833	09326	6	1540	261	118
+7370	Felsőegerszeg	BA	46.25	18.1333	13286	6	484	143	62
+7370	Oroszló	BA	46.2167	18.1333	04482	6	612	331	119
+7370	Palé	BA	46.2667	18.0667	23764	6	215	111	37
+7370	Sásd	BA	46.25	18.1167	32160	4	1488	3322	1396
+7370	Varga	BA	46.2333	18.15	28529	6	836	119	51
+7370	Vázsnok	BA	46.2667	18.1333	07074	6	475	117	62
+7370	Meződ	BA	46.2833	18.1	03470	6	1041	124	75
+7381	Ág	BA	46.2833	18.2	25812	6	1203	178	66
+7381	Kisvaszar	BA	46.2833	18.2167	09548	6	2035	332	120
+7381	Tékes	BA	46.2833	18.1667	27702	6	1256	261	99
+7383	Baranyaszentgyörgy	BA	46.2333	18.0167	05485	6	727	137	76
+7383	Tormás	BA	46.2333	18	22424	6	2470	290	130
+7383	Szágy	BA	46.2333	17.95	27508	6	940	145	62
+7384	Baranyajenő	BA	46.2667	18.05	24749	6	1555	527	169
+7385	Gödre	BA	46.2833	17.9833	33233	6	3993	930	405
+7386	Gödre	BA	46.2833	17.9833	33233	6	3993	930	405
+7391	Kisbeszterce	BA	46.2	18.0333	05722	6	747	80	49
+7391	Kishajmás	BA	46.2	18.0833	06831	6	1176	220	108
+7391	Mindszentgodisa	BA	46.2167	18.0667	16285	6	2297	926	384
+7393	Bakóca	BA	46.2167	18	22275	6	1065	280	160
+7394	Magyarhertelend	BA	46.1833	18.15	05430	6	1616	647	260
+7394	Bodolyabér	BA	46.2	18.1167	33002	6	909	251	115
+7396	Magyarszék	BA	46.2	18.2	22600	6	1386	1101	382
+7400	Kaposvár	SO	46.3667	17.8	20473	1	11359	67663	27911
+7400	Orci	SO	46.4	17.8667	24536	6	997	582	174
+7400	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7401	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7402	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7403	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7404	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7405	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7406	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7407	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7408	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7409	Zselickislak	SO	46.3167	17.8167	24110	6	1039	335	115
+7431	Juta	SO	46.4	17.75	17279	6	1923	1224	409
+7432	Csombárd	SO	46.45	17.6833	02477	6	899	286	115
+7432	Hetes	SO	46.4167	17.7	09928	6	2663	1172	381
+7434	Mezőcsokonya	SO	46.4333	17.65	30854	6	3078	1264	455
+7435	Somogysárd	SO	46.4167	17.6	28723	6	3636	1270	509
+7436	Újvárfalva	SO	46.4333	17.5833	07205	6	1222	333	137
+7439	Bodrog	SO	46.4667	17.6667	10506	6	1478	452	171
+7441	Magyaregres	SO	46.45	17.7833	25371	6	1440	643	210
+7442	Várda	SO	46.45	17.7333	26781	6	1036	517	198
+7443	Alsóbogát	SO	46.5	17.75	34184	6	1201	273	96
+7443	Somogyjád	SO	46.5	17.7	28963	6	2506	1578	567
+7443	Edde	SO	46.5167	17.7167	03489	6	851	202	98
+7444	Osztopán	SO	46.5167	17.6667	19770	6	2283	846	302
+7452	Somogyaszaló	SO	46.45	17.8167	31219	6	2212	712	285
+7453	Mernye	SO	46.5	17.8333	23630	6	2593	1491	565
+7454	Somodor	SO	46.4833	17.85	13824	6	1991	429	177
+7455	Somogygeszti	SO	46.5167	17.7833	20330	6	2171	488	209
+7456	Felsőmocsolád	SO	46.5833	17.8333	13985	6	1651	439	253
+7457	Ecseny	SO	46.55	17.85	10861	6	1292	214	178
+7458	Polány	SO	46.55	17.7833	13790	6	1287	232	152
+7463	Magyaratád	SO	46.4667	17.9	10427	6	1882	862	370
+7463	Patalom	SO	46.45	17.9167	06141	6	668	351	93
+7464	Ráksi	SO	46.5167	17.9167	30863	6	1517	489	187
+7465	Szentgáloskér	SO	46.5	17.8833	12973	6	2725	529	247
+7471	Zimány	SO	46.4167	17.9167	27614	6	1297	626	198
+7472	Cserénfa	SO	46.3167	17.8833	25681	6	1775	210	90
+7472	Szentbalázs	SO	46.3167	17.9	25706	6	1214	322	118
+7473	Gálosfa	SO	46.25	17.9	06585	6	1976	315	118
+7473	Kaposgyarmat	SO	46.2833	17.8833	28811	6	1107	107	35
+7473	Hajmás	SO	46.2833	17.9167	25830	6	1111	241	85
+7474	Zselicszentpál	SO	46.3	17.8333	17491	6	1035	385	150
+7474	Simonfa	SO	46.2833	17.8333	32780	6	1100	374	141
+7475	Bőszénfa	SO	46.2333	17.85	26277	6	4295	581	195
+7476	Kaposszerdahely	SO	46.3167	17.75	06424	6	885	999	346
+7477	Patca	SO	46.2833	17.7167	12168	6	496	57	36
+7477	Szenna	SO	46.3	17.7333	15103	6	2698	763	247
+7477	Zselickisfalud	SO	46.2667	17.7333	26842	6	2608	246	114
+7477	Szilvásszentmárton	SO	46.2667	17.7333	32461	6	708	196	70
+7478	Bárdudvarnok	SO	46.3333	17.6833	03735	6	4856	1200	544
+7479	Sántos	SO	46.35	17.8833	31121	6	1138	549	186
+7500	Nagyatád	SO	46.2167	17.3667	17941	4	7060	11196	5070
+7501	Nagyatád	SO	46.2167	17.3667	17941	4	7060	11196	5070
+7511	Ötvöskónyi	SO	46.2167	17.3667	32115	6	2771	915	300
+7512	Mike	SO	46.2333	17.5333	20905	6	3241	652	250
+7513	Rinyaszentkirály	SO	46.15	17.4	26754	6	3056	394	173
+7514	Tarany	SO	46.1833	17.3	16735	6	5468	1200	470
+7515	Somogyudvarhely	SO	46.1667	17.2	04853	6	4042	1101	455
+7516	Berzence	SO	46.2	17.15	30119	5	5376	2570	997
+7517	Bolhás	SO	46.2667	17.2833	13994	6	3143	441	196
+7521	Kaposmérő	SO	46.3667	17.7167	18227	6	1398	2471	856
+7522	Kaposújlak	SO	46.3667	17.7333	15732	6	893	728	274
+7523	Kisasszond	SO	46.3333	17.6333	19053	6	784	187	71
+7523	Kaposfő	SO	46.3667	17.6667	09098	6	2726	1730	589
+7524	Kiskorpád	SO	46.35	17.6167	13781	6	1695	904	347
+7525	Jákó	SO	46.3333	17.55	15927	6	1669	641	249
+7526	Csököly	SO	46.3	17.55	24314	6	2984	1154	433
+7527	Rinyakovácsi	SO	46.2833	17.6	32674	6	1109	144	69
+7527	Gige	SO	46.3	17.6167	09177	6	1319	362	136
+7530	Kőkút	SO	46.1833	17.5833	13745	6	2023	642	135
+7530	Kadarkút	SO	46.2333	17.6333	26453	4	3974	2624	979
+7532	Hencse	SO	46.2	17.6333	09946	6	711	367	150
+7533	Visnye	SO	46.1833	17.6833	19017	6	2438	225	116
+7533	Hedrehely	SO	46.1833	17.6667	16726	6	2551	435	194
+7535	Lad	SO	46.15	17.65	16258	6	2235	592	273
+7536	Patosfa	SO	46.1333	17.6667	15592	6	1507	254	146
+7537	Homokszentgyörgy	SO	46.1167	17.5833	19150	6	4964	1137	499
+7538	Kálmáncsa	SO	46.0667	17.6167	06105	6	4885	662	248
+7539	Szulok	SO	46.05	17.55	10986	6	2791	620	293
+7541	Kutas	SO	46.3333	17.45	28857	6	3655	1507	516
+7542	Kisbajom	SO	46.3	17.5	24387	6	1367	401	160
+7543	Beleg	SO	46.3167	17.4167	17127	6	1799	661	233
+7544	Szabás	SO	46.2833	17.45	28574	6	1811	652	196
+7545	Nagykorpád	SO	46.2667	17.4667	32805	6	3342	609	218
+7551	Lábod	SO	46.2	17.45	28291	6	6651	2074	749
+7552	Rinyabesenyő	SO	46.1667	17.5167	05078	6	2863	176	71
+7553	Görgeteg	SO	46.15	17.4333	14599	6	3350	1191	449
+7555	Csokonyavisonta	SO	46.0833	17.45	05971	6	8129	1646	644
+7556	Rinyaújlak	SO	46.0833	17.4167	20622	6	2426	306	142
+7557	Rinyaújlak	SO	46.0833	17.4167	20622	6	2426	306	142
+7561	Nagybajom	SO	46.3833	17.5167	21652	4	10806	3501	1154
+7561	Pálmajor	SO	46.3833	17.5667	34041	6	624	378	102
+7562	Segesd	SO	46.35	17.35	27368	6	7309	2580	912
+7563	Somogyszob	SO	46.3	17.3	18546	6	4008	1640	645
+7564	Kaszó	SO	46.3542	17.4333	34193	6	2248	124	58
+7570	Barcs	SO	45.96	17.4586	32799	4	12290	11699	4511
+7571	Barcs	SO	45.96	17.4586	32799	4	12290	11699	4511
+7582	Komlósd	SO	46.0167	17.3833	09858	6	746	196	92
+7582	Péterhida	SO	46.0167	17.3667	29197	6	1162	155	101
+7584	Babócsa	SO	46.0333	17.3667	30474	6	3099	1653	711
+7584	Rinyaújnép	SO	46.0833	17.35	20321	6	828	56	51
+7584	Somogyaracs	SO	46.05	17.4	05500	6	770	206	86
+7585	Háromfa	SO	46.1	17.3333	08837	6	4214	797	331
+7585	Bakháza	SO	46.1	17.3667	14395	6	592	199	85
+7586	Bolhó	SO	46.0333	17.3	18120	6	2507	752	401
+7587	Heresznye	SO	46.05	17.2833	24846	6	990	284	158
+7588	Vízvár	SO	46.0833	17.2333	29780	6	3224	575	349
+7589	Bélavár	SO	46.1167	17.2167	06910	6	2278	370	221
+7600	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7601	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7602	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7603	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7604	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7605	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7606	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7607	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7608	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7610	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7611	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7612	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7613	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7614	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7615	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7616	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7617	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7618	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7619	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7621	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7622	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7623	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7624	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7625	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7626	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7627	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7628	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7629	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7630	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7631	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7632	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7633	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7634	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7635	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7636	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7639	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7643	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7644	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7645	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7646	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7647	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7648	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7650	Pécs	BA	46.0967	18.2068	19415	1	16278	156974	69458
+7661	Erzsébet	BA	46.1	18.4667	13499	6	975	316	128
+7661	Kékesd	BA	46.1	18.4667	16805	6	811	185	96
+7661	Kátoly	BA	46.0667	18.45	19132	6	875	321	146
+7661	Szellő	BA	46.0667	18.4667	16984	6	596	167	74
+7663	Máriakéménd	BA	46.0333	18.4667	14483	6	1578	574	214
+7664	Berkesd	BA	46.0667	18.4167	16461	6	1904	868	289
+7664	Szilágy	BA	46.1	18.4167	19831	6	1155	305	132
+7664	Pereked	BA	46.1	18.3833	12867	6	674	179	75
+7666	Pogány	BA	45.98	18.26	17242	6	1155	1105	372
+7668	Gyód	BA	45.9958	18.1786	18315	6	325	699	225
+7668	Keszü	BA	46.0167	18.1833	03832	6	731	1326	398
+7668	Kökény	BA	45.9969	18.2028	03540	6	489	609	216
+7671	Bicsérd	BA	46.0167	18.0833	13310	6	1975	1035	349
+7671	Zók	BA	46	18.1	12201	6	893	294	108
+7671	Aranyosgadány	BA	46	18.1167	06886	6	826	340	133
+7672	Boda	BA	46.0833	18.05	20899	6	1542	438	168
+7673	Kővágószőlős	BA	46.0833	18.1333	15538	6	1825	1317	505
+7673	Cserkút	BA	46.0667	18.1333	03896	6	667	552	167
+7675	Kővágótöttös	BA	46.0833	18.0833	06992	6	1394	318	122
+7675	Bakonya	BA	46.0833	18.0833	08299	6	1507	388	143
+7677	Orfű	BA	46.1333	18.15	11730	6	3215	882	320
+7678	Abaliget	BA	46.15	18.1167	12548	6	1609	605	233
+7678	Kovácsszénája	BA	46.1667	18.1167	14517	6	783	52	30
+7678	Husztót	BA	46.1667	18.0833	31431	6	675	53	37
+7681	Okorvölgy	BA	46.15	18.0667	08341	6	311	95	47
+7681	Hetvehely	BA	46.1333	18.05	07126	6	2138	449	160
+7681	Szentkatalin	BA	46.1667	18.05	09803	6	1331	96	73
+7682	Bükkösd	BA	46.1	17.9833	23162	6	3015	1160	448
+7683	Helesfa	BA	46.0833	17.9833	17190	6	987	538	145
+7683	Dinnyeberki	BA	46.0833	17.95	11952	6	856	88	63
+7683	Cserdi	BA	46.0667	18	26082	6	647	385	147
+7691	Pécs	BA	46.0833	17.95	19415	1	16278	156974	69458
+7691	Dinnyeberki	BA	46.0833	17.95	11952	6	856	88	63
+7693	Pécs	BA	46.0833	17.95	19415	1	16278	156974	69458
+7693	Dinnyeberki	BA	46.0833	17.95	11952	6	856	88	63
+7694	Hosszúhetény	BA	46.15	18.35	30836	6	4527	3413	1160
+7695	Ófalu	BA	46.2167	18.5333	19646	6	985	320	142
+7695	Mecseknádasd	BA	46.2167	18.4667	13444	6	3608	1559	631
+7695	Óbánya	BA	46.2167	18.4167	12645	6	749	135	90
+7696	Hidas	BA	46.2667	18.5	06798	6	1906	2086	816
+7700	Mohács	BA	45.9931	18.6831	23959	4	11223	19129	8706
+7701	Mohács	BA	45.9931	18.6831	23959	4	11223	19129	8706
+7702	Mohács	BA	45.9931	18.6831	23959	4	11223	19129	8706
+7711	Bár	BA	46.05	18.7167	24378	6	900	543	218
+7712	Dunaszekcső	BA	46.0833	18.7667	09186	6	3675	1970	955
+7714	Dunaszekcső	BA	46.0833	18.7667	09186	6	3675	1970	955
+7715	Dunaszekcső	BA	46.0833	18.7667	09186	6	3675	1970	955
+7716	Homorúd	BA	45.9814	18.7922	29966	6	4473	612	400
+7717	Kölked	BA	45.9503	18.7078	17899	6	6194	1100	414
+7718	Udvar	BA	45.9006	18.6597	04437	6	440	160	67
+7720	Apátvarasd	BA	46.1833	18.4833	27298	6	814	132	42
+7720	Martonfa	BA	46.1167	18.3833	02228	6	569	205	82
+7720	Lovászhetény	BA	46.1667	18.4833	24624	6	895	272	117
+7720	Zengővárkony	BA	46.1667	18.4333	15848	6	1671	419	172
+7720	Pécsvárad	BA	46.15	18.4167	10825	4	3603	4058	1476
+7723	Erdősmecske	BA	46.1833	18.5167	18704	6	2644	398	187
+7724	Feked	BA	46.1667	18.5667	04543	6	1933	181	117
+7725	Szebény	BA	46.1333	18.6	03018	6	1437	453	215
+7726	Véménd	BA	46.15	18.6167	20279	6	3181	1500	600
+7727	Palotabozsok	BA	46.1333	18.65	10135	6	2019	947	429
+7728	Görcsönydoboka	BA	46.0667	18.6333	09636	6	951	409	186
+7728	Somberek	BA	46.0833	18.6667	23472	6	3142	1464	532
+7731	Nagypall	BA	46.15	18.45	19877	6	713	432	156
+7732	Fazekasboda	BA	46.1167	18.4833	17835	6	702	187	99
+7733	Maráza	BA	46.0667	18.5167	29920	6	970	186	108
+7733	Geresdlak	BA	46.1	18.5333	02857	6	2528	819	414
+7735	Szűr	BA	46.1	18.5833	11217	6	783	282	125
+7735	Erdősmárok	BA	46.05	18.55	25821	6	814	84	63
+7735	Himesháza	BA	46.0833	18.5667	27933	6	1754	1116	453
+7737	Székelyszabar	BA	46.05	18.6	16771	6	1548	612	263
+7741	Bogád	BA	46.0833	18.3333	32151	6	784	1080	323
+7741	Nagykozár	BA	46.0667	18.3333	10940	6	1146	1839	591
+7741	Romonya	BA	46.0833	18.35	24855	6	707	456	163
+7742	Bogád	BA	46.0833	18.3333	32151	6	784	1080	323
+7743	Romonya	BA	46.0833	18.35	24855	6	707	456	163
+7744	Ellend	BA	46.05	18.3833	06099	6	799	239	97
+7745	Olasz	BA	46.0167	18.4167	18555	6	1029	640	254
+7745	Hásságy	BA	46.0333	18.3833	27881	6	800	268	147
+7747	Belvárdgyula	BA	45.9722	18.4339	19008	6	1723	423	183
+7747	Birján	BA	45.9978	18.3747	05139	6	907	492	198
+7751	Szederkény	BA	45.9969	18.4578	05607	6	1433	1827	638
+7751	Monyoród	BA	46	18.4833	16027	6	712	190	99
+7752	Versend	BA	45.9953	18.5114	19725	6	1413	925	302
+7753	Szajk	BA	45.9906	18.5314	08475	6	1136	857	313
+7754	Bóly	BA	45.9672	18.5183	33154	4	2538	3970	1506
+7755	Töttös	BA	45.9156	18.5422	04136	6	2299	587	264
+7756	Borjád	BA	45.9339	18.4672	06725	6	1559	422	160
+7756	Pócsa	BA	45.9097	18.4708	22266	6	805	193	73
+7756	Kisbudmér	BA	45.9125	18.4475	22868	6	572	126	47
+7756	Nagybudmér	BA	45.9361	18.4456	03984	6	1022	227	86
+7757	Babarc	BA	45.9981	18.5547	05403	6	1885	758	326
+7757	Liptód	BA	46.05	18.5167	10038	6	1499	208	145
+7759	Lánycsók	BA	46	18.6333	33330	6	2540	2608	877
+7759	Kisnyárád	BA	46.0333	18.5667	33215	6	903	197	108
+7761	Lothárd	BA	45.9989	18.3525	31389	6	1046	266	110
+7761	Kozármisleny	BA	46.0333	18.3	06336	4	1445	5802	1998
+7761	Magyarsarlós	BA	46.0333	18.3667	27067	6	803	313	113
+7762	Pécsudvard	BA	46.0167	18.2833	21096	6	843	732	276
+7763	Áta	BA	45.9364	18.2947	28583	6	809	186	92
+7763	Szemely	BA	46.0167	18.3333	09308	6	947	479	173
+7763	Egerág	BA	45.9839	18.3047	28918	6	1301	1002	339
+7763	Szőkéd	BA	45.9667	18.2869	07694	6	958	388	138
+7763	Kisherend	BA	45.9661	18.3297	16975	6	692	178	81
+7766	Pécsdevecser	BA	45.9567	18.3842	15389	6	474	107	49
+7766	Újpetre	BA	45.9367	18.3625	06062	6	1671	1099	386
+7766	Peterd	BA	45.9742	18.3589	32425	6	1060	204	95
+7766	Kiskassa	BA	45.9531	18.3978	19910	6	1333	263	112
+7768	Kistótfalu	BA	45.9075	18.3075	10746	6	1050	331	134
+7768	Vokány	BA	45.9094	18.3361	05892	6	1709	875	355
+7771	Palkonya	BA	45.8967	18.3897	07153	6	1000	295	127
+7772	Ivánbattyán	BA	45.9072	18.4181	03337	6	613	134	70
+7772	Villánykövesd	BA	45.8822	18.4253	05209	6	749	284	128
+7773	Villány	BA	45.8689	18.4539	28024	4	2202	2480	1010
+7773	Kisjakabfalva	BA	45.8958	18.4347	12849	6	662	125	82
+7774	Márok	BA	45.8736	18.5086	20659	6	1593	455	191
+7775	Illocska	BA	45.8003	18.5225	31936	6	1510	228	99
+7775	Magyarbóly	BA	45.8419	18.4914	25177	6	1722	1025	376
+7775	Kislippó	BA	45.8272	18.5297	21616	6	837	279	123
+7775	Lapáncsa	BA	45.8192	18.4978	06479	6	436	201	77
+7781	Ivándárda	BA	45.8306	18.5903	03346	6	767	248	108
+7781	Lippó	BA	45.8628	18.57	22974	6	1453	465	212
+7781	Sárok	BA	45.8411	18.6114	20862	6	462	131	62
+7782	Bezedek	BA	45.8647	18.5864	14119	6	1136	242	108
+7783	Majs	BA	45.9092	18.6003	27863	6	3206	1002	394
+7784	Nagynyárád	BA	45.9433	18.5781	14650	6	2434	739	330
+7785	Sátorhely	BA	45.9408	18.6344	33482	6	1760	668	242
+7800	Kisharsány	BA	45.8586	18.3642	27021	6	1293	557	195
+7800	Siklós	BA	45.8553	18.2986	05519	4	5092	9944	4002
+7800	Nagytótfalu	BA	45.8639	18.3453	28927	6	1117	396	127
+7801	Nagytótfalu	BA	45.8639	18.3453	28927	6	1117	396	127
+7802	Nagytótfalu	BA	45.8639	18.3453	28927	6	1117	396	127
+7811	Bisse	BA	45.9078	18.2581	24925	6	1380	242	117
+7811	Szalánta	BA	45.9486	18.2375	22257	6	1708	1250	416
+7811	Bosta	BA	45.9483	18.2092	14368	6	595	140	54
+7811	Szilvás	BA	45.9622	18.2	24712	6	604	168	58
+7811	Csarnóta	BA	45.8953	18.2147	30614	6	533	134	57
+7811	Túrony	BA	45.9044	18.2317	18582	6	940	251	97
+7812	Garé	BA	45.9189	18.1933	07560	6	853	318	113
+7813	Szava	BA	45.9022	18.1761	31060	6	1264	340	127
+7814	Babarcszőlős	BA	45.9	18.1364	09663	6	425	116	66
+7814	Ócsárd	BA	45.9342	18.1519	03780	6	1266	410	142
+7814	Kisdér	BA	45.9406	18.1281	11183	6	437	126	54
+7814	Siklósbodony	BA	45.9103	18.1203	23205	6	433	138	46
+7815	Harkány	BA	45.8478	18.2375	21528	4	2569	4013	1814
+7817	Rádfalva	BA	45.8597	18.1258	11518	6	1288	202	90
+7817	Diósviszló	BA	45.8772	18.1633	32373	6	1581	725	247
+7817	Márfa	BA	45.86	18.1853	09450	6	409	220	68
+7822	Nagyharsány	BA	45.8464	18.3922	02653	6	2601	1572	579
+7823	Kistapolca	BA	45.8219	18.3847	03151	6	357	200	72
+7823	Siklósnagyfalu	BA	45.8197	18.3614	08800	6	909	413	132
+7824	Egyházasharaszti	BA	45.8094	18.3336	16498	6	1099	313	134
+7824	Old	BA	45.7881	18.3522	21704	6	1407	348	152
+7826	Alsószentmárton	BA	45.7892	18.3056	33279	6	1361	1172	308
+7827	Kásád	BA	45.7783	18.3989	17464	6	1329	322	138
+7827	Beremend	BA	45.7853	18.4347	31927	5	4826	2651	1030
+7831	Pellérd	BA	46.0333	18.15	16115	6	2093	2119	653
+7833	Görcsöny	BA	45.9694	18.1358	30438	6	1852	1696	533
+7833	Szőke	BA	45.96	18.1858	22211	6	648	139	55
+7833	Regenye	BA	45.9692	18.1681	25292	6	615	140	62
+7834	Baksa	BA	45.9536	18.0889	03975	6	1382	773	270
+7834	Tengeri	BA	45.9261	18.0881	13675	6	446	54	30
+7834	Téseny	BA	45.9399	18.0885	20978	6	1208	319	110
+7836	Bogádmindszent	BA	45.9069	18.0406	21892	6	1158	417	135
+7836	Ózdfalu	BA	45.9292	18.0217	18661	6	800	185	70
+7837	Hegyszentmárton	BA	45.9039	18.09	21023	6	1878	432	166
+7838	Nagycsány	BA	45.8667	17.95	18111	6	565	153	53
+7838	Hirics	BA	45.8167	18	03285	6	1468	240	78
+7838	Piskó	BA	45.8167	17.95	23506	6	1155	257	84
+7838	Besence	BA	45.9	17.9667	30049	6	958	129	48
+7838	Vajszló	BA	45.8633	17.9761	28538	5	1771	1781	707
+7838	Lúzsok	BA	45.8333	17.95	18865	6	652	261	67
+7838	Páprád	BA	45.8925	18.0097	07010	6	1211	169	77
+7838	Vejti	BA	45.8167	17.9667	18519	6	976	166	72
+7839	Kemse	BA	45.8167	17.9167	06789	6	896	65	37
+7839	Zaláta	BA	45.8167	17.8833	25122	6	2183	289	132
+7841	Baranyahídvég	BA	45.8464	18.0233	20464	6	849	205	86
+7841	Sámod	BA	45.8544	18.0375	18050	6	620	213	80
+7841	Adorjás	BA	45.8506	18.0628	06868	6	810	191	65
+7841	Kisszentmárton	BA	45.8242	18.0242	08651	6	1486	272	111
+7841	Kórós	BA	45.8669	18.0844	08110	6	1512	228	85
+7843	Cún	BA	45.8125	18.0669	11086	6	1843	243	94
+7843	Kémes	BA	45.8242	18.1011	10542	6	689	510	190
+7843	Drávapiski	BA	45.84	18.1011	12380	6	491	126	43
+7843	Tésenfa	BA	45.8131	18.1183	32744	6	840	183	86
+7843	Szaporca	BA	45.8136	18.1044	34032	6	965	237	98
+7846	Drávacsepely	BA	45.8292	18.1386	28121	6	660	214	89
+7847	Kovácshida	BA	45.8342	18.1814	24226	6	809	269	95
+7847	Drávaszerdahely	BA	45.8358	18.1633	30030	6	624	200	78
+7847	Ipacsfa	BA	45.8347	18.2033	29948	6	601	212	87
+7849	Drávacsehi	BA	45.8128	18.1672	28617	6	740	208	79
+7850	Drávapalkonya	BA	45.8031	18.1789	22734	6	1013	273	110
+7851	Drávapalkonya	BA	45.8031	18.1789	22734	6	1013	273	110
+7851	Drávacsehi	BA	45.8128	18.1672	28617	6	740	208	79
+7851	Drávaszabolcs	BA	45.8058	18.2114	28608	6	1122	686	286
+7853	Gordisa	BA	45.7964	18.2333	33084	6	1088	310	103
+7854	Matty	BA	45.7981	18.2661	15051	6	1690	352	147
+7900	Botykapeterd	BA	46.05	17.8667	13365	6	1743	347	134
+7900	Szigetvár	BA	46.05	17.8	26578	4	3951	10900	4305
+7900	Csertő	BA	46.1	17.8167	13851	6	1426	406	175
+7901	Csertő	BA	46.1	17.8167	13851	6	1426	406	175
+7912	Nyugotszenterzsébet	BA	46.0833	17.9167	26329	6	923	242	80
+7912	Nagyváty	BA	46.0667	17.9333	14191	6	1267	360	126
+7912	Nagypeterd	BA	46.05	17.9	27164	6	1163	655	225
+7913	Szentdénes	BA	46	17.9333	32009	6	1215	319	134
+7914	Katádfa	BA	46	17.8667	06965	6	439	180	69
+7914	Rózsafa	BA	46.0167	17.8833	04516	6	1664	387	141
+7914	Bánfa	BA	45.9833	17.8833	07603	6	1206	211	80
+7915	Szentegát	BA	45.9667	17.8333	33613	6	2778	415	179
+7915	Dencsháza	BA	46	17.8333	07773	6	1398	596	211
+7918	Tótújfalu	SO	45.8994	17.6556	16407	6	1327	209	147
+7918	Szentborbás	SO	45.8833	17.6667	32841	6	747	134	64
+7918	Lakócsa	SO	45.8964	17.6839	11040	6	2532	583	269
+7921	Somogyhatvan	BA	46.1167	17.7167	25070	6	1352	363	147
+7922	Basal	BA	46.0667	17.7833	15495	6	404	203	71
+7922	Somogyapáti	BA	46.0833	17.75	23807	6	1007	540	220
+7922	Somogyviszló	BA	46.1167	17.7667	21281	6	1263	251	111
+7922	Patapoklosi	BA	46.0667	17.75	17792	6	1265	338	121
+7923	Basal	BA	46.0667	17.7833	15495	6	404	203	71
+7924	Somogyviszló	BA	46.1167	17.7667	21281	6	1263	251	111
+7925	Magyarlukafa	BA	46.1667	17.7667	23542	6	1297	81	50
+7925	Somogyhárságy	BA	46.1667	17.7833	29142	6	3097	448	216
+7926	Vásárosbéc	BA	46.1833	17.7333	24952	6	2464	186	96
+7932	Almáskeresztúr	BA	46.1167	17.9	20376	6	1303	82	54
+7932	Szulimán	BA	46.1333	17.8	15404	6	1049	219	117
+7932	Mozsgó	BA	46.1167	17.85	29540	6	2176	1045	351
+7934	Almamellék	BA	46.15	17.8833	13329	6	4433	471	164
+7935	Horváthertelend	BA	46.1667	17.9167	23074	6	536	83	30
+7935	Csebény	BA	46.1833	17.9333	21591	6	376	105	44
+7935	Ibafa	BA	46.15	17.9167	33066	6	2930	233	94
+7936	Szentlászló	BA	46.15	17.8333	16355	6	1406	864	282
+7937	Boldogasszonyfa	BA	46.1833	17.8333	13116	6	1722	446	214
+7940	Szentlőrinc	BA	46.05	17.9833	15866	4	2782	7000	2526
+7940	Csonkamindszent	BA	46.05	17.9667	22576	6	553	187	61
+7940	Kacsóta	BA	46.0333	17.95	04297	6	951	259	95
+7951	Gerde	BA	45.9897	18.0242	12751	6	1276	584	188
+7951	Pécsbagota	BA	45.9903	18.0733	21519	6	607	117	39
+7951	Szabadszentkirály	BA	46.0167	18.0333	15079	6	1269	804	297
+7951	Velény	BA	45.9803	18.0533	22071	6	709	159	61
+7953	Királyegyháza	BA	46	17.9667	20552	6	2288	980	323
+7954	Gilvánfa	BA	45.9167	17.9667	18333	6	1543	398	99
+7954	Magyartelek	BA	45.9333	17.9833	04385	6	684	225	73
+7954	Gyöngyfa	BA	45.9667	17.95	28404	6	878	120	51
+7954	Kisasszonyfa	BA	45.9467	18.0061	18908	6	887	187	74
+7954	Magyarmecske	BA	45.95	17.9667	05412	6	1195	322	113
+7957	Okorág	BA	45.9167	17.8833	20686	6	1185	174	86
+7958	Kákics	BA	45.9025	17.8528	06415	6	1489	203	95
+7960	Marócsa	BA	45.9167	17.8167	15219	6	1138	89	57
+7960	Drávaiványi	BA	45.85	17.8167	32391	6	1101	202	100
+7960	Sellye	BA	45.8747	17.8439	28741	4	2518	2849	1160
+7960	Drávasztára	BA	45.8167	17.8167	21698	6	1818	414	240
+7960	Sósvertike	BA	45.8333	17.8667	31714	6	660	179	81
+7960	Sumony	BA	45.9714	17.9058	02547	6	2021	443	174
+7964	Csányoszró	BA	45.8819	17.9019	19901	6	2856	717	267
+7966	Bogdása	BA	45.8833	17.8	10694	6	2099	301	128
+7967	Markóc	BA	45.8667	17.7667	16443	6	579	57	36
+7967	Drávafok	BA	45.8864	17.76	17419	6	2390	519	215
+7967	Drávakeresztúr	BA	45.8333	17.7667	09159	6	1297	139	103
+7968	Felsőszentmárton	BA	45.8522	17.7	08819	6	1946	948	510
+7971	Hobol	BA	46.0167	17.7667	33932	6	1827	996	335
+7972	Gyöngyösmellék	BA	45.9833	17.7	22664	6	1002	290	108
+7972	Pettend	BA	46	17.7	29762	6	598	147	50
+7973	Bürüs	BA	45.9667	17.7667	07533	6	1630	104	44
+7973	Teklafalu	BA	45.95	17.7333	32072	6	1676	351	134
+7973	Endrőc	BA	45.9294	17.7586	28273	6	1133	384	130
+7973	Várad	BA	45.9667	17.75	08138	6	793	110	48
+7975	Kétújfalu	BA	45.9669	17.705	08572	6	1630	680	254
+7976	Zádor	BA	45.9667	17.6653	17747	6	1522	355	147
+7976	Szörény	BA	45.9667	17.6833	05528	6	441	61	33
+7977	Drávagárdony	SO	45.95	17.6167	13611	6	627	148	62
+7977	Potony	SO	45.9303	17.6433	28361	6	1590	211	126
+7977	Kastélyosdombó	SO	45.9544	17.6133	08411	6	1308	265	108
+7979	Drávatamási	SO	45.9444	17.5694	15884	6	845	387	109
+7980	Pettend	BA	46	17.7	29762	6	598	147	50
+7981	Kistamási	BA	46.0167	17.7333	12353	6	438	133	44
+7981	Merenye	BA	46.0667	17.7	07737	6	1447	281	124
+7981	Tótszentgyörgy	BA	46.0333	17.725	26994	6	750	173	80
+7981	Molvány	BA	46.0333	17.75	29522	6	1376	187	78
+7981	Nemeske	BA	46.0167	17.7167	18236	6	1057	273	109
+7985	Kisdobsza	BA	46.0333	17.6667	33905	6	995	264	103
+7985	Nagydobsza	BA	46.0333	17.6667	33899	6	1323	694	224
+7987	Istvándi	SO	46.0167	17.6333	21333	6	3030	608	190
+7988	Darány	SO	45.9803	17.5853	31352	6	2810	931	354
+8000	Székesfehérvár	FE	47.2	18.4166	14827	1	17089	102035	42981
+8001	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8002	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8003	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8004	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8005	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8006	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8007	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8008	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8011	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8019	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8020	Székesfehérvár	FE	47.2	18.4167	14827	1	17089	102035	42981
+8041	Csór	FE	47.2	18.2667	09779	6	4149	1797	630
+8042	Moha	FE	47.25	18.3333	25715	6	988	522	183
+8043	Iszkaszentgyörgy	FE	47.2333	18.3	32018	6	2627	1974	666
+8044	Kincsesbánya	FE	47.25	18.2667	02343	6	1087	1499	577
+8045	Isztimér	FE	47.2833	18.2	02200	6	5388	967	370
+8046	Bakonykúti	FE	47.25	18.2	23153	6	1245	117	68
+8051	Sárkeresztes	FE	47.25	18.35	31802	6	2327	1493	551
+8052	Fehérvárcsurgó	FE	47.3	18.2667	32203	6	2964	1878	710
+8053	Bodajk	FE	47.3167	18.2333	18254	4	2898	4124	1475
+8054	Bodajk	FE	47.3167	18.2333	18254	4	2898	4124	1475
+8055	Balinka	FE	47.3167	18.1833	31103	6	1862	987	381
+8056	Bakonycsernye	FE	47.3167	18.0833	08730	6	3813	3149	1217
+8060	Mór	FE	47.3833	18.2	18485	4	10861	14354	5647
+8061	Mór	FE	47.3833	18.2	18485	4	10861	14354	5647
+8062	Mór	FE	47.3833	18.2	18485	4	10861	14354	5647
+8065	Nagyveleg	FE	47.3667	18.1167	23588	6	1317	684	284
+8066	Pusztavám	FE	47.4333	18.2333	17774	6	3469	2534	991
+8071	Magyaralmás	FE	47.3	18.3333	27678	6	2242	1515	566
+8072	Söréd	FE	47.3167	18.2833	02893	6	625	488	198
+8073	Csákberény	FE	47.35	18.3333	05360	6	4137	1218	515
+8074	Csókakő	FE	47.35	18.2667	21908	6	1092	1284	501
+8080	Bodmér	FE	47.45	18.55	11624	6	717	213	120
+8081	Zámoly	FE	47.3167	18.4167	30243	6	4850	2260	799
+8082	Gánt	FE	47.3833	18.4	15750	6	5815	852	274
+8083	Csákvár	FE	47.4	18.45	20002	5	11876	5218	1912
+8084	Csákvár	FE	47.4	18.45	20002	5	11876	5218	1912
+8085	Vértesboglár	FE	47.4333	18.5333	13897	6	2321	911	358
+8086	Felcsút	FE	47.45	18.5833	29939	6	2202	1764	672
+8087	Alcsútdoboz	FE	47.4167	18.6167	15176	6	5071	1454	604
+8088	Tabajd	FE	47.4	18.6333	14465	6	2657	974	390
+8089	Vértesacsa	FE	47.3667	18.5833	02750	6	3619	1733	687
+8092	Pátka	FE	47.2833	18.5	28848	6	4038	1644	624
+8093	Lovasberény	FE	47.3	18.55	19114	6	6062	2733	1105
+8095	Pákozd	FE	47.2167	18.55	25751	6	4330	3033	977
+8096	Sukoró	FE	47.2333	18.6167	14951	6	1627	1190	445
+8097	Nadap	FE	47.2667	18.6167	27599	6	693	507	235
+8100	Várpalota	VE	47.2	18.1333	11439	4	7726	20688	8516
+8101	Várpalota	VE	47.2	18.1333	11439	4	7726	20688	8516
+8102	Várpalota	VE	47.2	18.1333	11439	4	7726	20688	8516
+8103	Várpalota	VE	47.2	18.1333	11439	4	7726	20688	8516
+8104	Várpalota	VE	47.2	18.1333	11439	4	7726	20688	8516
+8105	Pétfürdő	VE	47.1667	18.1167	34254	5	1732	4813	1896
+8109	Tés	VE	47.2667	18.0333	20570	6	4903	857	419
+8111	Seregélyes	FE	47.1	18.5833	20206	5	7819	4668	1598
+8112	Zichyújfalu	FE	47.1333	18.6833	34263	6	1082	969	273
+8121	Tác	FE	47.0833	18.4	29267	6	4569	1694	565
+8122	Csősz	FE	47.0333	18.4167	06734	6	1711	1074	382
+8123	Soponya	FE	47.0167	18.45	33321	5	4996	2051	690
+8124	Káloz	FE	46.95	18.4833	16683	6	4779	2460	919
+8125	Sárkeresztúr	FE	47	18.55	25344	6	4675	2630	772
+8126	Sárszentágota	FE	46.9667	18.5667	31538	6	4550	1379	510
+8127	Aba	FE	47.0333	18.5167	17376	5	8805	4657	1550
+8130	Enying	FE	46.9333	18.25	02802	4	8278	6982	2601
+8131	Enying	FE	46.9333	18.25	02802	4	8278	6982	2601
+8132	Lepsény	FE	47	18.25	07269	5	3908	3164	1194
+8133	Mezőszentgyörgy	FE	47	18.2833	06576	6	2712	1337	468
+8134	Mátyásdomb	FE	46.9167	18.35	16948	6	3539	750	283
+8135	Dég	FE	46.8667	18.45	32753	6	4686	2136	863
+8136	Lajoskomárom	FE	46.85	18.35	07506	5	7567	2232	892
+8137	Mezőkomárom	FE	46.8333	18.2833	05689	6	2905	964	411
+8138	Szabadhídvég	FE	46.8167	18.2833	18740	6	4410	875	408
+8142	Úrhida	FE	47.1333	18.3333	17622	6	725	2194	742
+8143	Sárszentmihály	FE	47.15	18.3333	11776	6	3740	3015	1061
+8144	Sárkeszi	FE	47.1667	18.2833	02699	6	1479	614	207
+8145	Nádasdladány	FE	47.1333	18.25	13903	6	2635	1834	633
+8146	Jenő	FE	47.1	18.25	15972	6	556	1344	504
+8151	Szabadbattyán	FE	47.1167	18.3833	28705	5	3366	4547	1553
+8152	Kőszárhegy	FE	47.1	18.3333	30650	6	590	1620	571
+8153	Kőszárhegy	FE	47.1	18.3333	30650	6	590	1620	571
+8154	Polgárdi	FE	47.05	18.3	17525	4	7216	6819	2065
+8156	Kisláng	FE	46.9667	18.3833	28990	6	5306	2506	1020
+8157	Füle	FE	47.05	18.25	06114	6	3032	877	399
+8161	Ősi	VE	47.15	18.2	24068	6	3586	2081	749
+8162	Küngös	VE	47.0667	18.1833	04066	6	940	530	182
+8163	Csajág	VE	47.05	18.1833	16072	6	2237	826	317
+8164	Balatonfőkajár	VE	47.0167	18.2167	29461	6	2192	1357	537
+8171	Balatonvilágos	VE	46.9667	18.1667	03559	6	2921	1192	588
+8172	Balatonvilágos	VE	46.9667	18.1667	03559	6	2921	1192	588
+8173	Balatonvilágos	VE	46.9667	18.1667	03559	6	2921	1192	588
+8174	Balatonkenese	VE	47.0333	18.1167	05148	5	6557	3263	1667
+8175	Balatonfűzfő	VE	47.0667	18.05	02219	4	925	4335	1899
+8181	Berhida	VE	47.1167	18.1333	33127	4	4273	6034	2036
+8182	Berhida	VE	47.1167	18.1333	33127	4	4273	6034	2036
+8183	Papkeszi	VE	47.0833	18.0833	07348	6	2239	1605	543
+8184	Papkeszi	VE	47.0833	18.0833	07348	6	2239	1605	543
+8191	Öskü	VE	47.1667	18.0833	25450	6	4830	2325	812
+8192	Hajmáskér	VE	47.15	18.0167	15361	6	3814	3111	1292
+8193	Sóly	VE	47.1333	18.0333	03601	6	1028	471	153
+8194	Vilonya	VE	47.1167	18.0667	15705	6	1350	615	232
+8195	Királyszentistván	VE	47.1	18.05	05421	6	891	467	162
+8196	Litér	VE	47.1	18.0167	04552	6	1283	2055	699
+8200	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8201	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8202	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8204	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8205	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8206	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8207	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8220	Balatonalmádi	VE	47.033	18.0164	05838	4	4988	8886	4167
+8221	Balatonalmádi	VE	47.0333	18.0167	05838	4	4988	8886	4167
+8222	Balatonalmádi	VE	47.0333	18.0167	05838	4	4988	8886	4167
+8225	Szentkirályszabadja	VE	47.05	17.9667	16267	6	2238	2061	677
+8226	Alsóörs	VE	46.9833	17.9833	30526	6	3334	1412	667
+8227	Felsőörs	VE	47.0167	17.95	24369	6	1724	1528	511
+8228	Lovas	VE	47	17.9667	05564	6	594	433	169
+8229	Csopak	VE	46.9833	17.9333	02185	6	2398	1576	788
+8229	Paloznak	VE	46.9833	17.95	17011	6	880	417	173
+8230	Balatonfüred	VE	46.95	17.8833	21175	4	4645	13422	5654
+8230	Balatonszőlős	VE	46.9616	17.875	28501	6	1281	602	176
+8231	Balatonszőlős	VE	46.9667	17.8333	28501	6	1281	602	176
+8232	Balatonszőlős	VE	46.9667	17.8333	28501	6	1281	602	176
+8233	Balatonszőlős	VE	46.9667	17.8333	28501	6	1281	602	176
+8236	Balatonszőlős	VE	46.9667	17.8333	28501	6	1281	602	176
+8237	Tihany	VE	46.9167	17.9	30465	6	2733	1369	653
+8241	Aszófő	VE	46.9333	17.8333	07339	6	832	413	160
+8242	Örvényes	VE	46.9167	17.8167	10092	6	446	154	81
+8242	Balatonudvari	VE	46.9	17.8167	15565	6	1880	284	148
+8243	Balatonakali	VE	46.8833	17.75	25308	6	3620	632	277
+8244	Dörgicse	VE	46.9167	17.7167	06363	6	1912	262	130
+8245	Pécsely	VE	46.95	17.7833	22451	6	2001	539	215
+8245	Vászoly	VE	46.9333	17.7667	16656	6	855	201	96
+8246	Tótvázsony	VE	47.0167	17.7833	02714	6	4250	1192	446
+8247	Hidegkút	VE	47	17.8333	20756	6	1358	458	171
+8248	Veszprémfajsz	VE	47.0333	17.9	21430	6	1174	274	93
+8248	Nemesvámos	VE	47.05	17.8833	02194	6	4077	2517	881
+8251	Zánka	VE	46.8833	17.6833	20826	6	1955	937	428
+8252	Balatonszepezd	VE	46.85	17.6667	17154	6	2506	399	213
+8253	Révfülöp	VE	46.8333	17.6333	05625	5	1036	1127	551
+8254	Kővágóörs	VE	46.85	17.6	23454	6	2209	828	371
+8254	Kékkút	VE	46.85	17.5667	26037	6	368	86	36
+8255	Balatonrendes	VE	46.8333	17.5833	33844	6	676	119	66
+8256	Salföld	VE	46.8333	17.55	30793	6	518	50	39
+8256	Ábrahámhegy	VE	46.8167	17.5667	04561	6	1488	440	228
+8257	Salföld	VE	46.8333	17.55	30793	6	518	50	39
+8258	Badacsonytomaj	VE	46.8	17.5167	22327	4	3271	2178	1068
+8261	Badacsonytomaj	VE	46.8	17.5167	22327	4	3271	2178	1068
+8263	Badacsonytördemic	VE	46.8167	17.4833	03267	6	1025	834	437
+8264	Szigliget	VE	46.8	17.4333	24891	6	3426	857	441
+8265	Hegymagas	VE	46.8333	17.4333	25803	6	789	243	153
+8271	Mencshely	VE	46.95	17.7	27137	6	1261	249	122
+8272	Balatoncsicsó	VE	46.9333	17.6667	03072	6	1320	199	98
+8272	Szentjakabfa	VE	46.9333	17.6667	11545	6	576	107	47
+8272	Szentantalfa	VE	46.9167	17.6833	03568	6	661	412	123
+8272	Óbudavár	VE	46.9333	17.7	23913	6	323	56	30
+8272	Tagyon	VE	46.9	17.6833	17039	6	276	89	38
+8273	Monoszló	VE	46.9	17.65	22512	6	746	132	67
+8274	Köveskál	VE	46.8833	17.6	25858	6	1449	384	177
+8275	Balatonhenye	VE	46.9167	17.6167	03638	6	1173	124	66
+8281	Szentbékkálla	VE	46.8833	17.5667	07092	6	1070	193	105
+8282	Mindszentkálla	VE	46.8667	17.55	04534	6	1084	312	143
+8283	Káptalantóti	VE	46.85	17.5167	05634	6	1173	436	190
+8284	Kisapáti	VE	46.85	17.4667	07931	6	689	372	139
+8284	Nemesgulács	VE	46.8333	17.4833	02787	6	835	998	417
+8286	Gyulakeszi	VE	46.8667	17.4833	09520	6	967	732	256
+8291	Vöröstó	VE	46.9667	17.7167	11703	6	619	100	53
+8291	Barnag	VE	46.9833	17.75	15778	6	1201	123	83
+8291	Nagyvázsony	VE	46.9833	17.7	19196	6	7629	1742	679
+8291	Pula	VE	47	17.65	11420	6	1464	218	96
+8292	Öcs	VE	47	17.6167	28112	6	1370	208	110
+8294	Kapolcs	VE	46.95	17.6167	14553	6	1397	422	219
+8294	Vigántpetend	VE	46.9667	17.6333	09733	6	1119	210	108
+8295	Taliándörögd	VE	46.9833	17.5667	17321	6	2808	718	296
+8296	Hegyesd	VE	46.9167	17.5167	02422	6	1105	164	87
+8296	Monostorapáti	VE	46.9167	17.5667	24040	6	2555	1083	473
+8297	Hegyesd	VE	46.9167	17.5167	02422	6	1105	164	87
+8300	Raposka	VE	46.8806	17.4362	03948	6	490	233	107
+8300	Tapolca	VE	46.8833	17.4333	29434	4	6348	16211	6854
+8301	Raposka	VE	46.85	17.4333	03948	6	490	233	107
+8302	Raposka	VE	46.85	17.4333	03948	6	490	233	107
+8303	Raposka	VE	46.85	17.4333	03948	6	490	233	107
+8308	Zalahaláp	VE	46.9167	17.4667	12654	6	2413	1285	413
+8308	Sáska	VE	46.9333	17.4833	13772	6	3747	269	122
+8311	Nemesvita	VE	46.8167	17.3667	28422	6	925	356	180
+8312	Balatonederics	VE	46.8167	17.3833	12238	6	1858	1053	458
+8313	Balatongyörök	ZA	46.75	17.3667	17002	6	3759	999	448
+8314	Vonyarcvashegy	ZA	46.75	17.3167	12919	5	1428	2192	885
+8315	Gyenesdiás	ZA	46.7667	17.2833	23302	5	1850	3478	1362
+8316	Vállus	ZA	46.85	17.3	10685	6	2180	131	60
+8316	Várvölgy	ZA	46.8667	17.3	14182	6	2504	1083	463
+8318	Lesencefalu	VE	46.85	17.35	17570	6	719	309	152
+8318	Lesencetomaj	VE	46.85	17.3667	17871	6	2408	1102	369
+8319	Lesenceistvánd	VE	46.8667	17.35	21962	6	864	960	387
+8321	Uzsa	VE	46.9	17.3333	34218	6	2024	323	162
+8330	Sümeg	VE	46.9833	17.2833	25593	4	6413	6423	2533
+8331	Sümeg	VE	46.9833	17.2833	25593	4	6413	6423	2533
+8341	Szalapa	ZA	46.9833	17.15	20543	6	452	216	93
+8341	Kisvásárhely	ZA	47	17.2	16364	6	435	58	38
+8341	Mihályfa	ZA	46.9833	17.1833	02130	6	1207	371	181
+8342	Óhíd	ZA	46.9667	17.1833	27775	6	1248	594	249
+8344	Hetyefő	VE	47.05	17.1667	15088	6	411	93	50
+8344	Zalaerdőd	VE	47.05	17.1333	29993	6	1769	273	161
+8345	Dabronc	VE	47.0333	17.1667	17172	6	2027	463	207
+8346	Gógánfa	VE	47.0167	17.1833	18193	6	1317	787	312
+8347	Ukk	VE	47.05	17.2167	23010	6	1387	298	168
+8348	Megyer	VE	47.0667	17.2	04987	6	426	29	25
+8348	Zalameggyes	VE	47.0833	17.2167	33039	6	256	64	34
+8348	Rigács	VE	47.0667	17.2167	25849	6	617	196	111
+8349	Zalagyömörő	VE	47.0167	17.2333	27207	6	1111	444	194
+8351	Sümegprága	VE	46.9333	17.2833	05388	6	579	637	248
+8352	Bazsi	VE	46.9333	17.25	07427	6	910	407	205
+8353	Vindornyalak	ZA	46.8833	17.2	06549	6	449	83	50
+8353	Zalaszántó	ZA	46.8833	17.2333	33288	6	3773	972	545
+8354	Karmacs	ZA	46.8333	17.1833	18041	6	1422	769	358
+8354	Zalaköveskút	ZA	46.85	17.15	18768	6	227	23	19
+8354	Vindornyafok	ZA	46.85	17.1833	32142	6	350	127	71
+8355	Vindornyaszőlős	ZA	46.9	17.1667	11800	6	1055	380	172
+8356	Nagygörbő	ZA	46.9333	17.1833	05218	6	745	194	115
+8356	Kisgörbő	ZA	46.9333	17.1667	09812	6	659	174	104
+8357	Döbröce	ZA	46.9333	17.2	07782	6	270	70	47
+8357	Sümegcsehi	ZA	46.95	17.2167	21397	6	1744	628	240
+8360	Keszthely	ZA	46.7658	17.2574	18421	4	7598	21100	9903
+8361	Keszthely	ZA	46.7667	17.25	18421	4	7598	21100	9903
+8362	Keszthely	ZA	46.7667	17.25	18421	4	7598	21100	9903
+8363	Keszthely	ZA	46.7667	17.25	18421	4	7598	21100	9903
+8364	Keszthely	ZA	46.7667	17.25	18421	4	7598	21100	9903
+8371	Nemesbük	ZA	46.8167	17.15	32948	6	998	651	350
+8372	Cserszegtomaj	ZA	46.8	17.2167	07135	6	1260	2581	1016
+8373	Rezi	ZA	46.85	17.2167	23898	6	2978	1190	506
+8380	Felsőpáhok	ZA	46.7899	17.1838	11642	6	727	649	294
+8380	Hévíz	ZA	46.7833	17.1667	03814	4	831	4335	3626
+8381	Felsőpáhok	ZA	46.7833	17.1667	11642	6	727	649	294
+8391	Sármellék	ZA	46.7167	17.1667	14906	6	3537	1862	770
+8392	Zalavár	ZA	46.6667	17.1667	13736	6	3106	923	414
+8393	Szentgyörgyvár	ZA	46.75	17.1333	23126	6	1166	324	161
+8394	Alsópáhok	ZA	46.7667	17.1833	32081	6	1802	1326	597
+8400	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8401	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8403	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8404	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8408	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8409	Úrkút	VE	47.0833	17.6333	20853	6	2013	2115	746
+8411	Úrkút	VE	47.0833	17.6333	20853	6	2013	2115	746
+8412	Úrkút	VE	47.0833	17.6333	20853	6	2013	2115	746
+8413	Eplény	VE	47.2167	17.9167	33941	6	828	512	182
+8414	Olaszfalu	VE	47.2333	17.9167	26514	6	4280	1107	390
+8415	Nagyesztergár	VE	47.2833	17.9	23180	6	1829	1251	404
+8416	Dudar	VE	47.3	17.95	02936	6	2458	1631	642
+8417	Csetény	VE	47.3167	18	31699	6	1837	1909	701
+8418	Bakonyoszlop	VE	47.35	17.9333	30410	6	1420	526	211
+8419	Csesznek	VE	47.35	17.8833	24642	6	2420	541	206
+8420	Zirc	VE	47.2667	17.8667	26499	4	3740	7093	2660
+8422	Bakonynána	VE	47.2833	17.9667	25991	6	1493	1011	392
+8423	Szápár	VE	47.3167	18.0333	16489	6	709	520	198
+8424	Jásd	VE	47.2833	18.0333	17437	6	1028	804	355
+8425	Lókút	VE	47.2	17.8667	18856	6	1811	505	191
+8426	Pénzesgyőr	VE	47.2333	17.7833	15547	6	1765	353	153
+8427	Bakonybél	VE	47.25	17.7333	23746	6	2436	1259	581
+8428	Borzavár	VE	47.3	17.8333	30252	6	1300	732	344
+8429	Porva	VE	47.3167	17.8167	23515	6	2813	461	186
+8430	Bakonyszentkirály	VE	47.3667	17.8833	22813	6	2790	875	378
+8431	Bakonyszentlászló	VE	47.4	17.825	05944	6	3851	1790	773
+8432	Fenyőfő	VE	47.4	17.825	30678	6	2965	119	78
+8433	Bakonygyirót	VE	47.4	17.825	28936	6	685	144	117
+8434	Románd	VE	47.4	17.825	17507	6	985	301	143
+8435	Gic	VE	47.4333	17.7667	16717	6	1968	471	151
+8436	Bakonypéterd	VE	47.4	17.825	22062	6	1002	265	124
+8437	Lázi	VE	47.4	17.825	04376	6	1679	568	239
+8438	Veszprémvarsány	VE	47.4	17.825	22691	6	2119	997	424
+8439	Sikátor	VE	47.4	17.825	08606	6	1374	304	144
+8440	Herend	VE	47.1333	17.75	23658	4	1956	3489	1290
+8441	Márkó	VE	47.1167	17.8167	32212	6	3441	1143	379
+8442	Hárskút	VE	47.1833	17.8167	25566	6	3446	671	230
+8443	Bánd	VE	47.1167	17.8	14173	6	984	696	236
+8444	Szentgál	VE	47.1167	17.7333	07922	6	9501	2765	1012
+8445	Csehbánya	VE	47.1833	17.6833	20251	6	1283	280	123
+8445	Városlőd	VE	47.15	17.65	07065	6	2227	1436	513
+8446	Kislőd	VE	47.15	17.6167	30173	6	3818	1246	439
+8447	Kislőd	VE	47.15	17.6167	30173	6	3818	1246	439
+8448	Kislőd	VE	47.15	17.6167	30173	6	3818	1246	439
+8449	Magyarpolány	VE	47.1667	17.55	20437	6	2697	1138	493
+8451	Magyarpolány	VE	47.1667	17.55	20437	6	2697	1138	493
+8452	Halimba	VE	47.0333	17.5333	07898	6	1262	1152	435
+8452	Szőc	VE	47.0167	17.5167	16692	6	755	439	108
+8454	Nyirád	VE	47	17.45	24004	6	6136	1949	749
+8455	Pusztamiske	VE	47.0667	17.45	28972	6	1782	413	154
+8456	Noszlop	VE	47.1833	17.4667	14757	6	3406	1068	419
+8457	Bakonypölöske	VE	47.2	17.4833	06327	6	1104	387	163
+8458	Oroszi	VE	47.15	17.4167	16595	6	474	138	89
+8460	Devecser	VE	47.1	17.4333	32276	4	6411	4806	1883
+8461	Devecser	VE	47.1	17.4333	32276	4	6411	4806	1883
+8468	Kolontár	VE	47.0833	17.4833	30182	6	2172	804	262
+8469	Kamond	VE	47.1333	17.2	19141	6	2050	421	159
+8471	Nemeshany	VE	47.0667	17.3667	05555	6	1050	415	161
+8471	Káptalanfa	VE	47.0667	17.35	14270	6	3371	877	316
+8471	Bodorfa	VE	47.0667	17.3333	04321	6	222	109	55
+8473	Gyepükaján	VE	47.05	17.3333	28671	6	911	363	158
+8474	Csabrendek	VE	47.0167	17.3	30924	6	4494	3032	1099
+8475	Hosztót	VE	47.0833	17.25	07250	6	727	76	62
+8475	Veszprémgalsa	VE	47.1	17.2833	19336	6	871	288	141
+8475	Szentimrefalva	VE	47.0667	17.2833	10065	6	1087	200	101
+8476	Zalaszegvár	VE	47.1	17.2333	23597	6	684	154	77
+8477	Apácatorna	VE	47.1167	17.3	28370	6	729	171	84
+8477	Tüskevár	VE	47.1167	17.3167	04631	6	1701	571	269
+8477	Kisberzseny	VE	47.1	17.2667	29072	6	529	90	59
+8478	Somlójenő	VE	47.1167	17.3667	05157	6	815	318	142
+8479	Borszörcsök	VE	47.1333	17.4	04765	6	1180	375	156
+8481	Somlóvásárhely	VE	47.1167	17.3833	26569	6	2321	1121	453
+8482	Doba	VE	47.1667	17.3833	10870	6	2122	502	261
+8483	Kisszőlős	VE	47.2	17.3333	23001	6	649	132	72
+8483	Somlószőlős	VE	47.1667	17.3667	25779	6	1946	672	322
+8484	Vid	VE	47.2167	17.35	09502	6	317	130	67
+8484	Somlóvecse	VE	47.2	17.35	14243	6	493	102	62
+8484	Nagyalásony	VE	47.2333	17.35	27979	6	1401	514	215
+8485	Dabrony	VE	47.25	17.3333	28237	6	1700	376	197
+8491	Karakószörcsök	VE	47.1333	17.2833	08749	6	711	329	133
+8492	Kerta	VE	47.1667	17.2833	25654	6	1546	635	252
+8493	Iszkáz	VE	47.1667	17.3	28015	6	1574	350	208
+8494	Kiscsősz	VE	47.2	17.2833	23700	6	904	129	85
+8495	Csögle	VE	47.2167	17.2667	32814	6	1691	647	314
+8496	Kispirit	VE	47.2	17.25	04288	6	496	99	68
+8496	Nagypirit	VE	47.2	17.2333	21403	6	1017	278	159
+8497	Adorjánháza	VE	47.2333	17.25	31307	6	1142	381	206
+8497	Egeralja	VE	47.2333	17.25	33871	6	894	230	116
+8500	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8501	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8502	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8503	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8505	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8510	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8511	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8512	Nyárád	VE	47.2833	17.3667	29009	6	1979	909	357
+8513	Mihályháza	VE	47.3	17.3333	04668	6	2152	771	317
+8514	Mezőlak	VE	47.3333	17.3667	23560	6	2158	1055	391
+8515	Békás	VE	47.3333	17.35	27058	6	652	214	97
+8516	Kemeneshőgyész	VE	47.35	17.3	19734	6	2608	508	240
+8517	Magyargencs	VE	47.3667	17.3	26374	6	3801	556	278
+8518	Kemenesszentpéter	VE	47.4333	17.2333	12478	6	2135	647	327
+8521	Nagyacsád	VE	47.3667	17.3667	23551	6	1396	666	261
+8522	Nemesgörzsöny	VE	47.4	17.3667	05652	6	1925	698	298
+8523	Egyházaskesző	VE	47.4167	17.3333	10445	6	2012	497	246
+8523	Várkesző	VE	47.4333	17.3167	26204	6	641	187	112
+8531	Várkesző	VE	47.4333	17.3167	26204	6	641	187	112
+8532	Marcaltő	VE	47.4333	17.3667	22220	6	2209	813	338
+8533	Malomsok	VE	47.45	17.4	03610	6	2574	546	262
+8534	Csikvánd	GS	47.4667	17.45	13505	6	1453	488	228
+8541	Takácsi	VE	47.4	17.4833	13125	6	1913	857	350
+8542	Vaszar	VE	47.4	17.5167	26648	6	3369	1512	650
+8543	Gecse	VE	47.45	17.5333	09292	6	934	425	202
+8544	Szerecseny	GS	47.4667	17.55	03887	6	1239	813	375
+8545	Gyarmat	GS	47.4667	17.5	26860	6	2245	1232	555
+8551	Nagygyimót	VE	47.3333	17.55	08262	6	2344	548	249
+8552	Vanyola	VE	47.3833	17.5833	21777	6	1951	571	276
+8553	Lovászpatona	VE	47.4333	17.6333	05087	6	4990	1161	520
+8554	Nagydém	VE	47.4333	17.6833	10001	6	1332	383	158
+8555	Bakonytamási	VE	47.4167	17.7333	24129	6	2049	665	291
+8556	Pápateszér	VE	47.3833	17.7	31255	6	3074	1201	485
+8557	Bakonyság	VE	47.4	17.65	29902	6	856	50	51
+8557	Bakonyszentiván	VE	47.4	17.6667	23922	6	914	227	117
+8558	Csót	VE	47.3667	17.6167	32878	6	2002	1049	380
+8561	Adásztevel	VE	47.3	17.55	07302	6	837	785	320
+8562	Nagytevel	VE	47.3	17.5667	25201	6	1441	531	226
+8563	Homokbödöge	VE	47.3	17.6	27818	6	1615	694	298
+8564	Ugod	VE	47.3167	17.6	24767	6	6279	1456	599
+8565	Béb	VE	47.35	17.6	22901	6	704	257	106
+8571	Bakonykoppány	VE	47.3333	17.6833	07287	6	683	186	119
+8572	Bakonyszücs	VE	47.3333	17.6833	26417	6	3521	344	157
+8581	Németbánya	VE	47.2167	17.65	10409	6	1219	70	66
+8581	Bakonyjákó	VE	47.2167	17.6	29513	6	4718	659	255
+8582	Farkasgyepű	VE	47.2	17.6333	10250	6	1005	407	150
+8591	Farkasgyepű	VE	47.2	17.6333	10250	6	1005	407	150
+8591	Nóráp	VE	47.2667	17.4667	26523	6	758	196	87
+8592	Dáka	VE	47.2833	17.4333	20154	6	2540	673	178
+8593	Pápadereske	VE	47.3	17.4	19868	6	575	278	104
+8594	Pápasalamon	VE	47.2333	17.4333	21607	6	1396	336	176
+8595	Kup	VE	47.25	17.4667	26541	6	2478	443	179
+8596	Pápakovácsi	VE	47.2667	17.4833	11855	6	1392	545	186
+8597	Ganna	VE	47.2333	17.5333	12742	6	1547	258	96
+8597	Döbrönte	VE	47.2333	17.55	29470	6	1079	256	100
+8598	Döbrönte	VE	47.2333	17.55	29470	6	1079	256	100
+8600	Siófok	SO	46.9058	18.0485	17631	4	12466	24221	11710
+8601	Siófok	SO	46.9	18.05	17631	4	12466	24221	11710
+8602	Siófok	SO	46.9	18.05	17631	4	12466	24221	11710
+8604	Siófok	SO	46.9	18.05	17631	4	12466	24221	11710
+8609	Siófok	SO	46.9	18.05	17631	4	12466	24221	11710
+8611	Siófok	SO	46.9	18.05	17631	4	12466	24221	11710
+8612	Nyim	SO	46.8	18.1167	03203	6	976	295	145
+8613	Balatonendréd	SO	46.8333	17.9833	19460	6	4002	1386	557
+8614	Bálványos	SO	46.7833	17.95	24457	6	2369	541	266
+8617	Kőröshegy	SO	46.8333	17.9	15510	6	2170	1610	722
+8618	Kereki	SO	46.8	17.9167	04598	6	1443	562	214
+8619	Pusztaszemes	SO	46.7667	17.9333	23311	6	1039	386	183
+8621	Zamárdi	SO	46.8833	17.95	06008	4	4515	2385	1052
+8622	Szántód	SO	46.8667	17.9	34236	6	760	354	259
+8623	Balatonföldvár	SO	46.85	17.8833	07117	4	1532	2071	1166
+8624	Balatonszárszó	SO	46.8333	17.8333	24907	5	3013	1903	918
+8625	Szólád	SO	46.7833	17.85	15194	6	1998	583	300
+8626	Teleki	SO	46.7667	17.8333	23968	6	805	202	85
+8627	Kötcse	SO	46.75	17.8667	18148	6	1954	496	236
+8628	Nagycsepely	SO	46.75	17.8333	20598	6	1980	367	168
+8630	Balatonboglár	SO	46.7667	17.6667	33853	4	3204	5920	2784
+8631	Balatonboglár	SO	46.7667	17.6667	33853	4	3204	5920	2784
+8634	Balatonboglár	SO	46.7667	17.6667	33853	4	3204	5920	2784
+8635	Ordacsehi	SO	46.7333	17.6167	16823	6	2256	766	342
+8636	Balatonszemes	SO	46.8167	17.7833	22822	6	3602	1782	716
+8637	Balatonőszöd	SO	46.8	17.8	11916	6	1508	531	334
+8638	Balatonlelle	SO	46.7833	17.6833	33862	4	4323	4911	2297
+8640	Fonyód	SO	46.7333	17.55	14632	4	5355	4965	2580
+8641	Birján	SO	46.7111	17.4194	05139	6	907	492	198
+8642	Birján	SO	46.7111	17.4194	05139	6	907	492	198
+8644	Birján	SO	46.7111	17.4194	05139	6	907	492	198
+8646	Balatonfenyves	SO	46.7167	17.5	20729	6	5193	1856	1076
+8647	Balatonmáriafürdő	SO	46.7	17.3833	14562	6	2677	646	390
+8647	Balatonkeresztúr	SO	46.7	17.3833	07375	6	2106	1486	688
+8648	Balatonkeresztúr	SO	46.7	17.3833	07375	6	2106	1486	688
+8649	Balatonberény	SO	46.7167	17.3167	27377	6	2609	1155	672
+8651	Balatonszabadi	SO	46.8833	18.1333	16601	6	4134	3022	1139
+8652	Siójut	SO	46.8833	18.1333	23092	6	1073	593	234
+8653	Ádánd	SO	46.8667	18.1667	06080	6	2952	2294	865
+8654	Ságvár	SO	46.8333	18.1167	14942	6	3844	1905	695
+8655	Som	SO	46.8	18.15	04127	6	2335	688	266
+8656	Nagyberény	SO	46.8	18.1667	29063	6	2314	1357	603
+8658	Bábonymegyer	SO	46.75	18.1167	28316	6	2193	820	366
+8660	Tab	SO	46.7333	18.0333	08590	4	2586	4504	1931
+8660	Zala	SO	46.7333	18	11466	6	924	253	133
+8660	Torvaj	SO	46.7667	18.05	10153	6	1142	273	150
+8660	Sérsekszőlős	SO	46.7667	18.0167	32133	6	665	150	71
+8660	Lulla	SO	46.7833	18.0333	10010	6	1039	251	94
+8666	Bedegkér	SO	46.65	18.0667	20710	6	2600	457	248
+8666	Somogyegres	SO	46.6667	18.0333	20057	6	1081	195	132
+8667	Kánya	SO	46.7	18.0667	05272	6	1452	437	224
+8668	Tengőd	SO	46.7	18.1	32416	6	3021	509	273
+8669	Miklósi	SO	46.65	18	33376	6	1047	234	124
+8671	Kapoly	SO	46.7333	17.9667	33394	6	2237	699	345
+8672	Zics	SO	46.6833	17.9833	33057	6	1501	365	193
+8673	Somogymeggyes	SO	46.7167	17.9167	12876	6	1565	539	241
+8674	Nágocs	SO	46.6667	17.9667	15909	6	2226	664	248
+8675	Andocs	SO	46.65	17.9333	28714	6	4327	1117	476
+8676	Karád	SO	46.6833	17.85	05263	6	5238	1549	847
+8681	Visz	SO	46.7333	17.7833	06877	6	602	200	103
+8681	Látrány	SO	46.75	17.75	14863	6	2231	1350	577
+8683	Somogytúr	SO	46.7	17.7667	32601	6	3530	438	195
+8684	Somogybabod	SO	46.6667	17.7833	32470	6	1058	501	239
+8685	Gamás	SO	46.6167	17.7667	06451	6	4292	758	387
+8691	Gamás	SO	46.6167	17.7667	06451	6	4292	758	387
+8692	Gyugy	SO	46.6833	17.6833	23904	6	1531	277	139
+8692	Szőlősgyörök	SO	46.7167	17.6833	11101	6	1863	1218	486
+8693	Kisberény	SO	46.6333	17.6667	30827	6	746	210	81
+8693	Lengyeltóti	SO	46.6667	17.65	26675	4	3957	3334	1239
+8694	Hács	SO	46.65	17.6833	18634	6	2128	388	193
+8695	Buzsák	SO	46.65	17.5833	17358	6	5968	1328	706
+8696	Táska	SO	46.6167	17.5333	13693	6	2598	410	191
+8697	Öreglak	SO	46.6	17.6167	07056	6	2072	1641	587
+8698	Pamuk	SO	46.55	17.65	26392	6	1196	246	127
+8698	Somogyvár	SO	46.5833	17.6667	19442	6	5299	1911	725
+8699	Somogyvámos	SO	46.5667	17.6833	21856	6	2502	757	322
+8700	Csömend	SO	46.5667	17.5	27270	6	866	302	131
+8700	Marcali	SO	46.5833	17.4167	18500	4	10440	11838	4975
+8701	Csömend	SO	46.5667	17.5	27270	6	866	302	131
+8705	Somogyszentpál	SO	46.65	17.4833	06600	6	2896	757	374
+8706	Nikla	SO	46.5833	17.5167	10959	6	2335	709	323
+8707	Pusztakovácsi	SO	46.5333	17.5833	19026	6	4338	875	349
+8707	Libickozma	SO	46.5167	17.5333	32355	6	2297	39	50
+8708	Somogyfajsz	SO	46.5167	17.5667	18078	6	1826	533	219
+8709	Somogyfajsz	SO	46.5167	17.5667	18078	6	1826	533	219
+8710	Balatonszentgyörgy	SO	46.6833	17.3	21324	6	2368	1610	695
+8711	Vörs	SO	46.6667	17.2667	09645	6	2265	450	276
+8712	Balatonújlak	SO	46.6667	17.3833	16470	6	1081	507	261
+8713	Kéthely	SO	46.65	17.4	11174	6	4906	2370	875
+8714	Kéthely	SO	46.65	17.4	11174	6	4906	2370	875
+8714	Kelevíz	SO	46.5167	17.4167	17446	6	491	340	128
+8716	Gadány	SO	46.5167	17.4	26222	6	1970	387	161
+8716	Mesztegnyő	SO	46.5	17.4333	16106	6	4471	1406	557
+8716	Hosszúvíz	SO	46.5167	17.45	30775	6	710	43	35
+8717	Szenyér	SO	46.4667	17.3833	30146	6	2019	311	147
+8717	Nemeskisfalud	SO	46.4333	17.3667	25511	6	282	103	46
+8718	Tapsony	SO	46.4667	17.3333	24615	6	3161	697	402
+8719	Böhönye	SO	46.4	17.4	26532	6	6417	2383	948
+8721	Vése	SO	46.4167	17.3	08183	6	4292	778	337
+8722	Nemesdéd	SO	46.4333	17.25	07913	6	2661	718	325
+8723	Varászló	SO	46.4333	17.2167	09274	6	1276	146	80
+8724	Inke	SO	46.4	17.2	26301	6	5176	1277	446
+8725	Iharosberény	SO	46.3667	17.1167	27784	6	4966	1272	477
+8726	Somogycsicsó	SO	46.3167	17.1333	11484	6	1238	165	98
+8726	Iharos	SO	46.3333	17.1	19619	6	2268	477	208
+8728	Pogányszentpéter	SO	46.3833	17.0667	27553	6	1315	497	169
+8731	Hollád	SO	46.6333	17.3167	06211	6	820	235	161
+8731	Tikos	SO	46.6333	17.3	17844	6	335	127	55
+8732	Főnyed	SO	46.6333	17.2667	22707	6	573	74	53
+8732	Sávoly	SO	46.5833	17.2667	02051	6	2684	513	229
+8732	Szegerdő	SO	46.6333	17.2833	18607	6	546	226	107
+8733	Somogysámson	SO	46.5833	17.3	15626	6	2177	776	284
+8734	Somogyzsitfa	SO	46.5667	17.3	04835	6	2722	637	312
+8735	Csákány	SO	46.5333	17.2833	03799	6	1609	279	191
+8736	Szőkedencs	SO	46.55	17.25	05810	6	1869	288	185
+8737	Somogysimonyi	SO	46.4833	17.2167	27535	6	1582	88	37
+8738	Nemesvid	SO	46.5	17.2667	17561	6	1838	724	335
+8739	Nagyszakácsi	SO	46.4833	17.3167	25520	6	2137	472	287
+8741	Zalaapáti	ZA	46.7333	17.1167	17400	6	2342	1653	605
+8741	Bókaháza	ZA	46.7667	17.1	19929	6	670	313	147
+8742	Esztergályhorváti	ZA	46.7	17.1167	15769	6	1670	462	201
+8743	Zalaszabar	ZA	46.65	17.1167	22947	6	1695	554	269
+8744	Orosztony	ZA	46.6333	17.0667	25052	6	1845	478	226
+8745	Kerecseny	ZA	46.6167	17.05	31529	6	1283	289	166
+8746	Nagyrada	ZA	46.6167	17.1167	16513	6	1285	496	204
+8747	Garabonc	ZA	46.5833	17.1333	12946	6	1856	739	265
+8747	Zalamerenye	ZA	46.5667	17.1	31617	6	1399	165	141
+8749	Zalakaros	ZA	46.5667	17.1333	11785	4	1717	1764	928
+8751	Zalakomár	ZA	46.55	17.1833	10348	6	5488	3076	1049
+8752	Zalakomár	ZA	46.55	17.1833	10348	6	5488	3076	1049
+8753	Balatonmagyaród	ZA	46.6	17.1833	26462	6	3153	496	259
+8754	Galambok	ZA	46.5167	17.1333	12991	6	2591	1277	527
+8756	Kisrécse	ZA	46.5	17.0667	32726	6	342	198	103
+8756	Csapi	ZA	46.5333	17.1	06132	6	1011	181	86
+8756	Zalasárszeg	ZA	46.5	17.0833	02972	6	304	122	43
+8756	Nagyrécse	ZA	46.4833	17.05	14979	6	2699	1107	374
+8761	Zalaigrice	ZA	46.75	17.0167	16896	6	773	115	63
+8761	Pacsa	ZA	46.7167	17.0167	31741	5	2270	1831	711
+8762	Gétye	ZA	46.7667	17.0667	20039	6	666	117	94
+8762	Szentpéterúr	ZA	46.7667	17.0333	11165	6	1596	1054	444
+8764	Dióskál	ZA	46.6667	17.05	28778	6	1963	492	256
+8764	Zalaszentmárton	ZA	46.7	17.0667	13091	6	498	76	39
+8765	Egeraracsa	ZA	46.6667	17.0833	24262	6	703	325	169
+8767	Pötréte	ZA	46.6833	16.95	24660	6	1412	264	147
+8767	Felsőrajk	ZA	46.6833	17	21476	6	2055	760	327
+8767	Alsórajk	ZA	46.65	17	18829	6	845	365	176
+8771	Hahót	ZA	46.6425	16.9236	10269	6	3901	1137	494
+8772	Zalaszentbalázs	ZA	46.5878	16.9186	18564	6	2099	843	349
+8772	Börzönce	ZA	46.5833	16.9	21139	6	560	63	35
+8773	Pölöskefő	ZA	46.6	16.95	31112	6	1232	396	158
+8773	Kacorlak	ZA	46.5667	16.9667	22965	6	760	230	90
+8774	Kilimán	ZA	46.6333	17	32267	6	572	246	102
+8774	Gelse	ZA	46.6	17	12089	6	2245	1080	462
+8774	Gelsesziget	ZA	46.5667	17	09089	6	498	271	96
+8776	Magyarszerdahely	ZA	46.55	16.9333	13064	6	1622	519	171
+8776	Bocska	ZA	46.55	16.9167	31291	6	738	374	143
+8776	Magyarszentmiklós	ZA	46.5344	16.9383	02909	6	419	277	103
+8777	Fűzvölgy	ZA	46.5167	16.95	16531	6	314	145	51
+8777	Homokkomárom	ZA	46.5	16.9167	24873	6	1670	217	79
+8777	Hosszúvölgy	ZA	46.5167	16.9333	11208	6	360	171	78
+8778	Újudvar	ZA	46.5333	17	32197	6	1631	941	373
+8782	Ligetfalva	ZA	46.8333	17.0667	28200	6	473	60	35
+8782	Zalacsány	ZA	46.8	17.1167	04002	6	1607	1005	384
+8782	Tilaj	ZA	46.8	17.05	27951	6	816	203	97
+8784	Kehidakustány	ZA	46.85	17.1	32902	6	1975	1159	645
+8785	Kallósd	ZA	46.8667	17.0667	05537	6	541	90	68
+8785	Kehidakustány	ZA	46.85	17.1	32902	6	1975	1159	645
+8788	Zalaszentlászló	ZA	46.8833	17.1167	07232	6	1967	858	325
+8788	Sénye	ZA	46.9	17.1333	14085	6	304	43	33
+8789	Sénye	ZA	46.9	17.1333	14085	6	304	43	33
+8790	Zalaszentgrót	ZA	46.95	17.0833	32522	4	8162	7313	3048
+8792	Zalavég	ZA	47	17.0333	17057	6	1211	416	228
+8793	Zalavég	ZA	47	17.0333	17057	6	1211	416	228
+8795	Zalavég	ZA	47	17.0333	17057	6	1211	416	228
+8796	Türje	ZA	46.9833	17.1	12609	6	3823	1713	690
+8797	Batyk	ZA	46.9833	17.0333	24864	6	809	407	192
+8798	Zalabér	ZA	46.9667	17.0333	24280	6	1278	718	334
+8799	Dötk	ZA	46.95	17.0167	16009	6	172	26	22
+8799	Pakod	ZA	46.9667	17	24271	6	1255	982	354
+8800	Nagykanizsa	ZA	46.4618	17.0102	30933	3	14840	50540	21648
+8801	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8802	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8803	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8804	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8808	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8809	Nagykanizsa	ZA	46.5142	16.9717	30933	3	14840	50540	21648
+8821	Nagybakónak	ZA	46.55	17.05	12760	6	1794	401	226
+8822	Zalaújlak	ZA	46.55	17.0833	09380	6	964	108	81
+8824	Sand	ZA	46.4167	17.1333	15556	6	748	419	197
+8825	Miháld	ZA	46.45	17.1333	27526	6	2164	847	373
+8825	Pat	ZA	46.4333	17.1833	29656	6	833	228	134
+8827	Zalaszentjakab	ZA	46.4833	17.1333	18096	6	701	375	141
+8831	Zalaszentjakab	ZA	46.4833	17.1333	18096	6	701	375	141
+8831	Liszó	ZA	46.3667	17	25025	6	2591	419	166
+8834	Murakeresztúr	ZA	46.3522	16.8781	25210	6	1171	1780	687
+8835	Fityeház	ZA	46.3667	16.9167	19187	6	650	667	248
+8840	Csurgónagymarton	SO	46.3	17.0833	10603	6	1482	192	85
+8840	Csurgó	SO	46.2667	17.1	21315	4	5942	5290	2109
+8849	Szenta	SO	46.25	17.1833	11509	6	6447	391	172
+8851	Gyékényes	SO	46.2378	17.0053	30960	6	3376	1010	469
+8852	Zákány	SO	46.2744	16.9511	14623	6	909	1044	590
+8852	Gyékényes	SO	46.2378	17.0053	30960	6	3376	1010	469
+8853	Zákányfalu	SO	46.2858	16.9926	34403	6	670	651	243
+8854	Őrtilos	SO	46.2797	16.9294	14012	6	2112	585	327
+8855	Belezna	ZA	46.3278	16.94	09168	6	3093	836	285
+8856	Nemespátró	ZA	46.3167	17.0167	19859	6	1225	313	166
+8856	Surd	ZA	46.3192	16.9706	02404	6	2194	635	246
+8857	Nemespátró	ZA	46.3167	17.0167	19859	6	1225	313	166
+8858	Somogybükkösd	SO	46.3	17	25043	6	1180	91	79
+8858	Porrogszentkirály	SO	46.2833	17.05	13930	6	1365	320	160
+8858	Porrogszentpál	SO	46.2833	17.0167	28510	6	354	95	47
+8858	Porrog	SO	46.2833	17.0333	11828	6	1402	246	135
+8861	Szepetnek	ZA	46.4308	16.905	07700	6	3039	1625	552
+8862	Semjénháza	ZA	46.4	16.85	30997	6	470	649	218
+8863	Molnári	ZA	46.3833	16.8333	21014	6	1286	716	273
+8864	Tótszerdahely	ZA	46.4	16.8	25113	6	1230	1215	446
+8865	Tótszentmárton	ZA	46.4167	16.8167	16382	6	1017	892	332
+8866	Becsehely	ZA	46.4458	16.7928	23144	6	3607	2141	756
+8866	Petrivente	ZA	46.4333	16.85	30757	6	765	384	136
+8868	Kistolmács	ZA	46.4833	16.75	20941	6	1220	165	98
+8868	Letenye	ZA	46.4286	16.7306	12122	4	4172	4260	1621
+8868	Zajk	ZA	46.4833	16.7167	24590	6	1239	211	95
+8868	Murarátka	ZA	46.4531	16.685	07968	6	1204	273	134
+8872	Szentmargitfalva	ZA	46.5	16.6667	14225	6	312	96	73
+8872	Muraszemenye	ZA	46.4667	16.6167	33987	6	1615	653	297
+8873	Csörnyeföld	ZA	46.5008	16.6319	33978	6	2125	467	223
+8874	Kerkaszentkirály	ZA	46.5	16.5833	09575	6	811	249	127
+8874	Dobri	ZA	46.5167	16.5833	25885	6	789	169	113
+8876	Tormafölde	ZA	46.5386	16.5944	04969	6	1886	365	210
+8877	Tornyiszentmiklós	ZA	46.515	16.5578	32638	6	1852	654	307
+8878	Lovászi	ZA	46.55	16.5667	28167	6	967	1226	590
+8879	Kerkateskánd	ZA	46.5833	16.5833	32647	6	894	168	92
+8879	Szécsisziget	ZA	46.5667	16.6	11554	6	620	232	104
+8881	Sormás	ZA	46.45	16.9167	06567	6	1637	904	319
+8882	Eszteregnye	ZA	46.4667	16.8833	06178	6	2009	734	285
+8883	Rigyác	ZA	46.4667	16.8667	24138	6	1536	448	155
+8885	Borsfa	ZA	46.5167	16.7833	10056	6	1183	728	287
+8885	Valkonya	ZA	46.5	16.8167	26268	6	755	64	46
+8886	Oltárc	ZA	46.5272	16.8372	25478	6	2953	255	148
+8887	Bázakerettye	ZA	46.5233	16.7294	18698	6	803	851	392
+8887	Lasztonya	ZA	46.5667	16.7167	03434	6	877	97	59
+8888	Lispeszentadorján	ZA	46.5333	16.7	10889	6	914	323	177
+8888	Kiscsehi	ZA	46.5167	16.6667	16249	6	1143	179	106
+8888	Maróc	ZA	46.55	16.6667	02103	6	516	86	70
+8891	Bánokszentgyörgy	ZA	46.5456	16.7872	08439	6	3254	678	298
+8891	Várfölde	ZA	46.5667	16.7667	02529	6	1487	209	106
+8893	Bucsuta	ZA	46.5667	16.85	07986	6	1619	238	111
+8893	Szentliszló	ZA	46.5756	16.8239	08615	6	689	320	141
+8895	Pusztamagyaród	ZA	46.6	16.8333	06530	6	1603	569	277
+8896	Pusztaszentlászló	ZA	46.6369	16.8442	26639	6	1034	636	274
+8897	Söjtör	ZA	46.6672	16.8583	19080	6	3616	1561	651
+8900	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8901	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8902	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8903	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8904	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8905	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8906	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8907	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8908	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8909	Zalaegerszeg	ZA	46.84	16.8439	32054	1	9985	61774	25497
+8911	Kiskutas	ZA	46.9167	16.8	20312	6	469	183	86
+8911	Nagykutas	ZA	46.9236	16.8078	22178	6	845	456	180
+8912	Kispáli	ZA	46.9167	16.8167	16081	6	451	261	113
+8912	Nagypáli	ZA	46.9167	16.85	28468	6	634	418	165
+8913	Egervár	ZA	46.9336	16.8553	33428	6	1029	1048	383
+8913	Lakhegy	ZA	46.9333	16.8667	33792	6	858	489	204
+8913	Gősfa	ZA	46.9667	16.8667	29771	6	1045	319	131
+8914	Vasboldogasszony	ZA	46.95	16.8833	10302	6	1175	623	216
+8915	Nemesrádó	ZA	46.7833	17	18023	6	1402	322	208
+8917	Dobronhegy	ZA	46.8167	16.75	32708	6	215	154	68
+8917	Pálfiszeg	ZA	46.7833	16.7333	14720	6	559	174	70
+8917	Milejszeg	ZA	46.8	16.75	02662	6	908	362	162
+8918	Csonkahegyhát	ZA	46.7983	16.7242	31149	6	828	374	140
+8918	Németfalu	ZA	46.8208	16.6736	25414	6	867	192	70
+8919	Kustánszeg	ZA	46.7839	16.6875	19479	6	1142	531	211
+8921	Zalaszentiván	ZA	46.8886	16.8994	02608	6	1310	1076	407
+8921	Zalaszentlőrinc	ZA	46.9167	16.8833	13301	6	489	306	129
+8921	Alibánfa	ZA	46.8833	16.9333	02644	6	584	484	165
+8921	Pethőhenye	ZA	46.8833	16.9167	05704	6	1142	416	192
+8923	Nemesapáti	ZA	46.8667	16.95	06169	6	1037	531	217
+8924	Alsónemesapáti	ZA	46.8481	16.935	19512	6	1451	736	287
+8925	Nemessándorháza	ZA	46.7833	16.95	25609	6	1116	253	176
+8925	Búcsúszentlászló	ZA	46.7861	16.9314	20613	6	154	878	289
+8925	Nemesszentandrás	ZA	46.7667	16.95	08059	6	547	292	137
+8925	Kisbucsa	ZA	46.8167	16.95	21379	6	880	483	192
+8925	Nemeshetés	ZA	46.8	16.9167	07658	6	661	310	194
+8929	Pölöske	ZA	46.75	16.9333	09867	6	4523	910	327
+8931	Vöckönd	ZA	46.8833	16.95	08369	6	279	85	49
+8931	Kemendollár	ZA	46.9	16.9667	25353	6	1607	529	211
+8932	Gyűrűs	ZA	46.8833	17	12539	6	419	94	54
+8932	Pókaszepetk	ZA	46.9233	16.9683	21050	6	1869	1008	370
+8932	Zalaistvánd	ZA	46.9167	16.9833	12496	6	1080	371	161
+8934	Bezeréd	ZA	46.8667	17.0167	12830	6	1214	158	156
+8935	Orbányosfa	ZA	46.85	16.9833	20835	6	568	142	62
+8935	Almásháza	ZA	46.85	17.05	23384	6	498	62	24
+8935	Nagykapornak	ZA	46.8167	17	20589	6	2441	931	391
+8935	Misefa	ZA	46.8	16.9833	04756	6	651	298	120
+8935	Padár	ZA	46.85	17.0167	24776	6	1069	142	76
+8936	Zalaszentmihály	ZA	46.725	16.9494	18449	6	2082	1002	472
+8943	Bocfölde	ZA	46.7833	16.8333	17543	6	873	1128	401
+8943	Csatár	ZA	46.7833	16.8833	23436	6	779	561	210
+8944	Sárhida	ZA	46.75	16.85	08101	6	509	808	280
+8945	Bak	ZA	46.7292	16.8464	04738	6	2305	1708	611
+8946	Tófej	ZA	46.6703	16.8056	05342	6	1532	706	292
+8946	Baktüttös	ZA	46.7	16.8167	15097	6	971	338	143
+8946	Pusztaederics	ZA	46.65	16.8	27465	6	955	181	97
+8947	Szentkozmadombja	ZA	46.6833	16.7667	03124	6	508	87	71
+8947	Zalatárnok	ZA	46.7019	16.7628	29683	6	2595	719	341
+8948	Barlahida	ZA	46.7158	16.7025	27447	6	610	131	86
+8948	Nova	ZA	46.6839	16.6839	03355	6	3929	833	363
+8949	Mikekarácsonyfa	ZA	46.65	16.7	22141	6	850	284	147
+8951	Gutorfölde	ZA	46.6414	16.7383	02097	6	2485	1081	508
+8951	Csertalakos	ZA	46.65	16.7	10649	6	199	31	35
+8953	Szentpéterfölde	ZA	46.6167	16.7667	30067	6	1212	134	84
+8954	Ortaháza	ZA	46.6167	16.6833	04950	6	703	130	63
+8956	Kányavár	ZA	46.5667	16.6833	04473	6	420	125	94
+8956	Pördefölde	ZA	46.5833	16.7167	32513	6	1912	65	42
+8956	Páka	ZA	46.5894	16.6506	29160	6	2318	1143	535
+8957	Csömödér	ZA	46.6083	16.6442	29364	6	779	604	271
+8957	Kissziget	ZA	46.6167	16.6667	13055	6	707	138	95
+8957	Hernyék	ZA	46.65	16.65	19895	6	1031	110	72
+8957	Zebecke	ZA	46.65	16.6833	03726	6	445	73	52
+8958	Iklódbördőce	ZA	46.6	16.6167	13921	6	1230	312	142
+8960	Lenti	ZA	46.6217	16.5392	12575	4	7380	8328	3386
+8961	Lenti	ZA	46.6217	16.5392	12575	4	7380	8328	3386
+8966	Lenti	ZA	46.6217	16.5392	12575	4	7380	8328	3386
+8969	Bödeháza	ZA	46.65	16.4167	04163	6	667	70	58
+8969	Zalaszombatfa	ZA	46.6333	16.45	27562	6	589	47	39
+8969	Gáborjánháza	ZA	46.6333	16.4167	17516	6	507	73	63
+8969	Szijártóháza	ZA	46.6333	16.45	26161	6	378	26	29
+8971	Zalabaksa	ZA	46.6997	16.5522	07579	6	1610	633	284
+8971	Kerkabarabás	ZA	46.6833	16.5667	29489	6	1029	284	136
+8973	Felsőszenterzsébet	ZA	46.75	16.45	30890	6	824	17	15
+8973	Magyarföld	ZA	46.7833	16.4167	08916	6	889	27	26
+8973	Alsószenterzsébet	ZA	46.75	16.4833	08767	6	963	77	40
+8973	Ramocsa	ZA	46.7833	16.45	14298	6	273	48	21
+8973	Csesztreg	ZA	46.7136	16.5203	02583	6	2300	803	361
+8973	Kerkafalva	ZA	46.7667	16.5	15112	6	1850	123	79
+8973	Kerkakutas	ZA	46.7667	16.5	22080	6	2007	138	96
+8975	Szentgyörgyvölgy	ZA	46.7244	16.4156	18652	6	2958	425	243
+8976	Nemesnép	ZA	46.7006	16.4625	32665	6	972	126	93
+8976	Márokföld	ZA	46.7167	16.45	31981	6	744	44	40
+8977	Baglad	ZA	46.6833	16.4833	11059	6	486	42	43
+8977	Lendvajakabfa	ZA	46.6833	16.45	11475	6	618	28	45
+8977	Resznek	ZA	46.6619	16.4792	17118	6	1842	308	155
+8978	Belsősárd	ZA	46.65	16.4833	20950	6	979	110	44
+8978	Lendvadedes	ZA	46.5833	16.5167	27483	6	402	36	26
+8978	Gosztola	ZA	46.5833	16.5333	13569	6	698	30	45
+8978	Rédics	ZA	46.6142	16.4775	31592	6	2532	988	381
+8978	Külsősárd	ZA	46.6333	16.5	32221	6	152	83	36
+8981	Gellénháza	ZA	46.7614	16.7878	08068	6	524	1615	643
+8981	Lickóvadamos	ZA	46.75	16.7667	03054	6	669	202	127
+8983	Babosdöbréte	ZA	46.8167	16.7833	21263	6	1252	535	220
+8983	Nagylengyel	ZA	46.7833	16.7667	04455	6	1024	522	200
+8983	Ormándlak	ZA	46.75	16.75	22497	6	575	118	51
+8984	Iborfia	ZA	46.7333	16.75	03188	6	259	12	20
+8984	Petrikeresztúr	ZA	46.7333	16.7333	19178	6	877	395	182
+8984	Gombosszeg	ZA	46.75	16.7333	17613	6	216	47	28
+8985	Becsvölgye	ZA	46.7667	16.7	18360	6	2140	833	355
+8986	Pusztaapáti	ZA	46.7667	16.6167	16920	6	1059	28	24
+8986	Szilvágy	ZA	46.7333	16.6333	17853	6	2427	211	99
+8986	Pórszombat	ZA	46.7264	16.5781	16850	6	1552	320	140
+8988	Kálócfa	ZA	46.75	16.5667	21500	6	1021	158	92
+8988	Kozmadombja	ZA	46.7667	16.55	13082	6	763	61	33
+8989	Dobronhegy	ZA	46.8167	16.75	32708	6	215	154	68
+8990	Pálfiszeg	ZA	46.7833	16.7333	14720	6	559	174	70
+8991	Hottó	ZA	46.85	16.75	28325	6	670	362	135
+8991	Teskánd	ZA	46.8469	16.7758	08828	6	485	1133	366
+8991	Böde	ZA	46.8375	16.7206	22877	6	917	310	129
+8992	Zalaboldogfa	ZA	46.9	16.7667	28495	6	1147	354	140
+8992	Boncodfölde	ZA	46.8667	16.7333	10782	6	590	358	134
+8992	Bagod	ZA	46.8781	16.7444	30368	6	1637	1356	470
+8992	Hagyárosbörönd	ZA	46.9	16.7167	10931	6	1125	294	126
+8994	Zalaszentgyörgy	ZA	46.8667	16.7167	33136	6	983	429	159
+8994	Kávás	ZA	46.8667	16.7167	32063	6	664	252	98
+8995	Keménfa	ZA	46.8333	16.6333	06071	6	1489	91	48
+8995	Salomvár	ZA	46.8489	16.6633	27720	6	1611	621	256
+8996	Zalacséb	ZA	46.8603	16.6639	02486	6	963	563	192
+8997	Zalaháshágy	ZA	46.89	16.6328	23834	6	1213	380	172
+8998	Vaspör	ZA	46.9161	16.65	14322	6	1345	391	204
+8998	Ozmánbük	ZA	46.9167	16.6833	18953	6	669	186	93
+8999	Csöde	ZA	46.8167	16.5333	27492	6	1061	80	54
+8999	Zalalövő	ZA	46.8483	16.5936	30313	4	5264	3053	1268
+9000	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9001	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9002	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9003	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9004	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9005	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9006	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9007	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9008	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9009	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9010	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9011	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9012	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9013	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9019	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9020	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9021	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9022	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9023	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9024	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9025	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9026	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9027	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9028	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9029	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9030	Győr	GS	47.6076	17.7819	25584	1	17462	130476	55350
+9061	Vámosszabadi	GS	47.7667	17.65	12405	6	2237	1562	508
+9062	Vének	GS	47.7333	17.7667	05014	6	689	193	82
+9062	Kisbajcs	GS	47.75	17.6833	22886	6	874	820	276
+9063	Nagybajcs	GS	47.7667	17.7	02361	6	765	929	372
+9071	Gönyű	GS	47.7333	17.8333	02060	6	2163	3147	1133
+9072	Nagyszentjános	GS	47.7167	17.8833	33543	6	3030	1810	616
+9073	Bőny	GS	47.65	17.8667	33950	6	5042	2192	776
+9074	Rétalap	GS	47.6	17.9167	33969	6	1320	555	222
+9081	Győrújbarát	GS	47.6	17.65	07481	6	3361	5998	2084
+9082	Nyúl	GS	47.5833	17.6833	12955	6	2514	4196	1527
+9083	Écs	GS	47.55	17.7167	16708	6	1984	1852	708
+9084	Győrság	GS	47.5667	17.75	31316	6	820	1494	573
+9085	Pázmándfalu	GS	47.5667	17.7833	12715	6	1939	983	371
+9086	Töltéstava	GS	47.6167	17.7333	16674	6	2317	2187	586
+9088	Bakonypéterd	VE	47.4	17.825	22062	6	1002	265	124
+9089	Lázi	VE	47.4	17.825	04376	6	1679	568	239
+9090	Pannonhalma	GS	47.55	17.75	24305	4	2958	3948	1296
+9091	Ravazd	GS	47.5167	17.75	21801	6	2854	1200	486
+9092	Tarjánpuszta	GS	47.5	17.7833	33914	6	844	378	141
+9093	Győrasszonyfa	GS	47.5	17.8	08721	6	648	507	208
+9094	Tápszentmiklós	GS	47.5	17.85	21971	6	2077	960	337
+9095	Táp	GS	47.5167	17.8333	14261	6	1988	720	280
+9096	Nyalka	GS	47.55	17.8167	19752	6	1286	444	193
+9097	Mezőörs	GS	47.5667	17.8833	12812	6	4848	1013	333
+9098	Mezőörs	GS	47.5667	17.8833	12812	6	4848	1013	333
+9099	Pér	GS	47.6167	17.8	15529	6	3148	2359	950
+9100	Tét	GS	47.5167	17.5167	19035	4	5635	4010	1469
+9111	Tényő	GS	47.5333	17.65	11457	6	2638	1566	676
+9112	Sokorópátka	GS	47.4833	17.7	12627	6	1686	1087	478
+9113	Koroncó	GS	47.6	17.5333	24633	6	2691	1965	681
+9121	Győrszemere	GS	47.55	17.5667	15653	6	3311	3122	1127
+9122	Felpéc	GS	47.5167	17.6	33251	6	2247	885	378
+9123	Kajárpéc	GS	47.4833	17.6333	12113	6	3189	1314	577
+9124	Gyömöre	GS	47.5	17.5667	20400	6	2049	1311	505
+9125	Szerecseny	GS	47.4667	17.55	03887	6	1239	813	375
+9126	Gyarmat	GS	47.4667	17.5	26860	6	2245	1232	555
+9127	Csikvánd	GS	47.4667	17.45	13505	6	1453	488	228
+9131	Mórichida	GS	47.5167	17.4167	02556	6	3230	835	362
+9132	Árpás	GS	47.5167	17.4	32249	6	1427	247	128
+9133	Rábaszentmiklós	GS	47.5333	17.4167	17297	6	501	127	63
+9133	Kisbabot	GS	47.55	17.4167	02413	6	610	211	112
+9134	Bodonhely	GS	47.5667	17.4	06220	6	1110	299	134
+9135	Rábaszentmihály	GS	47.5833	17.4333	33710	6	1097	510	200
+9136	Rábacsécsény	GS	47.5833	17.4333	33701	6	1568	601	241
+9136	Mérges	GS	47.6	17.45	20385	6	651	86	53
+9141	Ikrény	GS	47.65	17.5333	20604	6	1558	1826	566
+9142	Rábapatona	GS	47.6333	17.4833	25335	6	3975	2460	935
+9143	Enese	GS	47.65	17.4167	15033	6	1990	1795	604
+9144	Kóny	GS	47.6333	17.3667	11262	6	2888	2646	1047
+9145	Bágyogszovát	GS	47.5833	17.3667	28769	6	2406	1321	551
+9146	Rábapordány	GS	47.5667	17.3333	24721	6	2189	1066	448
+9147	Dör	GS	47.6	17.3	21917	6	1101	619	231
+9151	Abda	GS	47.7	17.55	11882	6	1902	3107	1100
+9152	Börcs	GS	47.6833	17.5	06619	6	1278	1279	419
+9153	Öttevény	GS	47.7333	17.4833	02635	6	2367	2867	1031
+9154	Mosonszentmiklós	GS	47.7333	17.3833	33677	6	3071	2319	947
+9155	Lébény	GS	47.7333	17.3833	33668	5	8137	3221	1225
+9161	Győrsövényház	GS	47.7	17.3667	19309	6	2421	788	319
+9162	Bezi	GS	47.6667	17.4	10560	6	1122	462	193
+9163	Fehértó	GS	47.6833	17.35	06956	6	1138	469	221
+9164	Markotabödöge	GS	47.6833	17.3167	06770	6	1629	454	242
+9165	Cakóháza	GS	47.7	17.2833	27085	6	288	48	31
+9165	Rábcakapi	GS	47.7	17.2833	03753	6	787	177	89
+9165	Tárnokréti	GS	47.7167	17.3167	04172	6	954	199	107
+9167	Bősárkány	GS	47.6833	17.25	15501	5	2333	2158	784
+9168	Acsalag	GS	47.6833	17.2	33385	6	1041	456	225
+9169	Maglóca	GS	47.6667	17.2833	26444	6	577	87	68
+9169	Barbacs	GS	47.65	17.3	06196	6	1365	738	308
+9171	Győrújfalu	GS	47.7167	17.6167	31787	6	737	1391	464
+9172	Győrzámoly	GS	47.7333	17.5833	15228	6	2638	2304	746
+9173	Győrladamér	GS	47.75	17.5667	13198	6	860	1503	509
+9174	Dunaszeg	GS	47.7667	17.55	21078	6	1726	1967	666
+9175	Dunaszentpál	GS	47.7833	17.5	15875	6	981	727	255
+9176	Mecsér	GS	47.8	17.4833	27359	6	2111	594	293
+9177	Ásványráró	GS	47.8333	17.5	26921	6	3916	1923	814
+9178	Hédervár	GS	47.8333	17.4667	12308	6	1428	1147	455
+9181	Kimle	GS	47.8333	17.3667	14748	6	3727	2158	847
+9182	Károlyháza	GS	47.6333	17.5833	34351	6	1125	682	152
+9183	Károlyháza	GS	47.6333	17.5833	34351	6	1125	682	152
+9184	Kunsziget	GS	47.7333	17.5167	31626	6	1788	1240	433
+9200	Mosonmagyaróvár	GS	47.8667	17.2833	04783	4	8535	32256	12608
+9201	Mosonmagyaróvár	GS	47.8667	17.2833	04783	4	8535	32256	12608
+9202	Mosonmagyaróvár	GS	47.8667	17.2833	04783	4	8535	32256	12608
+9203	Mosonmagyaróvár	GS	47.8667	17.2833	04783	4	8535	32256	12608
+9211	Feketeerdő	GS	47.9333	17.2833	32717	6	674	497	154
+9221	Levél	GS	47.9	17.2	19239	6	2491	1808	641
+9222	Hegyeshalom	GS	47.9167	17.1667	17905	5	5266	3486	1399
+9223	Bezenye	GS	47.9667	17.2167	29805	6	3003	1393	547
+9224	Rajka	GS	48	17.2	26587	6	5263	2385	949
+9225	Dunakiliti	GS	47.9667	17.2833	27739	6	3366	1816	671
+9226	Dunasziget	GS	47.9333	17.3667	10454	6	3590	1449	583
+9228	Halászi	GS	47.8833	17.3333	26790	6	3645	2905	1049
+9231	Máriakálnok	GS	47.8667	17.3167	12283	6	1548	1641	558
+9232	Darnózseli	GS	47.85	17.4333	21865	6	1961	1588	589
+9233	Lipót	GS	47.8667	17.4667	16221	6	1609	659	249
+9234	Kisbodak	GS	47.9	17.4167	07816	6	904	362	163
+9235	Dunaremete	GS	47.8833	17.4333	02079	6	436	246	103
+9235	Püski	GS	47.8833	17.4	12964	6	839	650	249
+9241	Jánossomorja	GS	47.8	17.1167	29221	4	14897	5811	2181
+9242	Jánossomorja	GS	47.8	17.1167	29221	4	14897	5811	2181
+9243	Várbalog	GS	47.85	17.0833	18412	6	2270	406	247
+9244	Újrónafő	GS	47.8	17.2	31839	6	4863	803	308
+9245	Mosonszolnok	GS	47.85	17.1833	28149	6	4393	1624	544
+9300	Csorna	GS	47.6167	17.25	04039	4	9173	10708	4258
+9301	Csorna	GS	47.6167	17.25	04039	4	9173	10708	4258
+9311	Pásztori	GS	47.55	17.2667	23481	6	852	380	128
+9312	Szilsárkány	GS	47.55	17.2667	03364	6	1668	662	309
+9313	Rábacsanak	GS	47.5333	17.3	04792	6	1385	512	276
+9314	Egyed	GS	47.5167	17.35	20288	6	1343	564	249
+9315	Sobor	GS	47.4833	17.3833	24208	6	1672	287	151
+9316	Rábaszentandrás	GS	47.45	17.3333	15273	6	1160	505	212
+9317	Szany	GS	47.4667	17.3	08536	5	3413	2137	1001
+9321	Farád	GS	47.6	17.2	33996	6	2902	1960	733
+9322	Rábatamási	GS	47.5833	17.1667	15422	6	2176	997	437
+9323	Jobaháza	GS	47.5833	17.2	06646	6	806	571	180
+9324	Potyond	GS	47.55	17.1833	27304	6	284	107	50
+9324	Bogyoszló	GS	47.5667	17.1833	04367	6	2621	604	315
+9325	Sopronnémeti	GS	47.5333	17.2167	02617	6	709	277	126
+9326	Szil	GS	47.5	17.2333	19266	6	3103	1235	631
+9327	Rábasebes	GS	47.4333	17.2333	20136	6	539	100	82
+9327	Vág	GS	47.45	17.2167	02237	6	1403	513	297
+9330	Kapuvár	GS	47.6	17.0333	28334	4	9605	10458	4311
+9331	Kapuvár	GS	47.6	17.0333	28334	4	9605	10458	4311
+9332	Kapuvár	GS	47.6	17.0333	28334	4	9605	10458	4311
+9339	Kapuvár	GS	47.6	17.0333	28334	4	9605	10458	4311
+9341	Kisfalud	GS	47.5167	17.1	33695	6	1510	760	312
+9342	Mihályi	GS	47.5167	17.1	21980	6	1628	1094	469
+9343	Beled	GS	47.4667	17.1	10588	5	2647	2686	1102
+9343	Vásárosfalu	GS	47.45	17.1167	17880	6	420	161	72
+9343	Edve	GS	47.45	17.1333	22442	6	505	114	72
+9344	Rábakecöl	GS	47.4333	17.1167	14793	6	2303	693	354
+9345	Páli	GS	47.4667	17.1667	19637	6	1958	358	211
+9346	Magyarkeresztúr	GS	47.5167	17.1667	13912	6	1674	447	226
+9346	Vadosfa	GS	47.5	17.1333	06239	6	419	72	44
+9346	Zsebeháza	GS	47.5167	17.2	16869	6	465	124	72
+9351	Babót	GS	47.5667	17.0833	15042	6	2167	1109	474
+9352	Veszkény	GS	47.6	17.0833	04589	6	1035	922	386
+9353	Szárföld	GS	47.6	17.1167	15714	6	1712	894	399
+9354	Osli	GS	47.6333	17.0833	15121	6	1880	884	377
+9361	Hövej	GS	47.55	17.0167	10029	6	852	314	160
+9362	Himod	GS	47.5167	17.0167	04020	6	2270	633	393
+9363	Gyóró	GS	47.5	17.0167	23843	6	1164	409	170
+9364	Cirák	GS	47.4667	17.0333	15954	6	1176	588	270
+9365	Dénesfa	GS	47.45	17.0333	32595	6	1754	353	172
+9371	Vitnyéd	GS	47.5833	16.9833	25797	6	3225	1370	509
+9372	Csapod	GS	47.5167	16.9167	08563	6	2918	519	274
+9373	Pusztacsalád	GS	47.4833	16.9	31370	6	2406	255	134
+9374	Iván	GS	47.45	16.9167	31635	6	5474	1321	466
+9375	Répceszemere	GS	47.4333	16.9833	14438	6	942	284	144
+9375	Csáfordjánosfa	GS	47.4167	16.95	10047	6	528	214	105
+9375	Csér	GS	47.4167	16.9333	30191	6	294	23	28
+9400	Sopron	GS	47.672	16.5852	08518	3	16906	59036	25073
+9401	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9402	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9403	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9404	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9405	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9406	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9407	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9408	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9409	Sopron	GS	47.6833	16.6	08518	3	16906	59036	25073
+9421	Fertőrákos	GS	47.7167	16.65	12414	6	2190	2172	860
+9422	Harka	GS	47.6333	16.6	07649	6	1100	1728	535
+9423	Ágfalva	GS	47.6833	16.5167	04880	6	1308	2119	621
+9431	Fertőd	GS	47.6167	16.8667	09885	4	4856	3474	1433
+9433	Fertőd	GS	47.6167	16.8667	09885	4	4856	3474	1433
+9434	Fertőd	GS	47.6167	16.8667	09885	4	4856	3474	1433
+9435	Sarród	GS	47.6333	16.8667	30021	6	4007	1112	433
+9436	Fertőszéplak	GS	47.6167	16.8333	31440	6	2178	1254	479
+9437	Hegykő	GS	47.6167	16.8	18403	6	2684	1322	535
+9438	Sarród	GS	47.6333	16.8667	30021	6	4007	1112	433
+9441	Agyagosszergény	GS	47.6167	16.95	29407	6	1989	896	373
+9442	Fertőendréd	GS	47.6	16.9167	09487	6	1509	610	242
+9443	Petőháza	GS	47.6	16.9	22831	6	264	1061	423
+9444	Fertőszentmiklós	GS	47.5833	16.8833	15343	4	3940	3802	1466
+9451	Röjtökmuzsaj	GS	47.55	16.8333	11068	6	1586	444	206
+9451	Ebergőc	GS	47.5667	16.8167	26347	6	502	154	99
+9461	Lövő	GS	47.5	16.7833	31194	6	1747	1463	516
+9462	Völcsej	GS	47.4833	16.7667	16319	6	932	392	168
+9463	Sopronhorpács	GS	47.4833	16.7333	29090	6	2069	826	323
+9464	Und	GS	47.4833	16.7	20792	6	679	335	146
+9471	Nemeskér	GS	47.4833	16.8	29328	6	642	228	98
+9472	Újkér	GS	47.4667	16.8167	19673	6	3238	974	436
+9473	Egyházasfalu	GS	47.4667	16.7667	15237	6	2164	851	354
+9474	Szakony	GS	47.4333	16.7167	11369	6	1350	456	239
+9474	Gyalóka	GS	47.45	16.7	17969	6	393	73	51
+9475	Répcevis	GS	47.45	16.6833	07746	6	609	356	161
+9476	Zsira	GS	47.45	16.6833	04622	6	1473	737	234
+9481	Pinnye	GS	47.5833	16.7667	14687	6	865	342	145
+9482	Nagylózs	GS	47.5667	16.7833	32939	6	1925	953	274
+9483	Sopronkövesd	GS	47.55	16.75	25724	6	2681	1168	462
+9484	Pereszteg	GS	47.6	16.7333	23773	6	2250	1382	493
+9485	Nagycenk	GS	47.6	16.7	02495	5	1945	1847	731
+9491	Hidegség	GS	47.6333	16.75	23375	6	1690	352	154
+9492	Fertőhomok	GS	47.6167	16.7667	10658	6	1261	583	221
+9493	Fertőboz	GS	47.6333	16.7	11253	6	1363	249	106
+9494	Fertőboz	GS	47.6333	16.7	11253	6	1363	249	106
+9495	Kópháza	GS	47.6333	16.65	06895	6	873	2001	662
+9500	Celldömölk	VA	47.25	17.15	27094	4	5239	11247	4723
+9501	Celldömölk	VA	47.25	17.15	27094	4	5239	11247	4723
+9502	Celldömölk	VA	47.25	17.15	27094	4	5239	11247	4723
+9503	Celldömölk	VA	47.25	17.15	27094	4	5239	11247	4723
+9511	Kemenesmihályfa	VA	47.2833	17.1167	13426	6	1781	527	231
+9512	Ostffyasszonyfa	VA	47.3167	17.05	32629	6	3431	793	390
+9513	Csönge	VA	47.3361	17.1139	22390	6	2527	379	198
+9514	Kenyeri	VA	47.3833	17.0833	09937	6	3396	869	445
+9515	Pápoc	VA	47.4167	17.1333	14067	6	3132	334	303
+9516	Vönöck	VA	47.3167	17.1667	03142	6	1760	749	340
+9517	Kemenessömjén	VA	47.3	17.1333	24484	6	1605	610	235
+9521	Kemenesszentmárton	VA	47.3	17.1667	20084	6	429	205	96
+9522	Kemenesmagasi	VA	47.3333	17.2167	12247	6	3319	872	439
+9523	Szergény	VA	47.3167	17.2667	27793	6	1561	339	173
+9531	Mersevát	VA	47.2833	17.2167	14809	6	1054	573	225
+9532	Külsővat	VE	47.3	17.2333	16142	6	1931	788	266
+9533	Nemesszalók	VE	47.2833	17.3	21759	6	2056	952	359
+9534	Vinár	VE	47.3167	17.2833	24651	6	460	248	93
+9534	Marcalgergelyi	VE	47.3167	17.2667	29294	6	776	419	176
+9541	Vinár	VA	47.125	17.175	24651	6	460	248	93
+9542	Nemeskocs	VA	47.2	17.1833	02839	6	793	380	147
+9542	Boba	VA	47.2	17.1833	29203	6	1095	837	328
+9544	Kemenespálfa	VA	47.1333	17.1833	20996	6	1372	442	166
+9545	Jánosháza	VA	47.1167	17.1667	11679	5	2341	2515	1095
+9547	Karakó	VA	47.1167	17.2	10913	6	1035	197	111
+9548	Nemeskeresztúr	VA	47.1	17.2	03674	6	1217	271	173
+9549	Keléd	VA	47.0833	17.1167	32036	6	872	72	60
+9551	Mesteri	VA	47.2167	17.0833	15723	6	1169	232	155
+9552	Vásárosmiske	VA	47.2	17.0667	09195	6	1342	361	178
+9553	Köcsk	VA	47.1833	17.0833	04190	6	1258	284	169
+9553	Kemeneskápolna	VA	47.2	17.1167	16911	6	497	88	67
+9554	Borgáta	VA	47.1667	17.0833	03090	6	621	149	101
+9554	Egyházashetye	VA	47.1667	17.1167	10232	6	1320	346	177
+9555	Kissomlyó	VA	47.1333	17.1	05953	6	858	243	148
+9556	Duka	VA	47.181	17.0929	02927	6	1524	236	166
+9561	Nagysimonyi	VA	47.2667	17.0667	26143	6	1567	976	426
+9561	Tokorcs	VA	47.2667	17.1	09229	6	640	333	149
+9600	Sárvár	VA	47.255	16.944	21306	4	6465	15011	6202
+9601	Sárvár	VA	47.25	16.9333	21306	4	6465	15011	6202
+9602	Sárvár	VA	47.25	16.9333	21306	4	6465	15011	6202
+9608	Sárvár	VA	47.25	16.9333	21306	4	6465	15011	6202
+9609	Sárvár	VA	47.25	16.9333	21306	4	6465	15011	6202
+9611	Csénye	VA	47.2333	16.8667	09070	6	1912	723	297
+9612	Porpác	VA	47.25	16.8	29896	6	619	161	77
+9612	Bögöt	VA	47.25	16.8	11651	6	499	387	166
+9621	Ölbő	VA	47.3	16.8667	12043	6	2353	751	308
+9622	Szeleste	VA	47.3167	16.8333	33172	6	2075	701	279
+9623	Répceszentgyörgy	VA	47.35	16.85	28626	6	575	115	81
+9624	Chernelházadamonya	VA	47.35	16.85	09876	6	785	202	105
+9625	Bő	VA	47.3667	16.8	05476	6	1065	646	309
+9625	Gór	VA	47.3667	16.8	11156	6	1099	306	174
+9631	Hegyfalu	VA	47.35	16.8833	32188	6	1189	781	312
+9632	Sajtoskál	VA	47.4	16.8667	10579	6	941	419	155
+9633	Simaság	VA	47.4167	16.85	26763	6	1013	543	246
+9634	Iklanberény	VA	47.4167	16.8	29504	6	296	31	36
+9634	Lócs	VA	47.4	16.8167	29081	6	513	118	97
+9635	Zsédeny	VA	47.3333	16.9	21643	6	643	200	109
+9636	Pósfa	VA	47.3333	16.85	15671	6	535	290	111
+9641	Rábapaty	VA	47.3	16.9333	26073	6	2141	1760	662
+9643	Jákfa	VA	47.3333	16.9667	06406	6	2011	540	242
+9651	Uraiújfalu	VA	47.3667	16.9833	21537	6	1908	869	380
+9652	Nick	VA	47.4	17.0167	10843	6	1140	521	221
+9653	Répcelak	VA	47.4167	17.0167	30881	4	1382	2443	1057
+9654	Csánig	VA	47.3944	17.0056	26772	6	819	390	173
+9661	Vasegerszeg	VA	47.3667	16.9167	15334	6	1272	398	150
+9662	Tompaládony	VA	47.3833	16.9	12335	6	944	316	146
+9662	Mesterháza	VA	47.3667	16.8667	31875	6	419	156	82
+9663	Nemesládony	VA	47.4	16.8833	26240	6	567	124	96
+9664	Nagygeresd	VA	47.3833	16.9167	09283	6	940	268	152
+9665	Vámoscsalád	VA	47.3833	16.9667	31051	6	1178	353	158
+9671	Sitke	VA	47.2333	17.0333	30748	6	2720	651	306
+9672	Gérce	VA	47.2167	17.0167	26152	6	1830	1142	503
+9673	Káld	VA	47.1667	17.05	29957	6	4244	1059	475
+9674	Vashosszúfalu	VA	47.1167	17.0667	20349	6	1392	373	214
+9675	Bögöte	VA	47.1667	17.0367	07296	6	2074	312	151
+9676	Hosszúpereszteg	VA	47.1	17.0167	20880	6	3700	652	407
+9681	Sótony	VA	47.2	16.95	22983	6	1493	645	288
+9682	Nyőgér	VA	47.1833	16.9333	22318	6	1073	317	177
+9683	Bejcgyertyános	VA	47.15	16.925	10384	6	3143	476	270
+9684	Egervölgy	VA	47.1167	16.9167	28796	6	886	368	224
+9685	Szemenye	VA	47.1	16.9	27997	6	1180	327	194
+9700	Szombathely	VA	47.2448	16.6168	03009	1	9750	79513	33655
+9701	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9702	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9703	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9704	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9705	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9706	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9707	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9708	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9709	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9710	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9719	Szombathely	VA	47.2333	16.6167	03009	1	9750	79513	33655
+9721	Gencsapáti	VA	47.2833	16.6	24183	6	2239	2822	925
+9722	Perenye	VA	47.3	16.5833	13684	6	1622	701	223
+9723	Lukácsháza	VA	47.35	16.5833	14021	6	936	1059	387
+9724	Gyöngyösfalu	VA	47.3167	16.5833	11943	6	965	1132	397
+9725	Kőszegszerdahely	VA	47.3333	16.5167	20109	6	737	492	202
+9725	Cák	VA	47.35	16.5167	08271	6	648	280	109
+9725	Kőszegdoroszló	VA	47.35	16.55	05740	6	965	241	104
+9726	Velem	VA	47.35	16.5	26000	6	861	342	164
+9727	Bozsok	VA	47.3333	16.5	05023	6	2091	342	139
+9730	Kőszeg	VA	47.3833	16.55	16832	4	5466	12032	4600
+9731	Kőszeg	VA	47.3833	16.55	16832	4	5466	12032	4600
+9732	Kőszeg	VA	47.3833	16.55	16832	4	5466	12032	4600
+9733	Horvátzsidány	VA	47.4167	16.6167	16887	6	1217	787	323
+9733	Kiszsidány	VA	47.4167	16.65	15486	6	493	101	39
+9733	Ólmod	VA	47.4167	16.6	22044	6	366	93	51
+9734	Peresznye	VA	47.4333	16.65	08882	6	1073	712	196
+9735	Csepreg	VA	47.4	16.7167	12140	4	4954	3452	1274
+9736	Tormásliget	VA	47.3846	16.6321	34087	6	753	337	122
+9737	Bük	VA	47.3833	16.75	02431	4	2086	3402	1613
+9738	Tömörd	VA	47.3667	16.6833	05166	6	1536	276	108
+9739	Pusztacsó	VA	47.3333	16.6333	10311	6	726	173	59
+9739	Kőszegpaty	VA	47.3333	16.65	26046	6	1225	198	77
+9739	Nemescsó	VA	47.35	16.6167	23320	6	738	319	118
+9740	Pusztacsó	VA	47.3333	16.6333	10311	6	726	173	59
+9741	Vassurány	VA	47.2833	16.7	25982	6	1009	810	278
+9742	Salköveskút	VA	47.3	16.7	18883	6	1320	509	192
+9743	Söpte	VA	47.2833	16.65	24800	6	1398	808	273
+9744	Vasasszonyfa	VA	47.3167	16.6667	20394	6	1065	382	155
+9745	Meszlen	VA	47.3333	16.7	32832	6	1202	230	99
+9746	Acsád	VA	47.3167	16.7333	07214	6	1434	689	185
+9747	Vasszilvágy	VA	47.3	16.75	12104	6	1180	414	168
+9748	Vát	VA	47.2833	16.7833	02246	6	2327	696	251
+9749	Nemesbőd	VA	47.2667	16.7333	24509	6	914	627	240
+9751	Vép	VA	47.2333	16.7333	26426	5	3289	3461	1171
+9752	Bozzai	VA	47.2	16.7667	06390	6	443	320	117
+9752	Kenéz	VA	47.2	16.7833	02574	6	717	282	111
+9754	Pecöl	VA	47.2	16.8333	14988	6	1726	803	302
+9754	Megyehíd	VA	47.2167	16.8333	30872	6	604	347	124
+9756	Ikervár	VA	47.2	16.9	11387	6	3534	1865	669
+9757	Meggyeskovácsi	VA	47.1667	16.8667	25760	6	2464	745	329
+9761	Táplánszentkereszt	VA	47.2	16.7	32045	6	2008	2555	843
+9762	Tanakajd	VA	47.2	16.7333	16212	6	1182	791	274
+9763	Vasszécseny	VA	47.1833	16.7667	29373	6	1795	1432	488
+9764	Csempeszkopács	VA	47.15	16.8	23816	6	540	313	118
+9766	Rábatöttös	VA	47.125	16.8333	17996	6	648	224	121
+9766	Zsennye	VA	47.1167	16.8167	12292	6	502	97	57
+9766	Rum	VA	47.1333	16.85	10597	6	1685	1263	453
+9771	Balogunyom	VA	47.1667	16.65	05102	6	1212	1242	425
+9772	Kisunyom	VA	47.15	16.65	02501	6	1000	414	174
+9773	Sorokpolány	VA	47.1333	16.6667	29692	6	1329	869	280
+9774	Gyanógeregye	VA	47.1167	16.7667	27030	6	707	163	67
+9774	Sorkikápolna	VA	47.1333	16.7	27960	6	886	265	103
+9774	Sorkifalud	VA	47.1333	16.7333	07171	6	1737	654	267
+9775	Nemeskolta	VA	47.15	16.7667	24059	6	734	371	147
+9776	Püspökmolnári	VA	47.1	16.8	07278	6	1510	937	384
+9777	Rábahídvég	VA	47.0667	16.75	03197	6	2241	977	398
+9781	Egyházashollós	VA	47.05	16.6833	30429	6	1904	547	261
+9782	Nemesrempehollós	VA	47.0833	16.6833	09672	6	1205	270	155
+9783	Egyházasrádóc	VA	47.0833	16.6167	25946	6	2479	1327	519
+9784	Rádóckölked	VA	47.0833	16.6	07551	6	1895	268	133
+9784	Harasztifalu	VA	47.05	16.55	05713	6	789	166	85
+9784	Nagykölked	VA	47.0667	16.55	32920	6	978	159	71
+9789	Sé	VA	47.2333	16.5667	10278	6	603	1413	470
+9791	Dozmat	VA	47.2333	16.5167	16151	6	854	232	91
+9791	Torony	VA	47.2333	16.5333	29878	6	1283	1942	660
+9792	Bucsu	VA	47.2667	16.5	32984	6	1654	602	214
+9793	Narda	VA	47.2333	16.4667	02042	6	1035	503	193
+9794	Felsőcsatár	VA	47.2167	16.45	13587	6	1790	468	190
+9795	Vaskeresztes	VA	47.2	16.45	30702	6	912	357	127
+9796	Horvátlövő	VA	47.1833	16.45	12733	6	616	221	70
+9796	Pornóapáti	VA	47.15	16.4667	20367	6	1514	404	139
+9797	Nárai	VA	47.2	16.5667	17367	6	1599	1216	431
+9798	Ják	VA	47.1333	16.5833	13958	6	4495	2575	915
+9799	Szentpéterfa	VA	47.1	16.4833	21254	6	3124	988	385
+9800	Vasvár	VA	47.05	16.8	04695	4	5510	4396	1926
+9801	Vasvár	VA	47.05	16.8	04695	4	5510	4396	1926
+9811	Andrásfa	VA	46.9667	16.8	12317	6	823	318	146
+9812	Telekes	VA	46.9389	16.7725	29568	6	1081	519	197
+9813	Gersekarát	VA	46.9739	16.7467	30942	6	1992	709	329
+9813	Sárfimizdó	VA	46.95	16.7167	09788	6	746	103	64
+9814	Halastó	VA	46.95	16.7	29452	6	565	102	73
+9821	Hegyhátszentpéter	VA	46.9833	16.8167	08226	6	684	153	92
+9821	Győrvár	VA	46.9878	16.8417	09724	6	1659	674	289
+9823	Pácsony	VA	47.0167	16.8667	07162	6	1001	279	132
+9824	Olaszfa	VA	47.0167	16.8833	19743	6	1654	470	257
+9825	Oszkó	VA	47.0333	16.8833	07667	6	2031	670	304
+9826	Petőmihályfa	VA	46.9833	16.7833	11572	6	995	237	107
+9831	Bérbaltavár	VA	47.0167	16.9667	32124	6	2567	502	308
+9832	Nagytilaj	VA	46.9733	16.9653	24837	6	1566	142	134
+9833	Csehi	VA	47.0333	16.95	19488	6	934	270	155
+9834	Csehimindszent	VA	47.05	16.95	12724	6	1543	361	194
+9835	Mikosszéplak	VA	47.0333	16.9833	30599	6	1866	331	159
+9836	Csipkerek	VA	47.0667	16.95	26064	6	1313	358	244
+9841	Kám	VA	47.1	16.8833	04640	6	1530	448	212
+9842	Alsóújlak	VA	47.05	16.8	22725	6	2102	610	305
+9900	Körmend	VA	47.0167	16.6	13532	4	5279	12028	5046
+9901	Körmend	VA	47.0167	16.6	13532	4	5279	12028	5046
+9909	Magyarnádalja	VA	47	16.5333	27289	6	385	211	85
+9909	Körmend	VA	47.0167	16.6	13532	4	5279	12028	5046
+9912	Magyarszecsőd	VA	47.0333	16.65	17288	6	1126	446	195
+9912	Molnaszecsőd	VA	47.05	16.6833	03294	6	1169	431	174
+9913	Döröske	VA	47.0167	16.7	03036	6	440	84	65
+9913	Szarvaskend	VA	46.9833	16.6833	17729	6	1034	220	125
+9913	Nagymizdó	VA	46.9833	16.6667	15060	6	676	131	79
+9914	Döbörhegy	VA	46.9833	16.7	20695	6	1175	163	117
+9915	Nádasd	VA	46.9636	16.6192	06716	6	3560	1329	543
+9915	Katafa	VA	46.9833	16.6333	26620	6	481	382	160
+9915	Hegyháthodász	VA	46.9333	16.65	14997	6	808	176	97
+9915	Hegyhátsál	VA	46.9667	16.65	30216	6	458	147	84
+9917	Halogy	VA	46.9667	16.5667	10676	6	705	264	145
+9917	Daraboshegy	VA	46.9667	16.5667	15990	6	459	90	61
+9918	Felsőmarác	VA	46.9333	16.5167	29841	6	1744	264	191
+9919	Csákánydoroszló	VA	46.9708	16.5069	03911	6	2661	1772	597
+9921	Vasalja	VA	47.0167	16.5167	02884	6	1124	325	150
+9922	Pinkamindszent	VA	47.0333	16.4833	06248	6	1101	160	109
+9923	Kemestaródfa	VA	47	16.5167	22716	6	635	237	119
+9931	Ivánc	VA	46.9333	16.5	31680	6	1714	706	239
+9931	Hegyhátszentmárton	VA	46.9333	16.4833	21838	6	1274	57	54
+9932	Viszák	VA	46.8833	16.5	07940	6	1013	254	126
+9933	Őrimagyarósd	VA	46.8883	16.5397	13453	6	1229	231	116
+9934	Felsőjánosfa	VA	46.85	16.5667	08013	6	306	196	88
+9934	Szaknyér	VA	46.8667	16.5333	16504	6	293	59	40
+9934	Hegyhátszentjakab	VA	46.8661	16.5547	18032	6	947	281	160
+9935	Szőce	VA	46.8833	16.5833	19521	6	1871	375	215
+9936	Kisrákos	VA	46.8667	16.5	11147	6	1106	211	98
+9937	Pankasz	VA	46.8333	16.5	23108	6	927	431	180
+9938	Szatta	VA	46.8	16.4833	02440	6	601	69	37
+9938	Nagyrákos	VA	46.8333	16.4667	29869	6	1611	272	151
+9941	Ispánk	VA	46.8667	16.45	07977	6	692	111	56
+9941	Őriszentpéter	VA	46.8408	16.4294	10630	4	3356	1198	527
+9942	Szalafő	VA	46.8667	16.3667	10223	6	2737	219	145
+9943	Kondorfa	VA	46.895	16.4017	13028	6	2161	541	297
+9944	Bajánsenye	VA	46.8	16.3833	17020	6	2185	488	246
+9944	Kerkáskápolna	VA	46.7833	16.4333	19761	6	920	100	56
+9945	Kercaszomor	VA	46.7833	16.3667	26596	6	1287	205	115
+9946	Magyarszombatfa	VA	46.7628	16.3467	25423	6	1594	277	152
+9946	Velemér	VA	46.7333	16.3833	18430	6	955	87	73
+9951	Rátót	VA	46.9667	16.4333	23861	6	727	241	99
+9952	Gasztony	VA	46.9625	16.4594	30906	6	1427	453	206
+9953	Nemesmedves	VA	47	16.4	31556	6	474	21	13
+9953	Vasszentmihály	VA	46.9667	16.4167	11633	6	641	348	172
+9954	Rönök	VA	46.9833	16.35	26806	6	1722	447	163
+9955	Rönök	VA	46.9833	16.35	26806	6	1722	447	163
+9961	Rábagyarmat	VA	46.9406	16.4286	26736	6	1679	816	306
+9962	Csörötnek	VA	46.9514	16.3764	04224	6	2053	870	331
+9962	Magyarlak	VA	46.95	16.35	03221	6	762	741	301
+9970	Szentgotthárd	VA	46.9519	16.3256	31583	4	6773	8953	3313
+9971	Szentgotthárd	VA	46.9519	16.3256	31583	4	6773	8953	3313
+9981	Szentgotthárd	VA	46.9519	16.3256	31583	4	6773	8953	3313
+9982	Apátistvánfalva	VA	46.9006	16.2647	08873	6	1286	369	166
+9982	Kétvölgy	VA	46.8833	16.2167	19345	6	628	127	72
+9982	Orfalu	VA	46.8833	16.2833	17093	6	694	60	32
+9983	Alsószölnök	VA	46.9278	16.2086	22549	6	1002	363	170
+9983	Szakonyfalu	VA	46.9167	16.2333	20932	6	1119	354	140
+9985	Felsőszölnök	VA	46.8797	16.1731	23287	6	2356	584	299
+2087	Piliscsaba	PE	47.6167	18.8333	07144	5	2557	7873	2468
+2099	Pilisszentkereszt	PE	47.7	18.9	18731	6	1721	2270	788
+2738	Cegléd	PE	47.1667	19.8	11341	4	24487	38318	15722
+2835	Tata	KE	47.65	18.3167	20127	4	7817	24902	9483
+2921	Komárom	KE	47.7333	18.1167	05449	4	7019	19747	8201
+3024	Lőrinci	HE	47.7333	19.6833	30401	4	2353	6126	2318
+3065	Pásztó	NO	47.9167	19.7	07409	4	7260	9880	4108
+3078	Bátonyterenye	NO	47.9667	19.8333	33534	4	7892	13270	5820
+3082	Pásztó	NO	47.9167	19.7	07409	4	7260	9880	4108
+3141	Salgótarján	NO	48.1167	19.8167	25788	1	10084	38207	18276
+3147	Kazár	NO	48.05	19.8667	28389	6	3039	2066	804
+3221	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3232	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3233	Gyöngyös	HE	47.7833	19.9333	05236	4	5531	32546	14438
+3234	Mátraszentimre	HE	47.9167	19.8833	29045	6	2129	501	271
+3244	Parád	HE	47.9167	20.0333	07436	5	3720	1961	1011
+3625	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3651	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3661	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3662	Ózd	BZ	48.2167	20.3	14492	4	9170	35621	14953
+3783	Edelény	BZ	48.3	20.7333	10728	4	5684	10372	3567
+3923	Gesztely	BZ	48.1	20.9667	15608	6	2882	2826	951
+3944	Sátoraljaújhely	BZ	48.4	21.6667	05120	4	7347	16299	6875
+3945	Sátoraljaújhely	BZ	48.4	21.6667	05120	4	7347	16299	6875
+3988	Sátoraljaújhely	BZ	48.4	21.6667	05120	4	7347	16299	6875
+4067	Egyek	HB	47.6333	20.9	15741	5	10479	5071	2392
+4074	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4078	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4079	Debrecen	HB	47.7675	21.24	15130	1	46165	206225	89716
+4086	Hajdúböszörmény	HB	47.6667	21.5167	03045	4	37078	31793	12312
+4162	Szerep	HB	47.2333	21.15	33437	6	5604	1604	571
+4246	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4252	Nyíradony	HB	47.6833	21.9167	06187	4	9659	7874	2796
+4253	Nyíradony	HB	47.6833	21.9167	06187	4	9659	7874	2796
+4446	Tiszaeszlár	SZ	48.05	21.4667	09113	6	5460	2676	1097
+4447	Tiszalök	SZ	48.0167	21.3833	23524	4	5872	5768	2262
+4481	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+4486	Tiszatelek	SZ	48.2	21.8	14447	6	3378	1473	541
+4551	Nyíregyháza	SZ	47.95	21.7167	17206	1	27454	117597	50269
+5095	Tiszavárkony	JN	47.0667	20.1833	31866	6	3562	1598	693
+5152	Jászberény	JN	47.5	19.9167	18209	4	22135	27134	11771
+5212	Törökszentmiklós	JN	47.1833	20.4167	27313	4	18516	21758	8989
+5213	Fegyvernek	JN	47.2667	20.5333	16647	5	7148	6629	2680
+5349	Kenderes	JN	47.25	20.6833	17145	4	11124	4917	2013
+5461	Tiszaföldvár	JN	46.9833	20.25	13815	4	8034	11548	4724
+5623	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5671	Békéscsaba	BE	46.6833	21.1	15200	1	19393	64784	29240
+5752	Medgyesegyháza	BE	46.5	21.0333	30128	5	6429	3848	1873
+6044	Kecskemét	BK	46.9	19.7833	26684	1	32136	111428	46329
+6648	Csongrád	CS	46.7	20.15	05111	4	17389	17686	8468
+7018	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7019	Sárbogárd	FE	46.8833	18.6333	23694	4	18934	12922	5089
+7027	Paks	TO	46.6333	18.8667	04862	4	15408	19833	8241
+7187	Bonyhád	TO	46.3	18.5333	06497	4	7213	13957	5592
+7409	Kaposvár	SO	46.3667	17.8	20473	1	11359	67663	27911
+7557	Barcs	SO	45.96	17.4586	32799	4	12290	11699	4511
+7714	Mohács	BA	45.9931	18.6831	23959	4	11223	19129	8706
+7715	Mohács	BA	45.9931	18.6831	23959	4	11223	19129	8706
+8054	Balinka	FE	47.3167	18.1833	31103	6	1862	987	381
+8172	Balatonkenese	VE	47.0333	18.1167	05148	5	6557	3263	1667
+8173	Balatonkenese	VE	47.0333	18.1167	05148	5	6557	3263	1667
+8184	Balatonfűzfő	VE	47.0667	18.05	02219	4	925	4335	1899
+8236	Balatonfüred	VE	46.95	17.8833	21175	4	4645	13422	5654
+8257	Badacsonytomaj	VE	46.8	17.5167	22327	4	3271	2178	1068
+8297	Tapolca	VE	46.8833	17.4333	29434	4	6348	16211	6854
+8411	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8412	Veszprém	VE	47.1	17.9167	11767	1	12690	63405	26062
+8447	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8448	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8451	Ajka	VE	47.1	17.5667	06673	4	9505	29685	12589
+8531	Marcaltő	VE	47.4333	17.3667	22220	6	2209	813	338
+8591	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8598	Pápa	VE	47.3333	17.4667	31945	4	9168	32664	13223
+8691	Balatonboglár	SO	46.7667	17.6667	33853	4	3204	5920	2784
+8709	Marcali	SO	46.5833	17.4167	18500	4	10440	11838	4975
+8714	Marcali	SO	46.5833	17.4167	18500	4	10440	11838	4975
+8785	Zalaszentgrót	ZA	46.95	17.0833	32522	4	8162	7313	3048
+8789	Zalaszentgrót	ZA	46.95	17.0833	32522	4	8162	7313	3048
+8793	Zalaszentgrót	ZA	46.95	17.0833	32522	4	8162	7313	3048
+8795	Zalaszentgrót	ZA	46.95	17.0833	32522	4	8162	7313	3048
+8831	Nagykanizsa	ZA	46.4618	17.0102	30933	3	14840	50540	21648
+9183	Mosonszentmiklós	GS	47.7333	17.3833	33677	6	3071	2319	947
+9434	Sarród	GS	47.6333	16.8667	30021	6	4007	1112	433
+9494	Sopron	GS	47.672	16.5852	08518	3	16906	59036	25073
+9541	Celldömölk	VA	47.25	17.15	27094	4	5239	11247	4723
+9740	Bük	VA	47.3833	16.75	02431	4	2086	3402	1613
+9955	Szentgotthárd	VA	46.9519	16.3256	31583	4	6773	8953	3313
diff --git a/common/models/Card.php b/common/models/Card.php
new file mode 100644
index 0000000..6468ed1
--- /dev/null
+++ b/common/models/Card.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "card".
+ *
+ * @property integer $id_card
+ * @property string $number
+ * @property integer $status
+ * @property integer $type
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Card extends \common\models\BaseFitnessActiveRecord
+{
+	
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+	const TYPE_RFID = 10;
+	const TYPE_QRCODE = 20;
+	const TYPE_BARCODE = 30;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'card';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['number', 'type','status'], 'required'],
+            [['status', 'type'], 'integer'],
+            [['number'], 'string', 'max' => 20],
+            [['number'], 'unique' ]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_card' => Yii::t('common/card', 'Id Card'),
+            'number' => Yii::t('common/card', 'Number'),
+            'status' => Yii::t('common/card', 'Status'),
+            'type' => Yii::t('common/card', 'Type'),
+            'created_at' => Yii::t('common/card', 'Created At'),
+            'updated_at' => Yii::t('common/card', 'Updated At'),
+        ];
+    }
+    
+    
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t('common/card', 'Active'),
+    			self::STATUS_DELETED => Yii::t('common/card', '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 types() {
+    	return [
+    			self::TYPE_RFID => Yii::t('common/card', 'RFID'),
+    			self::TYPE_QRCODE => Yii::t('common/card', 'QRCODE'),
+    			self::TYPE_BARCODE => Yii::t('common/card', 'BARCODE'),
+    	];
+    }
+    
+    public function getTypeHuman(){
+    	$result = null;
+    	$s = self::types($this->type);
+    	if ( array_key_exists($this->type, $s)){
+    		$result = $s[$this->type];
+    	}
+    	return $result;
+    }
+    
+    public function isInactive(){
+    	return $this->status == self::STATUS_DELETED;
+    }
+    
+    public static function readCard($number,$free = null){
+    	$card = null;
+    	$query = Card::find()
+    			->leftJoin(Customer::tableName(), 'card.id_card = customer.id_customer_card ' )
+    			->andWhere(['number'=>$number ]);
+    	
+    	if ( isset($free) ){
+    		if ( $free == true){
+    			$query->andWhere('customer.id_customer  is null');
+    		}else{
+    			$query->andWhere('customer.id_customer  is not null');
+    		}
+    	}
+    	
+    	$cards = $query->all();
+    	
+    	if ( count($cards) == 1){
+    		$card = $cards[0];
+    	}
+    	return $card;
+    }
+    
+    
+    public function getCustomer(){
+    	return $this->hasOne(Customer::className(), ['id_customer_card' => 'id_card']);
+    }
+    
+    public function getCustomerName(){
+    	$name = null;
+    	$customer = $this->customer;
+    	if ( $this->customer != null){
+    		$name = $this->customer->name;
+    	}
+    	return $name;
+    }
+    
+}
diff --git a/common/models/City.php b/common/models/City.php
new file mode 100644
index 0000000..79af7a0
--- /dev/null
+++ b/common/models/City.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "city".
+ *
+ * @property integer $id_city
+ * @property string $zip
+ * @property string $name
+ * @property string $city_code
+ * @property double $latitude
+ * @property double $longitude
+ * @property integer $cso_code
+ * @property integer $rig_id
+ * @property double $range
+ * @property integer $population
+ * @property integer $homes
+ */
+class City extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'city';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['zip', 'name', 'city_code'], 'required'],
+            [['latitude', 'longitude', 'range'], 'number'],
+            [['cso_code', 'rig_id', 'population', 'homes'], 'integer'],
+            [['zip'], 'string', 'max' => 8],
+            [['name'], 'string', 'max' => 64],
+            [['city_code'], 'string', 'max' => 2]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_city' => Yii::t('common/city', 'Id City'),
+            'zip' => Yii::t('common/city', 'Zip'),
+            'name' => Yii::t('common/city', 'Name'),
+            'city_code' => Yii::t('common/city', 'City Code'),
+            'latitude' => Yii::t('common/city', 'Latitude'),
+            'longitude' => Yii::t('common/city', 'Longitude'),
+            'cso_code' => Yii::t('common/city', 'Cso Code'),
+            'rig_id' => Yii::t('common/city', 'Rig ID'),
+            'range' => Yii::t('common/city', 'Range'),
+            'population' => Yii::t('common/city', 'Population'),
+            'homes' => Yii::t('common/city', 'Homes'),
+        ];
+    }
+}
diff --git a/common/models/Customer.php b/common/models/Customer.php
new file mode 100644
index 0000000..5ff5653
--- /dev/null
+++ b/common/models/Customer.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "customer".
+ *
+ * @property integer $id_customer
+ * @property integer $id_customer_card
+ * @property integer $id_user
+ * @property integer $id_partner_card
+ * @property integer $id_proposer
+ * @property string $name
+ * @property string $email
+ * @property string $password
+ * @property string $phone
+ * @property integer $sex
+ * @property string $date_stundent_card_expire
+ * @property string $birthdate
+ * @property string $image
+ * @property string $description
+ * @property string $tax_number
+ * @property string $country
+ * @property string $zip
+ * @property string $city
+ * @property string $address
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Customer extends \yii\db\ActiveRecord
+{
+	
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
+	const SEX_UNKNOWN = 0;
+	const SEX_MAN = 10;
+	const SEX_WOMAN = 20;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_customer_card', 'id_user', 'id_partner_card', 'id_proposer', 'sex'], 'integer'],
+            [['date_stundent_card_expire', 'birthdate', 'created_at', 'updated_at'], 'safe'],
+            [['name'], 'string', 'max' => 128],
+            [['email', 'image', 'description', 'address'], 'string', 'max' => 255],
+            [['password'], 'string', 'max' => 32],
+            [['phone', 'tax_number', 'country'], 'string', 'max' => 20],
+            [['zip'], 'string', 'max' => 8],
+            [['city'], 'string', 'max' => 30]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_customer' => Yii::t('common/customer', 'Id Customer'),
+            'id_customer_card' => Yii::t('common/customer', 'Id Customer Card'),
+            'id_user' => Yii::t('common/customer', 'Id User'),
+            'id_partner_card' => Yii::t('common/customer', 'Id Partner Card'),
+            'id_proposer' => Yii::t('common/customer', 'Id Proposer'),
+            'name' => Yii::t('common/customer', 'Name'),
+            'email' => Yii::t('common/customer', 'Email'),
+            'password' => Yii::t('common/customer', 'Password'),
+            'phone' => Yii::t('common/customer', 'Phone'),
+            'sex' => Yii::t('common/customer', 'Sex'),
+            'date_stundent_card_expire' => Yii::t('common/customer', 'Date Stundent Card Expire'),
+            'birthdate' => Yii::t('common/customer', 'Birthdate'),
+            'image' => Yii::t('common/customer', 'Image'),
+            'description' => Yii::t('common/customer', 'Description'),
+            'tax_number' => Yii::t('common/customer', 'Tax Number'),
+            'country' => Yii::t('common/customer', 'Country'),
+            'zip' => Yii::t('common/customer', 'Zip'),
+            'city' => Yii::t('common/customer', 'City'),
+            'address' => Yii::t('common/customer', 'Address'),
+            'created_at' => Yii::t('common/customer', 'Created At'),
+            'updated_at' => Yii::t('common/customer', 'Updated At'),
+            'customerCardNumber' => Yii::t('common/customer', 'Card number'),
+        ];
+    }
+    
+    
+    
+    static function statuses() {
+    	return [
+    			self::STATUS_ACTIVE => Yii::t('common/account', 'Active'),
+    			self::STATUS_DELETED => Yii::t('common/account', '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 sexes() {
+    	return [
+    			self::SEX_UNKNOWN => Yii::t('common/sex', 'Nincs megadva'),
+    			self::SEX_MAN => Yii::t('common/sex', 'Férfi'),
+    			self::SEX_WOMAN => Yii::t('common/sex', 'Nő'),
+    	];
+    }
+    
+    public function getSexHuman(){
+    	$result = null;
+    	$s = self::sexes( );
+    	if ( array_key_exists($this->sex, $s)){
+    		$result = $s[$this->sex];
+    	}
+    	return $result;
+    }
+    
+    public function isInactive(){
+    	return $this->status == self::STATUS_DELETED;
+    }
+    
+    
+    public function getCard(){
+    	return $this->hasOne ( Card::className (), [
+    			'id_card' => 'id_customer_card'
+    	] );
+    }
+    public function getUser(){
+    	return $this->hasOne ( User::className (), [
+    			'id' => 'id_user'
+    	] );
+    }
+    
+    public function getCustomerCardNumber(){
+    	$result = null;
+    	$card = $this->card;
+    	if ( $card != null) {
+    		$result = $card->number;
+    	}
+    	return $result;
+    }
+    public function getUsername(){
+    	$result = null;
+    	$user = $this->user;
+    	if ( $user != null) {
+    		$result = $user->username;
+    	}
+    	return $result;
+    }
+    
+    
+    
+}
diff --git a/composer.json b/composer.json
index b9decd9..7be5e79 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
         "yiisoft/yii2": ">=2.0.6",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
-        "kartik-v/yii2-widgets": "^3.4"
+        "kartik-v/yii2-widgets": "^3.4",
+        "kartik-v/yii2-widget-typeahead": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index a743e28..162ede7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "123abf1f9516a179624bd311ea413a81",
+    "hash": "f2a471b84002daca5d3a31691f578c78",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
diff --git a/console/migrations/m150925_194508_add__table__customer.php b/console/migrations/m150925_194508_add__table__customer.php
new file mode 100644
index 0000000..008b29c
--- /dev/null
+++ b/console/migrations/m150925_194508_add__table__customer.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150925_194508_add__table__customer extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%customer}}', [
+    			'id_customer' => $this->primaryKey(),
+    			'id_customer_card' => $this->integer(),
+    			'id_user' => $this->integer(),
+    			'id_partner_card' => $this->integer(),
+    			'id_proposer' =>$this->integer(),
+    			'name' => $this->string(128),
+    			'email' => $this->string(255),
+    			'password' => $this->string(32),
+    			'phone' => $this->string(20),
+    			'sex' => $this->smallInteger(),
+    			'date_stundent_card_expire' => $this->date(),
+    			'birthdate' => $this->date(),
+    			'image' => $this->string(255),
+    			'description' => $this->string(255),
+    			'tax_number' => $this->string(20),
+    			'country' => $this->string(20),
+    			'zip' => $this->string(8),
+    			'city' => $this->string(30),
+    			'address' => $this->string(255),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150925_194508_add__table__customer cannot be reverted.\n";
+
+        return false;
+    }
+
+}
diff --git a/console/migrations/m150925_201715_add__table__card.php b/console/migrations/m150925_201715_add__table__card.php
new file mode 100644
index 0000000..a4e3770
--- /dev/null
+++ b/console/migrations/m150925_201715_add__table__card.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150925_201715_add__table__card extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%card}}', [
+    			'id_card' => $this->primaryKey(),
+    			'number' => $this->string(20)->notNull(),
+    			'status' => $this->smallInteger()->notNull()->defaultValue(10),
+    			'type' => $this->integer(11)->notNull(),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150925_201715_add__table__card cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m150926_123638_add__table__city.php b/console/migrations/m150926_123638_add__table__city.php
new file mode 100644
index 0000000..c425333
--- /dev/null
+++ b/console/migrations/m150926_123638_add__table__city.php
@@ -0,0 +1,59 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150926_123638_add__table__city extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%city}}', [
+    			'id_city' => $this->primaryKey(),
+    			'zip' => $this->string(8)->notNull(),
+    			'name' => $this->string(64)->notNull(),
+    			'city_code' => $this->string(2)->notNull(),
+    			'latitude' => $this->float(),
+    			'longitude' => $this->float() ,
+    			'cso_code' => $this->integer(11) ,
+    			'rig_id' => $this->integer(11) ,
+    			'range' => $this->float() ,
+    			'population' =>$this->integer(11) ,
+    			'homes' =>  $this->integer(11) ,
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150926_123638_add__table__city cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    id_city
+zip
+name
+city_code
+latitude
+longitude
+cso_code
+rig_id
+cit_range
+population
+homes
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m150926_175400_add__data__to__city_table.php b/console/migrations/m150926_175400_add__data__to__city_table.php
new file mode 100644
index 0000000..757601b
--- /dev/null
+++ b/console/migrations/m150926_175400_add__data__to__city_table.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150926_175400_add__data__to__city_table extends Migration
+{
+    public function up()
+    {
+		$this->execute($this->insert);
+    }
+
+    public function down()
+    {
+        echo "m150926_175400_add__data__to__city_table cannot be reverted.\n";
+
+        return false;
+    }
+    
+    
+    public $insert = "INSERT INTO `city` VALUES (1,'1011','Budapest I. kerület','BU',47.501,19.047,9566,2,341.000,24728,16600),(2,'1012','Budapest I. kerület','BU',47.500,19.083,9566,2,341.000,24728,16600),(3,'1013','Budapest I. kerület','BU',47.496,19.031,9566,2,341.000,24728,16600),(4,'1014','Budapest I. kerület','BU',47.503,19.035,9566,2,341.000,24728,16600),(5,'1015','Budapest I. kerület','BU',47.500,19.083,9566,2,341.000,24728,16600),(6,'1016','Budapest I. kerület','BU',47.480,19.020,9566,2,341.000,24728,16600),(7,'1021','Budapest II. kerület','BU',47.496,19.077,3179,2,3634.000,88729,47668),(8,'1022','Budapest II. kerület','BU',47.500,19.083,3179,2,3634.000,88729,47668),(9,'1023','Budapest II. kerület','BU',47.521,19.035,3179,2,3634.000,88729,47668),(10,'1024','Budapest II. kerület','BU',47.507,19.057,3179,2,3634.000,88729,47668),(11,'1025','Budapest II. kerület','BU',47.403,19.091,3179,2,3634.000,88729,47668),(12,'1026','Budapest II. kerület','BU',47.512,19.013,3179,2,3634.000,88729,47668),(13,'1027','Budapest II. kerület','BU',47.508,19.039,3179,2,3634.000,88729,47668),(14,'1028','Budapest II. kerület','BU',47.500,19.083,3179,2,3634.000,88729,47668),(15,'1029','Budapest II. kerület','BU',47.500,19.083,3179,2,3634.000,88729,47668),(16,'1031','Budapest III. kerület','BU',47.573,19.054,18069,2,3970.000,123723,61137),(17,'1032','Budapest III. kerület','BU',47.500,19.083,18069,2,3970.000,123723,61137),(18,'1033','Budapest III. kerület','BU',47.500,19.083,18069,2,3970.000,123723,61137),(19,'1034','Budapest III. kerület','BU',47.500,19.083,18069,2,3970.000,123723,61137),(20,'1035','Budapest III. kerület','BU',47.500,19.083,18069,2,3970.000,123723,61137),(21,'1036','Budapest III. kerület','BU',47.533,19.042,18069,2,3970.000,123723,61137),(22,'1037','Budapest III. kerület','BU',47.500,19.083,18069,2,3970.000,123723,61137),(23,'1038','Budapest III. kerület','BU',47.592,19.049,18069,2,3970.000,123723,61137),(24,'1039','Budapest III. kerület','BU',47.556,19.068,18069,2,3970.000,123723,61137),(25,'1041','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(26,'1042','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(27,'1043','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(28,'1044','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(29,'1045','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(30,'1046','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(31,'1047','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(32,'1048','Budapest IV. kerület','BU',47.500,19.083,5467,2,1882.000,98374,47019),(33,'1051','Budapest V. kerület','BU',47.499,19.050,13392,2,259.000,27283,19250),(34,'1052','Budapest V. kerület','BU',47.497,19.055,13392,2,259.000,27283,19250),(35,'1053','Budapest V. kerület','BU',47.484,19.060,13392,2,259.000,27283,19250),(36,'1054','Budapest V. kerület','BU',47.507,19.053,13392,2,259.000,27283,19250),(37,'1055','Budapest V. kerület','BU',47.500,19.083,13392,2,259.000,27283,19250),(38,'1056','Budapest V. kerület','BU',47.493,19.052,13392,2,259.000,27283,19250),(39,'1061','Budapest VI. kerület','BU',47.500,19.057,16586,2,238.000,42120,26049),(40,'1062','Budapest VI. kerület','BU',47.525,19.077,16586,2,238.000,42120,26049),(41,'1063','Budapest VI. kerület','BU',47.510,19.070,16586,2,238.000,42120,26049),(42,'1064','Budapest VI. kerület','BU',47.506,19.069,16586,2,238.000,42120,26049),(43,'1065','Budapest VI. kerület','BU',47.477,19.085,16586,2,238.000,42120,26049),(44,'1066','Budapest VI. kerület','BU',47.508,19.059,16586,2,238.000,42120,26049),(45,'1067','Budapest VI. kerület','BU',47.508,19.060,16586,2,238.000,42120,26049),(46,'1068','Budapest VI. kerület','BU',47.510,19.072,16586,2,238.000,42120,26049),(47,'1071','Budapest VII. kerület','BU',47.500,19.083,29744,2,209.000,62530,36577),(48,'1072','Budapest VII. kerület','BU',47.500,19.072,29744,2,209.000,62530,36577),(49,'1073','Budapest VII. kerület','BU',47.499,19.072,29744,2,209.000,62530,36577),(50,'1074','Budapest VII. kerület','BU',47.477,19.071,29744,2,209.000,62530,36577),(51,'1075','Budapest VII. kerület','BU',47.497,19.057,29744,2,209.000,62530,36577),(52,'1076','Budapest VII. kerület','BU',47.500,19.083,29744,2,209.000,62530,36577),(53,'1077','Budapest VII. kerület','BU',47.501,19.079,29744,2,209.000,62530,36577),(54,'1078','Budapest VII. kerület','BU',47.503,19.082,29744,2,209.000,62530,36577),(55,'1081','Budapest VIII. kerület','BU',47.495,19.078,25405,2,685.000,82222,41816),(56,'1082','Budapest VIII. kerület','BU',47.514,19.079,25405,2,685.000,82222,41816),(57,'1083','Budapest VIII. kerület','BU',47.500,19.083,25405,2,685.000,82222,41816),(58,'1084','Budapest VIII. kerület','BU',47.500,19.083,25405,2,685.000,82222,41816),(59,'1085','Budapest VIII. kerület','BU',47.497,19.076,25405,2,685.000,82222,41816),(60,'1086','Budapest VIII. kerület','BU',47.500,19.083,25405,2,685.000,82222,41816),(61,'1087','Budapest VIII. kerület','BU',47.500,19.082,25405,2,685.000,82222,41816),(62,'1088','Budapest VIII. kerület','BU',47.490,19.090,25405,2,685.000,82222,41816),(63,'1089','Budapest VIII. kerület','BU',47.493,19.088,25405,2,685.000,82222,41816),(64,'1091','Budapest IX. kerület','BU',47.500,19.083,29586,2,1253.000,61576,38982),(65,'1092','Budapest IX. kerület','BU',47.500,19.083,29586,2,1253.000,61576,38982),(66,'1093','Budapest IX. kerület','BU',47.492,19.069,29586,2,1253.000,61576,38982),(67,'1094','Budapest IX. kerület','BU',47.481,19.072,29586,2,1253.000,61576,38982),(68,'1095','Budapest IX. kerület','BU',47.484,19.049,29586,2,1253.000,61576,38982),(69,'1096','Budapest IX. kerület','BU',47.500,19.083,29586,2,1253.000,61576,38982),(70,'1097','Budapest IX. kerület','BU',47.489,19.074,29586,2,1253.000,61576,38982),(71,'1098','Budapest IX. kerület','BU',47.500,19.083,29586,2,1253.000,61576,38982),(72,'1101','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(73,'1102','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(74,'1103','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(75,'1104','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(76,'1105','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(77,'1106','Budapest X. kerület','BU',47.503,19.137,10700,2,3249.000,79270,37353),(78,'1107','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(79,'1108','Budapest X. kerület','BU',47.500,19.083,10700,2,3249.000,79270,37353),(80,'1111','Budapest XI. kerület','BU',47.482,19.054,14216,2,3349.000,139049,73690),(81,'1112','Budapest XI. kerület','BU',47.473,19.008,14216,2,3349.000,139049,73690),(82,'1113','Budapest XI. kerület','BU',47.475,19.037,14216,2,3349.000,139049,73690),(83,'1114','Budapest XI. kerület','BU',47.500,19.083,14216,2,3349.000,139049,73690),(84,'1115','Budapest XI. kerület','BU',47.500,19.083,14216,2,3349.000,139049,73690),(85,'1116','Budapest XI. kerület','BU',47.444,19.041,14216,2,3349.000,139049,73690),(86,'1117','Budapest XI. kerület','BU',47.501,19.038,14216,2,3349.000,139049,73690),(87,'1118','Budapest XI. kerület','BU',47.485,19.033,14216,2,3349.000,139049,73690),(88,'1119','Budapest XI. kerület','BU',47.457,19.040,14216,2,3349.000,139049,73690),(89,'1121','Budapest XII. kerület','BU',47.501,19.008,24697,2,2667.000,56544,33468),(90,'1122','Budapest XII. kerület','BU',47.500,19.083,24697,2,2667.000,56544,33468),(91,'1123','Budapest XII. kerület','BU',47.494,19.024,24697,2,2667.000,56544,33468),(92,'1124','Budapest XII. kerület','BU',47.500,19.083,24697,2,2667.000,56544,33468),(93,'1125','Budapest XII. kerület','BU',47.500,19.083,24697,2,2667.000,56544,33468),(94,'1126','Budapest XII. kerület','BU',47.500,19.083,24697,2,2667.000,56544,33468),(95,'1131','Budapest XIII. kerület','BU',47.500,19.083,24299,2,1344.000,113531,70249),(96,'1132','Budapest XIII. kerület','BU',47.497,19.078,24299,2,1344.000,113531,70249),(97,'1133','Budapest XIII. kerület','BU',47.522,19.056,24299,2,1344.000,113531,70249),(98,'1134','Budapest XIII. kerület','BU',47.524,19.065,24299,2,1344.000,113531,70249),(99,'1135','Budapest XIII. kerület','BU',47.535,19.082,24299,2,1344.000,113531,70249),(100,'1136','Budapest XIII. kerület','BU',47.500,19.083,24299,2,1344.000,113531,70249),(101,'1137','Budapest XIII. kerület','BU',47.509,19.062,24299,2,1344.000,113531,70249),(102,'1138','Budapest XIII. kerület','BU',47.524,19.046,24299,2,1344.000,113531,70249),(103,'1139','Budapest XIII. kerület','BU',47.500,19.083,24299,2,1344.000,113531,70249),(104,'1141','Budapest XIV. kerület','BU',47.499,19.069,16337,2,1813.000,120148,70146),(105,'1142','Budapest XIV. kerület','BU',47.515,19.094,16337,2,1813.000,120148,70146),(106,'1143','Budapest XIV. kerület','BU',47.514,19.127,16337,2,1813.000,120148,70146),(107,'1144','Budapest XIV. kerület','BU',47.500,19.083,16337,2,1813.000,120148,70146),(108,'1145','Budapest XIV. kerület','BU',47.514,19.104,16337,2,1813.000,120148,70146),(109,'1146','Budapest XIV. kerület','BU',47.507,19.084,16337,2,1813.000,120148,70146),(110,'1147','Budapest XIV. kerület','BU',47.500,19.083,16337,2,1813.000,120148,70146),(111,'1148','Budapest XIV. kerület','BU',47.504,19.119,16337,2,1813.000,120148,70146),(112,'1149','Budapest XIV. kerület','BU',47.514,19.127,16337,2,1813.000,120148,70146),(113,'1151','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(114,'1152','Budapest XV. kerület','BU',47.548,19.131,11314,2,2694.000,80218,38177),(115,'1153','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(116,'1154','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(117,'1155','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(118,'1156','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(119,'1157','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(120,'1158','Budapest XV. kerület','BU',47.500,19.083,11314,2,2694.000,80218,38177),(121,'1161','Budapest XVI. kerület','BU',47.500,19.083,8208,2,3351.000,68484,29383),(122,'1162','Budapest XVI. kerület','BU',47.500,19.083,8208,2,3351.000,68484,29383),(123,'1163','Budapest XVI. kerület','BU',47.500,19.083,8208,2,3351.000,68484,29383),(124,'1164','Budapest XVI. kerület','BU',47.500,19.083,8208,2,3351.000,68484,29383),(125,'1165','Budapest XVI. kerület','BU',47.500,19.083,8208,2,3351.000,68484,29383),(126,'1171','Budapest XVII. kerület','BU',47.500,19.083,2112,2,5482.000,78250,30971),(127,'1172','Budapest XVII. kerület','BU',47.500,19.083,2112,2,5482.000,78250,30971),(128,'1173','Budapest XVII. kerület','BU',47.523,19.055,2112,2,5482.000,78250,30971),(129,'1174','Budapest XVII. kerület','BU',47.500,19.083,2112,2,5482.000,78250,30971),(130,'1181','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(131,'1182','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(132,'1183','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(133,'1184','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(134,'1185','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(135,'1186','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(136,'1188','Budapest XVIII. kerület','BU',47.500,19.083,29285,2,3860.000,93225,42467),(137,'1191','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(138,'1192','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(139,'1193','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(140,'1194','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(141,'1195','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(142,'1196','Budapest XIX. kerület','BU',47.500,19.083,4011,2,938.000,61610,27225),(143,'1201','Budapest XX. kerület','BU',47.500,19.083,6026,2,1218.000,63371,30299),(144,'1202','Budapest XX. kerület','BU',47.500,19.083,6026,2,1218.000,63371,30299),(145,'1203','Budapest XX. kerület','BU',47.500,19.083,6026,2,1218.000,63371,30299),(146,'1204','Budapest XX. kerület','BU',47.500,19.083,6026,2,1218.000,63371,30299),(147,'1205','Budapest XX. kerület','BU',47.500,19.083,6026,2,1218.000,63371,30299),(148,'1211','Budapest XXI. kerület','BU',47.500,19.083,13189,2,2575.000,76339,32634),(149,'1212','Budapest XXI. kerület','BU',47.484,19.123,13189,2,2575.000,76339,32634),(150,'1213','Budapest XXI. kerület','BU',47.500,19.083,13189,2,2575.000,76339,32634),(151,'1214','Budapest XXI. kerület','BU',47.500,19.083,13189,2,2575.000,76339,32634),(152,'1215','Budapest XXI. kerület','BU',47.500,19.083,13189,2,2575.000,76339,32634),(153,'1221','Budapest XXII. kerület','BU',47.500,19.083,10214,2,3425.000,50499,21248),(154,'1222','Budapest XXII. kerület','BU',47.500,19.083,10214,2,3425.000,50499,21248),(155,'1223','Budapest XXII. kerület','BU',47.500,19.083,10214,2,3425.000,50499,21248),(156,'1224','Budapest XXII. kerület','BU',47.500,19.083,10214,2,3425.000,50499,21248),(157,'1225','Budapest XXII. kerület','BU',47.500,19.083,10214,2,3425.000,50499,21248),(158,'1237','Budapest XXIII. kerület','BU',47.500,19.083,34139,2,4077.000,20387,8592),(159,'1238','Budapest XXIII. kerület','BU',47.500,19.083,34139,2,4077.000,20387,8592),(160,'1239','Budapest XXIII. kerület','BU',47.500,19.083,34139,2,4077.000,20387,8592),(161,'1529','Budapest XII. kerület','BU',47.500,19.083,24697,2,2667.000,56544,33468),(162,'2000','Szentendre','PE',47.667,19.083,15440,4,4382.000,25401,9519),(163,'2001','Szentendre','PE',47.667,19.083,15440,4,4382.000,25401,9519),(164,'2002','Szentendre','PE',47.667,19.083,15440,4,4382.000,25401,9519),(165,'2003','Szentendre','PE',47.667,19.083,15440,4,4382.000,25401,9519),(166,'2009','Pilisszentlászló','PE',47.717,19.000,8457,6,1775.000,1123,427),(167,'2011','Budakalász','PE',47.617,19.050,23463,5,1517.000,10299,3638),(168,'2012','Budakalász','PE',47.617,19.050,23463,5,1517.000,10299,3638),(169,'2013','Budakalász','PE',47.617,19.050,23463,5,1517.000,10299,3638),(170,'2014','Csobánka','PE',47.633,18.967,6822,6,2276.000,3169,989),(171,'2015','Szigetmonostor','PE',47.683,19.117,26213,6,2351.000,2213,708),(172,'2016','Leányfalu','PE',47.717,19.083,30809,5,1537.000,3475,1153),(173,'2017','Pócsmegyer','PE',47.717,19.100,4905,6,1308.000,1733,566),(174,'2019','Pomáz','PE',47.650,19.033,6372,4,4903.000,16677,5685),(175,'2021','Tahitótfalu','PE',47.750,19.100,31963,6,3917.000,5404,1971),(176,'2022','Tahitótfalu','PE',47.750,19.100,31963,6,3917.000,5404,1971),(177,'2023','Dunabogdány','PE',47.783,19.033,25362,6,2550.000,3143,1116),(178,'2024','Kisoroszi','PE',47.800,19.017,29850,6,1094.000,938,411),(179,'2025','Visegrád','PE',47.783,18.983,28413,4,3327.000,1831,718),(180,'2026','Visegrád','PE',47.783,18.983,28413,4,3327.000,1831,718),(181,'2027','Dömös','KE',47.767,18.917,6594,6,2398.000,1167,486),(182,'2028','Pilismarót','KE',47.783,18.883,14669,6,4459.000,2072,738),(183,'2030','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(184,'2031','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(185,'2032','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(186,'2033','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(187,'2035','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(188,'2036','Érd','PE',47.367,18.933,30988,3,6054.000,63669,21993),(189,'2038','Sóskút','PE',47.400,18.833,6840,6,2767.000,3160,1109),(190,'2039','Pusztazámor','PE',47.400,18.783,15583,6,927.000,1166,437),(191,'2040','Budaörs','PE',47.453,18.960,23278,4,2359.000,28272,10269),(192,'2041','Budaörs','PE',47.450,18.967,23278,4,2359.000,28272,10269),(193,'2042','Budaörs','PE',47.450,18.967,23278,4,2359.000,28272,10269),(194,'2043','Budaörs','PE',47.450,18.967,23278,4,2359.000,28272,10269),(195,'2044','Budaörs','PE',47.450,18.967,23278,4,2359.000,28272,10269),(196,'2045','Törökbálint','PE',47.433,18.917,6859,4,2940.000,13010,4507),(197,'2046','Törökbálint','PE',47.433,18.917,6859,4,2940.000,13010,4507),(198,'2047','Törökbálint','PE',47.433,18.917,6859,4,2940.000,13010,4507),(199,'2049','Diósd','PE',47.400,18.950,24013,6,575.000,8612,3105),(200,'2050','Diósd','PE',47.400,18.950,24013,6,575.000,8612,3105),(201,'2051','Biatorbágy','PE',47.467,18.817,8891,4,4380.000,11769,4082),(202,'2052','Biatorbágy','PE',47.467,18.817,8891,4,4380.000,11769,4082),(203,'2053','Herceghalom','PE',47.500,18.750,33552,6,734.000,1883,616),(204,'2055','Herceghalom','PE',47.500,18.750,33552,6,734.000,1883,616),(205,'2056','Herceghalom','PE',47.500,18.750,33552,6,734.000,1883,616),(206,'2060','Bicske','FE',47.483,18.633,10481,4,7708.000,11552,3997),(207,'2061','Bicske','FE',47.483,18.633,10481,4,7708.000,11552,3997),(208,'2063','Bicske','FE',47.483,18.633,10481,4,7708.000,11552,3997),(209,'2064','Csabdi','FE',47.517,18.617,30544,6,1702.000,1205,432),(210,'2065','Mány','FE',47.533,18.667,23490,6,4472.000,2372,781),(211,'2066','Újbarok','FE',47.483,18.567,17482,6,149.000,415,143),(212,'2066','Szár','FE',47.483,18.517,19549,6,2263.000,1675,580),(213,'2067','Szárliget','FE',47.495,18.610,33491,6,1456.000,2328,809),(214,'2071','Páty','PE',47.517,18.833,15024,6,3930.000,6773,2011),(215,'2072','Zsámbék','PE',47.550,18.717,25034,5,3366.000,5284,1640),(216,'2073','Tök','PE',47.567,18.733,24527,6,2473.000,1384,532),(217,'2074','Perbál','PE',47.600,18.767,28185,6,2565.000,2192,748),(218,'2080','Pilisjászfalu','PE',47.604,18.852,34148,6,697.000,1435,467),(219,'2081','Piliscsaba','PE',47.617,18.833,7144,5,2557.000,7873,2468),(220,'2082','Piliscsaba','PE',47.617,18.833,7144,5,2557.000,7873,2468),(221,'2083','Solymár','PE',47.583,18.933,7384,5,1786.000,10043,3711),(222,'2084','Pilisszentiván','PE',47.617,18.900,11396,6,812.000,4303,1589),(223,'2085','Pilisvörösvár','PE',47.617,18.917,14340,4,2430.000,13463,4565),(224,'2086','Tinnye','PE',47.617,18.783,7108,6,1610.000,1576,559),(225,'2087','Tinnye','PE',47.617,18.783,7108,6,1610.000,1576,559),(226,'2089','Telki','PE',47.550,18.833,8280,6,1047.000,3448,1062),(227,'2090','Remeteszőlős','PE',47.600,18.898,34315,6,56.000,651,206),(228,'2091','Etyek','FE',47.450,18.750,2316,6,5327.000,4236,1469),(229,'2092','Budakeszi','PE',47.517,18.933,12052,4,3710.000,13933,5382),(230,'2093','Budajenő','PE',47.550,18.800,3407,6,1242.000,1701,570),(231,'2094','Nagykovácsi','PE',47.583,18.883,9991,5,3001.000,6310,2175),(232,'2095','Pilisszántó','PE',47.667,18.900,5290,6,1596.000,2467,817),(233,'2096','Üröm','PE',47.600,19.017,11934,6,668.000,6937,2429),(234,'2097','Pilisborosjenő','PE',47.617,19.000,29601,6,927.000,3453,1226),(235,'2098','Pilisszentkereszt','PE',47.700,18.900,18731,6,1721.000,2270,788),(236,'2099','Dobogókő','PE',47.717,18.900,18731,6,1721.000,2270,788),(237,'2100','Gödöllő','PE',47.600,19.367,32559,4,6197.000,33575,12070),(238,'2101','Gödöllő','PE',47.600,19.367,32559,4,6197.000,33575,12070),(239,'2102','Gödöllő','PE',47.600,19.367,32559,4,6197.000,33575,12070),(240,'2103','Gödöllő','PE',47.600,19.367,32559,4,6197.000,33575,12070),(241,'2105','Gödöllő','PE',47.600,19.367,32559,4,6197.000,33575,12070),(242,'2111','Szada','PE',47.633,19.317,21458,6,1671.000,4355,1630),(243,'2112','Veresegyház','PE',47.650,19.283,18342,4,2856.000,15633,5149),(244,'2113','Erdőkertes','PE',47.667,19.317,13480,6,575.000,7437,2591),(245,'2114','Valkó','PE',47.567,19.517,17598,5,3759.000,2541,827),(246,'2115','Vácszentlászló','PE',47.583,19.533,9104,6,2987.000,2115,730),(247,'2116','Zsámbok','PE',47.550,19.617,22035,6,2335.000,2414,995),(248,'2117','Isaszeg','PE',47.533,19.400,7807,4,5483.000,11214,3641),(249,'2118','Dány','PE',47.517,19.550,18397,6,4301.000,4364,1463),(250,'2119','Pécel','PE',47.483,19.350,4057,4,4364.000,14868,4839),(251,'2120','Dunakeszi','PE',47.633,19.133,18616,4,3106.000,37153,14715),(252,'2121','Dunakeszi','PE',47.633,19.133,18616,4,3106.000,37153,14715),(253,'2122','Dunakeszi','PE',47.633,19.133,18616,4,3106.000,37153,14715),(254,'2123','Dunakeszi','PE',47.633,19.133,18616,4,3106.000,37153,14715),(255,'2131','Göd','PE',47.700,19.133,23649,4,2224.000,17587,6531),(256,'2132','Göd','PE',47.698,19.154,23649,4,2224.000,17587,6531),(257,'2133','Sződliget','PE',47.733,19.150,28866,6,731.000,4552,1501),(258,'2134','Sződ','PE',47.717,19.200,12690,6,1576.000,3270,1145),(259,'2135','Csörög','PE',47.733,19.183,34333,6,504.000,2174,583),(260,'2141','Csömör','PE',47.550,19.233,22804,5,2270.000,8904,3043),(261,'2142','Nagytarcsa','PE',47.533,19.283,23409,6,1214.000,3539,1110),(262,'2143','Kistarcsa','PE',47.533,19.267,34157,4,1102.000,10986,3715),(263,'2144','Kerepes','PE',47.533,19.267,34166,5,2408.000,9960,3304),(264,'2145','Kerepes','PE',47.533,19.267,34166,5,2408.000,9960,3304),(265,'2146','Mogyoród','PE',47.600,19.250,17783,5,3448.000,6018,1971),(266,'2151','Fót','PE',47.617,19.200,32610,4,3740.000,18365,6119),(267,'2152','Fót','PE',47.617,19.200,32610,4,3740.000,18365,6119),(268,'2153','Fót','PE',47.617,19.200,32610,4,3740.000,18365,6119),(269,'2161','Csomád','PE',47.667,19.233,33118,6,1239.000,1405,506),(270,'2162','Őrbottyán','PE',47.683,19.267,8545,5,2737.000,7109,2365),(271,'2163','Vácrátót','PE',47.717,19.233,17668,6,1805.000,1864,644),(272,'2164','Váchartyán','PE',47.733,19.267,19886,6,1213.000,1835,641),(273,'2165','Kisnémedi','PE',47.733,19.300,5227,6,1383.000,681,302),(274,'2166','Püspökszilágy','PE',47.733,19.317,4303,6,2530.000,767,294),(275,'2167','Vácduka','PE',47.750,19.217,5917,6,840.000,1284,448),(276,'2170','Aszód','PE',47.650,19.500,16188,4,1620.000,6324,2399),(277,'2173','Kartal','PE',47.667,19.550,30696,5,2911.000,5923,1870),(278,'2174','Verseg','PE',47.717,19.550,22488,6,2958.000,1351,534),(279,'2175','Kálló','NO',47.750,19.500,8642,6,3697.000,1507,535),(280,'2176','Erdőkürt','NO',47.767,19.467,22655,6,2172.000,580,264),(281,'2177','Erdőtarcsa','NO',47.767,19.550,21795,6,1507.000,534,246),(282,'2181','Iklad','PE',47.667,19.450,3300,6,1121.000,2125,672),(283,'2182','Domony','PE',47.650,19.433,4808,6,2180.000,2139,628),(284,'2183','Galgamácsa','PE',47.700,19.383,27128,6,4331.000,1986,739),(285,'2184','Vácegres','PE',47.683,19.367,30331,6,1367.000,887,294),(286,'2185','Váckisújfalu','PE',47.700,19.350,5698,6,1069.000,472,156),(287,'2191','Bag','PE',47.633,19.483,9131,5,2355.000,3987,1314),(288,'2192','Hévízgyörk','PE',47.633,19.517,13949,6,2284.000,3130,1099),(289,'2193','Galgahévíz','PE',47.617,19.567,19503,6,3118.000,2527,982),(290,'2194','Tura','PE',47.617,19.600,9593,4,5592.000,7945,2974),(291,'2200','Monor','PE',47.350,19.450,10551,4,4829.000,18526,6430),(292,'2201','Monor','PE',47.350,19.450,10551,4,4829.000,18526,6430),(293,'2202','Monor','PE',47.350,19.450,10551,4,4829.000,18526,6430),(294,'2209','Péteri','PE',47.383,19.417,21847,6,1189.000,2153,742),(295,'2211','Vasad','PE',47.317,19.400,22585,6,3341.000,1781,734),(296,'2212','Csévharaszt','PE',47.300,19.433,18476,6,4922.000,1953,690),(297,'2213','Csévharaszt','PE',47.300,19.433,18476,6,4922.000,1953,690),(298,'2214','Pánd','PE',47.350,19.633,22248,6,2221.000,2103,720),(299,'2215','Káva','PE',47.350,19.583,27827,6,1131.000,607,276),(300,'2216','Bénye','PE',47.350,19.550,25098,6,1652.000,1268,498),(301,'2217','Gomba','PE',47.367,19.533,9441,6,3971.000,3030,1037),(302,'2220','Vecsés','PE',47.402,19.246,26815,4,3616.000,20550,7662),(303,'2221','Vecsés','PE',47.400,19.283,26815,4,3616.000,20550,7662),(304,'2222','Vecsés','PE',47.400,19.283,26815,4,3616.000,20550,7662),(305,'2225','Üllő','PE',47.383,19.350,12894,4,4810.000,10924,3920),(306,'2230','Gyömrő','PE',47.417,19.400,29735,4,2651.000,15714,5525),(307,'2233','Ecser','PE',47.450,19.333,24518,6,1310.000,3589,1391),(308,'2234','Maglód','PE',47.450,19.367,10922,4,2236.000,11319,3717),(309,'2235','Mende','PE',47.417,19.450,3692,6,2717.000,4325,1485),(310,'2241','Sülysáp','PE',47.450,19.558,21713,5,4719.000,8258,2888),(311,'2242','Sülysáp','PE',47.450,19.558,21713,5,4719.000,8258,2888),(312,'2243','Kóka','PE',47.483,19.583,31361,6,4436.000,4530,1706),(313,'2244','Úri','PE',47.417,19.533,28644,6,2219.000,2713,957),(314,'2251','Tápiószecső','PE',47.450,19.600,31796,5,3838.000,6434,2323),(315,'2252','Tóalmás','PE',47.517,19.667,21467,6,3935.000,3407,1349),(316,'2253','Tápióság','PE',47.400,19.617,9405,6,3354.000,2705,1136),(317,'2254','Szentmártonkáta','PE',47.450,19.700,28653,6,5220.000,4999,1927),(318,'2255','Szentlőrinckáta','PE',47.517,19.750,7542,6,2015.000,1962,824),(319,'2300','Ráckeve','PE',47.167,18.950,17260,4,6409.000,9842,3692),(320,'2301','Ráckeve','PE',47.167,18.950,17260,4,6409.000,9842,3692),(321,'2309','Lórév','PE',47.117,18.900,9140,6,988.000,315,126),(322,'2310','Szigetszentmiklós','PE',47.350,19.050,28954,4,4565.000,32340,11485),(323,'2311','Szigetszentmiklós','PE',47.350,19.050,28954,4,4565.000,32340,11485),(324,'2313','Szigetszentmiklós','PE',47.350,19.050,28954,4,4565.000,32340,11485),(325,'2314','Halásztelek','PE',47.367,18.983,9690,4,864.000,8620,3104),(326,'2315','Szigethalom','PE',47.333,19.000,13277,4,912.000,16477,5236),(327,'2316','Tököl','PE',47.310,19.002,29823,4,3849.000,10164,3699),(328,'2317','Szigetcsép','PE',47.267,18.983,7870,6,1820.000,2354,901),(329,'2318','Szigetszentmárton','PE',47.233,18.967,15185,6,1073.000,2083,815),(330,'2319','Szigetújfalu','PE',47.233,18.933,22114,6,1083.000,2087,839),(331,'2321','Szigetbecse','PE',47.133,18.950,26259,6,1712.000,1346,511),(332,'2322','Makád','PE',47.083,18.933,4394,6,3177.000,1252,528),(333,'2330','Dunaharaszti','PE',47.350,19.083,9584,4,2917.000,19491,7467),(334,'2331','Dunaharaszti','PE',47.350,19.083,9584,4,2917.000,19491,7467),(335,'2332','Dunaharaszti','PE',47.350,19.083,9584,4,2917.000,19491,7467),(336,'2335','Taksony','PE',47.333,19.083,30720,5,2085.000,6369,2062),(337,'2336','Dunavarsány','PE',47.283,19.067,20534,4,2252.000,7112,2350),(338,'2337','Délegyháza','PE',47.250,19.067,9973,6,2542.000,3187,1118),(339,'2338','Áporka','PE',47.233,19.017,10108,6,1747.000,1155,479),(340,'2339','Majosháza','PE',47.267,19.000,10755,6,1142.000,1486,527),(341,'2340','Kiskunlacháza','PE',47.200,19.017,10816,5,9350.000,9080,3351),(342,'2341','Kiskunlacháza','PE',47.200,19.017,10816,5,9350.000,9080,3351),(343,'2342','Kiskunlacháza','PE',47.200,19.017,10816,5,9350.000,9080,3351),(344,'2344','Dömsöd','PE',47.083,19.000,29647,5,7242.000,5745,2336),(345,'2345','Apaj','PE',47.117,19.100,33561,6,7104.000,1251,437),(346,'2347','Bugyi','PE',47.217,19.150,32027,5,11555.000,5338,2026),(347,'2351','Alsónémedi','PE',47.317,19.167,23199,5,4907.000,4982,2037),(348,'2360','Gyál','PE',47.383,19.233,25627,4,2493.000,23220,8128),(349,'2363','Felsőpakony','PE',47.350,19.250,6035,6,1533.000,3415,1167),(350,'2364','Ócsa','PE',47.300,19.233,4075,4,8166.000,8989,3249),(351,'2365','Inárcs','PE',47.267,19.333,32106,6,2253.000,4448,1533),(352,'2366','Kakucs','PE',47.250,19.367,32230,6,2180.000,2729,966),(353,'2367','Újhartyán','PE',47.217,19.383,6293,6,2243.000,2755,1069),(354,'2370','Dabas','PE',47.183,19.317,9247,4,16599.000,16671,6007),(355,'2371','Dabas','PE',47.183,19.317,9247,4,16599.000,16671,6007),(356,'2372','Dabas','PE',47.183,19.317,9247,4,16599.000,16671,6007),(357,'2373','Dabas','PE',47.183,19.317,9247,4,16599.000,16671,6007),(358,'2374','Dabas','PE',47.183,19.317,9247,4,16599.000,16671,6007),(359,'2375','Tatárszentgyörgy','PE',47.067,19.383,27386,6,5506.000,1966,676),(360,'2376','Hernád','PE',47.167,19.433,9849,6,2706.000,4077,1411),(361,'2377','Örkény','PE',47.133,19.433,5281,4,3644.000,4924,1728),(362,'2378','Pusztavacs','PE',47.167,19.500,23083,6,7907.000,1427,567),(363,'2381','Táborfalva','PE',47.083,19.467,8332,6,4205.000,3429,1380),(364,'2400','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(365,'2401','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(366,'2402','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(367,'2403','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(368,'2404','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(369,'2405','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(370,'2406','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(371,'2407','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(372,'2408','Dunaújváros','FE',46.983,18.933,3115,3,5267.000,48562,22831),(373,'2421','Nagyvenyim','FE',46.967,18.850,26134,6,4368.000,4156,1469),(374,'2422','Mezőfalva','FE',46.933,18.767,17552,5,8042.000,4908,1724),(375,'2423','Daruszentmiklós','FE',46.895,18.845,34342,6,1912.000,1642,573),(376,'2424','Előszállás','FE',46.833,18.817,20358,5,3998.000,2233,952),(377,'2425','Nagykarácsony','FE',46.867,18.783,7001,6,3046.000,1433,589),(378,'2426','Baracs','FE',46.883,18.883,7047,6,5518.000,3573,1294),(379,'2427','Baracs','FE',46.883,18.883,7047,6,5518.000,3573,1294),(380,'2428','Kisapostag','FE',46.900,18.933,12636,6,958.000,1448,508),(381,'2431','Perkáta','FE',47.050,18.800,19354,5,7452.000,4047,1564),(382,'2432','Szabadegyháza','FE',47.067,18.683,13259,6,4164.000,2216,788),(383,'2433','Sárosd','FE',47.050,18.650,25140,5,4812.000,3397,1126),(384,'2434','Hantos','FE',47.000,18.700,23427,6,3696.000,950,373),(385,'2435','Nagylók','FE',46.967,18.667,32364,6,3244.000,1081,461),(386,'2440','Százhalombatta','PE',47.333,18.933,17312,4,2806.000,18226,7187),(387,'2441','Százhalombatta','PE',47.333,18.933,17312,4,2806.000,18226,7187),(388,'2442','Százhalombatta','PE',47.333,18.933,17312,4,2806.000,18226,7187),(389,'2443','Százhalombatta','PE',47.333,18.933,17312,4,2806.000,18226,7187),(390,'2444','Százhalombatta','PE',47.333,18.933,17312,4,2806.000,18226,7187),(391,'2451','Ercsi','FE',47.250,18.900,23603,4,6531.000,8426,3142),(392,'2453','Ercsi','FE',47.250,18.900,23603,4,6531.000,8426,3142),(393,'2454','Iváncsa','FE',47.150,18.817,13462,6,2517.000,2932,1009),(394,'2455','Beloiannisz','FE',47.167,18.833,8466,6,454.000,1161,436),(395,'2456','Besnyő','FE',47.183,18.817,16346,6,4464.000,1808,659),(396,'2457','Adony','FE',47.117,18.867,8925,4,6105.000,3839,1458),(397,'2458','Kulcs','FE',47.050,18.917,34209,6,1673.000,2503,792),(398,'2459','Rácalmás','FE',47.017,18.950,9900,5,4064.000,4461,1417),(399,'2461','Tárnok','PE',47.367,18.850,4154,5,2360.000,9029,3320),(400,'2462','Martonvásár','FE',47.317,18.783,4659,4,3125.000,5702,1927),(401,'2463','Tordas','FE',47.350,18.750,21005,6,1676.000,2000,613),(402,'2464','Gyúró','FE',47.383,18.733,15918,6,2437.000,1287,439),(403,'2465','Ráckeresztúr','FE',47.267,18.833,2015,6,3530.000,3296,1253),(404,'2471','Baracska','FE',47.283,18.767,8581,6,3968.000,2723,975),(405,'2472','Kajászó','FE',47.317,18.733,21342,6,2398.000,1054,392),(406,'2473','Vál','FE',47.367,18.683,5829,6,4048.000,2494,890),(407,'2475','Kápolnásnyék','FE',47.233,18.683,21926,6,4150.000,3483,1421),(408,'2476','Pázmánd','FE',47.283,18.667,21786,6,2714.000,2054,883),(409,'2477','Vereb','FE',47.317,18.617,3498,6,2232.000,801,310),(410,'2481','Velence','FE',47.233,18.650,25016,4,3337.000,5173,2084),(411,'2482','Velence','FE',47.233,18.650,25016,4,3337.000,5173,2084),(412,'2483','Gárdony','FE',47.200,18.650,10296,4,6350.000,9303,3707),(413,'2484','Gárdony','FE',47.200,18.650,10296,4,6350.000,9303,3707),(414,'2485','Gárdony','FE',47.200,18.650,10296,4,6350.000,9303,3707),(415,'2490','Pusztaszabolcs','FE',47.133,18.767,29018,4,5167.000,6192,2229),(416,'2500','Esztergom','KE',47.800,18.750,25131,4,10035.000,30928,11930),(417,'2501','Esztergom','KE',47.800,18.750,25131,4,10035.000,30928,11930),(418,'2503','Esztergom','KE',47.800,18.750,25131,4,10035.000,30928,11930),(419,'2508','Esztergom','KE',47.800,18.750,25131,4,10035.000,30928,11930),(420,'2509','Esztergom','KE',47.800,18.750,25131,4,10035.000,30928,11930),(421,'2510','Dorog','KE',47.717,18.733,10490,4,1155.000,12262,4949),(422,'2511','Dorog','KE',47.717,18.733,10490,4,1155.000,12262,4949),(423,'2512','Dorog','KE',47.717,18.733,10490,4,1155.000,12262,4949),(424,'2517','Kesztölc','KE',47.717,18.800,29577,6,2200.000,2669,984),(425,'2518','Leányvár','KE',47.683,18.783,25487,6,725.000,1721,647),(426,'2519','Piliscsév','KE',47.683,18.817,21874,6,2490.000,2378,919),(427,'2521','Csolnok','KE',47.700,18.717,18926,6,1871.000,3377,1234),(428,'2522','Dág','KE',47.667,18.717,22910,6,1189.000,990,387),(429,'2523','Sárisáp','KE',47.683,18.683,26903,6,1448.000,2885,1102),(430,'2524','Nagysáp','KE',47.683,18.600,27076,6,2477.000,1556,513),(431,'2525','Bajna','KE',47.650,18.600,16744,6,3727.000,1955,758),(432,'2526','Epöl','KE',47.650,18.650,29638,6,1253.000,610,258),(433,'2527','Máriahalom','KE',47.633,18.717,22637,6,1085.000,663,237),(434,'2528','Úny','KE',47.633,18.733,27632,6,1158.000,743,311),(435,'2529','Annavölgy','KE',47.663,18.677,34227,6,460.000,958,402),(436,'2531','Tokod','KE',47.717,18.667,14155,5,1491.000,4280,1593),(437,'2532','Tokodaltáró','KE',47.744,18.597,34023,6,527.000,3111,1055),(438,'2533','Bajót','KE',47.733,18.567,29355,6,1644.000,1567,537),(439,'2534','Tát','KE',47.750,18.650,8758,5,1177.000,5437,2011),(440,'2535','Mogyorósbánya','KE',47.733,18.600,28255,6,732.000,870,313),(441,'2536','Nyergesújfalu','KE',47.767,18.550,15352,4,3950.000,7660,2896),(442,'2537','Nyergesújfalu','KE',47.767,18.550,15352,4,3950.000,7660,2896),(443,'2541','Lábatlan','KE',47.750,18.500,15255,4,2635.000,5115,2085),(444,'2542','Lábatlan','KE',47.750,18.500,15255,4,2635.000,5115,2085),(445,'2543','Süttő','KE',47.750,18.450,8688,6,3436.000,2024,789),(446,'2544','Neszmély','KE',47.733,18.367,33826,6,2776.000,1385,568),(447,'2545','Dunaalmás','KE',47.733,18.333,33835,6,1477.000,1639,599),(448,'2600','Vác','PE',47.783,19.133,24934,4,6160.000,33381,14210),(449,'2601','Vác','PE',47.783,19.133,24934,4,6160.000,33381,14210),(450,'2602','Vác','PE',47.783,19.133,24934,4,6160.000,33381,14210),(451,'2603','Vác','PE',47.783,19.133,24934,4,6160.000,33381,14210),(452,'2610','Nőtincs','NO',47.883,19.150,29425,6,2047.000,1169,490),(453,'2611','Felsőpetény','NO',47.883,19.200,24323,6,1450.000,735,266),(454,'2612','Kosd','PE',47.800,19.183,27687,6,3408.000,2507,894),(455,'2613','Rád','PE',47.800,19.233,2370,6,1774.000,1870,635),(456,'2614','Penc','PE',47.800,19.250,18689,6,2134.000,1476,532),(457,'2615','Csővár','PE',47.817,19.333,26985,6,1717.000,671,254),(458,'2616','Ősagárd','NO',47.867,19.200,19318,6,1092.000,329,160),(459,'2616','Keszeg','NO',47.833,19.250,31413,6,995.000,702,285),(460,'2617','Alsópetény','NO',47.883,19.250,16425,6,1968.000,734,315),(461,'2618','Nézsa','NO',47.850,19.300,9797,6,1868.000,1091,471),(462,'2619','Legénd','NO',47.883,19.317,30395,6,1841.000,504,236),(463,'2621','Verőce','PE',47.833,19.033,33729,6,2019.000,3486,1142),(464,'2623','Kismaros','PE',47.833,19.033,33738,6,1211.000,2009,680),(465,'2624','Szokolya','PE',47.867,19.017,6947,6,5905.000,1791,688),(466,'2625','Kóspallag','PE',47.883,18.933,24679,6,1277.000,783,306),(467,'2626','Nagymaros','PE',47.783,18.967,31732,4,3437.000,4691,1802),(468,'2627','Zebegény','PE',47.800,18.917,14960,6,964.000,1181,474),(469,'2628','Szob','PE',47.817,18.867,24916,4,1797.000,2986,1103),(470,'2629','Márianosztra','PE',47.867,18.883,4570,6,2026.000,937,397),(471,'2631','Ipolydamásd','PE',47.850,18.833,28097,6,1160.000,354,210),(472,'2632','Letkés','PE',47.883,18.783,22682,6,2455.000,1153,456),(473,'2633','Ipolytölgyes','PE',47.917,18.783,4978,6,1366.000,476,129),(474,'2634','Nagybörzsöny','PE',47.933,18.833,14775,6,5069.000,784,354),(475,'2635','Vámosmikola','PE',47.983,18.783,10737,6,2529.000,1648,632),(476,'2636','Tésa','PE',48.033,18.850,19248,6,438.000,84,61),(477,'2637','Perőcsény','PE',48.000,18.867,4181,6,4140.000,349,211),(478,'2638','Kemence','PE',48.017,18.900,22345,6,4275.000,1010,558),(479,'2639','Bernecebaráti','PE',48.033,18.917,18777,6,3769.000,860,456),(480,'2640','Szendehely','NO',47.850,19.117,4507,6,1004.000,1629,628),(481,'2641','Berkenye','NO',47.883,19.083,9034,6,1346.000,670,253),(482,'2642','Nógrád','NO',47.917,19.050,4358,6,2954.000,1572,677),(483,'2643','Diósjenő','NO',47.950,19.050,6743,6,5750.000,2937,1065),(484,'2644','Borsosberény','NO',47.967,19.117,9894,6,2026.000,1034,396),(485,'2645','Nagyoroszi','NO',48.000,19.100,23986,6,4003.000,2149,849),(486,'2646','Drégelypalánk','NO',48.050,19.050,8156,6,2218.000,1580,679),(487,'2647','Hont','NO',48.050,19.000,13204,6,2413.000,532,313),(488,'2648','Patak','NO',48.033,19.150,7199,6,1622.000,925,427),(489,'2649','Dejtár','NO',48.033,19.167,12511,6,2174.000,1472,601),(490,'2651','Rétság','NO',47.933,19.133,23825,4,1978.000,2987,1150),(491,'2652','Tereske','NO',47.950,19.200,24174,6,1703.000,730,320),(492,'2653','Bánk','NO',47.933,19.183,24341,6,990.000,691,269),(493,'2654','Romhány','NO',47.933,19.267,12195,6,2547.000,2282,942),(494,'2655','Kétbodony','NO',47.933,19.267,11846,6,1305.000,484,234),(495,'2655','Kisecset','NO',47.933,19.317,33206,6,862.000,176,141),(496,'2655','Szente','NO',47.967,19.283,9043,6,753.000,357,158),(497,'2656','Szátok','NO',47.950,19.233,15325,6,895.000,581,167),(498,'2657','Tolmács','NO',47.933,19.133,6381,6,1224.000,721,337),(499,'2658','Horpács','NO',48.000,19.133,13718,6,672.000,178,92),(500,'2658','Pusztaberki','NO',47.967,19.167,17862,6,685.000,129,106),(501,'2659','Érsekvadkert','NO',48.000,19.200,21582,6,5537.000,3650,1391),(502,'2660','Balassagyarmat','NO',48.083,19.300,13657,4,2374.000,16580,6730),(503,'2661','Balassagyarmat','NO',48.083,19.300,13657,4,2374.000,16580,6730),(504,'2662','Balassagyarmat','NO',48.083,19.300,13657,4,2374.000,16580,6730),(505,'2668','Patvarc','NO',48.067,19.350,33880,6,784.000,645,270),(506,'2669','Ipolyvece','NO',48.067,19.117,29319,6,1390.000,879,366),(507,'2671','Őrhalom','NO',48.083,19.417,3249,6,1746.000,1076,403),(508,'2672','Hugyag','NO',48.083,19.433,16878,6,1090.000,886,336),(509,'2673','Csitár','NO',48.050,19.433,5050,6,1685.000,398,209),(510,'2675','Iliny','NO',48.033,19.433,26833,6,646.000,170,92),(511,'2675','Nógrádmarcal','NO',48.033,19.400,29832,6,1994.000,555,216),(512,'2676','Cserhátsurány','NO',47.983,19.433,22594,6,1880.000,857,364),(513,'2677','Herencsény','NO',47.983,19.483,5324,6,3318.000,653,298),(514,'2678','Csesztve','NO',48.017,19.283,20145,6,1625.000,327,170),(515,'2681','Galgagyörk','PE',47.733,19.383,13295,6,1471.000,1075,346),(516,'2682','Püspökhatvan','PE',47.767,19.367,21388,6,2472.000,1525,503),(517,'2683','Acsa','PE',47.800,19.383,18573,6,2694.000,1513,473),(518,'2685','Nógrádsáp','NO',47.833,19.350,8387,6,1546.000,855,367),(519,'2686','Galgaguta','NO',47.850,19.400,25663,6,1589.000,659,303),(520,'2687','Bercel','NO',47.867,19.417,2389,6,3588.000,2020,739),(521,'2688','Vanyarc','NO',47.833,19.450,30915,6,3222.000,1306,505),(522,'2691','Nógrádkövesd','NO',47.867,19.383,32300,6,880.000,713,291),(523,'2692','Szécsénke','NO',47.900,19.333,23047,6,978.000,226,125),(524,'2693','Becske','NO',47.917,19.383,12016,6,1566.000,574,286),(525,'2694','Magyarnándor','NO',47.967,19.350,32407,6,1867.000,1127,466),(526,'2694','Debercsény','NO',47.967,19.317,7320,6,543.000,77,51),(527,'2694','Cserháthaláp','NO',47.983,19.367,21935,6,1047.000,371,179),(528,'2696','Terény','NO',47.950,19.450,4844,6,2435.000,435,252),(529,'2697','Szanda','NO',47.933,19.450,13754,6,2149.000,622,418),(530,'2698','Mohora','NO',47.983,19.333,27915,6,1595.000,968,379),(531,'2699','Szügy','NO',48.033,19.333,18786,6,1951.000,1425,534),(532,'2700','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(533,'2701','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(534,'2702','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(535,'2703','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(536,'2704','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(537,'2711','Tápiószentmárton','PE',47.333,19.750,14571,5,10291.000,5505,2449),(538,'2712','Nyársapát','PE',47.100,19.800,20066,6,5403.000,1828,814),(539,'2713','Csemő','PE',47.117,19.700,5184,6,7944.000,4298,1882),(540,'2721','Pilis','PE',47.283,19.550,9821,4,4730.000,11410,4045),(541,'2723','Nyáregyháza','PE',47.250,19.500,23038,6,3199.000,3957,1393),(542,'2724','Újlengyel','PE',47.217,19.450,19682,6,2625.000,1757,675),(543,'2730','Albertirsa','PE',47.250,19.617,31653,4,7296.000,12348,4802),(544,'2735','Dánszentmiklós','PE',47.217,19.550,31811,6,3801.000,2869,1058),(545,'2736','Mikebuda','PE',47.167,19.633,24466,6,4217.000,732,351),(546,'2737','Ceglédbercel','PE',47.217,19.683,20640,6,2815.000,4440,1655),(547,'2738','Ceglédbercel','PE',47.217,19.683,20640,6,2815.000,4440,1655),(548,'2740','Abony','PE',47.183,20.000,27872,4,12797.000,15498,6143),(549,'2745','Kőröstetétlen','PE',47.100,20.033,32975,6,3265.000,844,363),(550,'2746','Jászkarajenő','PE',47.050,20.067,11004,6,6515.000,2811,1427),(551,'2747','Törtel','PE',47.117,19.933,22008,6,8416.000,4367,1872),(552,'2750','Nagykőrös','PE',47.033,19.783,19716,4,22794.000,25105,10392),(553,'2751','Nagykőrös','PE',47.033,19.783,19716,4,22794.000,25105,10392),(554,'2752','Nagykőrös','PE',47.033,19.783,19716,4,22794.000,25105,10392),(555,'2755','Kocsér','PE',47.005,19.911,32771,6,6728.000,1947,1011),(556,'2760','Nagykáta','PE',47.417,19.750,13435,4,8161.000,12739,5001),(557,'2761','Nagykáta','PE',47.417,19.750,13435,4,8161.000,12739,5001),(558,'2764','Tápióbicske','PE',47.367,19.683,15015,6,4848.000,3512,1512),(559,'2765','Farmos','PE',47.367,19.850,9122,6,4012.000,3754,1551),(560,'2766','Tápiószele','PE',47.333,19.883,14146,5,3699.000,6207,2418),(561,'2767','Tápiógyörgye','PE',47.333,19.950,17303,6,5331.000,3756,1569),(562,'2768','Újszilvás','PE',47.283,19.933,17808,6,3898.000,2708,1200),(563,'2769','Tápiószőlős','PE',47.300,19.850,2769,6,3179.000,3036,1314),(564,'2800','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(565,'2801','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(566,'2802','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(567,'2803','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(568,'2804','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(569,'2805','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(570,'2806','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(571,'2807','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(572,'2808','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(573,'2809','Tatabánya','KE',47.567,18.417,18157,1,9143.000,70333,29978),(574,'2821','Gyermely','KE',47.600,18.650,6521,6,4545.000,1454,519),(575,'2822','Szomor','KE',47.583,18.667,21421,6,1319.000,1135,396),(576,'2823','Vértessomló','KE',47.517,18.367,15282,6,2229.000,1348,499),(577,'2824','Várgesztes','KE',47.467,18.400,17251,6,1204.000,569,250),(578,'2831','Tarján','KE',47.617,18.517,18935,6,4307.000,2744,1074),(579,'2832','Héreg','KE',47.650,18.517,11891,6,2713.000,1030,443),(580,'2833','Vértestolna','KE',47.633,18.450,29629,6,1695.000,548,217),(581,'2834','Tardos','KE',47.667,18.450,30225,6,2332.000,1630,680),(582,'2835','Tardos','KE',47.667,18.450,30225,6,2332.000,1630,680),(583,'2836','Baj','KE',47.650,18.367,29212,6,2113.000,2838,1043),(584,'2837','Vértesszőlős','KE',47.617,18.383,31264,6,1713.000,3059,977),(585,'2840','Oroszlány','KE',47.483,18.317,30766,4,7586.000,18968,7905),(586,'2841','Oroszlány','KE',47.483,18.317,30766,4,7586.000,18968,7905),(587,'2842','Oroszlány','KE',47.483,18.317,30766,4,7586.000,18968,7905),(588,'2851','Környe','KE',47.550,18.333,30553,6,4534.000,4454,1643),(589,'2852','Kecskéd','KE',47.517,18.317,4525,6,1108.000,2021,667),(590,'2853','Kömlőd','KE',47.550,18.267,7630,6,2284.000,1249,378),(591,'2854','Dad','KE',47.517,18.233,33163,6,2375.000,1019,389),(592,'2855','Bokod','KE',47.500,18.250,7311,6,2992.000,2245,807),(593,'2856','Szákszend','KE',47.550,18.167,33516,6,3593.000,1534,643),(594,'2858','Császár','KE',47.500,18.150,16416,6,6780.000,1777,717),(595,'2859','Vérteskethely','KE',47.483,18.083,32586,6,1747.000,576,235),(596,'2861','Bakonysárkány','KE',47.450,18.100,25229,6,1413.000,953,389),(597,'2862','Aka','KE',47.400,18.067,6682,6,1811.000,257,132),(598,'2870','Kisbér','KE',47.500,18.033,17330,4,5218.000,5516,2181),(599,'2879','Kisbér','KE',47.500,18.033,17330,4,5218.000,5516,2181),(600,'2881','Ászár','KE',47.504,18.000,23852,6,1869.000,1946,703),(601,'2882','Kerékteleki','KE',47.517,17.933,10995,6,2946.000,675,280),(602,'2883','Bársonyos','KE',47.517,17.917,8624,6,1687.000,761,303),(603,'2884','Bakonyszombathely','KE',47.467,17.967,22381,6,3653.000,1460,607),(604,'2885','Bakonybánk','KE',47.467,17.900,24244,6,1507.000,457,219),(605,'2886','Réde','KE',47.433,17.917,30012,6,4588.000,1405,566),(606,'2887','Ácsteszér','KE',47.400,18.017,18139,6,1773.000,708,286),(607,'2888','Csatka','KE',47.367,17.983,33109,6,1777.000,265,171),(608,'2889','Súr','KE',47.367,18.033,31990,6,3736.000,1274,517),(609,'2890','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(610,'2891','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(611,'2892','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(612,'2893','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(613,'2894','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(614,'2896','Szomód','KE',47.683,18.350,22619,6,2835.000,2104,722),(615,'2897','Dunaszentmiklós','KE',47.700,18.383,24101,6,777.000,452,178),(616,'2898','Kocs','KE',47.600,18.217,2510,6,5826.000,2636,960),(617,'2899','Naszály','KE',47.700,18.267,20163,6,3023.000,2359,835),(618,'2900','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(619,'2901','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(620,'2902','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(621,'2903','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(622,'2904','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(623,'2911','Mocsa','KE',47.667,18.183,26930,6,6722.000,2257,832),(624,'2921','Mocsa','KE',47.667,18.183,26930,6,6722.000,2257,832),(625,'2922','Mocsa','KE',47.667,18.183,26930,6,6722.000,2257,832),(626,'2931','Almásfüzitő','KE',47.717,18.267,32346,6,819.000,2246,1146),(627,'2932','Almásfüzitő','KE',47.717,18.267,32346,6,819.000,2246,1146),(628,'2941','Ács','KE',47.700,18.017,4428,4,10384.000,7156,2675),(629,'2942','Nagyigmánd','KE',47.633,18.083,22372,5,5139.000,3014,1178),(630,'2943','Bábolna','KE',47.633,17.983,19363,4,3359.000,3756,1366),(631,'2944','Bana','KE',47.650,17.917,31422,6,2514.000,1685,564),(632,'2945','Tárkány','KE',47.583,18.000,20987,6,6498.000,1620,627),(633,'2946','Csép','KE',47.583,18.067,18272,6,2006.000,366,157),(634,'2947','Ete','KE',47.500,18.033,6664,6,2061.000,591,248),(635,'2948','Kisigmánd','KE',47.650,18.100,20923,6,1314.000,524,203),(636,'2949','Csém','KE',47.683,18.100,33640,6,629.000,477,169),(637,'3000','Hatvan','HE',47.667,19.683,22309,4,6617.000,20949,8949),(638,'3001','Hatvan','HE',47.667,19.683,22309,4,6617.000,20949,8949),(639,'3002','Hatvan','HE',47.667,19.683,22309,4,6617.000,20949,8949),(640,'3003','Hatvan','HE',47.667,19.683,22309,4,6617.000,20949,8949),(641,'3009','Hatvan','HE',47.667,19.683,22309,4,6617.000,20949,8949),(642,'3011','Heréd','HE',47.700,19.633,20242,6,1396.000,2074,777),(643,'3012','Nagykökényes','HE',47.733,19.600,24943,6,1728.000,606,259),(644,'3013','Ecséd','HE',47.733,19.783,17181,6,4160.000,3335,1450),(645,'3014','Hort','HE',47.700,19.783,4145,6,4309.000,3839,1602),(646,'3015','Csány','HE',47.650,19.833,16841,6,4789.000,2308,987),(647,'3016','Boldog','HE',47.600,19.700,3452,6,2674.000,3067,1174),(648,'3021','Lőrinci','HE',47.733,19.683,30401,4,2353.000,6126,2318),(649,'3022','Lőrinci','HE',47.733,19.683,30401,4,2353.000,6126,2318),(650,'3023','Petőfibánya','HE',47.767,19.717,33686,6,1111.000,2869,1357),(651,'3024','Petőfibánya','HE',47.767,19.717,33686,6,1111.000,2869,1357),(652,'3031','Zagyvaszántó','HE',47.783,19.683,21722,6,952.000,2014,777),(653,'3032','Apc','HE',47.800,19.700,7241,6,2046.000,2655,1106),(654,'3033','Rózsaszentmárton','HE',47.783,19.750,27650,6,1631.000,2043,890),(655,'3034','Szűcsi','HE',47.800,19.767,9982,6,1738.000,1605,663),(656,'3035','Gyöngyöspata','HE',47.817,19.800,8323,6,6075.000,2583,1069),(657,'3036','Gyöngyöstarján','HE',47.800,19.867,28088,6,4639.000,2514,983),(658,'3041','Héhalom','NO',47.800,19.600,3993,6,1867.000,1011,407),(659,'3042','Palotás','NO',47.800,19.600,5883,6,1707.000,1667,665),(660,'3043','Egyházasdengeleg','NO',47.800,19.567,17659,6,1575.000,480,219),(661,'3044','Szirák','NO',47.833,19.533,21634,6,1909.000,1141,456),(662,'3045','Bér','NO',47.867,19.500,32911,6,2549.000,399,212),(663,'3046','Kisbágyon','NO',47.817,19.583,27243,6,1024.000,445,205),(664,'3047','Buják','NO',47.883,19.550,14234,6,5304.000,2238,921),(665,'3051','Szarvasgede','NO',47.817,19.650,10199,6,999.000,432,213),(666,'3052','Csécse','NO',47.867,19.633,30270,6,2173.000,901,423),(667,'3053','Kozárd','NO',47.917,19.617,13842,6,644.000,171,130),(668,'3053','Ecseg','NO',47.900,19.600,4251,6,2410.000,1243,542),(669,'3060','Pásztó','NO',47.917,19.700,7409,4,7260.000,9880,4108),(670,'3061','Pásztó','NO',47.917,19.700,7409,4,7260.000,9880,4108),(671,'3062','Pásztó','NO',47.917,19.700,7409,4,7260.000,9880,4108),(672,'3063','Jobbágyi','NO',47.833,19.683,8712,6,1783.000,2289,874),(673,'3064','Szurdokpüspöki','NO',47.850,19.683,19044,6,2671.000,1905,896),(674,'3065','Szurdokpüspöki','NO',47.850,19.683,19044,6,2671.000,1905,896),(675,'3066','Kutasó','NO',47.950,19.550,19451,6,605.000,122,78),(676,'3066','Bokor','NO',47.933,19.550,3841,6,675.000,115,74),(677,'3066','Cserhátszentiván','NO',47.933,19.583,32319,6,1066.000,148,130),(678,'3067','Felsőtold','NO',47.967,19.617,33312,6,1083.000,152,107),(679,'3067','Garáb','NO',47.983,19.650,18494,6,820.000,61,68),(680,'3068','Mátraszőlős','NO',47.967,19.683,4330,6,2916.000,1621,678),(681,'3069','Alsótold','NO',47.950,19.600,7621,6,786.000,257,109),(682,'3070','Bátonyterenye','NO',47.967,19.833,33534,4,7892.000,13270,5820),(683,'3071','Bátonyterenye','NO',47.967,19.833,33534,4,7892.000,13270,5820),(684,'3072','Bátonyterenye','NO',47.967,19.833,33534,4,7892.000,13270,5820),(685,'3073','Tar','NO',47.950,19.750,32896,6,2734.000,1933,864),(686,'3074','Sámsonháza','NO',47.983,19.733,24572,6,1271.000,273,156),(687,'3075','Márkháza','NO',48.017,19.733,14641,6,631.000,236,115),(688,'3075','Kisbárkány','NO',48.017,19.683,26295,6,803.000,214,107),(689,'3075','Nagybárkány','NO',48.000,19.700,16391,6,884.000,671,246),(690,'3077','Mátraverebély','NO',47.983,19.783,30100,6,1840.000,2159,875),(691,'3078','Mátraverebély','NO',47.983,19.783,30100,6,1840.000,2159,875),(692,'3082','Mátraverebély','NO',47.983,19.783,30100,6,1840.000,2159,875),(693,'3100','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(694,'3101','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(695,'3102','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(696,'3103','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(697,'3104','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(698,'3107','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(699,'3109','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(700,'3110','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(701,'3121','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(702,'3123','Cered','NO',48.150,19.967,3665,6,3858.000,1162,561),(703,'3124','Zabar','NO',48.133,20.050,21661,6,1817.000,556,258),(704,'3125','Szilaspogony','NO',48.117,20.033,7959,6,1440.000,341,177),(705,'3126','Bárna','NO',48.100,19.933,20048,6,1539.000,1130,456),(706,'3127','Kazár','NO',48.050,19.867,28389,6,3039.000,2066,804),(707,'3128','Vizslás','NO',48.050,19.817,10320,6,1012.000,1333,546),(708,'3129','Lucfalva','NO',48.033,19.700,20190,6,1410.000,628,234),(709,'3131','Sóshartyán','NO',48.067,19.683,14881,6,1214.000,941,301),(710,'3132','Nógrádmegyer','NO',48.067,19.633,12131,6,2277.000,1707,573),(711,'3133','Magyargéc','NO',48.083,19.617,26967,6,1235.000,888,300),(712,'3134','Piliny','NO',48.150,19.600,11590,6,1604.000,596,282),(713,'3135','Szécsényfelfalu','NO',48.150,19.567,33011,6,822.000,462,226),(714,'3136','Etes','NO',48.117,19.717,15370,6,1580.000,1493,720),(715,'3137','Karancsberény','NO',48.183,19.750,25548,6,2314.000,955,380),(716,'3138','Ipolytarnóc','NO',48.233,19.633,3328,6,1366.000,481,213),(717,'3141','Ipolytarnóc','NO',48.233,19.633,3328,6,1366.000,481,213),(718,'3142','Mátraszele','NO',48.050,19.900,24332,6,1697.000,1050,470),(719,'3143','Mátranovák','NO',48.033,19.983,19372,6,2697.000,1779,1112),(720,'3144','Mátranovák','NO',48.033,19.983,19372,6,2697.000,1779,1112),(721,'3145','Mátraterenye','NO',48.033,19.950,33525,6,2813.000,1861,897),(722,'3146','Mátraterenye','NO',48.033,19.950,33525,6,2813.000,1861,897),(723,'3147','Mátraterenye','NO',48.033,19.950,33525,6,2813.000,1861,897),(724,'3151','Rákóczibánya','NO',47.987,19.913,34360,6,457.000,787,307),(725,'3152','Nemti','NO',48.017,19.900,27580,6,1106.000,776,432),(726,'3153','Dorogháza','NO',47.983,19.900,24439,6,1768.000,1143,568),(727,'3154','Szuha','NO',47.983,19.917,28194,6,1756.000,658,358),(728,'3155','Mátramindszent','NO',47.967,19.933,20075,6,1673.000,854,446),(729,'3161','Kishartyán','NO',48.083,19.717,33400,6,895.000,606,264),(730,'3162','Ságújfalu','NO',48.100,19.683,12520,6,1203.000,1084,395),(731,'3163','Karancsság','NO',48.117,19.667,26897,6,2139.000,1190,417),(732,'3163','Szalmatercs','NO',48.117,19.633,19798,6,758.000,490,194),(733,'3165','Endrefalva','NO',48.133,19.583,25496,6,1323.000,1321,455),(734,'3170','Szécsény','NO',48.083,19.517,6628,4,4583.000,5917,2528),(735,'3175','Nagylóc','NO',48.033,19.583,21102,6,3912.000,1618,719),(736,'3176','Hollókő','NO',48.000,19.600,33242,6,518.000,374,224),(737,'3177','Rimóc','NO',48.033,19.533,28884,6,2926.000,1829,695),(738,'3178','Varsány','NO',48.033,19.500,29498,6,2558.000,1705,638),(739,'3179','Nógrádsipek','NO',48.017,19.500,19497,6,2012.000,667,305),(740,'3181','Karancsalja','NO',48.133,19.750,18625,6,1254.000,1597,636),(741,'3182','Karancslapujtő','NO',48.150,19.733,21041,6,1935.000,2719,1068),(742,'3183','Karancskeszi','NO',48.167,19.700,8855,6,3169.000,1907,828),(743,'3184','Mihálygerge','NO',48.200,19.633,13222,6,1106.000,612,309),(744,'3185','Egyházasgerge','NO',48.183,19.650,5980,6,1537.000,763,370),(745,'3186','Litke','NO',48.217,19.600,4871,6,1816.000,867,362),(746,'3187','Nógrádszakál','NO',48.183,19.533,27340,6,1879.000,580,258),(747,'3188','Ludányhalászi','NO',48.133,19.517,2778,6,2120.000,1589,502),(748,'3200','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(749,'3201','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(750,'3202','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(751,'3211','Gyöngyösoroszi','HE',47.833,19.900,13338,6,2139.000,1533,576),(752,'3212','Gyöngyöshalász','HE',47.733,19.933,17534,6,2713.000,2579,1032),(753,'3213','Atkár','HE',47.717,19.900,16090,6,3376.000,1726,724),(754,'3214','Nagyréde','HE',47.767,19.850,31486,6,3434.000,3211,1239),(755,'3221','Nagyréde','HE',47.767,19.850,31486,6,3434.000,3211,1239),(756,'3231','Gyöngyössolymos','HE',47.817,19.933,19123,6,6485.000,3085,1291),(757,'3232','Gyöngyössolymos','HE',47.817,19.933,19123,6,6485.000,3085,1291),(758,'3233','Gyöngyössolymos','HE',47.817,19.933,19123,6,6485.000,3085,1291),(759,'3234','Gyöngyössolymos','HE',47.817,19.933,19123,6,6485.000,3085,1291),(760,'3235','Mátraszentimre','HE',47.917,19.883,29045,6,2129.000,501,271),(761,'3240','Parád','HE',47.917,20.033,7436,5,3720.000,1961,1011),(762,'3242','Parádsasvár','HE',47.917,19.983,20215,6,1694.000,416,239),(763,'3243','Bodony','HE',47.950,20.033,14933,6,2897.000,770,459),(764,'3244','Bodony','HE',47.950,20.033,14933,6,2897.000,770,459),(765,'3245','Recsk','HE',47.933,20.117,9609,5,4537.000,2782,1318),(766,'3246','Mátraderecske','HE',47.950,20.083,14872,6,1399.000,2000,992),(767,'3247','Mátraballa','HE',47.983,20.033,19965,6,2636.000,768,424),(768,'3248','Ivád','HE',48.017,20.067,13879,6,1194.000,361,202),(769,'3250','Pétervására','HE',48.017,20.100,12070,4,3387.000,2534,927),(770,'3252','Erdőkövesd','HE',48.033,20.100,28556,6,1718.000,636,304),(771,'3253','Istenmezeje','HE',48.083,20.050,10074,6,3279.000,1615,720),(772,'3254','Váraszó','HE',48.033,20.117,27012,6,2705.000,522,256),(773,'3255','Fedémes','HE',48.033,20.200,12432,6,862.000,315,175),(774,'3256','Kisfüzes','HE',47.983,20.133,22460,6,481.000,132,88),(775,'3257','Bükkszenterzsébet','HE',48.050,20.167,10621,6,2486.000,1119,489),(776,'3258','Tarnalelesz','HE',48.050,20.183,13240,6,3713.000,1715,694),(777,'3259','Szentdomonkos','HE',48.067,20.200,13231,6,1840.000,464,222),(778,'3261','Abasár','HE',47.800,20.000,24554,6,2082.000,2562,1151),(779,'3262','Markaz','HE',47.817,20.067,16540,6,2561.000,1826,798),(780,'3263','Domoszló','HE',47.833,20.117,7515,6,4022.000,2108,960),(781,'3264','Kisnána','HE',47.850,20.150,12502,6,2260.000,1016,521),(782,'3265','Vécs','HE',47.817,20.167,5759,6,2566.000,638,385),(783,'3271','Visonta','HE',47.783,20.033,31246,6,2529.000,1091,491),(784,'3272','Visonta','HE',47.783,20.033,31246,6,2529.000,1091,491),(785,'3273','Halmajugra','HE',47.767,20.067,11411,6,2168.000,1306,443),(786,'3274','Ludas','HE',47.733,20.100,15796,6,1079.000,855,382),(787,'3275','Detk','HE',47.750,20.100,9201,6,2808.000,1192,523),(788,'3281','Karácsond','HE',47.733,20.033,5935,6,3160.000,3178,1266),(789,'3282','Nagyfüged','HE',47.683,20.117,26879,6,2751.000,1929,749),(790,'3283','Tarnazsadány','HE',47.667,20.167,17163,6,2519.000,1188,513),(791,'3284','Tarnaméra','HE',47.650,20.167,23348,6,2826.000,1656,707),(792,'3291','Vámosgyörk','HE',47.683,19.933,14580,6,2182.000,2012,783),(793,'3292','Adács','HE',47.700,19.983,23241,6,3794.000,2820,1228),(794,'3293','Visznek','HE',47.650,20.033,3513,6,2273.000,1135,535),(795,'3294','Tarnaörs','HE',47.660,20.030,14128,6,3028.000,1857,755),(796,'3295','Erk','HE',47.617,20.083,20118,6,2168.000,881,371),(797,'3296','Zaránk','HE',47.650,20.117,23445,6,1453.000,469,305),(798,'3300','Eger','HE',47.906,20.371,20491,1,9224.000,56429,25295),(799,'3301','Eger','HE',47.900,20.383,20491,1,9224.000,56429,25295),(800,'3302','Eger','HE',47.900,20.383,20491,1,9224.000,56429,25295),(801,'3303','Eger','HE',47.900,20.383,20491,1,9224.000,56429,25295),(802,'3304','Eger','HE',47.900,20.383,20491,1,9224.000,56429,25295),(803,'3305','Eger','HE',47.900,20.383,20491,1,9224.000,56429,25295),(804,'3321','Egerbakta','HE',47.933,20.300,12821,6,3237.000,1504,501),(805,'3322','Hevesaranyos','HE',48.017,20.233,10241,6,1702.000,659,280),(806,'3323','Szarvaskő','HE',47.900,20.383,3382,6,1259.000,374,154),(807,'3324','Felsőtárkány','HE',47.967,20.417,16328,6,7732.000,3468,1232),(808,'3325','Noszvaj','HE',47.933,20.483,18810,6,1884.000,1821,696),(809,'3326','Ostoros','HE',47.867,20.433,27216,6,2351.000,2737,943),(810,'3327','Novaj','HE',47.850,20.483,29276,6,1852.000,1463,557),(811,'3328','Egerszólát','HE',47.883,20.267,13648,6,2610.000,1090,441),(812,'3331','Tarnaszentmária','HE',47.883,20.200,9052,6,1100.000,249,183),(813,'3332','Sirok','HE',47.933,20.200,8527,6,6339.000,1903,957),(814,'3333','Terpes','HE',47.967,20.150,12229,6,220.000,204,103),(815,'3334','Szajla','HE',47.967,20.150,16063,6,870.000,658,272),(816,'3335','Bükkszék','HE',47.983,20.183,2963,6,1530.000,758,404),(817,'3336','Bátor','HE',47.983,20.267,24022,6,2732.000,437,195),(818,'3337','Egerbocs','HE',48.033,20.267,26019,6,1595.000,559,269),(819,'3341','Szúcs','HE',48.050,20.250,13523,6,849.000,413,158),(820,'3341','Egercsehi','HE',48.050,20.283,16610,6,1039.000,1467,648),(821,'3343','Bekölce','HE',48.083,20.283,4400,6,1377.000,688,368),(822,'3344','Mikófalva','HE',48.050,20.317,31282,6,1441.000,764,317),(823,'3345','Mónosbél','HE',48.033,20.350,31565,6,1378.000,440,148),(824,'3346','Bélapátfalva','HE',48.050,20.367,33260,4,3663.000,3215,1154),(825,'3346','Bükkszentmárton','HE',48.067,20.350,22099,6,826.000,331,131),(826,'3347','Balaton','HE',48.100,20.317,11527,6,1320.000,1162,456),(827,'3348','Szilvásvárad','HE',48.100,20.400,5643,6,3782.000,1742,745),(828,'3349','Nagyvisnyó','HE',48.133,20.433,28282,6,4302.000,977,491),(829,'3350','Kál','HE',47.733,20.267,32179,5,3481.000,3645,1365),(830,'3351','Verpelét','HE',47.850,20.233,24147,5,5318.000,3931,1599),(831,'3352','Feldebrő','HE',47.817,20.250,20747,6,2652.000,1112,554),(832,'3353','Aldebrő','HE',47.800,20.233,6345,6,2178.000,696,354),(833,'3354','Tófalu','HE',47.783,20.250,9964,6,1448.000,570,284),(834,'3355','Kápolna','HE',47.767,20.250,15307,6,2151.000,1602,556),(835,'3356','Kompolt','HE',47.733,20.250,23995,6,2273.000,2174,789),(836,'3357','Nagyút','HE',47.717,20.167,10418,6,1894.000,729,337),(837,'3358','Erdőtelek','HE',47.683,20.317,24235,6,4490.000,3306,1379),(838,'3359','Tenk','HE',47.650,20.350,14076,6,1234.000,1189,455),(839,'3360','Heves','HE',47.600,20.283,14526,4,9931.000,10804,4178),(840,'3368','Boconád','HE',47.633,20.200,22354,6,2956.000,1350,628),(841,'3369','Tarnabod','HE',47.683,20.233,32966,6,1033.000,718,280),(842,'3371','Átány','HE',47.617,20.367,6503,6,5044.000,1394,587),(843,'3372','Kömlő','HE',47.600,20.450,14535,6,4922.000,1820,679),(844,'3373','Besenyőtelek','HE',47.700,20.433,27517,6,4910.000,2710,1108),(845,'3374','Dormánd','HE',47.717,20.417,30261,6,2006.000,1061,382),(846,'3375','Mezőtárkány','HE',47.717,20.483,31662,6,4064.000,1646,738),(847,'3377','Szihalom','HE',47.767,20.483,11013,6,3417.000,2073,972),(848,'3378','Mezőszemere','HE',47.750,20.533,25089,6,2148.000,1336,613),(849,'3379','Egerfarmos','HE',47.717,20.550,2981,6,2380.000,730,338),(850,'3381','Pély','HE',47.483,20.350,19567,6,9030.000,1434,666),(851,'3382','Tarnaszentmiklós','HE',47.533,20.383,16160,6,3500.000,901,445),(852,'3383','Hevesvezekény','HE',47.550,20.367,4084,6,1978.000,638,313),(853,'3384','Kisköre','HE',47.500,20.500,18281,4,6842.000,2892,1227),(854,'3385','Tiszanána','HE',47.567,20.533,7083,6,6814.000,2425,1016),(855,'3386','Sarud','HE',47.583,20.600,7180,6,5162.000,1183,557),(856,'3387','Újlőrincfalva','HE',47.633,20.600,27623,6,4809.000,271,151),(857,'3388','Poroszló','HE',47.650,20.667,22196,6,10904.000,2773,1368),(858,'3390','Füzesabony','HE',47.750,20.417,3276,4,4634.000,7963,3081),(859,'3392','Füzesabony','HE',47.750,20.417,3276,4,4634.000,7963,3081),(860,'3393','Füzesabony','HE',47.750,20.417,3276,4,4634.000,7963,3081),(861,'3394','Egerszalók','HE',47.867,20.333,24758,6,2311.000,1908,797),(862,'3395','Demjén','HE',47.833,20.333,8660,6,2508.000,615,307),(863,'3396','Kerecsend','HE',47.800,20.350,28079,6,2458.000,2289,737),(864,'3397','Maklár','HE',47.800,20.417,27696,6,2801.000,2415,965),(865,'3398','Nagytálya','HE',47.817,20.417,27605,6,1319.000,872,338),(866,'3399','Andornaktálya','HE',47.850,20.417,17987,6,1675.000,2743,1015),(867,'3400','Mezőkövesd','BZ',47.817,20.583,19433,4,10056.000,16905,7539),(868,'3401','Mezőkövesd','BZ',47.817,20.583,19433,4,10056.000,16905,7539),(869,'3402','Mezőkövesd','BZ',47.817,20.583,19433,4,10056.000,16905,7539),(870,'3411','Szomolya','BZ',47.900,20.500,18892,6,2269.000,1613,707),(871,'3412','Bogács','BZ',47.900,20.533,25195,6,2470.000,2011,973),(872,'3413','Cserépfalu','BZ',47.933,20.533,6974,6,4466.000,1049,555),(873,'3414','Bükkzsérc','BZ',47.967,20.500,32887,6,3725.000,1009,495),(874,'3416','Tard','BZ',47.883,20.617,8165,6,4050.000,1331,579),(875,'3417','Cserépváralja','BZ',47.933,20.567,25575,6,1462.000,470,213),(876,'3418','Szentistván','BZ',47.767,20.667,22169,5,5129.000,2479,1141),(877,'3421','Mezőnyárád','BZ',47.867,20.683,11749,6,1408.000,1597,689),(878,'3422','Bükkábrány','BZ',47.883,20.683,13596,6,1803.000,1590,699),(879,'3423','Tibolddaróc','BZ',47.917,20.633,30447,6,3034.000,1479,665),(880,'3424','Kács','BZ',47.950,20.617,32993,6,1670.000,541,335),(881,'3425','Sály','BZ',47.950,20.667,4729,6,2558.000,2187,739),(882,'3426','Borsodgeszt','BZ',47.950,20.700,16124,6,1508.000,263,180),(883,'3431','Vatta','BZ',47.917,20.750,30076,6,2334.000,919,376),(884,'3432','Emőd','BZ',47.933,20.817,4677,4,4938.000,5203,1983),(885,'3433','Nyékládháza','BZ',47.983,20.833,12885,4,2467.000,4950,1756),(886,'3434','Mályi','BZ',48.017,20.833,27395,6,1128.000,4252,1369),(887,'3435','Mályi','BZ',48.017,20.833,27395,6,1128.000,4252,1369),(888,'3441','Mezőkeresztes','BZ',47.833,20.700,11323,5,7426.000,4089,1760),(889,'3442','Csincse','BZ',47.883,20.767,34111,6,1134.000,560,212),(890,'3443','Mezőnagymihály','BZ',47.817,20.733,18379,6,6188.000,1064,539),(891,'3444','Gelej','BZ',47.833,20.783,23719,6,3211.000,632,303),(892,'3450','Mezőcsát','BZ',47.817,20.917,13833,4,10309.000,6214,2492),(893,'3458','Tiszakeszi','BZ',47.783,21.000,13888,6,4618.000,2515,1056),(894,'3459','Igrici','BZ',47.867,20.883,25399,6,1947.000,1247,478),(895,'3461','Egerlövő','BZ',47.717,20.633,5865,6,1984.000,583,294),(896,'3462','Borsodivánka','BZ',47.700,20.667,6707,6,1591.000,753,241),(897,'3463','Négyes','BZ',47.700,20.717,24156,6,1734.000,259,217),(898,'3464','Tiszavalk','BZ',47.683,20.750,10977,6,1155.000,322,179),(899,'3465','Tiszabábolna','BZ',47.683,20.817,2291,6,3271.000,393,269),(900,'3466','Tiszadorogma','BZ',47.683,20.867,3717,6,4664.000,389,258),(901,'3467','Ároktő','BZ',47.733,20.950,3823,6,4641.000,1128,529),(902,'3500','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(903,'3501','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(904,'3502','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(905,'3503','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(906,'3504','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(907,'3505','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(908,'3506','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(909,'3507','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(910,'3508','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(911,'3509','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(912,'3510','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(913,'3511','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(914,'3513','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(915,'3514','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(916,'3515','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(917,'3516','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(918,'3517','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(919,'3518','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(920,'3519','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(921,'3521','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(922,'3523','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(923,'3524','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(924,'3525','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(925,'3526','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(926,'3527','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(927,'3528','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(928,'3529','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(929,'3530','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(930,'3531','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(931,'3532','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(932,'3533','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(933,'3534','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(934,'3535','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(935,'3542','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(936,'3543','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(937,'3544','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(938,'3545','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(939,'3546','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(940,'3547','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(941,'3548','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(942,'3549','Miskolc','BZ',47.980,20.935,30456,1,23666.000,170234,75747),(943,'3551','Ónod','BZ',48.000,20.917,22628,6,1773.000,2625,835),(944,'3552','Muhi','BZ',47.983,20.933,2158,6,962.000,549,209),(945,'3553','Kistokaj','BZ',48.050,20.850,12399,6,976.000,2010,688),(946,'3554','Bükkaranyos','BZ',47.983,20.783,27890,6,2620.000,1525,528),(947,'3555','Harsány','BZ',47.967,20.750,5847,6,3653.000,2058,794),(948,'3556','Kisgyőr','BZ',48.017,20.700,22840,6,7113.000,1703,638),(949,'3557','Bükkszentkereszt','BZ',48.067,20.633,8022,6,2697.000,1209,508),(950,'3559','Répáshuta','BZ',48.050,20.533,31884,6,1679.000,467,181),(951,'3561','Felsőzsolca','BZ',48.100,20.867,2848,4,1625.000,7043,2237),(952,'3562','Onga','BZ',48.117,20.917,22558,5,3149.000,4826,1524),(953,'3563','Hernádkak','BZ',48.083,20.967,24165,6,1090.000,1655,484),(954,'3564','Hernádnémeti','BZ',48.067,20.983,31200,6,2876.000,3617,1191),(955,'3565','Tiszalúc','BZ',48.033,21.083,28398,5,4488.000,5481,1926),(956,'3571','Alsózsolca','BZ',48.067,20.883,21032,4,2602.000,6044,1839),(957,'3572','Sajólád','BZ',48.050,20.900,27173,6,1268.000,3127,1002),(958,'3573','Sajópetri','BZ',48.033,20.900,16638,6,928.000,1569,490),(959,'3574','Bőcs','BZ',48.050,20.967,5306,6,2432.000,2793,952),(960,'3575','Berzék','BZ',48.017,20.950,26356,6,1059.000,1118,347),(961,'3576','Sajóhídvég','BZ',48.000,20.950,3081,6,1344.000,1065,346),(962,'3577','Köröm','BZ',47.983,20.950,26602,6,834.000,1366,353),(963,'3578','Girincs','BZ',47.967,20.983,21564,6,1120.000,890,294),(964,'3578','Kiscsécs','BZ',47.967,21.017,17349,6,413.000,208,54),(965,'3579','Kesznyéten','BZ',47.967,21.050,29249,6,3640.000,1912,655),(966,'3580','Tiszaújváros','BZ',47.933,21.083,28352,4,4604.000,16641,7023),(967,'3581','Tiszaújváros','BZ',47.933,21.083,28352,4,4604.000,16641,7023),(968,'3582','Tiszaújváros','BZ',47.933,21.083,28352,4,4604.000,16641,7023),(969,'3585','Tiszaújváros','BZ',47.933,21.083,28352,4,4604.000,16641,7023),(970,'3586','Sajóörös','BZ',47.950,21.033,8129,6,844.000,1304,467),(971,'3587','Tiszapalkonya','BZ',47.883,21.067,8633,6,1349.000,1480,631),(972,'3588','Hejőkürt','BZ',47.867,21.000,2282,6,1490.000,332,151),(973,'3589','Tiszatarján','BZ',47.833,21.017,30377,6,4039.000,1433,532),(974,'3591','Oszlár','BZ',47.883,21.033,2866,6,571.000,425,183),(975,'3592','Nemesbikk','BZ',47.883,20.967,5245,6,2410.000,1043,380),(976,'3593','Hejőbába','BZ',47.900,20.950,6655,6,1872.000,1970,550),(977,'3594','Hejőpapi','BZ',47.900,20.917,16780,6,1702.000,1219,427),(978,'3595','Hejőszalonta','BZ',47.933,20.883,12159,6,1097.000,852,244),(979,'3596','Szakáld','BZ',47.950,20.917,3805,6,1140.000,558,227),(980,'3597','Hejőkeresztúr','BZ',47.967,20.883,4604,6,1028.000,998,404),(981,'3598','Nagycsécs','BZ',47.967,20.950,5582,6,983.000,835,292),(982,'3599','Sajószöged','BZ',47.950,21.000,30340,6,1362.000,2372,893),(983,'3600','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(984,'3601','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(985,'3603','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(986,'3604','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(987,'3607','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(988,'3608','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(989,'3621','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(990,'3622','Uppony','BZ',48.217,20.433,18351,6,1281.000,319,191),(991,'3623','Borsodszentgyörgy','BZ',48.183,20.200,30207,6,2152.000,1188,483),(992,'3625','Borsodszentgyörgy','BZ',48.183,20.200,30207,6,2152.000,1188,483),(993,'3626','Hangony','BZ',48.233,20.200,25104,6,3915.000,1561,616),(994,'3627','Kissikátor','BZ',48.200,20.133,14702,6,1038.000,340,128),(995,'3627','Domaháza','BZ',48.183,20.117,25690,6,2883.000,872,345),(996,'3630','Putnok','BZ',48.300,20.433,27410,4,3473.000,7038,2598),(997,'3635','Dubicsány','BZ',48.283,20.500,27669,6,1300.000,309,119),(998,'3636','Sajógalgóc','BZ',48.300,20.533,10171,6,1012.000,382,137),(999,'3636','Vadna','BZ',48.267,20.567,7223,6,782.000,617,222),(1000,'3641','Nagybarca','BZ',48.250,20.533,29188,6,1439.000,1104,354),(1001,'3642','Bánhorváti','BZ',48.233,20.517,25159,6,2848.000,1409,592),(1002,'3643','Dédestapolcsány','BZ',48.183,20.483,4686,6,2943.000,1475,769),(1003,'3644','Tardona','BZ',48.167,20.533,14784,6,1223.000,1056,433),(1004,'3645','Mályinka','BZ',48.150,20.500,14915,6,2421.000,484,236),(1005,'3646','Nekézseny','BZ',48.167,20.433,28033,6,1410.000,810,343),(1006,'3647','Csokvaomány','BZ',48.167,20.383,14289,6,1499.000,858,450),(1007,'3648','Lénárddaróc','BZ',48.150,20.383,7038,6,516.000,305,170),(1008,'3648','Bükkmogyorósd','BZ',48.133,20.367,19406,6,990.000,141,107),(1009,'3648','Csernely','BZ',48.150,20.350,28459,6,2062.000,819,459),(1010,'3651','Lénárddaróc','BZ',48.150,20.383,7038,6,516.000,305,170),(1011,'3652','Sajónémeti','BZ',48.267,20.383,11332,6,738.000,533,249),(1012,'3653','Sajópüspöki','BZ',48.283,20.350,23782,6,945.000,540,205),(1013,'3654','Bánréve','BZ',48.300,20.367,21953,6,663.000,1376,556),(1014,'3655','Hét','BZ',48.283,20.383,8004,6,371.000,543,214),(1015,'3656','Sajómercse','BZ',48.250,20.417,15945,6,1118.000,224,130),(1016,'3656','Sajóvelezd','BZ',48.267,20.467,27757,6,2302.000,849,317),(1017,'3657','Királd','BZ',48.250,20.400,32090,6,788.000,896,413),(1018,'3658','Borsodbóta','BZ',48.217,20.400,30669,6,814.000,901,357),(1019,'3659','Sáta','BZ',48.183,20.400,2875,6,1651.000,1142,544),(1020,'3661','Sáta','BZ',48.183,20.400,2875,6,1651.000,1142,544),(1021,'3662','Sáta','BZ',48.183,20.400,2875,6,1651.000,1142,544),(1022,'3663','Arló','BZ',48.183,20.267,14331,5,4687.000,3785,1170),(1023,'3664','Járdánháza','BZ',48.150,20.250,26657,6,1125.000,1867,652),(1024,'3671','Borsodnádasd','BZ',48.117,20.250,5315,4,2807.000,3146,1382),(1025,'3672','Borsodnádasd','BZ',48.117,20.250,5315,4,2807.000,3146,1382),(1026,'3700','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1027,'3701','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1028,'3702','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1029,'3703','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1030,'3704','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1031,'3705','Kazincbarcika','BZ',48.250,20.633,6691,4,3667.000,29695,12616),(1032,'3711','Szirmabesenyő','BZ',48.150,20.800,9496,5,1575.000,4531,1612),(1033,'3712','Sajósenye','BZ',48.200,20.833,8970,6,847.000,470,135),(1034,'3712','Sajóvámos','BZ',48.183,20.850,20738,6,3122.000,2247,778),(1035,'3713','Arnót','BZ',48.133,20.867,3771,6,1754.000,2607,806),(1036,'3714','Sajópálfala','BZ',48.167,20.850,18537,6,711.000,792,282),(1037,'3715','Gesztely','BZ',48.100,20.967,15608,6,2882.000,2826,951),(1038,'3716','Újcsanálos','BZ',48.133,21.017,12487,6,1218.000,905,335),(1039,'3716','Sóstófalva','BZ',48.150,21.000,13268,6,728.000,301,112),(1040,'3717','Alsódobsza','BZ',48.183,21.000,19664,6,1069.000,344,163),(1041,'3718','Megyaszó','BZ',48.183,21.050,21768,6,5342.000,2875,920),(1042,'3720','Sajókaza','BZ',48.283,20.583,14313,6,3072.000,3489,1053),(1043,'3720','Sajóivánka','BZ',48.267,20.583,3212,6,1023.000,592,220),(1044,'3721','Felsőnyárád','BZ',48.333,20.600,32762,6,1167.000,1049,394),(1045,'3721','Jákfalva','BZ',48.333,20.583,20233,6,906.000,513,149),(1046,'3721','Dövény','BZ',48.350,20.550,6123,6,1165.000,289,115),(1047,'3722','Felsőkelecsény','BZ',48.367,20.600,31723,6,799.000,407,144),(1048,'3723','Zubogy','BZ',48.383,20.583,19105,6,1143.000,601,233),(1049,'3724','Imola','BZ',48.417,20.550,16577,6,1812.000,101,70),(1050,'3724','Ragály','BZ',48.400,20.517,6053,6,1554.000,664,253),(1051,'3724','Trizs','BZ',48.433,20.500,4914,6,1025.000,227,113),(1052,'3726','Alsószuha','BZ',48.367,20.517,28839,6,2242.000,459,183),(1053,'3726','Szuhafő','BZ',48.417,20.450,3160,6,1605.000,156,91),(1054,'3726','Zádorfalva','BZ',48.383,20.483,3063,6,1375.000,475,179),(1055,'3728','Gömörszőlős','BZ',48.383,20.433,9706,6,878.000,69,47),(1056,'3728','Kelemér','BZ',48.350,20.433,12034,6,1881.000,539,181),(1057,'3729','Serényfalva','BZ',48.317,20.400,32531,6,1964.000,998,369),(1058,'3731','Szuhakálló','BZ',48.283,20.667,11110,6,696.000,1037,393),(1059,'3732','Kurityán','BZ',48.317,20.633,11819,6,754.000,1712,603),(1060,'3733','Rudabánya','BZ',48.383,20.633,23029,4,1646.000,2668,1151),(1061,'3734','Szuhogy','BZ',48.383,20.683,24606,6,1700.000,1243,448),(1062,'3735','Kánó','BZ',48.433,20.600,7764,6,1377.000,164,95),(1063,'3735','Felsőtelekes','BZ',48.400,20.633,31671,6,845.000,762,288),(1064,'3735','Alsótelekes','BZ',48.417,20.667,8217,6,644.000,137,93),(1065,'3741','Izsófalva','BZ',48.300,20.667,5591,5,941.000,1763,617),(1066,'3742','Rudolftelep','BZ',48.317,20.683,34120,6,439.000,746,294),(1067,'3743','Ormosbánya','BZ',48.350,20.650,34069,6,755.000,1779,701),(1068,'3744','Múcsony','BZ',48.267,20.683,21546,5,1754.000,3210,1209),(1069,'3751','Szendrőlád','BZ',48.350,20.750,27456,6,1770.000,1933,440),(1070,'3752','Galvács','BZ',48.417,20.783,19293,6,1504.000,91,79),(1071,'3752','Szendrő','BZ',48.400,20.733,8077,4,5356.000,4177,1454),(1072,'3753','Abod','BZ',48.400,20.800,10357,6,3117.000,228,126),(1073,'3754','Szalonna','BZ',48.450,20.750,16753,6,2008.000,1023,364),(1074,'3754','Meszes','BZ',48.433,20.800,11758,6,1140.000,169,117),(1075,'3755','Martonyi','BZ',48.467,20.767,2024,6,1757.000,424,182),(1076,'3756','Varbóc','BZ',48.467,20.650,10144,6,1010.000,48,60),(1077,'3756','Perkupa','BZ',48.467,20.700,33419,6,1940.000,854,357),(1078,'3757','Égerszög','BZ',48.450,20.583,13356,6,1077.000,52,46),(1079,'3757','Teresztenye','BZ',48.450,20.617,28635,6,869.000,27,23),(1080,'3757','Szőlősardó','BZ',48.450,20.633,7889,6,1066.000,109,84),(1081,'3758','Jósvafő','BZ',48.483,20.567,15680,6,2155.000,256,176),(1082,'3759','Aggtelek','BZ',48.467,20.517,9362,6,4382.000,569,247),(1083,'3761','Szin','BZ',48.500,20.667,20871,6,1810.000,751,256),(1084,'3761','Tornakápolna','BZ',48.467,20.617,10375,6,402.000,29,34),(1085,'3761','Szinpetri','BZ',48.483,20.633,11493,6,971.000,228,100),(1086,'3762','Szögliget','BZ',48.517,20.683,16179,6,3474.000,641,395),(1087,'3763','Bódvaszilas','BZ',48.533,20.733,5926,6,1922.000,1067,484),(1088,'3764','Bódvarákó','BZ',48.517,20.750,33303,6,922.000,109,82),(1089,'3765','Tornaszentandrás','BZ',48.517,20.783,27836,6,1565.000,224,135),(1090,'3765','Komjáti','BZ',48.550,20.767,10612,6,1108.000,290,143),(1091,'3765','Tornabarakony','BZ',48.500,20.817,16902,6,820.000,15,29),(1092,'3767','Tornanádaska','BZ',48.567,20.783,18801,6,783.000,595,134),(1093,'3768','Hidvégardó','BZ',48.567,20.850,25672,6,1699.000,575,298),(1094,'3768','Bódvalenke','BZ',48.550,20.817,27429,6,663.000,182,62),(1095,'3768','Becskeháza','BZ',48.533,20.850,27049,6,500.000,40,40),(1096,'3769','Tornaszentjakab','BZ',48.517,20.883,30517,6,2822.000,205,135),(1097,'3770','Sajószentpéter','BZ',48.217,20.717,16054,4,3485.000,12453,4579),(1098,'3773','Sajókápolna','BZ',48.200,20.700,21670,6,1051.000,409,165),(1099,'3773','Sajólászlófalva','BZ',48.183,20.683,22479,6,662.000,438,166),(1100,'3775','Kondó','BZ',48.200,20.650,32498,6,1963.000,607,222),(1101,'3776','Radostyán','BZ',48.183,20.667,21193,6,810.000,627,223),(1102,'3777','Parasznya','BZ',48.167,20.650,26745,6,1676.000,1208,438),(1103,'3778','Varbó','BZ',48.167,20.633,21810,6,2588.000,1105,404),(1104,'3779','Alacska','BZ',48.217,20.650,33093,6,856.000,812,281),(1105,'3780','Ládbesenyő','BZ',48.300,20.733,26231,6,1040.000,285,127),(1106,'3780','Damak','BZ',48.317,20.833,11350,6,752.000,264,104),(1107,'3780','Balajt','BZ',48.300,20.733,22521,6,903.000,465,149),(1108,'3780','Edelény','BZ',48.300,20.733,10728,4,5684.000,10372,3567),(1109,'3783','Ládbesenyő','BZ',48.300,20.733,26231,6,1040.000,285,127),(1110,'3786','Irota','BZ',48.400,20.883,5005,6,1234.000,70,64),(1111,'3786','Szakácsi','BZ',48.383,20.867,32258,6,862.000,139,81),(1112,'3786','Hegymeg','BZ',48.333,20.867,2468,6,570.000,110,57),(1113,'3786','Lak','BZ',48.350,20.867,15857,6,1976.000,606,209),(1114,'3787','Tomor','BZ',48.333,20.883,14890,6,1289.000,230,124),(1115,'3791','Sajókeresztúr','BZ',48.167,20.783,26949,6,1639.000,1541,570),(1116,'3792','Sajóbábony','BZ',48.167,20.733,3504,5,1343.000,2877,1144),(1117,'3793','Sajóecseg','BZ',48.200,20.783,27331,6,794.000,1024,433),(1118,'3794','Boldva','BZ',48.217,20.800,8396,6,2834.000,2384,801),(1119,'3794','Ziliz','BZ',48.250,20.800,19275,6,925.000,369,137),(1120,'3795','Hangács','BZ',48.300,20.833,11226,6,2253.000,623,256),(1121,'3795','Nyomár','BZ',48.283,20.817,4215,6,1046.000,332,133),(1122,'3796','Borsodszirák','BZ',48.267,20.767,16799,6,1101.000,1228,390),(1123,'3800','Szikszó','BZ',48.200,20.933,21351,4,3623.000,5637,2212),(1124,'3809','Abaújszolnok','BZ',48.367,20.983,26338,6,866.000,164,70),(1125,'3809','Nyésta','BZ',48.367,20.950,4419,6,693.000,53,36),(1126,'3809','Selyeb','BZ',48.333,20.967,25380,6,1668.000,497,186),(1127,'3811','Alsóvadász','BZ',48.250,20.917,29814,6,2291.000,1554,457),(1128,'3812','Monaj','BZ',48.300,20.950,9016,6,1155.000,265,107),(1129,'3812','Homrogd','BZ',48.283,20.917,21236,6,1347.000,986,327),(1130,'3813','Kupa','BZ',48.333,20.917,18722,6,784.000,144,79),(1131,'3814','Felsővadász','BZ',48.367,20.933,23533,6,1866.000,549,186),(1132,'3815','Gadna','BZ',48.400,20.933,5494,6,809.000,260,83),(1133,'3815','Abaújlak','BZ',48.400,20.967,2820,6,706.000,114,86),(1134,'3816','Gagyvendégi','BZ',48.433,20.983,3744,6,1232.000,188,108),(1135,'3817','Gagybátor','BZ',48.433,20.950,28307,6,1877.000,238,118),(1136,'3821','Pamlény','BZ',48.500,20.933,12371,6,1243.000,58,55),(1137,'3821','Büttös','BZ',48.483,21.017,23977,6,1822.000,188,108),(1138,'3821','Szászfa','BZ',48.467,20.950,8147,6,1213.000,155,85),(1139,'3821','Kány','BZ',48.517,21.017,25742,6,925.000,61,57),(1140,'3821','Perecse','BZ',48.500,21.000,32683,6,1257.000,33,38),(1141,'3821','Krasznokvajda','BZ',48.467,20.983,19576,6,1144.000,503,202),(1142,'3821','Keresztéte','BZ',48.500,20.950,17066,6,401.000,31,27),(1143,'3825','Debréte','BZ',48.500,20.867,31954,6,962.000,19,28),(1144,'3825','Rakaca','BZ',48.467,20.900,29717,6,1900.000,763,262),(1145,'3825','Viszló','BZ',48.500,20.900,3957,6,1110.000,72,58),(1146,'3826','Rakacaszend','BZ',48.467,20.850,16133,6,1571.000,352,166),(1147,'3831','Kázsmárk','BZ',48.283,20.983,13374,6,1252.000,958,266),(1148,'3832','Léh','BZ',48.283,20.983,3531,6,845.000,452,153),(1149,'3833','Rásonysápberencs','BZ',48.317,21.000,31909,6,916.000,591,197),(1150,'3834','Beret','BZ',48.350,21.033,29674,6,682.000,273,93),(1151,'3834','Detek','BZ',48.333,21.033,10524,6,970.000,279,135),(1152,'3836','Baktakék','BZ',48.383,21.033,18184,6,1885.000,700,294),(1153,'3837','Felsőgagy','BZ',48.433,21.017,29708,6,1447.000,161,89),(1154,'3837','Gagyapáti','BZ',48.417,21.000,28732,6,326.000,24,14),(1155,'3837','Alsógagy','BZ',48.400,21.033,14429,6,628.000,100,56),(1156,'3837','Csenyéte','BZ',48.433,21.050,8493,6,1000.000,454,83),(1157,'3841','Aszaló','BZ',48.217,20.967,4233,6,2540.000,1960,644),(1158,'3842','Halmaj','BZ',48.250,21.000,27942,6,1263.000,1885,600),(1159,'3843','Kiskinizs','BZ',48.250,21.050,3762,6,718.000,339,130),(1160,'3844','Szentistvánbaksa','BZ',48.217,21.033,8484,6,656.000,277,140),(1161,'3844','Nagykinizs','BZ',48.233,21.033,26505,6,662.000,350,138),(1162,'3846','Hernádkércs','BZ',48.250,21.050,21829,6,741.000,267,151),(1163,'3847','Felsődobsza','BZ',48.267,21.067,9742,6,1527.000,933,343),(1164,'3848','Csobád','BZ',48.283,21.033,5333,6,1186.000,697,265),(1165,'3849','Forró','BZ',48.317,21.083,30483,6,1903.000,2476,859),(1166,'3851','Ináncs','BZ',48.283,21.067,8086,6,1098.000,1278,437),(1167,'3852','Hernádszentandrás','BZ',48.283,21.100,17136,6,704.000,475,165),(1168,'3853','Pere','BZ',48.283,21.133,24420,6,956.000,357,182),(1169,'3853','Hernádbűd','BZ',48.300,21.133,15839,6,591.000,142,79),(1170,'3854','Hernádbűd','BZ',48.300,21.133,15839,6,591.000,142,79),(1171,'3855','Fancsal','BZ',48.350,21.067,12557,6,981.000,317,146),(1172,'3860','Encs','BZ',48.333,21.133,33048,4,2580.000,6396,2274),(1173,'3861','Encs','BZ',48.333,21.133,33048,4,2580.000,6396,2274),(1174,'3863','Szalaszend','BZ',48.383,21.133,31015,6,1826.000,1117,380),(1175,'3864','Fulókércs','BZ',48.433,21.117,22123,6,1863.000,387,120),(1176,'3865','Fáj','BZ',48.417,21.083,2741,6,1932.000,358,100),(1177,'3866','Szemere','BZ',48.467,21.100,9830,6,2630.000,386,157),(1178,'3866','Litka','BZ',48.450,21.067,28219,6,670.000,56,49),(1179,'3871','Méra','BZ',48.350,21.150,25618,6,1511.000,1775,596),(1180,'3872','Novajidrány','BZ',48.400,21.183,27191,6,1435.000,1428,465),(1181,'3873','Garadna','BZ',48.417,21.183,10904,6,978.000,458,194),(1182,'3874','Pusztaradvány','BZ',48.467,21.133,15413,6,718.000,232,66),(1183,'3874','Hernádvécse','BZ',48.450,21.167,19840,6,1694.000,978,288),(1184,'3874','Hernádpetri','BZ',48.483,21.167,24882,6,1711.000,270,103),(1185,'3875','Hernádszurdok','BZ',48.483,21.217,24970,6,448.000,197,97),(1186,'3876','Hidasnémeti','BZ',48.500,21.233,11697,6,1611.000,1115,442),(1187,'3877','Tornyosnémeti','BZ',48.517,21.267,29054,6,1404.000,510,273),(1188,'3881','Abaújszántó','BZ',48.283,21.200,3595,4,4736.000,3169,1306),(1189,'3881','Sima','BZ',48.300,21.300,23418,6,488.000,23,16),(1190,'3881','Baskó','BZ',48.333,21.333,8846,6,2963.000,186,116),(1191,'3882','Abaújalpár','BZ',48.317,21.233,15662,6,848.000,77,61),(1192,'3882','Abaújkér','BZ',48.300,21.200,26718,6,1727.000,692,300),(1193,'3884','Boldogkőújfalu','BZ',48.317,21.250,18944,6,1102.000,534,214),(1194,'3885','Boldogkőváralja','BZ',48.333,21.233,14474,6,2203.000,1160,435),(1195,'3885','Arka','BZ',48.350,21.250,26198,6,953.000,81,65),(1196,'3886','Korlát','BZ',48.383,21.250,22956,6,794.000,293,143),(1197,'3887','Hernádcéce','BZ',48.350,21.200,9399,6,994.000,206,122),(1198,'3888','Vizsoly','BZ',48.383,21.217,21087,6,1841.000,878,359),(1199,'3891','Vilmány','BZ',48.417,21.233,11581,6,1258.000,1375,460),(1200,'3892','Hejce','BZ',48.433,21.283,22187,6,953.000,267,113),(1201,'3893','Regéc','BZ',48.400,21.350,8402,6,2721.000,99,62),(1202,'3893','Fony','BZ',48.400,21.300,17932,6,4058.000,368,210),(1203,'3893','Mogyoróska','BZ',48.383,21.333,10968,6,1917.000,75,70),(1204,'3894','Göncruszka','BZ',48.450,21.250,18643,6,1673.000,623,324),(1205,'3895','Gönc','BZ',48.467,21.283,15936,4,3730.000,2060,950),(1206,'3896','Telkibánya','BZ',48.483,21.367,13763,6,4686.000,634,342),(1207,'3897','Zsujta','BZ',48.500,21.283,11022,6,677.000,173,88),(1208,'3898','Abaújvár','BZ',48.533,21.317,2273,6,736.000,232,159),(1209,'3898','Pányok','BZ',48.533,21.367,24730,6,850.000,53,81),(1210,'3899','Kéked','BZ',48.550,21.350,15264,6,1305.000,193,139),(1211,'3900','Szerencs','BZ',48.167,21.200,30739,4,3668.000,9444,3869),(1212,'3901','Szerencs','BZ',48.167,21.200,30739,4,3668.000,9444,3869),(1213,'3903','Bekecs','BZ',48.150,21.183,6929,6,2572.000,2486,928),(1214,'3904','Legyesbénye','BZ',48.167,21.150,11660,6,2031.000,1593,630),(1215,'3905','Monok','BZ',48.217,21.150,7825,6,4198.000,1606,806),(1216,'3906','Golop','BZ',48.233,21.200,13134,6,943.000,585,301),(1217,'3907','Tállya','BZ',48.233,21.233,12210,6,3795.000,2025,1019),(1218,'3908','Rátka','BZ',48.217,21.233,12469,6,1177.000,975,432),(1219,'3909','Mád','BZ',48.200,21.283,3902,6,3186.000,2251,1211),(1220,'3910','Tokaj','BZ',48.117,21.417,18306,4,2819.000,4747,1707),(1221,'3911','Tokaj','BZ',48.117,21.417,18306,4,2819.000,4747,1707),(1222,'3915','Tarcal','BZ',48.133,21.350,21740,6,5373.000,3006,1353),(1223,'3916','Bodrogkeresztúr','BZ',48.167,21.367,30784,6,2987.000,1157,560),(1224,'3917','Bodrogkisfalud','BZ',48.183,21.367,33808,6,1468.000,891,432),(1225,'3918','Szegi','BZ',48.200,21.383,33817,6,905.000,323,138),(1226,'3918','Szegilong','BZ',48.217,21.400,31510,6,694.000,231,120),(1227,'3921','Taktaszada','BZ',48.117,21.183,3133,6,2574.000,1947,682),(1228,'3922','Taktaharkány','BZ',48.083,21.133,18245,5,3913.000,3853,1343),(1229,'3923','Taktaharkány','BZ',48.083,21.133,18245,5,3913.000,3853,1343),(1230,'3924','Taktakenéz','BZ',48.050,21.217,28787,6,1974.000,1268,436),(1231,'3925','Prügy','BZ',48.083,21.250,21272,6,3139.000,2454,837),(1232,'3926','Taktabáj','BZ',48.067,21.317,3708,6,1682.000,597,239),(1233,'3927','Csobaj','BZ',48.050,21.350,20774,6,1959.000,767,345),(1234,'3928','Tiszatardos','BZ',48.050,21.383,30298,6,893.000,240,146),(1235,'3929','Tiszaladány','BZ',48.067,21.417,19381,6,2221.000,704,330),(1236,'3931','Mezőzombor','BZ',48.150,21.267,3443,6,3878.000,2475,902),(1237,'3932','Erdőbénye','BZ',48.267,21.367,25326,6,4579.000,1099,699),(1238,'3933','Olaszliszka','BZ',48.250,21.433,31778,6,3949.000,1672,791),(1239,'3934','Tolcsva','BZ',48.283,21.450,28051,6,1649.000,1756,805),(1240,'3935','Erdőhorváti','BZ',48.317,21.433,22503,6,5011.000,604,319),(1241,'3936','Háromhuta','BZ',48.383,21.433,12706,6,3780.000,132,89),(1242,'3937','Komlóska','BZ',48.333,21.467,16559,6,2986.000,268,179),(1243,'3941','Vámosújfalu','BZ',48.267,21.467,15149,6,1065.000,863,331),(1244,'3942','Sárazsadány','BZ',48.267,21.500,20516,6,1533.000,260,181),(1245,'3943','Bodrogolaszi','BZ',48.283,21.517,14401,6,2061.000,942,400),(1246,'3944','Bodrogolaszi','BZ',48.283,21.517,14401,6,2061.000,942,400),(1247,'3945','Bodrogolaszi','BZ',48.283,21.517,14401,6,2061.000,942,400),(1248,'3950','Sárospatak','BZ',48.317,21.583,27474,4,13919.000,13357,5323),(1249,'3954','Györgytarló','BZ',48.200,21.667,5069,6,3019.000,578,224),(1250,'3955','Kenézlő','BZ',48.200,21.533,5458,6,2296.000,1261,566),(1251,'3956','Viss','BZ',48.217,21.517,5096,6,1392.000,672,353),(1252,'3957','Zalkod','BZ',48.183,21.467,15617,6,1022.000,244,215),(1253,'3958','Hercegkút','BZ',48.333,21.533,30137,6,782.000,634,258),(1254,'3959','Makkoshotyka','BZ',48.350,21.517,19600,6,1041.000,905,310),(1255,'3961','Vajdácska','BZ',48.317,21.667,30003,6,2278.000,1343,468),(1256,'3962','Karos','BZ',48.333,21.750,30508,6,1532.000,508,206),(1257,'3963','Karcsa','BZ',48.317,21.800,21218,6,4370.000,1806,665),(1258,'3964','Pácin','BZ',48.333,21.833,15893,6,3394.000,1421,622),(1259,'3965','Kisrozvágy','BZ',48.350,21.950,11448,6,834.000,150,87),(1260,'3965','Nagyrozvágy','BZ',48.333,21.917,33181,6,2682.000,642,292),(1261,'3967','Lácacséke','BZ',48.367,22.000,20844,6,1637.000,291,208),(1262,'3971','Tiszakarád','BZ',48.200,21.717,13976,6,4757.000,2373,929),(1263,'3972','Tiszacsermely','BZ',48.233,21.783,29133,6,2028.000,629,254),(1264,'3973','Cigánd','BZ',48.250,21.900,3939,4,5676.000,2820,1170),(1265,'3974','Ricse','BZ',48.333,21.967,19220,5,2476.000,1737,660),(1266,'3974','Semjén','BZ',48.350,21.967,23755,6,784.000,461,168),(1267,'3976','Révleányvár','BZ',48.317,22.050,9317,6,1649.000,521,320),(1268,'3977','Zemplénagárd','BZ',48.350,22.083,31608,6,2911.000,775,430),(1269,'3978','Dámóc','BZ',48.367,22.033,7719,6,1599.000,392,201),(1270,'3980','Sátoraljaújhely','BZ',48.400,21.667,5120,4,7347.000,16299,6875),(1271,'3981','Sátoraljaújhely','BZ',48.400,21.667,5120,4,7347.000,16299,6875),(1272,'3985','Felsőberecki','BZ',48.367,21.700,8174,6,353.000,296,117),(1273,'3985','Alsóberecki','BZ',48.350,21.700,20482,6,686.000,795,288),(1274,'3987','Bodroghalom','BZ',48.300,21.717,23737,6,2687.000,1355,564),(1275,'3988','Bodroghalom','BZ',48.300,21.717,23737,6,2687.000,1355,564),(1276,'3989','Mikóháza','BZ',48.475,21.617,24253,6,1692.000,578,228),(1277,'3989','Felsőregmec','BZ',48.483,21.617,7588,6,1075.000,309,103),(1278,'3989','Alsóregmec','BZ',48.467,21.617,23223,6,1539.000,202,92),(1279,'3991','Vilyvitány','BZ',48.500,21.567,12982,6,1313.000,249,177),(1280,'3992','Vágáshuta','BZ',48.417,21.550,29151,6,200.000,99,70),(1281,'3992','Kovácsvágás','BZ',48.450,21.533,28547,6,2113.000,632,238),(1282,'3993','Füzérradvány','BZ',48.483,21.533,10366,6,986.000,390,209),(1283,'3994','Kishuta','BZ',48.450,21.483,28875,6,518.000,293,133),(1284,'3994','Filkeháza','BZ',48.500,21.500,25238,6,441.000,102,42),(1285,'3994','Nagyhuta','BZ',48.433,21.500,15468,6,3506.000,73,80),(1286,'3994','Füzérkajata','BZ',48.517,21.500,6460,6,1145.000,116,77),(1287,'3994','Pálháza','BZ',48.467,21.517,12362,4,676.000,1062,416),(1288,'3994','Bózsva','BZ',48.467,21.467,31006,6,1639.000,197,124),(1289,'3995','Pusztafalu','BZ',48.550,21.500,17048,6,700.000,213,106),(1290,'3996','Füzér','BZ',48.550,21.467,17109,6,3750.000,477,228),(1291,'3997','Füzérkomlós','BZ',48.517,21.467,11378,6,587.000,340,139),(1292,'3998','Nyíri','BZ',48.500,21.450,26435,6,1647.000,426,177),(1293,'3999','Hollóháza','BZ',48.550,21.417,31167,6,236.000,885,433),(1294,'4000','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1295,'4001','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1296,'4002','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1297,'4003','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1298,'4004','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1299,'4005','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1300,'4006','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1301,'4007','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1302,'4008','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1303,'4009','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1304,'4010','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1305,'4011','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1306,'4012','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1307,'4013','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1308,'4014','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1309,'4015','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1310,'4017','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1311,'4021','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1312,'4022','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1313,'4024','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1314,'4025','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1315,'4026','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1316,'4027','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1317,'4028','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1318,'4029','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1319,'4030','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1320,'4031','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1321,'4032','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1322,'4033','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1323,'4034','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1324,'4040','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1325,'4041','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1326,'4042','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1327,'4044','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1328,'4045','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1329,'4046','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1330,'4047','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1331,'4048','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(1332,'4060','Balmazújváros','HB',47.617,21.350,2918,4,20545.000,17575,6669),(1333,'4063','Balmazújváros','HB',47.617,21.350,2918,4,20545.000,17575,6669),(1334,'4063','Debrecen','HB',47.617,21.350,15130,1,46165.000,206225,89716),(1335,'4064','Nagyhegyes','HB',47.517,21.417,9478,6,13276.000,2752,990),(1336,'4065','Újszentmargita','HB',47.733,21.100,32568,6,9622.000,1442,652),(1337,'4066','Tiszacsege','HB',47.700,21.000,15644,4,13640.000,4705,2101),(1338,'4067','Tiszacsege','HB',47.700,21.000,15644,4,13640.000,4705,2101),(1339,'4069','Egyek','HB',47.633,20.900,15741,5,10479.000,5071,2392),(1340,'4071','Hortobágy','HB',47.583,21.167,4118,6,28458.000,1553,651),(1341,'4074','Tarnalelesz','HB',47.771,21.217,13240,6,3713.000,1715,694),(1342,'4075','Görbeháza','HB',47.833,21.233,16568,6,8020.000,2463,1071),(1343,'4078','Görbeháza','HB',47.833,21.233,16568,6,8020.000,2463,1071),(1344,'4079','Görbeháza','HB',47.833,21.233,16568,6,8020.000,2463,1071),(1345,'4080','Hajdúnánás','HB',47.850,21.433,22406,4,25962.000,17498,7027),(1346,'4081','Hajdúnánás','HB',47.850,21.433,22406,4,25962.000,17498,7027),(1347,'4085','Hajdúnánás','HB',47.850,21.433,22406,4,25962.000,17498,7027),(1348,'4086','Hajdúnánás','HB',47.850,21.433,22406,4,25962.000,17498,7027),(1349,'4087','Hajdúdorog','HB',47.817,21.500,12803,4,10065.000,9070,3562),(1350,'4090','Polgár','HB',47.867,21.117,23117,4,9746.000,8133,3364),(1351,'4090','Folyás','HB',47.800,21.133,34014,6,5392.000,352,154),(1352,'4096','Újtikos','HB',47.917,21.183,11925,6,3529.000,905,386),(1353,'4097','Tiszagyulaháza','HB',47.950,21.150,30845,6,2078.000,768,373),(1354,'4100','Berettyóújfalu','HB',47.217,21.550,12788,4,17098.000,15427,6308),(1355,'4101','Berettyóújfalu','HB',47.217,21.550,12788,4,17098.000,15427,6308),(1356,'4103','Berettyóújfalu','HB',47.217,21.550,12788,4,17098.000,15427,6308),(1357,'4110','Biharkeresztes','HB',47.133,21.717,19956,4,4926.000,3819,1655),(1358,'4114','Bojt','HB',47.200,21.733,14137,6,2688.000,501,246),(1359,'4115','Ártánd','HB',47.117,21.767,3319,6,1982.000,506,240),(1360,'4116','Berekböszörmény','HB',47.067,21.683,18467,6,4284.000,1707,785),(1361,'4117','Told','HB',47.117,21.650,25876,6,1491.000,312,150),(1362,'4118','Mezőpeterd','HB',47.167,21.617,31033,6,1823.000,500,269),(1363,'4119','Váncsod','HB',47.200,21.650,16762,6,3443.000,1241,543),(1364,'4121','Szentpéterszeg','HB',47.233,21.617,19099,6,2551.000,1111,477),(1365,'4122','Gáborján','HB',47.233,21.667,18175,6,2646.000,898,386),(1366,'4123','Hencida','HB',47.250,21.700,29391,6,3479.000,1280,484),(1367,'4124','Esztár','HB',47.283,21.783,25469,6,3171.000,1351,525),(1368,'4125','Pocsaj','HB',47.283,21.817,11837,5,4955.000,2588,1033),(1369,'4126','Kismarja','HB',47.250,21.833,15477,6,4716.000,1239,535),(1370,'4127','Nagykereki','HB',47.183,21.800,8907,6,3727.000,1185,530),(1371,'4128','Bedő','HB',47.167,21.750,33446,6,1020.000,252,142),(1372,'4130','Derecske','HB',47.350,21.567,5573,4,10358.000,9116,3315),(1373,'4131','Derecske','HB',47.350,21.567,5573,4,10358.000,9116,3315),(1374,'4132','Tépe','HB',47.317,21.583,31042,6,2322.000,1116,420),(1375,'4133','Konyár','HB',47.317,21.667,25964,6,4170.000,2099,857),(1376,'4134','Mezősas','HB',47.117,21.567,18847,6,2639.000,635,310),(1377,'4135','Körösszegapáti','HB',47.033,21.633,8943,6,4585.000,862,500),(1378,'4136','Körösszakál','HB',47.017,21.600,31130,6,1502.000,828,391),(1379,'4137','Magyarhomorog','HB',47.017,21.550,3683,6,3956.000,861,453),(1380,'4138','Komádi','HB',47.000,21.500,2167,4,14465.000,5407,2604),(1381,'4141','Furta','HB',47.133,21.467,16993,6,4285.000,1151,599),(1382,'4142','Zsáka','HB',47.133,21.433,4817,5,7881.000,1622,764),(1383,'4143','Vekerd','HB',47.100,21.400,11138,6,741.000,119,114),(1384,'4144','Darvas','HB',47.100,21.350,14678,6,4231.000,574,284),(1385,'4145','Csökmő','HB',47.033,21.300,12450,5,6897.000,1885,916),(1386,'4146','Újiráz','HB',46.983,21.367,23393,6,1547.000,543,275),(1387,'4150','Püspökladány','HB',47.317,21.117,10162,4,18695.000,15117,5964),(1388,'4151','Püspökladány','HB',47.317,21.117,10162,4,18695.000,15117,5964),(1389,'4152','Püspökladány','HB',47.317,21.117,10162,4,18695.000,15117,5964),(1390,'4155','Püspökladány','HB',47.317,21.117,10162,4,18695.000,15117,5964),(1391,'4161','Báránd','HB',47.300,21.233,26693,6,4257.000,2624,1183),(1392,'4162','Báránd','HB',47.300,21.233,26693,6,4257.000,2624,1183),(1393,'4163','Szerep','HB',47.233,21.150,33437,6,5604.000,1604,571),(1394,'4164','Bakonszeg','HB',47.183,21.450,15167,6,3503.000,1176,584),(1395,'4171','Sárrétudvari','HB',47.233,21.200,23940,5,5442.000,2870,1251),(1396,'4172','Biharnagybajom','HB',47.217,21.233,24828,6,6135.000,2801,1145),(1397,'4173','Nagyrábé','HB',47.200,21.333,6309,5,8542.000,2102,964),(1398,'4174','Bihartorda','HB',47.217,21.367,29887,6,2238.000,905,435),(1399,'4175','Bihardancsháza','HB',47.233,21.317,25256,6,831.000,193,104),(1400,'4176','Sáp','HB',47.250,21.367,26116,6,1922.000,980,410),(1401,'4177','Földes','HB',47.300,21.367,3258,5,6524.000,4092,1753),(1402,'4181','Nádudvar','HB',47.417,21.167,28103,4,22591.000,8995,3728),(1403,'4183','Kaba','HB',47.350,21.283,2307,4,9504.000,6087,2369),(1404,'4184','Tetétlen','HB',47.317,21.300,19691,6,3211.000,1397,558),(1405,'4200','Hajdúszoboszló','HB',47.447,21.392,5175,4,23870.000,23296,10524),(1406,'4201','Hajdúszoboszló','HB',47.450,21.400,5175,4,23870.000,23296,10524),(1407,'4202','Hajdúszoboszló','HB',47.450,21.400,5175,4,23870.000,23296,10524),(1408,'4211','Ebes','HB',47.467,21.500,14614,6,7727.000,4407,1579),(1409,'4212','Hajdúszovát','HB',47.383,21.483,17473,6,5801.000,3087,1101),(1410,'4220','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(1411,'4221','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(1412,'4224','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(1413,'4225','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(1414,'4225','Debrecen','HB',47.667,21.517,15130,1,46165.000,206225,89716),(1415,'4231','Bököny','SZ',47.733,21.750,11299,6,3547.000,3272,1267),(1416,'4232','Geszteréd','SZ',47.767,21.783,28893,6,3352.000,1709,798),(1417,'4233','Balkány','SZ',47.767,21.867,26958,4,8999.000,6442,2494),(1418,'4234','Szakoly','SZ',47.767,21.917,4774,6,4144.000,2847,1028),(1419,'4235','Biri','SZ',47.817,21.850,2945,6,2259.000,1356,495),(1420,'4241','Bocskaikert','HB',47.433,21.917,34102,6,1089.000,2964,1059),(1421,'4242','Hajdúhadház','HB',47.683,21.667,10393,4,8780.000,12650,4203),(1422,'4243','Téglás','HB',47.717,21.683,23214,4,3833.000,6624,2337),(1423,'4244','Újfehértó','SZ',47.800,21.683,26611,4,14088.000,13335,4971),(1424,'4245','Érpatak','SZ',47.800,21.767,10852,6,3133.000,1749,735),(1425,'4246','Érpatak','SZ',47.800,21.767,10852,6,3133.000,1749,735),(1426,'4251','Hajdúsámson','HB',47.600,21.767,31097,4,6947.000,12846,4103),(1427,'4252','Hajdúsámson','HB',47.600,21.767,31097,4,6947.000,12846,4103),(1428,'4253','Hajdúsámson','HB',47.600,21.767,31097,4,6947.000,12846,4103),(1429,'4254','Nyíradony','HB',47.683,21.917,6187,4,9659.000,7874,2796),(1430,'4262','Nyíracsád','HB',47.600,21.983,14003,6,7492.000,3873,1482),(1431,'4263','Nyírmártonfalva','HB',47.583,21.900,32382,6,5748.000,2075,818),(1432,'4264','Nyírábrány','HB',47.550,22.033,32294,5,5562.000,3854,1545),(1433,'4266','Fülöp','HB',47.600,22.067,22150,6,5595.000,1767,784),(1434,'4267','Penészlek','SZ',47.633,22.150,17084,6,3692.000,959,503),(1435,'4271','Mikepércs','HB',47.450,21.633,24217,6,3693.000,4177,1221),(1436,'4272','Sáránd','HB',47.400,21.633,25007,6,2268.000,2338,831),(1437,'4273','Hajdúbagos','HB',47.400,21.667,26170,6,3744.000,1995,854),(1438,'4274','Hosszúpályi','HB',47.400,21.750,6266,5,7918.000,5839,2045),(1439,'4275','Monostorpályi','HB',47.400,21.783,25894,6,4444.000,2217,954),(1440,'4281','Létavértes','HB',47.383,21.900,5768,4,11662.000,7165,2724),(1441,'4283','Létavértes','HB',47.383,21.900,5768,4,11662.000,7165,2724),(1442,'4284','Kokad','HB',47.400,21.950,17455,6,1610.000,596,302),(1443,'4285','Álmosd','HB',47.417,21.983,27641,6,3413.000,1602,725),(1444,'4286','Bagamér','HB',47.450,22.000,20011,5,4702.000,2553,1023),(1445,'4287','Vámospércs','HB',47.533,21.900,8989,4,5819.000,5347,2146),(1446,'4288','Újléta','HB',47.467,21.883,20419,6,3041.000,1063,445),(1447,'4300','Nyírbátor','SZ',47.833,22.133,14845,4,6673.000,12522,4764),(1448,'4301','Nyírbátor','SZ',47.833,22.133,14845,4,6673.000,12522,4764),(1449,'4311','Nyírgyulaj','SZ',47.883,22.100,9238,6,3576.000,2000,786),(1450,'4320','Nagykálló','SZ',47.883,21.850,24785,4,6855.000,10064,3653),(1451,'4321','Nagykálló','SZ',47.883,21.850,24785,4,6855.000,10064,3653),(1452,'4324','Kállósemjén','SZ',47.867,21.933,31404,5,5452.000,3820,1570),(1453,'4325','Kisléta','SZ',47.833,22.017,28477,6,2200.000,1896,574),(1454,'4326','Máriapócs','SZ',47.883,22.033,19655,4,2209.000,2130,728),(1455,'4327','Pócspetri','SZ',47.883,22.000,11244,6,2637.000,1762,669),(1456,'4331','Nyírcsászári','SZ',47.867,22.183,25973,6,1323.000,1166,430),(1457,'4332','Nyírderzs','SZ',47.900,22.167,5041,6,1701.000,598,266),(1458,'4333','Nyírkáta','SZ',47.867,22.267,32452,6,3863.000,1816,661),(1459,'4334','Hodász','SZ',47.917,22.217,13019,5,2649.000,3399,1134),(1460,'4335','Kántorjánosi','SZ',47.933,22.150,2671,6,4162.000,2183,883),(1461,'4336','Őr','SZ',47.983,22.200,9025,6,1778.000,1447,544),(1462,'4337','Jármi','SZ',47.967,22.250,17589,6,1237.000,1267,482),(1463,'4338','Papos','SZ',47.983,22.250,32577,6,1067.000,837,320),(1464,'4341','Nyírvasvári','SZ',47.817,22.183,16522,6,2843.000,1944,743),(1465,'4342','Terem','SZ',47.800,22.317,33358,6,4951.000,650,306),(1466,'4343','Bátorliget','SZ',47.808,22.250,2990,6,3330.000,710,353),(1467,'4351','Vállaj','SZ',47.767,22.383,6938,6,2227.000,867,456),(1468,'4352','Mérk','SZ',47.783,22.367,7463,5,2508.000,2118,817),(1469,'4353','Tiborszállás','SZ',47.817,22.417,8952,6,2552.000,1003,373),(1470,'4354','Fábiánháza','SZ',47.833,22.367,23250,6,2735.000,1730,777),(1471,'4355','Nagyecsed','SZ',47.867,22.400,6488,4,4387.000,6306,2391),(1472,'4356','Nyírcsaholy','SZ',47.900,22.333,7904,6,3434.000,2172,833),(1473,'4361','Nyírbogát','SZ',47.800,22.067,31158,5,5536.000,3279,1287),(1474,'4362','Nyírgelse','SZ',47.750,21.983,28440,6,2761.000,1117,504),(1475,'4363','Nyírmihálydi','SZ',47.733,21.983,26365,6,2548.000,2005,638),(1476,'4371','Nyírlugos','SZ',47.700,22.050,11271,4,5838.000,2837,1226),(1477,'4372','Nyírbéltek','SZ',47.700,22.133,15802,5,6217.000,2815,1119),(1478,'4373','Ömböly','SZ',47.700,22.217,26550,6,3035.000,425,200),(1479,'4374','Encsencs','SZ',47.733,22.117,32328,6,3191.000,1986,678),(1480,'4375','Piricse','SZ',47.767,22.150,3391,6,3699.000,1891,642),(1481,'4376','Nyírpilis','SZ',47.783,22.183,3878,6,1634.000,836,243),(1482,'4400','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1483,'4401','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1484,'4402','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1485,'4403','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1486,'4404','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1487,'4405','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1488,'4406','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1489,'4407','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1490,'4410','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1491,'4411','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1492,'4412','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1493,'4413','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1494,'4431','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1495,'4432','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1496,'4433','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1497,'4434','Kálmánháza','SZ',47.883,21.583,27225,6,3724.000,2051,762),(1498,'4435','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(1499,'4440','Tiszavasvári','SZ',47.967,21.350,7597,4,12659.000,13012,4559),(1500,'4441','Szorgalmatos','SZ',47.967,21.488,34388,6,1038.000,1070,330),(1501,'4444','Szorgalmatos','SZ',47.967,21.488,34388,6,1038.000,1070,330),(1502,'4445','Nagycserkesz','SZ',47.967,21.533,22743,6,4151.000,1800,684),(1503,'4446','Nagycserkesz','SZ',47.967,21.533,22743,6,4151.000,1800,684),(1504,'4447','Nagycserkesz','SZ',47.967,21.533,22743,6,4151.000,1800,684),(1505,'4450','Tiszalök','SZ',48.017,21.383,23524,4,5872.000,5768,2262),(1506,'4455','Tiszadada','SZ',48.033,21.250,6433,6,4877.000,2327,977),(1507,'4456','Tiszadob','SZ',48.017,21.167,12593,5,8261.000,3071,1233),(1508,'4461','Nyírtelek','SZ',48.017,21.633,13550,4,6792.000,7001,2552),(1509,'4463','Tiszanagyfalu','SZ',48.100,21.483,27252,6,2705.000,1904,707),(1510,'4464','Tiszaeszlár','SZ',48.050,21.467,9113,6,5460.000,2676,1097),(1511,'4465','Rakamaz','SZ',48.133,21.467,14739,4,4264.000,4910,1893),(1512,'4466','Timár','SZ',48.167,21.467,24475,6,2182.000,1350,533),(1513,'4467','Szabolcs','SZ',48.183,21.500,19169,6,588.000,423,201),(1514,'4468','Balsa','SZ',48.183,21.550,15963,6,2251.000,856,433),(1515,'4471','Gávavencsellő','SZ',48.167,21.600,5801,5,6683.000,3596,1662),(1516,'4472','Gávavencsellő','SZ',48.167,21.600,5801,5,6683.000,3596,1662),(1517,'4474','Tiszabercel','SZ',48.150,21.650,3850,6,3138.000,1957,754),(1518,'4475','Paszab','SZ',48.150,21.683,31972,6,1296.000,1306,434),(1519,'4481','Paszab','SZ',48.150,21.683,31972,6,1296.000,1306,434),(1520,'4482','Kótaj','SZ',48.050,21.717,23728,6,2593.000,4542,1523),(1521,'4483','Buj','SZ',48.100,21.650,19707,6,3276.000,2305,978),(1522,'4484','Ibrány','SZ',48.133,21.717,25636,4,6048.000,6955,2369),(1523,'4485','Nagyhalász','SZ',48.133,21.767,27155,4,4431.000,5715,1963),(1524,'4486','Nagyhalász','SZ',48.133,21.767,27155,4,4431.000,5715,1963),(1525,'4487','Tiszatelek','SZ',48.200,21.800,14447,6,3378.000,1473,541),(1526,'4488','Beszterec','SZ',48.150,21.850,21227,6,1159.000,1044,379),(1527,'4491','Újdombrád','SZ',48.233,21.933,33659,6,1078.000,703,220),(1528,'4492','Dombrád','SZ',48.233,21.933,14508,4,5184.000,4069,1484),(1529,'4493','Tiszakanyár','SZ',48.250,21.967,8554,6,1551.000,1630,551),(1530,'4494','Kékcse','SZ',48.250,22.000,14359,6,1823.000,1568,493),(1531,'4495','Döge','SZ',48.267,22.083,3647,6,1654.000,2115,743),(1532,'4496','Szabolcsveresmart','SZ',48.300,22.017,3586,6,2295.000,1708,578),(1533,'4501','Kemecse','SZ',48.067,21.800,19992,4,3894.000,4840,1673),(1534,'4502','Vasmegyer','SZ',48.117,21.817,27100,6,2273.000,1726,584),(1535,'4503','Tiszarád','SZ',48.117,21.800,10205,6,923.000,603,209),(1536,'4511','Nyírbogdány','SZ',48.050,21.883,28802,6,3503.000,2985,1046),(1537,'4512','Nyírbogdány','SZ',48.050,21.883,28802,6,3503.000,2985,1046),(1538,'4515','Kék','SZ',48.117,21.883,28431,6,2205.000,1966,670),(1539,'4516','Demecser','SZ',48.117,21.917,17756,4,3698.000,4368,1524),(1540,'4517','Gégény','SZ',48.150,21.950,5670,6,2344.000,1981,733),(1541,'4521','Berkesz','SZ',48.100,21.983,7472,6,1318.000,900,345),(1542,'4522','Nyírtass','SZ',48.117,22.033,28060,6,3795.000,2034,832),(1543,'4523','Pátroha','SZ',48.167,22.000,12186,6,3922.000,2939,1032),(1544,'4524','Ajak','SZ',48.183,22.067,8776,5,2476.000,3691,1297),(1545,'4525','Rétközberencs','SZ',48.200,22.017,21573,6,1580.000,1171,403),(1546,'4531','Nyírpazony','SZ',47.983,21.800,33145,6,1505.000,3396,1220),(1547,'4532','Nyírtura','SZ',48.017,21.833,12098,6,2148.000,1872,659),(1548,'4533','Sényő','SZ',48.000,21.883,4491,6,1830.000,1439,463),(1549,'4534','Székely','SZ',48.067,21.950,31088,6,1608.000,1076,363),(1550,'4535','Nyíribrony','SZ',48.017,21.967,14696,6,2009.000,1118,429),(1551,'4536','Ramocsaháza','SZ',48.050,22.000,31857,6,1811.000,1493,547),(1552,'4537','Nyírkércs','SZ',48.017,22.050,25928,6,1428.000,799,321),(1553,'4541','Nyírjákó','SZ',48.033,22.083,31477,6,1034.000,927,365),(1554,'4542','Petneháza','SZ',48.067,22.083,17224,6,2420.000,1849,703),(1555,'4543','Laskod','SZ',48.050,22.050,21290,6,1359.000,1006,415),(1556,'4544','Nyírkarász','SZ',48.100,22.100,18290,6,4143.000,2360,872),(1557,'4545','Gyulaháza','SZ',48.133,22.117,7676,6,2209.000,1970,691),(1558,'4546','Anarcs','SZ',48.183,22.117,29975,6,1706.000,1977,682),(1559,'4547','Szabolcsbáka','SZ',48.150,22.150,22053,6,1984.000,1215,464),(1560,'4551','Szabolcsbáka','SZ',48.150,22.150,22053,6,1984.000,1215,464),(1561,'4552','Napkor','SZ',47.933,21.883,8420,6,3735.000,3844,1336),(1562,'4553','Apagy','SZ',47.967,21.933,20303,6,3204.000,2269,862),(1563,'4554','Nyírtét','SZ',48.017,21.933,9256,6,1717.000,1080,375),(1564,'4555','Levelek','SZ',47.967,22.000,30979,5,2573.000,2898,953),(1565,'4556','Magy','SZ',47.933,21.983,16629,6,2070.000,987,332),(1566,'4557','Besenyőd','SZ',47.967,22.017,13639,6,945.000,642,254),(1567,'4558','Ófehértó','SZ',47.933,22.050,22284,6,4317.000,2614,1020),(1568,'4561','Baktalórántháza','SZ',48.000,22.083,2325,4,3525.000,4306,1204),(1569,'4562','Vaja','SZ',48.000,22.167,18591,5,2861.000,3625,1171),(1570,'4563','Rohod','SZ',48.033,22.133,24581,6,1956.000,1225,434),(1571,'4564','Nyírmada','SZ',48.067,22.200,12274,5,3882.000,4866,1568),(1572,'4565','Pusztadobos','SZ',48.067,22.233,13860,6,1669.000,1330,511),(1573,'4566','Ilk','SZ',48.117,22.233,9654,6,1456.000,1234,418),(1574,'4567','Gemzse','SZ',48.133,22.200,13000,6,1360.000,829,302),(1575,'4600','Kisvárda','SZ',48.217,22.083,9265,4,3591.000,17097,6915),(1576,'4601','Kisvárda','SZ',48.217,22.083,9265,4,3591.000,17097,6915),(1577,'4603','Kisvárda','SZ',48.217,22.083,9265,4,3591.000,17097,6915),(1578,'4611','Jéke','SZ',48.233,22.167,13143,6,632.000,736,278),(1579,'4621','Fényeslitke','SZ',48.267,22.100,22415,6,2515.000,2409,868),(1580,'4622','Komoró','SZ',48.300,22.117,27146,6,1169.000,1318,459),(1581,'4623','Tuzsér','SZ',48.350,22.133,9919,5,1551.000,3360,1016),(1582,'4624','Tiszabezdéd','SZ',48.367,22.150,20172,6,1860.000,1961,674),(1583,'4625','Győröcske','SZ',48.383,22.150,28945,6,213.000,136,55),(1584,'4625','Záhony','SZ',48.417,22.183,16203,4,687.000,4279,1800),(1585,'4627','Zsurk','SZ',48.417,22.217,13037,6,1539.000,751,278),(1586,'4628','Tiszaszentmárton','SZ',48.383,22.233,27544,6,1455.000,1190,414),(1587,'4631','Pap','SZ',48.217,22.150,27748,6,1715.000,1829,635),(1588,'4632','Nyírlövő','SZ',48.200,22.183,11095,6,791.000,707,258),(1589,'4633','Lövőpetri','SZ',48.183,22.200,7995,6,926.000,460,220),(1590,'4634','Aranyosapáti','SZ',48.200,22.267,9353,6,2136.000,1993,711),(1591,'4635','Újkenéz','SZ',48.250,22.233,10117,6,969.000,1047,382),(1592,'4641','Mezőladány','SZ',48.283,22.217,32656,6,1404.000,1009,363),(1593,'4642','Tornyospálca','SZ',48.267,22.183,16957,6,4366.000,2542,960),(1594,'4643','Benk','SZ',48.300,22.233,25441,6,850.000,452,189),(1595,'4644','Mándok','SZ',48.317,22.200,17826,4,2891.000,4366,1486),(1596,'4645','Tiszamogyorós','SZ',48.317,22.233,11907,6,1025.000,680,252),(1597,'4646','Eperjeske','SZ',48.350,22.217,18528,6,1357.000,1155,379),(1598,'4700','Mátészalka','SZ',47.950,22.333,18874,4,4140.000,17436,7015),(1599,'4701','Mátészalka','SZ',47.950,22.333,18874,4,4140.000,17436,7015),(1600,'4702','Mátészalka','SZ',47.950,22.333,18874,4,4140.000,17436,7015),(1601,'4721','Szamoskér','SZ',48.017,22.417,16300,6,971.000,426,190),(1602,'4722','Nyírmeggyes','SZ',47.917,22.267,23269,6,2879.000,2599,1045),(1603,'4731','Tunyogmatolcs','SZ',47.967,22.467,13213,6,2628.000,2464,935),(1604,'4732','Cégénydányád','SZ',47.933,22.550,9681,6,1220.000,706,285),(1605,'4733','Gyügye','SZ',47.933,22.567,19558,6,433.000,240,138),(1606,'4734','Szamosújlak','SZ',47.917,22.600,31273,6,527.000,419,197),(1607,'4735','Hermánszeg','SZ',47.900,22.633,12061,6,520.000,248,141),(1608,'4735','Szamossályi','SZ',47.900,22.617,10436,6,1157.000,672,343),(1609,'4737','Darnó','SZ',47.967,22.667,18795,6,464.000,177,76),(1610,'4737','Kisnamény','SZ',47.950,22.700,16036,6,1801.000,322,155),(1611,'4741','Jánkmajtis','SZ',47.950,22.650,7843,6,2503.000,1690,646),(1612,'4742','Csegöld','SZ',47.888,22.688,26107,6,1935.000,602,257),(1613,'4743','Csengersima','SZ',47.867,22.733,24095,6,2380.000,634,288),(1614,'4745','Szamosbecs','SZ',47.867,22.700,22017,6,671.000,340,167),(1615,'4746','Szamostatárfalva','SZ',47.867,22.667,30085,6,450.000,312,132),(1616,'4751','Kocsord','SZ',47.950,22.383,7445,6,2547.000,2883,1025),(1617,'4752','Győrtelek','SZ',47.933,22.433,10126,6,1478.000,1630,475),(1618,'4754','Géberjén','SZ',47.933,22.467,3629,6,538.000,546,207),(1619,'4754','Fülpösdaróc','SZ',47.933,22.500,14377,6,425.000,330,117),(1620,'4755','Ököritófülpös','SZ',47.917,22.517,31769,5,3342.000,1800,685),(1621,'4756','Rápolt','SZ',47.917,22.567,9061,6,323.000,146,86),(1622,'4761','Porcsalma','SZ',47.883,22.567,17215,5,3110.000,2575,1002),(1623,'4762','Tyukod','SZ',47.850,22.550,31398,5,6222.000,1901,927),(1624,'4763','Ura','SZ',47.817,22.617,28981,6,3234.000,646,280),(1625,'4764','Csengerújfalu','SZ',47.800,22.633,26851,6,2561.000,820,350),(1626,'4765','Komlódtótfalu','SZ',47.850,22.700,22336,6,697.000,115,62),(1627,'4765','Csenger','SZ',47.833,22.683,30641,4,3616.000,4824,1924),(1628,'4766','Pátyod','SZ',47.867,22.617,23685,6,905.000,640,295),(1629,'4767','Szamosangyalos','SZ',47.867,22.667,18005,6,809.000,505,206),(1630,'4800','Vásárosnamény','SZ',48.133,22.317,18324,4,6566.000,8917,3319),(1631,'4801','Vásárosnamény','SZ',48.133,22.317,18324,4,6566.000,8917,3319),(1632,'4803','Vásárosnamény','SZ',48.133,22.317,18324,4,6566.000,8917,3319),(1633,'4804','Vásárosnamény','SZ',48.133,22.317,18324,4,6566.000,8917,3319),(1634,'4811','Kisvarsány','SZ',48.150,22.300,12672,6,1283.000,963,383),(1635,'4812','Nagyvarsány','SZ',48.167,22.283,33783,6,1254.000,1501,546),(1636,'4813','Gyüre','SZ',48.183,22.283,33774,6,1587.000,1259,449),(1637,'4821','Ópályi','SZ',48.000,22.317,27924,6,2672.000,2873,898),(1638,'4822','Nyírparasznya','SZ',48.033,22.283,10807,6,1476.000,970,330),(1639,'4823','Nagydobos','SZ',48.050,22.317,21485,6,2693.000,2194,752),(1640,'4824','Szamosszeg','SZ',48.050,22.367,13046,6,3530.000,1883,734),(1641,'4826','Olcsva','SZ',48.083,22.333,11129,6,996.000,644,259),(1642,'4831','Tiszaszalka','SZ',48.183,22.317,13541,6,1495.000,851,369),(1643,'4832','Tiszavid','SZ',48.200,22.300,33747,6,1075.000,491,197),(1644,'4833','Tiszaadony','SZ',48.233,22.300,9423,6,1563.000,627,265),(1645,'4834','Tiszakerecseny','SZ',48.267,22.300,4446,6,2387.000,869,407),(1646,'4835','Mátyus','SZ',48.283,22.283,20668,6,1103.000,327,145),(1647,'4836','Lónya','SZ',48.317,22.283,26091,6,3549.000,723,420),(1648,'4841','Jánd','SZ',48.117,22.383,17075,6,1654.000,794,278),(1649,'4842','Gulács','SZ',48.083,22.467,29443,6,2335.000,814,341),(1650,'4843','Hetefejércse','SZ',48.117,22.483,5616,6,1545.000,267,158),(1651,'4844','Csaroda','SZ',48.167,22.467,29416,6,2468.000,595,260),(1652,'4845','Tákos','SZ',48.150,22.433,29911,6,1082.000,382,162),(1653,'4900','Fehérgyarmat','SZ',47.983,22.517,18971,4,5246.000,8180,3247),(1654,'4901','Fehérgyarmat','SZ',47.983,22.517,18971,4,5246.000,8180,3247),(1655,'4911','Nábrád','SZ',48.000,22.450,19211,6,1769.000,895,365),(1656,'4912','Kérsemjén','SZ',48.017,22.417,32869,6,708.000,289,123),(1657,'4913','Panyola','SZ',48.050,22.400,29559,6,1223.000,591,292),(1658,'4914','Olcsvaapáti','SZ',48.083,22.350,10834,6,1100.000,312,153),(1659,'4921','Tivadar','SZ',48.067,22.517,20260,6,480.000,197,88),(1660,'4921','Kisar','SZ',48.050,22.517,19424,6,1543.000,1077,374),(1661,'4922','Nagyar','SZ',48.050,22.567,4710,6,1599.000,687,280),(1662,'4931','Tarpa','SZ',48.100,22.533,4312,5,4973.000,2141,902),(1663,'4932','Márokpapi','SZ',48.150,22.517,33224,6,2118.000,441,222),(1664,'4933','Beregsurány','SZ',48.167,22.550,20677,6,1600.000,633,237),(1665,'4934','Beregdaróc','SZ',48.200,22.533,28246,6,2382.000,755,364),(1666,'4935','Gelénes','SZ',48.200,22.450,4613,6,2055.000,534,243),(1667,'4936','Vámosatya','SZ',48.200,22.417,27322,6,2429.000,549,259),(1668,'4937','Barabás','SZ',48.233,22.433,26480,6,3819.000,769,382),(1669,'4941','Penyige','SZ',47.983,22.567,32692,6,1889.000,742,289),(1670,'4942','Mánd','SZ',48.000,22.617,2088,6,517.000,258,107),(1671,'4942','Nemesborzova','SZ',47.983,22.633,27119,6,220.000,82,45),(1672,'4943','Kömörő','SZ',48.017,22.583,23612,6,1637.000,532,246),(1673,'4944','Túristvándi','SZ',48.050,22.650,13602,6,1522.000,699,261),(1674,'4945','Szatmárcseke','SZ',48.083,22.633,31237,6,3631.000,1429,600),(1675,'4946','Tiszakóród','SZ',48.100,22.717,8794,6,1669.000,749,321),(1676,'4947','Tiszacsécse','SZ',48.100,22.750,24448,6,482.000,247,118),(1677,'4948','Milota','SZ',48.100,22.783,31750,6,1539.000,829,321),(1678,'4951','Tiszabecs','SZ',48.100,22.817,17817,5,1714.000,998,418),(1679,'4952','Uszka','SZ',48.067,22.867,31820,6,736.000,369,109),(1680,'4953','Magosliget','SZ',48.050,22.867,29984,6,518.000,248,92),(1681,'4954','Sonkád','SZ',48.050,22.750,23889,6,1981.000,705,247),(1682,'4955','Botpalád','SZ',48.033,22.800,22239,6,1650.000,591,247),(1683,'4956','Kispalád','SZ',48.017,22.833,29300,6,1674.000,538,191),(1684,'4961','Zsarolyán','SZ',47.950,22.600,28750,6,639.000,387,154),(1685,'4962','Nagyszekeres','SZ',47.967,22.617,27988,6,1052.000,545,209),(1686,'4963','Kisszekeres','SZ',47.967,22.633,9751,6,1467.000,555,213),(1687,'4964','Fülesd','SZ',48.017,22.683,10791,6,1505.000,477,176),(1688,'4965','Kölcse','SZ',48.050,22.717,16665,5,2824.000,1276,560),(1689,'4966','Vámosoroszi','SZ',47.983,22.683,8934,6,1316.000,530,181),(1690,'4967','Csaholc','SZ',47.983,22.733,12928,6,1935.000,486,180),(1691,'4968','Túrricse','SZ',47.967,22.767,8998,6,1299.000,606,233),(1692,'4969','Tisztaberek','SZ',47.950,22.800,27261,6,1822.000,608,213),(1693,'4971','Rozsály','SZ',47.917,22.800,17428,6,1487.000,763,258),(1694,'4972','Gacsály','SZ',47.933,22.767,13727,6,1982.000,890,307),(1695,'4973','Császló','SZ',47.917,22.733,9715,6,1018.000,373,152),(1696,'4974','Zajta','SZ',47.900,22.800,6275,6,917.000,419,176),(1697,'4975','Méhtelek','SZ',47.933,22.850,29799,6,862.000,702,280),(1698,'4976','Garbolc','SZ',47.950,22.867,4996,6,726.000,144,71),(1699,'4977','Kishódos','SZ',47.967,22.833,8509,6,892.000,96,35),(1700,'4977','Nagyhódos','SZ',47.967,22.850,26976,6,765.000,115,83),(1701,'5000','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1702,'5001','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1703,'5002','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1704,'5003','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1705,'5004','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1706,'5005','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1707,'5006','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1708,'5007','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1709,'5008','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1710,'5009','Szolnok','JN',47.183,20.200,27854,1,18724.000,74885,33758),(1711,'5051','Zagyvarékas','JN',47.267,20.133,14836,6,3171.000,3729,1494),(1712,'5052','Újszász','JN',47.300,20.083,15291,4,5820.000,6598,2558),(1713,'5053','Szászberek','JN',47.317,20.100,5777,6,3922.000,994,415),(1714,'5054','Jászalsószentgyörgy','JN',47.367,20.100,30711,6,4767.000,3640,1575),(1715,'5055','Jászladány','JN',47.367,20.167,21111,5,9273.000,5922,2404),(1716,'5061','Tiszasüly','JN',47.383,20.400,17695,6,9177.000,1470,788),(1717,'5062','Kőtelek','JN',47.333,20.450,11235,6,4514.000,1631,868),(1718,'5063','Hunyadfalva','JN',47.317,20.383,34050,6,535.000,191,106),(1719,'5064','Csataszög','JN',47.283,20.400,34175,6,1121.000,315,132),(1720,'5065','Nagykörű','JN',47.267,20.450,15574,6,4281.000,1636,925),(1721,'5071','Besenyszög','JN',47.300,20.267,11305,6,13808.000,3452,1426),(1722,'5081','Szajol','JN',47.183,20.300,5874,6,3697.000,3942,1554),(1723,'5082','Tiszatenyő','JN',47.133,20.383,9627,6,2355.000,1705,666),(1724,'5083','Kengyel','JN',47.083,20.333,7418,6,7914.000,4037,1413),(1725,'5084','Rákócziújfalu','JN',47.067,20.267,12423,6,1961.000,2039,722),(1726,'5085','Rákóczifalva','JN',47.083,20.233,14207,5,3594.000,5440,2175),(1727,'5091','Tószeg','JN',47.100,20.150,7490,6,5917.000,4602,1791),(1728,'5092','Tiszavárkony','JN',47.067,20.183,31866,6,3562.000,1598,693),(1729,'5093','Vezseny','JN',47.033,20.217,21157,6,2517.000,690,320),(1730,'5094','Tiszajenő','JN',47.033,20.150,29346,6,2819.000,1656,791),(1731,'5095','Tiszajenő','JN',47.033,20.150,29346,6,2819.000,1656,791),(1732,'5100','Jászberény','JN',47.500,19.917,18209,4,22135.000,27134,11771),(1733,'5101','Jászberény','JN',47.500,19.917,18209,4,22135.000,27134,11771),(1734,'5102','Jászberény','JN',47.500,19.917,18209,4,22135.000,27134,11771),(1735,'5111','Jászfelsőszentgyörgy','JN',47.500,19.800,23579,6,3928.000,1925,784),(1736,'5121','Jászjákóhalma','JN',47.517,20.000,25186,6,4504.000,3105,1375),(1737,'5122','Jászdózsa','JN',47.567,20.017,17978,6,4286.000,2174,1143),(1738,'5123','Jászárokszállás','JN',47.633,19.983,22105,4,7717.000,8041,3734),(1739,'5124','Jászágó','JN',47.600,19.867,22929,6,3693.000,738,421),(1740,'5125','Pusztamonostor','JN',47.550,19.800,15246,6,2462.000,1615,738),(1741,'5126','Jászfényszaru','JN',47.567,19.717,23339,4,7616.000,5755,2613),(1742,'5130','Jászapáti','JN',47.517,20.150,22202,4,7816.000,9217,3666),(1743,'5131','Jászapáti','JN',47.517,20.150,22202,4,7816.000,9217,3666),(1744,'5135','Jászivány','JN',47.533,20.250,24086,6,3951.000,392,212),(1745,'5136','Jászszentandrás','JN',47.583,20.183,13514,6,4433.000,2479,1567),(1746,'5137','Jászkisér','JN',47.450,20.217,22798,5,13011.000,5427,2251),(1747,'5141','Jásztelek','JN',47.483,20.000,23135,6,4115.000,1656,735),(1748,'5142','Alattyán','JN',47.433,20.050,25265,6,3429.000,2145,917),(1749,'5143','Jánoshida','JN',47.383,20.067,22859,6,3479.000,2585,1157),(1750,'5144','Jászboldogháza','JN',47.367,20.000,15811,6,5531.000,1668,821),(1751,'5152','Jászboldogháza','JN',47.367,20.000,15811,6,5531.000,1668,821),(1752,'5200','Törökszentmiklós','JN',47.183,20.417,27313,4,18516.000,21758,8989),(1753,'5201','Törökszentmiklós','JN',47.183,20.417,27313,4,18516.000,21758,8989),(1754,'5211','Tiszapüspöki','JN',47.217,20.317,3373,6,3745.000,2099,836),(1755,'5212','Tiszapüspöki','JN',47.217,20.317,3373,6,3745.000,2099,836),(1756,'5213','Tiszapüspöki','JN',47.217,20.317,3373,6,3745.000,2099,836),(1757,'5222','Örményes','JN',47.200,20.583,29382,6,3413.000,1105,460),(1758,'5231','Fegyvernek','JN',47.267,20.533,16647,5,7148.000,6629,2680),(1759,'5232','Tiszabő','JN',47.300,20.483,10773,6,3504.000,1936,572),(1760,'5233','Tiszagyenda','JN',47.383,20.517,30304,6,3693.000,1001,542),(1761,'5234','Tiszaroff','JN',47.400,20.450,20181,6,5249.000,1674,977),(1762,'5235','Tiszabura','JN',47.450,20.467,22770,6,4520.000,2801,833),(1763,'5241','Abádszalók','JN',47.467,20.600,12441,4,13223.000,4276,2101),(1764,'5243','Tiszaderzs','JN',47.517,20.650,16230,6,2719.000,1101,644),(1765,'5244','Tiszaszőlős','JN',47.617,20.767,7852,6,4779.000,1949,742),(1766,'5300','Karcag','JN',47.317,20.933,4923,4,36863.000,20872,8219),(1767,'5301','Karcag','JN',47.317,20.933,4923,4,36863.000,20872,8219),(1768,'5302','Karcag','JN',47.317,20.933,4923,4,36863.000,20872,8219),(1769,'5309','Berekfürdő','JN',47.383,20.850,34005,6,1857.000,956,474),(1770,'5310','Kisújszállás','JN',47.217,20.767,25919,4,20527.000,11738,4767),(1771,'5311','Kisújszállás','JN',47.217,20.767,25919,4,20527.000,11738,4767),(1772,'5321','Kunmadaras','JN',47.433,20.800,23171,5,15355.000,5507,2083),(1773,'5322','Tiszaszentimre','JN',47.483,20.733,22789,6,6561.000,2140,1042),(1774,'5323','Tiszaszentimre','JN',47.483,20.733,22789,6,6561.000,2140,1042),(1775,'5324','Tomajmonostora','JN',47.433,20.717,9557,6,1376.000,680,360),(1776,'5331','Kenderes','JN',47.250,20.683,17145,4,11124.000,4917,2013),(1777,'5340','Kunhegyes','JN',47.367,20.633,22567,4,14894.000,7866,3388),(1778,'5341','Kunhegyes','JN',47.367,20.633,22567,4,14894.000,7866,3388),(1779,'5349','Kunhegyes','JN',47.367,20.633,22567,4,14894.000,7866,3388),(1780,'5350','Tiszafüred','JN',47.617,20.767,29726,4,16218.000,11136,5277),(1781,'5351','Tiszafüred','JN',47.617,20.767,29726,4,16218.000,11136,5277),(1782,'5358','Tiszafüred','JN',47.617,20.767,29726,4,16218.000,11136,5277),(1783,'5359','Tiszafüred','JN',47.617,20.767,29726,4,16218.000,11136,5277),(1784,'5361','Tiszaigar','JN',47.533,20.800,28699,6,3402.000,817,409),(1785,'5362','Tiszaörs','JN',47.517,20.833,15787,6,3710.000,1291,672),(1786,'5363','Nagyiván','JN',47.483,20.933,21689,6,4316.000,1168,517),(1787,'5400','Mezőtúr','JN',47.000,20.633,4260,4,28972.000,18176,7759),(1788,'5401','Mezőtúr','JN',47.000,20.633,4260,4,28972.000,18176,7759),(1789,'5403','Mezőtúr','JN',47.000,20.633,4260,4,28972.000,18176,7759),(1790,'5404','Mezőtúr','JN',47.000,20.633,4260,4,28972.000,18176,7759),(1791,'5411','Kétpó','JN',47.083,20.467,19813,6,6676.000,723,324),(1792,'5412','Kuncsorba','JN',47.133,20.567,5254,6,3363.000,637,305),(1793,'5420','Túrkeve','JN',47.100,20.750,28228,4,23652.000,9215,3995),(1794,'5421','Túrkeve','JN',47.100,20.750,28228,4,23652.000,9215,3995),(1795,'5430','Tiszaföldvár','JN',46.983,20.250,13815,4,8034.000,11548,4724),(1796,'5431','Tiszaföldvár','JN',46.983,20.250,13815,4,8034.000,11548,4724),(1797,'5432','Tiszaföldvár','JN',46.983,20.250,13815,4,8034.000,11548,4724),(1798,'5435','Martfű','JN',47.017,20.283,2626,4,2308.000,6715,2919),(1799,'5440','Kunszentmárton','JN',46.833,20.283,32504,4,14365.000,8850,3969),(1800,'5441','Kunszentmárton','JN',46.833,20.283,32504,4,14365.000,8850,3969),(1801,'5449','Kunszentmárton','JN',46.833,20.283,32504,4,14365.000,8850,3969),(1802,'5451','Öcsöd','JN',46.900,20.400,28006,5,10366.000,3390,1754),(1803,'5452','Mesterszállás','JN',46.950,20.433,30234,6,4292.000,711,393),(1804,'5453','Mezőhék','JN',47.000,20.400,26286,6,8982.000,327,203),(1805,'5461','Mezőhék','JN',47.000,20.400,26286,6,8982.000,327,203),(1806,'5462','Cibakháza','JN',46.967,20.200,22938,5,3821.000,4439,1924),(1807,'5463','Nagyrév','JN',46.950,20.150,6318,6,2979.000,726,432),(1808,'5464','Tiszainoka','JN',46.900,20.150,20446,6,1792.000,406,220),(1809,'5465','Cserkeszőlő','JN',46.867,20.183,5795,6,3070.000,2119,1385),(1810,'5471','Tiszakürt','JN',46.883,20.117,30386,6,2837.000,1463,783),(1811,'5473','Tiszaug','JN',46.833,20.154,14094,6,2504.000,908,432),(1812,'5474','Tiszasas','JN',46.817,20.083,21494,6,2879.000,1061,586),(1813,'5475','Csépa','JN',46.800,20.133,13170,6,2967.000,1667,902),(1814,'5476','Szelevény','JN',46.833,20.283,20428,6,4539.000,1073,588),(1815,'5500','Gyomaendrőd','BE',46.933,20.833,33455,4,30394.000,14375,6479),(1816,'5501','Gyomaendrőd','BE',46.933,20.833,33455,4,30394.000,14375,6479),(1817,'5502','Gyomaendrőd','BE',46.933,20.833,33455,4,30394.000,14375,6479),(1818,'5510','Dévaványa','BE',47.033,20.967,24819,4,21655.000,8067,3287),(1819,'5515','Ecsegfalva','BE',47.150,20.917,9432,6,7899.000,1232,555),(1820,'5516','Körösladány','BE',46.967,21.083,11615,4,12379.000,4788,2034),(1821,'5520','Szeghalom','BE',47.033,21.167,21883,4,21713.000,9314,3899),(1822,'5521','Szeghalom','BE',47.033,21.167,21883,4,21713.000,9314,3899),(1823,'5525','Füzesgyarmat','BE',47.100,21.217,12256,4,12734.000,5981,2414),(1824,'5526','Kertészsziget','BE',47.150,21.067,12618,6,3911.000,401,189),(1825,'5527','Bucsa','BE',47.200,21.000,13471,6,5582.000,2251,993),(1826,'5530','Vésztő','BE',46.917,21.267,29531,4,12570.000,7094,3089),(1827,'5534','Okány','BE',46.900,21.350,19257,6,7062.000,2688,1267),(1828,'5536','Körösújfalu','BE',46.967,21.400,30164,6,2530.000,610,281),(1829,'5537','Zsadány','BE',46.917,21.500,6257,6,6584.000,1649,768),(1830,'5538','Biharugra','BE',46.967,21.600,29610,6,5284.000,899,579),(1831,'5539','Körösnagyharsány','BE',47.000,21.650,10764,6,1991.000,560,351),(1832,'5540','Szarvas','BE',46.867,20.550,23870,4,16157.000,17557,7531),(1833,'5541','Szarvas','BE',46.867,20.550,23870,4,16157.000,17557,7531),(1834,'5551','Csabacsűd','BE',46.833,20.650,31334,5,6685.000,1879,857),(1835,'5552','Kardos','BE',46.817,20.771,24794,6,4279.000,654,389),(1836,'5553','Kondoros','BE',46.767,20.800,10287,5,8184.000,5355,2529),(1837,'5555','Hunya','BE',46.817,20.850,33297,6,3257.000,694,423),(1838,'5556','Örménykút','BE',46.850,20.783,27438,6,5456.000,417,217),(1839,'5561','Békésszentandrás','BE',46.867,20.483,2680,5,7745.000,3909,1928),(1840,'5600','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1841,'5601','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1842,'5602','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1843,'5603','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1844,'5604','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1845,'5605','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(1846,'5609','Csabaszabadi','BE',46.683,21.083,34078,6,3271.000,344,186),(1847,'5621','Csárdaszállás','BE',46.867,20.933,25502,6,5416.000,468,244),(1848,'5622','Köröstarcsa','BE',46.883,21.033,12900,6,6280.000,2585,1244),(1849,'5623','Köröstarcsa','BE',46.883,21.033,12900,6,6280.000,2585,1244),(1850,'5624','Doboz','BE',46.733,21.250,33190,5,5447.000,4345,1898),(1851,'5630','Békés','BE',46.767,21.133,9760,4,12723.000,20465,8266),(1852,'5631','Békés','BE',46.767,21.133,9760,4,12723.000,20465,8266),(1853,'5641','Tarhos','BE',46.817,21.217,33075,6,5745.000,968,378),(1854,'5643','Bélmegyer','BE',46.867,21.183,19390,6,6305.000,1064,575),(1855,'5650','Mezőberény','BE',46.817,21.033,19628,4,11853.000,11241,4618),(1856,'5661','Újkígyós','BE',46.583,21.033,2352,5,5492.000,5436,2251),(1857,'5662','Csanádapáca','BE',46.550,20.883,20455,6,5130.000,2729,1388),(1858,'5663','Medgyesbodzás','BE',46.517,20.967,20765,6,3167.000,1089,595),(1859,'5664','Medgyesbodzás','BE',46.517,20.967,20765,6,3167.000,1089,595),(1860,'5665','Pusztaottlaka','BE',46.550,20.983,19594,6,1887.000,374,237),(1861,'5666','Medgyesegyháza','BE',46.500,21.033,30128,5,6429.000,3848,1873),(1862,'5667','Magyarbánhegyes','BE',46.450,20.967,27906,6,3656.000,2462,1101),(1863,'5668','Nagybánhegyes','BE',46.467,20.900,26028,6,4224.000,1223,796),(1864,'5671','Nagybánhegyes','BE',46.467,20.900,26028,6,4224.000,1223,796),(1865,'5672','Murony','BE',46.767,21.050,11989,6,3568.000,1307,575),(1866,'5673','Kamut','BE',46.767,20.983,4279,6,6048.000,1053,529),(1867,'5674','Kétsoprony','BE',46.717,20.867,3106,6,5124.000,1507,600),(1868,'5675','Telekgerendás','BE',46.650,20.967,12681,6,7237.000,1599,703),(1869,'5700','Gyula','BE',46.647,21.277,5032,4,25580.000,32055,13642),(1870,'5701','Gyula','BE',46.650,21.283,5032,4,25580.000,32055,13642),(1871,'5702','Gyula','BE',46.650,21.283,5032,4,25580.000,32055,13642),(1872,'5703','Gyula','BE',46.650,21.283,5032,4,25580.000,32055,13642),(1873,'5711','Gyula','BE',46.650,21.283,5032,4,25580.000,32055,13642),(1874,'5712','Szabadkígyós','BE',46.617,21.100,31325,6,4556.000,2809,1092),(1875,'5720','Sarkad','BE',46.750,21.383,28565,4,12557.000,10463,4323),(1876,'5721','Sarkad','BE',46.750,21.383,28565,4,12557.000,10463,4323),(1877,'5722','Sarkad','BE',46.750,21.383,28565,4,12557.000,10463,4323),(1878,'5725','Kötegyán','BE',46.733,21.483,6804,6,4295.000,1402,737),(1879,'5726','Méhkerék','BE',46.783,21.450,23931,6,2585.000,2125,878),(1880,'5727','Újszalonta','BE',46.800,21.500,24350,6,2083.000,112,75),(1881,'5731','Sarkadkeresztúr','BE',46.800,21.383,25168,6,3530.000,1598,800),(1882,'5732','Mezőgyán','BE',46.867,21.533,4206,6,5986.000,1119,549),(1883,'5734','Geszt','BE',46.883,21.583,17394,6,5139.000,756,364),(1884,'5741','Kétegyháza','BE',46.533,21.183,3461,5,5049.000,4197,1746),(1885,'5742','Elek','BE',46.533,21.250,32957,4,5491.000,5048,1995),(1886,'5743','Lőkösháza','BE',46.433,21.233,21209,6,5202.000,1868,831),(1887,'5744','Kevermes','BE',46.417,21.183,31574,5,4334.000,2136,1160),(1888,'5745','Dombiratos','BE',46.417,21.117,22132,6,1830.000,584,406),(1889,'5746','Kunágota','BE',46.433,21.050,16045,6,6396.000,2685,1390),(1890,'5747','Almáskamarás','BE',46.467,21.100,29595,6,1475.000,869,466),(1891,'5751','Nagykamarás','BE',46.467,21.117,4242,6,4305.000,1493,858),(1892,'5752','Nagykamarás','BE',46.467,21.117,4242,6,4305.000,1493,858),(1893,'5800','Mezőkovácsháza','BE',46.400,20.917,30322,4,6259.000,6304,2961),(1894,'5801','Mezőkovácsháza','BE',46.400,20.917,30322,4,6259.000,6304,2961),(1895,'5802','Mezőkovácsháza','BE',46.400,20.917,30322,4,6259.000,6304,2961),(1896,'5811','Végegyháza','BE',46.383,20.867,31228,6,2894.000,1455,764),(1897,'5820','Mezőhegyes','BE',46.317,20.817,11873,4,15544.000,5408,2899),(1898,'5830','Battonya','BE',46.283,21.017,18102,4,14571.000,5838,3099),(1899,'5836','Dombegyház','BE',46.333,21.133,24031,5,5794.000,2064,1083),(1900,'5837','Kisdombegyház','BE',46.367,21.100,18838,6,1261.000,478,279),(1901,'5838','Magyardombegyház','BE',46.383,21.067,11536,6,765.000,259,168),(1902,'5900','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1903,'5901','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1904,'5902','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1905,'5903','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1906,'5904','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1907,'5905','Orosháza','BE',46.567,20.667,23065,4,20222.000,30032,14030),(1908,'5919','Pusztaföldvár','BE',46.533,20.800,5397,6,5713.000,1752,905),(1909,'5920','Csorvás','BE',46.633,20.833,26709,4,9018.000,5302,2393),(1910,'5925','Gerendás','BE',46.600,20.867,7393,6,4078.000,1397,719),(1911,'5931','Nagyszénás','BE',46.683,20.667,8244,5,9556.000,5256,2366),(1912,'5932','Gádoros','BE',46.667,20.600,9511,5,3813.000,3833,1880),(1913,'5940','Tótkomlós','BE',46.417,20.733,16434,4,12505.000,6049,2952),(1914,'5945','Kardoskút','BE',46.483,20.667,12177,6,7658.000,917,429),(1915,'5946','Békéssámson','BE',46.417,20.633,26189,6,7121.000,2434,1135),(1916,'5948','Kaszaper','BE',46.467,20.833,22752,6,3357.000,1960,892),(1917,'6000','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1918,'6001','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1919,'6002','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1920,'6003','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1921,'6004','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1922,'6005','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1923,'6006','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1924,'6007','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1925,'6008','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1926,'6010','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(1927,'6031','Szentkirály','BK',46.917,19.933,21120,6,10189.000,1958,914),(1928,'6032','Nyárlőrinc','BK',46.862,19.873,23056,6,6636.000,2364,1013),(1929,'6033','Városföld','BK',46.817,19.767,10667,6,6287.000,2186,807),(1930,'6034','Helvécia','BK',46.833,19.617,4093,6,5647.000,4362,1588),(1931,'6035','Ballószög','BK',46.867,19.583,13408,6,3500.000,3356,1060),(1932,'6041','Kerekegyháza','BK',46.937,19.478,22530,4,8128.000,6225,2736),(1933,'6042','Fülöpháza','BK',46.883,19.417,31468,6,4706.000,862,479),(1934,'6043','Kunbaracs','BK',46.983,19.417,7728,6,5511.000,655,328),(1935,'6044','Kunbaracs','BK',46.983,19.417,7728,6,5511.000,655,328),(1936,'6045','Ladánybene','BK',47.033,19.450,5786,6,4074.000,1688,801),(1937,'6050','Lajosmizse','BK',47.017,19.550,17677,4,16466.000,11053,4886),(1938,'6055','Felsőlajos','BK',47.067,19.517,33598,6,1141.000,1003,409),(1939,'6060','Tiszakécske','BK',46.933,20.100,30623,4,13327.000,11504,5206),(1940,'6061','Tiszakécske','BK',46.933,20.100,30623,4,13327.000,11504,5206),(1941,'6062','Tiszakécske','BK',46.933,20.100,30623,4,13327.000,11504,5206),(1942,'6063','Tiszakécske','BK',46.933,20.100,30623,4,13327.000,11504,5206),(1943,'6064','Tiszaug','BK',46.852,20.055,14094,6,2504.000,908,432),(1944,'6065','Lakitelek','BK',46.876,19.989,6202,5,5466.000,4449,1966),(1945,'6066','Tiszaalpár','BK',46.822,19.984,24545,5,9113.000,5031,2314),(1946,'6067','Tiszaalpár','BK',46.822,19.984,24545,5,9113.000,5031,2314),(1947,'6070','Izsák','BK',46.801,19.355,21999,4,11376.000,6004,2904),(1948,'6075','Páhi','BK',46.717,19.400,18670,6,3896.000,1213,688),(1949,'6076','Ágasegyháza','BK',46.833,19.450,17686,6,5587.000,1912,898),(1950,'6077','Orgovány','BK',46.749,19.474,16939,6,9916.000,3282,1656),(1951,'6078','Jakabszállás','BK',46.760,19.607,17923,6,7086.000,2645,1235),(1952,'6080','Szabadszállás','BK',46.873,19.224,25061,4,16462.000,6221,3083),(1953,'6085','Fülöpszállás','BK',46.818,19.239,14058,6,9132.000,2357,1287),(1954,'6086','Szalkszentmárton','BK',46.974,19.020,19947,6,8208.000,2948,1279),(1955,'6087','Dunavecse','BK',46.917,18.983,7612,4,6677.000,4026,1714),(1956,'6088','Apostag','BK',46.883,18.950,21148,6,3194.000,2035,971),(1957,'6090','Kunszentmiklós','BK',47.033,19.133,28130,4,17211.000,8704,3545),(1958,'6093','Kunszentmiklós','BK',47.033,19.133,28130,4,17211.000,8704,3545),(1959,'6096','Kunpeszér','BK',47.067,19.283,31918,6,7755.000,641,306),(1960,'6097','Kunadacs','BK',46.950,19.317,5856,6,8990.000,1612,770),(1961,'6098','Tass','BK',47.017,19.033,20525,6,7472.000,2957,1143),(1962,'6100','Kiskunfélegyháza','BK',46.714,19.852,20297,4,25630.000,30523,14644),(1963,'6101','Kiskunfélegyháza','BK',46.714,19.852,20297,4,25630.000,30523,14644),(1964,'6102','Kiskunfélegyháza','BK',46.714,19.852,20297,4,25630.000,30523,14644),(1965,'6111','Gátér','BK',46.683,19.967,26383,6,3089.000,989,492),(1966,'6112','Pálmonostora','BK',46.628,19.942,2705,6,5328.000,1818,1094),(1967,'6113','Petőfiszállás','BK',46.617,19.833,15431,6,6779.000,1495,915),(1968,'6114','Bugac','BK',46.689,19.679,32823,5,13111.000,2869,1481),(1969,'6114','Bugacpusztaháza','BK',46.689,19.679,33631,6,4300.000,307,143),(1970,'6115','Kunszállás','BK',46.767,19.750,31893,6,2085.000,1660,743),(1971,'6116','Fülöpjakab','BK',46.677,19.834,33622,6,2316.000,1169,494),(1972,'6120','Kiskunmajsa','BK',46.490,19.740,24396,4,22199.000,11707,5434),(1973,'6131','Szank','BK',46.554,19.672,11794,6,7483.000,2472,1167),(1974,'6132','Móricgát','BK',46.492,19.749,34096,6,3289.000,490,378),(1975,'6133','Jászszentlászló','BK',46.568,19.761,8378,6,6034.000,2537,1299),(1976,'6134','Kömpöc','BK',46.467,19.867,13806,6,2998.000,744,396),(1977,'6135','Csólyospálos','BK',46.418,19.844,12025,6,6510.000,1699,1087),(1978,'6136','Harkakötöny','BK',46.450,19.600,8350,6,5270.000,932,395),(1979,'6200','Kiskőrös','BK',46.621,19.289,9344,4,10223.000,14452,6770),(1980,'6201','Kiskőrös','BK',46.621,19.289,9344,4,10223.000,14452,6770),(1981,'6211','Kaskantyú','BK',46.667,19.400,30605,6,5828.000,937,559),(1982,'6221','Akasztó','BK',46.692,19.208,21944,6,6488.000,3367,1557),(1983,'6222','Csengőd','BK',46.717,19.267,12344,6,4889.000,2176,1180),(1984,'6223','Soltszentimre','BK',46.770,19.283,18218,6,4449.000,1302,668),(1985,'6224','Tabdi','BK',46.683,19.300,25432,6,2139.000,1127,549),(1986,'6230','Soltvadkert','BK',46.578,19.396,19983,4,10886.000,7519,3369),(1987,'6235','Bócsa','BK',46.600,19.500,8305,6,9704.000,1816,945),(1988,'6236','Tázlár','BK',46.549,19.520,24998,6,7338.000,1782,911),(1989,'6237','Kecel','BK',46.525,19.252,19789,4,11448.000,8892,3787),(1990,'6238','Imrehegy','BK',46.483,19.317,8095,6,7031.000,738,355),(1991,'6239','Császártöltés','BK',46.422,19.184,10472,6,8206.000,2457,1055),(1992,'6300','Kalocsa','BK',46.534,18.986,6442,4,5318.000,17492,7737),(1993,'6301','Kalocsa','BK',46.526,18.986,6442,4,5318.000,17492,7737),(1994,'6311','Öregcsertő','BK',46.514,19.112,8679,6,4306.000,888,423),(1995,'6320','Solt','BK',46.800,19.016,29115,4,13267.000,6632,3000),(1996,'6321','Újsolt','BK',46.867,19.117,8785,6,3298.000,152,127),(1997,'6323','Dunaegyháza','BK',46.833,18.950,21069,6,1012.000,1543,728),(1998,'6325','Dunatetétlen','BK',46.750,19.117,14766,6,4319.000,549,283),(1999,'6326','Harta','BK',46.694,19.031,18458,5,12968.000,3414,1664),(2000,'6327','Harta','BK',46.694,19.031,18458,5,12968.000,3414,1664),(2001,'6328','Dunapataj','BK',46.640,19.002,7861,5,9047.000,3347,1655),(2002,'6331','Foktő','BK',46.517,18.917,2149,6,3146.000,1646,757),(2003,'6332','Uszód','BK',46.567,18.917,16294,6,2446.000,1068,488),(2004,'6333','Dunaszentbenedek','BK',46.600,18.900,11606,6,2324.000,847,434),(2005,'6334','Géderlak','BK',46.617,18.917,3577,6,1874.000,1041,480),(2006,'6335','Ordas','BK',46.633,18.950,16276,6,1652.000,446,265),(2007,'6336','Szakmár','BK',46.552,19.074,19530,6,7464.000,1246,618),(2008,'6337','Újtelek','BK',46.590,19.059,33604,6,956.000,404,253),(2009,'6341','Homokmégy','BK',46.487,19.074,27845,6,7032.000,1387,760),(2010,'6342','Drágszél','BK',46.467,19.050,7524,6,1259.000,362,174),(2011,'6343','Miske','BK',46.442,19.032,30632,6,4227.000,1789,757),(2012,'6344','Hajós','BK',46.399,19.121,18759,4,8992.000,3262,1418),(2013,'6345','Nemesnádudvar','BK',46.336,19.053,32540,6,5878.000,1885,727),(2014,'6346','Sükösd','BK',46.283,19.000,21245,5,9418.000,3816,1549),(2015,'6347','Érsekcsanád','BK',46.250,18.983,11864,6,5830.000,2831,978),(2016,'6348','Érsekhalma','BK',46.350,19.117,33589,6,2756.000,657,293),(2017,'6351','Bátya','BK',46.483,18.950,11961,6,3386.000,2132,970),(2018,'6352','Fajsz','BK',46.417,18.917,3230,6,3199.000,1759,884),(2019,'6353','Dusnok','BK',46.383,18.967,4109,6,5747.000,3022,1246),(2020,'6400','Kiskunhalas','BK',46.431,19.488,32434,4,22758.000,28997,12208),(2021,'6401','Kiskunhalas','BK',46.431,19.488,32434,4,22758.000,28997,12208),(2022,'6402','Kiskunhalas','BK',46.431,19.488,32434,4,22758.000,28997,12208),(2023,'6411','Zsana','BK',46.417,19.683,15158,6,8794.000,811,448),(2024,'6412','Balotaszállás','BK',46.350,19.533,25937,6,10494.000,1541,821),(2025,'6413','Kunfehértó','BK',46.350,19.417,29027,6,7837.000,2089,911),(2026,'6414','Pirtó','BK',46.517,19.433,15398,6,3448.000,976,440),(2027,'6421','Kisszállás','BK',46.278,19.496,28158,6,9205.000,2558,1212),(2028,'6422','Tompa','BK',46.218,19.542,28486,4,8157.000,4689,2081),(2029,'6423','Kelebia','BK',46.194,19.612,27571,6,6670.000,2774,1320),(2030,'6424','Csikéria','BK',46.122,19.479,15699,6,2581.000,952,501),(2031,'6425','Bácsszőlős','BK',46.150,19.450,30155,6,3883.000,388,272),(2032,'6430','Bácsalmás','BK',46.125,19.336,10719,4,10832.000,7045,3287),(2033,'6435','Kunbaja','BK',46.084,19.428,6044,6,3372.000,1598,757),(2034,'6440','Jánoshalma','BK',46.299,19.326,9469,4,13221.000,9343,4476),(2035,'6444','Kéleshalom','BK',46.367,19.250,18166,6,6163.000,451,336),(2036,'6445','Borota','BK',46.263,19.225,19327,6,8180.000,1365,739),(2037,'6446','Rém','BK',46.243,19.146,26310,6,3993.000,1371,576),(2038,'6447','Felsőszentiván','BK',46.195,19.190,2954,6,5354.000,1990,882),(2039,'6448','Csávoly','BK',46.189,19.147,16373,6,4742.000,1927,824),(2040,'6449','Mélykút','BK',46.211,19.387,16018,5,12346.000,5403,2918),(2041,'6451','Tataháza','BK',46.174,19.306,14544,6,2610.000,1300,688),(2042,'6452','Mátételke','BK',46.167,19.283,27809,6,2793.000,549,298),(2043,'6453','Bácsbokod','BK',46.122,19.159,10180,5,6393.000,2804,1248),(2044,'6454','Bácsborsód','BK',46.096,19.158,27234,6,7752.000,1238,427),(2045,'6455','Katymár','BK',46.032,19.211,11280,6,7108.000,2229,991),(2046,'6456','Madaras','BK',46.055,19.267,23357,6,4930.000,3046,1558),(2047,'6500','Baja','BK',46.183,18.967,3522,4,17761.000,37707,15969),(2048,'6501','Baja','BK',46.183,18.967,3522,4,17761.000,37707,15969),(2049,'6502','Baja','BK',46.183,18.967,3522,4,17761.000,37707,15969),(2050,'6503','Baja','BK',46.183,18.967,3522,4,17761.000,37707,15969),(2051,'6511','Bácsszentgyörgy','BK',45.972,19.039,8697,6,1473.000,159,98),(2052,'6512','Szeremle','BK',46.150,18.883,28820,6,3464.000,1511,627),(2053,'6513','Dunafalva','BK',46.061,18.961,12566,6,5789.000,876,581),(2054,'6521','Vaskút','BK',46.117,18.983,28343,6,7149.000,3506,1363),(2055,'6522','Gara','BK',46.032,19.043,31848,6,5996.000,2556,953),(2056,'6523','Csátalja','BK',46.033,18.950,26471,6,3905.000,1557,668),(2057,'6524','Dávod','BK',45.995,18.917,10533,6,6921.000,1984,1078),(2058,'6525','Hercegszántó','BK',45.950,18.939,12937,6,6855.000,2008,1150),(2059,'6527','Nagybaracska','BK',46.050,18.900,25955,6,3795.000,2325,1030),(2060,'6528','Bátmonostor','BK',46.100,18.933,3656,6,3795.000,1574,699),(2061,'6600','Szentes','CS',46.650,20.267,14456,4,35325.000,29117,12722),(2062,'6601','Szentes','CS',46.650,20.267,14456,4,35325.000,29117,12722),(2063,'6602','Szentes','CS',46.650,20.267,14456,4,35325.000,29117,12722),(2064,'6603','Szentes','CS',46.650,20.267,14456,4,35325.000,29117,12722),(2065,'6612','Nagytőke','CS',46.700,20.283,29179,6,5468.000,455,233),(2066,'6621','Derekegyház','CS',46.583,20.367,7834,6,5378.000,1670,678),(2067,'6622','Nagymágocs','CS',46.583,20.500,17233,5,7509.000,3152,1249),(2068,'6623','Árpádhalom','CS',46.617,20.550,19062,6,4520.000,529,259),(2069,'6624','Eperjes','CS',46.683,20.567,22992,6,7389.000,547,349),(2070,'6625','Fábiánsebestyén','CS',46.683,20.467,19974,6,7173.000,2134,895),(2071,'6630','Mindszent','CS',46.533,20.200,21555,4,5935.000,6909,3187),(2072,'6635','Szegvár','CS',46.583,20.233,32489,5,8622.000,4673,2096),(2073,'6636','Mártély','CS',46.483,20.217,25733,6,3645.000,1368,568),(2074,'6640','Csongrád','CS',46.700,20.150,5111,4,17389.000,17686,8468),(2075,'6641','Csongrád','CS',46.700,20.150,5111,4,17389.000,17686,8468),(2076,'6642','Csongrád','CS',46.700,20.150,5111,4,17389.000,17686,8468),(2077,'6645','Felgyő','CS',46.650,20.100,22646,6,7673.000,1324,616),(2078,'6646','Tömörkény','CS',46.617,20.033,25900,6,5391.000,1836,1034),(2079,'6647','Csanytelek','CS',46.600,20.117,22293,6,3471.000,2848,1408),(2080,'6648','Csanytelek','CS',46.600,20.117,22293,6,3471.000,2848,1408),(2081,'6700','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2082,'6701','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2083,'6702','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2084,'6703','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2085,'6704','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2086,'6705','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2087,'6706','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2088,'6707','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2089,'6708','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2090,'6709','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2091,'6710','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2092,'6712','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2093,'6713','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2094,'6717','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2095,'6718','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2096,'6719','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2097,'6720','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2098,'6721','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2099,'6722','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2100,'6723','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2101,'6724','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2102,'6725','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2103,'6726','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2104,'6727','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2105,'6728','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2106,'6729','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2107,'6740','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2108,'6741','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2109,'6742','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2110,'6743','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2111,'6744','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2112,'6745','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2113,'6746','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2114,'6747','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2115,'6748','Szeged','CS',46.318,20.027,33367,1,28100.000,169030,75739),(2116,'6750','Algyő','CS',46.170,20.170,34245,5,7577.000,5247,2018),(2117,'6750','Szeged','CS',46.170,20.170,33367,1,28100.000,169030,75739),(2118,'6753','Algyő','CS',46.170,20.170,34245,5,7577.000,5247,2018),(2119,'6753','Szeged','CS',46.170,20.170,33367,1,28100.000,169030,75739),(2120,'6754','Újszentiván','CS',46.183,20.183,14924,6,1549.000,1657,542),(2121,'6755','Kübekháza','CS',46.150,20.283,14410,6,2731.000,1561,592),(2122,'6756','Tiszasziget','CS',46.167,20.167,16966,6,2689.000,1767,614),(2123,'6757','Tiszasziget','CS',46.167,20.167,16966,6,2689.000,1767,614),(2124,'6757','Szeged','CS',46.167,20.167,33367,1,28100.000,169030,75739),(2125,'6758','Röszke','CS',46.183,20.050,13161,6,3663.000,3269,1410),(2126,'6760','Kistelek','CS',46.472,19.980,31024,4,6919.000,7198,3405),(2127,'6762','Sándorfalva','CS',46.367,20.100,31705,4,5577.000,8042,3073),(2128,'6763','Szatymaz','CS',46.350,20.050,12007,6,5372.000,4593,1932),(2129,'6764','Balástya','CS',46.417,20.017,23676,6,11000.000,3450,1929),(2130,'6765','Csengele','CS',46.533,19.867,32285,6,6066.000,1958,991),(2131,'6766','Dóc','CS',46.433,20.133,30535,6,4943.000,786,326),(2132,'6767','Ópusztaszer','CS',46.483,20.083,12797,6,5950.000,2236,941),(2133,'6768','Baks','CS',46.550,20.100,29106,6,6192.000,2141,881),(2134,'6769','Pusztaszer','CS',46.550,19.983,28592,6,4893.000,1520,785),(2135,'6771','Pusztaszer','CS',46.550,19.983,28592,6,4893.000,1520,785),(2136,'6771','Szeged','CS',46.550,19.983,33367,1,28100.000,169030,75739),(2137,'6772','Deszk','CS',46.217,20.250,24077,6,5205.000,3584,1233),(2138,'6773','Klárafalva','CS',46.217,20.333,8253,6,910.000,513,199),(2139,'6774','Ferencszállás','CS',46.217,20.350,18999,6,579.000,619,272),(2140,'6775','Kiszombor','CS',46.183,20.433,26666,6,6581.000,3970,1651),(2141,'6781','Domaszék','CS',46.249,20.011,13383,6,5215.000,4851,1900),(2142,'6782','Mórahalom','CS',46.219,19.891,4349,4,8315.000,6007,2549),(2143,'6783','Ásotthalom','CS',46.201,19.791,10339,6,12254.000,4063,1988),(2144,'6784','Öttömös','CS',46.283,19.683,31079,6,3091.000,782,426),(2145,'6785','Pusztamérges','CS',46.333,19.683,6354,6,2439.000,1261,613),(2146,'6786','Ruzsa','CS',46.290,19.754,3966,6,8468.000,2578,1439),(2147,'6787','Zákányszék','CS',46.267,19.917,5546,6,6607.000,2793,1447),(2148,'6791','Szeged','CS',46.267,19.917,33367,1,28100.000,169030,75739),(2149,'6791','Zákányszék','CS',46.267,19.917,5546,6,6607.000,2793,1447),(2150,'6792','Zsombó','CS',46.333,19.983,17765,6,2689.000,3475,1340),(2151,'6793','Forráskút','CS',46.367,19.917,33020,6,3667.000,2335,1044),(2152,'6794','Üllés','CS',46.338,19.852,21412,6,4988.000,3217,1520),(2153,'6795','Bordány','CS',46.322,19.925,8192,6,3648.000,3155,1421),(2154,'6800','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2155,'6801','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2156,'6802','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2157,'6803','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2158,'6804','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2159,'6806','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2160,'6808','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2161,'6811','Hódmezővásárhely','CS',46.417,20.333,8314,3,48798.000,47258,19616),(2162,'6821','Székkutas','CS',46.500,20.533,12265,6,12399.000,2422,1080),(2163,'6900','Makó','CS',46.217,20.483,7357,4,22923.000,24403,11422),(2164,'6901','Makó','CS',46.217,20.483,7357,4,22923.000,24403,11422),(2165,'6902','Makó','CS',46.217,20.483,7357,4,22923.000,24403,11422),(2166,'6903','Makó','CS',46.217,20.483,7357,4,22923.000,24403,11422),(2167,'6911','Királyhegyes','CS',46.267,20.617,13666,6,2980.000,664,373),(2168,'6912','Kövegy','CS',46.217,20.683,9955,6,971.000,411,254),(2169,'6913','Csanádpalota','CS',46.250,20.733,5379,5,7776.000,3064,1680),(2170,'6914','Pitvaros','CS',46.297,20.703,6284,6,1314.000,1417,677),(2171,'6915','Csanádalberti','CS',46.333,20.717,2121,6,1532.000,440,261),(2172,'6916','Ambrózfalva','CS',46.350,20.733,16197,6,1122.000,509,247),(2173,'6917','Nagyér','CS',46.367,20.733,20914,6,1229.000,526,269),(2174,'6921','Maroslele','CS',46.267,20.350,10515,6,4656.000,2084,937),(2175,'6922','Földeák','CS',46.317,20.500,9210,6,3637.000,3199,1478),(2176,'6923','Óföldeák','CS',46.300,20.450,7755,6,3509.000,454,192),(2177,'6931','Apátfalva','CS',46.167,20.583,14252,6,5377.000,3065,1597),(2178,'6932','Magyarcsanád','CS',46.167,20.617,5962,6,4819.000,1525,752),(2179,'6933','Nagylak','CS',46.167,20.717,12779,6,470.000,479,296),(2180,'7000','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(2181,'7001','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(2182,'7002','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(2183,'7003','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(2184,'7011','Alap','FE',46.800,18.700,26824,6,4829.000,2005,902),(2185,'7012','Alsószentiván','FE',46.783,18.733,25283,6,3965.000,650,289),(2186,'7013','Cece','FE',46.767,18.650,13152,5,5885.000,2644,1137),(2187,'7014','Sáregres','FE',46.783,18.600,2723,6,2616.000,812,356),(2188,'7015','Igar','FE',46.783,18.517,17738,6,4119.000,1022,526),(2189,'7016','Igar','FE',46.783,18.517,17738,6,4119.000,1022,526),(2190,'7017','Mezőszilas','FE',46.817,18.483,29036,6,6497.000,2157,840),(2191,'7018','Mezőszilas','FE',46.817,18.483,29036,6,6497.000,2157,840),(2192,'7019','Mezőszilas','FE',46.817,18.483,29036,6,6497.000,2157,840),(2193,'7020','Dunaföldvár','TO',46.800,18.933,31501,4,11142.000,9003,4039),(2194,'7021','Dunaföldvár','TO',46.800,18.933,31501,4,11142.000,9003,4039),(2195,'7025','Bölcske','TO',46.733,18.967,6558,6,5878.000,2914,1268),(2196,'7026','Madocsa','TO',46.683,18.967,29337,6,4333.000,1920,841),(2197,'7027','Madocsa','TO',46.683,18.967,29337,6,4333.000,1920,841),(2198,'7030','Paks','TO',46.633,18.867,4862,4,15408.000,19833,8241),(2199,'7031','Paks','TO',46.633,18.867,4862,4,15408.000,19833,8241),(2200,'7032','Paks','TO',46.633,18.867,4862,4,15408.000,19833,8241),(2201,'7038','Pusztahencse','TO',46.600,18.717,19938,6,3171.000,1031,411),(2202,'7039','Németkér','TO',46.717,18.767,15006,6,6497.000,1771,754),(2203,'7041','Vajta','FE',46.717,18.667,2459,6,2343.000,1004,370),(2204,'7042','Pálfa','TO',46.717,18.633,9371,6,3474.000,1592,670),(2205,'7043','Bikács','TO',46.683,18.667,11970,6,3467.000,443,220),(2206,'7044','Nagydorog','TO',46.633,18.667,18388,5,4144.000,2711,1113),(2207,'7045','Györköny','TO',46.633,18.700,12326,6,3160.000,922,469),(2208,'7047','Sárszentlőrinc','TO',46.633,18.617,20817,6,3845.000,960,460),(2209,'7051','Kajdacs','TO',46.567,18.633,14100,6,3773.000,1277,551),(2210,'7052','Kölesd','TO',46.517,18.583,10463,6,3813.000,1562,613),(2211,'7054','Tengelic','TO',46.533,18.717,6901,6,7093.000,2401,1002),(2212,'7056','Szedres','TO',46.483,18.683,16814,6,4631.000,2324,800),(2213,'7057','Medina','TO',46.467,18.650,30562,6,2224.000,849,351),(2214,'7061','Belecska','TO',46.650,18.417,28662,6,1439.000,432,142),(2215,'7062','Keszőhidegkút','TO',46.617,18.433,17640,6,1033.000,210,115),(2216,'7063','Szárazd','TO',46.567,18.433,18263,6,778.000,230,136),(2217,'7064','Gyönk','TO',46.550,18.483,30289,5,3812.000,2051,704),(2218,'7065','Miszla','TO',46.633,18.483,2811,6,3471.000,280,185),(2219,'7066','Udvari','TO',46.600,18.517,21360,6,2765.000,441,216),(2220,'7067','Varsád','TO',46.533,18.517,6637,6,2156.000,397,182),(2221,'7068','Kistormás','TO',46.500,18.567,3869,6,1135.000,336,128),(2222,'7071','Szakadát','TO',46.533,18.483,15316,6,1070.000,268,146),(2223,'7072','Diósberény','TO',46.533,18.450,11688,6,1775.000,361,179),(2224,'7081','Simontornya','TO',46.750,18.550,20783,4,3383.000,4220,1883),(2225,'7082','Kisszékely','TO',46.683,18.550,27766,6,2830.000,336,222),(2226,'7083','Tolnanémedi','TO',46.717,18.483,11031,6,2195.000,1146,534),(2227,'7084','Pincehely','TO',46.683,18.450,19585,5,5008.000,2371,1071),(2228,'7085','Nagyszékely','TO',46.650,18.533,6761,6,3670.000,437,232),(2229,'7086','Ozora','TO',46.750,18.400,5661,6,5958.000,1666,764),(2230,'7087','Fürged','TO',46.717,18.300,17950,6,2676.000,722,252),(2231,'7090','Tamási','TO',46.633,18.283,24563,4,11196.000,8592,3717),(2232,'7091','Tamási','TO',46.633,18.283,24563,4,11196.000,8592,3717),(2233,'7092','Nagykónyi','TO',46.583,18.200,27182,6,4788.000,1149,545),(2234,'7093','Értény','TO',46.617,18.133,8448,6,2995.000,773,277),(2235,'7094','Koppányszántó','TO',46.600,18.117,21184,6,2255.000,340,220),(2236,'7095','Iregszemcse','TO',46.700,18.183,4701,6,5833.000,2680,1075),(2237,'7095','Újireg','TO',46.650,18.183,20561,6,1090.000,296,126),(2238,'7097','Nagyszokoly','TO',46.717,18.217,13709,6,2799.000,878,434),(2239,'7098','Magyarkeszi','TO',46.750,18.233,6017,6,3816.000,1269,643),(2240,'7099','Felsőnyék','TO',46.783,18.300,17914,6,3202.000,1036,505),(2241,'7100','Szekszárd','TO',46.350,18.717,22761,1,9628.000,33883,14923),(2242,'7101','Szekszárd','TO',46.350,18.717,22761,1,9628.000,33883,14923),(2243,'7102','Szekszárd','TO',46.350,18.717,22761,1,9628.000,33883,14923),(2244,'7103','Szekszárd','TO',46.350,18.717,22761,1,9628.000,33883,14923),(2245,'7121','Szálka','TO',46.283,18.633,14711,6,1708.000,593,261),(2246,'7122','Kakasd','TO',46.350,18.600,2033,6,2079.000,1633,609),(2247,'7130','Tolna','TO',46.433,18.783,25274,4,7108.000,11637,4483),(2248,'7131','Tolna','TO',46.433,18.783,25274,4,7108.000,11637,4483),(2249,'7132','Bogyiszló','TO',46.383,18.833,3425,6,5593.000,2231,912),(2250,'7133','Fadd','TO',46.467,18.833,18980,5,6753.000,4501,1567),(2251,'7134','Gerjen','TO',46.500,18.900,5731,6,3628.000,1235,534),(2252,'7135','Dunaszentgyörgy','TO',46.533,18.833,9539,6,3763.000,2531,1020),(2253,'7136','Fácánkert','TO',46.450,18.733,24192,6,1070.000,676,292),(2254,'7140','Bátaszék','TO',46.183,18.733,8864,4,6354.000,6607,2569),(2255,'7142','Pörböly','TO',46.200,18.817,33570,6,1111.000,555,244),(2256,'7143','Őcsény','TO',46.317,18.767,8961,6,7261.000,2445,945),(2257,'7144','Decs','TO',46.283,18.767,24989,5,9468.000,4164,1550),(2258,'7145','Sárpilis','TO',46.250,18.750,4747,6,2170.000,694,218),(2259,'7146','Várdomb','TO',46.250,18.700,9414,6,955.000,1212,437),(2260,'7147','Alsónána','TO',46.250,18.667,29665,6,1314.000,690,279),(2261,'7148','Alsónyék','TO',46.200,18.733,11563,6,3205.000,778,307),(2262,'7149','Báta','TO',46.133,18.783,11712,6,6617.000,1758,822),(2263,'7150','Bonyhád','TO',46.300,18.533,6497,4,7213.000,13957,5592),(2264,'7151','Bonyhád','TO',46.300,18.533,6497,4,7213.000,13957,5592),(2265,'7153','Bonyhád','TO',46.300,18.533,6497,4,7213.000,13957,5592),(2266,'7158','Bonyhádvarasd','TO',46.367,18.483,14818,6,1045.000,421,159),(2267,'7159','Kisdorog','TO',46.383,18.500,17710,6,2000.000,755,286),(2268,'7161','Cikó','TO',46.250,18.567,19284,6,1986.000,885,352),(2269,'7162','Grábóc','TO',46.283,18.617,26727,6,1373.000,172,92),(2270,'7163','Mőcsény','TO',46.267,18.600,33349,6,1215.000,367,148),(2271,'7164','Bátaapáti','TO',46.217,18.600,28909,6,2044.000,405,136),(2272,'7165','Mórágy','TO',46.217,18.650,20701,6,1762.000,735,279),(2273,'7171','Sióagárd','TO',46.400,18.650,25645,6,2440.000,1312,518),(2274,'7172','Harc','TO',46.400,18.633,14164,6,1586.000,903,317),(2275,'7173','Zomba','TO',46.400,18.567,21625,6,5729.000,2185,851),(2276,'7174','Kéty','TO',46.433,18.533,21731,6,1656.000,705,265),(2277,'7175','Felsőnána','TO',46.467,18.533,15820,6,1890.000,612,242),(2278,'7176','Murga','TO',46.467,18.483,18917,6,659.000,75,56),(2279,'7181','Tevel','TO',46.417,18.450,31459,6,2527.000,1537,570),(2280,'7182','Závod','TO',46.400,18.417,14304,6,1291.000,306,140),(2281,'7183','Kisvejke','TO',46.383,18.417,31185,6,1133.000,423,139),(2282,'7184','Lengyel','BA',46.379,18.436,24411,6,2003.000,536,241),(2283,'7184','Szárász','TO',46.379,18.436,7366,6,598.000,34,37),(2284,'7185','Mucsfa','TO',46.350,18.417,13620,6,1275.000,398,150),(2285,'7186','Aparhant','TO',46.333,18.450,26125,6,1796.000,1070,385),(2286,'7186','Nagyvejke','TO',46.383,18.450,16452,6,777.000,161,80),(2287,'7187','Nagyvejke','TO',46.383,18.450,16452,6,777.000,161,80),(2288,'7188','Szárász','BA',46.340,18.405,7366,6,598.000,34,37),(2289,'7191','Hőgyész','TO',46.483,18.417,26055,5,3715.000,2962,1126),(2290,'7192','Szakály','TO',46.533,18.383,4464,6,4101.000,1548,627),(2291,'7193','Regöly','TO',46.583,18.417,15459,6,6267.000,1177,546),(2292,'7194','Kalaznó','TO',46.500,18.483,23791,6,1835.000,172,111),(2293,'7195','Mucsi','TO',46.433,18.400,7029,6,2476.000,485,219),(2294,'7200','Dombóvár','TO',46.383,18.117,7685,4,7848.000,20084,8374),(2295,'7201','Dombóvár','TO',46.383,18.117,7685,4,7848.000,20084,8374),(2296,'7202','Dombóvár','TO',46.383,18.117,7685,4,7848.000,20084,8374),(2297,'7203','Dombóvár','TO',46.383,18.117,7685,4,7848.000,20084,8374),(2298,'7211','Dalmand','TO',46.500,18.183,29230,6,4877.000,1353,519),(2299,'7212','Kocsola','TO',46.533,18.183,22433,6,3334.000,1258,527),(2300,'7213','Szakcs','TO',46.513,18.110,10083,6,5579.000,929,488),(2301,'7214','Várong','TO',46.533,18.050,29124,6,663.000,164,91),(2302,'7214','Lápafő','TO',46.517,18.067,14605,6,931.000,161,84),(2303,'7215','Nak','TO',46.483,18.067,2796,6,2778.000,580,299),(2304,'7224','Dúzs','TO',46.483,18.383,19202,6,1127.000,273,120),(2305,'7225','Csibrák','TO',46.467,18.350,11998,6,1462.000,355,156),(2306,'7226','Kurd','TO',46.450,18.317,20507,6,3119.000,1244,509),(2307,'7227','Gyulaj','TO',46.500,18.300,30359,6,7082.000,991,367),(2308,'7228','Döbrököz','TO',46.417,18.250,2565,6,4313.000,2007,983),(2309,'7251','Kapospula','TO',46.352,18.014,23296,6,1980.000,928,352),(2310,'7252','Attala','TO',46.352,18.014,32735,6,2064.000,869,378),(2311,'7253','Csoma','SO',46.367,18.050,8040,6,843.000,440,184),(2312,'7253','Szabadi','SO',46.367,18.033,14854,6,823.000,294,127),(2313,'7255','Nagyberki','SO',46.367,18.017,21449,6,2174.000,1480,529),(2314,'7256','Kercseliget','SO',46.333,18.067,14386,6,1947.000,388,182),(2315,'7257','Mosdós','SO',46.350,18.000,31343,6,1695.000,1036,330),(2316,'7258','Kaposkeresztúr','SO',46.333,17.967,12663,6,1980.000,341,137),(2317,'7258','Baté','SO',46.350,17.967,32337,6,1028.000,834,297),(2318,'7261','Kaposhomok','SO',46.367,17.917,25867,6,1148.000,496,153),(2319,'7261','Taszár','SO',46.367,17.917,4932,6,1729.000,1982,800),(2320,'7271','Fonó','SO',46.400,17.950,22026,6,1061.000,325,155),(2321,'7272','Gölle','SO',46.433,18.017,30571,6,4469.000,996,436),(2322,'7273','Büssü','SO',46.467,17.967,8703,6,1719.000,336,160),(2323,'7274','Kazsok','SO',46.483,17.967,26888,6,1071.000,321,123),(2324,'7275','Igal','SO',46.533,17.950,11192,5,3606.000,1243,579),(2325,'7276','Somogyszil','SO',46.517,18.000,3416,6,3846.000,754,369),(2326,'7276','Gadács','SO',46.533,18.017,28264,6,386.000,91,63),(2327,'7279','Kisgyalán','SO',46.417,17.983,4826,6,941.000,188,103),(2328,'7281','Bonnya','SO',46.583,17.900,22673,6,1462.000,269,150),(2329,'7282','Kisbárapáti','SO',46.600,17.867,24493,6,2871.000,467,235),(2330,'7282','Fiad','SO',46.633,17.850,31644,6,1491.000,162,79),(2331,'7283','Somogyacsa','SO',46.583,17.950,30580,6,2446.000,150,182),(2332,'7284','Somogydöröcske','SO',46.583,18.000,15981,6,1083.000,151,102),(2333,'7285','Kára','SO',46.617,18.017,5351,6,537.000,54,46),(2334,'7285','Szorosad','SO',46.600,18.033,5193,6,648.000,93,59),(2335,'7285','Törökkoppány','SO',46.600,18.050,20093,6,2580.000,481,239),(2336,'7286','Miklósi','SO',46.650,18.000,33376,6,1047.000,234,124),(2337,'7300','Mecsekpölöske','BA',46.217,18.217,11402,6,731.000,450,154),(2338,'7300','Komló','BA',46.200,18.267,26408,4,4655.000,25881,11198),(2339,'7301','Mecsekpölöske','BA',46.217,18.217,11402,6,731.000,450,154),(2340,'7302','Mecsekpölöske','BA',46.217,18.217,11402,6,731.000,450,154),(2341,'7303','Mecsekpölöske','BA',46.217,18.217,11402,6,731.000,450,154),(2342,'7304','Mánfa','BA',46.167,18.250,33923,6,2770.000,875,331),(2343,'7305','Mánfa','BA',46.167,18.250,33923,6,2770.000,875,331),(2344,'7306','Mánfa','BA',46.167,18.250,33923,6,2770.000,875,331),(2345,'7309','Mánfa','BA',46.167,18.250,33923,6,2770.000,875,331),(2346,'7331','Liget','BA',46.233,18.200,17604,6,1207.000,446,142),(2347,'7332','Magyaregregy','BA',46.250,18.317,29753,6,2681.000,752,341),(2348,'7333','Kárász','BA',46.267,18.317,5999,6,802.000,336,145),(2349,'7333','Vékény','BA',46.267,18.350,24402,6,936.000,155,65),(2350,'7334','Köblény','BA',46.300,18.300,25247,6,804.000,249,106),(2351,'7334','Szalatnak','BA',46.283,18.283,9007,6,1028.000,348,171),(2352,'7341','Csikóstőttős','TO',46.333,18.167,30094,6,1770.000,882,371),(2353,'7342','Mágocs','BA',46.350,18.233,6813,5,4254.000,2483,975),(2354,'7343','Nagyhajmás','BA',46.328,18.294,12858,6,1801.000,359,148),(2355,'7344','Mekényes','BA',46.383,18.333,30492,6,1777.000,277,145),(2356,'7345','Alsómocsolád','BA',46.317,18.250,17385,6,1300.000,349,141),(2357,'7346','Bikal','BA',46.333,18.283,4899,6,1703.000,763,336),(2358,'7347','Egyházaskozár','BA',46.333,18.317,27401,6,2431.000,801,348),(2359,'7348','Tófű','BA',46.317,18.367,4048,6,434.000,117,58),(2360,'7348','Hegyhátmaróc','BA',46.317,18.333,30951,6,759.000,154,86),(2361,'7349','Szászvár','BA',46.267,18.367,33765,5,2117.000,2428,1037),(2362,'7351','Máza','BA',46.267,18.400,33756,6,1069.000,1269,485),(2363,'7352','Györe','TO',46.300,18.400,25539,6,1131.000,667,253),(2364,'7353','Izmény','TO',46.317,18.417,27711,6,1373.000,519,204),(2365,'7354','Váralja','TO',46.267,18.433,32850,6,2113.000,927,372),(2366,'7355','Nagymányok','TO',46.283,18.467,14030,5,1068.000,2357,923),(2367,'7356','Kismányok','TO',46.267,18.483,6512,6,543.000,357,134),(2368,'7357','Jágónak','TO',46.317,18.083,9326,6,1540.000,261,118),(2369,'7361','Kaposszekcső','TO',46.333,18.133,18962,6,1562.000,1549,645),(2370,'7362','Gerényes','BA',46.300,18.183,13347,6,1234.000,250,99),(2371,'7362','Vásárosdombó','BA',46.300,18.150,2264,6,1174.000,1160,397),(2372,'7362','Tarrós','TO',46.306,18.139,15635,6,529.000,117,52),(2373,'7362','Jágónak','TO',46.317,18.083,9326,6,1540.000,261,118),(2374,'7370','Felsőegerszeg','BA',46.250,18.133,13286,6,484.000,143,62),(2375,'7370','Oroszló','BA',46.217,18.133,4482,6,612.000,331,119),(2376,'7370','Palé','BA',46.267,18.067,23764,6,215.000,111,37),(2377,'7370','Sásd','BA',46.250,18.117,32160,4,1488.000,3322,1396),(2378,'7370','Varga','BA',46.233,18.150,28529,6,836.000,119,51),(2379,'7370','Vázsnok','BA',46.267,18.133,7074,6,475.000,117,62),(2380,'7370','Meződ','BA',46.283,18.100,3470,6,1041.000,124,75),(2381,'7381','Ág','BA',46.283,18.200,25812,6,1203.000,178,66),(2382,'7381','Kisvaszar','BA',46.283,18.217,9548,6,2035.000,332,120),(2383,'7381','Tékes','BA',46.283,18.167,27702,6,1256.000,261,99),(2384,'7383','Baranyaszentgyörgy','BA',46.233,18.017,5485,6,727.000,137,76),(2385,'7383','Tormás','BA',46.233,18.000,22424,6,2470.000,290,130),(2386,'7383','Szágy','BA',46.233,17.950,27508,6,940.000,145,62),(2387,'7384','Baranyajenő','BA',46.267,18.050,24749,6,1555.000,527,169),(2388,'7385','Gödre','BA',46.283,17.983,33233,6,3993.000,930,405),(2389,'7386','Gödre','BA',46.283,17.983,33233,6,3993.000,930,405),(2390,'7391','Kisbeszterce','BA',46.200,18.033,5722,6,747.000,80,49),(2391,'7391','Kishajmás','BA',46.200,18.083,6831,6,1176.000,220,108),(2392,'7391','Mindszentgodisa','BA',46.217,18.067,16285,6,2297.000,926,384),(2393,'7393','Bakóca','BA',46.217,18.000,22275,6,1065.000,280,160),(2394,'7394','Magyarhertelend','BA',46.183,18.150,5430,6,1616.000,647,260),(2395,'7394','Bodolyabér','BA',46.200,18.117,33002,6,909.000,251,115),(2396,'7396','Magyarszék','BA',46.200,18.200,22600,6,1386.000,1101,382),(2397,'7400','Kaposvár','SO',46.367,17.800,20473,1,11359.000,67663,27911),(2398,'7400','Orci','SO',46.400,17.867,24536,6,997.000,582,174),(2399,'7400','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2400,'7401','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2401,'7402','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2402,'7403','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2403,'7404','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2404,'7405','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2405,'7406','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2406,'7407','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2407,'7408','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2408,'7409','Zselickislak','SO',46.317,17.817,24110,6,1039.000,335,115),(2409,'7431','Juta','SO',46.400,17.750,17279,6,1923.000,1224,409),(2410,'7432','Csombárd','SO',46.450,17.683,2477,6,899.000,286,115),(2411,'7432','Hetes','SO',46.417,17.700,9928,6,2663.000,1172,381),(2412,'7434','Mezőcsokonya','SO',46.433,17.650,30854,6,3078.000,1264,455),(2413,'7435','Somogysárd','SO',46.417,17.600,28723,6,3636.000,1270,509),(2414,'7436','Újvárfalva','SO',46.433,17.583,7205,6,1222.000,333,137),(2415,'7439','Bodrog','SO',46.467,17.667,10506,6,1478.000,452,171),(2416,'7441','Magyaregres','SO',46.450,17.783,25371,6,1440.000,643,210),(2417,'7442','Várda','SO',46.450,17.733,26781,6,1036.000,517,198),(2418,'7443','Alsóbogát','SO',46.500,17.750,34184,6,1201.000,273,96),(2419,'7443','Somogyjád','SO',46.500,17.700,28963,6,2506.000,1578,567),(2420,'7443','Edde','SO',46.517,17.717,3489,6,851.000,202,98),(2421,'7444','Osztopán','SO',46.517,17.667,19770,6,2283.000,846,302),(2422,'7452','Somogyaszaló','SO',46.450,17.817,31219,6,2212.000,712,285),(2423,'7453','Mernye','SO',46.500,17.833,23630,6,2593.000,1491,565),(2424,'7454','Somodor','SO',46.483,17.850,13824,6,1991.000,429,177),(2425,'7455','Somogygeszti','SO',46.517,17.783,20330,6,2171.000,488,209),(2426,'7456','Felsőmocsolád','SO',46.583,17.833,13985,6,1651.000,439,253),(2427,'7457','Ecseny','SO',46.550,17.850,10861,6,1292.000,214,178),(2428,'7458','Polány','SO',46.550,17.783,13790,6,1287.000,232,152),(2429,'7463','Magyaratád','SO',46.467,17.900,10427,6,1882.000,862,370),(2430,'7463','Patalom','SO',46.450,17.917,6141,6,668.000,351,93),(2431,'7464','Ráksi','SO',46.517,17.917,30863,6,1517.000,489,187),(2432,'7465','Szentgáloskér','SO',46.500,17.883,12973,6,2725.000,529,247),(2433,'7471','Zimány','SO',46.417,17.917,27614,6,1297.000,626,198),(2434,'7472','Cserénfa','SO',46.317,17.883,25681,6,1775.000,210,90),(2435,'7472','Szentbalázs','SO',46.317,17.900,25706,6,1214.000,322,118),(2436,'7473','Gálosfa','SO',46.250,17.900,6585,6,1976.000,315,118),(2437,'7473','Kaposgyarmat','SO',46.283,17.883,28811,6,1107.000,107,35),(2438,'7473','Hajmás','SO',46.283,17.917,25830,6,1111.000,241,85),(2439,'7474','Zselicszentpál','SO',46.300,17.833,17491,6,1035.000,385,150),(2440,'7474','Simonfa','SO',46.283,17.833,32780,6,1100.000,374,141),(2441,'7475','Bőszénfa','SO',46.233,17.850,26277,6,4295.000,581,195),(2442,'7476','Kaposszerdahely','SO',46.317,17.750,6424,6,885.000,999,346),(2443,'7477','Patca','SO',46.283,17.717,12168,6,496.000,57,36),(2444,'7477','Szenna','SO',46.300,17.733,15103,6,2698.000,763,247),(2445,'7477','Zselickisfalud','SO',46.267,17.733,26842,6,2608.000,246,114),(2446,'7477','Szilvásszentmárton','SO',46.267,17.733,32461,6,708.000,196,70),(2447,'7478','Bárdudvarnok','SO',46.333,17.683,3735,6,4856.000,1200,544),(2448,'7479','Sántos','SO',46.350,17.883,31121,6,1138.000,549,186),(2449,'7500','Nagyatád','SO',46.217,17.367,17941,4,7060.000,11196,5070),(2450,'7501','Nagyatád','SO',46.217,17.367,17941,4,7060.000,11196,5070),(2451,'7511','Ötvöskónyi','SO',46.217,17.367,32115,6,2771.000,915,300),(2452,'7512','Mike','SO',46.233,17.533,20905,6,3241.000,652,250),(2453,'7513','Rinyaszentkirály','SO',46.150,17.400,26754,6,3056.000,394,173),(2454,'7514','Tarany','SO',46.183,17.300,16735,6,5468.000,1200,470),(2455,'7515','Somogyudvarhely','SO',46.167,17.200,4853,6,4042.000,1101,455),(2456,'7516','Berzence','SO',46.200,17.150,30119,5,5376.000,2570,997),(2457,'7517','Bolhás','SO',46.267,17.283,13994,6,3143.000,441,196),(2458,'7521','Kaposmérő','SO',46.367,17.717,18227,6,1398.000,2471,856),(2459,'7522','Kaposújlak','SO',46.367,17.733,15732,6,893.000,728,274),(2460,'7523','Kisasszond','SO',46.333,17.633,19053,6,784.000,187,71),(2461,'7523','Kaposfő','SO',46.367,17.667,9098,6,2726.000,1730,589),(2462,'7524','Kiskorpád','SO',46.350,17.617,13781,6,1695.000,904,347),(2463,'7525','Jákó','SO',46.333,17.550,15927,6,1669.000,641,249),(2464,'7526','Csököly','SO',46.300,17.550,24314,6,2984.000,1154,433),(2465,'7527','Rinyakovácsi','SO',46.283,17.600,32674,6,1109.000,144,69),(2466,'7527','Gige','SO',46.300,17.617,9177,6,1319.000,362,136),(2467,'7530','Kőkút','SO',46.183,17.583,13745,6,2023.000,642,135),(2468,'7530','Kadarkút','SO',46.233,17.633,26453,4,3974.000,2624,979),(2469,'7532','Hencse','SO',46.200,17.633,9946,6,711.000,367,150),(2470,'7533','Visnye','SO',46.183,17.683,19017,6,2438.000,225,116),(2471,'7533','Hedrehely','SO',46.183,17.667,16726,6,2551.000,435,194),(2472,'7535','Lad','SO',46.150,17.650,16258,6,2235.000,592,273),(2473,'7536','Patosfa','SO',46.133,17.667,15592,6,1507.000,254,146),(2474,'7537','Homokszentgyörgy','SO',46.117,17.583,19150,6,4964.000,1137,499),(2475,'7538','Kálmáncsa','SO',46.067,17.617,6105,6,4885.000,662,248),(2476,'7539','Szulok','SO',46.050,17.550,10986,6,2791.000,620,293),(2477,'7541','Kutas','SO',46.333,17.450,28857,6,3655.000,1507,516),(2478,'7542','Kisbajom','SO',46.300,17.500,24387,6,1367.000,401,160),(2479,'7543','Beleg','SO',46.317,17.417,17127,6,1799.000,661,233),(2480,'7544','Szabás','SO',46.283,17.450,28574,6,1811.000,652,196),(2481,'7545','Nagykorpád','SO',46.267,17.467,32805,6,3342.000,609,218),(2482,'7551','Lábod','SO',46.200,17.450,28291,6,6651.000,2074,749),(2483,'7552','Rinyabesenyő','SO',46.167,17.517,5078,6,2863.000,176,71),(2484,'7553','Görgeteg','SO',46.150,17.433,14599,6,3350.000,1191,449),(2485,'7555','Csokonyavisonta','SO',46.083,17.450,5971,6,8129.000,1646,644),(2486,'7556','Rinyaújlak','SO',46.083,17.417,20622,6,2426.000,306,142),(2487,'7557','Rinyaújlak','SO',46.083,17.417,20622,6,2426.000,306,142),(2488,'7561','Nagybajom','SO',46.383,17.517,21652,4,10806.000,3501,1154),(2489,'7561','Pálmajor','SO',46.383,17.567,34041,6,624.000,378,102),(2490,'7562','Segesd','SO',46.350,17.350,27368,6,7309.000,2580,912),(2491,'7563','Somogyszob','SO',46.300,17.300,18546,6,4008.000,1640,645),(2492,'7564','Kaszó','SO',46.354,17.433,34193,6,2248.000,124,58),(2493,'7570','Barcs','SO',45.960,17.459,32799,4,12290.000,11699,4511),(2494,'7571','Barcs','SO',45.960,17.459,32799,4,12290.000,11699,4511),(2495,'7582','Komlósd','SO',46.017,17.383,9858,6,746.000,196,92),(2496,'7582','Péterhida','SO',46.017,17.367,29197,6,1162.000,155,101),(2497,'7584','Babócsa','SO',46.033,17.367,30474,6,3099.000,1653,711),(2498,'7584','Rinyaújnép','SO',46.083,17.350,20321,6,828.000,56,51),(2499,'7584','Somogyaracs','SO',46.050,17.400,5500,6,770.000,206,86),(2500,'7585','Háromfa','SO',46.100,17.333,8837,6,4214.000,797,331),(2501,'7585','Bakháza','SO',46.100,17.367,14395,6,592.000,199,85),(2502,'7586','Bolhó','SO',46.033,17.300,18120,6,2507.000,752,401),(2503,'7587','Heresznye','SO',46.050,17.283,24846,6,990.000,284,158),(2504,'7588','Vízvár','SO',46.083,17.233,29780,6,3224.000,575,349),(2505,'7589','Bélavár','SO',46.117,17.217,6910,6,2278.000,370,221),(2506,'7600','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2507,'7601','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2508,'7602','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2509,'7603','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2510,'7604','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2511,'7605','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2512,'7606','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2513,'7607','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2514,'7608','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2515,'7610','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2516,'7611','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2517,'7612','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2518,'7613','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2519,'7614','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2520,'7615','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2521,'7616','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2522,'7617','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2523,'7618','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2524,'7619','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2525,'7621','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2526,'7622','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2527,'7623','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2528,'7624','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2529,'7625','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2530,'7626','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2531,'7627','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2532,'7628','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2533,'7629','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2534,'7630','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2535,'7631','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2536,'7632','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2537,'7633','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2538,'7634','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2539,'7635','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2540,'7636','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2541,'7639','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2542,'7643','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2543,'7644','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2544,'7645','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2545,'7646','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2546,'7647','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2547,'7648','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2548,'7650','Pécs','BA',46.097,18.207,19415,1,16278.000,156974,69458),(2549,'7661','Erzsébet','BA',46.100,18.467,13499,6,975.000,316,128),(2550,'7661','Kékesd','BA',46.100,18.467,16805,6,811.000,185,96),(2551,'7661','Kátoly','BA',46.067,18.450,19132,6,875.000,321,146),(2552,'7661','Szellő','BA',46.067,18.467,16984,6,596.000,167,74),(2553,'7663','Máriakéménd','BA',46.033,18.467,14483,6,1578.000,574,214),(2554,'7664','Berkesd','BA',46.067,18.417,16461,6,1904.000,868,289),(2555,'7664','Szilágy','BA',46.100,18.417,19831,6,1155.000,305,132),(2556,'7664','Pereked','BA',46.100,18.383,12867,6,674.000,179,75),(2557,'7666','Pogány','BA',45.980,18.260,17242,6,1155.000,1105,372),(2558,'7668','Gyód','BA',45.996,18.179,18315,6,325.000,699,225),(2559,'7668','Keszü','BA',46.017,18.183,3832,6,731.000,1326,398),(2560,'7668','Kökény','BA',45.997,18.203,3540,6,489.000,609,216),(2561,'7671','Bicsérd','BA',46.017,18.083,13310,6,1975.000,1035,349),(2562,'7671','Zók','BA',46.000,18.100,12201,6,893.000,294,108),(2563,'7671','Aranyosgadány','BA',46.000,18.117,6886,6,826.000,340,133),(2564,'7672','Boda','BA',46.083,18.050,20899,6,1542.000,438,168),(2565,'7673','Kővágószőlős','BA',46.083,18.133,15538,6,1825.000,1317,505),(2566,'7673','Cserkút','BA',46.067,18.133,3896,6,667.000,552,167),(2567,'7675','Kővágótöttös','BA',46.083,18.083,6992,6,1394.000,318,122),(2568,'7675','Bakonya','BA',46.083,18.083,8299,6,1507.000,388,143),(2569,'7677','Orfű','BA',46.133,18.150,11730,6,3215.000,882,320),(2570,'7678','Abaliget','BA',46.150,18.117,12548,6,1609.000,605,233),(2571,'7678','Kovácsszénája','BA',46.167,18.117,14517,6,783.000,52,30),(2572,'7678','Husztót','BA',46.167,18.083,31431,6,675.000,53,37),(2573,'7681','Okorvölgy','BA',46.150,18.067,8341,6,311.000,95,47),(2574,'7681','Hetvehely','BA',46.133,18.050,7126,6,2138.000,449,160),(2575,'7681','Szentkatalin','BA',46.167,18.050,9803,6,1331.000,96,73),(2576,'7682','Bükkösd','BA',46.100,17.983,23162,6,3015.000,1160,448),(2577,'7683','Helesfa','BA',46.083,17.983,17190,6,987.000,538,145),(2578,'7683','Dinnyeberki','BA',46.083,17.950,11952,6,856.000,88,63),(2579,'7683','Cserdi','BA',46.067,18.000,26082,6,647.000,385,147),(2580,'7691','Pécs','BA',46.083,17.950,19415,1,16278.000,156974,69458),(2581,'7691','Dinnyeberki','BA',46.083,17.950,11952,6,856.000,88,63),(2582,'7693','Pécs','BA',46.083,17.950,19415,1,16278.000,156974,69458),(2583,'7693','Dinnyeberki','BA',46.083,17.950,11952,6,856.000,88,63),(2584,'7694','Hosszúhetény','BA',46.150,18.350,30836,6,4527.000,3413,1160),(2585,'7695','Ófalu','BA',46.217,18.533,19646,6,985.000,320,142),(2586,'7695','Mecseknádasd','BA',46.217,18.467,13444,6,3608.000,1559,631),(2587,'7695','Óbánya','BA',46.217,18.417,12645,6,749.000,135,90),(2588,'7696','Hidas','BA',46.267,18.500,6798,6,1906.000,2086,816),(2589,'7700','Mohács','BA',45.993,18.683,23959,4,11223.000,19129,8706),(2590,'7701','Mohács','BA',45.993,18.683,23959,4,11223.000,19129,8706),(2591,'7702','Mohács','BA',45.993,18.683,23959,4,11223.000,19129,8706),(2592,'7711','Bár','BA',46.050,18.717,24378,6,900.000,543,218),(2593,'7712','Dunaszekcső','BA',46.083,18.767,9186,6,3675.000,1970,955),(2594,'7714','Dunaszekcső','BA',46.083,18.767,9186,6,3675.000,1970,955),(2595,'7715','Dunaszekcső','BA',46.083,18.767,9186,6,3675.000,1970,955),(2596,'7716','Homorúd','BA',45.981,18.792,29966,6,4473.000,612,400),(2597,'7717','Kölked','BA',45.950,18.708,17899,6,6194.000,1100,414),(2598,'7718','Udvar','BA',45.901,18.660,4437,6,440.000,160,67),(2599,'7720','Apátvarasd','BA',46.183,18.483,27298,6,814.000,132,42),(2600,'7720','Martonfa','BA',46.117,18.383,2228,6,569.000,205,82),(2601,'7720','Lovászhetény','BA',46.167,18.483,24624,6,895.000,272,117),(2602,'7720','Zengővárkony','BA',46.167,18.433,15848,6,1671.000,419,172),(2603,'7720','Pécsvárad','BA',46.150,18.417,10825,4,3603.000,4058,1476),(2604,'7723','Erdősmecske','BA',46.183,18.517,18704,6,2644.000,398,187),(2605,'7724','Feked','BA',46.167,18.567,4543,6,1933.000,181,117),(2606,'7725','Szebény','BA',46.133,18.600,3018,6,1437.000,453,215),(2607,'7726','Véménd','BA',46.150,18.617,20279,6,3181.000,1500,600),(2608,'7727','Palotabozsok','BA',46.133,18.650,10135,6,2019.000,947,429),(2609,'7728','Görcsönydoboka','BA',46.067,18.633,9636,6,951.000,409,186),(2610,'7728','Somberek','BA',46.083,18.667,23472,6,3142.000,1464,532),(2611,'7731','Nagypall','BA',46.150,18.450,19877,6,713.000,432,156),(2612,'7732','Fazekasboda','BA',46.117,18.483,17835,6,702.000,187,99),(2613,'7733','Maráza','BA',46.067,18.517,29920,6,970.000,186,108),(2614,'7733','Geresdlak','BA',46.100,18.533,2857,6,2528.000,819,414),(2615,'7735','Szűr','BA',46.100,18.583,11217,6,783.000,282,125),(2616,'7735','Erdősmárok','BA',46.050,18.550,25821,6,814.000,84,63),(2617,'7735','Himesháza','BA',46.083,18.567,27933,6,1754.000,1116,453),(2618,'7737','Székelyszabar','BA',46.050,18.600,16771,6,1548.000,612,263),(2619,'7741','Bogád','BA',46.083,18.333,32151,6,784.000,1080,323),(2620,'7741','Nagykozár','BA',46.067,18.333,10940,6,1146.000,1839,591),(2621,'7741','Romonya','BA',46.083,18.350,24855,6,707.000,456,163),(2622,'7742','Bogád','BA',46.083,18.333,32151,6,784.000,1080,323),(2623,'7743','Romonya','BA',46.083,18.350,24855,6,707.000,456,163),(2624,'7744','Ellend','BA',46.050,18.383,6099,6,799.000,239,97),(2625,'7745','Olasz','BA',46.017,18.417,18555,6,1029.000,640,254),(2626,'7745','Hásságy','BA',46.033,18.383,27881,6,800.000,268,147),(2627,'7747','Belvárdgyula','BA',45.972,18.434,19008,6,1723.000,423,183),(2628,'7747','Birján','BA',45.998,18.375,5139,6,907.000,492,198),(2629,'7751','Szederkény','BA',45.997,18.458,5607,6,1433.000,1827,638),(2630,'7751','Monyoród','BA',46.000,18.483,16027,6,712.000,190,99),(2631,'7752','Versend','BA',45.995,18.511,19725,6,1413.000,925,302),(2632,'7753','Szajk','BA',45.991,18.531,8475,6,1136.000,857,313),(2633,'7754','Bóly','BA',45.967,18.518,33154,4,2538.000,3970,1506),(2634,'7755','Töttös','BA',45.916,18.542,4136,6,2299.000,587,264),(2635,'7756','Borjád','BA',45.934,18.467,6725,6,1559.000,422,160),(2636,'7756','Pócsa','BA',45.910,18.471,22266,6,805.000,193,73),(2637,'7756','Kisbudmér','BA',45.913,18.448,22868,6,572.000,126,47),(2638,'7756','Nagybudmér','BA',45.936,18.446,3984,6,1022.000,227,86),(2639,'7757','Babarc','BA',45.998,18.555,5403,6,1885.000,758,326),(2640,'7757','Liptód','BA',46.050,18.517,10038,6,1499.000,208,145),(2641,'7759','Lánycsók','BA',46.000,18.633,33330,6,2540.000,2608,877),(2642,'7759','Kisnyárád','BA',46.033,18.567,33215,6,903.000,197,108),(2643,'7761','Lothárd','BA',45.999,18.352,31389,6,1046.000,266,110),(2644,'7761','Kozármisleny','BA',46.033,18.300,6336,4,1445.000,5802,1998),(2645,'7761','Magyarsarlós','BA',46.033,18.367,27067,6,803.000,313,113),(2646,'7762','Pécsudvard','BA',46.017,18.283,21096,6,843.000,732,276),(2647,'7763','Áta','BA',45.936,18.295,28583,6,809.000,186,92),(2648,'7763','Szemely','BA',46.017,18.333,9308,6,947.000,479,173),(2649,'7763','Egerág','BA',45.984,18.305,28918,6,1301.000,1002,339),(2650,'7763','Szőkéd','BA',45.967,18.287,7694,6,958.000,388,138),(2651,'7763','Kisherend','BA',45.966,18.330,16975,6,692.000,178,81),(2652,'7766','Pécsdevecser','BA',45.957,18.384,15389,6,474.000,107,49),(2653,'7766','Újpetre','BA',45.937,18.363,6062,6,1671.000,1099,386),(2654,'7766','Peterd','BA',45.974,18.359,32425,6,1060.000,204,95),(2655,'7766','Kiskassa','BA',45.953,18.398,19910,6,1333.000,263,112),(2656,'7768','Kistótfalu','BA',45.907,18.308,10746,6,1050.000,331,134),(2657,'7768','Vokány','BA',45.909,18.336,5892,6,1709.000,875,355),(2658,'7771','Palkonya','BA',45.897,18.390,7153,6,1000.000,295,127),(2659,'7772','Ivánbattyán','BA',45.907,18.418,3337,6,613.000,134,70),(2660,'7772','Villánykövesd','BA',45.882,18.425,5209,6,749.000,284,128),(2661,'7773','Villány','BA',45.869,18.454,28024,4,2202.000,2480,1010),(2662,'7773','Kisjakabfalva','BA',45.896,18.435,12849,6,662.000,125,82),(2663,'7774','Márok','BA',45.874,18.509,20659,6,1593.000,455,191),(2664,'7775','Illocska','BA',45.800,18.523,31936,6,1510.000,228,99),(2665,'7775','Magyarbóly','BA',45.842,18.491,25177,6,1722.000,1025,376),(2666,'7775','Kislippó','BA',45.827,18.530,21616,6,837.000,279,123),(2667,'7775','Lapáncsa','BA',45.819,18.498,6479,6,436.000,201,77),(2668,'7781','Ivándárda','BA',45.831,18.590,3346,6,767.000,248,108),(2669,'7781','Lippó','BA',45.863,18.570,22974,6,1453.000,465,212),(2670,'7781','Sárok','BA',45.841,18.611,20862,6,462.000,131,62),(2671,'7782','Bezedek','BA',45.865,18.586,14119,6,1136.000,242,108),(2672,'7783','Majs','BA',45.909,18.600,27863,6,3206.000,1002,394),(2673,'7784','Nagynyárád','BA',45.943,18.578,14650,6,2434.000,739,330),(2674,'7785','Sátorhely','BA',45.941,18.634,33482,6,1760.000,668,242),(2675,'7800','Kisharsány','BA',45.859,18.364,27021,6,1293.000,557,195),(2676,'7800','Siklós','BA',45.855,18.299,5519,4,5092.000,9944,4002),(2677,'7800','Nagytótfalu','BA',45.864,18.345,28927,6,1117.000,396,127),(2678,'7801','Nagytótfalu','BA',45.864,18.345,28927,6,1117.000,396,127),(2679,'7802','Nagytótfalu','BA',45.864,18.345,28927,6,1117.000,396,127),(2680,'7811','Bisse','BA',45.908,18.258,24925,6,1380.000,242,117),(2681,'7811','Szalánta','BA',45.949,18.238,22257,6,1708.000,1250,416),(2682,'7811','Bosta','BA',45.948,18.209,14368,6,595.000,140,54),(2683,'7811','Szilvás','BA',45.962,18.200,24712,6,604.000,168,58),(2684,'7811','Csarnóta','BA',45.895,18.215,30614,6,533.000,134,57),(2685,'7811','Túrony','BA',45.904,18.232,18582,6,940.000,251,97),(2686,'7812','Garé','BA',45.919,18.193,7560,6,853.000,318,113),(2687,'7813','Szava','BA',45.902,18.176,31060,6,1264.000,340,127),(2688,'7814','Babarcszőlős','BA',45.900,18.136,9663,6,425.000,116,66),(2689,'7814','Ócsárd','BA',45.934,18.152,3780,6,1266.000,410,142),(2690,'7814','Kisdér','BA',45.941,18.128,11183,6,437.000,126,54),(2691,'7814','Siklósbodony','BA',45.910,18.120,23205,6,433.000,138,46),(2692,'7815','Harkány','BA',45.848,18.238,21528,4,2569.000,4013,1814),(2693,'7817','Rádfalva','BA',45.860,18.126,11518,6,1288.000,202,90),(2694,'7817','Diósviszló','BA',45.877,18.163,32373,6,1581.000,725,247),(2695,'7817','Márfa','BA',45.860,18.185,9450,6,409.000,220,68),(2696,'7822','Nagyharsány','BA',45.846,18.392,2653,6,2601.000,1572,579),(2697,'7823','Kistapolca','BA',45.822,18.385,3151,6,357.000,200,72),(2698,'7823','Siklósnagyfalu','BA',45.820,18.361,8800,6,909.000,413,132),(2699,'7824','Egyházasharaszti','BA',45.809,18.334,16498,6,1099.000,313,134),(2700,'7824','Old','BA',45.788,18.352,21704,6,1407.000,348,152),(2701,'7826','Alsószentmárton','BA',45.789,18.306,33279,6,1361.000,1172,308),(2702,'7827','Kásád','BA',45.778,18.399,17464,6,1329.000,322,138),(2703,'7827','Beremend','BA',45.785,18.435,31927,5,4826.000,2651,1030),(2704,'7831','Pellérd','BA',46.033,18.150,16115,6,2093.000,2119,653),(2705,'7833','Görcsöny','BA',45.969,18.136,30438,6,1852.000,1696,533),(2706,'7833','Szőke','BA',45.960,18.186,22211,6,648.000,139,55),(2707,'7833','Regenye','BA',45.969,18.168,25292,6,615.000,140,62),(2708,'7834','Baksa','BA',45.954,18.089,3975,6,1382.000,773,270),(2709,'7834','Tengeri','BA',45.926,18.088,13675,6,446.000,54,30),(2710,'7834','Téseny','BA',45.940,18.088,20978,6,1208.000,319,110),(2711,'7836','Bogádmindszent','BA',45.907,18.041,21892,6,1158.000,417,135),(2712,'7836','Ózdfalu','BA',45.929,18.022,18661,6,800.000,185,70),(2713,'7837','Hegyszentmárton','BA',45.904,18.090,21023,6,1878.000,432,166),(2714,'7838','Nagycsány','BA',45.867,17.950,18111,6,565.000,153,53),(2715,'7838','Hirics','BA',45.817,18.000,3285,6,1468.000,240,78),(2716,'7838','Piskó','BA',45.817,17.950,23506,6,1155.000,257,84),(2717,'7838','Besence','BA',45.900,17.967,30049,6,958.000,129,48),(2718,'7838','Vajszló','BA',45.863,17.976,28538,5,1771.000,1781,707),(2719,'7838','Lúzsok','BA',45.833,17.950,18865,6,652.000,261,67),(2720,'7838','Páprád','BA',45.892,18.010,7010,6,1211.000,169,77),(2721,'7838','Vejti','BA',45.817,17.967,18519,6,976.000,166,72),(2722,'7839','Kemse','BA',45.817,17.917,6789,6,896.000,65,37),(2723,'7839','Zaláta','BA',45.817,17.883,25122,6,2183.000,289,132),(2724,'7841','Baranyahídvég','BA',45.846,18.023,20464,6,849.000,205,86),(2725,'7841','Sámod','BA',45.854,18.038,18050,6,620.000,213,80),(2726,'7841','Adorjás','BA',45.851,18.063,6868,6,810.000,191,65),(2727,'7841','Kisszentmárton','BA',45.824,18.024,8651,6,1486.000,272,111),(2728,'7841','Kórós','BA',45.867,18.084,8110,6,1512.000,228,85),(2729,'7843','Cún','BA',45.812,18.067,11086,6,1843.000,243,94),(2730,'7843','Kémes','BA',45.824,18.101,10542,6,689.000,510,190),(2731,'7843','Drávapiski','BA',45.840,18.101,12380,6,491.000,126,43),(2732,'7843','Tésenfa','BA',45.813,18.118,32744,6,840.000,183,86),(2733,'7843','Szaporca','BA',45.814,18.104,34032,6,965.000,237,98),(2734,'7846','Drávacsepely','BA',45.829,18.139,28121,6,660.000,214,89),(2735,'7847','Kovácshida','BA',45.834,18.181,24226,6,809.000,269,95),(2736,'7847','Drávaszerdahely','BA',45.836,18.163,30030,6,624.000,200,78),(2737,'7847','Ipacsfa','BA',45.835,18.203,29948,6,601.000,212,87),(2738,'7849','Drávacsehi','BA',45.813,18.167,28617,6,740.000,208,79),(2739,'7850','Drávapalkonya','BA',45.803,18.179,22734,6,1013.000,273,110),(2740,'7851','Drávapalkonya','BA',45.803,18.179,22734,6,1013.000,273,110),(2741,'7851','Drávacsehi','BA',45.813,18.167,28617,6,740.000,208,79),(2742,'7851','Drávaszabolcs','BA',45.806,18.211,28608,6,1122.000,686,286),(2743,'7853','Gordisa','BA',45.796,18.233,33084,6,1088.000,310,103),(2744,'7854','Matty','BA',45.798,18.266,15051,6,1690.000,352,147),(2745,'7900','Botykapeterd','BA',46.050,17.867,13365,6,1743.000,347,134),(2746,'7900','Szigetvár','BA',46.050,17.800,26578,4,3951.000,10900,4305),(2747,'7900','Csertő','BA',46.100,17.817,13851,6,1426.000,406,175),(2748,'7901','Csertő','BA',46.100,17.817,13851,6,1426.000,406,175),(2749,'7912','Nyugotszenterzsébet','BA',46.083,17.917,26329,6,923.000,242,80),(2750,'7912','Nagyváty','BA',46.067,17.933,14191,6,1267.000,360,126),(2751,'7912','Nagypeterd','BA',46.050,17.900,27164,6,1163.000,655,225),(2752,'7913','Szentdénes','BA',46.000,17.933,32009,6,1215.000,319,134),(2753,'7914','Katádfa','BA',46.000,17.867,6965,6,439.000,180,69),(2754,'7914','Rózsafa','BA',46.017,17.883,4516,6,1664.000,387,141),(2755,'7914','Bánfa','BA',45.983,17.883,7603,6,1206.000,211,80),(2756,'7915','Szentegát','BA',45.967,17.833,33613,6,2778.000,415,179),(2757,'7915','Dencsháza','BA',46.000,17.833,7773,6,1398.000,596,211),(2758,'7918','Tótújfalu','SO',45.899,17.656,16407,6,1327.000,209,147),(2759,'7918','Szentborbás','SO',45.883,17.667,32841,6,747.000,134,64),(2760,'7918','Lakócsa','SO',45.896,17.684,11040,6,2532.000,583,269),(2761,'7921','Somogyhatvan','BA',46.117,17.717,25070,6,1352.000,363,147),(2762,'7922','Basal','BA',46.067,17.783,15495,6,404.000,203,71),(2763,'7922','Somogyapáti','BA',46.083,17.750,23807,6,1007.000,540,220),(2764,'7922','Somogyviszló','BA',46.117,17.767,21281,6,1263.000,251,111),(2765,'7922','Patapoklosi','BA',46.067,17.750,17792,6,1265.000,338,121),(2766,'7923','Basal','BA',46.067,17.783,15495,6,404.000,203,71),(2767,'7924','Somogyviszló','BA',46.117,17.767,21281,6,1263.000,251,111),(2768,'7925','Magyarlukafa','BA',46.167,17.767,23542,6,1297.000,81,50),(2769,'7925','Somogyhárságy','BA',46.167,17.783,29142,6,3097.000,448,216),(2770,'7926','Vásárosbéc','BA',46.183,17.733,24952,6,2464.000,186,96),(2771,'7932','Almáskeresztúr','BA',46.117,17.900,20376,6,1303.000,82,54),(2772,'7932','Szulimán','BA',46.133,17.800,15404,6,1049.000,219,117),(2773,'7932','Mozsgó','BA',46.117,17.850,29540,6,2176.000,1045,351),(2774,'7934','Almamellék','BA',46.150,17.883,13329,6,4433.000,471,164),(2775,'7935','Horváthertelend','BA',46.167,17.917,23074,6,536.000,83,30),(2776,'7935','Csebény','BA',46.183,17.933,21591,6,376.000,105,44),(2777,'7935','Ibafa','BA',46.150,17.917,33066,6,2930.000,233,94),(2778,'7936','Szentlászló','BA',46.150,17.833,16355,6,1406.000,864,282),(2779,'7937','Boldogasszonyfa','BA',46.183,17.833,13116,6,1722.000,446,214),(2780,'7940','Szentlőrinc','BA',46.050,17.983,15866,4,2782.000,7000,2526),(2781,'7940','Csonkamindszent','BA',46.050,17.967,22576,6,553.000,187,61),(2782,'7940','Kacsóta','BA',46.033,17.950,4297,6,951.000,259,95),(2783,'7951','Gerde','BA',45.990,18.024,12751,6,1276.000,584,188),(2784,'7951','Pécsbagota','BA',45.990,18.073,21519,6,607.000,117,39),(2785,'7951','Szabadszentkirály','BA',46.017,18.033,15079,6,1269.000,804,297),(2786,'7951','Velény','BA',45.980,18.053,22071,6,709.000,159,61),(2787,'7953','Királyegyháza','BA',46.000,17.967,20552,6,2288.000,980,323),(2788,'7954','Gilvánfa','BA',45.917,17.967,18333,6,1543.000,398,99),(2789,'7954','Magyartelek','BA',45.933,17.983,4385,6,684.000,225,73),(2790,'7954','Gyöngyfa','BA',45.967,17.950,28404,6,878.000,120,51),(2791,'7954','Kisasszonyfa','BA',45.947,18.006,18908,6,887.000,187,74),(2792,'7954','Magyarmecske','BA',45.950,17.967,5412,6,1195.000,322,113),(2793,'7957','Okorág','BA',45.917,17.883,20686,6,1185.000,174,86),(2794,'7958','Kákics','BA',45.903,17.853,6415,6,1489.000,203,95),(2795,'7960','Marócsa','BA',45.917,17.817,15219,6,1138.000,89,57),(2796,'7960','Drávaiványi','BA',45.850,17.817,32391,6,1101.000,202,100),(2797,'7960','Sellye','BA',45.875,17.844,28741,4,2518.000,2849,1160),(2798,'7960','Drávasztára','BA',45.817,17.817,21698,6,1818.000,414,240),(2799,'7960','Sósvertike','BA',45.833,17.867,31714,6,660.000,179,81),(2800,'7960','Sumony','BA',45.971,17.906,2547,6,2021.000,443,174),(2801,'7964','Csányoszró','BA',45.882,17.902,19901,6,2856.000,717,267),(2802,'7966','Bogdása','BA',45.883,17.800,10694,6,2099.000,301,128),(2803,'7967','Markóc','BA',45.867,17.767,16443,6,579.000,57,36),(2804,'7967','Drávafok','BA',45.886,17.760,17419,6,2390.000,519,215),(2805,'7967','Drávakeresztúr','BA',45.833,17.767,9159,6,1297.000,139,103),(2806,'7968','Felsőszentmárton','BA',45.852,17.700,8819,6,1946.000,948,510),(2807,'7971','Hobol','BA',46.017,17.767,33932,6,1827.000,996,335),(2808,'7972','Gyöngyösmellék','BA',45.983,17.700,22664,6,1002.000,290,108),(2809,'7972','Pettend','BA',46.000,17.700,29762,6,598.000,147,50),(2810,'7973','Bürüs','BA',45.967,17.767,7533,6,1630.000,104,44),(2811,'7973','Teklafalu','BA',45.950,17.733,32072,6,1676.000,351,134),(2812,'7973','Endrőc','BA',45.929,17.759,28273,6,1133.000,384,130),(2813,'7973','Várad','BA',45.967,17.750,8138,6,793.000,110,48),(2814,'7975','Kétújfalu','BA',45.967,17.705,8572,6,1630.000,680,254),(2815,'7976','Zádor','BA',45.967,17.665,17747,6,1522.000,355,147),(2816,'7976','Szörény','BA',45.967,17.683,5528,6,441.000,61,33),(2817,'7977','Drávagárdony','SO',45.950,17.617,13611,6,627.000,148,62),(2818,'7977','Potony','SO',45.930,17.643,28361,6,1590.000,211,126),(2819,'7977','Kastélyosdombó','SO',45.954,17.613,8411,6,1308.000,265,108),(2820,'7979','Drávatamási','SO',45.944,17.569,15884,6,845.000,387,109),(2821,'7980','Pettend','BA',46.000,17.700,29762,6,598.000,147,50),(2822,'7981','Kistamási','BA',46.017,17.733,12353,6,438.000,133,44),(2823,'7981','Merenye','BA',46.067,17.700,7737,6,1447.000,281,124),(2824,'7981','Tótszentgyörgy','BA',46.033,17.725,26994,6,750.000,173,80),(2825,'7981','Molvány','BA',46.033,17.750,29522,6,1376.000,187,78),(2826,'7981','Nemeske','BA',46.017,17.717,18236,6,1057.000,273,109),(2827,'7985','Kisdobsza','BA',46.033,17.667,33905,6,995.000,264,103),(2828,'7985','Nagydobsza','BA',46.033,17.667,33899,6,1323.000,694,224),(2829,'7987','Istvándi','SO',46.017,17.633,21333,6,3030.000,608,190),(2830,'7988','Darány','SO',45.980,17.585,31352,6,2810.000,931,354),(2831,'8000','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2832,'8001','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2833,'8002','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2834,'8003','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2835,'8004','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2836,'8005','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2837,'8006','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2838,'8007','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2839,'8008','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2840,'8011','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2841,'8019','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2842,'8020','Székesfehérvár','FE',47.200,18.417,14827,1,17089.000,102035,42981),(2843,'8041','Csór','FE',47.200,18.267,9779,6,4149.000,1797,630),(2844,'8042','Moha','FE',47.250,18.333,25715,6,988.000,522,183),(2845,'8043','Iszkaszentgyörgy','FE',47.233,18.300,32018,6,2627.000,1974,666),(2846,'8044','Kincsesbánya','FE',47.250,18.267,2343,6,1087.000,1499,577),(2847,'8045','Isztimér','FE',47.283,18.200,2200,6,5388.000,967,370),(2848,'8046','Bakonykúti','FE',47.250,18.200,23153,6,1245.000,117,68),(2849,'8051','Sárkeresztes','FE',47.250,18.350,31802,6,2327.000,1493,551),(2850,'8052','Fehérvárcsurgó','FE',47.300,18.267,32203,6,2964.000,1878,710),(2851,'8053','Bodajk','FE',47.317,18.233,18254,4,2898.000,4124,1475),(2852,'8054','Bodajk','FE',47.317,18.233,18254,4,2898.000,4124,1475),(2853,'8055','Balinka','FE',47.317,18.183,31103,6,1862.000,987,381),(2854,'8056','Bakonycsernye','FE',47.317,18.083,8730,6,3813.000,3149,1217),(2855,'8060','Mór','FE',47.383,18.200,18485,4,10861.000,14354,5647),(2856,'8061','Mór','FE',47.383,18.200,18485,4,10861.000,14354,5647),(2857,'8062','Mór','FE',47.383,18.200,18485,4,10861.000,14354,5647),(2858,'8065','Nagyveleg','FE',47.367,18.117,23588,6,1317.000,684,284),(2859,'8066','Pusztavám','FE',47.433,18.233,17774,6,3469.000,2534,991),(2860,'8071','Magyaralmás','FE',47.300,18.333,27678,6,2242.000,1515,566),(2861,'8072','Söréd','FE',47.317,18.283,2893,6,625.000,488,198),(2862,'8073','Csákberény','FE',47.350,18.333,5360,6,4137.000,1218,515),(2863,'8074','Csókakő','FE',47.350,18.267,21908,6,1092.000,1284,501),(2864,'8080','Bodmér','FE',47.450,18.550,11624,6,717.000,213,120),(2865,'8081','Zámoly','FE',47.317,18.417,30243,6,4850.000,2260,799),(2866,'8082','Gánt','FE',47.383,18.400,15750,6,5815.000,852,274),(2867,'8083','Csákvár','FE',47.400,18.450,20002,5,11876.000,5218,1912),(2868,'8084','Csákvár','FE',47.400,18.450,20002,5,11876.000,5218,1912),(2869,'8085','Vértesboglár','FE',47.433,18.533,13897,6,2321.000,911,358),(2870,'8086','Felcsút','FE',47.450,18.583,29939,6,2202.000,1764,672),(2871,'8087','Alcsútdoboz','FE',47.417,18.617,15176,6,5071.000,1454,604),(2872,'8088','Tabajd','FE',47.400,18.633,14465,6,2657.000,974,390),(2873,'8089','Vértesacsa','FE',47.367,18.583,2750,6,3619.000,1733,687),(2874,'8092','Pátka','FE',47.283,18.500,28848,6,4038.000,1644,624),(2875,'8093','Lovasberény','FE',47.300,18.550,19114,6,6062.000,2733,1105),(2876,'8095','Pákozd','FE',47.217,18.550,25751,6,4330.000,3033,977),(2877,'8096','Sukoró','FE',47.233,18.617,14951,6,1627.000,1190,445),(2878,'8097','Nadap','FE',47.267,18.617,27599,6,693.000,507,235),(2879,'8100','Várpalota','VE',47.200,18.133,11439,4,7726.000,20688,8516),(2880,'8101','Várpalota','VE',47.200,18.133,11439,4,7726.000,20688,8516),(2881,'8102','Várpalota','VE',47.200,18.133,11439,4,7726.000,20688,8516),(2882,'8103','Várpalota','VE',47.200,18.133,11439,4,7726.000,20688,8516),(2883,'8104','Várpalota','VE',47.200,18.133,11439,4,7726.000,20688,8516),(2884,'8105','Pétfürdő','VE',47.167,18.117,34254,5,1732.000,4813,1896),(2885,'8109','Tés','VE',47.267,18.033,20570,6,4903.000,857,419),(2886,'8111','Seregélyes','FE',47.100,18.583,20206,5,7819.000,4668,1598),(2887,'8112','Zichyújfalu','FE',47.133,18.683,34263,6,1082.000,969,273),(2888,'8121','Tác','FE',47.083,18.400,29267,6,4569.000,1694,565),(2889,'8122','Csősz','FE',47.033,18.417,6734,6,1711.000,1074,382),(2890,'8123','Soponya','FE',47.017,18.450,33321,5,4996.000,2051,690),(2891,'8124','Káloz','FE',46.950,18.483,16683,6,4779.000,2460,919),(2892,'8125','Sárkeresztúr','FE',47.000,18.550,25344,6,4675.000,2630,772),(2893,'8126','Sárszentágota','FE',46.967,18.567,31538,6,4550.000,1379,510),(2894,'8127','Aba','FE',47.033,18.517,17376,5,8805.000,4657,1550),(2895,'8130','Enying','FE',46.933,18.250,2802,4,8278.000,6982,2601),(2896,'8131','Enying','FE',46.933,18.250,2802,4,8278.000,6982,2601),(2897,'8132','Lepsény','FE',47.000,18.250,7269,5,3908.000,3164,1194),(2898,'8133','Mezőszentgyörgy','FE',47.000,18.283,6576,6,2712.000,1337,468),(2899,'8134','Mátyásdomb','FE',46.917,18.350,16948,6,3539.000,750,283),(2900,'8135','Dég','FE',46.867,18.450,32753,6,4686.000,2136,863),(2901,'8136','Lajoskomárom','FE',46.850,18.350,7506,5,7567.000,2232,892),(2902,'8137','Mezőkomárom','FE',46.833,18.283,5689,6,2905.000,964,411),(2903,'8138','Szabadhídvég','FE',46.817,18.283,18740,6,4410.000,875,408),(2904,'8142','Úrhida','FE',47.133,18.333,17622,6,725.000,2194,742),(2905,'8143','Sárszentmihály','FE',47.150,18.333,11776,6,3740.000,3015,1061),(2906,'8144','Sárkeszi','FE',47.167,18.283,2699,6,1479.000,614,207),(2907,'8145','Nádasdladány','FE',47.133,18.250,13903,6,2635.000,1834,633),(2908,'8146','Jenő','FE',47.100,18.250,15972,6,556.000,1344,504),(2909,'8151','Szabadbattyán','FE',47.117,18.383,28705,5,3366.000,4547,1553),(2910,'8152','Kőszárhegy','FE',47.100,18.333,30650,6,590.000,1620,571),(2911,'8153','Kőszárhegy','FE',47.100,18.333,30650,6,590.000,1620,571),(2912,'8154','Polgárdi','FE',47.050,18.300,17525,4,7216.000,6819,2065),(2913,'8156','Kisláng','FE',46.967,18.383,28990,6,5306.000,2506,1020),(2914,'8157','Füle','FE',47.050,18.250,6114,6,3032.000,877,399),(2915,'8161','Ősi','VE',47.150,18.200,24068,6,3586.000,2081,749),(2916,'8162','Küngös','VE',47.067,18.183,4066,6,940.000,530,182),(2917,'8163','Csajág','VE',47.050,18.183,16072,6,2237.000,826,317),(2918,'8164','Balatonfőkajár','VE',47.017,18.217,29461,6,2192.000,1357,537),(2919,'8171','Balatonvilágos','VE',46.967,18.167,3559,6,2921.000,1192,588),(2920,'8172','Balatonvilágos','VE',46.967,18.167,3559,6,2921.000,1192,588),(2921,'8173','Balatonvilágos','VE',46.967,18.167,3559,6,2921.000,1192,588),(2922,'8174','Balatonkenese','VE',47.033,18.117,5148,5,6557.000,3263,1667),(2923,'8175','Balatonfűzfő','VE',47.067,18.050,2219,4,925.000,4335,1899),(2924,'8181','Berhida','VE',47.117,18.133,33127,4,4273.000,6034,2036),(2925,'8182','Berhida','VE',47.117,18.133,33127,4,4273.000,6034,2036),(2926,'8183','Papkeszi','VE',47.083,18.083,7348,6,2239.000,1605,543),(2927,'8184','Papkeszi','VE',47.083,18.083,7348,6,2239.000,1605,543),(2928,'8191','Öskü','VE',47.167,18.083,25450,6,4830.000,2325,812),(2929,'8192','Hajmáskér','VE',47.150,18.017,15361,6,3814.000,3111,1292),(2930,'8193','Sóly','VE',47.133,18.033,3601,6,1028.000,471,153),(2931,'8194','Vilonya','VE',47.117,18.067,15705,6,1350.000,615,232),(2932,'8195','Királyszentistván','VE',47.100,18.050,5421,6,891.000,467,162),(2933,'8196','Litér','VE',47.100,18.017,4552,6,1283.000,2055,699),(2934,'8200','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2935,'8201','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2936,'8202','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2937,'8204','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2938,'8205','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2939,'8206','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2940,'8207','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(2941,'8220','Balatonalmádi','VE',47.033,18.016,5838,4,4988.000,8886,4167),(2942,'8221','Balatonalmádi','VE',47.033,18.017,5838,4,4988.000,8886,4167),(2943,'8222','Balatonalmádi','VE',47.033,18.017,5838,4,4988.000,8886,4167),(2944,'8225','Szentkirályszabadja','VE',47.050,17.967,16267,6,2238.000,2061,677),(2945,'8226','Alsóörs','VE',46.983,17.983,30526,6,3334.000,1412,667),(2946,'8227','Felsőörs','VE',47.017,17.950,24369,6,1724.000,1528,511),(2947,'8228','Lovas','VE',47.000,17.967,5564,6,594.000,433,169),(2948,'8229','Csopak','VE',46.983,17.933,2185,6,2398.000,1576,788),(2949,'8229','Paloznak','VE',46.983,17.950,17011,6,880.000,417,173),(2950,'8230','Balatonfüred','VE',46.950,17.883,21175,4,4645.000,13422,5654),(2951,'8230','Balatonszőlős','VE',46.962,17.875,28501,6,1281.000,602,176),(2952,'8231','Balatonszőlős','VE',46.967,17.833,28501,6,1281.000,602,176),(2953,'8232','Balatonszőlős','VE',46.967,17.833,28501,6,1281.000,602,176),(2954,'8233','Balatonszőlős','VE',46.967,17.833,28501,6,1281.000,602,176),(2955,'8236','Balatonszőlős','VE',46.967,17.833,28501,6,1281.000,602,176),(2956,'8237','Tihany','VE',46.917,17.900,30465,6,2733.000,1369,653),(2957,'8241','Aszófő','VE',46.933,17.833,7339,6,832.000,413,160),(2958,'8242','Örvényes','VE',46.917,17.817,10092,6,446.000,154,81),(2959,'8242','Balatonudvari','VE',46.900,17.817,15565,6,1880.000,284,148),(2960,'8243','Balatonakali','VE',46.883,17.750,25308,6,3620.000,632,277),(2961,'8244','Dörgicse','VE',46.917,17.717,6363,6,1912.000,262,130),(2962,'8245','Pécsely','VE',46.950,17.783,22451,6,2001.000,539,215),(2963,'8245','Vászoly','VE',46.933,17.767,16656,6,855.000,201,96),(2964,'8246','Tótvázsony','VE',47.017,17.783,2714,6,4250.000,1192,446),(2965,'8247','Hidegkút','VE',47.000,17.833,20756,6,1358.000,458,171),(2966,'8248','Veszprémfajsz','VE',47.033,17.900,21430,6,1174.000,274,93),(2967,'8248','Nemesvámos','VE',47.050,17.883,2194,6,4077.000,2517,881),(2968,'8251','Zánka','VE',46.883,17.683,20826,6,1955.000,937,428),(2969,'8252','Balatonszepezd','VE',46.850,17.667,17154,6,2506.000,399,213),(2970,'8253','Révfülöp','VE',46.833,17.633,5625,5,1036.000,1127,551),(2971,'8254','Kővágóörs','VE',46.850,17.600,23454,6,2209.000,828,371),(2972,'8254','Kékkút','VE',46.850,17.567,26037,6,368.000,86,36),(2973,'8255','Balatonrendes','VE',46.833,17.583,33844,6,676.000,119,66),(2974,'8256','Salföld','VE',46.833,17.550,30793,6,518.000,50,39),(2975,'8256','Ábrahámhegy','VE',46.817,17.567,4561,6,1488.000,440,228),(2976,'8257','Salföld','VE',46.833,17.550,30793,6,518.000,50,39),(2977,'8258','Badacsonytomaj','VE',46.800,17.517,22327,4,3271.000,2178,1068),(2978,'8261','Badacsonytomaj','VE',46.800,17.517,22327,4,3271.000,2178,1068),(2979,'8263','Badacsonytördemic','VE',46.817,17.483,3267,6,1025.000,834,437),(2980,'8264','Szigliget','VE',46.800,17.433,24891,6,3426.000,857,441),(2981,'8265','Hegymagas','VE',46.833,17.433,25803,6,789.000,243,153),(2982,'8271','Mencshely','VE',46.950,17.700,27137,6,1261.000,249,122),(2983,'8272','Balatoncsicsó','VE',46.933,17.667,3072,6,1320.000,199,98),(2984,'8272','Szentjakabfa','VE',46.933,17.667,11545,6,576.000,107,47),(2985,'8272','Szentantalfa','VE',46.917,17.683,3568,6,661.000,412,123),(2986,'8272','Óbudavár','VE',46.933,17.700,23913,6,323.000,56,30),(2987,'8272','Tagyon','VE',46.900,17.683,17039,6,276.000,89,38),(2988,'8273','Monoszló','VE',46.900,17.650,22512,6,746.000,132,67),(2989,'8274','Köveskál','VE',46.883,17.600,25858,6,1449.000,384,177),(2990,'8275','Balatonhenye','VE',46.917,17.617,3638,6,1173.000,124,66),(2991,'8281','Szentbékkálla','VE',46.883,17.567,7092,6,1070.000,193,105),(2992,'8282','Mindszentkálla','VE',46.867,17.550,4534,6,1084.000,312,143),(2993,'8283','Káptalantóti','VE',46.850,17.517,5634,6,1173.000,436,190),(2994,'8284','Kisapáti','VE',46.850,17.467,7931,6,689.000,372,139),(2995,'8284','Nemesgulács','VE',46.833,17.483,2787,6,835.000,998,417),(2996,'8286','Gyulakeszi','VE',46.867,17.483,9520,6,967.000,732,256),(2997,'8291','Vöröstó','VE',46.967,17.717,11703,6,619.000,100,53),(2998,'8291','Barnag','VE',46.983,17.750,15778,6,1201.000,123,83),(2999,'8291','Nagyvázsony','VE',46.983,17.700,19196,6,7629.000,1742,679),(3000,'8291','Pula','VE',47.000,17.650,11420,6,1464.000,218,96),(3001,'8292','Öcs','VE',47.000,17.617,28112,6,1370.000,208,110),(3002,'8294','Kapolcs','VE',46.950,17.617,14553,6,1397.000,422,219),(3003,'8294','Vigántpetend','VE',46.967,17.633,9733,6,1119.000,210,108),(3004,'8295','Taliándörögd','VE',46.983,17.567,17321,6,2808.000,718,296),(3005,'8296','Hegyesd','VE',46.917,17.517,2422,6,1105.000,164,87),(3006,'8296','Monostorapáti','VE',46.917,17.567,24040,6,2555.000,1083,473),(3007,'8297','Hegyesd','VE',46.917,17.517,2422,6,1105.000,164,87),(3008,'8300','Raposka','VE',46.881,17.436,3948,6,490.000,233,107),(3009,'8300','Tapolca','VE',46.883,17.433,29434,4,6348.000,16211,6854),(3010,'8301','Raposka','VE',46.850,17.433,3948,6,490.000,233,107),(3011,'8302','Raposka','VE',46.850,17.433,3948,6,490.000,233,107),(3012,'8303','Raposka','VE',46.850,17.433,3948,6,490.000,233,107),(3013,'8308','Zalahaláp','VE',46.917,17.467,12654,6,2413.000,1285,413),(3014,'8308','Sáska','VE',46.933,17.483,13772,6,3747.000,269,122),(3015,'8311','Nemesvita','VE',46.817,17.367,28422,6,925.000,356,180),(3016,'8312','Balatonederics','VE',46.817,17.383,12238,6,1858.000,1053,458),(3017,'8313','Balatongyörök','ZA',46.750,17.367,17002,6,3759.000,999,448),(3018,'8314','Vonyarcvashegy','ZA',46.750,17.317,12919,5,1428.000,2192,885),(3019,'8315','Gyenesdiás','ZA',46.767,17.283,23302,5,1850.000,3478,1362),(3020,'8316','Vállus','ZA',46.850,17.300,10685,6,2180.000,131,60),(3021,'8316','Várvölgy','ZA',46.867,17.300,14182,6,2504.000,1083,463),(3022,'8318','Lesencefalu','VE',46.850,17.350,17570,6,719.000,309,152),(3023,'8318','Lesencetomaj','VE',46.850,17.367,17871,6,2408.000,1102,369),(3024,'8319','Lesenceistvánd','VE',46.867,17.350,21962,6,864.000,960,387),(3025,'8321','Uzsa','VE',46.900,17.333,34218,6,2024.000,323,162),(3026,'8330','Sümeg','VE',46.983,17.283,25593,4,6413.000,6423,2533),(3027,'8331','Sümeg','VE',46.983,17.283,25593,4,6413.000,6423,2533),(3028,'8341','Szalapa','ZA',46.983,17.150,20543,6,452.000,216,93),(3029,'8341','Kisvásárhely','ZA',47.000,17.200,16364,6,435.000,58,38),(3030,'8341','Mihályfa','ZA',46.983,17.183,2130,6,1207.000,371,181),(3031,'8342','Óhíd','ZA',46.967,17.183,27775,6,1248.000,594,249),(3032,'8344','Hetyefő','VE',47.050,17.167,15088,6,411.000,93,50),(3033,'8344','Zalaerdőd','VE',47.050,17.133,29993,6,1769.000,273,161),(3034,'8345','Dabronc','VE',47.033,17.167,17172,6,2027.000,463,207),(3035,'8346','Gógánfa','VE',47.017,17.183,18193,6,1317.000,787,312),(3036,'8347','Ukk','VE',47.050,17.217,23010,6,1387.000,298,168),(3037,'8348','Megyer','VE',47.067,17.200,4987,6,426.000,29,25),(3038,'8348','Zalameggyes','VE',47.083,17.217,33039,6,256.000,64,34),(3039,'8348','Rigács','VE',47.067,17.217,25849,6,617.000,196,111),(3040,'8349','Zalagyömörő','VE',47.017,17.233,27207,6,1111.000,444,194),(3041,'8351','Sümegprága','VE',46.933,17.283,5388,6,579.000,637,248),(3042,'8352','Bazsi','VE',46.933,17.250,7427,6,910.000,407,205),(3043,'8353','Vindornyalak','ZA',46.883,17.200,6549,6,449.000,83,50),(3044,'8353','Zalaszántó','ZA',46.883,17.233,33288,6,3773.000,972,545),(3045,'8354','Karmacs','ZA',46.833,17.183,18041,6,1422.000,769,358),(3046,'8354','Zalaköveskút','ZA',46.850,17.150,18768,6,227.000,23,19),(3047,'8354','Vindornyafok','ZA',46.850,17.183,32142,6,350.000,127,71),(3048,'8355','Vindornyaszőlős','ZA',46.900,17.167,11800,6,1055.000,380,172),(3049,'8356','Nagygörbő','ZA',46.933,17.183,5218,6,745.000,194,115),(3050,'8356','Kisgörbő','ZA',46.933,17.167,9812,6,659.000,174,104),(3051,'8357','Döbröce','ZA',46.933,17.200,7782,6,270.000,70,47),(3052,'8357','Sümegcsehi','ZA',46.950,17.217,21397,6,1744.000,628,240),(3053,'8360','Keszthely','ZA',46.766,17.257,18421,4,7598.000,21100,9903),(3054,'8361','Keszthely','ZA',46.767,17.250,18421,4,7598.000,21100,9903),(3055,'8362','Keszthely','ZA',46.767,17.250,18421,4,7598.000,21100,9903),(3056,'8363','Keszthely','ZA',46.767,17.250,18421,4,7598.000,21100,9903),(3057,'8364','Keszthely','ZA',46.767,17.250,18421,4,7598.000,21100,9903),(3058,'8371','Nemesbük','ZA',46.817,17.150,32948,6,998.000,651,350),(3059,'8372','Cserszegtomaj','ZA',46.800,17.217,7135,6,1260.000,2581,1016),(3060,'8373','Rezi','ZA',46.850,17.217,23898,6,2978.000,1190,506),(3061,'8380','Felsőpáhok','ZA',46.790,17.184,11642,6,727.000,649,294),(3062,'8380','Hévíz','ZA',46.783,17.167,3814,4,831.000,4335,3626),(3063,'8381','Felsőpáhok','ZA',46.783,17.167,11642,6,727.000,649,294),(3064,'8391','Sármellék','ZA',46.717,17.167,14906,6,3537.000,1862,770),(3065,'8392','Zalavár','ZA',46.667,17.167,13736,6,3106.000,923,414),(3066,'8393','Szentgyörgyvár','ZA',46.750,17.133,23126,6,1166.000,324,161),(3067,'8394','Alsópáhok','ZA',46.767,17.183,32081,6,1802.000,1326,597),(3068,'8400','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(3069,'8401','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(3070,'8403','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(3071,'8404','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(3072,'8408','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(3073,'8409','Úrkút','VE',47.083,17.633,20853,6,2013.000,2115,746),(3074,'8411','Úrkút','VE',47.083,17.633,20853,6,2013.000,2115,746),(3075,'8412','Úrkút','VE',47.083,17.633,20853,6,2013.000,2115,746),(3076,'8413','Eplény','VE',47.217,17.917,33941,6,828.000,512,182),(3077,'8414','Olaszfalu','VE',47.233,17.917,26514,6,4280.000,1107,390),(3078,'8415','Nagyesztergár','VE',47.283,17.900,23180,6,1829.000,1251,404),(3079,'8416','Dudar','VE',47.300,17.950,2936,6,2458.000,1631,642),(3080,'8417','Csetény','VE',47.317,18.000,31699,6,1837.000,1909,701),(3081,'8418','Bakonyoszlop','VE',47.350,17.933,30410,6,1420.000,526,211),(3082,'8419','Csesznek','VE',47.350,17.883,24642,6,2420.000,541,206),(3083,'8420','Zirc','VE',47.267,17.867,26499,4,3740.000,7093,2660),(3084,'8422','Bakonynána','VE',47.283,17.967,25991,6,1493.000,1011,392),(3085,'8423','Szápár','VE',47.317,18.033,16489,6,709.000,520,198),(3086,'8424','Jásd','VE',47.283,18.033,17437,6,1028.000,804,355),(3087,'8425','Lókút','VE',47.200,17.867,18856,6,1811.000,505,191),(3088,'8426','Pénzesgyőr','VE',47.233,17.783,15547,6,1765.000,353,153),(3089,'8427','Bakonybél','VE',47.250,17.733,23746,6,2436.000,1259,581),(3090,'8428','Borzavár','VE',47.300,17.833,30252,6,1300.000,732,344),(3091,'8429','Porva','VE',47.317,17.817,23515,6,2813.000,461,186),(3092,'8430','Bakonyszentkirály','VE',47.367,17.883,22813,6,2790.000,875,378),(3093,'8431','Bakonyszentlászló','VE',47.400,17.825,5944,6,3851.000,1790,773),(3094,'8432','Fenyőfő','VE',47.400,17.825,30678,6,2965.000,119,78),(3095,'8433','Bakonygyirót','VE',47.400,17.825,28936,6,685.000,144,117),(3096,'8434','Románd','VE',47.400,17.825,17507,6,985.000,301,143),(3097,'8435','Gic','VE',47.433,17.767,16717,6,1968.000,471,151),(3098,'8436','Bakonypéterd','VE',47.400,17.825,22062,6,1002.000,265,124),(3099,'8437','Lázi','VE',47.400,17.825,4376,6,1679.000,568,239),(3100,'8438','Veszprémvarsány','VE',47.400,17.825,22691,6,2119.000,997,424),(3101,'8439','Sikátor','VE',47.400,17.825,8606,6,1374.000,304,144),(3102,'8440','Herend','VE',47.133,17.750,23658,4,1956.000,3489,1290),(3103,'8441','Márkó','VE',47.117,17.817,32212,6,3441.000,1143,379),(3104,'8442','Hárskút','VE',47.183,17.817,25566,6,3446.000,671,230),(3105,'8443','Bánd','VE',47.117,17.800,14173,6,984.000,696,236),(3106,'8444','Szentgál','VE',47.117,17.733,7922,6,9501.000,2765,1012),(3107,'8445','Csehbánya','VE',47.183,17.683,20251,6,1283.000,280,123),(3108,'8445','Városlőd','VE',47.150,17.650,7065,6,2227.000,1436,513),(3109,'8446','Kislőd','VE',47.150,17.617,30173,6,3818.000,1246,439),(3110,'8447','Kislőd','VE',47.150,17.617,30173,6,3818.000,1246,439),(3111,'8448','Kislőd','VE',47.150,17.617,30173,6,3818.000,1246,439),(3112,'8449','Magyarpolány','VE',47.167,17.550,20437,6,2697.000,1138,493),(3113,'8451','Magyarpolány','VE',47.167,17.550,20437,6,2697.000,1138,493),(3114,'8452','Halimba','VE',47.033,17.533,7898,6,1262.000,1152,435),(3115,'8452','Szőc','VE',47.017,17.517,16692,6,755.000,439,108),(3116,'8454','Nyirád','VE',47.000,17.450,24004,6,6136.000,1949,749),(3117,'8455','Pusztamiske','VE',47.067,17.450,28972,6,1782.000,413,154),(3118,'8456','Noszlop','VE',47.183,17.467,14757,6,3406.000,1068,419),(3119,'8457','Bakonypölöske','VE',47.200,17.483,6327,6,1104.000,387,163),(3120,'8458','Oroszi','VE',47.150,17.417,16595,6,474.000,138,89),(3121,'8460','Devecser','VE',47.100,17.433,32276,4,6411.000,4806,1883),(3122,'8461','Devecser','VE',47.100,17.433,32276,4,6411.000,4806,1883),(3123,'8468','Kolontár','VE',47.083,17.483,30182,6,2172.000,804,262),(3124,'8469','Kamond','VE',47.133,17.200,19141,6,2050.000,421,159),(3125,'8471','Nemeshany','VE',47.067,17.367,5555,6,1050.000,415,161),(3126,'8471','Káptalanfa','VE',47.067,17.350,14270,6,3371.000,877,316),(3127,'8471','Bodorfa','VE',47.067,17.333,4321,6,222.000,109,55),(3128,'8473','Gyepükaján','VE',47.050,17.333,28671,6,911.000,363,158),(3129,'8474','Csabrendek','VE',47.017,17.300,30924,6,4494.000,3032,1099),(3130,'8475','Hosztót','VE',47.083,17.250,7250,6,727.000,76,62),(3131,'8475','Veszprémgalsa','VE',47.100,17.283,19336,6,871.000,288,141),(3132,'8475','Szentimrefalva','VE',47.067,17.283,10065,6,1087.000,200,101),(3133,'8476','Zalaszegvár','VE',47.100,17.233,23597,6,684.000,154,77),(3134,'8477','Apácatorna','VE',47.117,17.300,28370,6,729.000,171,84),(3135,'8477','Tüskevár','VE',47.117,17.317,4631,6,1701.000,571,269),(3136,'8477','Kisberzseny','VE',47.100,17.267,29072,6,529.000,90,59),(3137,'8478','Somlójenő','VE',47.117,17.367,5157,6,815.000,318,142),(3138,'8479','Borszörcsök','VE',47.133,17.400,4765,6,1180.000,375,156),(3139,'8481','Somlóvásárhely','VE',47.117,17.383,26569,6,2321.000,1121,453),(3140,'8482','Doba','VE',47.167,17.383,10870,6,2122.000,502,261),(3141,'8483','Kisszőlős','VE',47.200,17.333,23001,6,649.000,132,72),(3142,'8483','Somlószőlős','VE',47.167,17.367,25779,6,1946.000,672,322),(3143,'8484','Vid','VE',47.217,17.350,9502,6,317.000,130,67),(3144,'8484','Somlóvecse','VE',47.200,17.350,14243,6,493.000,102,62),(3145,'8484','Nagyalásony','VE',47.233,17.350,27979,6,1401.000,514,215),(3146,'8485','Dabrony','VE',47.250,17.333,28237,6,1700.000,376,197),(3147,'8491','Karakószörcsök','VE',47.133,17.283,8749,6,711.000,329,133),(3148,'8492','Kerta','VE',47.167,17.283,25654,6,1546.000,635,252),(3149,'8493','Iszkáz','VE',47.167,17.300,28015,6,1574.000,350,208),(3150,'8494','Kiscsősz','VE',47.200,17.283,23700,6,904.000,129,85),(3151,'8495','Csögle','VE',47.217,17.267,32814,6,1691.000,647,314),(3152,'8496','Kispirit','VE',47.200,17.250,4288,6,496.000,99,68),(3153,'8496','Nagypirit','VE',47.200,17.233,21403,6,1017.000,278,159),(3154,'8497','Adorjánháza','VE',47.233,17.250,31307,6,1142.000,381,206),(3155,'8497','Egeralja','VE',47.233,17.250,33871,6,894.000,230,116),(3156,'8500','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3157,'8501','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3158,'8502','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3159,'8503','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3160,'8505','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3161,'8510','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3162,'8511','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(3163,'8512','Nyárád','VE',47.283,17.367,29009,6,1979.000,909,357),(3164,'8513','Mihályháza','VE',47.300,17.333,4668,6,2152.000,771,317),(3165,'8514','Mezőlak','VE',47.333,17.367,23560,6,2158.000,1055,391),(3166,'8515','Békás','VE',47.333,17.350,27058,6,652.000,214,97),(3167,'8516','Kemeneshőgyész','VE',47.350,17.300,19734,6,2608.000,508,240),(3168,'8517','Magyargencs','VE',47.367,17.300,26374,6,3801.000,556,278),(3169,'8518','Kemenesszentpéter','VE',47.433,17.233,12478,6,2135.000,647,327),(3170,'8521','Nagyacsád','VE',47.367,17.367,23551,6,1396.000,666,261),(3171,'8522','Nemesgörzsöny','VE',47.400,17.367,5652,6,1925.000,698,298),(3172,'8523','Egyházaskesző','VE',47.417,17.333,10445,6,2012.000,497,246),(3173,'8523','Várkesző','VE',47.433,17.317,26204,6,641.000,187,112),(3174,'8531','Várkesző','VE',47.433,17.317,26204,6,641.000,187,112),(3175,'8532','Marcaltő','VE',47.433,17.367,22220,6,2209.000,813,338),(3176,'8533','Malomsok','VE',47.450,17.400,3610,6,2574.000,546,262),(3177,'8534','Csikvánd','GS',47.467,17.450,13505,6,1453.000,488,228),(3178,'8541','Takácsi','VE',47.400,17.483,13125,6,1913.000,857,350),(3179,'8542','Vaszar','VE',47.400,17.517,26648,6,3369.000,1512,650),(3180,'8543','Gecse','VE',47.450,17.533,9292,6,934.000,425,202),(3181,'8544','Szerecseny','GS',47.467,17.550,3887,6,1239.000,813,375),(3182,'8545','Gyarmat','GS',47.467,17.500,26860,6,2245.000,1232,555),(3183,'8551','Nagygyimót','VE',47.333,17.550,8262,6,2344.000,548,249),(3184,'8552','Vanyola','VE',47.383,17.583,21777,6,1951.000,571,276),(3185,'8553','Lovászpatona','VE',47.433,17.633,5087,6,4990.000,1161,520),(3186,'8554','Nagydém','VE',47.433,17.683,10001,6,1332.000,383,158),(3187,'8555','Bakonytamási','VE',47.417,17.733,24129,6,2049.000,665,291),(3188,'8556','Pápateszér','VE',47.383,17.700,31255,6,3074.000,1201,485),(3189,'8557','Bakonyság','VE',47.400,17.650,29902,6,856.000,50,51),(3190,'8557','Bakonyszentiván','VE',47.400,17.667,23922,6,914.000,227,117),(3191,'8558','Csót','VE',47.367,17.617,32878,6,2002.000,1049,380),(3192,'8561','Adásztevel','VE',47.300,17.550,7302,6,837.000,785,320),(3193,'8562','Nagytevel','VE',47.300,17.567,25201,6,1441.000,531,226),(3194,'8563','Homokbödöge','VE',47.300,17.600,27818,6,1615.000,694,298),(3195,'8564','Ugod','VE',47.317,17.600,24767,6,6279.000,1456,599),(3196,'8565','Béb','VE',47.350,17.600,22901,6,704.000,257,106),(3197,'8571','Bakonykoppány','VE',47.333,17.683,7287,6,683.000,186,119),(3198,'8572','Bakonyszücs','VE',47.333,17.683,26417,6,3521.000,344,157),(3199,'8581','Németbánya','VE',47.217,17.650,10409,6,1219.000,70,66),(3200,'8581','Bakonyjákó','VE',47.217,17.600,29513,6,4718.000,659,255),(3201,'8582','Farkasgyepű','VE',47.200,17.633,10250,6,1005.000,407,150),(3202,'8591','Farkasgyepű','VE',47.200,17.633,10250,6,1005.000,407,150),(3203,'8591','Nóráp','VE',47.267,17.467,26523,6,758.000,196,87),(3204,'8592','Dáka','VE',47.283,17.433,20154,6,2540.000,673,178),(3205,'8593','Pápadereske','VE',47.300,17.400,19868,6,575.000,278,104),(3206,'8594','Pápasalamon','VE',47.233,17.433,21607,6,1396.000,336,176),(3207,'8595','Kup','VE',47.250,17.467,26541,6,2478.000,443,179),(3208,'8596','Pápakovácsi','VE',47.267,17.483,11855,6,1392.000,545,186),(3209,'8597','Ganna','VE',47.233,17.533,12742,6,1547.000,258,96),(3210,'8597','Döbrönte','VE',47.233,17.550,29470,6,1079.000,256,100),(3211,'8598','Döbrönte','VE',47.233,17.550,29470,6,1079.000,256,100),(3212,'8600','Siófok','SO',46.906,18.049,17631,4,12466.000,24221,11710),(3213,'8601','Siófok','SO',46.900,18.050,17631,4,12466.000,24221,11710),(3214,'8602','Siófok','SO',46.900,18.050,17631,4,12466.000,24221,11710),(3215,'8604','Siófok','SO',46.900,18.050,17631,4,12466.000,24221,11710),(3216,'8609','Siófok','SO',46.900,18.050,17631,4,12466.000,24221,11710),(3217,'8611','Siófok','SO',46.900,18.050,17631,4,12466.000,24221,11710),(3218,'8612','Nyim','SO',46.800,18.117,3203,6,976.000,295,145),(3219,'8613','Balatonendréd','SO',46.833,17.983,19460,6,4002.000,1386,557),(3220,'8614','Bálványos','SO',46.783,17.950,24457,6,2369.000,541,266),(3221,'8617','Kőröshegy','SO',46.833,17.900,15510,6,2170.000,1610,722),(3222,'8618','Kereki','SO',46.800,17.917,4598,6,1443.000,562,214),(3223,'8619','Pusztaszemes','SO',46.767,17.933,23311,6,1039.000,386,183),(3224,'8621','Zamárdi','SO',46.883,17.950,6008,4,4515.000,2385,1052),(3225,'8622','Szántód','SO',46.867,17.900,34236,6,760.000,354,259),(3226,'8623','Balatonföldvár','SO',46.850,17.883,7117,4,1532.000,2071,1166),(3227,'8624','Balatonszárszó','SO',46.833,17.833,24907,5,3013.000,1903,918),(3228,'8625','Szólád','SO',46.783,17.850,15194,6,1998.000,583,300),(3229,'8626','Teleki','SO',46.767,17.833,23968,6,805.000,202,85),(3230,'8627','Kötcse','SO',46.750,17.867,18148,6,1954.000,496,236),(3231,'8628','Nagycsepely','SO',46.750,17.833,20598,6,1980.000,367,168),(3232,'8630','Balatonboglár','SO',46.767,17.667,33853,4,3204.000,5920,2784),(3233,'8631','Balatonboglár','SO',46.767,17.667,33853,4,3204.000,5920,2784),(3234,'8634','Balatonboglár','SO',46.767,17.667,33853,4,3204.000,5920,2784),(3235,'8635','Ordacsehi','SO',46.733,17.617,16823,6,2256.000,766,342),(3236,'8636','Balatonszemes','SO',46.817,17.783,22822,6,3602.000,1782,716),(3237,'8637','Balatonőszöd','SO',46.800,17.800,11916,6,1508.000,531,334),(3238,'8638','Balatonlelle','SO',46.783,17.683,33862,4,4323.000,4911,2297),(3239,'8640','Fonyód','SO',46.733,17.550,14632,4,5355.000,4965,2580),(3240,'8641','Birján','SO',46.711,17.419,5139,6,907.000,492,198),(3241,'8642','Birján','SO',46.711,17.419,5139,6,907.000,492,198),(3242,'8644','Birján','SO',46.711,17.419,5139,6,907.000,492,198),(3243,'8646','Balatonfenyves','SO',46.717,17.500,20729,6,5193.000,1856,1076),(3244,'8647','Balatonmáriafürdő','SO',46.700,17.383,14562,6,2677.000,646,390),(3245,'8647','Balatonkeresztúr','SO',46.700,17.383,7375,6,2106.000,1486,688),(3246,'8648','Balatonkeresztúr','SO',46.700,17.383,7375,6,2106.000,1486,688),(3247,'8649','Balatonberény','SO',46.717,17.317,27377,6,2609.000,1155,672),(3248,'8651','Balatonszabadi','SO',46.883,18.133,16601,6,4134.000,3022,1139),(3249,'8652','Siójut','SO',46.883,18.133,23092,6,1073.000,593,234),(3250,'8653','Ádánd','SO',46.867,18.167,6080,6,2952.000,2294,865),(3251,'8654','Ságvár','SO',46.833,18.117,14942,6,3844.000,1905,695),(3252,'8655','Som','SO',46.800,18.150,4127,6,2335.000,688,266),(3253,'8656','Nagyberény','SO',46.800,18.167,29063,6,2314.000,1357,603),(3254,'8658','Bábonymegyer','SO',46.750,18.117,28316,6,2193.000,820,366),(3255,'8660','Tab','SO',46.733,18.033,8590,4,2586.000,4504,1931),(3256,'8660','Zala','SO',46.733,18.000,11466,6,924.000,253,133),(3257,'8660','Torvaj','SO',46.767,18.050,10153,6,1142.000,273,150),(3258,'8660','Sérsekszőlős','SO',46.767,18.017,32133,6,665.000,150,71),(3259,'8660','Lulla','SO',46.783,18.033,10010,6,1039.000,251,94),(3260,'8666','Bedegkér','SO',46.650,18.067,20710,6,2600.000,457,248),(3261,'8666','Somogyegres','SO',46.667,18.033,20057,6,1081.000,195,132),(3262,'8667','Kánya','SO',46.700,18.067,5272,6,1452.000,437,224),(3263,'8668','Tengőd','SO',46.700,18.100,32416,6,3021.000,509,273),(3264,'8669','Miklósi','SO',46.650,18.000,33376,6,1047.000,234,124),(3265,'8671','Kapoly','SO',46.733,17.967,33394,6,2237.000,699,345),(3266,'8672','Zics','SO',46.683,17.983,33057,6,1501.000,365,193),(3267,'8673','Somogymeggyes','SO',46.717,17.917,12876,6,1565.000,539,241),(3268,'8674','Nágocs','SO',46.667,17.967,15909,6,2226.000,664,248),(3269,'8675','Andocs','SO',46.650,17.933,28714,6,4327.000,1117,476),(3270,'8676','Karád','SO',46.683,17.850,5263,6,5238.000,1549,847),(3271,'8681','Visz','SO',46.733,17.783,6877,6,602.000,200,103),(3272,'8681','Látrány','SO',46.750,17.750,14863,6,2231.000,1350,577),(3273,'8683','Somogytúr','SO',46.700,17.767,32601,6,3530.000,438,195),(3274,'8684','Somogybabod','SO',46.667,17.783,32470,6,1058.000,501,239),(3275,'8685','Gamás','SO',46.617,17.767,6451,6,4292.000,758,387),(3276,'8691','Gamás','SO',46.617,17.767,6451,6,4292.000,758,387),(3277,'8692','Gyugy','SO',46.683,17.683,23904,6,1531.000,277,139),(3278,'8692','Szőlősgyörök','SO',46.717,17.683,11101,6,1863.000,1218,486),(3279,'8693','Kisberény','SO',46.633,17.667,30827,6,746.000,210,81),(3280,'8693','Lengyeltóti','SO',46.667,17.650,26675,4,3957.000,3334,1239),(3281,'8694','Hács','SO',46.650,17.683,18634,6,2128.000,388,193),(3282,'8695','Buzsák','SO',46.650,17.583,17358,6,5968.000,1328,706),(3283,'8696','Táska','SO',46.617,17.533,13693,6,2598.000,410,191),(3284,'8697','Öreglak','SO',46.600,17.617,7056,6,2072.000,1641,587),(3285,'8698','Pamuk','SO',46.550,17.650,26392,6,1196.000,246,127),(3286,'8698','Somogyvár','SO',46.583,17.667,19442,6,5299.000,1911,725),(3287,'8699','Somogyvámos','SO',46.567,17.683,21856,6,2502.000,757,322),(3288,'8700','Csömend','SO',46.567,17.500,27270,6,866.000,302,131),(3289,'8700','Marcali','SO',46.583,17.417,18500,4,10440.000,11838,4975),(3290,'8701','Csömend','SO',46.567,17.500,27270,6,866.000,302,131),(3291,'8705','Somogyszentpál','SO',46.650,17.483,6600,6,2896.000,757,374),(3292,'8706','Nikla','SO',46.583,17.517,10959,6,2335.000,709,323),(3293,'8707','Pusztakovácsi','SO',46.533,17.583,19026,6,4338.000,875,349),(3294,'8707','Libickozma','SO',46.517,17.533,32355,6,2297.000,39,50),(3295,'8708','Somogyfajsz','SO',46.517,17.567,18078,6,1826.000,533,219),(3296,'8709','Somogyfajsz','SO',46.517,17.567,18078,6,1826.000,533,219),(3297,'8710','Balatonszentgyörgy','SO',46.683,17.300,21324,6,2368.000,1610,695),(3298,'8711','Vörs','SO',46.667,17.267,9645,6,2265.000,450,276),(3299,'8712','Balatonújlak','SO',46.667,17.383,16470,6,1081.000,507,261),(3300,'8713','Kéthely','SO',46.650,17.400,11174,6,4906.000,2370,875),(3301,'8714','Kéthely','SO',46.650,17.400,11174,6,4906.000,2370,875),(3302,'8714','Kelevíz','SO',46.517,17.417,17446,6,491.000,340,128),(3303,'8716','Gadány','SO',46.517,17.400,26222,6,1970.000,387,161),(3304,'8716','Mesztegnyő','SO',46.500,17.433,16106,6,4471.000,1406,557),(3305,'8716','Hosszúvíz','SO',46.517,17.450,30775,6,710.000,43,35),(3306,'8717','Szenyér','SO',46.467,17.383,30146,6,2019.000,311,147),(3307,'8717','Nemeskisfalud','SO',46.433,17.367,25511,6,282.000,103,46),(3308,'8718','Tapsony','SO',46.467,17.333,24615,6,3161.000,697,402),(3309,'8719','Böhönye','SO',46.400,17.400,26532,6,6417.000,2383,948),(3310,'8721','Vése','SO',46.417,17.300,8183,6,4292.000,778,337),(3311,'8722','Nemesdéd','SO',46.433,17.250,7913,6,2661.000,718,325),(3312,'8723','Varászló','SO',46.433,17.217,9274,6,1276.000,146,80),(3313,'8724','Inke','SO',46.400,17.200,26301,6,5176.000,1277,446),(3314,'8725','Iharosberény','SO',46.367,17.117,27784,6,4966.000,1272,477),(3315,'8726','Somogycsicsó','SO',46.317,17.133,11484,6,1238.000,165,98),(3316,'8726','Iharos','SO',46.333,17.100,19619,6,2268.000,477,208),(3317,'8728','Pogányszentpéter','SO',46.383,17.067,27553,6,1315.000,497,169),(3318,'8731','Hollád','SO',46.633,17.317,6211,6,820.000,235,161),(3319,'8731','Tikos','SO',46.633,17.300,17844,6,335.000,127,55),(3320,'8732','Főnyed','SO',46.633,17.267,22707,6,573.000,74,53),(3321,'8732','Sávoly','SO',46.583,17.267,2051,6,2684.000,513,229),(3322,'8732','Szegerdő','SO',46.633,17.283,18607,6,546.000,226,107),(3323,'8733','Somogysámson','SO',46.583,17.300,15626,6,2177.000,776,284),(3324,'8734','Somogyzsitfa','SO',46.567,17.300,4835,6,2722.000,637,312),(3325,'8735','Csákány','SO',46.533,17.283,3799,6,1609.000,279,191),(3326,'8736','Szőkedencs','SO',46.550,17.250,5810,6,1869.000,288,185),(3327,'8737','Somogysimonyi','SO',46.483,17.217,27535,6,1582.000,88,37),(3328,'8738','Nemesvid','SO',46.500,17.267,17561,6,1838.000,724,335),(3329,'8739','Nagyszakácsi','SO',46.483,17.317,25520,6,2137.000,472,287),(3330,'8741','Zalaapáti','ZA',46.733,17.117,17400,6,2342.000,1653,605),(3331,'8741','Bókaháza','ZA',46.767,17.100,19929,6,670.000,313,147),(3332,'8742','Esztergályhorváti','ZA',46.700,17.117,15769,6,1670.000,462,201),(3333,'8743','Zalaszabar','ZA',46.650,17.117,22947,6,1695.000,554,269),(3334,'8744','Orosztony','ZA',46.633,17.067,25052,6,1845.000,478,226),(3335,'8745','Kerecseny','ZA',46.617,17.050,31529,6,1283.000,289,166),(3336,'8746','Nagyrada','ZA',46.617,17.117,16513,6,1285.000,496,204),(3337,'8747','Garabonc','ZA',46.583,17.133,12946,6,1856.000,739,265),(3338,'8747','Zalamerenye','ZA',46.567,17.100,31617,6,1399.000,165,141),(3339,'8749','Zalakaros','ZA',46.567,17.133,11785,4,1717.000,1764,928),(3340,'8751','Zalakomár','ZA',46.550,17.183,10348,6,5488.000,3076,1049),(3341,'8752','Zalakomár','ZA',46.550,17.183,10348,6,5488.000,3076,1049),(3342,'8753','Balatonmagyaród','ZA',46.600,17.183,26462,6,3153.000,496,259),(3343,'8754','Galambok','ZA',46.517,17.133,12991,6,2591.000,1277,527),(3344,'8756','Kisrécse','ZA',46.500,17.067,32726,6,342.000,198,103),(3345,'8756','Csapi','ZA',46.533,17.100,6132,6,1011.000,181,86),(3346,'8756','Zalasárszeg','ZA',46.500,17.083,2972,6,304.000,122,43),(3347,'8756','Nagyrécse','ZA',46.483,17.050,14979,6,2699.000,1107,374),(3348,'8761','Zalaigrice','ZA',46.750,17.017,16896,6,773.000,115,63),(3349,'8761','Pacsa','ZA',46.717,17.017,31741,5,2270.000,1831,711),(3350,'8762','Gétye','ZA',46.767,17.067,20039,6,666.000,117,94),(3351,'8762','Szentpéterúr','ZA',46.767,17.033,11165,6,1596.000,1054,444),(3352,'8764','Dióskál','ZA',46.667,17.050,28778,6,1963.000,492,256),(3353,'8764','Zalaszentmárton','ZA',46.700,17.067,13091,6,498.000,76,39),(3354,'8765','Egeraracsa','ZA',46.667,17.083,24262,6,703.000,325,169),(3355,'8767','Pötréte','ZA',46.683,16.950,24660,6,1412.000,264,147),(3356,'8767','Felsőrajk','ZA',46.683,17.000,21476,6,2055.000,760,327),(3357,'8767','Alsórajk','ZA',46.650,17.000,18829,6,845.000,365,176),(3358,'8771','Hahót','ZA',46.642,16.924,10269,6,3901.000,1137,494),(3359,'8772','Zalaszentbalázs','ZA',46.588,16.919,18564,6,2099.000,843,349),(3360,'8772','Börzönce','ZA',46.583,16.900,21139,6,560.000,63,35),(3361,'8773','Pölöskefő','ZA',46.600,16.950,31112,6,1232.000,396,158),(3362,'8773','Kacorlak','ZA',46.567,16.967,22965,6,760.000,230,90),(3363,'8774','Kilimán','ZA',46.633,17.000,32267,6,572.000,246,102),(3364,'8774','Gelse','ZA',46.600,17.000,12089,6,2245.000,1080,462),(3365,'8774','Gelsesziget','ZA',46.567,17.000,9089,6,498.000,271,96),(3366,'8776','Magyarszerdahely','ZA',46.550,16.933,13064,6,1622.000,519,171),(3367,'8776','Bocska','ZA',46.550,16.917,31291,6,738.000,374,143),(3368,'8776','Magyarszentmiklós','ZA',46.534,16.938,2909,6,419.000,277,103),(3369,'8777','Fűzvölgy','ZA',46.517,16.950,16531,6,314.000,145,51),(3370,'8777','Homokkomárom','ZA',46.500,16.917,24873,6,1670.000,217,79),(3371,'8777','Hosszúvölgy','ZA',46.517,16.933,11208,6,360.000,171,78),(3372,'8778','Újudvar','ZA',46.533,17.000,32197,6,1631.000,941,373),(3373,'8782','Ligetfalva','ZA',46.833,17.067,28200,6,473.000,60,35),(3374,'8782','Zalacsány','ZA',46.800,17.117,4002,6,1607.000,1005,384),(3375,'8782','Tilaj','ZA',46.800,17.050,27951,6,816.000,203,97),(3376,'8784','Kehidakustány','ZA',46.850,17.100,32902,6,1975.000,1159,645),(3377,'8785','Kallósd','ZA',46.867,17.067,5537,6,541.000,90,68),(3378,'8785','Kehidakustány','ZA',46.850,17.100,32902,6,1975.000,1159,645),(3379,'8788','Zalaszentlászló','ZA',46.883,17.117,7232,6,1967.000,858,325),(3380,'8788','Sénye','ZA',46.900,17.133,14085,6,304.000,43,33),(3381,'8789','Sénye','ZA',46.900,17.133,14085,6,304.000,43,33),(3382,'8790','Zalaszentgrót','ZA',46.950,17.083,32522,4,8162.000,7313,3048),(3383,'8792','Zalavég','ZA',47.000,17.033,17057,6,1211.000,416,228),(3384,'8793','Zalavég','ZA',47.000,17.033,17057,6,1211.000,416,228),(3385,'8795','Zalavég','ZA',47.000,17.033,17057,6,1211.000,416,228),(3386,'8796','Türje','ZA',46.983,17.100,12609,6,3823.000,1713,690),(3387,'8797','Batyk','ZA',46.983,17.033,24864,6,809.000,407,192),(3388,'8798','Zalabér','ZA',46.967,17.033,24280,6,1278.000,718,334),(3389,'8799','Dötk','ZA',46.950,17.017,16009,6,172.000,26,22),(3390,'8799','Pakod','ZA',46.967,17.000,24271,6,1255.000,982,354),(3391,'8800','Nagykanizsa','ZA',46.462,17.010,30933,3,14840.000,50540,21648),(3392,'8801','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3393,'8802','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3394,'8803','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3395,'8804','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3396,'8808','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3397,'8809','Nagykanizsa','ZA',46.514,16.972,30933,3,14840.000,50540,21648),(3398,'8821','Nagybakónak','ZA',46.550,17.050,12760,6,1794.000,401,226),(3399,'8822','Zalaújlak','ZA',46.550,17.083,9380,6,964.000,108,81),(3400,'8824','Sand','ZA',46.417,17.133,15556,6,748.000,419,197),(3401,'8825','Miháld','ZA',46.450,17.133,27526,6,2164.000,847,373),(3402,'8825','Pat','ZA',46.433,17.183,29656,6,833.000,228,134),(3403,'8827','Zalaszentjakab','ZA',46.483,17.133,18096,6,701.000,375,141),(3404,'8831','Zalaszentjakab','ZA',46.483,17.133,18096,6,701.000,375,141),(3405,'8831','Liszó','ZA',46.367,17.000,25025,6,2591.000,419,166),(3406,'8834','Murakeresztúr','ZA',46.352,16.878,25210,6,1171.000,1780,687),(3407,'8835','Fityeház','ZA',46.367,16.917,19187,6,650.000,667,248),(3408,'8840','Csurgónagymarton','SO',46.300,17.083,10603,6,1482.000,192,85),(3409,'8840','Csurgó','SO',46.267,17.100,21315,4,5942.000,5290,2109),(3410,'8849','Szenta','SO',46.250,17.183,11509,6,6447.000,391,172),(3411,'8851','Gyékényes','SO',46.238,17.005,30960,6,3376.000,1010,469),(3412,'8852','Zákány','SO',46.274,16.951,14623,6,909.000,1044,590),(3413,'8852','Gyékényes','SO',46.238,17.005,30960,6,3376.000,1010,469),(3414,'8853','Zákányfalu','SO',46.286,16.993,34403,6,670.000,651,243),(3415,'8854','Őrtilos','SO',46.280,16.929,14012,6,2112.000,585,327),(3416,'8855','Belezna','ZA',46.328,16.940,9168,6,3093.000,836,285),(3417,'8856','Nemespátró','ZA',46.317,17.017,19859,6,1225.000,313,166),(3418,'8856','Surd','ZA',46.319,16.971,2404,6,2194.000,635,246),(3419,'8857','Nemespátró','ZA',46.317,17.017,19859,6,1225.000,313,166),(3420,'8858','Somogybükkösd','SO',46.300,17.000,25043,6,1180.000,91,79),(3421,'8858','Porrogszentkirály','SO',46.283,17.050,13930,6,1365.000,320,160),(3422,'8858','Porrogszentpál','SO',46.283,17.017,28510,6,354.000,95,47),(3423,'8858','Porrog','SO',46.283,17.033,11828,6,1402.000,246,135),(3424,'8861','Szepetnek','ZA',46.431,16.905,7700,6,3039.000,1625,552),(3425,'8862','Semjénháza','ZA',46.400,16.850,30997,6,470.000,649,218),(3426,'8863','Molnári','ZA',46.383,16.833,21014,6,1286.000,716,273),(3427,'8864','Tótszerdahely','ZA',46.400,16.800,25113,6,1230.000,1215,446),(3428,'8865','Tótszentmárton','ZA',46.417,16.817,16382,6,1017.000,892,332),(3429,'8866','Becsehely','ZA',46.446,16.793,23144,6,3607.000,2141,756),(3430,'8866','Petrivente','ZA',46.433,16.850,30757,6,765.000,384,136),(3431,'8868','Kistolmács','ZA',46.483,16.750,20941,6,1220.000,165,98),(3432,'8868','Letenye','ZA',46.429,16.731,12122,4,4172.000,4260,1621),(3433,'8868','Zajk','ZA',46.483,16.717,24590,6,1239.000,211,95),(3434,'8868','Murarátka','ZA',46.453,16.685,7968,6,1204.000,273,134),(3435,'8872','Szentmargitfalva','ZA',46.500,16.667,14225,6,312.000,96,73),(3436,'8872','Muraszemenye','ZA',46.467,16.617,33987,6,1615.000,653,297),(3437,'8873','Csörnyeföld','ZA',46.501,16.632,33978,6,2125.000,467,223),(3438,'8874','Kerkaszentkirály','ZA',46.500,16.583,9575,6,811.000,249,127),(3439,'8874','Dobri','ZA',46.517,16.583,25885,6,789.000,169,113),(3440,'8876','Tormafölde','ZA',46.539,16.594,4969,6,1886.000,365,210),(3441,'8877','Tornyiszentmiklós','ZA',46.515,16.558,32638,6,1852.000,654,307),(3442,'8878','Lovászi','ZA',46.550,16.567,28167,6,967.000,1226,590),(3443,'8879','Kerkateskánd','ZA',46.583,16.583,32647,6,894.000,168,92),(3444,'8879','Szécsisziget','ZA',46.567,16.600,11554,6,620.000,232,104),(3445,'8881','Sormás','ZA',46.450,16.917,6567,6,1637.000,904,319),(3446,'8882','Eszteregnye','ZA',46.467,16.883,6178,6,2009.000,734,285),(3447,'8883','Rigyác','ZA',46.467,16.867,24138,6,1536.000,448,155),(3448,'8885','Borsfa','ZA',46.517,16.783,10056,6,1183.000,728,287),(3449,'8885','Valkonya','ZA',46.500,16.817,26268,6,755.000,64,46),(3450,'8886','Oltárc','ZA',46.527,16.837,25478,6,2953.000,255,148),(3451,'8887','Bázakerettye','ZA',46.523,16.729,18698,6,803.000,851,392),(3452,'8887','Lasztonya','ZA',46.567,16.717,3434,6,877.000,97,59),(3453,'8888','Lispeszentadorján','ZA',46.533,16.700,10889,6,914.000,323,177),(3454,'8888','Kiscsehi','ZA',46.517,16.667,16249,6,1143.000,179,106),(3455,'8888','Maróc','ZA',46.550,16.667,2103,6,516.000,86,70),(3456,'8891','Bánokszentgyörgy','ZA',46.546,16.787,8439,6,3254.000,678,298),(3457,'8891','Várfölde','ZA',46.567,16.767,2529,6,1487.000,209,106),(3458,'8893','Bucsuta','ZA',46.567,16.850,7986,6,1619.000,238,111),(3459,'8893','Szentliszló','ZA',46.576,16.824,8615,6,689.000,320,141),(3460,'8895','Pusztamagyaród','ZA',46.600,16.833,6530,6,1603.000,569,277),(3461,'8896','Pusztaszentlászló','ZA',46.637,16.844,26639,6,1034.000,636,274),(3462,'8897','Söjtör','ZA',46.667,16.858,19080,6,3616.000,1561,651),(3463,'8900','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3464,'8901','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3465,'8902','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3466,'8903','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3467,'8904','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3468,'8905','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3469,'8906','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3470,'8907','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3471,'8908','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3472,'8909','Zalaegerszeg','ZA',46.840,16.844,32054,1,9985.000,61774,25497),(3473,'8911','Kiskutas','ZA',46.917,16.800,20312,6,469.000,183,86),(3474,'8911','Nagykutas','ZA',46.924,16.808,22178,6,845.000,456,180),(3475,'8912','Kispáli','ZA',46.917,16.817,16081,6,451.000,261,113),(3476,'8912','Nagypáli','ZA',46.917,16.850,28468,6,634.000,418,165),(3477,'8913','Egervár','ZA',46.934,16.855,33428,6,1029.000,1048,383),(3478,'8913','Lakhegy','ZA',46.933,16.867,33792,6,858.000,489,204),(3479,'8913','Gősfa','ZA',46.967,16.867,29771,6,1045.000,319,131),(3480,'8914','Vasboldogasszony','ZA',46.950,16.883,10302,6,1175.000,623,216),(3481,'8915','Nemesrádó','ZA',46.783,17.000,18023,6,1402.000,322,208),(3482,'8917','Dobronhegy','ZA',46.817,16.750,32708,6,215.000,154,68),(3483,'8917','Pálfiszeg','ZA',46.783,16.733,14720,6,559.000,174,70),(3484,'8917','Milejszeg','ZA',46.800,16.750,2662,6,908.000,362,162),(3485,'8918','Csonkahegyhát','ZA',46.798,16.724,31149,6,828.000,374,140),(3486,'8918','Németfalu','ZA',46.821,16.674,25414,6,867.000,192,70),(3487,'8919','Kustánszeg','ZA',46.784,16.688,19479,6,1142.000,531,211),(3488,'8921','Zalaszentiván','ZA',46.889,16.899,2608,6,1310.000,1076,407),(3489,'8921','Zalaszentlőrinc','ZA',46.917,16.883,13301,6,489.000,306,129),(3490,'8921','Alibánfa','ZA',46.883,16.933,2644,6,584.000,484,165),(3491,'8921','Pethőhenye','ZA',46.883,16.917,5704,6,1142.000,416,192),(3492,'8923','Nemesapáti','ZA',46.867,16.950,6169,6,1037.000,531,217),(3493,'8924','Alsónemesapáti','ZA',46.848,16.935,19512,6,1451.000,736,287),(3494,'8925','Nemessándorháza','ZA',46.783,16.950,25609,6,1116.000,253,176),(3495,'8925','Búcsúszentlászló','ZA',46.786,16.931,20613,6,154.000,878,289),(3496,'8925','Nemesszentandrás','ZA',46.767,16.950,8059,6,547.000,292,137),(3497,'8925','Kisbucsa','ZA',46.817,16.950,21379,6,880.000,483,192),(3498,'8925','Nemeshetés','ZA',46.800,16.917,7658,6,661.000,310,194),(3499,'8929','Pölöske','ZA',46.750,16.933,9867,6,4523.000,910,327),(3500,'8931','Vöckönd','ZA',46.883,16.950,8369,6,279.000,85,49),(3501,'8931','Kemendollár','ZA',46.900,16.967,25353,6,1607.000,529,211),(3502,'8932','Gyűrűs','ZA',46.883,17.000,12539,6,419.000,94,54),(3503,'8932','Pókaszepetk','ZA',46.923,16.968,21050,6,1869.000,1008,370),(3504,'8932','Zalaistvánd','ZA',46.917,16.983,12496,6,1080.000,371,161),(3505,'8934','Bezeréd','ZA',46.867,17.017,12830,6,1214.000,158,156),(3506,'8935','Orbányosfa','ZA',46.850,16.983,20835,6,568.000,142,62),(3507,'8935','Almásháza','ZA',46.850,17.050,23384,6,498.000,62,24),(3508,'8935','Nagykapornak','ZA',46.817,17.000,20589,6,2441.000,931,391),(3509,'8935','Misefa','ZA',46.800,16.983,4756,6,651.000,298,120),(3510,'8935','Padár','ZA',46.850,17.017,24776,6,1069.000,142,76),(3511,'8936','Zalaszentmihály','ZA',46.725,16.949,18449,6,2082.000,1002,472),(3512,'8943','Bocfölde','ZA',46.783,16.833,17543,6,873.000,1128,401),(3513,'8943','Csatár','ZA',46.783,16.883,23436,6,779.000,561,210),(3514,'8944','Sárhida','ZA',46.750,16.850,8101,6,509.000,808,280),(3515,'8945','Bak','ZA',46.729,16.846,4738,6,2305.000,1708,611),(3516,'8946','Tófej','ZA',46.670,16.806,5342,6,1532.000,706,292),(3517,'8946','Baktüttös','ZA',46.700,16.817,15097,6,971.000,338,143),(3518,'8946','Pusztaederics','ZA',46.650,16.800,27465,6,955.000,181,97),(3519,'8947','Szentkozmadombja','ZA',46.683,16.767,3124,6,508.000,87,71),(3520,'8947','Zalatárnok','ZA',46.702,16.763,29683,6,2595.000,719,341),(3521,'8948','Barlahida','ZA',46.716,16.703,27447,6,610.000,131,86),(3522,'8948','Nova','ZA',46.684,16.684,3355,6,3929.000,833,363),(3523,'8949','Mikekarácsonyfa','ZA',46.650,16.700,22141,6,850.000,284,147),(3524,'8951','Gutorfölde','ZA',46.641,16.738,2097,6,2485.000,1081,508),(3525,'8951','Csertalakos','ZA',46.650,16.700,10649,6,199.000,31,35),(3526,'8953','Szentpéterfölde','ZA',46.617,16.767,30067,6,1212.000,134,84),(3527,'8954','Ortaháza','ZA',46.617,16.683,4950,6,703.000,130,63),(3528,'8956','Kányavár','ZA',46.567,16.683,4473,6,420.000,125,94),(3529,'8956','Pördefölde','ZA',46.583,16.717,32513,6,1912.000,65,42),(3530,'8956','Páka','ZA',46.589,16.651,29160,6,2318.000,1143,535),(3531,'8957','Csömödér','ZA',46.608,16.644,29364,6,779.000,604,271),(3532,'8957','Kissziget','ZA',46.617,16.667,13055,6,707.000,138,95),(3533,'8957','Hernyék','ZA',46.650,16.650,19895,6,1031.000,110,72),(3534,'8957','Zebecke','ZA',46.650,16.683,3726,6,445.000,73,52),(3535,'8958','Iklódbördőce','ZA',46.600,16.617,13921,6,1230.000,312,142),(3536,'8960','Lenti','ZA',46.622,16.539,12575,4,7380.000,8328,3386),(3537,'8961','Lenti','ZA',46.622,16.539,12575,4,7380.000,8328,3386),(3538,'8966','Lenti','ZA',46.622,16.539,12575,4,7380.000,8328,3386),(3539,'8969','Bödeháza','ZA',46.650,16.417,4163,6,667.000,70,58),(3540,'8969','Zalaszombatfa','ZA',46.633,16.450,27562,6,589.000,47,39),(3541,'8969','Gáborjánháza','ZA',46.633,16.417,17516,6,507.000,73,63),(3542,'8969','Szijártóháza','ZA',46.633,16.450,26161,6,378.000,26,29),(3543,'8971','Zalabaksa','ZA',46.700,16.552,7579,6,1610.000,633,284),(3544,'8971','Kerkabarabás','ZA',46.683,16.567,29489,6,1029.000,284,136),(3545,'8973','Felsőszenterzsébet','ZA',46.750,16.450,30890,6,824.000,17,15),(3546,'8973','Magyarföld','ZA',46.783,16.417,8916,6,889.000,27,26),(3547,'8973','Alsószenterzsébet','ZA',46.750,16.483,8767,6,963.000,77,40),(3548,'8973','Ramocsa','ZA',46.783,16.450,14298,6,273.000,48,21),(3549,'8973','Csesztreg','ZA',46.714,16.520,2583,6,2300.000,803,361),(3550,'8973','Kerkafalva','ZA',46.767,16.500,15112,6,1850.000,123,79),(3551,'8973','Kerkakutas','ZA',46.767,16.500,22080,6,2007.000,138,96),(3552,'8975','Szentgyörgyvölgy','ZA',46.724,16.416,18652,6,2958.000,425,243),(3553,'8976','Nemesnép','ZA',46.701,16.462,32665,6,972.000,126,93),(3554,'8976','Márokföld','ZA',46.717,16.450,31981,6,744.000,44,40),(3555,'8977','Baglad','ZA',46.683,16.483,11059,6,486.000,42,43),(3556,'8977','Lendvajakabfa','ZA',46.683,16.450,11475,6,618.000,28,45),(3557,'8977','Resznek','ZA',46.662,16.479,17118,6,1842.000,308,155),(3558,'8978','Belsősárd','ZA',46.650,16.483,20950,6,979.000,110,44),(3559,'8978','Lendvadedes','ZA',46.583,16.517,27483,6,402.000,36,26),(3560,'8978','Gosztola','ZA',46.583,16.533,13569,6,698.000,30,45),(3561,'8978','Rédics','ZA',46.614,16.477,31592,6,2532.000,988,381),(3562,'8978','Külsősárd','ZA',46.633,16.500,32221,6,152.000,83,36),(3563,'8981','Gellénháza','ZA',46.761,16.788,8068,6,524.000,1615,643),(3564,'8981','Lickóvadamos','ZA',46.750,16.767,3054,6,669.000,202,127),(3565,'8983','Babosdöbréte','ZA',46.817,16.783,21263,6,1252.000,535,220),(3566,'8983','Nagylengyel','ZA',46.783,16.767,4455,6,1024.000,522,200),(3567,'8983','Ormándlak','ZA',46.750,16.750,22497,6,575.000,118,51),(3568,'8984','Iborfia','ZA',46.733,16.750,3188,6,259.000,12,20),(3569,'8984','Petrikeresztúr','ZA',46.733,16.733,19178,6,877.000,395,182),(3570,'8984','Gombosszeg','ZA',46.750,16.733,17613,6,216.000,47,28),(3571,'8985','Becsvölgye','ZA',46.767,16.700,18360,6,2140.000,833,355),(3572,'8986','Pusztaapáti','ZA',46.767,16.617,16920,6,1059.000,28,24),(3573,'8986','Szilvágy','ZA',46.733,16.633,17853,6,2427.000,211,99),(3574,'8986','Pórszombat','ZA',46.726,16.578,16850,6,1552.000,320,140),(3575,'8988','Kálócfa','ZA',46.750,16.567,21500,6,1021.000,158,92),(3576,'8988','Kozmadombja','ZA',46.767,16.550,13082,6,763.000,61,33),(3577,'8989','Dobronhegy','ZA',46.817,16.750,32708,6,215.000,154,68),(3578,'8990','Pálfiszeg','ZA',46.783,16.733,14720,6,559.000,174,70),(3579,'8991','Hottó','ZA',46.850,16.750,28325,6,670.000,362,135),(3580,'8991','Teskánd','ZA',46.847,16.776,8828,6,485.000,1133,366),(3581,'8991','Böde','ZA',46.837,16.721,22877,6,917.000,310,129),(3582,'8992','Zalaboldogfa','ZA',46.900,16.767,28495,6,1147.000,354,140),(3583,'8992','Boncodfölde','ZA',46.867,16.733,10782,6,590.000,358,134),(3584,'8992','Bagod','ZA',46.878,16.744,30368,6,1637.000,1356,470),(3585,'8992','Hagyárosbörönd','ZA',46.900,16.717,10931,6,1125.000,294,126),(3586,'8994','Zalaszentgyörgy','ZA',46.867,16.717,33136,6,983.000,429,159),(3587,'8994','Kávás','ZA',46.867,16.717,32063,6,664.000,252,98),(3588,'8995','Keménfa','ZA',46.833,16.633,6071,6,1489.000,91,48),(3589,'8995','Salomvár','ZA',46.849,16.663,27720,6,1611.000,621,256),(3590,'8996','Zalacséb','ZA',46.860,16.664,2486,6,963.000,563,192),(3591,'8997','Zalaháshágy','ZA',46.890,16.633,23834,6,1213.000,380,172),(3592,'8998','Vaspör','ZA',46.916,16.650,14322,6,1345.000,391,204),(3593,'8998','Ozmánbük','ZA',46.917,16.683,18953,6,669.000,186,93),(3594,'8999','Csöde','ZA',46.817,16.533,27492,6,1061.000,80,54),(3595,'8999','Zalalövő','ZA',46.848,16.594,30313,4,5264.000,3053,1268),(3596,'9000','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3597,'9001','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3598,'9002','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3599,'9003','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3600,'9004','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3601,'9005','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3602,'9006','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3603,'9007','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3604,'9008','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3605,'9009','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3606,'9010','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3607,'9011','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3608,'9012','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3609,'9013','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3610,'9019','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3611,'9020','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3612,'9021','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3613,'9022','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3614,'9023','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3615,'9024','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3616,'9025','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3617,'9026','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3618,'9027','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3619,'9028','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3620,'9029','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3621,'9030','Győr','GS',47.608,17.782,25584,1,17462.000,130476,55350),(3622,'9061','Vámosszabadi','GS',47.767,17.650,12405,6,2237.000,1562,508),(3623,'9062','Vének','GS',47.733,17.767,5014,6,689.000,193,82),(3624,'9062','Kisbajcs','GS',47.750,17.683,22886,6,874.000,820,276),(3625,'9063','Nagybajcs','GS',47.767,17.700,2361,6,765.000,929,372),(3626,'9071','Gönyű','GS',47.733,17.833,2060,6,2163.000,3147,1133),(3627,'9072','Nagyszentjános','GS',47.717,17.883,33543,6,3030.000,1810,616),(3628,'9073','Bőny','GS',47.650,17.867,33950,6,5042.000,2192,776),(3629,'9074','Rétalap','GS',47.600,17.917,33969,6,1320.000,555,222),(3630,'9081','Győrújbarát','GS',47.600,17.650,7481,6,3361.000,5998,2084),(3631,'9082','Nyúl','GS',47.583,17.683,12955,6,2514.000,4196,1527),(3632,'9083','Écs','GS',47.550,17.717,16708,6,1984.000,1852,708),(3633,'9084','Győrság','GS',47.567,17.750,31316,6,820.000,1494,573),(3634,'9085','Pázmándfalu','GS',47.567,17.783,12715,6,1939.000,983,371),(3635,'9086','Töltéstava','GS',47.617,17.733,16674,6,2317.000,2187,586),(3636,'9088','Bakonypéterd','VE',47.400,17.825,22062,6,1002.000,265,124),(3637,'9089','Lázi','VE',47.400,17.825,4376,6,1679.000,568,239),(3638,'9090','Pannonhalma','GS',47.550,17.750,24305,4,2958.000,3948,1296),(3639,'9091','Ravazd','GS',47.517,17.750,21801,6,2854.000,1200,486),(3640,'9092','Tarjánpuszta','GS',47.500,17.783,33914,6,844.000,378,141),(3641,'9093','Győrasszonyfa','GS',47.500,17.800,8721,6,648.000,507,208),(3642,'9094','Tápszentmiklós','GS',47.500,17.850,21971,6,2077.000,960,337),(3643,'9095','Táp','GS',47.517,17.833,14261,6,1988.000,720,280),(3644,'9096','Nyalka','GS',47.550,17.817,19752,6,1286.000,444,193),(3645,'9097','Mezőörs','GS',47.567,17.883,12812,6,4848.000,1013,333),(3646,'9098','Mezőörs','GS',47.567,17.883,12812,6,4848.000,1013,333),(3647,'9099','Pér','GS',47.617,17.800,15529,6,3148.000,2359,950),(3648,'9100','Tét','GS',47.517,17.517,19035,4,5635.000,4010,1469),(3649,'9111','Tényő','GS',47.533,17.650,11457,6,2638.000,1566,676),(3650,'9112','Sokorópátka','GS',47.483,17.700,12627,6,1686.000,1087,478),(3651,'9113','Koroncó','GS',47.600,17.533,24633,6,2691.000,1965,681),(3652,'9121','Győrszemere','GS',47.550,17.567,15653,6,3311.000,3122,1127),(3653,'9122','Felpéc','GS',47.517,17.600,33251,6,2247.000,885,378),(3654,'9123','Kajárpéc','GS',47.483,17.633,12113,6,3189.000,1314,577),(3655,'9124','Gyömöre','GS',47.500,17.567,20400,6,2049.000,1311,505),(3656,'9125','Szerecseny','GS',47.467,17.550,3887,6,1239.000,813,375),(3657,'9126','Gyarmat','GS',47.467,17.500,26860,6,2245.000,1232,555),(3658,'9127','Csikvánd','GS',47.467,17.450,13505,6,1453.000,488,228),(3659,'9131','Mórichida','GS',47.517,17.417,2556,6,3230.000,835,362),(3660,'9132','Árpás','GS',47.517,17.400,32249,6,1427.000,247,128),(3661,'9133','Rábaszentmiklós','GS',47.533,17.417,17297,6,501.000,127,63),(3662,'9133','Kisbabot','GS',47.550,17.417,2413,6,610.000,211,112),(3663,'9134','Bodonhely','GS',47.567,17.400,6220,6,1110.000,299,134),(3664,'9135','Rábaszentmihály','GS',47.583,17.433,33710,6,1097.000,510,200),(3665,'9136','Rábacsécsény','GS',47.583,17.433,33701,6,1568.000,601,241),(3666,'9136','Mérges','GS',47.600,17.450,20385,6,651.000,86,53),(3667,'9141','Ikrény','GS',47.650,17.533,20604,6,1558.000,1826,566),(3668,'9142','Rábapatona','GS',47.633,17.483,25335,6,3975.000,2460,935),(3669,'9143','Enese','GS',47.650,17.417,15033,6,1990.000,1795,604),(3670,'9144','Kóny','GS',47.633,17.367,11262,6,2888.000,2646,1047),(3671,'9145','Bágyogszovát','GS',47.583,17.367,28769,6,2406.000,1321,551),(3672,'9146','Rábapordány','GS',47.567,17.333,24721,6,2189.000,1066,448),(3673,'9147','Dör','GS',47.600,17.300,21917,6,1101.000,619,231),(3674,'9151','Abda','GS',47.700,17.550,11882,6,1902.000,3107,1100),(3675,'9152','Börcs','GS',47.683,17.500,6619,6,1278.000,1279,419),(3676,'9153','Öttevény','GS',47.733,17.483,2635,6,2367.000,2867,1031),(3677,'9154','Mosonszentmiklós','GS',47.733,17.383,33677,6,3071.000,2319,947),(3678,'9155','Lébény','GS',47.733,17.383,33668,5,8137.000,3221,1225),(3679,'9161','Győrsövényház','GS',47.700,17.367,19309,6,2421.000,788,319),(3680,'9162','Bezi','GS',47.667,17.400,10560,6,1122.000,462,193),(3681,'9163','Fehértó','GS',47.683,17.350,6956,6,1138.000,469,221),(3682,'9164','Markotabödöge','GS',47.683,17.317,6770,6,1629.000,454,242),(3683,'9165','Cakóháza','GS',47.700,17.283,27085,6,288.000,48,31),(3684,'9165','Rábcakapi','GS',47.700,17.283,3753,6,787.000,177,89),(3685,'9165','Tárnokréti','GS',47.717,17.317,4172,6,954.000,199,107),(3686,'9167','Bősárkány','GS',47.683,17.250,15501,5,2333.000,2158,784),(3687,'9168','Acsalag','GS',47.683,17.200,33385,6,1041.000,456,225),(3688,'9169','Maglóca','GS',47.667,17.283,26444,6,577.000,87,68),(3689,'9169','Barbacs','GS',47.650,17.300,6196,6,1365.000,738,308),(3690,'9171','Győrújfalu','GS',47.717,17.617,31787,6,737.000,1391,464),(3691,'9172','Győrzámoly','GS',47.733,17.583,15228,6,2638.000,2304,746),(3692,'9173','Győrladamér','GS',47.750,17.567,13198,6,860.000,1503,509),(3693,'9174','Dunaszeg','GS',47.767,17.550,21078,6,1726.000,1967,666),(3694,'9175','Dunaszentpál','GS',47.783,17.500,15875,6,981.000,727,255),(3695,'9176','Mecsér','GS',47.800,17.483,27359,6,2111.000,594,293),(3696,'9177','Ásványráró','GS',47.833,17.500,26921,6,3916.000,1923,814),(3697,'9178','Hédervár','GS',47.833,17.467,12308,6,1428.000,1147,455),(3698,'9181','Kimle','GS',47.833,17.367,14748,6,3727.000,2158,847),(3699,'9182','Károlyháza','GS',47.633,17.583,34351,6,1125.000,682,152),(3700,'9183','Károlyháza','GS',47.633,17.583,34351,6,1125.000,682,152),(3701,'9184','Kunsziget','GS',47.733,17.517,31626,6,1788.000,1240,433),(3702,'9200','Mosonmagyaróvár','GS',47.867,17.283,4783,4,8535.000,32256,12608),(3703,'9201','Mosonmagyaróvár','GS',47.867,17.283,4783,4,8535.000,32256,12608),(3704,'9202','Mosonmagyaróvár','GS',47.867,17.283,4783,4,8535.000,32256,12608),(3705,'9203','Mosonmagyaróvár','GS',47.867,17.283,4783,4,8535.000,32256,12608),(3706,'9211','Feketeerdő','GS',47.933,17.283,32717,6,674.000,497,154),(3707,'9221','Levél','GS',47.900,17.200,19239,6,2491.000,1808,641),(3708,'9222','Hegyeshalom','GS',47.917,17.167,17905,5,5266.000,3486,1399),(3709,'9223','Bezenye','GS',47.967,17.217,29805,6,3003.000,1393,547),(3710,'9224','Rajka','GS',48.000,17.200,26587,6,5263.000,2385,949),(3711,'9225','Dunakiliti','GS',47.967,17.283,27739,6,3366.000,1816,671),(3712,'9226','Dunasziget','GS',47.933,17.367,10454,6,3590.000,1449,583),(3713,'9228','Halászi','GS',47.883,17.333,26790,6,3645.000,2905,1049),(3714,'9231','Máriakálnok','GS',47.867,17.317,12283,6,1548.000,1641,558),(3715,'9232','Darnózseli','GS',47.850,17.433,21865,6,1961.000,1588,589),(3716,'9233','Lipót','GS',47.867,17.467,16221,6,1609.000,659,249),(3717,'9234','Kisbodak','GS',47.900,17.417,7816,6,904.000,362,163),(3718,'9235','Dunaremete','GS',47.883,17.433,2079,6,436.000,246,103),(3719,'9235','Püski','GS',47.883,17.400,12964,6,839.000,650,249),(3720,'9241','Jánossomorja','GS',47.800,17.117,29221,4,14897.000,5811,2181),(3721,'9242','Jánossomorja','GS',47.800,17.117,29221,4,14897.000,5811,2181),(3722,'9243','Várbalog','GS',47.850,17.083,18412,6,2270.000,406,247),(3723,'9244','Újrónafő','GS',47.800,17.200,31839,6,4863.000,803,308),(3724,'9245','Mosonszolnok','GS',47.850,17.183,28149,6,4393.000,1624,544),(3725,'9300','Csorna','GS',47.617,17.250,4039,4,9173.000,10708,4258),(3726,'9301','Csorna','GS',47.617,17.250,4039,4,9173.000,10708,4258),(3727,'9311','Pásztori','GS',47.550,17.267,23481,6,852.000,380,128),(3728,'9312','Szilsárkány','GS',47.550,17.267,3364,6,1668.000,662,309),(3729,'9313','Rábacsanak','GS',47.533,17.300,4792,6,1385.000,512,276),(3730,'9314','Egyed','GS',47.517,17.350,20288,6,1343.000,564,249),(3731,'9315','Sobor','GS',47.483,17.383,24208,6,1672.000,287,151),(3732,'9316','Rábaszentandrás','GS',47.450,17.333,15273,6,1160.000,505,212),(3733,'9317','Szany','GS',47.467,17.300,8536,5,3413.000,2137,1001),(3734,'9321','Farád','GS',47.600,17.200,33996,6,2902.000,1960,733),(3735,'9322','Rábatamási','GS',47.583,17.167,15422,6,2176.000,997,437),(3736,'9323','Jobaháza','GS',47.583,17.200,6646,6,806.000,571,180),(3737,'9324','Potyond','GS',47.550,17.183,27304,6,284.000,107,50),(3738,'9324','Bogyoszló','GS',47.567,17.183,4367,6,2621.000,604,315),(3739,'9325','Sopronnémeti','GS',47.533,17.217,2617,6,709.000,277,126),(3740,'9326','Szil','GS',47.500,17.233,19266,6,3103.000,1235,631),(3741,'9327','Rábasebes','GS',47.433,17.233,20136,6,539.000,100,82),(3742,'9327','Vág','GS',47.450,17.217,2237,6,1403.000,513,297),(3743,'9330','Kapuvár','GS',47.600,17.033,28334,4,9605.000,10458,4311),(3744,'9331','Kapuvár','GS',47.600,17.033,28334,4,9605.000,10458,4311),(3745,'9332','Kapuvár','GS',47.600,17.033,28334,4,9605.000,10458,4311),(3746,'9339','Kapuvár','GS',47.600,17.033,28334,4,9605.000,10458,4311),(3747,'9341','Kisfalud','GS',47.517,17.100,33695,6,1510.000,760,312),(3748,'9342','Mihályi','GS',47.517,17.100,21980,6,1628.000,1094,469),(3749,'9343','Beled','GS',47.467,17.100,10588,5,2647.000,2686,1102),(3750,'9343','Vásárosfalu','GS',47.450,17.117,17880,6,420.000,161,72),(3751,'9343','Edve','GS',47.450,17.133,22442,6,505.000,114,72),(3752,'9344','Rábakecöl','GS',47.433,17.117,14793,6,2303.000,693,354),(3753,'9345','Páli','GS',47.467,17.167,19637,6,1958.000,358,211),(3754,'9346','Magyarkeresztúr','GS',47.517,17.167,13912,6,1674.000,447,226),(3755,'9346','Vadosfa','GS',47.500,17.133,6239,6,419.000,72,44),(3756,'9346','Zsebeháza','GS',47.517,17.200,16869,6,465.000,124,72),(3757,'9351','Babót','GS',47.567,17.083,15042,6,2167.000,1109,474),(3758,'9352','Veszkény','GS',47.600,17.083,4589,6,1035.000,922,386),(3759,'9353','Szárföld','GS',47.600,17.117,15714,6,1712.000,894,399),(3760,'9354','Osli','GS',47.633,17.083,15121,6,1880.000,884,377),(3761,'9361','Hövej','GS',47.550,17.017,10029,6,852.000,314,160),(3762,'9362','Himod','GS',47.517,17.017,4020,6,2270.000,633,393),(3763,'9363','Gyóró','GS',47.500,17.017,23843,6,1164.000,409,170),(3764,'9364','Cirák','GS',47.467,17.033,15954,6,1176.000,588,270),(3765,'9365','Dénesfa','GS',47.450,17.033,32595,6,1754.000,353,172),(3766,'9371','Vitnyéd','GS',47.583,16.983,25797,6,3225.000,1370,509),(3767,'9372','Csapod','GS',47.517,16.917,8563,6,2918.000,519,274),(3768,'9373','Pusztacsalád','GS',47.483,16.900,31370,6,2406.000,255,134),(3769,'9374','Iván','GS',47.450,16.917,31635,6,5474.000,1321,466),(3770,'9375','Répceszemere','GS',47.433,16.983,14438,6,942.000,284,144),(3771,'9375','Csáfordjánosfa','GS',47.417,16.950,10047,6,528.000,214,105),(3772,'9375','Csér','GS',47.417,16.933,30191,6,294.000,23,28),(3773,'9400','Sopron','GS',47.672,16.585,8518,3,16906.000,59036,25073),(3774,'9401','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3775,'9402','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3776,'9403','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3777,'9404','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3778,'9405','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3779,'9406','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3780,'9407','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3781,'9408','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3782,'9409','Sopron','GS',47.683,16.600,8518,3,16906.000,59036,25073),(3783,'9421','Fertőrákos','GS',47.717,16.650,12414,6,2190.000,2172,860),(3784,'9422','Harka','GS',47.633,16.600,7649,6,1100.000,1728,535),(3785,'9423','Ágfalva','GS',47.683,16.517,4880,6,1308.000,2119,621),(3786,'9431','Fertőd','GS',47.617,16.867,9885,4,4856.000,3474,1433),(3787,'9433','Fertőd','GS',47.617,16.867,9885,4,4856.000,3474,1433),(3788,'9434','Fertőd','GS',47.617,16.867,9885,4,4856.000,3474,1433),(3789,'9435','Sarród','GS',47.633,16.867,30021,6,4007.000,1112,433),(3790,'9436','Fertőszéplak','GS',47.617,16.833,31440,6,2178.000,1254,479),(3791,'9437','Hegykő','GS',47.617,16.800,18403,6,2684.000,1322,535),(3792,'9438','Sarród','GS',47.633,16.867,30021,6,4007.000,1112,433),(3793,'9441','Agyagosszergény','GS',47.617,16.950,29407,6,1989.000,896,373),(3794,'9442','Fertőendréd','GS',47.600,16.917,9487,6,1509.000,610,242),(3795,'9443','Petőháza','GS',47.600,16.900,22831,6,264.000,1061,423),(3796,'9444','Fertőszentmiklós','GS',47.583,16.883,15343,4,3940.000,3802,1466),(3797,'9451','Röjtökmuzsaj','GS',47.550,16.833,11068,6,1586.000,444,206),(3798,'9451','Ebergőc','GS',47.567,16.817,26347,6,502.000,154,99),(3799,'9461','Lövő','GS',47.500,16.783,31194,6,1747.000,1463,516),(3800,'9462','Völcsej','GS',47.483,16.767,16319,6,932.000,392,168),(3801,'9463','Sopronhorpács','GS',47.483,16.733,29090,6,2069.000,826,323),(3802,'9464','Und','GS',47.483,16.700,20792,6,679.000,335,146),(3803,'9471','Nemeskér','GS',47.483,16.800,29328,6,642.000,228,98),(3804,'9472','Újkér','GS',47.467,16.817,19673,6,3238.000,974,436),(3805,'9473','Egyházasfalu','GS',47.467,16.767,15237,6,2164.000,851,354),(3806,'9474','Szakony','GS',47.433,16.717,11369,6,1350.000,456,239),(3807,'9474','Gyalóka','GS',47.450,16.700,17969,6,393.000,73,51),(3808,'9475','Répcevis','GS',47.450,16.683,7746,6,609.000,356,161),(3809,'9476','Zsira','GS',47.450,16.683,4622,6,1473.000,737,234),(3810,'9481','Pinnye','GS',47.583,16.767,14687,6,865.000,342,145),(3811,'9482','Nagylózs','GS',47.567,16.783,32939,6,1925.000,953,274),(3812,'9483','Sopronkövesd','GS',47.550,16.750,25724,6,2681.000,1168,462),(3813,'9484','Pereszteg','GS',47.600,16.733,23773,6,2250.000,1382,493),(3814,'9485','Nagycenk','GS',47.600,16.700,2495,5,1945.000,1847,731),(3815,'9491','Hidegség','GS',47.633,16.750,23375,6,1690.000,352,154),(3816,'9492','Fertőhomok','GS',47.617,16.767,10658,6,1261.000,583,221),(3817,'9493','Fertőboz','GS',47.633,16.700,11253,6,1363.000,249,106),(3818,'9494','Fertőboz','GS',47.633,16.700,11253,6,1363.000,249,106),(3819,'9495','Kópháza','GS',47.633,16.650,6895,6,873.000,2001,662),(3820,'9500','Celldömölk','VA',47.250,17.150,27094,4,5239.000,11247,4723),(3821,'9501','Celldömölk','VA',47.250,17.150,27094,4,5239.000,11247,4723),(3822,'9502','Celldömölk','VA',47.250,17.150,27094,4,5239.000,11247,4723),(3823,'9503','Celldömölk','VA',47.250,17.150,27094,4,5239.000,11247,4723),(3824,'9511','Kemenesmihályfa','VA',47.283,17.117,13426,6,1781.000,527,231),(3825,'9512','Ostffyasszonyfa','VA',47.317,17.050,32629,6,3431.000,793,390),(3826,'9513','Csönge','VA',47.336,17.114,22390,6,2527.000,379,198),(3827,'9514','Kenyeri','VA',47.383,17.083,9937,6,3396.000,869,445),(3828,'9515','Pápoc','VA',47.417,17.133,14067,6,3132.000,334,303),(3829,'9516','Vönöck','VA',47.317,17.167,3142,6,1760.000,749,340),(3830,'9517','Kemenessömjén','VA',47.300,17.133,24484,6,1605.000,610,235),(3831,'9521','Kemenesszentmárton','VA',47.300,17.167,20084,6,429.000,205,96),(3832,'9522','Kemenesmagasi','VA',47.333,17.217,12247,6,3319.000,872,439),(3833,'9523','Szergény','VA',47.317,17.267,27793,6,1561.000,339,173),(3834,'9531','Mersevát','VA',47.283,17.217,14809,6,1054.000,573,225),(3835,'9532','Külsővat','VE',47.300,17.233,16142,6,1931.000,788,266),(3836,'9533','Nemesszalók','VE',47.283,17.300,21759,6,2056.000,952,359),(3837,'9534','Vinár','VE',47.317,17.283,24651,6,460.000,248,93),(3838,'9534','Marcalgergelyi','VE',47.317,17.267,29294,6,776.000,419,176),(3839,'9541','Vinár','VA',47.125,17.175,24651,6,460.000,248,93),(3840,'9542','Nemeskocs','VA',47.200,17.183,2839,6,793.000,380,147),(3841,'9542','Boba','VA',47.200,17.183,29203,6,1095.000,837,328),(3842,'9544','Kemenespálfa','VA',47.133,17.183,20996,6,1372.000,442,166),(3843,'9545','Jánosháza','VA',47.117,17.167,11679,5,2341.000,2515,1095),(3844,'9547','Karakó','VA',47.117,17.200,10913,6,1035.000,197,111),(3845,'9548','Nemeskeresztúr','VA',47.100,17.200,3674,6,1217.000,271,173),(3846,'9549','Keléd','VA',47.083,17.117,32036,6,872.000,72,60),(3847,'9551','Mesteri','VA',47.217,17.083,15723,6,1169.000,232,155),(3848,'9552','Vásárosmiske','VA',47.200,17.067,9195,6,1342.000,361,178),(3849,'9553','Köcsk','VA',47.183,17.083,4190,6,1258.000,284,169),(3850,'9553','Kemeneskápolna','VA',47.200,17.117,16911,6,497.000,88,67),(3851,'9554','Borgáta','VA',47.167,17.083,3090,6,621.000,149,101),(3852,'9554','Egyházashetye','VA',47.167,17.117,10232,6,1320.000,346,177),(3853,'9555','Kissomlyó','VA',47.133,17.100,5953,6,858.000,243,148),(3854,'9556','Duka','VA',47.181,17.093,2927,6,1524.000,236,166),(3855,'9561','Nagysimonyi','VA',47.267,17.067,26143,6,1567.000,976,426),(3856,'9561','Tokorcs','VA',47.267,17.100,9229,6,640.000,333,149),(3857,'9600','Sárvár','VA',47.255,16.944,21306,4,6465.000,15011,6202),(3858,'9601','Sárvár','VA',47.250,16.933,21306,4,6465.000,15011,6202),(3859,'9602','Sárvár','VA',47.250,16.933,21306,4,6465.000,15011,6202),(3860,'9608','Sárvár','VA',47.250,16.933,21306,4,6465.000,15011,6202),(3861,'9609','Sárvár','VA',47.250,16.933,21306,4,6465.000,15011,6202),(3862,'9611','Csénye','VA',47.233,16.867,9070,6,1912.000,723,297),(3863,'9612','Porpác','VA',47.250,16.800,29896,6,619.000,161,77),(3864,'9612','Bögöt','VA',47.250,16.800,11651,6,499.000,387,166),(3865,'9621','Ölbő','VA',47.300,16.867,12043,6,2353.000,751,308),(3866,'9622','Szeleste','VA',47.317,16.833,33172,6,2075.000,701,279),(3867,'9623','Répceszentgyörgy','VA',47.350,16.850,28626,6,575.000,115,81),(3868,'9624','Chernelházadamonya','VA',47.350,16.850,9876,6,785.000,202,105),(3869,'9625','Bő','VA',47.367,16.800,5476,6,1065.000,646,309),(3870,'9625','Gór','VA',47.367,16.800,11156,6,1099.000,306,174),(3871,'9631','Hegyfalu','VA',47.350,16.883,32188,6,1189.000,781,312),(3872,'9632','Sajtoskál','VA',47.400,16.867,10579,6,941.000,419,155),(3873,'9633','Simaság','VA',47.417,16.850,26763,6,1013.000,543,246),(3874,'9634','Iklanberény','VA',47.417,16.800,29504,6,296.000,31,36),(3875,'9634','Lócs','VA',47.400,16.817,29081,6,513.000,118,97),(3876,'9635','Zsédeny','VA',47.333,16.900,21643,6,643.000,200,109),(3877,'9636','Pósfa','VA',47.333,16.850,15671,6,535.000,290,111),(3878,'9641','Rábapaty','VA',47.300,16.933,26073,6,2141.000,1760,662),(3879,'9643','Jákfa','VA',47.333,16.967,6406,6,2011.000,540,242),(3880,'9651','Uraiújfalu','VA',47.367,16.983,21537,6,1908.000,869,380),(3881,'9652','Nick','VA',47.400,17.017,10843,6,1140.000,521,221),(3882,'9653','Répcelak','VA',47.417,17.017,30881,4,1382.000,2443,1057),(3883,'9654','Csánig','VA',47.394,17.006,26772,6,819.000,390,173),(3884,'9661','Vasegerszeg','VA',47.367,16.917,15334,6,1272.000,398,150),(3885,'9662','Tompaládony','VA',47.383,16.900,12335,6,944.000,316,146),(3886,'9662','Mesterháza','VA',47.367,16.867,31875,6,419.000,156,82),(3887,'9663','Nemesládony','VA',47.400,16.883,26240,6,567.000,124,96),(3888,'9664','Nagygeresd','VA',47.383,16.917,9283,6,940.000,268,152),(3889,'9665','Vámoscsalád','VA',47.383,16.967,31051,6,1178.000,353,158),(3890,'9671','Sitke','VA',47.233,17.033,30748,6,2720.000,651,306),(3891,'9672','Gérce','VA',47.217,17.017,26152,6,1830.000,1142,503),(3892,'9673','Káld','VA',47.167,17.050,29957,6,4244.000,1059,475),(3893,'9674','Vashosszúfalu','VA',47.117,17.067,20349,6,1392.000,373,214),(3894,'9675','Bögöte','VA',47.167,17.037,7296,6,2074.000,312,151),(3895,'9676','Hosszúpereszteg','VA',47.100,17.017,20880,6,3700.000,652,407),(3896,'9681','Sótony','VA',47.200,16.950,22983,6,1493.000,645,288),(3897,'9682','Nyőgér','VA',47.183,16.933,22318,6,1073.000,317,177),(3898,'9683','Bejcgyertyános','VA',47.150,16.925,10384,6,3143.000,476,270),(3899,'9684','Egervölgy','VA',47.117,16.917,28796,6,886.000,368,224),(3900,'9685','Szemenye','VA',47.100,16.900,27997,6,1180.000,327,194),(3901,'9700','Szombathely','VA',47.245,16.617,3009,1,9750.000,79513,33655),(3902,'9701','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3903,'9702','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3904,'9703','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3905,'9704','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3906,'9705','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3907,'9706','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3908,'9707','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3909,'9708','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3910,'9709','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3911,'9710','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3912,'9719','Szombathely','VA',47.233,16.617,3009,1,9750.000,79513,33655),(3913,'9721','Gencsapáti','VA',47.283,16.600,24183,6,2239.000,2822,925),(3914,'9722','Perenye','VA',47.300,16.583,13684,6,1622.000,701,223),(3915,'9723','Lukácsháza','VA',47.350,16.583,14021,6,936.000,1059,387),(3916,'9724','Gyöngyösfalu','VA',47.317,16.583,11943,6,965.000,1132,397),(3917,'9725','Kőszegszerdahely','VA',47.333,16.517,20109,6,737.000,492,202),(3918,'9725','Cák','VA',47.350,16.517,8271,6,648.000,280,109),(3919,'9725','Kőszegdoroszló','VA',47.350,16.550,5740,6,965.000,241,104),(3920,'9726','Velem','VA',47.350,16.500,26000,6,861.000,342,164),(3921,'9727','Bozsok','VA',47.333,16.500,5023,6,2091.000,342,139),(3922,'9730','Kőszeg','VA',47.383,16.550,16832,4,5466.000,12032,4600),(3923,'9731','Kőszeg','VA',47.383,16.550,16832,4,5466.000,12032,4600),(3924,'9732','Kőszeg','VA',47.383,16.550,16832,4,5466.000,12032,4600),(3925,'9733','Horvátzsidány','VA',47.417,16.617,16887,6,1217.000,787,323),(3926,'9733','Kiszsidány','VA',47.417,16.650,15486,6,493.000,101,39),(3927,'9733','Ólmod','VA',47.417,16.600,22044,6,366.000,93,51),(3928,'9734','Peresznye','VA',47.433,16.650,8882,6,1073.000,712,196),(3929,'9735','Csepreg','VA',47.400,16.717,12140,4,4954.000,3452,1274),(3930,'9736','Tormásliget','VA',47.385,16.632,34087,6,753.000,337,122),(3931,'9737','Bük','VA',47.383,16.750,2431,4,2086.000,3402,1613),(3932,'9738','Tömörd','VA',47.367,16.683,5166,6,1536.000,276,108),(3933,'9739','Pusztacsó','VA',47.333,16.633,10311,6,726.000,173,59),(3934,'9739','Kőszegpaty','VA',47.333,16.650,26046,6,1225.000,198,77),(3935,'9739','Nemescsó','VA',47.350,16.617,23320,6,738.000,319,118),(3936,'9740','Pusztacsó','VA',47.333,16.633,10311,6,726.000,173,59),(3937,'9741','Vassurány','VA',47.283,16.700,25982,6,1009.000,810,278),(3938,'9742','Salköveskút','VA',47.300,16.700,18883,6,1320.000,509,192),(3939,'9743','Söpte','VA',47.283,16.650,24800,6,1398.000,808,273),(3940,'9744','Vasasszonyfa','VA',47.317,16.667,20394,6,1065.000,382,155),(3941,'9745','Meszlen','VA',47.333,16.700,32832,6,1202.000,230,99),(3942,'9746','Acsád','VA',47.317,16.733,7214,6,1434.000,689,185),(3943,'9747','Vasszilvágy','VA',47.300,16.750,12104,6,1180.000,414,168),(3944,'9748','Vát','VA',47.283,16.783,2246,6,2327.000,696,251),(3945,'9749','Nemesbőd','VA',47.267,16.733,24509,6,914.000,627,240),(3946,'9751','Vép','VA',47.233,16.733,26426,5,3289.000,3461,1171),(3947,'9752','Bozzai','VA',47.200,16.767,6390,6,443.000,320,117),(3948,'9752','Kenéz','VA',47.200,16.783,2574,6,717.000,282,111),(3949,'9754','Pecöl','VA',47.200,16.833,14988,6,1726.000,803,302),(3950,'9754','Megyehíd','VA',47.217,16.833,30872,6,604.000,347,124),(3951,'9756','Ikervár','VA',47.200,16.900,11387,6,3534.000,1865,669),(3952,'9757','Meggyeskovácsi','VA',47.167,16.867,25760,6,2464.000,745,329),(3953,'9761','Táplánszentkereszt','VA',47.200,16.700,32045,6,2008.000,2555,843),(3954,'9762','Tanakajd','VA',47.200,16.733,16212,6,1182.000,791,274),(3955,'9763','Vasszécseny','VA',47.183,16.767,29373,6,1795.000,1432,488),(3956,'9764','Csempeszkopács','VA',47.150,16.800,23816,6,540.000,313,118),(3957,'9766','Rábatöttös','VA',47.125,16.833,17996,6,648.000,224,121),(3958,'9766','Zsennye','VA',47.117,16.817,12292,6,502.000,97,57),(3959,'9766','Rum','VA',47.133,16.850,10597,6,1685.000,1263,453),(3960,'9771','Balogunyom','VA',47.167,16.650,5102,6,1212.000,1242,425),(3961,'9772','Kisunyom','VA',47.150,16.650,2501,6,1000.000,414,174),(3962,'9773','Sorokpolány','VA',47.133,16.667,29692,6,1329.000,869,280),(3963,'9774','Gyanógeregye','VA',47.117,16.767,27030,6,707.000,163,67),(3964,'9774','Sorkikápolna','VA',47.133,16.700,27960,6,886.000,265,103),(3965,'9774','Sorkifalud','VA',47.133,16.733,7171,6,1737.000,654,267),(3966,'9775','Nemeskolta','VA',47.150,16.767,24059,6,734.000,371,147),(3967,'9776','Püspökmolnári','VA',47.100,16.800,7278,6,1510.000,937,384),(3968,'9777','Rábahídvég','VA',47.067,16.750,3197,6,2241.000,977,398),(3969,'9781','Egyházashollós','VA',47.050,16.683,30429,6,1904.000,547,261),(3970,'9782','Nemesrempehollós','VA',47.083,16.683,9672,6,1205.000,270,155),(3971,'9783','Egyházasrádóc','VA',47.083,16.617,25946,6,2479.000,1327,519),(3972,'9784','Rádóckölked','VA',47.083,16.600,7551,6,1895.000,268,133),(3973,'9784','Harasztifalu','VA',47.050,16.550,5713,6,789.000,166,85),(3974,'9784','Nagykölked','VA',47.067,16.550,32920,6,978.000,159,71),(3975,'9789','Sé','VA',47.233,16.567,10278,6,603.000,1413,470),(3976,'9791','Dozmat','VA',47.233,16.517,16151,6,854.000,232,91),(3977,'9791','Torony','VA',47.233,16.533,29878,6,1283.000,1942,660),(3978,'9792','Bucsu','VA',47.267,16.500,32984,6,1654.000,602,214),(3979,'9793','Narda','VA',47.233,16.467,2042,6,1035.000,503,193),(3980,'9794','Felsőcsatár','VA',47.217,16.450,13587,6,1790.000,468,190),(3981,'9795','Vaskeresztes','VA',47.200,16.450,30702,6,912.000,357,127),(3982,'9796','Horvátlövő','VA',47.183,16.450,12733,6,616.000,221,70),(3983,'9796','Pornóapáti','VA',47.150,16.467,20367,6,1514.000,404,139),(3984,'9797','Nárai','VA',47.200,16.567,17367,6,1599.000,1216,431),(3985,'9798','Ják','VA',47.133,16.583,13958,6,4495.000,2575,915),(3986,'9799','Szentpéterfa','VA',47.100,16.483,21254,6,3124.000,988,385),(3987,'9800','Vasvár','VA',47.050,16.800,4695,4,5510.000,4396,1926),(3988,'9801','Vasvár','VA',47.050,16.800,4695,4,5510.000,4396,1926),(3989,'9811','Andrásfa','VA',46.967,16.800,12317,6,823.000,318,146),(3990,'9812','Telekes','VA',46.939,16.773,29568,6,1081.000,519,197),(3991,'9813','Gersekarát','VA',46.974,16.747,30942,6,1992.000,709,329),(3992,'9813','Sárfimizdó','VA',46.950,16.717,9788,6,746.000,103,64),(3993,'9814','Halastó','VA',46.950,16.700,29452,6,565.000,102,73),(3994,'9821','Hegyhátszentpéter','VA',46.983,16.817,8226,6,684.000,153,92),(3995,'9821','Győrvár','VA',46.988,16.842,9724,6,1659.000,674,289),(3996,'9823','Pácsony','VA',47.017,16.867,7162,6,1001.000,279,132),(3997,'9824','Olaszfa','VA',47.017,16.883,19743,6,1654.000,470,257),(3998,'9825','Oszkó','VA',47.033,16.883,7667,6,2031.000,670,304),(3999,'9826','Petőmihályfa','VA',46.983,16.783,11572,6,995.000,237,107),(4000,'9831','Bérbaltavár','VA',47.017,16.967,32124,6,2567.000,502,308),(4001,'9832','Nagytilaj','VA',46.973,16.965,24837,6,1566.000,142,134),(4002,'9833','Csehi','VA',47.033,16.950,19488,6,934.000,270,155),(4003,'9834','Csehimindszent','VA',47.050,16.950,12724,6,1543.000,361,194),(4004,'9835','Mikosszéplak','VA',47.033,16.983,30599,6,1866.000,331,159),(4005,'9836','Csipkerek','VA',47.067,16.950,26064,6,1313.000,358,244),(4006,'9841','Kám','VA',47.100,16.883,4640,6,1530.000,448,212),(4007,'9842','Alsóújlak','VA',47.050,16.800,22725,6,2102.000,610,305),(4008,'9900','Körmend','VA',47.017,16.600,13532,4,5279.000,12028,5046),(4009,'9901','Körmend','VA',47.017,16.600,13532,4,5279.000,12028,5046),(4010,'9909','Magyarnádalja','VA',47.000,16.533,27289,6,385.000,211,85),(4011,'9909','Körmend','VA',47.017,16.600,13532,4,5279.000,12028,5046),(4012,'9912','Magyarszecsőd','VA',47.033,16.650,17288,6,1126.000,446,195),(4013,'9912','Molnaszecsőd','VA',47.050,16.683,3294,6,1169.000,431,174),(4014,'9913','Döröske','VA',47.017,16.700,3036,6,440.000,84,65),(4015,'9913','Szarvaskend','VA',46.983,16.683,17729,6,1034.000,220,125),(4016,'9913','Nagymizdó','VA',46.983,16.667,15060,6,676.000,131,79),(4017,'9914','Döbörhegy','VA',46.983,16.700,20695,6,1175.000,163,117),(4018,'9915','Nádasd','VA',46.964,16.619,6716,6,3560.000,1329,543),(4019,'9915','Katafa','VA',46.983,16.633,26620,6,481.000,382,160),(4020,'9915','Hegyháthodász','VA',46.933,16.650,14997,6,808.000,176,97),(4021,'9915','Hegyhátsál','VA',46.967,16.650,30216,6,458.000,147,84),(4022,'9917','Halogy','VA',46.967,16.567,10676,6,705.000,264,145),(4023,'9917','Daraboshegy','VA',46.967,16.567,15990,6,459.000,90,61),(4024,'9918','Felsőmarác','VA',46.933,16.517,29841,6,1744.000,264,191),(4025,'9919','Csákánydoroszló','VA',46.971,16.507,3911,6,2661.000,1772,597),(4026,'9921','Vasalja','VA',47.017,16.517,2884,6,1124.000,325,150),(4027,'9922','Pinkamindszent','VA',47.033,16.483,6248,6,1101.000,160,109),(4028,'9923','Kemestaródfa','VA',47.000,16.517,22716,6,635.000,237,119),(4029,'9931','Ivánc','VA',46.933,16.500,31680,6,1714.000,706,239),(4030,'9931','Hegyhátszentmárton','VA',46.933,16.483,21838,6,1274.000,57,54),(4031,'9932','Viszák','VA',46.883,16.500,7940,6,1013.000,254,126),(4032,'9933','Őrimagyarósd','VA',46.888,16.540,13453,6,1229.000,231,116),(4033,'9934','Felsőjánosfa','VA',46.850,16.567,8013,6,306.000,196,88),(4034,'9934','Szaknyér','VA',46.867,16.533,16504,6,293.000,59,40),(4035,'9934','Hegyhátszentjakab','VA',46.866,16.555,18032,6,947.000,281,160),(4036,'9935','Szőce','VA',46.883,16.583,19521,6,1871.000,375,215),(4037,'9936','Kisrákos','VA',46.867,16.500,11147,6,1106.000,211,98),(4038,'9937','Pankasz','VA',46.833,16.500,23108,6,927.000,431,180),(4039,'9938','Szatta','VA',46.800,16.483,2440,6,601.000,69,37),(4040,'9938','Nagyrákos','VA',46.833,16.467,29869,6,1611.000,272,151),(4041,'9941','Ispánk','VA',46.867,16.450,7977,6,692.000,111,56),(4042,'9941','Őriszentpéter','VA',46.841,16.429,10630,4,3356.000,1198,527),(4043,'9942','Szalafő','VA',46.867,16.367,10223,6,2737.000,219,145),(4044,'9943','Kondorfa','VA',46.895,16.402,13028,6,2161.000,541,297),(4045,'9944','Bajánsenye','VA',46.800,16.383,17020,6,2185.000,488,246),(4046,'9944','Kerkáskápolna','VA',46.783,16.433,19761,6,920.000,100,56),(4047,'9945','Kercaszomor','VA',46.783,16.367,26596,6,1287.000,205,115),(4048,'9946','Magyarszombatfa','VA',46.763,16.347,25423,6,1594.000,277,152),(4049,'9946','Velemér','VA',46.733,16.383,18430,6,955.000,87,73),(4050,'9951','Rátót','VA',46.967,16.433,23861,6,727.000,241,99),(4051,'9952','Gasztony','VA',46.962,16.459,30906,6,1427.000,453,206),(4052,'9953','Nemesmedves','VA',47.000,16.400,31556,6,474.000,21,13),(4053,'9953','Vasszentmihály','VA',46.967,16.417,11633,6,641.000,348,172),(4054,'9954','Rönök','VA',46.983,16.350,26806,6,1722.000,447,163),(4055,'9955','Rönök','VA',46.983,16.350,26806,6,1722.000,447,163),(4056,'9961','Rábagyarmat','VA',46.941,16.429,26736,6,1679.000,816,306),(4057,'9962','Csörötnek','VA',46.951,16.376,4224,6,2053.000,870,331),(4058,'9962','Magyarlak','VA',46.950,16.350,3221,6,762.000,741,301),(4059,'9970','Szentgotthárd','VA',46.952,16.326,31583,4,6773.000,8953,3313),(4060,'9971','Szentgotthárd','VA',46.952,16.326,31583,4,6773.000,8953,3313),(4061,'9981','Szentgotthárd','VA',46.952,16.326,31583,4,6773.000,8953,3313),(4062,'9982','Apátistvánfalva','VA',46.901,16.265,8873,6,1286.000,369,166),(4063,'9982','Kétvölgy','VA',46.883,16.217,19345,6,628.000,127,72),(4064,'9982','Orfalu','VA',46.883,16.283,17093,6,694.000,60,32),(4065,'9983','Alsószölnök','VA',46.928,16.209,22549,6,1002.000,363,170),(4066,'9983','Szakonyfalu','VA',46.917,16.233,20932,6,1119.000,354,140),(4067,'9985','Felsőszölnök','VA',46.880,16.173,23287,6,2356.000,584,299),(4068,'2087','Piliscsaba','PE',47.617,18.833,7144,5,2557.000,7873,2468),(4069,'2099','Pilisszentkereszt','PE',47.700,18.900,18731,6,1721.000,2270,788),(4070,'2738','Cegléd','PE',47.167,19.800,11341,4,24487.000,38318,15722),(4071,'2835','Tata','KE',47.650,18.317,20127,4,7817.000,24902,9483),(4072,'2921','Komárom','KE',47.733,18.117,5449,4,7019.000,19747,8201),(4073,'3024','Lőrinci','HE',47.733,19.683,30401,4,2353.000,6126,2318),(4074,'3065','Pásztó','NO',47.917,19.700,7409,4,7260.000,9880,4108),(4075,'3078','Bátonyterenye','NO',47.967,19.833,33534,4,7892.000,13270,5820),(4076,'3082','Pásztó','NO',47.917,19.700,7409,4,7260.000,9880,4108),(4077,'3141','Salgótarján','NO',48.117,19.817,25788,1,10084.000,38207,18276),(4078,'3147','Kazár','NO',48.050,19.867,28389,6,3039.000,2066,804),(4079,'3221','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(4080,'3232','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(4081,'3233','Gyöngyös','HE',47.783,19.933,5236,4,5531.000,32546,14438),(4082,'3234','Mátraszentimre','HE',47.917,19.883,29045,6,2129.000,501,271),(4083,'3244','Parád','HE',47.917,20.033,7436,5,3720.000,1961,1011),(4084,'3625','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(4085,'3651','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(4086,'3661','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(4087,'3662','Ózd','BZ',48.217,20.300,14492,4,9170.000,35621,14953),(4088,'3783','Edelény','BZ',48.300,20.733,10728,4,5684.000,10372,3567),(4089,'3923','Gesztely','BZ',48.100,20.967,15608,6,2882.000,2826,951),(4090,'3944','Sátoraljaújhely','BZ',48.400,21.667,5120,4,7347.000,16299,6875),(4091,'3945','Sátoraljaújhely','BZ',48.400,21.667,5120,4,7347.000,16299,6875),(4092,'3988','Sátoraljaújhely','BZ',48.400,21.667,5120,4,7347.000,16299,6875),(4093,'4067','Egyek','HB',47.633,20.900,15741,5,10479.000,5071,2392),(4094,'4074','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(4095,'4078','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(4096,'4079','Debrecen','HB',47.767,21.240,15130,1,46165.000,206225,89716),(4097,'4086','Hajdúböszörmény','HB',47.667,21.517,3045,4,37078.000,31793,12312),(4098,'4162','Szerep','HB',47.233,21.150,33437,6,5604.000,1604,571),(4099,'4246','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(4100,'4252','Nyíradony','HB',47.683,21.917,6187,4,9659.000,7874,2796),(4101,'4253','Nyíradony','HB',47.683,21.917,6187,4,9659.000,7874,2796),(4102,'4446','Tiszaeszlár','SZ',48.050,21.467,9113,6,5460.000,2676,1097),(4103,'4447','Tiszalök','SZ',48.017,21.383,23524,4,5872.000,5768,2262),(4104,'4481','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(4105,'4486','Tiszatelek','SZ',48.200,21.800,14447,6,3378.000,1473,541),(4106,'4551','Nyíregyháza','SZ',47.950,21.717,17206,1,27454.000,117597,50269),(4107,'5095','Tiszavárkony','JN',47.067,20.183,31866,6,3562.000,1598,693),(4108,'5152','Jászberény','JN',47.500,19.917,18209,4,22135.000,27134,11771),(4109,'5212','Törökszentmiklós','JN',47.183,20.417,27313,4,18516.000,21758,8989),(4110,'5213','Fegyvernek','JN',47.267,20.533,16647,5,7148.000,6629,2680),(4111,'5349','Kenderes','JN',47.250,20.683,17145,4,11124.000,4917,2013),(4112,'5461','Tiszaföldvár','JN',46.983,20.250,13815,4,8034.000,11548,4724),(4113,'5623','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(4114,'5671','Békéscsaba','BE',46.683,21.100,15200,1,19393.000,64784,29240),(4115,'5752','Medgyesegyháza','BE',46.500,21.033,30128,5,6429.000,3848,1873),(4116,'6044','Kecskemét','BK',46.900,19.783,26684,1,32136.000,111428,46329),(4117,'6648','Csongrád','CS',46.700,20.150,5111,4,17389.000,17686,8468),(4118,'7018','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(4119,'7019','Sárbogárd','FE',46.883,18.633,23694,4,18934.000,12922,5089),(4120,'7027','Paks','TO',46.633,18.867,4862,4,15408.000,19833,8241),(4121,'7187','Bonyhád','TO',46.300,18.533,6497,4,7213.000,13957,5592),(4122,'7409','Kaposvár','SO',46.367,17.800,20473,1,11359.000,67663,27911),(4123,'7557','Barcs','SO',45.960,17.459,32799,4,12290.000,11699,4511),(4124,'7714','Mohács','BA',45.993,18.683,23959,4,11223.000,19129,8706),(4125,'7715','Mohács','BA',45.993,18.683,23959,4,11223.000,19129,8706),(4126,'8054','Balinka','FE',47.317,18.183,31103,6,1862.000,987,381),(4127,'8172','Balatonkenese','VE',47.033,18.117,5148,5,6557.000,3263,1667),(4128,'8173','Balatonkenese','VE',47.033,18.117,5148,5,6557.000,3263,1667),(4129,'8184','Balatonfűzfő','VE',47.067,18.050,2219,4,925.000,4335,1899),(4130,'8236','Balatonfüred','VE',46.950,17.883,21175,4,4645.000,13422,5654),(4131,'8257','Badacsonytomaj','VE',46.800,17.517,22327,4,3271.000,2178,1068),(4132,'8297','Tapolca','VE',46.883,17.433,29434,4,6348.000,16211,6854),(4133,'8411','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(4134,'8412','Veszprém','VE',47.100,17.917,11767,1,12690.000,63405,26062),(4135,'8447','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(4136,'8448','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(4137,'8451','Ajka','VE',47.100,17.567,6673,4,9505.000,29685,12589),(4138,'8531','Marcaltő','VE',47.433,17.367,22220,6,2209.000,813,338),(4139,'8591','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(4140,'8598','Pápa','VE',47.333,17.467,31945,4,9168.000,32664,13223),(4141,'8691','Balatonboglár','SO',46.767,17.667,33853,4,3204.000,5920,2784),(4142,'8709','Marcali','SO',46.583,17.417,18500,4,10440.000,11838,4975),(4143,'8714','Marcali','SO',46.583,17.417,18500,4,10440.000,11838,4975),(4144,'8785','Zalaszentgrót','ZA',46.950,17.083,32522,4,8162.000,7313,3048),(4145,'8789','Zalaszentgrót','ZA',46.950,17.083,32522,4,8162.000,7313,3048),(4146,'8793','Zalaszentgrót','ZA',46.950,17.083,32522,4,8162.000,7313,3048),(4147,'8795','Zalaszentgrót','ZA',46.950,17.083,32522,4,8162.000,7313,3048),(4148,'8831','Nagykanizsa','ZA',46.462,17.010,30933,3,14840.000,50540,21648),(4149,'9183','Mosonszentmiklós','GS',47.733,17.383,33677,6,3071.000,2319,947),(4150,'9434','Sarród','GS',47.633,16.867,30021,6,4007.000,1112,433),(4151,'9494','Sopron','GS',47.672,16.585,8518,3,16906.000,59036,25073),(4152,'9541','Celldömölk','VA',47.250,17.150,27094,4,5239.000,11247,4723),(4153,'9740','Bük','VA',47.383,16.750,2431,4,2086.000,3402,1613),(4154,'9955','Szentgotthárd','VA',46.952,16.326,31583,4,6773.000,8953,3313);
+    ";
+
+}

From 5d9587d8fd6fad8a42d5fe88270774a6a06c72a8 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Sun, 27 Sep 2015 21:49:29 +0200
Subject: [PATCH 023/100] add card and customer translations

---
 common/messages/hu/common/card.php     | 39 +++++++++++++++++++
 common/messages/hu/common/city.php     | 40 ++++++++++++++++++++
 common/messages/hu/common/customer.php | 52 ++++++++++++++++++++++++++
 common/models/Customer.php             |  6 +--
 4 files changed, 134 insertions(+), 3 deletions(-)
 create mode 100644 common/messages/hu/common/card.php
 create mode 100644 common/messages/hu/common/city.php
 create mode 100644 common/messages/hu/common/customer.php

diff --git a/common/messages/hu/common/card.php b/common/messages/hu/common/card.php
new file mode 100644
index 0000000..2f6cf77
--- /dev/null
+++ b/common/messages/hu/common/card.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Active' => 'Aktív',
+    'BARCODE' => 'VONALKÓD',
+    'Card: ' => 'Bérletkártya: ',
+    'Cards' => 'Bérletkártyák',
+    'Create' => 'Mentés',
+    'Create Card' => 'Új bérletkártya',
+    'Created At' => 'Létrehozás ideje',
+    'Customer' => 'Vendég',
+    'Id Card' => 'Azonosító',
+    'Inactive' => 'Inaktív',
+    'Number' => 'Kártyaszám',
+    'QRCODE' => 'QRCODE',
+    'RFID' => 'RFID',
+    'Search' => 'Keresés',
+    'Status' => 'Státusz',
+    'Type' => 'Típus',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/city.php b/common/messages/hu/common/city.php
new file mode 100644
index 0000000..d9ded10
--- /dev/null
+++ b/common/messages/hu/common/city.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Are you sure you want to delete this item?' => '',
+    'Cities' => '',
+    'City Code' => '',
+    'Create' => '',
+    'Create City' => '',
+    'Cso Code' => '',
+    'Delete' => '',
+    'Homes' => '',
+    'Id City' => '',
+    'Latitude' => '',
+    'Longitude' => '',
+    'Name' => '',
+    'Population' => '',
+    'Range' => '',
+    'Reset' => '',
+    'Rig ID' => '',
+    'Search' => '',
+    'Update' => '',
+    'Update {modelClass}: ' => '',
+    'Zip' => '',
+];
diff --git a/common/messages/hu/common/customer.php b/common/messages/hu/common/customer.php
new file mode 100644
index 0000000..de72864
--- /dev/null
+++ b/common/messages/hu/common/customer.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Bérlet kártya nem üres vagy hibás kártyaszám' => '',
+    'Man' => 'Férfi',
+    'Password' => '',
+    'Unknown sex' => 'Nincs megadva',
+    'Woman' => 'Nő',
+    'Address' => 'Cím',
+    'Birthdate' => 'Születésnap',
+    'Card number' => 'Kártyaszám',
+    'City' => 'Város',
+    'Country' => 'Ország',
+    'Create' => 'Mentés',
+    'Create Customer' => 'Új vendég',
+    'Created At' => 'Létrehozás ideje',
+    'Customers' => 'Vendégek',
+    'Date Stundent Card Expire' => 'Diákigazolvány lejárati dátum',
+    'Description' => 'Megjegyzés',
+    'Email' => 'Email',
+    'Id Customer' => 'Azonosító',
+    'Id Customer Card' => 'Bérletkártya azonosító',
+    'Id Partner Card' => 'Partnerkártya azonosító',
+    'Id Proposer' => 'Ajánló',
+    'Id User' => 'Admin',
+    'Image' => 'Kép',
+    'Name' => 'Név',
+    'Phone' => 'Telefon',
+    'Search' => 'Keresés',
+    'Sex' => 'Nem',
+    'Tax Number' => 'Adószám',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+    'Updated At' => 'Módosítás ideje',
+    'Zip' => 'Irsz.',
+];
diff --git a/common/models/Customer.php b/common/models/Customer.php
index 5ff5653..70522e9 100644
--- a/common/models/Customer.php
+++ b/common/models/Customer.php
@@ -115,9 +115,9 @@ class Customer extends \yii\db\ActiveRecord
     
     static function sexes() {
     	return [
-    			self::SEX_UNKNOWN => Yii::t('common/sex', 'Nincs megadva'),
-    			self::SEX_MAN => Yii::t('common/sex', 'Férfi'),
-    			self::SEX_WOMAN => Yii::t('common/sex', 'Nő'),
+    			self::SEX_UNKNOWN => Yii::t('common/customer', 'Unknown sex'),
+    			self::SEX_MAN => Yii::t('common/customer', 'Man'),
+    			self::SEX_WOMAN => Yii::t('common/customer', 'Woman'),
     	];
     }
     

From 2bcaee18de27d33add64b357e6d591dd786c6015 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 28 Sep 2015 09:38:35 +0200
Subject: [PATCH 024/100] add frontend basics

---
 frontend/components/FrontendMenuStructure.php |  71 ++++++++++
 frontend/controllers/CustomerController.php   | 130 ++++++++++++++++++
 frontend/models/CustomerSearch.php            |  85 ++++++++++++
 frontend/views/customer/_form.php             |  61 ++++++++
 frontend/views/customer/_search.php           |  67 +++++++++
 frontend/views/customer/create.php            |  21 +++
 frontend/views/customer/index.php             |  54 ++++++++
 frontend/views/customer/main.php              |   7 +
 frontend/views/customer/update.php            |  23 ++++
 frontend/views/customer/view.php              |  55 ++++++++
 frontend/views/layouts/main.php               |   6 +
 11 files changed, 580 insertions(+)
 create mode 100644 frontend/components/FrontendMenuStructure.php
 create mode 100644 frontend/controllers/CustomerController.php
 create mode 100644 frontend/models/CustomerSearch.php
 create mode 100644 frontend/views/customer/_form.php
 create mode 100644 frontend/views/customer/_search.php
 create mode 100644 frontend/views/customer/create.php
 create mode 100644 frontend/views/customer/index.php
 create mode 100644 frontend/views/customer/main.php
 create mode 100644 frontend/views/customer/update.php
 create mode 100644 frontend/views/customer/view.php

diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
new file mode 100644
index 0000000..e4bef95
--- /dev/null
+++ b/frontend/components/FrontendMenuStructure.php
@@ -0,0 +1,71 @@
+<?php
+namespace frontend\components;
+
+use Yii;
+use common\models\Order;
+use yii\helpers\Html;
+
+class FrontendMenuStructure{
+	
+	public $menuItems;
+	
+	public function FrontendMenuStructure(){
+		$this->menuItems = [];
+	}
+	
+	protected function can($authItem){
+		$result = false;
+		if (\Yii::$app->user->can($authItem)) {
+			$result = true;
+		}
+		return $result;
+	}
+	
+	
+	
+	
+	
+	protected function addUserMainMenu(){
+		
+		$userMainMenu = null;
+		$items = [];
+		
+		
+		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/main'] ];
+		
+		if ( count($items) > 0 ){
+			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
+				'items' =>  $items
+			];
+		}
+		
+		if ( isset($userMainMenu)){
+			$this->menuItems[]  = $userMainMenu;
+		}
+		
+		
+	}
+	
+	
+	protected function addLoginMainMenu(){
+		if (Yii::$app->user->isGuest) {
+			$mainMenuItem= ['label' => 'Login', 'url' => ['/site/login']];
+		} else {
+			$mainMenuItem= [
+					'label' => 'Kijelentkezés (' . Yii::$app->user->identity->username . ')',
+					'url' => ['/site/logout'],
+					'linkOptions' => ['data-method' => 'post']
+			];
+		}
+		$this->menuItems[] = $mainMenuItem;
+	}
+	
+	
+	public function run(){
+		$this->addUserMainMenu();
+		$this->addLoginMainMenu();
+		return $this->menuItems;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
new file mode 100644
index 0000000..8f156ee
--- /dev/null
+++ b/frontend/controllers/CustomerController.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Customer;
+use frontend\models\CustomerSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * CustomerController implements the CRUD actions for Customer model.
+ */
+class CustomerController extends Controller
+{
+	
+	
+	
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+	public function actionMain(){
+		
+		
+		return $this->render('main',[]);
+	}
+
+	/**
+     * Lists all Customer models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CustomerSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Customer model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Customer model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Customer();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_customer]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Customer model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_customer]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Customer model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Customer model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Customer the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Customer::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/CustomerSearch.php b/frontend/models/CustomerSearch.php
new file mode 100644
index 0000000..c347df1
--- /dev/null
+++ b/frontend/models/CustomerSearch.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Customer;
+
+/**
+ * CustomerSearch represents the model behind the search form about `common\models\Customer`.
+ */
+class CustomerSearch extends Customer
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_customer', 'id_customer_card', 'id_user', 'id_partner_card', 'id_proposer', 'sex'], 'integer'],
+            [['name', 'email', 'password', 'phone', 'date_stundent_card_expire', 'birthdate', 'image', 'description', 'tax_number', 'country', 'zip', 'city', 'address', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Customer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_customer' => $this->id_customer,
+            'id_customer_card' => $this->id_customer_card,
+            'id_user' => $this->id_user,
+            'id_partner_card' => $this->id_partner_card,
+            'id_proposer' => $this->id_proposer,
+            'sex' => $this->sex,
+            'date_stundent_card_expire' => $this->date_stundent_card_expire,
+            'birthdate' => $this->birthdate,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'email', $this->email])
+            ->andFilterWhere(['like', 'password', $this->password])
+            ->andFilterWhere(['like', 'phone', $this->phone])
+            ->andFilterWhere(['like', 'image', $this->image])
+            ->andFilterWhere(['like', 'description', $this->description])
+            ->andFilterWhere(['like', 'tax_number', $this->tax_number])
+            ->andFilterWhere(['like', 'country', $this->country])
+            ->andFilterWhere(['like', 'zip', $this->zip])
+            ->andFilterWhere(['like', 'city', $this->city])
+            ->andFilterWhere(['like', 'address', $this->address]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/customer/_form.php b/frontend/views/customer/_form.php
new file mode 100644
index 0000000..0545dd4
--- /dev/null
+++ b/frontend/views/customer/_form.php
@@ -0,0 +1,61 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_customer_card')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'id_partner_card')->textInput() ?>
+
+    <?= $form->field($model, 'id_proposer')->textInput() ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'password')->passwordInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'sex')->textInput() ?>
+
+    <?= $form->field($model, 'date_stundent_card_expire')->textInput() ?>
+
+    <?= $form->field($model, 'birthdate')->textInput() ?>
+
+    <?= $form->field($model, 'image')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'description')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'zip')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'city')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/customer', 'Create') : Yii::t('frontend/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/customer/_search.php b/frontend/views/customer/_search.php
new file mode 100644
index 0000000..d2166dd
--- /dev/null
+++ b/frontend/views/customer/_search.php
@@ -0,0 +1,67 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\CustomerSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_customer') ?>
+
+    <?= $form->field($model, 'id_customer_card') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'id_partner_card') ?>
+
+    <?= $form->field($model, 'id_proposer') ?>
+
+    <?php // echo $form->field($model, 'name') ?>
+
+    <?php // echo $form->field($model, 'email') ?>
+
+    <?php // echo $form->field($model, 'password') ?>
+
+    <?php // echo $form->field($model, 'phone') ?>
+
+    <?php // echo $form->field($model, 'sex') ?>
+
+    <?php // echo $form->field($model, 'date_stundent_card_expire') ?>
+
+    <?php // echo $form->field($model, 'birthdate') ?>
+
+    <?php // echo $form->field($model, 'image') ?>
+
+    <?php // echo $form->field($model, 'description') ?>
+
+    <?php // echo $form->field($model, 'tax_number') ?>
+
+    <?php // echo $form->field($model, 'country') ?>
+
+    <?php // echo $form->field($model, 'zip') ?>
+
+    <?php // echo $form->field($model, 'city') ?>
+
+    <?php // echo $form->field($model, 'address') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/customer', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/customer', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/customer/create.php b/frontend/views/customer/create.php
new file mode 100644
index 0000000..a9e04e8
--- /dev/null
+++ b/frontend/views/customer/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = Yii::t('frontend/customer', 'Create Customer');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/customer/index.php b/frontend/views/customer/index.php
new file mode 100644
index 0000000..b226612
--- /dev/null
+++ b/frontend/views/customer/index.php
@@ -0,0 +1,54 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\CustomerSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/customer', 'Customers');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/customer', 'Create Customer'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_customer',
+            'id_customer_card',
+            'id_user',
+            'id_partner_card',
+            'id_proposer',
+            // 'name',
+            // 'email:email',
+            // 'password',
+            // 'phone',
+            // 'sex',
+            // 'date_stundent_card_expire',
+            // 'birthdate',
+            // 'image',
+            // 'description',
+            // 'tax_number',
+            // 'country',
+            // 'zip',
+            // 'city',
+            // 'address',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/customer/main.php b/frontend/views/customer/main.php
new file mode 100644
index 0000000..2516bcc
--- /dev/null
+++ b/frontend/views/customer/main.php
@@ -0,0 +1,7 @@
+
+<?php 
+
+
+?>
+
+<h1>Recepció</h1>
\ No newline at end of file
diff --git a/frontend/views/customer/update.php b/frontend/views/customer/update.php
new file mode 100644
index 0000000..6e88c4c
--- /dev/null
+++ b/frontend/views/customer/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = Yii::t('frontend/customer', 'Update {modelClass}: ', [
+    'modelClass' => 'Customer',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_customer]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/customer', 'Update');
+?>
+<div class="customer-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/customer/view.php b/frontend/views/customer/view.php
new file mode 100644
index 0000000..e9765a0
--- /dev/null
+++ b/frontend/views/customer/view.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="customer-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/customer', 'Update'), ['update', 'id' => $model->id_customer], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/customer', 'Delete'), ['delete', 'id' => $model->id_customer], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/customer', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_customer',
+            'id_customer_card',
+            'id_user',
+            'id_partner_card',
+            'id_proposer',
+            'name',
+            'email:email',
+            'password',
+            'phone',
+            'sex',
+            'date_stundent_card_expire',
+            'birthdate',
+            'image',
+            'description',
+            'tax_number',
+            'country',
+            'zip',
+            'city',
+            'address',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 3258889..7ca8b3d 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -9,6 +9,8 @@ use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 use frontend\assets\AppAsset;
 use common\widgets\Alert;
+use common\components\FrotnendMenuStructure;
+use frontend\components\FrontendMenuStructure;
 
 AppAsset::register($this);
 ?>
@@ -27,6 +29,10 @@ AppAsset::register($this);
 
 <div class="wrap">
     <?php
+    
+    $menuStruct = new FrontendMenuStructure();
+    $items = $menuStruct->run();
+    
     NavBar::begin([
         'brandLabel' => 'My Company',
         'brandUrl' => Yii::$app->homeUrl,

From cee219ed14729c6de8b9387840bf46dc851daa02 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 29 Sep 2015 09:02:53 +0200
Subject: [PATCH 025/100] add reception changes

---
 frontend/components/FrontendMenuStructure.php | 19 +-----
 frontend/controllers/CustomerController.php   | 15 ++++-
 frontend/models/ReceptionForm.php             | 36 ++++++++++
 frontend/views/customer/_form_reception.php   | 66 +++++++++++++++++++
 frontend/views/customer/main.php              |  7 --
 frontend/views/customer/reception.php         | 11 ++++
 frontend/views/layouts/main.php               |  2 +-
 7 files changed, 128 insertions(+), 28 deletions(-)
 create mode 100644 frontend/models/ReceptionForm.php
 create mode 100644 frontend/views/customer/_form_reception.php
 delete mode 100644 frontend/views/customer/main.php
 create mode 100644 frontend/views/customer/reception.php

diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index e4bef95..058b36e 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -26,24 +26,7 @@ class FrontendMenuStructure{
 	
 	
 	protected function addUserMainMenu(){
-		
-		$userMainMenu = null;
-		$items = [];
-		
-		
-		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/main'] ];
-		
-		if ( count($items) > 0 ){
-			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
-				'items' =>  $items
-			];
-		}
-		
-		if ( isset($userMainMenu)){
-			$this->menuItems[]  = $userMainMenu;
-		}
-		
-		
+		$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
 	}
 	
 	
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index 8f156ee..e013318 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -4,10 +4,12 @@ namespace frontend\controllers;
 
 use Yii;
 use common\models\Customer;
+use frontend\models\ReceptionForm;
 use frontend\models\CustomerSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use yii\base\Object;
 
 /**
  * CustomerController implements the CRUD actions for Customer model.
@@ -29,12 +31,21 @@ class CustomerController extends Controller
         ];
     }
 
-	public function actionMain(){
+	public function actionReception(){
+		
+		$model = new ReceptionForm();
+		
+		if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+			
+// 			return $this->redirect(['view', 'id' => $model->id_customer]);
+		}
 		
 		
-		return $this->render('main',[]);
+		return $this->render('reception',['model' => $model]);
 	}
 
+	
+	
 	/**
      * Lists all Customer models.
      * @return mixed
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
new file mode 100644
index 0000000..47b14f9
--- /dev/null
+++ b/frontend/models/ReceptionForm.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+
+/**
+ * ContactForm is the model behind the contact form.
+ */
+class ReceptionForm extends Model
+{
+    public $number;
+    
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['number'], 'required'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'verifyCode' => 'Verification Code',
+        ];
+    }
+
+}
diff --git a/frontend/views/customer/_form_reception.php b/frontend/views/customer/_form_reception.php
new file mode 100644
index 0000000..524904b
--- /dev/null
+++ b/frontend/views/customer/_form_reception.php
@@ -0,0 +1,66 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<style >
+	.reception-form .btn.btn-reception{
+		width:100%;
+		margin-top: 6px;
+		margin-bottom: 6px;
+	}
+
+</style>
+
+<div class="reception-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+	
+	<div class="row">
+		<div class='col-md-3'>
+		    <div class='row'>
+				<div class='col-md-8'>
+					<?php echo Html::a(Yii::t( 'frontend/customer', 'Adatlap') , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+				<div class='col-md-4'>
+					<?php echo           Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-8'>
+					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Befizetések') ,null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+				<div class='col-md-4'>
+					<?php echo           Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Egyenleg') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		</div>    
+		<div class='col-md-2'>
+			<?php echo $form->field($model, 'number')->textInput()?>
+		</div>
+	</div>    
+
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/customer/main.php b/frontend/views/customer/main.php
deleted file mode 100644
index 2516bcc..0000000
--- a/frontend/views/customer/main.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<?php 
-
-
-?>
-
-<h1>Recepció</h1>
\ No newline at end of file
diff --git a/frontend/views/customer/reception.php b/frontend/views/customer/reception.php
new file mode 100644
index 0000000..972305a
--- /dev/null
+++ b/frontend/views/customer/reception.php
@@ -0,0 +1,11 @@
+
+<?php 
+
+
+?>
+
+<h1>Recepció</h1>
+<?php 
+
+?>
+<?php   echo $this->render('_form_reception', [ 'model' => $model ]); ?>
\ No newline at end of file
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 7ca8b3d..ba9afeb 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -57,7 +57,7 @@ AppAsset::register($this);
     }
     echo Nav::widget([
         'options' => ['class' => 'navbar-nav navbar-right'],
-        'items' => $menuItems,
+        'items' => $items,
     ]);
     NavBar::end();
     ?>

From 2b57f95b1e10a28247b5b3a1afd2f92f46639a7c Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 29 Sep 2015 17:27:31 +0200
Subject: [PATCH 026/100] add reception changes

---
 composer.lock                               | 30 ++++++-------
 frontend/controllers/CustomerController.php |  7 ++-
 frontend/models/ReceptionForm.php           | 14 +++++-
 frontend/views/customer/_form_reception.php | 49 +++++++++++++++++----
 4 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/composer.lock b/composer.lock
index 162ede7..c44bc26 100644
--- a/composer.lock
+++ b/composer.lock
@@ -318,16 +318,16 @@
         },
         {
             "name": "kartik-v/bootstrap-fileinput",
-            "version": "v4.2.6",
+            "version": "v4.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-fileinput.git",
-                "reference": "e4906dd5ee852a5333d3ce4d19f69ee855efe844"
+                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/e4906dd5ee852a5333d3ce4d19f69ee855efe844",
-                "reference": "e4906dd5ee852a5333d3ce4d19f69ee855efe844",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-fileinput/zipball/0468bbba9c28c1250aca83eba9b33e32ec135f78",
+                "reference": "0468bbba9c28c1250aca83eba9b33e32ec135f78",
                 "shasum": ""
             },
             "type": "library",
@@ -362,20 +362,20 @@
                 "progress",
                 "upload"
             ],
-            "time": "2015-08-26 18:42:44"
+            "time": "2015-09-13 17:39:44"
         },
         {
             "name": "kartik-v/bootstrap-star-rating",
-            "version": "v3.5.3",
+            "version": "v3.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/bootstrap-star-rating.git",
-                "reference": "bd9c52db6ac71cb270620c1aee601d142ab2cc00"
+                "reference": "987777ee21a599bebbc545c743063fcee9833842"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/bd9c52db6ac71cb270620c1aee601d142ab2cc00",
-                "reference": "bd9c52db6ac71cb270620c1aee601d142ab2cc00",
+                "url": "https://api.github.com/repos/kartik-v/bootstrap-star-rating/zipball/987777ee21a599bebbc545c743063fcee9833842",
+                "reference": "987777ee21a599bebbc545c743063fcee9833842",
                 "shasum": ""
             },
             "type": "library",
@@ -403,7 +403,7 @@
                 "jquery",
                 "star"
             ],
-            "time": "2015-06-18 14:42:46"
+            "time": "2015-09-21 09:06:33"
         },
         {
             "name": "kartik-v/dependent-dropdown",
@@ -1036,16 +1036,16 @@
         },
         {
             "name": "kartik-v/yii2-widget-select2",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-select2.git",
-                "reference": "585e8797d7982e0c9d09370b98b451a028a59439"
+                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/585e8797d7982e0c9d09370b98b451a028a59439",
-                "reference": "585e8797d7982e0c9d09370b98b451a028a59439",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/e72880e7e8dfc845c112ed7df275bf1c929be6db",
+                "reference": "e72880e7e8dfc845c112ed7df275bf1c929be6db",
                 "shasum": ""
             },
             "require": {
@@ -1080,7 +1080,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2015-07-01 15:20:59"
+            "time": "2015-09-12 19:56:48"
         },
         {
             "name": "kartik-v/yii2-widget-sidenav",
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index e013318..232314a 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -10,6 +10,7 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\base\Object;
+use common\models\Card;
 
 /**
  * CustomerController implements the CRUD actions for Customer model.
@@ -32,12 +33,10 @@ class CustomerController extends Controller
     }
 
 	public function actionReception(){
-		
 		$model = new ReceptionForm();
 		
-		if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-			
-// 			return $this->redirect(['view', 'id' => $model->id_customer]);
+		if ($model->load(Yii::$app->request->get()) && $model->validate()) {
+			$model->readCard();
 		}
 		
 		
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
index 47b14f9..d8f224c 100644
--- a/frontend/models/ReceptionForm.php
+++ b/frontend/models/ReceptionForm.php
@@ -4,6 +4,8 @@ namespace frontend\models;
 
 use Yii;
 use yii\base\Model;
+use common\models\Card;
+use common\models\Customer;
 
 /**
  * ContactForm is the model behind the contact form.
@@ -11,8 +13,10 @@ use yii\base\Model;
 class ReceptionForm extends Model
 {
     public $number;
+	public $card;
+	public $customer;
+    
     
-
     /**
      * @inheritdoc
      */
@@ -23,6 +27,7 @@ class ReceptionForm extends Model
         ];
     }
 
+    
     /**
      * @inheritdoc
      */
@@ -32,5 +37,12 @@ class ReceptionForm extends Model
             'verifyCode' => 'Verification Code',
         ];
     }
+    
+    public function readCard(){
+    	$this->card = Card::findOne(['number' => $this->number]);
+    	if ( $this->card != null ){
+    		$this->customer = $this->card->customer;
+    	}
+    }
 
 }
diff --git a/frontend/views/customer/_form_reception.php b/frontend/views/customer/_form_reception.php
index 524904b..d4f01d7 100644
--- a/frontend/views/customer/_form_reception.php
+++ b/frontend/views/customer/_form_reception.php
@@ -17,46 +17,77 @@ use yii\widgets\ActiveForm;
 
 </style>
 
+<?php 
+$card = $model->card;
+$customer = $model->customer;
+$customername = "";
+if ( $customer != null ){
+	$customername = $customer->name; 
+}
+
+
+function mkCustomerBtn($card, $label,$url = null ){
+
+	$classes =  'btn btn-primary btn-reception';
+	if ( $card == null ){
+		$classes .= ' disabled';
+	}
+	
+	return  Html::a(  $label   , null,  ['class' =>   $classes ] );
+}
+
+?>
+
 <div class="reception-form">
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+		'enableAjaxValidation' => false,
+    	'method' => 'get'
+    ]); ?>
 	
 	<div class="row">
 		<div class='col-md-3'>
 		    <div class='row'>
 				<div class='col-md-8'>
-					<?php echo Html::a(Yii::t( 'frontend/customer', 'Adatlap') , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap')  );  ?>
 				</div>
 				<div class='col-md-4'>
-					<?php echo           Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
 				</div>
 			</div>
 		    <div class='row'>
 				<div class='col-md-8'>
-					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Befizetések') ,null,['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  );  ?>
 				</div>
 				<div class='col-md-4'>
-					<?php echo           Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
 				</div>
 			</div>
 		    <div class='row'>
 				<div class='col-md-12'>
-					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
 				</div>
 			</div>
 		    <div class='row'>
 				<div class='col-md-12'>
-					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Egyenleg') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Egyenleg')  );  ?>
 				</div>
 			</div>
 		    <div class='row'>
 				<div class='col-md-12'>
-					<?php echo  Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+					<?php echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
 				</div>
 			</div>
 		</div>    
 		<div class='col-md-2'>
-			<?php echo $form->field($model, 'number')->textInput()?>
+			<div  class="row" >
+				<div class='col-md-12'>
+					<?php echo $form->field($model, 'number')->textInput()?>
+				</div>
+				<div class='col-md-12'>
+					<?php echo $customername; ?>
+				</div>
+			</div>
 		</div>
 	</div>    
 

From 640d04cb76cc182be158f1ab1d29914e1f169b09 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 30 Sep 2015 11:25:32 +0200
Subject: [PATCH 027/100] add reception customer update changes

---
 common/components/CityZipTypeahead.php        |   2 +-
 .../components/ReceptionCardNumberWidget.php  |  22 +++
 frontend/components/ReceptionMenuWidget.php   |  22 +++
 frontend/controllers/CityController.php       | 172 ++++++++++++++++++
 frontend/controllers/CustomerController.php   |  30 ++-
 frontend/controllers/ProductController.php    | 121 ++++++++++++
 frontend/models/CustomerCreate.php            | 117 ++++++++++++
 frontend/models/CustomerUpdate.php            |  97 ++++++++++
 frontend/models/ProductSearch.php             |  78 ++++++++
 frontend/views/common/_form_card_number.php   |  42 +++++
 frontend/views/common/_menu_reception.php     |  76 ++++++++
 frontend/views/customer/_form_update.php      | 146 +++++++++++++++
 frontend/views/customer/reception.php         |  17 +-
 frontend/views/customer/update.php            |  25 ++-
 frontend/views/product/_form.php              |  41 +++++
 frontend/views/product/_search.php            |  53 ++++++
 frontend/views/product/create.php             |  21 +++
 frontend/views/product/index.php              |  47 +++++
 frontend/views/product/update.php             |  23 +++
 frontend/views/product/view.php               |  48 +++++
 20 files changed, 1185 insertions(+), 15 deletions(-)
 create mode 100644 frontend/components/ReceptionCardNumberWidget.php
 create mode 100644 frontend/components/ReceptionMenuWidget.php
 create mode 100644 frontend/controllers/CityController.php
 create mode 100644 frontend/controllers/ProductController.php
 create mode 100644 frontend/models/CustomerCreate.php
 create mode 100644 frontend/models/CustomerUpdate.php
 create mode 100644 frontend/models/ProductSearch.php
 create mode 100644 frontend/views/common/_form_card_number.php
 create mode 100644 frontend/views/common/_menu_reception.php
 create mode 100644 frontend/views/customer/_form_update.php
 create mode 100644 frontend/views/product/_form.php
 create mode 100644 frontend/views/product/_search.php
 create mode 100644 frontend/views/product/create.php
 create mode 100644 frontend/views/product/index.php
 create mode 100644 frontend/views/product/update.php
 create mode 100644 frontend/views/product/view.php

diff --git a/common/components/CityZipTypeahead.php b/common/components/CityZipTypeahead.php
index 24397d7..54c5ac8 100644
--- a/common/components/CityZipTypeahead.php
+++ b/common/components/CityZipTypeahead.php
@@ -40,7 +40,7 @@ class CityZipTypeahead extends Typeahead{
     						'limit' => 10,
     						'display' => $this->display,
     						'templates' => [
-	    						'notFound' => '<div class="text-danger" style="padding:0 8px">Unable to find repositories for selected query.</div>',
+	    						'notFound' => '<div class="text-danger" style="padding:0 8px">Nincs találat</div>',
 	    						'suggestion' => new JsExpression("Handlebars.compile('{$this->item_template}')")
     						]
     			]
diff --git a/frontend/components/ReceptionCardNumberWidget.php b/frontend/components/ReceptionCardNumberWidget.php
new file mode 100644
index 0000000..983b6c1
--- /dev/null
+++ b/frontend/components/ReceptionCardNumberWidget.php
@@ -0,0 +1,22 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class ReceptionCardNumberWidget extends Widget{
+	
+	public $number;
+	public $route;
+	
+	public $customer;
+	public $card;
+	
+	public $viewFile = '//common/_form_card_number';
+	
+	
+	public function run(){
+		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer , 'route' => $this->route ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/components/ReceptionMenuWidget.php b/frontend/components/ReceptionMenuWidget.php
new file mode 100644
index 0000000..a1cd23d
--- /dev/null
+++ b/frontend/components/ReceptionMenuWidget.php
@@ -0,0 +1,22 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class ReceptionMenuWidget extends Widget{
+	
+	public $number;
+	public $route;
+	
+	public $customer;
+	public $card;
+	
+	public $viewFile = '//common/_menu_reception';
+	
+	
+	public function run(){
+		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/controllers/CityController.php b/frontend/controllers/CityController.php
new file mode 100644
index 0000000..fa258a7
--- /dev/null
+++ b/frontend/controllers/CityController.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\City;
+use backend\models\CitySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use yii\db\Query;
+use yii\helpers\Json;
+
+/**
+ * CityController implements the CRUD actions for City model.
+ */
+class CityController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all City models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CitySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single City model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new City model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+    public function actionCreate()
+    {
+        $model = new City();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_city]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+     */
+
+    /**
+     * Updates an existing City model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_city]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+     */
+
+    /**
+     * Deletes an existing City model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+     */
+
+    /**
+     * Finds the City model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return City the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = City::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+    
+    
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionNameList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'name',
+    			'min(zip) as zip',
+    			'concat( zip, \' \', name) as fullname'
+    	] )->from (City::tableName() )->where ( ' lower(name) LIKE "%' . strtolower ( $search ) . '%"' )->orderBy ( 'name' )->groupBy('name')->limit(20);
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'name' => $d ['name'],
+    				'zip' => $d ['zip'],
+    				'fullname' => $d ['fullname'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionZipList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'name',
+    			'min(zip) as zip',
+    			'concat( zip, \' \', name) as fullname'
+    	] )->from (City::tableName() )->where ( ' lower(zip) LIKE "' . strtolower ( $search ) . '%"' )->orderBy ( 'name' )->groupBy('name')->limit(20);
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'name' => $d ['name'],
+    				'zip' => $d ['zip'],
+    				'fullname' => $d ['fullname'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+}
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index 232314a..98e4d19 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -11,6 +11,7 @@ use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\base\Object;
 use common\models\Card;
+use frontend\models\CustomerUpdate;
 
 /**
  * CustomerController implements the CRUD actions for Customer model.
@@ -32,12 +33,12 @@ class CustomerController extends Controller
         ];
     }
 
-	public function actionReception(){
+	public function actionReception($number = ""){
 		$model = new ReceptionForm();
 		
-		if ($model->load(Yii::$app->request->get()) && $model->validate()) {
-			$model->readCard();
-		}
+		$model->number = $number;
+		
+		$model->readCard();
 		
 		
 		return $this->render('reception',['model' => $model]);
@@ -90,24 +91,37 @@ class CustomerController extends Controller
         }
     }
 
-    /**
+/**
      * Updates an existing Customer model.
      * If update is successful, the browser will be redirected to the 'view' page.
      * @param integer $id
      * @return mixed
      */
-    public function actionUpdate($id)
+    public function actionUpdate($number = null)
     {
-        $model = $this->findModel($id);
+    	$card = null;
+    	$model = null;
+    	if ( $number != null ){
+	    	$card = Card::readCard($number);
+    		if ( $card != null ){
+		    	$model = CustomerUpdate::find()->innerJoin(Card::tableName(), "customer.id_customer_card = card.id_card")->one();
+    		}
+    	}
+    	
+   	   if ( $model == null) {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+        
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_customer]);
+            return $this->redirect(['update', 'number' => $card->number]);
         } else {
             return $this->render('update', [
                 'model' => $model,
             ]);
         }
     }
+    
 
     /**
      * Deletes an existing Customer model.
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
new file mode 100644
index 0000000..8fd758c
--- /dev/null
+++ b/frontend/controllers/ProductController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Product;
+use frontend\models\ProductSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * ProductController implements the CRUD actions for Product model.
+ */
+class ProductController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Product models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new ProductSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Product model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Product model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Product();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Product model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Product model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Product model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Product the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Product::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/CustomerCreate.php b/frontend/models/CustomerCreate.php
new file mode 100644
index 0000000..41f47eb
--- /dev/null
+++ b/frontend/models/CustomerCreate.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use common\models\Customer;
+use common\models\Card;
+
+/**
+ * This is the model class for table "customer".
+ *
+ * @property integer $id_customer
+ * @property integer $id_customer_card
+ * @property integer $id_user
+ * @property integer $id_partner_card
+ * @property integer $id_proposer
+ * @property string $name
+ * @property string $email
+ * @property string $password
+ * @property string $phone
+ * @property integer $sex
+ * @property string $date_stundent_card_expire
+ * @property string $birthdate
+ * @property string $image
+ * @property string $description
+ * @property string $tax_number
+ * @property string $country
+ * @property string $zip
+ * @property string $city
+ * @property string $address
+ * @property string $created_at
+ * @property string $updated_at
+ * @property string $cardNumber
+ */
+class CustomerCreate extends \common\models\Customer
+{
+	
+	public $cardNumber;
+	public $partnerCardNumber;
+	
+	public $password_plain;
+	public $password_repeat;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        		[['cardNumber'], 'required' ],
+        		[['cardNumber'], 'string', 'max' => 10],
+        		[['cardNumber'], 'validateCustomerCard' ],
+        		
+        		[['partnerCardNumber'], 'string', 'max' => 10],
+        		[['partnerCardNumber'], 'validatePartnerCard' ],
+        		
+        		[['name'], 'required' ],
+        		[['name'], 'string', 'max' => 128],
+
+        		[['email'], 'string', 'max' => 255],
+        		[['email'], 'email' ],
+        		[['email'], 'unique' ],
+        		
+        		[['password_plain','password_repeat'], 'string', 'max' => 32],
+        		
+        		[['sex'], 'integer'],
+        		
+        		[[ 'birthdate',  ], 'date'     ],
+        		[[ 'date_stundent_card_expire',  ], 'date'     ],
+        		
+        		[[ 'description', 'address'], 'string', 'max' => 255],
+        		
+        		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
+        		
+        		[['zip'], 'string', 'max' => 8],
+        		
+        		[['city'], 'string', 'max' => 30]
+        ];
+    }
+
+    
+    public function validateCustomerCard($a,$p){
+    	$card =  null;
+    	
+    	if ( !empty($this->cardNumber)){
+    	 	$card = Card::readCard($this->cardNumber,true);
+    	}
+    	 
+    	if ( $card == null ){
+    	 	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+    	}else{
+    	 	$this->id_customer_card = $card->id_card;
+    	 }
+    	 
+//     	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+    }
+    
+    public function validatePartnerCard($a,$p){
+    	if ( !empty($this->partnerCardNumber) ){
+	    	$card = Card::readCard($this->partnerCardNumber,true);
+	    	 if ( $card == null ){
+	    	 	$this->addError($a,Yii::t('common/customer', "Bérlet kártya nem üres vagy hibás kártyaszám"));
+	    	 }else{
+	    	 	$this->id_partner_card = $card->id_card;
+	    	 }
+    	}
+    }
+    
+}
diff --git a/frontend/models/CustomerUpdate.php b/frontend/models/CustomerUpdate.php
new file mode 100644
index 0000000..96e1ffc
--- /dev/null
+++ b/frontend/models/CustomerUpdate.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use common\models\Customer;
+
+/**
+ * This is the model class for table "customer".
+ *
+ * @property integer $id_customer
+ * @property integer $id_customer_card
+ * @property integer $id_user
+ * @property integer $id_partner_card
+ * @property integer $id_proposer
+ * @property string $name
+ * @property string $email
+ * @property string $password
+ * @property string $phone
+ * @property integer $sex
+ * @property string $date_stundent_card_expire
+ * @property string $birthdate
+ * @property string $image
+ * @property string $description
+ * @property string $tax_number
+ * @property string $country
+ * @property string $zip
+ * @property string $city
+ * @property string $address
+ * @property string $created_at
+ * @property string $updated_at
+ * @property string $cardNumber
+ */
+class CustomerUpdate extends \common\models\Customer
+{
+	
+	public $cardNumber;
+	public $partnerCardNumber;
+	
+	public $password_plain;
+	public $password_repeat;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+//         		[['cardNumber'], 'required' ],
+//         		[['cardNumber'], 'string', 'max' => 10],
+//         		[['cardNumber'], 'validateCustomerCard' ],
+        		
+        		[['partnerCardNumber'], 'string', 'max' => 10],
+        		[['partnerCardNumber'], 'validatePartnerCard' ],
+        		
+        		[['name'], 'required' ],
+        		[['name'], 'string', 'max' => 128],
+
+        		[['email'], 'string', 'max' => 255],
+        		[['email'], 'email' ],
+        		[['email'], 'unique' ],
+        		
+        		[['password_plain','password_repeat'], 'string', 'max' => 32],
+        		
+        		[['sex'], 'integer'],
+        		
+        		[[ 'birthdate',  ], 'date'     ],
+        		[[ 'date_stundent_card_expire',  ], 'date'     ],
+        		
+        		[[ 'description', 'address'], 'string', 'max' => 255],
+        		
+        		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
+        		
+        		[['zip'], 'string', 'max' => 8],
+        		
+        		[['city'], 'string', 'max' => 30]
+        ];
+    }
+
+    
+    public function validateCustomerCard($a,$p){
+//     	 Customer::find()->andWhere(  [$this->cardNumber )
+    }
+    public function validatePartnerCard($a,$p){
+//     	 Customer::find()->andWhere(  [$this->cardNumber )
+    }
+
+    
+}
diff --git a/frontend/models/ProductSearch.php b/frontend/models/ProductSearch.php
new file mode 100644
index 0000000..33468a8
--- /dev/null
+++ b/frontend/models/ProductSearch.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Product;
+
+/**
+ * ProductSearch represents the model behind the search form about `common\models\Product`.
+ */
+class ProductSearch extends Product
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_product', 'id_product_category', 'id_account', 'purchase_price', 'sale_price', 'profit_margins', 'status', 'stock'], 'integer'],
+            [['product_number', 'barcode', 'description', 'created_at', 'updated_at', 'name'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Product::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_product' => $this->id_product,
+            'id_product_category' => $this->id_product_category,
+            'id_account' => $this->id_account,
+            'purchase_price' => $this->purchase_price,
+            'sale_price' => $this->sale_price,
+            'profit_margins' => $this->profit_margins,
+            'status' => $this->status,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+            'stock' => $this->stock,
+        ]);
+
+        $query->andFilterWhere(['like', 'product_number', $this->product_number])
+            ->andFilterWhere(['like', 'barcode', $this->barcode])
+            ->andFilterWhere(['like', 'description', $this->description])
+            ->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/common/_form_card_number.php b/frontend/views/common/_form_card_number.php
new file mode 100644
index 0000000..02e05e8
--- /dev/null
+++ b/frontend/views/common/_form_card_number.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<?php 
+$customername = "";
+$number = "";
+if ( isset($card)){
+	$number = $card->number;
+}
+if ( isset($customer) ){
+	$customername = $customer->name; 
+}
+
+?>
+	
+	    <?php $form = ActiveForm::begin([
+			'enableAjaxValidation' => false,
+	    	'method' => 'get',
+	    	'action' => $route
+	    ]); ?>
+<div  class="row" >
+	<div class='col-md-12'>
+			<?php echo Html::textInput("number", $number )?>
+	</div>
+	<div class='col-md-12'>
+		<?php echo $customername; ?>
+	</div>
+	<div class='col-md-12'>
+		<?php echo Html::submitButton("search",[ 'class' => 'btn btn-primary']); ?>
+	</div>
+</div>
+	    <?php ActiveForm::end(); ?>
+
+
+
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
new file mode 100644
index 0000000..5c7e3f0
--- /dev/null
+++ b/frontend/views/common/_menu_reception.php
@@ -0,0 +1,76 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $card common\models\Card */
+/* @var $customer common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<style >
+	 .btn.btn-reception{
+		width:100%;
+		margin-top: 6px;
+		margin-bottom: 6px;
+	}
+
+</style>
+
+<?php 
+$customername = "";
+if ( isset($customer ) ){
+	$customername = $customer->name; 
+}
+
+
+function mkCustomerBtn($card, $label,$route = null ){
+
+	$url = null;
+	$classes =  'btn btn-primary btn-reception';
+	if ( $card == null ){
+		$classes .= ' disabled';
+	}
+	if ( isset($route)){
+		$url = [$route, 'number' => $card->number];
+	}
+	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
+}
+
+?>
+	
+		    <div class='row'>
+				<div class='col-md-8'>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
+				</div>
+				<div class='col-md-4'>
+					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-8'>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  );  ?>
+				</div>
+				<div class='col-md-4'>
+					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Egyenleg')  );  ?>
+				</div>
+			</div>
+		    <div class='row'>
+				<div class='col-md-12'>
+					<?php echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
+				</div>
+			</div>
+
+
+
diff --git a/frontend/views/customer/_form_update.php b/frontend/views/customer/_form_update.php
new file mode 100644
index 0000000..b42be88
--- /dev/null
+++ b/frontend/views/customer/_form_update.php
@@ -0,0 +1,146 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Customer;
+use common\components\CityNameTypeahead;
+use common\components\CityZipTypeahead;
+use common\components\CardNumberTypeahead;
+use kartik\widgets\DatePicker;
+use yii\base\Widget;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+	<div class='row'>
+		<div class='col-md-3'>
+		     <?php //echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
+		     <label><?php echo $model->getAttributeLabel('id_customer_card')?></label>
+		     <div>
+		     <?php echo $model->customerCardNumber ?>
+		     </div>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		</div>
+	</div>
+
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+   
+
+	<div class='row'>
+		<div class='col-md-3'>
+		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?php /* echo $form->field($model, 'birthdate',[  ] )->widget(DatePicker::classname(), [
+		    	'value' =>  Yii::$app->formatter->asDate($model->birthdate),
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  */?>
+			<?php 
+				echo DatePicker::widget(
+						[
+						'name' => 'CustomerUpdate[birthdate]',
+						'value' =>  Yii::$app->formatter->asDate($model->birthdate),
+						'pluginOptions' => [
+								'autoclose'=>true,
+								'format' => 'yyyy.mm.dd'
+						]
+						]
+						)
+			?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'date_stundent_card_expire')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-2'>
+		    <?= $form->field($model, 'zip')->widget(CityZipTypeahead::className(),[
+		    		'pluginEvents' =>[
+		    				"typeahead:select" => "function(a,b) {
+		    			$('#customercreate-city').typeahead( 'val', b.name );
+				}",]
+		    ])?>
+		</div>
+		<div class='col-md-4'>
+		    <?php echo $form->field($model, 'city')->widget(CityNameTypeahead::className(),[
+		    	'pluginEvents' =>[	
+		    	"typeahead:select" => "function(a,b) {  
+		    			$('#customercreate-zip').typeahead( 'val', b.zip );
+				}",]
+		    		
+		    ])?>
+		</div>
+	</div>
+
+
+
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/customer', 'Create') : Yii::t('common/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/customer/reception.php b/frontend/views/customer/reception.php
index 972305a..fefac02 100644
--- a/frontend/views/customer/reception.php
+++ b/frontend/views/customer/reception.php
@@ -1,5 +1,8 @@
-
 <?php 
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
+use yii\base\Widget;
+
 
 
 ?>
@@ -8,4 +11,14 @@
 <?php 
 
 ?>
-<?php   echo $this->render('_form_reception', [ 'model' => $model ]); ?>
\ No newline at end of file
+<?php  // echo $this->render('_form_reception', [ 'model' => $model ]); ?>
+<div class='row'>
+	<div class='col-md-3'>
+		<?php echo ReceptionMenuWidget::widget( [ 'customer' => $model->customer, 'card' =>$model->card ] ) ?>
+	</div>
+	<div class='col-md-4'>
+		<?php echo ReceptionCardNumberWidget::widget([ 'customer' => $model->customer, 'card' =>$model->card, 'route' => ['customer/reception'] ] )?>
+	</div>
+	<div class='col-md-4'>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/customer/update.php b/frontend/views/customer/update.php
index 6e88c4c..05727b3 100644
--- a/frontend/views/customer/update.php
+++ b/frontend/views/customer/update.php
@@ -1,22 +1,39 @@
 <?php
 
 use yii\helpers\Html;
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
 
-$this->title = Yii::t('frontend/customer', 'Update {modelClass}: ', [
+$this->title = Yii::t('common/customer', 'Update {modelClass}: ', [
     'modelClass' => 'Customer',
 ]) . ' ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/customer', 'Customers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_customer]];
-$this->params['breadcrumbs'][] = Yii::t('frontend/customer', 'Update');
+$this->params['breadcrumbs'][] = Yii::t('common/customer', 'Update');
+
+$customer = $model;
+$card = $customer->card;
+
 ?>
 <div class="customer-update">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <?= $this->render('_form', [
+	<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+		</div>
+		<div class='col-md-4'>
+		</div>
+	</div>
+
+    <?= $this->render('_form_update', [
         'model' => $model,
     ]) ?>
 
diff --git a/frontend/views/product/_form.php b/frontend/views/product/_form.php
new file mode 100644
index 0000000..c31f0d4
--- /dev/null
+++ b/frontend/views/product/_form.php
@@ -0,0 +1,41 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_product_category')->textInput() ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'product_number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'barcode')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'purchase_price')->textInput() ?>
+
+    <?= $form->field($model, 'sale_price')->textInput() ?>
+
+    <?= $form->field($model, 'profit_margins')->textInput() ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'description')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/product', 'Create') : Yii::t('frontend/product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/product/_search.php b/frontend/views/product/_search.php
new file mode 100644
index 0000000..ccf43ab
--- /dev/null
+++ b/frontend/views/product/_search.php
@@ -0,0 +1,53 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\ProductSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="product-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_product') ?>
+
+    <?= $form->field($model, 'id_product_category') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'product_number') ?>
+
+    <?= $form->field($model, 'barcode') ?>
+
+    <?php // echo $form->field($model, 'purchase_price') ?>
+
+    <?php // echo $form->field($model, 'sale_price') ?>
+
+    <?php // echo $form->field($model, 'profit_margins') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'description') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <?php // echo $form->field($model, 'stock') ?>
+
+    <?php // echo $form->field($model, 'name') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/product', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/product', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/product/create.php b/frontend/views/product/create.php
new file mode 100644
index 0000000..d24804f
--- /dev/null
+++ b/frontend/views/product/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+
+$this->title = Yii::t('frontend/product', 'Create Product');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/product', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/product/index.php b/frontend/views/product/index.php
new file mode 100644
index 0000000..7b36ca2
--- /dev/null
+++ b/frontend/views/product/index.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\ProductSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/product', 'Products');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/product', 'Create Product'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_product',
+            'id_product_category',
+            'id_account',
+            'product_number',
+            'barcode',
+            // 'purchase_price',
+            // 'sale_price',
+            // 'profit_margins',
+            // 'status',
+            // 'description',
+            // 'created_at',
+            // 'updated_at',
+            // 'stock',
+            // 'name',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/product/update.php b/frontend/views/product/update.php
new file mode 100644
index 0000000..e8180f7
--- /dev/null
+++ b/frontend/views/product/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+
+$this->title = Yii::t('frontend/product', 'Update {modelClass}: ', [
+    'modelClass' => 'Product',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/product', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_product]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/product', 'Update');
+?>
+<div class="product-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/product/view.php b/frontend/views/product/view.php
new file mode 100644
index 0000000..67e6889
--- /dev/null
+++ b/frontend/views/product/view.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Product */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/product', 'Products'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="product-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/product', 'Update'), ['update', 'id' => $model->id_product], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/product', 'Delete'), ['delete', 'id' => $model->id_product], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/product', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_product',
+            'id_product_category',
+            'id_account',
+            'product_number',
+            'barcode',
+            'purchase_price',
+            'sale_price',
+            'profit_margins',
+            'status',
+            'description',
+            'created_at',
+            'updated_at',
+            'stock',
+            'name',
+        ],
+    ]) ?>
+
+</div>

From 7128cd438dff44390f1c321dbf4eaf52f552339a Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 30 Sep 2015 15:24:16 +0200
Subject: [PATCH 028/100] add reception changes

---
 frontend/controllers/CardController.php     |  86 +++++++++++++
 frontend/controllers/CustomerController.php |  28 ++++-
 frontend/models/CustomerUpdate.php          |   2 +-
 frontend/views/common/_menu_reception.php   |  70 ++++++-----
 frontend/views/customer/_form_create.php    | 128 ++++++++++++++++++++
 frontend/views/customer/_form_reception.php |  97 ---------------
 frontend/views/customer/_form_update.php    |  21 +---
 frontend/views/customer/create.php          |  24 +++-
 frontend/views/customer/update.php          |   6 +-
 frontend/views/layouts/main.php             |   8 ++
 frontend/views/product/index.php            |   2 -
 11 files changed, 311 insertions(+), 161 deletions(-)
 create mode 100644 frontend/controllers/CardController.php
 create mode 100644 frontend/views/customer/_form_create.php
 delete mode 100644 frontend/views/customer/_form_reception.php

diff --git a/frontend/controllers/CardController.php b/frontend/controllers/CardController.php
new file mode 100644
index 0000000..b1ce3bf
--- /dev/null
+++ b/frontend/controllers/CardController.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Card;
+use backend\models\CardSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use yii\db\Query;
+use common\models\Customer;
+use yii\helpers\Json;
+
+/**
+ * CardController implements the CRUD actions for Card model.
+ */
+class CardController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+
+
+
+
+
+    /**
+     * Finds the Card model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Card the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Card::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+    
+    
+    /**
+     * Your controller action to fetch the list
+     */
+    public function actionList($search = null) {
+    	$query = new Query();
+    
+    	$query->select ( [
+    			'card.number as number',
+    			'customer.name as name',
+    			"concat( card.number , case when  customer.name is null then  '' else customer.name end  ) as txt ",
+    	] )->from (Card::tableName() )->join("left join", Customer::tableName(), 'card.id_card = customer.id_customer_card')->where ( ' lower(number) LIKE "%' . strtolower ( $search ) . '%"' )->orderBy ( 'number' ) ;
+    
+    	if ( isset($_GET['onlyFree'])  && $_GET['onlyFree'] == '1'){
+    		$query->andWhere( 'customer.id_customer is null' );
+    	}
+    	
+    	$command = $query->createCommand ();
+    	$data = $command->queryAll ();
+    	$out = [ ];
+    	foreach ( $data as $d ) {
+    		$out [] = [
+    				'number' => $d ['number'],
+    				'name' => $d ['name'],
+    				'txt' => $d ['txt'],
+    		];
+    	}
+    	echo Json::encode ( $out );
+    }
+    
+    
+    
+}
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index 98e4d19..b28c568 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -12,6 +12,7 @@ use yii\filters\VerbFilter;
 use yii\base\Object;
 use common\models\Card;
 use frontend\models\CustomerUpdate;
+use frontend\models\CustomerCreate;
 
 /**
  * CustomerController implements the CRUD actions for Customer model.
@@ -78,12 +79,21 @@ class CustomerController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionCreate()
+    public function actionCreate($number = null)
     {
-        $model = new Customer();
+    	$model = new CustomerCreate();
+        
+        $model->country = "Magyarország";
+        $model->id_user = Yii::$app->user->id;
+        
 
+        if ( isset($number)){
+        	$model->cardNumber = $number;
+        }
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_customer]);
+        	\Yii::$app->session->setFlash( 'success','Vendég létrehozva!' );
+            return $this->redirect(['update', 'number' => $model->cardNumber]);
         } else {
             return $this->render('create', [
                 'model' => $model,
@@ -104,7 +114,7 @@ class CustomerController extends Controller
     	if ( $number != null ){
 	    	$card = Card::readCard($number);
     		if ( $card != null ){
-		    	$model = CustomerUpdate::find()->innerJoin(Card::tableName(), "customer.id_customer_card = card.id_card")->one();
+		    	$model = CustomerUpdate::find()->innerJoin(Card::tableName(), "customer.id_customer_card = card.id_card")->andWhere( [ 'customer.id_customer_card' => $card->id_card   ])->one();
     		}
     	}
     	
@@ -113,9 +123,17 @@ class CustomerController extends Controller
         }
         
 
+        $model->birthdate= isset($model->birthdate ) ? Yii::$app->formatter->asDate($model->birthdate) :'';
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['update', 'number' => $card->number]);
+        	
+        	\Yii::$app->session->setFlash( 'success','Vendég módosításai elmentve' );
+            
+        	return $this->redirect(['update', 'number' => $card->number]);
         } else {
+        	
+        	
+        	
             return $this->render('update', [
                 'model' => $model,
             ]);
diff --git a/frontend/models/CustomerUpdate.php b/frontend/models/CustomerUpdate.php
index 96e1ffc..8f1967f 100644
--- a/frontend/models/CustomerUpdate.php
+++ b/frontend/models/CustomerUpdate.php
@@ -68,7 +68,7 @@ class CustomerUpdate extends \common\models\Customer
         		[['email'], 'email' ],
         		[['email'], 'unique' ],
         		
-        		[['password_plain','password_repeat'], 'string', 'max' => 32],
+//         		[['password_plain','password_repeat'], 'string', 'max' => 32],
         		
         		[['sex'], 'integer'],
         		
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
index 5c7e3f0..52d5a70 100644
--- a/frontend/views/common/_menu_reception.php
+++ b/frontend/views/common/_menu_reception.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $card common\models\Card */
@@ -33,44 +34,47 @@ function mkCustomerBtn($card, $label,$route = null ){
 		$classes .= ' disabled';
 	}
 	if ( isset($route)){
-		$url = [$route, 'number' => $card->number];
+		$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
 	}
 	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
 }
 
-?>
+function mkBtn($card, $label,$route = null ){
+
+	$url = null;
+	$classes =  'btn btn-primary btn-reception';
 	
-		    <div class='row'>
-				<div class='col-md-8'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
-				</div>
-				<div class='col-md-4'>
-					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-8'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  );  ?>
-				</div>
-				<div class='col-md-4'>
-					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Egyenleg')  );  ?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
+	if ( isset($route)){
+		$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
+	}
+	
+	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
+}
+
+
+?>
+    <div class='row'>
+		<div class='col-md-8'>
+			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('customer/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
+		</div>
+	</div>
+    <div class='row'>
+		<div class='col-md-8'>
+			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create'  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
+		</div>
+	</div>
+    <div class='row'>
+		<div class='col-md-12'>
+			<?php //echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') ,  'product/index'  , ['class' =>   'btn btn-primary btn-reception'] )?>
+			<?php echo mkBtn($card, Yii::t( 'frontend/customer', 'Termékeladás'),  'product/index')?>
+		</div>
+	</div>
 
 
 
diff --git a/frontend/views/customer/_form_create.php b/frontend/views/customer/_form_create.php
new file mode 100644
index 0000000..036d453
--- /dev/null
+++ b/frontend/views/customer/_form_create.php
@@ -0,0 +1,128 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\Customer;
+use common\components\CityNameTypeahead;
+use common\components\CityZipTypeahead;
+use common\components\CardNumberTypeahead;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="customer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+	<div class='row'>
+		<div class='col-md-3'>
+		     <?php echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		</div>
+	</div>
+
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'email')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+   
+
+	<div class='row'>
+		<div class='col-md-3'>
+		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'birthdate')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'date_stundent_card_expire')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'description')->textarea(['maxlength' => true]) ?>
+		</div>
+	</div>
+
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'tax_number')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-6'>
+		    <?= $form->field($model, 'country')->textInput(['maxlength' => true]) ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-2'>
+		    <?= $form->field($model, 'zip')->widget(CityZipTypeahead::className(),[
+		    		'pluginEvents' =>[
+		    				"typeahead:select" => "function(a,b) {
+		    			$('#customercreate-city').typeahead( 'val', b.name );
+				}",]
+		    ])?>
+		</div>
+		<div class='col-md-4'>
+		    <?php echo $form->field($model, 'city')->widget(CityNameTypeahead::className(),[
+		    	'pluginEvents' =>[	
+		    	"typeahead:select" => "function(a,b) {  
+		    			$('#customercreate-zip').typeahead( 'val', b.zip );
+				}",]
+		    		
+		    ])?>
+		</div>
+	</div>
+
+
+
+
+    <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/customer', 'Create') : Yii::t('common/customer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/customer/_form_reception.php b/frontend/views/customer/_form_reception.php
deleted file mode 100644
index d4f01d7..0000000
--- a/frontend/views/customer/_form_reception.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model common\models\Customer */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<style >
-	.reception-form .btn.btn-reception{
-		width:100%;
-		margin-top: 6px;
-		margin-bottom: 6px;
-	}
-
-</style>
-
-<?php 
-$card = $model->card;
-$customer = $model->customer;
-$customername = "";
-if ( $customer != null ){
-	$customername = $customer->name; 
-}
-
-
-function mkCustomerBtn($card, $label,$url = null ){
-
-	$classes =  'btn btn-primary btn-reception';
-	if ( $card == null ){
-		$classes .= ' disabled';
-	}
-	
-	return  Html::a(  $label   , null,  ['class' =>   $classes ] );
-}
-
-?>
-
-<div class="reception-form">
-
-    <?php $form = ActiveForm::begin([
-		'enableAjaxValidation' => false,
-    	'method' => 'get'
-    ]); ?>
-	
-	<div class="row">
-		<div class='col-md-3'>
-		    <div class='row'>
-				<div class='col-md-8'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap')  );  ?>
-				</div>
-				<div class='col-md-4'>
-					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-8'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  );  ?>
-				</div>
-				<div class='col-md-4'>
-					<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , null,  ['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo Html::a(Yii::t( 'frontend/customer', 'Jelentkezések') , null,['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Egyenleg')  );  ?>
-				</div>
-			</div>
-		    <div class='row'>
-				<div class='col-md-12'>
-					<?php echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') , null,['class' =>   'btn btn-primary btn-reception'] )?>
-				</div>
-			</div>
-		</div>    
-		<div class='col-md-2'>
-			<div  class="row" >
-				<div class='col-md-12'>
-					<?php echo $form->field($model, 'number')->textInput()?>
-				</div>
-				<div class='col-md-12'>
-					<?php echo $customername; ?>
-				</div>
-			</div>
-		</div>
-	</div>    
-
-
-    <?php ActiveForm::end(); ?>
-
-</div>
diff --git a/frontend/views/customer/_form_update.php b/frontend/views/customer/_form_update.php
index b42be88..0823749 100644
--- a/frontend/views/customer/_form_update.php
+++ b/frontend/views/customer/_form_update.php
@@ -44,31 +44,19 @@ use yii\base\Widget;
 		</div>
 	</div>
 
-   
-
-	<div class='row'>
-		<div class='col-md-3'>
-		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
-		</div>
-		<div class='col-md-3'>
-		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
-		</div>
-	</div>
-
 	<div class='row'>
 		<div class='col-md-3'>
 		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
 		</div>
 		<div class='col-md-3'>
-		    <?php /* echo $form->field($model, 'birthdate',[  ] )->widget(DatePicker::classname(), [
-		    	'value' =>  Yii::$app->formatter->asDate($model->birthdate),
+		    <?php  echo $form->field($model, 'birthdate',[  ] )->widget(DatePicker::classname(), [
     			 'pluginOptions' => [
 				        'autoclose'=>true,
 				        'format' => 'yyyy.mm.dd'
 				    ]
-				])  */?>
+				])  ?>
 			<?php 
-				echo DatePicker::widget(
+				/*echo DatePicker::widget(
 						[
 						'name' => 'CustomerUpdate[birthdate]',
 						'value' =>  Yii::$app->formatter->asDate($model->birthdate),
@@ -77,7 +65,8 @@ use yii\base\Widget;
 								'format' => 'yyyy.mm.dd'
 						]
 						]
-						)
+				);
+				*/
 			?>
 		</div>
 	</div>
diff --git a/frontend/views/customer/create.php b/frontend/views/customer/create.php
index a9e04e8..9bc033f 100644
--- a/frontend/views/customer/create.php
+++ b/frontend/views/customer/create.php
@@ -1,20 +1,38 @@
 <?php
 
 use yii\helpers\Html;
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
 
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
 
-$this->title = Yii::t('frontend/customer', 'Create Customer');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/customer', 'Customers'), 'url' => ['index']];
+$this->title = Yii::t('common/customer', 'Create Customer');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
+
+
+$customer = $model;
+$card = $customer->card;
+
 ?>
 <div class="customer-create">
 
+	<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+		</div>
+		<div class='col-md-4'>
+		</div>
+	</div>
+
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <?= $this->render('_form', [
+    <?= $this->render('_form_create', [
         'model' => $model,
     ]) ?>
 
diff --git a/frontend/views/customer/update.php b/frontend/views/customer/update.php
index 05727b3..debcd50 100644
--- a/frontend/views/customer/update.php
+++ b/frontend/views/customer/update.php
@@ -7,9 +7,7 @@ use frontend\components\ReceptionCardNumberWidget;
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
 
-$this->title = Yii::t('common/customer', 'Update {modelClass}: ', [
-    'modelClass' => 'Customer',
-]) . ' ' . $model->name;
+$this->title = Yii::t('common/customer', 'Update customer:' ) . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_customer]];
 $this->params['breadcrumbs'][] = Yii::t('common/customer', 'Update');
@@ -20,7 +18,6 @@ $card = $customer->card;
 ?>
 <div class="customer-update">
 
-    <h1><?= Html::encode($this->title) ?></h1>
 
 	<div class='row'>
 		<div class='col-md-3'>
@@ -33,6 +30,7 @@ $card = $customer->card;
 		</div>
 	</div>
 
+    <h1><?= Html::encode($this->title) ?></h1>
     <?= $this->render('_form_update', [
         'model' => $model,
     ]) ?>
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index ba9afeb..993db33 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -11,6 +11,7 @@ use frontend\assets\AppAsset;
 use common\widgets\Alert;
 use common\components\FrotnendMenuStructure;
 use frontend\components\FrontendMenuStructure;
+use kartik\widgets\AlertBlock;
 
 AppAsset::register($this);
 ?>
@@ -30,6 +31,13 @@ AppAsset::register($this);
 <div class="wrap">
     <?php
     
+    // with growl
+    echo AlertBlock::widget([
+    		'useSessionFlash' => true,
+    		'type' => AlertBlock::TYPE_GROWL,
+    		'delay' => '3000'
+    		]);
+    
     $menuStruct = new FrontendMenuStructure();
     $items = $menuStruct->run();
     
diff --git a/frontend/views/product/index.php b/frontend/views/product/index.php
index 7b36ca2..9185b8a 100644
--- a/frontend/views/product/index.php
+++ b/frontend/views/product/index.php
@@ -21,9 +21,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
 
             'id_product',
             'id_product_category',

From e3d6c0b902a805a9cefeb7308b5ecc9e02b855b4 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 1 Oct 2015 09:37:34 +0200
Subject: [PATCH 029/100] add product sale changes

---
 backend/components/AdminMenuStructure.php     |   2 +
 backend/controllers/CurrencyController.php    | 109 +++++++++++
 backend/controllers/TransferController.php    |  92 +++++++++
 backend/models/CurrencySearch.php             |  70 +++++++
 backend/models/TransferSearch.php             |  79 ++++++++
 backend/views/currency/_form.php              |  28 +++
 backend/views/currency/_search.php            |  37 ++++
 backend/views/currency/create.php             |  21 ++
 backend/views/currency/index.php              |  37 ++++
 backend/views/currency/update.php             |  23 +++
 backend/views/currency/view.php               |  32 ++++
 backend/views/transfer/_form.php              |  49 +++++
 backend/views/transfer/_search.php            |  55 ++++++
 backend/views/transfer/create.php             |  21 ++
 backend/views/transfer/index.php              |  47 +++++
 backend/views/transfer/update.php             |  23 +++
 backend/views/transfer/view.php               |  49 +++++
 common/models/Currency.php                    |  54 ++++++
 common/models/Transfer.php                    |  75 ++++++++
 common/models/TransferSearch.php              |  79 ++++++++
 .../m150930_140224_add__table__transfer.php   |  72 +++++++
 .../m150930_140728_add__table__currency.php   |  43 +++++
 frontend/controllers/ProductController.php    |  36 ++++
 frontend/controllers/TransferController.php   | 121 ++++++++++++
 frontend/models/ProductSaleForm.php           |  46 +++++
 frontend/models/TransferSearch.php            |  79 ++++++++
 frontend/views/common/_menu_reception.php     |   2 +-
 frontend/views/product/sale.php               | 180 ++++++++++++++++++
 frontend/views/transfer/_form.php             |  45 +++++
 frontend/views/transfer/_search.php           |  55 ++++++
 frontend/views/transfer/create.php            |  21 ++
 frontend/views/transfer/index.php             |  48 +++++
 frontend/views/transfer/update.php            |  23 +++
 frontend/views/transfer/view.php              |  49 +++++
 34 files changed, 1801 insertions(+), 1 deletion(-)
 create mode 100644 backend/controllers/CurrencyController.php
 create mode 100644 backend/controllers/TransferController.php
 create mode 100644 backend/models/CurrencySearch.php
 create mode 100644 backend/models/TransferSearch.php
 create mode 100644 backend/views/currency/_form.php
 create mode 100644 backend/views/currency/_search.php
 create mode 100644 backend/views/currency/create.php
 create mode 100644 backend/views/currency/index.php
 create mode 100644 backend/views/currency/update.php
 create mode 100644 backend/views/currency/view.php
 create mode 100644 backend/views/transfer/_form.php
 create mode 100644 backend/views/transfer/_search.php
 create mode 100644 backend/views/transfer/create.php
 create mode 100644 backend/views/transfer/index.php
 create mode 100644 backend/views/transfer/update.php
 create mode 100644 backend/views/transfer/view.php
 create mode 100644 common/models/Currency.php
 create mode 100644 common/models/Transfer.php
 create mode 100644 common/models/TransferSearch.php
 create mode 100644 console/migrations/m150930_140224_add__table__transfer.php
 create mode 100644 console/migrations/m150930_140728_add__table__currency.php
 create mode 100644 frontend/controllers/TransferController.php
 create mode 100644 frontend/models/ProductSaleForm.php
 create mode 100644 frontend/models/TransferSearch.php
 create mode 100644 frontend/views/product/sale.php
 create mode 100644 frontend/views/transfer/_form.php
 create mode 100644 frontend/views/transfer/_search.php
 create mode 100644 frontend/views/transfer/create.php
 create mode 100644 frontend/views/transfer/index.php
 create mode 100644 frontend/views/transfer/update.php
 create mode 100644 frontend/views/transfer/view.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 9611261..0a51e6c 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -44,6 +44,8 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
 		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
 		$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
+		$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
+		$items[] = ['label' => 'Transfer', 'url' => ['/transfer/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/CurrencyController.php b/backend/controllers/CurrencyController.php
new file mode 100644
index 0000000..6f77f3a
--- /dev/null
+++ b/backend/controllers/CurrencyController.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Currency;
+use backend\models\CurrencySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * CurrencyController implements the CRUD actions for Currency model.
+ */
+class CurrencyController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Currency models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CurrencySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Currency model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Currency model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Currency();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_currency]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Currency model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_currency]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+
+    /**
+     * Finds the Currency model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Currency the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Currency::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
new file mode 100644
index 0000000..a41f25c
--- /dev/null
+++ b/backend/controllers/TransferController.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Transfer;
+use backend\models\TransferSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TransferController implements the CRUD actions for Transfer model.
+ */
+class TransferController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Transfer models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TransferSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Transfer model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+
+    /**
+     * Updates an existing Transfer model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_transfer]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+
+    /**
+     * Finds the Transfer model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Transfer the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Transfer::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/CurrencySearch.php b/backend/models/CurrencySearch.php
new file mode 100644
index 0000000..10d7906
--- /dev/null
+++ b/backend/models/CurrencySearch.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Currency;
+
+/**
+ * CurrencySearch represents the model behind the search form about `common\models\Currency`.
+ */
+class CurrencySearch extends Currency
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_currency', 'rate'], 'integer'],
+            [['currency', 'name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Currency::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_currency' => $this->id_currency,
+            'rate' => $this->rate,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'currency', $this->currency])
+            ->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
new file mode 100644
index 0000000..903aaeb
--- /dev/null
+++ b/backend/models/TransferSearch.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Transfer;
+
+/**
+ * TransferSearch represents the model behind the search form about `common\models\Transfer`.
+ */
+class TransferSearch extends Transfer
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
+            [['comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Transfer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_transfer' => $this->id_transfer,
+            'id_discount' => $this->id_discount,
+            'id_currency' => $this->id_currency,
+            'id_object' => $this->id_object,
+            'status' => $this->status,
+            'type' => $this->type,
+            'item_price' => $this->item_price,
+            'count' => $this->count,
+            'money' => $this->money,
+            'money_currency' => $this->money_currency,
+            'rate' => $this->rate,
+            'id_user' => $this->id_user,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/currency/_form.php b/backend/views/currency/_form.php
new file mode 100644
index 0000000..7e9f12b
--- /dev/null
+++ b/backend/views/currency/_form.php
@@ -0,0 +1,28 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Currency */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="currency-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'currency')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'rate')->textInput() ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/currency', 'Create') : Yii::t('frontend/currency', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/currency/_search.php b/backend/views/currency/_search.php
new file mode 100644
index 0000000..d0a3166
--- /dev/null
+++ b/backend/views/currency/_search.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\CurrencySearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="currency-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_currency') ?>
+
+    <?= $form->field($model, 'currency') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'rate') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/currency', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/currency', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/currency/create.php b/backend/views/currency/create.php
new file mode 100644
index 0000000..818df07
--- /dev/null
+++ b/backend/views/currency/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Currency */
+
+$this->title = Yii::t('frontend/currency', 'Create Currency');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/currency', 'Currencies'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="currency-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/currency/index.php b/backend/views/currency/index.php
new file mode 100644
index 0000000..db7896b
--- /dev/null
+++ b/backend/views/currency/index.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\CurrencySearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/currency', 'Currencies');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="currency-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/currency', 'Create Currency'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'currency',
+            'name',
+            'rate',
+//             'created_at:datetime',
+            'updated_at:datetime:datetime',
+
+            ['class' => 'yii\grid\ActionColumn',
+            				'template' =>'{view} {update}'
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/currency/update.php b/backend/views/currency/update.php
new file mode 100644
index 0000000..6f2ebd8
--- /dev/null
+++ b/backend/views/currency/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Currency */
+
+$this->title = Yii::t('frontend/currency', 'Update {modelClass}: ', [
+    'modelClass' => 'Currency',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/currency', 'Currencies'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_currency]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/currency', 'Update');
+?>
+<div class="currency-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/currency/view.php b/backend/views/currency/view.php
new file mode 100644
index 0000000..974115c
--- /dev/null
+++ b/backend/views/currency/view.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Currency */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/currency', 'Currencies'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="currency-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/currency', 'Update'), ['update', 'id' => $model->id_currency], ['class' => 'btn btn-primary']) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'currency',
+            'name',
+            'rate',
+            'created_at:datetime',
+            'updated_at:datetime',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/transfer/_form.php b/backend/views/transfer/_form.php
new file mode 100644
index 0000000..1fbe83d
--- /dev/null
+++ b/backend/views/transfer/_form.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transfer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_discount')->textInput() ?>
+
+    <?= $form->field($model, 'id_currency')->textInput() ?>
+
+    <?= $form->field($model, 'id_object')->textInput() ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'item_price')->textInput() ?>
+
+    <?= $form->field($model, 'count')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'money_currency')->textInput() ?>
+
+    <?= $form->field($model, 'rate')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/transfer', 'Create') : Yii::t('frontend/transfer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/transfer/_search.php b/backend/views/transfer/_search.php
new file mode 100644
index 0000000..3e67083
--- /dev/null
+++ b/backend/views/transfer/_search.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\TransferSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transfer-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_transfer') ?>
+
+    <?= $form->field($model, 'id_discount') ?>
+
+    <?= $form->field($model, 'id_currency') ?>
+
+    <?= $form->field($model, 'id_object') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'type') ?>
+
+    <?php // echo $form->field($model, 'item_price') ?>
+
+    <?php // echo $form->field($model, 'count') ?>
+
+    <?php // echo $form->field($model, 'money') ?>
+
+    <?php // echo $form->field($model, 'money_currency') ?>
+
+    <?php // echo $form->field($model, 'rate') ?>
+
+    <?php // echo $form->field($model, 'id_user') ?>
+
+    <?php // echo $form->field($model, 'comment') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/transfer', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/transfer/create.php b/backend/views/transfer/create.php
new file mode 100644
index 0000000..c256a17
--- /dev/null
+++ b/backend/views/transfer/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = Yii::t('frontend/transfer', 'Create Transfer');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php
new file mode 100644
index 0000000..2d0a0c8
--- /dev/null
+++ b/backend/views/transfer/index.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\TransferSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/transfer', 'Transfers');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/transfer', 'Create Transfer'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+
+            'id_discount',
+            'id_currency',
+            'id_object',
+            'status',
+            // 'type',
+            // 'item_price',
+            // 'count',
+            // 'money',
+            // 'money_currency',
+            // 'rate',
+            // 'id_user',
+            // 'comment',
+            'created_at:datetime',
+            'updated_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn',
+            'template' => '{view}'
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/transfer/update.php b/backend/views/transfer/update.php
new file mode 100644
index 0000000..053729b
--- /dev/null
+++ b/backend/views/transfer/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = Yii::t('frontend/transfer', 'Update {modelClass}: ', [
+    'modelClass' => 'Transfer',
+]) . ' ' . $model->id_transfer;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_transfer, 'url' => ['view', 'id' => $model->id_transfer]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/transfer', 'Update');
+?>
+<div class="transfer-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/transfer/view.php b/backend/views/transfer/view.php
new file mode 100644
index 0000000..9fff603
--- /dev/null
+++ b/backend/views/transfer/view.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = $model->id_transfer;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/transfer', 'Update'), ['update', 'id' => $model->id_transfer], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/transfer', 'Delete'), ['delete', 'id' => $model->id_transfer], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/transfer', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_transfer',
+            'id_discount',
+            'id_currency',
+            'id_object',
+            'status',
+            'type',
+            'item_price',
+            'count',
+            'money',
+            'money_currency',
+            'rate',
+            'id_user',
+            'comment',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Currency.php b/common/models/Currency.php
new file mode 100644
index 0000000..b2bd95e
--- /dev/null
+++ b/common/models/Currency.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "currency".
+ *
+ * @property integer $id_currency
+ * @property string $currency
+ * @property string $name
+ * @property integer $rate
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Currency extends \common\models\BaseFitnessActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'currency';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['currency', 'name'], 'required'],
+            [['rate'], 'integer'],
+            [['currency'], 'string', 'max' => 10],
+            [['name'], 'string', 'max' => 32]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_currency' => Yii::t('common/currency', 'Id Currency'),
+            'currency' => Yii::t('common/currency', 'Currency'),
+            'name' => Yii::t('common/currency', 'Name'),
+            'rate' => Yii::t('common/currency', 'Rate'),
+            'created_at' => Yii::t('common/currency', 'Created At'),
+            'updated_at' => Yii::t('common/currency', 'Updated At'),
+        ];
+    }
+}
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
new file mode 100644
index 0000000..cd4395d
--- /dev/null
+++ b/common/models/Transfer.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "transfer".
+ *
+ * @property integer $id_transfer
+ * @property integer $id_discount
+ * @property integer $id_currency
+ * @property integer $id_object
+ * @property integer $status
+ * @property integer $type
+ * @property integer $item_price
+ * @property integer $count
+ * @property integer $money
+ * @property integer $money_currency
+ * @property integer $rate
+ * @property integer $id_user
+ * @property string $comment
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Transfer extends \yii\db\ActiveRecord
+{
+	
+	const TYPE_PRODUCT = 10;
+	const TYPE_TICKET  = 20;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'transfer';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
+            [['created_at', 'updated_at'], 'safe'],
+            [['comment'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_transfer' => Yii::t('common/transfer', 'Id Transfer'),
+            'id_discount' => Yii::t('common/transfer', 'Id Discount'),
+            'id_currency' => Yii::t('common/transfer', 'Id Currency'),
+            'id_object' => Yii::t('common/transfer', 'Id Object'),
+            'status' => Yii::t('common/transfer', 'Status'),
+            'type' => Yii::t('common/transfer', 'Type'),
+            'item_price' => Yii::t('common/transfer', 'Item Price'),
+            'count' => Yii::t('common/transfer', 'Count'),
+            'money' => Yii::t('common/transfer', 'Money'),
+            'money_currency' => Yii::t('common/transfer', 'Money Currency'),
+            'rate' => Yii::t('common/transfer', 'Rate'),
+            'id_user' => Yii::t('common/transfer', 'Id User'),
+            'comment' => Yii::t('common/transfer', 'Comment'),
+            'created_at' => Yii::t('common/transfer', 'Created At'),
+            'updated_at' => Yii::t('common/transfer', 'Updated At'),
+        ];
+    }
+}
diff --git a/common/models/TransferSearch.php b/common/models/TransferSearch.php
new file mode 100644
index 0000000..322f7d7
--- /dev/null
+++ b/common/models/TransferSearch.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Transfer;
+
+/**
+ * TransferSearch represents the model behind the search form about `common\models\Transfer`.
+ */
+class TransferSearch extends Transfer
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
+            [['comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Transfer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_transfer' => $this->id_transfer,
+            'id_discount' => $this->id_discount,
+            'id_currency' => $this->id_currency,
+            'id_object' => $this->id_object,
+            'status' => $this->status,
+            'type' => $this->type,
+            'item_price' => $this->item_price,
+            'count' => $this->count,
+            'money' => $this->money,
+            'money_currency' => $this->money_currency,
+            'rate' => $this->rate,
+            'id_user' => $this->id_user,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/console/migrations/m150930_140224_add__table__transfer.php b/console/migrations/m150930_140224_add__table__transfer.php
new file mode 100644
index 0000000..f25bb87
--- /dev/null
+++ b/console/migrations/m150930_140224_add__table__transfer.php
@@ -0,0 +1,72 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150930_140224_add__table__transfer extends Migration
+{
+	/*id_transfer (int)
+id_account
+id_discount
+id_currency
+id_object
+status
+type
+item_price
+count
+money
+money_currency
+rate
+id_user
+comment
+created_at
+updated_at
+
+	*/
+	
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%transfer}}', [
+    			'id_transfer' => $this->primaryKey(),
+    			'id_discount' => $this->integer(11) ,
+    			'id_currency' => $this->integer(11) ,
+    			'id_discount' => $this->integer(11) ,
+    			'id_object' => $this->integer(11) ,
+    			'status' => $this->smallInteger(),
+    			'type' => $this->smallInteger(),
+    			'item_price' => $this->integer(11),
+    			'count' => $this->integer(11),
+    			'money' => $this->integer(11),
+    			'money_currency' => $this->integer(11),
+    			'rate' => $this->integer(11),
+    			'id_user' => $this->integer(11),
+    			'comment' => $this->string(255),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150930_140224_add__table__transfer cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m150930_140728_add__table__currency.php b/console/migrations/m150930_140728_add__table__currency.php
new file mode 100644
index 0000000..71daf34
--- /dev/null
+++ b/console/migrations/m150930_140728_add__table__currency.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m150930_140728_add__table__currency extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%currency}}', [
+    			'id_currency' => $this->primaryKey(),
+    			'currency' => $this->string(10)->notNull(),
+    			'name' => $this->string(32)->notNull(),
+    			'rate' =>  $this->integer(11) ,
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m150930_140728_add__table__currency cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 8fd758c..9c0fb34 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -8,12 +8,19 @@ use frontend\models\ProductSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use frontend\models\ProductSaleForm;
+use common\models\Card;
+use common\models\Customer;
 
 /**
  * ProductController implements the CRUD actions for Product model.
  */
 class ProductController extends Controller
 {
+	
+	protected $card;
+	protected $customer;
+	
     public function behaviors()
     {
         return [
@@ -26,6 +33,21 @@ class ProductController extends Controller
         ];
     }
 
+    
+    public function actionSale( $number = null){
+    	
+    	$this->findByNumber($number);
+    	
+    	$model = new ProductSaleForm();
+    	
+    	return $this->render("sale",[
+    			'customer' => $this->customer,
+    			'card' => $this->card
+    	]);
+    	
+    	
+    }
+    
     /**
      * Lists all Product models.
      * @return mixed
@@ -118,4 +140,18 @@ class ProductController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+    
+    protected function findByNumber($number){
+    	$this->card = null;
+    	$this->customer = null;
+    	if ( $number != null ){
+    		$this->card = Card::readCard($number);
+    		if ( $this->card != null ){
+    			$this->customer = Customer::find()->innerJoin(Card::tableName(), "customer.id_customer_card = card.id_card")->andWhere( [ 'customer.id_customer_card' => $this->card->id_card   ])->one();
+    		}
+    	}
+    	 
+    	
+    }
+    
 }
diff --git a/frontend/controllers/TransferController.php b/frontend/controllers/TransferController.php
new file mode 100644
index 0000000..a0677f8
--- /dev/null
+++ b/frontend/controllers/TransferController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Transfer;
+use frontend\models\TransferSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TransferController implements the CRUD actions for Transfer model.
+ */
+class TransferController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Transfer models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TransferSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Transfer model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Transfer model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Transfer();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_transfer]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Transfer model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_transfer]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Transfer model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Transfer model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Transfer the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Transfer::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
new file mode 100644
index 0000000..36b2238
--- /dev/null
+++ b/frontend/models/ProductSaleForm.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use common\models\Card;
+use common\models\Customer;
+
+/**
+ * ContactForm is the model behind the contact form.
+ */
+class ProductSaleForm extends Model
+{
+	
+	public $productNumber;
+	public $productBarcode;
+	public $count;
+	public $currency;
+	public $account;
+	public $comment;
+	
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['number'], 'required'],
+        ];
+    }
+
+    
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'verifyCode' => 'Verification Code',
+        ];
+    }
+    
+
+}
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
new file mode 100644
index 0000000..e920478
--- /dev/null
+++ b/frontend/models/TransferSearch.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Transfer;
+
+/**
+ * TransferSearch represents the model behind the search form about `common\models\Transfer`.
+ */
+class TransferSearch extends Transfer
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
+            [['comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Transfer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_transfer' => $this->id_transfer,
+            'id_discount' => $this->id_discount,
+            'id_currency' => $this->id_currency,
+            'id_object' => $this->id_object,
+            'status' => $this->status,
+            'type' => $this->type,
+            'item_price' => $this->item_price,
+            'count' => $this->count,
+            'money' => $this->money,
+            'money_currency' => $this->money_currency,
+            'rate' => $this->rate,
+            'id_user' => $this->id_user,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
index 52d5a70..40e1037 100644
--- a/frontend/views/common/_menu_reception.php
+++ b/frontend/views/common/_menu_reception.php
@@ -72,7 +72,7 @@ function mkBtn($card, $label,$route = null ){
     <div class='row'>
 		<div class='col-md-12'>
 			<?php //echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') ,  'product/index'  , ['class' =>   'btn btn-primary btn-reception'] )?>
-			<?php echo mkBtn($card, Yii::t( 'frontend/customer', 'Termékeladás'),  'product/index')?>
+			<?php echo mkBtn($card, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
 		</div>
 	</div>
 
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
new file mode 100644
index 0000000..aff1bfd
--- /dev/null
+++ b/frontend/views/product/sale.php
@@ -0,0 +1,180 @@
+<?php 
+
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
+use yii\helpers\Html;
+?>
+
+<style>
+	.product-form input, .product-form select, .product-form textarea{
+		width: 100%;
+	}
+</style>
+
+<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['product/sale'] ] )?>
+		</div>
+		<div class='col-md-4'>
+		</div>
+	</div>
+	
+	<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
+
+	<div class='row'>
+		<div class='col-md-4'>
+			<?php  echo Html::label(Yii::t('frontend/product', 'Product'))?>
+			<?php  echo Html::textInput('filter_text')?>
+		</div>
+		<div class='col-md-4'>
+			
+		</div>
+		<div class='col-md-4'>
+			
+		</div>
+	</div>
+	
+	<div class='row product-form'>
+		<div class='col-md-6'>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Product name'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::tag('span','',[ 'class' => 'product product-name']); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Product price'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::tag('span','',[ 'class' => 'product product-price']); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Product number'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::tag('span','',[ 'class' => 'product product-number']); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Barcode'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::tag('span','',[ 'class' => 'product barcode']); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Count'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::textInput('count') ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Currency'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::dropDownList('currency',null,[],[]); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Account'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::dropDownList('account',null,[],[]); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Discount'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::dropDownList('discount',null,[],[]); ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Comment'))?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-10'>
+					<?php echo Html::textarea('comment', ''); ?>
+				</div>
+			</div>
+		</div>
+		<div class='col-md-6'>
+			<div class="row">
+				<div class='col-md-10'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Bill'))?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-4'>
+					<?php echo Html::label(Yii::t('frontend/product', 'Debit'))?>
+				</div>
+				<div class='col-md-6'>
+					<?php echo Html::tag("span",'0,00',['sale', 'sale-debit']) ?>
+				</div>
+			</div>
+			<div class="row">
+				<div class='col-md-12'>
+					<table class="table table-bordered table-striped">
+						<thead>
+							<tr>
+								<th>
+									<?php echo Yii::t('frontend/product', 'Product name')?>
+								</th>
+								<th>
+									<?php echo Yii::t('frontend/product', 'Count')?>
+								</th>
+								<th>
+									<?php echo Yii::t('frontend/product', 'Currency')?>
+								</th>
+								<th>
+									<?php echo Yii::t('frontend/product', 'Item Price')?>
+								</th>
+								<th>
+									<?php echo Yii::t('frontend/product', 'Total Price')?>
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+							<tr>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+								<td>&nbsp;</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		</div>
\ No newline at end of file
diff --git a/frontend/views/transfer/_form.php b/frontend/views/transfer/_form.php
new file mode 100644
index 0000000..3ae6209
--- /dev/null
+++ b/frontend/views/transfer/_form.php
@@ -0,0 +1,45 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transfer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_discount')->textInput() ?>
+
+    <?= $form->field($model, 'id_currency')->textInput() ?>
+
+    <?= $form->field($model, 'id_object')->textInput() ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'item_price')->textInput() ?>
+
+    <?= $form->field($model, 'count')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'money_currency')->textInput() ?>
+
+    <?= $form->field($model, 'rate')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/transfer', 'Create') : Yii::t('frontend/transfer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
new file mode 100644
index 0000000..d910cf8
--- /dev/null
+++ b/frontend/views/transfer/_search.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\TransferSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transfer-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_transfer') ?>
+
+    <?= $form->field($model, 'id_discount') ?>
+
+    <?= $form->field($model, 'id_currency') ?>
+
+    <?= $form->field($model, 'id_object') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'type') ?>
+
+    <?php // echo $form->field($model, 'item_price') ?>
+
+    <?php // echo $form->field($model, 'count') ?>
+
+    <?php // echo $form->field($model, 'money') ?>
+
+    <?php // echo $form->field($model, 'money_currency') ?>
+
+    <?php // echo $form->field($model, 'rate') ?>
+
+    <?php // echo $form->field($model, 'id_user') ?>
+
+    <?php // echo $form->field($model, 'comment') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/transfer', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/transfer/create.php b/frontend/views/transfer/create.php
new file mode 100644
index 0000000..c256a17
--- /dev/null
+++ b/frontend/views/transfer/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = Yii::t('frontend/transfer', 'Create Transfer');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/transfer/index.php b/frontend/views/transfer/index.php
new file mode 100644
index 0000000..43c9b60
--- /dev/null
+++ b/frontend/views/transfer/index.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\models\TransferSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/transfer', 'Transfers');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/transfer', 'Create Transfer'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_transfer',
+            'id_discount',
+            'id_currency',
+            'id_object',
+            'status',
+            // 'type',
+            // 'item_price',
+            // 'count',
+            // 'money',
+            // 'money_currency',
+            // 'rate',
+            // 'id_user',
+            // 'comment',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/transfer/update.php b/frontend/views/transfer/update.php
new file mode 100644
index 0000000..053729b
--- /dev/null
+++ b/frontend/views/transfer/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = Yii::t('frontend/transfer', 'Update {modelClass}: ', [
+    'modelClass' => 'Transfer',
+]) . ' ' . $model->id_transfer;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_transfer, 'url' => ['view', 'id' => $model->id_transfer]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/transfer', 'Update');
+?>
+<div class="transfer-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/transfer/view.php b/frontend/views/transfer/view.php
new file mode 100644
index 0000000..9fff603
--- /dev/null
+++ b/frontend/views/transfer/view.php
@@ -0,0 +1,49 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = $model->id_transfer;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/transfer', 'Update'), ['update', 'id' => $model->id_transfer], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/transfer', 'Delete'), ['delete', 'id' => $model->id_transfer], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/transfer', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_transfer',
+            'id_discount',
+            'id_currency',
+            'id_object',
+            'status',
+            'type',
+            'item_price',
+            'count',
+            'money',
+            'money_currency',
+            'rate',
+            'id_user',
+            'comment',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>

From e9f9567618dbddbe074fb1104a7775cd0e22f187 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 1 Oct 2015 17:31:48 +0200
Subject: [PATCH 030/100] add changes sell product

---
 common/models/Product.php                  |  41 ++++++
 frontend/assets/ProductSellAsset.php       |  28 ++++
 frontend/controllers/ProductController.php |  18 +++
 frontend/views/product/_sale_form.php      |  85 +++++++++++
 frontend/views/product/_sold_items.php     |  64 ++++++++
 frontend/views/product/sale.php            | 164 +++------------------
 frontend/web/js/product.sell.js            |  67 +++++++++
 7 files changed, 323 insertions(+), 144 deletions(-)
 create mode 100644 frontend/assets/ProductSellAsset.php
 create mode 100644 frontend/views/product/_sale_form.php
 create mode 100644 frontend/views/product/_sold_items.php
 create mode 100644 frontend/web/js/product.sell.js

diff --git a/common/models/Product.php b/common/models/Product.php
index 0b1bbd5..d9e28b8 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "product".
@@ -125,4 +126,44 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	return $warehouses;
     }
     
+    public static  function findProduct($query){
+    	$result = [];
+    	$product = null;
+    
+    	$products = Product::find()
+    	->andWhere(
+    			['or',
+    			['product_number' => $query ],
+    			['barcode' => $query ],
+    			]
+    	)->andWhere(['status' =>Product::STATUS_ACTIVE])
+    	->all();
+    
+    	 
+    	if ( count($products) == 1 ){
+    		$product = $products[0];
+    	}
+    	return $product;
+    }
+    
+    public static function modelToArray($product,$default = null){
+    	
+    	if ( $product == null ){
+    		return $default;
+    	}
+    	
+    	return ArrayHelper::toArray($product, [
+	    	'common\models\Product' => [
+	    	'name',
+	    	'product_number',
+	    	'barcode',
+	    	'sale_price',
+	    	'stock',
+	    	'category' => function ($product) {
+	    		return $product->productCategoryName;
+	    	},
+	    	],
+    	]);
+    }
+    
 }
diff --git a/frontend/assets/ProductSellAsset.php b/frontend/assets/ProductSellAsset.php
new file mode 100644
index 0000000..74fb237
--- /dev/null
+++ b/frontend/assets/ProductSellAsset.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class ProductSellAsset extends AssetBundle
+{
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+    ];
+     public $js = [
+    	'js/product.sell.js',
+    ];
+    public $depends = [
+        'frontend\assets\AppAsset',
+    ];
+}
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 9c0fb34..5f431f6 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -125,6 +125,24 @@ class ProductController extends Controller
         return $this->redirect(['index']);
     }
 
+    /**
+     */
+    public function actionLookup($query = null)
+    {
+        $result = [];
+    	$product = Product::findProduct($query);
+    	$product = Product::modelToArray($product);
+    	 
+    	$result['product'] = $product;
+    	
+    	\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    	
+    	
+    	
+    	return $result;
+    }
+
+    
     /**
      * Finds the Product model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
new file mode 100644
index 0000000..e44cec4
--- /dev/null
+++ b/frontend/views/product/_sale_form.php
@@ -0,0 +1,85 @@
+<?php
+use yii\helpers\Html;
+?>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Product name'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::tag('span','',[ 'class' => 'product product-name']); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Product price'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::tag('span','',[ 'class' => 'product product-price']); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Product number'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::tag('span','',[ 'class' => 'product product-number']); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Barcode'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::tag('span','',[ 'class' => 'product barcode']); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Count'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::textInput('count') ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Currency'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::dropDownList('currency',null,[],[]); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Account'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::dropDownList('account',null,[],[]); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Discount'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::dropDownList('discount',null,[],[]); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Comment'))?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-10'>
+		<?php echo Html::textarea('comment', ''); ?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-3'>
+		<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success'] );?>
+	</div>
+	<div class='col-md-7'>
+		<?php echo Html::a(Yii::t("frontend/product","Sell product and add to total"),null,['class' => 'btn btn-success'] );?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/product/_sold_items.php b/frontend/views/product/_sold_items.php
new file mode 100644
index 0000000..a737b6e
--- /dev/null
+++ b/frontend/views/product/_sold_items.php
@@ -0,0 +1,64 @@
+<?php
+use yii\bootstrap\Html;
+?>
+<div class="row">
+	<div class='col-md-10'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Bill'))?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-4'>
+		<?php echo Html::label(Yii::t('frontend/product', 'Debit'))?>
+	</div>
+	<div class='col-md-6'>
+		<?php echo Html::tag("span",'0,00',['sale', 'sale-debit'])?>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-12'>
+		<table class="table table-bordered table-striped">
+			<thead>
+				<tr>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Product name')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Count')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Currency')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Item Price')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Total Price')?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+				</tr>
+				<tr>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index aff1bfd..42c3a00 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -3,6 +3,20 @@
 use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
 use yii\helpers\Html;
+use common\models\Product;
+use frontend\assets\ProductSellAsset;
+use yii\helpers\Url;
+
+ProductSellAsset::register($this);
+
+$options = [];
+
+$options['lookup_product_url'] = Url::toRoute(['product/lookup']);
+
+$this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
+
+
+
 ?>
 
 <style>
@@ -21,160 +35,22 @@ use yii\helpers\Html;
 		<div class='col-md-4'>
 		</div>
 	</div>
-	
 	<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
-
 	<div class='row'>
 		<div class='col-md-4'>
 			<?php  echo Html::label(Yii::t('frontend/product', 'Product'))?>
-			<?php  echo Html::textInput('filter_text')?>
+			<?php  echo Html::textInput('filter_text','', ['id'=>'filter_text'])?>
 		</div>
 		<div class='col-md-4'>
-			
 		</div>
 		<div class='col-md-4'>
-			
 		</div>
 	</div>
-	
-	<div class='row product-form'>
-		<div class='col-md-6'>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Product name'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::tag('span','',[ 'class' => 'product product-name']); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Product price'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::tag('span','',[ 'class' => 'product product-price']); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Product number'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::tag('span','',[ 'class' => 'product product-number']); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Barcode'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::tag('span','',[ 'class' => 'product barcode']); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Count'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::textInput('count') ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Currency'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::dropDownList('currency',null,[],[]); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Account'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::dropDownList('account',null,[],[]); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Discount'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::dropDownList('discount',null,[],[]); ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Comment'))?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-10'>
-					<?php echo Html::textarea('comment', ''); ?>
-				</div>
-			</div>
+	<div class='row '>
+		<div class='col-md-6 product-form'>
+			<?php echo $this->render('_sale_form' ) ?>	
 		</div>
 		<div class='col-md-6'>
-			<div class="row">
-				<div class='col-md-10'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Bill'))?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-4'>
-					<?php echo Html::label(Yii::t('frontend/product', 'Debit'))?>
-				</div>
-				<div class='col-md-6'>
-					<?php echo Html::tag("span",'0,00',['sale', 'sale-debit']) ?>
-				</div>
-			</div>
-			<div class="row">
-				<div class='col-md-12'>
-					<table class="table table-bordered table-striped">
-						<thead>
-							<tr>
-								<th>
-									<?php echo Yii::t('frontend/product', 'Product name')?>
-								</th>
-								<th>
-									<?php echo Yii::t('frontend/product', 'Count')?>
-								</th>
-								<th>
-									<?php echo Yii::t('frontend/product', 'Currency')?>
-								</th>
-								<th>
-									<?php echo Yii::t('frontend/product', 'Item Price')?>
-								</th>
-								<th>
-									<?php echo Yii::t('frontend/product', 'Total Price')?>
-								</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-							</tr>
-							<tr>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-							</tr>
-							<tr>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
+			<?php echo $this->render('_sold_items' ) ?>
 		</div>
-		</div>
\ No newline at end of file
+	</div>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
new file mode 100644
index 0000000..dd8a1d5
--- /dev/null
+++ b/frontend/web/js/product.sell.js
@@ -0,0 +1,67 @@
+function ProductSell(o){
+	
+	this.defaults = {
+		selector_filter_text: '#filter_text',
+		lookup_product_url: ''	
+	};
+	
+	init();
+	
+	function init(){
+		this.defaults = $.extend(this.defaults, o );
+		addBehaviorEnterPressedListener();
+	}
+	
+	
+	function addBehaviorEnterPressedListener(){
+		alert($(  this.defaults.selector_filter_text ).length);
+		$(  this.defaults.selector_filter_text ).keypress(function( event ) {
+			  if ( event.which == 13 ) {
+				  event.preventDefault();
+				  lookupProduct();
+			  }
+				
+		});	
+	}
+	
+	function lookupProduct(){
+		var data, url;
+		
+		url = this.defaults.lookup_product_url;
+		data = {
+			'query' : 	$(  this.defaults.selector_filter_text ).val()
+		};
+		
+		$.ajax({
+			  dataType: "json",
+			  url: url,
+			  data: data,
+			  success: onLookupProductReady
+			});
+	}
+	
+	function onLookupProductReady(  data  ){
+		alert('ok');
+		productChanged(data.product);
+	}
+	
+	
+	function productChanged(product){
+		clearForm();
+		if ( product == null){
+			applyProduct();
+		}
+	}
+	
+	function clearForm(){
+		$('.product-name').html('-');
+	}
+	
+	function applyProduct(product){
+		$('.product-name').html(product.name);
+	}
+		
+	
+	
+	
+}

From 36c8d37914fd8bea4c13a266caf6c51745325623 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 5 Oct 2015 07:37:17 +0200
Subject: [PATCH 031/100] sell product changes

---
 backend/views/layouts/main.php                |   2 +-
 common/models/Currency.php                    |  11 ++
 common/models/Discount.php                    |  15 ++
 common/models/Product.php                     |   6 +
 common/models/Transfer.php                    |  71 ++++++++
 composer.json                                 |   3 +-
 composer.lock                                 |  41 ++++-
 ...6_add__id_account__to__table__transfer.php |  31 ++++
 frontend/assets/AppAsset.php                  |   2 +
 frontend/assets/GrowlAsset.php                |  16 ++
 frontend/controllers/ProductController.php    |  53 +++++-
 frontend/models/ProductLookupForm.php         |  40 +++++
 frontend/models/ProductSaleForm.php           | 104 ++++++++++-
 frontend/views/product/_sale_form.php         | 161 +++++++++--------
 frontend/views/product/_sold_items.php        |  37 +---
 frontend/views/product/_view.php              |  56 ++++++
 frontend/views/product/sale.php               |  30 ++--
 frontend/web/js/product.sell.js               | 166 ++++++++++++++++--
 18 files changed, 704 insertions(+), 141 deletions(-)
 create mode 100644 console/migrations/m151002_163816_add__id_account__to__table__transfer.php
 create mode 100644 frontend/assets/GrowlAsset.php
 create mode 100644 frontend/models/ProductLookupForm.php
 create mode 100644 frontend/views/product/_view.php

diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index a466606..0a2b5e6 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -56,7 +56,7 @@ $items = $adminMenu->run();
 
 <footer class="footer">
     <div class="container">
-        <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
+        <p class="pull-left">&copy; Botond <?= date('Y') ?></p>
 
         <p class="pull-right"><?= Yii::powered() ?></p>
     </div>
diff --git a/common/models/Currency.php b/common/models/Currency.php
index b2bd95e..c169e1f 100644
--- a/common/models/Currency.php
+++ b/common/models/Currency.php
@@ -51,4 +51,15 @@ class Currency extends \common\models\BaseFitnessActiveRecord
             'updated_at' => Yii::t('common/currency', 'Updated At'),
         ];
     }
+    
+    /**
+     * @param integer $money
+     * @param common\models\Currency $currency
+     * */
+    public static function applyCurrency( $money,$currency ) {
+    	$result = $money  / $currency;
+    	return $result;
+    }
+    
+    
 }
diff --git a/common/models/Discount.php b/common/models/Discount.php
index 6d2350d..6e65bbf 100644
--- a/common/models/Discount.php
+++ b/common/models/Discount.php
@@ -103,4 +103,19 @@ class Discount extends \yii\db\ActiveRecord
     	return $result;
     }
     
+    public static  function read(){
+    	return Discount::find()->andWhere([ 'status' => self::STATUS_ACTIVE ])->all();
+    }
+    
+    /**
+     * @param integer $money
+     * @param common\models\Discount $discount
+     * */
+    public static function applyDiscount($money,$discount){
+    	$result  = $money;
+    	$valueOfDiscount =  $money  * $discount->value * 100;
+    	$result = $money - $valueOfDiscount;
+    	return $result;
+    }
+    
 }
diff --git a/common/models/Product.php b/common/models/Product.php
index d9e28b8..30544e8 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -154,11 +154,13 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	
     	return ArrayHelper::toArray($product, [
 	    	'common\models\Product' => [
+	    	'id_product',
 	    	'name',
 	    	'product_number',
 	    	'barcode',
 	    	'sale_price',
 	    	'stock',
+	    	'id_account',
 	    	'category' => function ($product) {
 	    		return $product->productCategoryName;
 	    	},
@@ -166,4 +168,8 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	]);
     }
     
+    public static function sellProduct($product,$count){
+    	$product->stock = $product->stock - $count;
+    }
+    
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index cd4395d..f455b10 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\base\Object;
 
 /**
  * This is the model class for table "transfer".
@@ -10,6 +11,7 @@ use Yii;
  * @property integer $id_transfer
  * @property integer $id_discount
  * @property integer $id_currency
+ * @property integer $id_account
  * @property integer $id_object
  * @property integer $status
  * @property integer $type
@@ -29,6 +31,9 @@ class Transfer extends \yii\db\ActiveRecord
 	const TYPE_PRODUCT = 10;
 	const TYPE_TICKET  = 20;
 	
+	const STATUS_NOT_PAID = 10;
+	const STATUS_PAID = 20;
+	
     /**
      * @inheritdoc
      */
@@ -72,4 +77,70 @@ class Transfer extends \yii\db\ActiveRecord
             'updated_at' => Yii::t('common/transfer', 'Updated At'),
         ];
     }
+    
+    public function getProduct(){
+    	return $this->hasOne( Product::className(), ["id_product" =>"id_object" ] );
+    }
+    
+    public function getAccount(){
+    	return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] );
+    }
+
+    public function getCurrency(){
+    	return $this->hasOne( Currency::className(), ["id_currency" =>"id_currency" ] );
+    }
+    
+    public function getDiscount(){
+    	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
+    }
+    
+	
+    public function toProductSoldString(){
+    	$s = "";
+    	
+    	$s .= $this->count;
+    	$s .= " " . Yii::t('frontend/transfer', 'pieces') . " ";
+    	$s .= $this->product->name;
+    	$s .= " - ";
+    	$s .= $this->account->name;
+    	
+    	return $s;
+    }
+    
+    /**
+     * @param $account common\models\Account
+     * @param $discount common\models\Discount
+     * @param $currency common\models\Currency
+     * @param $product common\models\Product
+     * */
+    public static function createProductTransfer($account, $discount, $currency, $count,$product ){
+    	$transfer = new Transfer();
+    	
+    	$transfer->type = Transfer::TYPE_PRODUCT;
+    	
+    	$transfer->id_object  = $product->id_product;
+    	
+    	$transfer->item_price = $product->sale_price; 
+    	$totalPrice = $transfer->item_price; 
+    	
+    	$transfer->count = $count;
+    	$totalPrice = $totalPrice * $count;
+    	
+    	if ( isset( $discount ) ){
+    		$transfer->id_discount = $discount->id_discount;
+    		$totalPrice =  Discount::applyDiscount( $totalPrice, $discount);
+    	}
+    	
+    	$transfer->money = $totalPrice;
+    	
+    	if ( isset( $currency ) ){
+    		$transfer->rate = $currency->rate;
+    		$transfer->money_currency = Currency::applyCurrency($totalPrice, $currency);
+    	}
+    	
+    	$transfer->id_account = $account->id_account;
+    	
+    	return $transfer;
+    }
+    
 }
diff --git a/composer.json b/composer.json
index 7be5e79..61e7748 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
         "kartik-v/yii2-widgets": "^3.4",
-        "kartik-v/yii2-widget-typeahead": "*"
+        "kartik-v/yii2-widget-typeahead": "*",
+        "bower-asset/remarkable-bootstrap-notify": "^3.1"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index c44bc26..c305ed7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f2a471b84002daca5d3a31691f578c78",
+    "hash": "a1314409d3150e430e6ff7e350de0e3b",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -179,6 +179,45 @@
                 ]
             }
         },
+        {
+            "name": "bower-asset/remarkable-bootstrap-notify",
+            "version": "3.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mouse0270/bootstrap-notify.git",
+                "reference": "c6a3e3acafda0815cce3703103499b6262500cd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mouse0270/bootstrap-notify/zipball/c6a3e3acafda0815cce3703103499b6262500cd7",
+                "reference": "c6a3e3acafda0815cce3703103499b6262500cd7",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/bootstrap": ">=2.0.0",
+                "bower-asset/jquery": ">=1.10.2"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "bootstrap-notify.js",
+                "bower-asset-ignore": []
+            },
+            "license": [
+                "MIT"
+            ],
+            "description": "This is a simple plugin that turns standard Bootstrap alerts into \"Growl-like\" notifications.",
+            "keywords": [
+                "bootstrap",
+                "growl",
+                "jquery",
+                "message",
+                "notice",
+                "notification",
+                "notifications",
+                "notify",
+                "remarkable"
+            ]
+        },
         {
             "name": "bower-asset/yii2-pjax",
             "version": "v2.0.4",
diff --git a/console/migrations/m151002_163816_add__id_account__to__table__transfer.php b/console/migrations/m151002_163816_add__id_account__to__table__transfer.php
new file mode 100644
index 0000000..a75859d
--- /dev/null
+++ b/console/migrations/m151002_163816_add__id_account__to__table__transfer.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+use common\models\Transfer;
+
+class m151002_163816_add__id_account__to__table__transfer extends Migration
+{
+    public function up()
+    {
+		$this->addColumn("transfer", "id_account", "integer(11)");
+    }
+
+    public function down()
+    {
+        echo "m151002_163816_add__id_account__to__table__transfer cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index 995e3dc..d30cb4c 100644
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -21,9 +21,11 @@ class AppAsset extends AssetBundle
         'css/site.css',
     ];
     public $js = [
+    	
     ];
     public $depends = [
         'yii\web\YiiAsset',
         'yii\bootstrap\BootstrapAsset',
+    	'frontend\assets\GrowlAsset'
     ];
 }
diff --git a/frontend/assets/GrowlAsset.php b/frontend/assets/GrowlAsset.php
new file mode 100644
index 0000000..ad85f9b
--- /dev/null
+++ b/frontend/assets/GrowlAsset.php
@@ -0,0 +1,16 @@
+<?php
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+class GrowlAsset extends AssetBundle
+{
+	public $sourcePath = '@bower';
+	
+	public $js = [
+		'remarkable-bootstrap-notify/bootstrap-notify.min.js'
+	];
+	
+	public $depends = [
+	];
+}
\ No newline at end of file
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 5f431f6..002c51f 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -9,8 +9,14 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use frontend\models\ProductSaleForm;
+use frontend\models\ProductLookupForm;
 use common\models\Card;
 use common\models\Customer;
+use yii\base\DynamicModel;
+use yii\base\Object;
+use common\models\Currency;
+use common\models\Account;
+use common\models\Discount;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -40,11 +46,50 @@ class ProductController extends Controller
     	
     	$model = new ProductSaleForm();
     	
-    	return $this->render("sale",[
-    			'customer' => $this->customer,
-    			'card' => $this->card
-    	]);
+    	$lookupModel = new ProductLookupForm();
     	
+    	$currencies = Currency::find()->all();
+    	
+    	$accounts = Account::readAccounts();
+    	
+    	$discounts = Discount::read();
+    	
+    	
+    	if (Yii::$app->request->isAjax) {
+    		
+    		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    		
+    		$model->currencies = $currencies;
+    		$model->accounts   = $accounts;
+    		$model->discounts  = $discounts;
+    		
+    		
+    		$result = [];
+    		$result['code'] = 'unknown';
+	     	if ($model->load(Yii::$app->request->post())  ) {
+	     		if ( $model->save()){
+	     			
+	     			
+	     			$result['code'] = 'success';
+	     			$result['message'] = Yii::t('common/product',"Sold: {product}" ,[ 'product' => $model->transfer->toProductSoldString()  ]);
+	     		}else{
+	     			$result['code'] = 'invalid';
+	     			$result['errors'] = $model->getErrors();
+	     		}
+	        } 
+    		return $result;
+    	
+    	}else{
+	    	return $this->render("sale",[
+	    			'customer' => $this->customer,
+	    			'card' => $this->card,
+	    			'model' => $model,
+	    			'lookupModel' =>$lookupModel,
+	    			'currencies' => $currencies,
+	    			'accounts' => $accounts,
+	    			'discounts' => $discounts,
+	    	]);
+    	}
     	
     }
     
diff --git a/frontend/models/ProductLookupForm.php b/frontend/models/ProductLookupForm.php
new file mode 100644
index 0000000..9443250
--- /dev/null
+++ b/frontend/models/ProductLookupForm.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use common\models\Card;
+use common\models\Customer;
+
+/**
+ * ContactForm is the model behind the contact form.
+ */
+class ProductLookupForm extends Model
+{
+	
+	public $filter_text;
+	
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        ];
+    }
+
+    
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'verifyCode' => 'Verification Code',
+        ];
+    }
+    
+
+}
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 36b2238..10fd0ec 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -6,6 +6,12 @@ use Yii;
 use yii\base\Model;
 use common\models\Card;
 use common\models\Customer;
+use common\models\Product;
+use common\models\Transfer;
+use yii\base\Object;
+use common\models\Account;
+use common\models\Discount;
+use common\models\Currency;
 
 /**
  * ContactForm is the model behind the contact form.
@@ -13,25 +19,86 @@ use common\models\Customer;
 class ProductSaleForm extends Model
 {
 	
-	public $productNumber;
-	public $productBarcode;
+	public $id_product;
 	public $count;
-	public $currency;
-	public $account;
+	public $id_currency;
+	public $id_account;
+	public $id_discount;
 	public $comment;
+	public $barcode;
+	public $product_number;
+	public $sale_price;
+	public $product_name;
 	
 	
+	public $accounts;
+	public $currencies;
+	public $discounts;
+	
+	public $product;
+	public $account;
+	public $currency;
+	public $discount;
+	
+	public $transfer;
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['number'], 'required'],
+            [['id_product','count','id_account'], 'required'],
+            [['id_product','id_currency','id_account', 'id_discount','count'], 'integer'],
+            [['comment'], 'string' ,'max' => 255],
+            [['id_product' ], 'validateProduct'],
+            [['count' ], 'validateCount'],
+            [['id_currency' ], 'validateCurrency'],
+            [['id_account' ], 'validateAccount'],
+            [['id_discount' ], 'validateDiscount'],
         ];
     }
 
     
+    public function validateProduct($attribute,$params){
+    	$this->product = Product::findOne($this->id_product);
+    	
+    	if ( !isset( $this->product ) ){
+    		$this->addError($attribute, Yii::t('frontend/product', 'Product not found!'));
+    	}
+    	
+    	
+    }
+    
+    public function validateCount($attribute,$params){
+    	if ( $this->product != null ){
+    		if ( $this->product->stock  < $this->count ){
+    			$this->addError($attribute, Yii::t('frontend/product', 'Stock {stock} lower then {count}!', [ 'count' => $this->count, 'stock' => $this->product->stock ] ));
+    		}
+    	}
+    }
+    public function validateCurrency($attribute,$params){
+    	if ( isset($this->id_currency ) ){
+    		$this->currency = Currency::findOne($this->id_currency);
+    		if ( !isset( $this->currency )  ){
+    			$this->addError($attribute,Yii::t('frontend/product', 'Currency not found') );
+    		}
+    	}		 
+    }
+    
+    public function validateAccount($attribute,$params){
+    	$this->account = Account::findOne($this->id_account);
+    }
+    
+    public function validateDiscount($attribute,$params){
+    	if (  isset( $this->id_discount ) ){
+	    	$this->discount = Discount::findOne($this->id_discount);
+	    	if ( !isset( $this->discount )  ){
+	    		$this->addError($attribute,Yii::t('frontend/product', 'Discount not found') );
+	    	}
+    	}
+    }
+    
     /**
      * @inheritdoc
      */
@@ -42,5 +109,32 @@ class ProductSaleForm extends Model
         ];
     }
     
+    
+    public function save(){
+    	if ( $this->validate() ){
+	    	$this->saveTransfer();
+	    	$this->saveProduct();
+	    	return true;
+    	} 
+    	return false;
+    }
+    
+    protected function saveTransfer(){
+    	
+    	$this->transfer =  Transfer::createProductTransfer($this->account, $this->discount, $this->currency, $this->count,   $this->product);
+    	/*
+ 		*/
+    	$this->transfer->status = Transfer::STATUS_PAID;
+    	if ( isset($this->comment)){
+ 			$this->transfer->comment = $this->comment;
+    	}
+ 		$this->transfer->id_user = Yii::$app->user->id;
+ 		$this->transfer->save();
+    }
 
+    protected function saveProduct(){
+    	Product::sellProduct($this->product, $this->count);
+    	$this->product->save();
+    }
+    
 }
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index e44cec4..150c5ec 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -1,85 +1,106 @@
 <?php
 use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+use yii\helpers\ArrayHelper;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\ProductSaleForm */
+/* @var $form yii\bootstrap\ActiveForm */
+/* @var $currencies common\models\Currency[] */
+
+
+function mkOptions($options){
+	// 	$o = $options;
+
+	$all = ['' => '-' ];
+
+	$o =  $all + $options;
+
+	return $o;
+}
+
+$currencyOptions = mkOptions( ArrayHelper::map($currencies, 'id_currency', 'name') );
+$accountOptions = mkOptions( ArrayHelper::map($accounts, 'id_account', 'name') );
+$discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name') );
 ?>
+<?php ?>
+
 <div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Product name'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::tag('span','',[ 'class' => 'product product-name']); ?>
+	<div class="col-md-12">
+		<?php echo  $this->render('_view')?>
 	</div>
 </div>
+
 <div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Product price'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::tag('span','',[ 'class' => 'product product-price']); ?>
+	<?php   $form =  ActiveForm::begin([
+	'id' => 'filter_text_form',
+	'class' =>'form-inline',
+		'layout' => 'horizontal',
+			 'fieldConfig' => [
+		        'horizontalCssClasses' => [
+		            'label' => 'col-sm-5',
+		            'offset' => 'col-sm-offset-6',
+		            'wrapper' => 'col-sm-7',
+		            'error' => '',
+		            'hint' => '',
+		        ],
+		    ],
+		]	)?>
+	<div class='col-md-12'>
+		<?php  echo $form->field($lookupModel,'filter_text')->textInput(['id'=>'filter_text']); ?>
 	</div>
+	<?php    ActiveForm::end()?>
 </div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Product number'))?>
+
+<?php $form = ActiveForm::begin(
+		[
+			'id' => 'product_form',
+			'class' =>'form-inline',
+			'layout' => 'horizontal',
+				 'fieldConfig' => [
+			        'horizontalCssClasses' => [
+			            'label' => 'col-sm-5',
+			            'offset' => 'col-sm-offset-6',
+			            'wrapper' => 'col-sm-7',
+			            'error' => '',
+			            'hint' => '',
+			        ],
+			    ],
+		]	
+	); ?>
+	<?php echo Html::activeHiddenInput($model, 'id_product') ?>
+
+	<div class="row">
+		<div class='col-md-12'>
+			<?php echo $form->field($model, 'count')->input("number")  ?>
+		</div>
 	</div>
-	<div class='col-md-6'>
-		<?php echo Html::tag('span','',[ 'class' => 'product product-number']); ?>
+	<div class="row">
+		<div class='col-md-12'>
+			<?php echo $form->field($model,'id_currency')->dropDownList($currencyOptions)  ?>
+		</div>
 	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Barcode'))?>
+	<div class="row">
+		<div class='col-md-12'>
+			<?php echo $form->field($model,'id_account')->dropDownList($accountOptions)  ?>
+		</div>
 	</div>
-	<div class='col-md-6'>
-		<?php echo Html::tag('span','',[ 'class' => 'product barcode']); ?>
+	<div class="row">
+		<div class='col-md-12'>
+			<?php echo $form->field($model,'id_discount')->dropDownList($discountOptions)  ?>
+		</div>
 	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Count'))?>
+	<div class="row">
+		<div class='col-md-12'>
+			<?php  echo $form->field( $model,'comment' )->textarea() ?>
+		</div>
 	</div>
-	<div class='col-md-6'>
-		<?php echo Html::textInput('count') ?>
+	<div class="row">
+		<div class='col-md-5'>
+			<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success', 'id' => 'btn_sell'] );?>
+		</div>
+		<div class='col-md-7'>
+			<?php echo Html::a(Yii::t("frontend/product","Sell product and add to total"),null,['class' => 'btn btn-success', 'id' => 'btn_sell_append'] );?>
+		</div>
 	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Currency'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::dropDownList('currency',null,[],[]); ?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Account'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::dropDownList('account',null,[],[]); ?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Discount'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::dropDownList('discount',null,[],[]); ?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Comment'))?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-10'>
-		<?php echo Html::textarea('comment', ''); ?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-3'>
-		<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success'] );?>
-	</div>
-	<div class='col-md-7'>
-		<?php echo Html::a(Yii::t("frontend/product","Sell product and add to total"),null,['class' => 'btn btn-success'] );?>
-	</div>
-</div>
\ No newline at end of file
+<?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/frontend/views/product/_sold_items.php b/frontend/views/product/_sold_items.php
index a737b6e..f9a7162 100644
--- a/frontend/views/product/_sold_items.php
+++ b/frontend/views/product/_sold_items.php
@@ -1,19 +1,9 @@
 <?php
 use yii\bootstrap\Html;
 ?>
-<div class="row">
-	<div class='col-md-10'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Bill'))?>
-	</div>
-</div>
-<div class="row">
-	<div class='col-md-4'>
-		<?php echo Html::label(Yii::t('frontend/product', 'Debit'))?>
-	</div>
-	<div class='col-md-6'>
-		<?php echo Html::tag("span",'0,00',['sale', 'sale-debit'])?>
-	</div>
-</div>
+
+
+
 <div class="row">
 	<div class='col-md-12'>
 		<table class="table table-bordered table-striped">
@@ -37,27 +27,6 @@ use yii\bootstrap\Html;
 				</tr>
 			</thead>
 			<tbody>
-				<tr>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-				</tr>
 			</tbody>
 		</table>
 	</div>
diff --git a/frontend/views/product/_view.php b/frontend/views/product/_view.php
new file mode 100644
index 0000000..cae956b
--- /dev/null
+++ b/frontend/views/product/_view.php
@@ -0,0 +1,56 @@
+<?php
+?>
+<table class="table table-bordered table-striped">
+	<tbody>
+		<tr>
+			<th>
+				<?php echo Yii::t('frontend/product','Name')?>
+			</th>
+			<td colspan="3">
+				<span class="product-name"></span>
+			</td>
+		</tr>
+		<tr>
+			<th>
+				<?php echo Yii::t('frontend/product','Barcode')?>
+			</th>
+			<td>
+				<span class="product-barcode">123456789</span>
+			</td>
+			<th>
+				<?php echo Yii::t('frontend/product','Product number')?>
+			</th>
+			<td>
+				<span class="product-number">123456789</span>
+			</td>
+		</tr>
+		<tr>
+			<th>
+				<?php echo Yii::t('frontend/product','Stock'). ' (Db)'?>
+			</th>
+			<td>
+				<span class="product-stock"></span>  
+			</td>
+			<th>
+				<?php echo Yii::t('frontend/product','Count'). ' (Db)'?>
+			</th>
+			<td>
+				<span class="product-count">1</span> 
+			</td>
+		</tr>
+		<tr>
+			<th>
+				<?php echo Yii::t('frontend/product','Sale Price')?>
+			</th>
+			<td>
+				<span class="product-sale-price"></span>
+			</td>
+			<th>
+				<?php echo Yii::t('frontend/product','Price')?>
+			</th>
+			<td>
+				<span class="product-price">100 000</span>
+			</td>
+		</tr>
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 42c3a00..c3a2ad8 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -6,6 +6,12 @@ use yii\helpers\Html;
 use common\models\Product;
 use frontend\assets\ProductSellAsset;
 use yii\helpers\Url;
+use yii\bootstrap\ActiveForm;
+use yii\helpers\ArrayHelper;
+
+/* @var $this yii\web\View */
+/* @var $form yii\bootstrap\ActiveForm */
+/* @var $currencies common\models\Currency[] */
 
 ProductSellAsset::register($this);
 
@@ -20,9 +26,19 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 ?>
 
 <style>
+/*
 	.product-form input, .product-form select, .product-form textarea{
 		width: 100%;
 	}
+	*/
+	.product-count{
+		text-align: right;
+	}
+	
+	.form-group{
+		margin-bottom: 3px;
+	}
+	
 </style>
 
 <div class='row'>
@@ -32,23 +48,11 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 		<div class='col-md-4'>
 			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['product/sale'] ] )?>
 		</div>
-		<div class='col-md-4'>
-		</div>
 	</div>
 	<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
-	<div class='row'>
-		<div class='col-md-4'>
-			<?php  echo Html::label(Yii::t('frontend/product', 'Product'))?>
-			<?php  echo Html::textInput('filter_text','', ['id'=>'filter_text'])?>
-		</div>
-		<div class='col-md-4'>
-		</div>
-		<div class='col-md-4'>
-		</div>
-	</div>
 	<div class='row '>
 		<div class='col-md-6 product-form'>
-			<?php echo $this->render('_sale_form' ) ?>	
+			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts,]) ?>	
 		</div>
 		<div class='col-md-6'>
 			<?php echo $this->render('_sold_items' ) ?>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index dd8a1d5..821ece1 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -1,35 +1,98 @@
 function ProductSell(o){
 	
+	var app = this;
+	var product = null;
+	
 	this.defaults = {
 		selector_filter_text: '#filter_text',
-		lookup_product_url: ''	
+		lookup_product_url: ''	,
+	    selector_form: '#product_form',
+	    form_invalid: 'Az ürlap hibákat tartalmaz'
 	};
 	
 	init();
 	
 	function init(){
-		this.defaults = $.extend(this.defaults, o );
+		$.extend(app.defaults, o );
 		addBehaviorEnterPressedListener();
+		addBehaviourBtnSell();
+		addBehaviourBtnSellAndAppendToBill();
+		addBehaviorAjaxSubmit();
+		setFocus();
+		addBehaviorCountEnterPressedListener();
+		addBehaviorCountChangedListener();
+		addBehaviorCurrencyEnterPressedListener();
+		addBehaviorAccountEnterPressedListener();
+		addBehaviorDiscountEnterPressedListener();
+		productChanged();
 	}
 	
+	function setFocus(){
+		$("#filter_text").focus();
+		
+	}
 	
 	function addBehaviorEnterPressedListener(){
-		alert($(  this.defaults.selector_filter_text ).length);
-		$(  this.defaults.selector_filter_text ).keypress(function( event ) {
+		$(   app.defaults.selector_filter_text ).keypress(function( event ) {
 			  if ( event.which == 13 ) {
 				  event.preventDefault();
 				  lookupProduct();
 			  }
-				
+		});	
+	}
+	
+	function addBehaviorCountEnterPressedListener(){
+		$(   '#productsaleform-count' ).keypress(function( event ) {
+			if ( event.which == 13 ) {
+				event.preventDefault();
+				event.stopImmediatePropagation();
+				$('#productsaleform-id_currency').focus();
+			}
+		});	
+	}
+	
+	function addBehaviorCurrencyEnterPressedListener(){
+		$(   '#productsaleform-id_currency' ).keypress(function( event ) {
+			if ( event.which == 13 ) {
+				event.preventDefault();
+				event.stopImmediatePropagation();
+				$('#productsaleform-id_account').focus();
+			}
+		});	
+	}
+	function addBehaviorAccountEnterPressedListener(){
+		$(   '#productsaleform-id_account' ).keypress(function( event ) {
+			if ( event.which == 13 ) {
+				event.preventDefault();
+				event.stopImmediatePropagation();
+				$('#productsaleform-id_discount').focus();
+			}
+		});	
+	}
+	
+	function addBehaviorDiscountEnterPressedListener(){
+		$(   '#productsaleform-id_discount' ).keypress(function( event ) {
+			if ( event.which == 13 ) {
+				event.preventDefault();
+				event.stopImmediatePropagation();
+				$('#productsaleform-comment').focus();
+			}
+		});	
+	}
+	
+	function addBehaviorCountChangedListener(){
+		$(   '#productsaleform-count' ).change(function( event ) {
+			refreshCalculatedValues();
+			 
 		});	
 	}
 	
 	function lookupProduct(){
 		var data, url;
 		
-		url = this.defaults.lookup_product_url;
+		url = app.defaults.lookup_product_url;
 		data = {
-			'query' : 	$(  this.defaults.selector_filter_text ).val()
+			'query' : 	$(  app.defaults.selector_filter_text ).val()
 		};
 		
 		$.ajax({
@@ -41,27 +104,106 @@ function ProductSell(o){
 	}
 	
 	function onLookupProductReady(  data  ){
-		alert('ok');
-		productChanged(data.product);
+		app.product = data.product;
+		productChanged();
 	}
 	
 	
-	function productChanged(product){
+	function productChanged( ){
 		clearForm();
-		if ( product == null){
-			applyProduct();
+		if ( app.product != null){
+			applyProduct( app.product);
+			refreshCalculatedValues();
+			$("#productsaleform-count").focus().select();
 		}
 	}
 	
 	function clearForm(){
 		$('.product-name').html('-');
+		$('.product-price').html('-');
+		$('.product-number').html('-');
+		$('.product-barcode').html('-');
+		$('.product-stock').html('-');
+		$('.product-price').html('-');
+		$('.product-sale-price').html('-');
+		$("#productsaleform-count").val(1);
+		$('#productsaleform-id_product').val('');
+		$('#productsaleform-id_account').val('');
 	}
 	
 	function applyProduct(product){
+		$('#productsaleform-id_product').val(product.id_product);
 		$('.product-name').html(product.name);
+		$('.product-sale-price').html(product.sale_price);
+		$('.product-number').html(product.product_number);
+		$('.product-barcode').html(product.barcode);
+		$('.product-stock').html(product.stock);
+		$('#productsaleform-id_account').val(product.id_account);
+		
 	}
 		
+	function refreshCalculatedValues(){
+		var count,price;
+		count = $("#productsaleform-count").val();
+		count = +count;
+		if ( isNaN(count)){
+			count = 0;
+		}
+		price = count * app.product.sale_price;
+		$('.product-count').html(count);
+		$('.product-price').html(price);
+	}
+
+	function addBehaviourBtnSell(){
+		$('#btn_sell').on('click',submitSell);
+	}
 	
+	function addBehaviourBtnSellAndAppendToBill(){
+		$('#btn_sell_append').on('click',submitSell);
+	}
+	
+	function submitSell(){
+		$('#product_form').submit();
+	}
+	
+	function addBehaviorAjaxSubmit(){
+		
+		$('body').on('beforeSubmit', '#product_form', function () {
+			     var form = $(this);
+			     // return false if form still have some validation errors
+			     if (form.find('.has-error').length) {
+			    	 $.notify(app.defaults.form_invalid, { 'type' : 'success' });
+			          return false;
+			     }
+			     // submit form
+			     $.ajax({
+			          url: form.attr('action'),
+			          type: 'post',
+			          data: form.serialize(),
+			          success: function (response) {
+			               // do something with response
+			        	  if ( response.code == 'success'){
+			        		  $.notify(response.message, { 'type' : 'success' });
+			        		  clearForm();
+			        		  refreshCalculatedValues();
+			        		  $("#filter_text").val('');
+			        		  setFocus();
+			        	  }else if ( response.code == 'invalid'){
+			        		  if ( response.errors ){
+			        			  	$.each(response.errors, function (key, value){
+			        			  		var message;
+			        			  		message = $.map(value, function(obj){ return obj }).join('  ');
+				        			  		$.notify(message, { 'type' : 'danger' });
+				        			  	}
+			        			  	);
+			        		  }
+			        	  }
+			          }
+			     });
+			     return false;
+			});
+		
+	}
 	
 	
 }

From 203dfeac72c0bcc792c51a5eaf1447ec16a73045 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 5 Oct 2015 09:17:45 +0200
Subject: [PATCH 032/100] add js transferlist

---
 common/models/UserSoldItem.php                | 45 +++++++++++++
 .../m151005_054611_add__user_sold_item.php    | 42 ++++++++++++
 frontend/assets/ProductSellAsset.php          |  1 +
 frontend/web/js/transferlist.js               | 65 +++++++++++++++++++
 4 files changed, 153 insertions(+)
 create mode 100644 common/models/UserSoldItem.php
 create mode 100644 console/migrations/m151005_054611_add__user_sold_item.php
 create mode 100644 frontend/web/js/transferlist.js

diff --git a/common/models/UserSoldItem.php b/common/models/UserSoldItem.php
new file mode 100644
index 0000000..ed1029a
--- /dev/null
+++ b/common/models/UserSoldItem.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "user_sold_item".
+ *
+ * @property integer $id_user_sold_item
+ * @property integer $id_user
+ * @property integer $id_transfer
+ */
+class UserSoldItem extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'user_sold_item';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_user', 'id_transfer'], 'integer']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_user_sold_item' => Yii::t('common/user-sold-item', 'Id User Sold Item'),
+            'id_user' => Yii::t('common/user-sold-item', 'Id User'),
+            'id_transfer' => Yii::t('common/user-sold-item', 'Id Transfer'),
+        ];
+    }
+}
diff --git a/console/migrations/m151005_054611_add__user_sold_item.php b/console/migrations/m151005_054611_add__user_sold_item.php
new file mode 100644
index 0000000..248aa15
--- /dev/null
+++ b/console/migrations/m151005_054611_add__user_sold_item.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151005_054611_add__user_sold_item extends Migration
+{
+    public function up()
+    {
+		
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%user_sold_item}}', [
+    			'id_user_sold_item' => $this->primaryKey(),
+    			'id_user' =>  $this->integer(11) ,
+    			'id_transfer' =>  $this->integer(11) ,
+    	], $tableOptions);
+    	
+    }
+
+    public function down()
+    {
+        echo "m151005_054611_add__user_sold_item cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/assets/ProductSellAsset.php b/frontend/assets/ProductSellAsset.php
index 74fb237..6f76e29 100644
--- a/frontend/assets/ProductSellAsset.php
+++ b/frontend/assets/ProductSellAsset.php
@@ -20,6 +20,7 @@ class ProductSellAsset extends AssetBundle
     public $css = [
     ];
      public $js = [
+    	'js/transferlist.js',
     	'js/product.sell.js',
     ];
     public $depends = [
diff --git a/frontend/web/js/transferlist.js b/frontend/web/js/transferlist.js
new file mode 100644
index 0000000..50f84ed
--- /dev/null
+++ b/frontend/web/js/transferlist.js
@@ -0,0 +1,65 @@
+$.widget( "fitness.transferList", {
+	options: {
+		transfers: [],
+		columns: [
+		   { 'label' : 'Termék' },
+		   { 'label' : 'Ár' },
+		   { 'label' : 'Db' },
+		   { 'label' : 'Összesen' },
+		 ]
+	},
+	_create: function() {
+		var o;
+		o = this.options;
+	},
+	_refresh: function(){
+		var s;
+		s = this._render('table',{ 'columns' : this.options.columns });
+		this.element.html(s);
+	},
+	_render: function(template,params){
+		var s;
+		var columsn;
+		s = "";
+			switch(template){
+			case 'table':
+				s += this._render('openTable', {});
+				s += this._render('header', { 'columns' : params.columns });
+				s += this._render('closeTable', {});
+				break;
+			case 'openTable':
+				s += '<table class="table table-bordered table-striped">';
+				break;
+			case 'closeTable':
+				s += '</table>';
+				break;
+			case 'header':
+				s += '<thead>'
+				columns = params.columns;
+				for(var i = 0; i < columns.length; i++){
+					s += this._render('headrow', { 'column' : columns[i] })
+				}
+				s += '</thead>';
+				break;
+			case 'headrow':
+				s += '<th>';
+				s += params.column.label;
+				s += '</th>';
+				break;
+			case 'body':
+				s += '<tbody>';
+				for( var i = 0; i < transfers.length; i++){
+					
+				}
+				s += '</tbody>';
+				break;
+			case 'row':
+			
+			break;
+			}
+		
+		return s;
+	}
+	
+	 
+});
\ No newline at end of file

From 2610749305dc3b16ee63b72a7d6b1eb45f2899bf Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 5 Oct 2015 17:24:26 +0200
Subject: [PATCH 033/100] sell product list

---
 common/models/Transfer.php                    | 44 +++++++++
 common/models/UserSoldItem.php                | 20 ++++
 composer.json                                 |  3 +-
 composer.lock                                 | 77 ++++++++++++++-
 ...95529_alter__table__discount_rename_id.php | 30 ++++++
 frontend/assets/AppAsset.php                  |  2 +-
 frontend/assets/ProductSellAsset.php          |  1 +
 frontend/controllers/ProductController.php    | 14 ++-
 frontend/models/ProductSaleForm.php           | 22 +++++
 frontend/views/product/_sale_form.php         |  1 +
 frontend/views/product/_sold_items.php        |  4 +-
 frontend/views/product/_view.php              |  2 +-
 frontend/views/product/sale.php               |  8 +-
 frontend/web/js/product.sell.js               | 91 +++++++++++++-----
 frontend/web/js/transferlist.js               | 94 +++++++++++++++++--
 15 files changed, 373 insertions(+), 40 deletions(-)
 create mode 100644 console/migrations/m151005_095529_alter__table__discount_rename_id.php

diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index f455b10..0c0db1e 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -4,6 +4,7 @@ namespace common\models;
 
 use Yii;
 use yii\base\Object;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "transfer".
@@ -94,6 +95,10 @@ class Transfer extends \yii\db\ActiveRecord
     	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
     }
     
+    public function getUserSoldItem(){
+    	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
+    }
+    
 	
     public function toProductSoldString(){
     	$s = "";
@@ -143,4 +148,43 @@ class Transfer extends \yii\db\ActiveRecord
     	return $transfer;
     }
     
+    public static function modelsToArray($transfers,$default = null){
+    	 
+    	if ( $transfers == null ){
+    		return $default;
+    	}
+    	 
+    	return ArrayHelper::toArray($transfers, [
+    			'common\models\Transfer' => [
+	    			'id_transfer',
+	    			'item_price',
+	    			'count',
+	    			'money',
+	    			'money_currency',
+	    			'account_name' => function ($transfer) {
+	    				return $transfer->account->name;
+	    			},
+	    			'product_name' => function ($transfer) {
+	    				return $transfer->product->name;
+	    			},
+	    			'category' => function ($transfer) {
+	    				return $transfer->product->productCategoryName;
+	    			},
+    			],
+		]);
+    }
+    
+    
+    public static function readUserSoldTransfers($user){
+    	$transfers = [];
+    	
+    	$query = Transfer::find();
+    	
+    	$query->innerJoinWith('userSoldItem');
+    	$query->andWhere(['user_sold_item.id_user' => $user->id ]);
+    	$transfers = $query->all();
+    	
+    	return $transfers;
+    }
+    
 }
diff --git a/common/models/UserSoldItem.php b/common/models/UserSoldItem.php
index ed1029a..2d3ad74 100644
--- a/common/models/UserSoldItem.php
+++ b/common/models/UserSoldItem.php
@@ -42,4 +42,24 @@ class UserSoldItem extends \yii\db\ActiveRecord
             'id_transfer' => Yii::t('common/user-sold-item', 'Id Transfer'),
         ];
     }
+    
+    public function getAccount(){
+    	$this->hasOne(Transfer::className(), ["id_transfer" => "id_transfer"]);
+    }
+    
+    public function getUser(){
+    	$this->hasOne(User::className(), ["id" => "id_user"]);
+    }
+    
+    
+    public static function read($user){
+    	
+    	$query = UserSoldItem::find();
+    	$query->andWhere(['id_user' => $user->id_user]);
+    	$result = $query->all();
+    	
+    }
+    
+    
+    
 }
diff --git a/composer.json b/composer.json
index 61e7748..1bb2607 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
         "yiisoft/yii2-swiftmailer": "*",
         "kartik-v/yii2-widgets": "^3.4",
         "kartik-v/yii2-widget-typeahead": "*",
-        "bower-asset/remarkable-bootstrap-notify": "^3.1"
+        "bower-asset/remarkable-bootstrap-notify": "^3.1",
+        "yiisoft/yii2-jui": "^2.0"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index c305ed7..4925c02 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a1314409d3150e430e6ff7e350de0e3b",
+    "hash": "7bff75eba2c88cda67ff49b95bda9644",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -99,6 +99,31 @@
                 "library"
             ]
         },
+        {
+            "name": "bower-asset/jquery-ui",
+            "version": "1.11.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/components/jqueryui.git",
+                "reference": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/components/jqueryui/zipball/c34f8dbf3ba57b3784b93f26119f436c0e8288e1",
+                "reference": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.6"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "jquery-ui.js"
+                ],
+                "bower-asset-ignore": []
+            }
+        },
         {
             "name": "bower-asset/jquery.inputmask",
             "version": "3.1.63",
@@ -1715,6 +1740,56 @@
             ],
             "time": "2015-03-01 06:22:44"
         },
+        {
+            "name": "yiisoft/yii2-jui",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-jui.git",
+                "reference": "ce16f29cca654702c2ee500ccad9657a2d2e6a09"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/ce16f29cca654702c2ee500ccad9657a2d2e6a09",
+                "reference": "ce16f29cca654702c2ee500ccad9657a2d2e6a09",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery-ui": "1.11.*@stable",
+                "yiisoft/yii2": ">=2.0.4"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                },
+                "asset-installer-paths": {
+                    "npm-asset-library": "vendor/npm",
+                    "bower-asset-library": "vendor/bower"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\jui\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com"
+                }
+            ],
+            "description": "The Jquery UI extension for the Yii framework",
+            "keywords": [
+                "jQuery UI",
+                "yii2"
+            ],
+            "time": "2015-05-10 22:09:43"
+        },
         {
             "name": "yiisoft/yii2-swiftmailer",
             "version": "2.0.4",
diff --git a/console/migrations/m151005_095529_alter__table__discount_rename_id.php b/console/migrations/m151005_095529_alter__table__discount_rename_id.php
new file mode 100644
index 0000000..780780d
--- /dev/null
+++ b/console/migrations/m151005_095529_alter__table__discount_rename_id.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151005_095529_alter__table__discount_rename_id extends Migration
+{
+    public function up()
+    {
+    	$this->renameColumn('discount','id_warehouse','id_discount');
+    }
+
+    public function down()
+    {
+        echo "m151005_095529_alter__table__discount_rename_id cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index d30cb4c..c37175f 100644
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -26,6 +26,6 @@ class AppAsset extends AssetBundle
     public $depends = [
         'yii\web\YiiAsset',
         'yii\bootstrap\BootstrapAsset',
-    	'frontend\assets\GrowlAsset'
+    	'frontend\assets\GrowlAsset',
     ];
 }
diff --git a/frontend/assets/ProductSellAsset.php b/frontend/assets/ProductSellAsset.php
index 6f76e29..30bed56 100644
--- a/frontend/assets/ProductSellAsset.php
+++ b/frontend/assets/ProductSellAsset.php
@@ -25,5 +25,6 @@ class ProductSellAsset extends AssetBundle
     ];
     public $depends = [
         'frontend\assets\AppAsset',
+        'yii\jui\JuiAsset',
     ];
 }
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 002c51f..3ec9acd 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -17,6 +17,8 @@ use yii\base\Object;
 use common\models\Currency;
 use common\models\Account;
 use common\models\Discount;
+use common\models\Transfer;
+use common\models\User;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -54,6 +56,7 @@ class ProductController extends Controller
     	
     	$discounts = Discount::read();
     	
+    	$user = User::findOne(Yii::$app->user->id ); 
     	
     	if (Yii::$app->request->isAjax) {
     		
@@ -76,10 +79,18 @@ class ProductController extends Controller
 	     			$result['code'] = 'invalid';
 	     			$result['errors'] = $model->getErrors();
 	     		}
-	        } 
+	     	}
+
+	     	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+	     	$result['transfers'] = $userTransfers;
+	     	
     		return $result;
     	
     	}else{
+    		
+//     		$userTransfers = Transfer::readUserSoldTransfers( $user );
+    		$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+    		
 	    	return $this->render("sale",[
 	    			'customer' => $this->customer,
 	    			'card' => $this->card,
@@ -88,6 +99,7 @@ class ProductController extends Controller
 	    			'currencies' => $currencies,
 	    			'accounts' => $accounts,
 	    			'discounts' => $discounts,
+	    			'userTransfers' => $userTransfers
 	    	]);
     	}
     	
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 10fd0ec..db7b219 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -12,6 +12,7 @@ use yii\base\Object;
 use common\models\Account;
 use common\models\Discount;
 use common\models\Currency;
+use common\models\UserSoldItem;
 
 /**
  * ContactForm is the model behind the contact form.
@@ -19,6 +20,8 @@ use common\models\Currency;
 class ProductSaleForm extends Model
 {
 	
+	public $append_to_sold_list;
+	
 	public $id_product;
 	public $count;
 	public $id_currency;
@@ -51,11 +54,13 @@ class ProductSaleForm extends Model
             [['id_product','count','id_account'], 'required'],
             [['id_product','id_currency','id_account', 'id_discount','count'], 'integer'],
             [['comment'], 'string' ,'max' => 255],
+            [['append_to_sold_list'], 'string' ,'max' => 10],
             [['id_product' ], 'validateProduct'],
             [['count' ], 'validateCount'],
             [['id_currency' ], 'validateCurrency'],
             [['id_account' ], 'validateAccount'],
             [['id_discount' ], 'validateDiscount'],
+            [['id_discount' ], 'validateDiscount'],
         ];
     }
 
@@ -114,6 +119,7 @@ class ProductSaleForm extends Model
     	if ( $this->validate() ){
 	    	$this->saveTransfer();
 	    	$this->saveProduct();
+	    	$this->appendToSoldList();
 	    	return true;
     	} 
     	return false;
@@ -137,4 +143,20 @@ class ProductSaleForm extends Model
     	$this->product->save();
     }
     
+    public function isAppendToList(){
+    	$result = false;
+    	if ( isset( $this->append_to_sold_list )  && $this->append_to_sold_list  == 'append' ){
+    		$result = true;
+    	}
+    	return $result;
+    }
+    
+    public function appendToSoldList(){
+    	if ( $this->isAppendToList() ){
+    		$item = new UserSoldItem();
+    		$item->id_transfer = $this->transfer->id_transfer;
+    		$item->id_user = Yii::$app->user->id;
+    		$item->save(false);
+    	}
+    }
 }
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index 150c5ec..ae42348 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -69,6 +69,7 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 		]	
 	); ?>
 	<?php echo Html::activeHiddenInput($model, 'id_product') ?>
+	<?php echo Html::activeHiddenInput($model, 'append_to_sold_list') ?>
 
 	<div class="row">
 		<div class='col-md-12'>
diff --git a/frontend/views/product/_sold_items.php b/frontend/views/product/_sold_items.php
index f9a7162..fddf34c 100644
--- a/frontend/views/product/_sold_items.php
+++ b/frontend/views/product/_sold_items.php
@@ -5,7 +5,8 @@ use yii\bootstrap\Html;
 
 
 <div class="row">
-	<div class='col-md-12'>
+	<div class='col-md-12 '>
+		<div class="sold-items-container">
 		<table class="table table-bordered table-striped">
 			<thead>
 				<tr>
@@ -29,5 +30,6 @@ use yii\bootstrap\Html;
 			<tbody>
 			</tbody>
 		</table>
+		</div>
 	</div>
 </div>
diff --git a/frontend/views/product/_view.php b/frontend/views/product/_view.php
index cae956b..ab6247c 100644
--- a/frontend/views/product/_view.php
+++ b/frontend/views/product/_view.php
@@ -1,6 +1,6 @@
 <?php
 ?>
-<table class="table table-bordered table-striped">
+<table class="table table-bordered table-striped table-product">
 	<tbody>
 		<tr>
 			<th>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index c3a2ad8..afa5589 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -18,11 +18,11 @@ ProductSellAsset::register($this);
 $options = [];
 
 $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
+$options['sold_items'] = $userTransfers;
+
 
 $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 
-
-
 ?>
 
 <style>
@@ -49,12 +49,14 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['product/sale'] ] )?>
 		</div>
 	</div>
-	<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
 	<div class='row '>
 		<div class='col-md-6 product-form'>
+			<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
 			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts,]) ?>	
 		</div>
 		<div class='col-md-6'>
+			<h1><?php  echo Yii::t('frontend/product','Sold')?></h1>
 			<?php echo $this->render('_sold_items' ) ?>
+			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'class' => 'btn btn-primary' ]) ?>
 		</div>
 	</div>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 821ece1..f90ae71 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -1,13 +1,21 @@
 function ProductSell(o){
 	
+	/**reference for the instance*/
 	var app = this;
+	/**currently loaded product*/
 	var product = null;
 	
 	this.defaults = {
+		/**id of filter text*/
 		selector_filter_text: '#filter_text',
-		lookup_product_url: ''	,
+		/** ajax url for lookup service*/
+		lookup_product_url: '',
+		/**the id of form*/
 	    selector_form: '#product_form',
-	    form_invalid: 'Az ürlap hibákat tartalmaz'
+	    /**form contains error text*/
+	    form_invalid: 'Az ürlap hibákat tartalmaz',
+	    /**list of sold items by current user*/
+	    sold_items: [],
 	};
 	
 	init();
@@ -25,13 +33,18 @@ function ProductSell(o){
 		addBehaviorAccountEnterPressedListener();
 		addBehaviorDiscountEnterPressedListener();
 		productChanged();
+		createUserSoldItemsTable();
 	}
 	
+	/**
+	 * set the focus for text input #filter_text
+	 * */
 	function setFocus(){
 		$("#filter_text").focus();
 		
 	}
 	
+	/**listen for enter key pressed on #filter_text*/
 	function addBehaviorEnterPressedListener(){
 		$(   app.defaults.selector_filter_text ).keypress(function( event ) {
 			  if ( event.which == 13 ) {
@@ -41,6 +54,7 @@ function ProductSell(o){
 		});	
 	}
 	
+	/**listen for enter key pressed on #productsaleform-count*/
 	function addBehaviorCountEnterPressedListener(){
 		$(   '#productsaleform-count' ).keypress(function( event ) {
 			if ( event.which == 13 ) {
@@ -50,7 +64,7 @@ function ProductSell(o){
 			}
 		});	
 	}
-	
+	/**listen for enter key pressed on #productsaleform-id_currency*/
 	function addBehaviorCurrencyEnterPressedListener(){
 		$(   '#productsaleform-id_currency' ).keypress(function( event ) {
 			if ( event.which == 13 ) {
@@ -60,6 +74,7 @@ function ProductSell(o){
 			}
 		});	
 	}
+	/**listen for enter key pressed on #productsaleform-id_account*/
 	function addBehaviorAccountEnterPressedListener(){
 		$(   '#productsaleform-id_account' ).keypress(function( event ) {
 			if ( event.which == 13 ) {
@@ -69,7 +84,7 @@ function ProductSell(o){
 			}
 		});	
 	}
-	
+	/**listen for enter key pressed on #productsaleform-id_discount*/
 	function addBehaviorDiscountEnterPressedListener(){
 		$(   '#productsaleform-id_discount' ).keypress(function( event ) {
 			if ( event.which == 13 ) {
@@ -79,7 +94,7 @@ function ProductSell(o){
 			}
 		});	
 	}
-	
+	/**listen for event "change"  #productsaleform-count*/
 	function addBehaviorCountChangedListener(){
 		$(   '#productsaleform-count' ).change(function( event ) {
 			refreshCalculatedValues();
@@ -87,6 +102,7 @@ function ProductSell(o){
 		});	
 	}
 	
+	/**load a product from server by exact barcode or product number*/
 	function lookupProduct(){
 		var data, url;
 		
@@ -103,12 +119,13 @@ function ProductSell(o){
 			});
 	}
 	
+	/**succes event handler after lookup product event*/
 	function onLookupProductReady(  data  ){
 		app.product = data.product;
 		productChanged();
 	}
 	
-	
+	/**handles product change.*/
 	function productChanged( ){
 		clearForm();
 		if ( app.product != null){
@@ -119,26 +136,30 @@ function ProductSell(o){
 	}
 	
 	function clearForm(){
-		$('.product-name').html('-');
-		$('.product-price').html('-');
-		$('.product-number').html('-');
-		$('.product-barcode').html('-');
-		$('.product-stock').html('-');
-		$('.product-price').html('-');
-		$('.product-sale-price').html('-');
-		$("#productsaleform-count").val(1);
-		$('#productsaleform-id_product').val('');
-		$('#productsaleform-id_account').val('');
+		var table;
+		table = $('.table-product');
+		table.find('.product-name').html('-');
+		table.find('.product-price').html('-');
+		table.find('.product-number').html('-');
+		table.find('.product-barcode').html('-');
+		table.find('.product-stock').html('-');
+		table.find('.product-price').html('-');
+		table.find('.product-sale-price').html('-');
+		table.find("#productsaleform-count").val(1);
+		table.find('#productsaleform-id_product').val('');
+		table.find('#productsaleform-id_account').val('');
 	}
 	
 	function applyProduct(product){
-		$('#productsaleform-id_product').val(product.id_product);
-		$('.product-name').html(product.name);
-		$('.product-sale-price').html(product.sale_price);
-		$('.product-number').html(product.product_number);
-		$('.product-barcode').html(product.barcode);
-		$('.product-stock').html(product.stock);
-		$('#productsaleform-id_account').val(product.id_account);
+		var table;
+		table = $('.table-product');
+		table.find('#productsaleform-id_product').val(product.id_product);
+		table.find('.product-name').html(product.name);
+		table.find('.product-sale-price').html(product.sale_price);
+		table.find('.product-number').html(product.product_number);
+		table.find('.product-barcode').html(product.barcode);
+		table.find('.product-stock').html(product.stock);
+		table.find('#productsaleform-id_account').val(product.id_account);
 		
 	}
 		
@@ -159,12 +180,22 @@ function ProductSell(o){
 	}
 	
 	function addBehaviourBtnSellAndAppendToBill(){
-		$('#btn_sell_append').on('click',submitSell);
+		$('#btn_sell_append').on('click',submitSellAndAppend);
 	}
 	
 	function submitSell(){
+		$('#productsaleform-append_to_sold_list').val('');
 		$('#product_form').submit();
 	}
+	function submitSellAndAppend(){
+		$('#productsaleform-append_to_sold_list').val('append');
+		$('#product_form').submit();
+	}
+	
+	
+	function refreshSoldUseritems(){
+		$('.sold-items-container').transferList('option','transfers' , app.defaults.sold_items );
+	}
 	
 	function addBehaviorAjaxSubmit(){
 		
@@ -188,6 +219,9 @@ function ProductSell(o){
 			        		  refreshCalculatedValues();
 			        		  $("#filter_text").val('');
 			        		  setFocus();
+			        		  app.defaults.sold_items = response.transfers; 
+			        		  $('.sold-items-container').transferList( 'option', 'transfers' , app.defaults.sold_items );
+			        		  
 			        	  }else if ( response.code == 'invalid'){
 			        		  if ( response.errors ){
 			        			  	$.each(response.errors, function (key, value){
@@ -206,4 +240,13 @@ function ProductSell(o){
 	}
 	
 	
+	function createUserSoldItemsTable(){
+		console.info(  app.defaults.sold_items );
+		$('.sold-items-container').transferList({
+			'transfers' : app.defaults.sold_items
+		});
+	}
+	
+	
+	
 }
diff --git a/frontend/web/js/transferlist.js b/frontend/web/js/transferlist.js
index 50f84ed..dbf2cf0 100644
--- a/frontend/web/js/transferlist.js
+++ b/frontend/web/js/transferlist.js
@@ -6,29 +6,56 @@ $.widget( "fitness.transferList", {
 		   { 'label' : 'Ár' },
 		   { 'label' : 'Db' },
 		   { 'label' : 'Összesen' },
+		 ],
+		 footers: [
+		    { 
+		    	'label' : 'Összesen',
+		    	'total' : function(transfers){
+		    		var totals;
+		    		totals = 0;
+		    		for ( var i = 0; i < transfers.length ; i++ ){
+		    			totals += transfers[i].money;
+		    		}
+		    		return totals;
+		    	},
+		    	'count' : function(transfers){
+		    		var totals;
+		    		totals = 0;
+		    		for ( var i = 0; i < transfers.length ; i++ ){
+		    			totals += transfers[i].count;
+		    		}
+		    		return totals;
+		    	},
+            }
 		 ]
 	},
 	_create: function() {
 		var o;
 		o = this.options;
+		this._refresh();
 	},
 	_refresh: function(){
 		var s;
-		s = this._render('table',{ 'columns' : this.options.columns });
+		s = this._render('table',{ 'columns' : this.options.columns, 'transfers' : this.options.transfers,'footer': this.options.footers });
 		this.element.html(s);
 	},
+	 
 	_render: function(template,params){
 		var s;
 		var columsn;
+		var transfer;
+		var footer;
 		s = "";
 			switch(template){
 			case 'table':
 				s += this._render('openTable', {});
-				s += this._render('header', { 'columns' : params.columns });
-				s += this._render('closeTable', {});
+				s += this._render('header', { 'columns'   : params.columns   });
+				s += this._render('body'  , { 'transfers' : params.transfers });
+				s += this._render('footer'  , { 'transfers' : params.transfers ,'footers': this.options.footers});
+				s += this._render('closeTable', { });
 				break;
 			case 'openTable':
-				s += '<table class="table table-bordered table-striped">';
+				s += '<table class="table table-bordered table-striped table-transfers">';
 				break;
 			case 'closeTable':
 				s += '</table>';
@@ -48,17 +75,70 @@ $.widget( "fitness.transferList", {
 				break;
 			case 'body':
 				s += '<tbody>';
-				for( var i = 0; i < transfers.length; i++){
-					
+				for( var i = 0; i < params.transfers.length; i++){
+					s += this._render('row', { 'transfer' : params.transfers[i] })
 				}
 				s += '</tbody>';
 				break;
 			case 'row':
-			
+				transfer = params.transfer;
+				s += '<tr>';
+				s += '<td class="product-name">';
+				s += transfer.product_name;
+				s += '</td>';
+				s += '<td class="sale-price">';
+				s += transfer.item_price;
+				s += '</td>';
+				s += '<td class=\'product-count\' >';
+				s += transfer.count;
+				s += '</td>';
+				s += '<td class=\'product-money\'  >';
+				s += transfer.money;
+				s += '</td>';
+				s += '</tr>';
 			break;
+			case 'footer':
+				s += "<tfoot>";
+				for ( var i = 0; i < params.footers.length; i++ ){
+					footer = params.footers[i];
+					s += "<tr class='warning' >";
+					s += "<th class='product-name'>";
+					s += footer.label;
+					s += "</th>";
+					s += "<td class=\"sale-price\">";
+					s += "</td>";
+					s += "<td class=\'product-count\' >";
+					s += footer.count( params.transfers );
+					s += "</td>";
+					s += "<td class=\'product-money\'  >";
+					s += footer.total( params.transfers );
+					s += "</td>";
+					s += "</tr>";
+				}
+				s += "</tfoot>";
+				break;
 			}
 		
 		return s;
+	},
+	_setOption: function (key, value) {
+		var self = this,
+			prev = this.options[key],
+			fnMap = {
+				'transfers': function () {
+					self._refresh();
+				},
+			};	
+		 
+			// base
+			this._super(key, value);
+		 
+			if (key in fnMap) {
+				fnMap[key]();
+
+			// Fire event
+//			this._triggerOptionChanged(key, prev, value);
+		  }
 	}
 	
 	 

From 8fbe963379d3884df8d7aba4aaa374c3111ce66d Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 6 Oct 2015 09:29:50 +0200
Subject: [PATCH 034/100] add changes to sell product

---
 common/models/Transfer.php                  |   5 +-
 frontend/controllers/ProductController.php  |  21 +++
 frontend/views/product/sale.php             |  23 ++-
 frontend/web/coffee/keypresslistener.coffee |   6 +
 frontend/web/js/product.sell.js             | 147 +++++++++++++++++---
 frontend/web/js/transferlist.js             |   9 +-
 6 files changed, 186 insertions(+), 25 deletions(-)
 create mode 100644 frontend/web/coffee/keypresslistener.coffee

diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 0c0db1e..84b141e 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -148,7 +148,7 @@ class Transfer extends \yii\db\ActiveRecord
     	return $transfer;
     }
     
-    public static function modelsToArray($transfers,$default = null){
+    public static function modelsToArray($transfers,$default = []){
     	 
     	if ( $transfers == null ){
     		return $default;
@@ -161,6 +161,9 @@ class Transfer extends \yii\db\ActiveRecord
 	    			'count',
 	    			'money',
 	    			'money_currency',
+    				'time' => function ($transfer){
+    					return Yii::$app->formatter->asTime($transfer->created_at);
+    				},
 	    			'account_name' => function ($transfer) {
 	    				return $transfer->account->name;
 	    			},
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 3ec9acd..320f2a1 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -19,6 +19,7 @@ use common\models\Account;
 use common\models\Discount;
 use common\models\Transfer;
 use common\models\User;
+use common\models\UserSoldItem;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -105,6 +106,26 @@ class ProductController extends Controller
     	
     }
     
+    public function actionClearList(){
+    	
+    	if (Yii::$app->request->isAjax) {    	
+    		$result = [];
+    		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    	
+    		$user = User::findOne(Yii::$app->user->id );
+    		
+    		UserSoldItem::deleteAll(['id_user' => Yii::$app->user->id]);
+    		
+    		$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+    		$result['transfers'] = $userTransfers;
+    		$result['code'] = 'success';
+    		
+    		return $result;
+    	}
+    	
+    }
+    
+    
     /**
      * Lists all Product models.
      * @return mixed
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index afa5589..497226a 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -18,6 +18,7 @@ ProductSellAsset::register($this);
 $options = [];
 
 $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
+$options['clear_list_url'] = Url::toRoute(['product/clear-list']);
 $options['sold_items'] = $userTransfers;
 
 
@@ -39,6 +40,24 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 		margin-bottom: 3px;
 	}
 	
+	.table-transfers thead th{
+		text-align: center;
+	}
+	
+	.table-transfers tfoot .product-money,
+	.table-transfers tfoot .product-count,
+	.table-transfers tbody .product-money,
+	.table-transfers tbody .product-count,
+	.table-transfers tbody .sale-price
+	{
+			text-align: right;
+	}
+	.table-transfers tbody .product-name,
+	.table-transfers tbody .product-time
+	{
+			text-align: center;
+	}
+	
 </style>
 
 <div class='row'>
@@ -55,8 +74,8 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts,]) ?>	
 		</div>
 		<div class='col-md-6'>
-			<h1><?php  echo Yii::t('frontend/product','Sold')?></h1>
+			<h1><?php  echo Yii::t('frontend/product','Cart')?></h1>
 			<?php echo $this->render('_sold_items' ) ?>
-			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'class' => 'btn btn-primary' ]) ?>
+			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
 		</div>
 	</div>
diff --git a/frontend/web/coffee/keypresslistener.coffee b/frontend/web/coffee/keypresslistener.coffee
new file mode 100644
index 0000000..ca9ee3e
--- /dev/null
+++ b/frontend/web/coffee/keypresslistener.coffee
@@ -0,0 +1,6 @@
+class KeypressListener
+
+	constructor: (@name) ->
+	
+	listen: ()->
+	
\ No newline at end of file
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index f90ae71..93dd66e 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -10,10 +10,13 @@ function ProductSell(o){
 		selector_filter_text: '#filter_text',
 		/** ajax url for lookup service*/
 		lookup_product_url: '',
+		/**mark list paid url*/
+		clear_list_url: '',
 		/**the id of form*/
 	    selector_form: '#product_form',
 	    /**form contains error text*/
 	    form_invalid: 'Az ürlap hibákat tartalmaz',
+	    message_paid: 'Tételek fizetve',
 	    /**list of sold items by current user*/
 	    sold_items: [],
 	};
@@ -22,18 +25,82 @@ function ProductSell(o){
 	
 	function init(){
 		$.extend(app.defaults, o );
-		addBehaviorEnterPressedListener();
+		app.keyDate = null;
+		app.keySeq = '';
+		app.enterPressed = 0;
 		addBehaviourBtnSell();
 		addBehaviourBtnSellAndAppendToBill();
 		addBehaviorAjaxSubmit();
 		setFocus();
-		addBehaviorCountEnterPressedListener();
+		addEnterPressedBehaviours();
 		addBehaviorCountChangedListener();
+		createUserSoldItemsTable();
+		addBehaviourBtnPaid();
+		productChanged();
+		addDocumentKeypressedListener();
+	}
+	
+	function addDocumentKeypressedListener(){
+		$(  document ).keypress(function( event ) {
+			
+			var tag = event.target.tagName.toLowerCase();
+		    if (   tag != 'input' && tag != 'textarea') {
+			
+		    	resetSequenceIfToMuchTimePassedOrEnterWasPressed(event);
+		    	
+				if ( event.which == 13 ) {
+					app.enterPressed = 1;
+					$( document ).trigger( "wordtyped", [ { originalEvent: event, 'word': app.seq } ] );
+				}else {
+					appendCharToSeq(event);
+				}
+			}
+		});	
+		
+		$( document ).on( "wordtyped", function( event, data ) {
+			var word;
+			word = data.word;
+			if ( word.length > 0){
+				if ( word.length >= 6 && word.length <= 8 ){
+					//lookupuser
+				}else{
+					$("#filter_text").val(data.word);
+					_lookupProduct(data.word);
+				}
+				
+			}
+		});
+		
+	}
+	
+	
+	
+	function resetSequenceIfToMuchTimePassedOrEnterWasPressed(){
+		var prevDate, timePassed;
+		prevDate= app.keyDate;
+		app.keyDate = new Date().getTime();
+		timePassed = app.keyDate - prevDate;
+		if ( app.enterPressed > 0 || timePassed > 2000 ){
+			app.seq = '';
+			app.enterPressed = 0;
+		}
+	}
+	
+	function appendCharToSeq(event){
+		var code,s;
+		code = event.which;
+		if ( code ){
+			s = String.fromCharCode(code);
+			app.seq += s;
+		}
+	}
+	
+	function addEnterPressedBehaviours(){
+		addBehaviorEnterPressedListener();
+		addBehaviorCountEnterPressedListener();
 		addBehaviorCurrencyEnterPressedListener();
 		addBehaviorAccountEnterPressedListener();
 		addBehaviorDiscountEnterPressedListener();
-		productChanged();
-		createUserSoldItemsTable();
 	}
 	
 	/**
@@ -104,19 +171,23 @@ function ProductSell(o){
 	
 	/**load a product from server by exact barcode or product number*/
 	function lookupProduct(){
+		_lookupProduct($(  app.defaults.selector_filter_text ).val());
+	}
+	
+	function _lookupProduct(s){
 		var data, url;
 		
 		url = app.defaults.lookup_product_url;
 		data = {
-			'query' : 	$(  app.defaults.selector_filter_text ).val()
+				'query' : 	s,
 		};
 		
 		$.ajax({
-			  dataType: "json",
-			  url: url,
-			  data: data,
-			  success: onLookupProductReady
-			});
+			dataType: "json",
+			url: url,
+			data: data,
+			success: onLookupProductReady
+		});
 	}
 	
 	/**succes event handler after lookup product event*/
@@ -145,34 +216,36 @@ function ProductSell(o){
 		table.find('.product-stock').html('-');
 		table.find('.product-price').html('-');
 		table.find('.product-sale-price').html('-');
-		table.find("#productsaleform-count").val(1);
-		table.find('#productsaleform-id_product').val('');
-		table.find('#productsaleform-id_account').val('');
+		$('#productsaleform-id_product').val('');
+		$('#productsaleform-id_account').val('');
+		$("#productsaleform-count").val(1);
 	}
 	
 	function applyProduct(product){
 		var table;
 		table = $('.table-product');
-		table.find('#productsaleform-id_product').val(product.id_product);
 		table.find('.product-name').html(product.name);
 		table.find('.product-sale-price').html(product.sale_price);
 		table.find('.product-number').html(product.product_number);
 		table.find('.product-barcode').html(product.barcode);
 		table.find('.product-stock').html(product.stock);
-		table.find('#productsaleform-id_account').val(product.id_account);
+		$('#productsaleform-id_product').val(product.id_product);
+		$('#productsaleform-id_account').val(product.id_account);
 		
 	}
 		
 	function refreshCalculatedValues(){
 		var count,price;
+		var table;
+		table = $('.table-product');
 		count = $("#productsaleform-count").val();
 		count = +count;
 		if ( isNaN(count)){
 			count = 0;
 		}
 		price = count * app.product.sale_price;
-		$('.product-count').html(count);
-		$('.product-price').html(price);
+		table.find('.product-count').html(count);
+		table.find('.product-price').html(price);
 	}
 
 	function addBehaviourBtnSell(){
@@ -199,6 +272,16 @@ function ProductSell(o){
 	
 	function addBehaviorAjaxSubmit(){
 		
+		$('body').on('afterValidate', '#product_form', function () {
+		     var form = $(this);
+		     // return false if form still have some validation errors
+		     if ( form.find('.has-error').length ) {
+		    	 $.notify(app.defaults.form_invalid, { 'type' : 'warning' });
+		     }
+		     
+		});
+		
+		
 		$('body').on('beforeSubmit', '#product_form', function () {
 			     var form = $(this);
 			     // return false if form still have some validation errors
@@ -206,13 +289,13 @@ function ProductSell(o){
 			    	 $.notify(app.defaults.form_invalid, { 'type' : 'success' });
 			          return false;
 			     }
+		
 			     // submit form
 			     $.ajax({
 			          url: form.attr('action'),
 			          type: 'post',
 			          data: form.serialize(),
 			          success: function (response) {
-			               // do something with response
 			        	  if ( response.code == 'success'){
 			        		  $.notify(response.message, { 'type' : 'success' });
 			        		  clearForm();
@@ -220,8 +303,7 @@ function ProductSell(o){
 			        		  $("#filter_text").val('');
 			        		  setFocus();
 			        		  app.defaults.sold_items = response.transfers; 
-			        		  $('.sold-items-container').transferList( 'option', 'transfers' , app.defaults.sold_items );
-			        		  
+			        		  refreshSoldItemsList();
 			        	  }else if ( response.code == 'invalid'){
 			        		  if ( response.errors ){
 			        			  	$.each(response.errors, function (key, value){
@@ -240,8 +322,31 @@ function ProductSell(o){
 	}
 	
 	
+	function refreshSoldItemsList(){
+		$('.sold-items-container').transferList( 'option', 'transfers' , app.defaults.sold_items );
+	}
+	
+	function addBehaviourBtnPaid(  ){
+		$('#btn_paid').on('click',function(){
+			
+			$.ajax({
+				url: app.defaults.clear_list_url,
+				type: 'post',
+		        data: {},
+		        success: function (response) {
+		        	if ( response.code == 'success'){
+		        		app.defaults.sold_items= response.transfers;
+		        		refreshSoldItemsList();
+		        		$.notify(app.defaults.message_paid, { 'type' : 'success' });
+		        	}
+		        }
+			}
+			);
+		});
+	}
+	
+	
 	function createUserSoldItemsTable(){
-		console.info(  app.defaults.sold_items );
 		$('.sold-items-container').transferList({
 			'transfers' : app.defaults.sold_items
 		});
diff --git a/frontend/web/js/transferlist.js b/frontend/web/js/transferlist.js
index dbf2cf0..465cc7d 100644
--- a/frontend/web/js/transferlist.js
+++ b/frontend/web/js/transferlist.js
@@ -2,6 +2,8 @@ $.widget( "fitness.transferList", {
 	options: {
 		transfers: [],
 		columns: [
+		          
+		   { 'label' : 'Idő' },
 		   { 'label' : 'Termék' },
 		   { 'label' : 'Ár' },
 		   { 'label' : 'Db' },
@@ -83,6 +85,9 @@ $.widget( "fitness.transferList", {
 			case 'row':
 				transfer = params.transfer;
 				s += '<tr>';
+				s += '<td class="product-time">';
+				s += transfer.time;
+				s += '</td>';
 				s += '<td class="product-name">';
 				s += transfer.product_name;
 				s += '</td>';
@@ -102,9 +107,11 @@ $.widget( "fitness.transferList", {
 				for ( var i = 0; i < params.footers.length; i++ ){
 					footer = params.footers[i];
 					s += "<tr class='warning' >";
-					s += "<th class='product-name'>";
+					s += "<th class='product-time'>";
 					s += footer.label;
 					s += "</th>";
+					s += "<th class='product-name'>";
+					s += "</th>";
 					s += "<td class=\"sale-price\">";
 					s += "</td>";
 					s += "<td class=\'product-count\' >";

From 48e392b4fd5c2b652a2de12b269178fc41e3ad7f Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 6 Oct 2015 11:38:43 +0200
Subject: [PATCH 035/100] add translations for sell product

---
 common/messages/hu/common/currency.php       | 26 ++++++++++
 common/messages/hu/common/customer.php       | 11 ++--
 common/messages/hu/common/product.php        |  7 +--
 common/messages/hu/common/transfer.php       | 35 +++++++++++++
 common/messages/hu/common/user-sold-item.php | 23 +++++++++
 common/messages/hu/frontend/currency.php     | 27 ++++++++++
 common/messages/hu/frontend/customer.php     | 30 +++++++++++
 common/messages/hu/frontend/product.php      | 53 ++++++++++++++++++++
 common/messages/hu/frontend/transfer.php     | 31 ++++++++++++
 frontend/models/ProductLookupForm.php        |  2 +-
 frontend/models/ProductSaleForm.php          | 25 +++++----
 11 files changed, 251 insertions(+), 19 deletions(-)
 create mode 100644 common/messages/hu/common/currency.php
 create mode 100644 common/messages/hu/common/transfer.php
 create mode 100644 common/messages/hu/common/user-sold-item.php
 create mode 100644 common/messages/hu/frontend/currency.php
 create mode 100644 common/messages/hu/frontend/customer.php
 create mode 100644 common/messages/hu/frontend/product.php
 create mode 100644 common/messages/hu/frontend/transfer.php

diff --git a/common/messages/hu/common/currency.php b/common/messages/hu/common/currency.php
new file mode 100644
index 0000000..0497b23
--- /dev/null
+++ b/common/messages/hu/common/currency.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Created At' => 'Létrehozás ideje',
+    'Currency' => 'Valuta',
+    'Id Currency' => 'Valuta',
+    'Name' => 'Név',
+    'Rate' => 'Árfolyam',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/customer.php b/common/messages/hu/common/customer.php
index de72864..0885b09 100644
--- a/common/messages/hu/common/customer.php
+++ b/common/messages/hu/common/customer.php
@@ -17,11 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Bérlet kártya nem üres vagy hibás kártyaszám' => '',
-    'Man' => 'Férfi',
-    'Password' => '',
-    'Unknown sex' => 'Nincs megadva',
-    'Woman' => 'Nő',
+    'Bérlet kártya nem üres vagy hibás kártyaszám' => 'Bérlet kártya nem üres vagy hibás kártyaszám',
+    'Password' => 'Jelszó',
+    'Update customer:' => 'Jelszó újra',
     'Address' => 'Cím',
     'Birthdate' => 'Születésnap',
     'Card number' => 'Kártyaszám',
@@ -40,13 +38,16 @@ return [
     'Id Proposer' => 'Ajánló',
     'Id User' => 'Admin',
     'Image' => 'Kép',
+    'Man' => 'Férfi',
     'Name' => 'Név',
     'Phone' => 'Telefon',
     'Search' => 'Keresés',
     'Sex' => 'Nem',
     'Tax Number' => 'Adószám',
+    'Unknown sex' => 'Nincs megadva',
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítása:',
     'Updated At' => 'Módosítás ideje',
+    'Woman' => 'Nő',
     'Zip' => 'Irsz.',
 ];
diff --git a/common/messages/hu/common/product.php b/common/messages/hu/common/product.php
index 9afa7e9..aabd12c 100644
--- a/common/messages/hu/common/product.php
+++ b/common/messages/hu/common/product.php
@@ -17,9 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Details' => 'Részletek',
-    'Procurement' => 'Beszerzés',
-    'Product' => 'Termék',
+    'Sold: {product}' => 'Eladva: {product}',
     'Active' => 'Aktív',
     'All' => 'Mind',
     'Barcode' => 'Vonalkód',
@@ -27,12 +25,15 @@ return [
     'Create Product' => 'Új termék',
     'Created At' => 'Létrehozás ideje',
     'Description' => 'Leírás',
+    'Details' => 'Részletek',
     'Id Account' => 'Kassza',
     'Id Product' => 'Termék',
     'Id Product Category' => 'Termék kategória',
     'Inactive' => 'Inaktív',
     'Max 255 character' => 'Max 255 karakter',
     'Name' => 'Név',
+    'Procurement' => 'Beszerzés',
+    'Product' => 'Termék',
     'Product Number' => 'Termék szám',
     'Products' => 'Termékek',
     'Profit Margins' => 'Haszonkulcs',
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
new file mode 100644
index 0000000..b0cc91b
--- /dev/null
+++ b/common/messages/hu/common/transfer.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Comment' => 'Megjegyzés',
+    'Count' => 'Mennyiség',
+    'Created At' => 'Dátum',
+    'Id Currency' => 'Valuta',
+    'Id Discount' => 'Kedvezmény',
+    'Id Object' => 'Termék',
+    'Id Transfer' => 'Pénzmozgás',
+    'Id User' => 'Felhasználó',
+    'Item Price' => 'Termék ár',
+    'Money' => 'Ár',
+    'Money Currency' => 'Ár valuta',
+    'Rate' => 'Árfolyam',
+    'Status' => 'Státusz',
+    'Type' => 'Típus',
+    'Updated At' => 'Módosíáts',
+];
diff --git a/common/messages/hu/common/user-sold-item.php b/common/messages/hu/common/user-sold-item.php
new file mode 100644
index 0000000..648c0ea
--- /dev/null
+++ b/common/messages/hu/common/user-sold-item.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Id Transfer' => 'Pénzmozgás',
+    'Id User' => 'Felhasználó',
+    'Id User Sold Item' => 'Eladás',
+];
diff --git a/common/messages/hu/frontend/currency.php b/common/messages/hu/frontend/currency.php
new file mode 100644
index 0000000..8c505d1
--- /dev/null
+++ b/common/messages/hu/frontend/currency.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Create' => 'Mentés',
+    'Create Currency' => 'Új valuta',
+    'Currencies' => 'Valuták',
+    'Reset' => 'Reset',
+    'Search' => 'Keresés',
+    'Update' => 'Módosítá',
+    'Update {modelClass}: ' => 'Módosítás {modelClass}: ',
+];
diff --git a/common/messages/hu/frontend/customer.php b/common/messages/hu/frontend/customer.php
new file mode 100644
index 0000000..7641b8c
--- /dev/null
+++ b/common/messages/hu/frontend/customer.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Adatlap' => 'Adatlap',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
+    'Befizetések' => 'Befizetések',
+    'Create' => 'Mentés',
+    '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/product.php b/common/messages/hu/frontend/product.php
new file mode 100644
index 0000000..3799713
--- /dev/null
+++ b/common/messages/hu/frontend/product.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Account' => 'Kassza',
+    'Barcode or product code' => 'Vonalkód vagy termék kód',
+    'Comment' => 'Megjegyzés',
+    'Discount' => 'Kedvezmény',
+    'Product' => 'Termék',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
+    'Barcode' => 'Vonalkód',
+    'Cart' => 'Kosár',
+    'Count' => 'Mennyiség',
+    'Create' => 'Mentés',
+    'Create Product' => 'Új termék',
+    'Currency' => 'Valuta',
+    'Currency not found' => 'Valuta nem található',
+    'Delete' => 'Törlés',
+    'Discount not found' => 'Kedvezmény nem található',
+    'Item Price' => 'Termék ár',
+    'Name' => 'Név',
+    'Paid' => 'Fizetve',
+    'Price' => 'Ár',
+    'Product name' => 'Termék név',
+    'Product not found!' => 'Termék nem található',
+    'Product number' => 'Termák kód',
+    'Products' => 'Termékek',
+    'Reset' => 'Reset',
+    'Sale Price' => 'Eladási ár',
+    'Search' => 'Keresés',
+    'Sell product' => 'Termék eladás',
+    'Sell product and add to total' => 'Termék eladás és kosárba helyezés',
+    'Stock' => 'Raktáron',
+    'Stock {stock} lower then {count}!' => 'Raktáron {stock} kevesebb mint {count}!',
+    'Total Price' => 'Összesen',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => 'Módosítás {modelClass}: ',
+];
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
new file mode 100644
index 0000000..d5286ac
--- /dev/null
+++ b/common/messages/hu/frontend/transfer.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Are you sure you want to delete this item?' => '',
+    'Create' => 'Mentés',
+    'Create Transfer' => 'Új pénzmozgás',
+    'Delete' => 'Törlés',
+    'Reset' => '',
+    'Search' => 'Keresés',
+    'Termékeladás' => 'Termékeladás',
+    'Transfers' => 'Pénzmozgások',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítás: ',
+    'pieces' => 'db',
+];
diff --git a/frontend/models/ProductLookupForm.php b/frontend/models/ProductLookupForm.php
index 9443250..5486ec2 100644
--- a/frontend/models/ProductLookupForm.php
+++ b/frontend/models/ProductLookupForm.php
@@ -32,7 +32,7 @@ class ProductLookupForm extends Model
     public function attributeLabels()
     {
         return [
-            'verifyCode' => 'Verification Code',
+            'filter_text' => Yii::t('frontend/product','Barcode or product code') ,
         ];
     }
     
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index db7b219..524f2a5 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -64,6 +64,21 @@ class ProductSaleForm extends Model
         ];
     }
 
+	/**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_product' => Yii::t("frontend/product", "Product"),
+            'count' => Yii::t("frontend/product", "Count"),
+            'id_currency' => Yii::t("frontend/product", "Currency"),
+            'id_account' => Yii::t("frontend/product", "Account"),
+            'id_discount' => Yii::t("frontend/product", "Discount"),
+            'comment' => Yii::t("frontend/product", "Comment"),
+        ];
+    }
+    
     
     public function validateProduct($attribute,$params){
     	$this->product = Product::findOne($this->id_product);
@@ -104,16 +119,6 @@ class ProductSaleForm extends Model
     	}
     }
     
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'verifyCode' => 'Verification Code',
-        ];
-    }
-    
     
     public function save(){
     	if ( $this->validate() ){

From 2e906de8c213974f2df68b044395754b4db3649f Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 6 Oct 2015 17:20:15 +0200
Subject: [PATCH 036/100] add ticket basics

---
 backend/controllers/TicketController.php      | 121 ++++++++++++++++++
 backend/models/TicketSearch.php               |  78 +++++++++++
 backend/views/ticket/_form.php                |  47 +++++++
 backend/views/ticket/_search.php              |  53 ++++++++
 backend/views/ticket/create.php               |  21 +++
 backend/views/ticket/index.php                |  47 +++++++
 backend/views/ticket/update.php               |  23 ++++
 backend/views/ticket/view.php                 |  48 +++++++
 common/models/Ticket.php                      |  70 ++++++++++
 .../m151006_100909_create__table__ticket.php  |  52 ++++++++
 frontend/controllers/TicketController.php     | 121 ++++++++++++++++++
 frontend/models/TicketSearch.php              |  78 +++++++++++
 frontend/views/ticket/_form.php               |  47 +++++++
 frontend/views/ticket/_search.php             |  53 ++++++++
 frontend/views/ticket/create.php              |  21 +++
 frontend/views/ticket/index.php               |  47 +++++++
 frontend/views/ticket/update.php              |  23 ++++
 frontend/views/ticket/view.php                |  48 +++++++
 18 files changed, 998 insertions(+)
 create mode 100644 backend/controllers/TicketController.php
 create mode 100644 backend/models/TicketSearch.php
 create mode 100644 backend/views/ticket/_form.php
 create mode 100644 backend/views/ticket/_search.php
 create mode 100644 backend/views/ticket/create.php
 create mode 100644 backend/views/ticket/index.php
 create mode 100644 backend/views/ticket/update.php
 create mode 100644 backend/views/ticket/view.php
 create mode 100644 common/models/Ticket.php
 create mode 100644 console/migrations/m151006_100909_create__table__ticket.php
 create mode 100644 frontend/controllers/TicketController.php
 create mode 100644 frontend/models/TicketSearch.php
 create mode 100644 frontend/views/ticket/_form.php
 create mode 100644 frontend/views/ticket/_search.php
 create mode 100644 frontend/views/ticket/create.php
 create mode 100644 frontend/views/ticket/index.php
 create mode 100644 frontend/views/ticket/update.php
 create mode 100644 frontend/views/ticket/view.php

diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
new file mode 100644
index 0000000..a036d8f
--- /dev/null
+++ b/backend/controllers/TicketController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Ticket;
+use backend\models\TicketSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TicketController implements the CRUD actions for Ticket model.
+ */
+class TicketController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Ticket models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TicketSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Ticket model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Ticket model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Ticket();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Ticket model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Ticket model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Ticket model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Ticket the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Ticket::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/TicketSearch.php b/backend/models/TicketSearch.php
new file mode 100644
index 0000000..19d5813
--- /dev/null
+++ b/backend/models/TicketSearch.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Ticket;
+
+/**
+ * TicketSearch represents the model behind the search form about `common\models\Ticket`.
+ */
+class TicketSearch extends Ticket
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'id_discount', 'max_usage_count', 'usage_count', 'status', 'price_brutto'], 'integer'],
+            [['start', 'end', 'comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Ticket::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_ticket' => $this->id_ticket,
+            'id_user' => $this->id_user,
+            'id_ticket_type' => $this->id_ticket_type,
+            'id_account' => $this->id_account,
+            'id_discount' => $this->id_discount,
+            'start' => $this->start,
+            'end' => $this->end,
+            'max_usage_count' => $this->max_usage_count,
+            'usage_count' => $this->usage_count,
+            'status' => $this->status,
+            'price_brutto' => $this->price_brutto,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/ticket/_form.php b/backend/views/ticket/_form.php
new file mode 100644
index 0000000..d984294
--- /dev/null
+++ b/backend/views/ticket/_form.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'id_ticket_type')->textInput() ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'id_discount')->textInput() ?>
+
+    <?= $form->field($model, 'start')->textInput() ?>
+
+    <?= $form->field($model, 'end')->textInput() ?>
+
+    <?= $form->field($model, 'max_usage_count')->textInput() ?>
+
+    <?= $form->field($model, 'usage_count')->textInput() ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'price_brutto')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket', 'Create') : Yii::t('common/ticket', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/ticket/_search.php b/backend/views/ticket/_search.php
new file mode 100644
index 0000000..c89f75f
--- /dev/null
+++ b/backend/views/ticket/_search.php
@@ -0,0 +1,53 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\TicketSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_ticket') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'id_ticket_type') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'id_discount') ?>
+
+    <?php // echo $form->field($model, 'start') ?>
+
+    <?php // echo $form->field($model, 'end') ?>
+
+    <?php // echo $form->field($model, 'max_usage_count') ?>
+
+    <?php // echo $form->field($model, 'usage_count') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'price_brutto') ?>
+
+    <?php // echo $form->field($model, 'comment') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/ticket', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/ticket', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/ticket/create.php b/backend/views/ticket/create.php
new file mode 100644
index 0000000..67727e3
--- /dev/null
+++ b/backend/views/ticket/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = Yii::t('common/ticket', 'Create Ticket');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/ticket/index.php b/backend/views/ticket/index.php
new file mode 100644
index 0000000..0b4ee0e
--- /dev/null
+++ b/backend/views/ticket/index.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\TicketSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/ticket', 'Tickets');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket', 'Create Ticket'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_ticket',
+            'id_user',
+            'id_ticket_type',
+            'id_account',
+            'id_discount',
+            // 'start',
+            // 'end',
+            // 'max_usage_count',
+            // 'usage_count',
+            // 'status',
+            // 'price_brutto',
+            // 'comment',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/ticket/update.php b/backend/views/ticket/update.php
new file mode 100644
index 0000000..09f838a
--- /dev/null
+++ b/backend/views/ticket/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = Yii::t('common/ticket', 'Update {modelClass}: ', [
+    'modelClass' => 'Ticket',
+]) . ' ' . $model->id_ticket;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_ticket, 'url' => ['view', 'id' => $model->id_ticket]];
+$this->params['breadcrumbs'][] = Yii::t('common/ticket', 'Update');
+?>
+<div class="ticket-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/ticket/view.php b/backend/views/ticket/view.php
new file mode 100644
index 0000000..7bc9143
--- /dev/null
+++ b/backend/views/ticket/view.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = $model->id_ticket;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket', 'Update'), ['update', 'id' => $model->id_ticket], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/ticket', 'Delete'), ['delete', 'id' => $model->id_ticket], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/ticket', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_ticket',
+            'id_user',
+            'id_ticket_type',
+            'id_account',
+            'id_discount',
+            'start',
+            'end',
+            'max_usage_count',
+            'usage_count',
+            'status',
+            'price_brutto',
+            'comment',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
new file mode 100644
index 0000000..91fa231
--- /dev/null
+++ b/common/models/Ticket.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "ticket".
+ *
+ * @property integer $id_ticket
+ * @property integer $id_user
+ * @property integer $id_ticket_type
+ * @property integer $id_account
+ * @property integer $id_discount
+ * @property string $start
+ * @property string $end
+ * @property integer $max_usage_count
+ * @property integer $usage_count
+ * @property integer $status
+ * @property integer $price_brutto
+ * @property string $comment
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Ticket extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'ticket';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_user', 'id_ticket_type', 'id_account', 'id_discount', 'max_usage_count', 'usage_count', 'status', 'price_brutto'], 'integer'],
+            [['start', 'end', 'created_at', 'updated_at'], 'safe'],
+            [['comment'], 'required'],
+            [['comment'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_ticket' => Yii::t('common/ticket', 'Id Ticket'),
+            'id_user' => Yii::t('common/ticket', 'Id User'),
+            'id_ticket_type' => Yii::t('common/ticket', 'Id Ticket Type'),
+            'id_account' => Yii::t('common/ticket', 'Id Account'),
+            'id_discount' => Yii::t('common/ticket', 'Id Discount'),
+            'start' => Yii::t('common/ticket', 'Start'),
+            'end' => Yii::t('common/ticket', 'End'),
+            'max_usage_count' => Yii::t('common/ticket', 'Max Usage Count'),
+            'usage_count' => Yii::t('common/ticket', 'Usage Count'),
+            'status' => Yii::t('common/ticket', 'Status'),
+            'price_brutto' => Yii::t('common/ticket', 'Price Brutto'),
+            'comment' => Yii::t('common/ticket', 'Comment'),
+            'created_at' => Yii::t('common/ticket', 'Created At'),
+            'updated_at' => Yii::t('common/ticket', 'Updated At'),
+        ];
+    }
+}
diff --git a/console/migrations/m151006_100909_create__table__ticket.php b/console/migrations/m151006_100909_create__table__ticket.php
new file mode 100644
index 0000000..49aa33b
--- /dev/null
+++ b/console/migrations/m151006_100909_create__table__ticket.php
@@ -0,0 +1,52 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151006_100909_create__table__ticket extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	
+    	$this->createTable('{{%ticket}}', [
+    			'id_ticket' => $this->primaryKey(),
+    			'id_user' => $this->integer(),
+    			'id_ticket_type' => $this->integer(),
+    			'id_account' => $this->integer(),
+    			'id_discount' => $this->integer(),
+    			'start' => $this->timestamp(),
+    			'end' =>  $this->timestamp(),
+    			'max_usage_count' => $this->integer(),
+    			'usage_count' => $this->integer(),
+    			'status' => $this->integer(),
+    			'price_brutto' => $this->integer(),
+    			'comment' => $this->string(255)->notNull(),
+    			'created_at' => $this->timestamp()->notNull(),
+    			'updated_at' =>  $this->timestamp()->notNull(),
+    			], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151006_100909_create__table__ticket cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
new file mode 100644
index 0000000..4a2bdbc
--- /dev/null
+++ b/frontend/controllers/TicketController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Ticket;
+use frontend\models\TicketSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * TicketController implements the CRUD actions for Ticket model.
+ */
+class TicketController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Ticket models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TicketSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Ticket model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Ticket model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Ticket();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Ticket model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Ticket model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Ticket model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Ticket the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Ticket::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/TicketSearch.php b/frontend/models/TicketSearch.php
new file mode 100644
index 0000000..92af23b
--- /dev/null
+++ b/frontend/models/TicketSearch.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Ticket;
+
+/**
+ * TicketSearch represents the model behind the search form about `common\models\Ticket`.
+ */
+class TicketSearch extends Ticket
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'id_discount', 'max_usage_count', 'usage_count', 'status', 'price_brutto'], 'integer'],
+            [['start', 'end', 'comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Ticket::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_ticket' => $this->id_ticket,
+            'id_user' => $this->id_user,
+            'id_ticket_type' => $this->id_ticket_type,
+            'id_account' => $this->id_account,
+            'id_discount' => $this->id_discount,
+            'start' => $this->start,
+            'end' => $this->end,
+            'max_usage_count' => $this->max_usage_count,
+            'usage_count' => $this->usage_count,
+            'status' => $this->status,
+            'price_brutto' => $this->price_brutto,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
new file mode 100644
index 0000000..d984294
--- /dev/null
+++ b/frontend/views/ticket/_form.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'id_ticket_type')->textInput() ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'id_discount')->textInput() ?>
+
+    <?= $form->field($model, 'start')->textInput() ?>
+
+    <?= $form->field($model, 'end')->textInput() ?>
+
+    <?= $form->field($model, 'max_usage_count')->textInput() ?>
+
+    <?= $form->field($model, 'usage_count')->textInput() ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'price_brutto')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket', 'Create') : Yii::t('common/ticket', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/ticket/_search.php b/frontend/views/ticket/_search.php
new file mode 100644
index 0000000..bdc5a35
--- /dev/null
+++ b/frontend/views/ticket/_search.php
@@ -0,0 +1,53 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\TicketSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_ticket') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'id_ticket_type') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'id_discount') ?>
+
+    <?php // echo $form->field($model, 'start') ?>
+
+    <?php // echo $form->field($model, 'end') ?>
+
+    <?php // echo $form->field($model, 'max_usage_count') ?>
+
+    <?php // echo $form->field($model, 'usage_count') ?>
+
+    <?php // echo $form->field($model, 'status') ?>
+
+    <?php // echo $form->field($model, 'price_brutto') ?>
+
+    <?php // echo $form->field($model, 'comment') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/ticket', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('common/ticket', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/ticket/create.php b/frontend/views/ticket/create.php
new file mode 100644
index 0000000..67727e3
--- /dev/null
+++ b/frontend/views/ticket/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = Yii::t('common/ticket', 'Create Ticket');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/ticket/index.php b/frontend/views/ticket/index.php
new file mode 100644
index 0000000..3469666
--- /dev/null
+++ b/frontend/views/ticket/index.php
@@ -0,0 +1,47 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\TicketSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('common/ticket', 'Tickets');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket', 'Create Ticket'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_ticket',
+            'id_user',
+            'id_ticket_type',
+            'id_account',
+            'id_discount',
+            // 'start',
+            // 'end',
+            // 'max_usage_count',
+            // 'usage_count',
+            // 'status',
+            // 'price_brutto',
+            // 'comment',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/ticket/update.php b/frontend/views/ticket/update.php
new file mode 100644
index 0000000..09f838a
--- /dev/null
+++ b/frontend/views/ticket/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = Yii::t('common/ticket', 'Update {modelClass}: ', [
+    'modelClass' => 'Ticket',
+]) . ' ' . $model->id_ticket;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_ticket, 'url' => ['view', 'id' => $model->id_ticket]];
+$this->params['breadcrumbs'][] = Yii::t('common/ticket', 'Update');
+?>
+<div class="ticket-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/ticket/view.php b/frontend/views/ticket/view.php
new file mode 100644
index 0000000..7bc9143
--- /dev/null
+++ b/frontend/views/ticket/view.php
@@ -0,0 +1,48 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+
+$this->title = $model->id_ticket;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="ticket-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('common/ticket', 'Update'), ['update', 'id' => $model->id_ticket], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/ticket', 'Delete'), ['delete', 'id' => $model->id_ticket], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('common/ticket', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_ticket',
+            'id_user',
+            'id_ticket_type',
+            'id_account',
+            'id_discount',
+            'start',
+            'end',
+            'max_usage_count',
+            'usage_count',
+            'status',
+            'price_brutto',
+            'comment',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>

From c3ae414bba2c343ea96f56d401646fbc9a548e64 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 8 Oct 2015 10:13:29 +0200
Subject: [PATCH 037/100] add changes to create ticket

---
 .gitignore                                    |   2 +
 backend/controllers/TicketController.php      |  11 ++
 common/assets/MomentAsset.php                 |  16 ++
 common/models/Ticket.php                      |   5 +-
 common/models/TicketType.php                  |  38 +++++
 composer.json                                 |   3 +-
 composer.lock                                 |  39 ++++-
 ...5256_alter__table__ticket__add_columns.php |  30 ++++
 frontend/assets/TicketSellAsset.php           |  31 ++++
 frontend/components/HtmlHelper.php            |  43 +++++
 frontend/controllers/TicketController.php     |  40 ++++-
 frontend/models/TicketCreate.php              |  76 +++++++++
 frontend/views/common/_menu_reception.php     |   2 +-
 frontend/views/common/_transfer_list.php      |   9 +
 frontend/views/customer/create.php            |   5 +
 frontend/views/ticket/_form.php               |  92 +++++++----
 frontend/views/ticket/create.php              |  50 +++++-
 frontend/web/js/frontend.js                   |  17 ++
 frontend/web/js/frontend.js.map               |  10 ++
 frontend/web/js/ticket.sell.js                | 154 ++++++++++++++++++
 package.json                                  |  22 +++
 21 files changed, 650 insertions(+), 45 deletions(-)
 create mode 100644 common/assets/MomentAsset.php
 create mode 100644 console/migrations/m151008_065256_alter__table__ticket__add_columns.php
 create mode 100644 frontend/assets/TicketSellAsset.php
 create mode 100644 frontend/components/HtmlHelper.php
 create mode 100644 frontend/models/TicketCreate.php
 create mode 100644 frontend/views/common/_transfer_list.php
 create mode 100644 frontend/web/js/frontend.js
 create mode 100644 frontend/web/js/frontend.js.map
 create mode 100644 frontend/web/js/ticket.sell.js
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 346d3b2..e587688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ composer.phar
 phpunit.phar
 # local phpunit config
 /phpunit.xml
+
+/node_modules
diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
index a036d8f..39b2f67 100644
--- a/backend/controllers/TicketController.php
+++ b/backend/controllers/TicketController.php
@@ -8,6 +8,9 @@ use backend\models\TicketSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Discount;
+use common\models\TicketType;
+use common\models\Account;
 
 /**
  * TicketController implements the CRUD actions for Ticket model.
@@ -61,12 +64,20 @@ class TicketController extends Controller
     public function actionCreate()
     {
         $model = new Ticket();
+        
+        $discounts = Discount::read();
+        $ticketTypes = TicketType::read();
+        $accounts = Account::readAccounts();
+        
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_ticket]);
         } else {
             return $this->render('create', [
                 'model' => $model,
+                'discounts' => $discounts,
+                'ticketTypes' => $ticketTypes,
+                'accounts' => $accounts,
             ]);
         }
     }
diff --git a/common/assets/MomentAsset.php b/common/assets/MomentAsset.php
new file mode 100644
index 0000000..f599a17
--- /dev/null
+++ b/common/assets/MomentAsset.php
@@ -0,0 +1,16 @@
+<?php
+namespace common\assets;
+
+use yii\web\AssetBundle;
+
+class MomentAsset extends AssetBundle
+{
+	public $sourcePath = '@bower';
+	
+	public $js = [
+		'moment/min/moment.min.js'
+	];
+	
+	public $depends = [
+	];
+}
\ No newline at end of file
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index 91fa231..ccbf7e1 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -22,8 +22,11 @@ use Yii;
  * @property string $created_at
  * @property string $updated_at
  */
-class Ticket extends \yii\db\ActiveRecord
+class Ticket  extends \common\models\BaseFitnessActiveRecord
 {
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
+	
     /**
      * @inheritdoc
      */
diff --git a/common/models/TicketType.php b/common/models/TicketType.php
index ed620c9..efe3c1b 100644
--- a/common/models/TicketType.php
+++ b/common/models/TicketType.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "ticket_type".
@@ -193,5 +194,42 @@ class TicketType extends \common\models\BaseFitnessActiveRecord {
 			}
 		}
 	}
+
+	/**
+	 * $param int $forceIncludeAccount id account, that should be included in list, even if it is inactive
+	 * */
+	public static  function read($forceIncludeObjectWithId = null){
+		$ticketTypes = null;
+	
+		if ( $forceIncludeObjectWithId  == null){
+			$ticketTypes = TicketType::find()->andWhere(['status' => self::STATUS_ACTIVE])->all();
+		}else{
+			$ticketTypes = TicketType::find()->andWhere( ['or', ['status' => self::STATUS_ACTIVE], ['id_ticket_type' =>  $forceIncludeObjectWithId ] ])->all();
+		}
+	
+		return $ticketTypes;
+	}
+	
+	
+	public static function modelsToArray($models,$default = []){
+	
+		if ( $models == null ){
+			return $default;
+		}
+	
+		return ArrayHelper::toArray($models, [
+				'common\models\TicketType' => [
+						'name',
+						'id_ticket_type',
+						'max_usage_count',
+						'time_unit_type',
+						'time_unit_count',
+						'id_account',
+						'price_brutto',
+						],
+						]);
+	}
+	
+	
 	
 }
diff --git a/composer.json b/composer.json
index 1bb2607..411126e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
         "kartik-v/yii2-widgets": "^3.4",
         "kartik-v/yii2-widget-typeahead": "*",
         "bower-asset/remarkable-bootstrap-notify": "^3.1",
-        "yiisoft/yii2-jui": "^2.0"
+        "yiisoft/yii2-jui": "^2.0",
+        "bower-asset/moment": "^2.10"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index 4925c02..745d589 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7bff75eba2c88cda67ff49b95bda9644",
+    "hash": "ade53c29b13f5eaa8367e21defe51905",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -176,6 +176,43 @@
                 "plugins"
             ]
         },
+        {
+            "name": "bower-asset/moment",
+            "version": "2.10.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/moment/moment.git",
+                "reference": "f3fbef9d9875bbff340b527dbe3f1c447a942f69"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/moment/moment/zipball/f3fbef9d9875bbff340b527dbe3f1c447a942f69",
+                "reference": "f3fbef9d9875bbff340b527dbe3f1c447a942f69",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "moment.js",
+                "bower-asset-ignore": [
+                    "**/.*",
+                    "benchmarks",
+                    "bower_components",
+                    "meteor",
+                    "node_modules",
+                    "scripts",
+                    "tasks",
+                    "test",
+                    "component.json",
+                    "composer.json",
+                    "CONTRIBUTING.md",
+                    "ender.js",
+                    "Gruntfile.js",
+                    "Moment.js.nuspec",
+                    "package.js",
+                    "package.json"
+                ]
+            }
+        },
         {
             "name": "bower-asset/punycode",
             "version": "v1.3.2",
diff --git a/console/migrations/m151008_065256_alter__table__ticket__add_columns.php b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
new file mode 100644
index 0000000..9e9c763
--- /dev/null
+++ b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151008_065256_alter__table__ticket__add_columns extends Migration
+{
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m151008_065256_alter__table__ticket__add_columns cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/assets/TicketSellAsset.php b/frontend/assets/TicketSellAsset.php
new file mode 100644
index 0000000..5cff2cc
--- /dev/null
+++ b/frontend/assets/TicketSellAsset.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class TicketSellAsset extends AssetBundle
+{
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+    ];
+     public $js = [
+    	'js/transferlist.js',
+    	'js/ticket.sell.js',
+    ];
+    public $depends = [
+        'frontend\assets\AppAsset',
+        'common\assets\MomentAsset',
+        'yii\jui\JuiAsset',
+    ];
+}
diff --git a/frontend/components/HtmlHelper.php b/frontend/components/HtmlHelper.php
new file mode 100644
index 0000000..095e528
--- /dev/null
+++ b/frontend/components/HtmlHelper.php
@@ -0,0 +1,43 @@
+<?php
+namespace frontend\components;
+
+use Yii;
+use common\models\Order;
+use yii\helpers\Html;
+use yii\helpers\ArrayHelper;
+
+class HtmlHelper{
+	
+
+	private static function mkOptions( $models, $key, $value = 'name', $options = [] ){
+		$result = [];
+		$result = ArrayHelper::map($models, $key, $value);
+		return $result;
+		
+	}
+	
+	/**
+	 * @var $models common\models\Account[]
+	 * @return 
+	 * */
+	public static function mkAccountOptions( $models,  $options = [] ){
+		return $result = self::mkOptions($models, 'id_account');
+	}
+	/**
+	 * @var $models common\models\Discount[]
+	 * @return 
+	 * */
+	public static function mkDiscountOptions( $models,  $options = [] ){
+		return $result = self::mkOptions($models, 'id_discount');
+	}
+	
+	/**
+	 * @var $models common\models\TicketType[]
+	 * @return 
+	 * */
+	public static function mkTicketTypeOptions( $models,  $options = [] ){
+		return  $result = self::mkOptions($models, 'id_ticket_type');
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 4a2bdbc..8706659 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -5,9 +5,17 @@ namespace frontend\controllers;
 use Yii;
 use common\models\Ticket;
 use frontend\models\TicketSearch;
+use frontend\models\ReceptionForm;
+use frontend\models\TicketCreate;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Discount;
+use common\models\TicketType;
+use common\models\Account;
+use yii\base\Object;
+use common\models\Transfer;
+use common\models\User;
 
 /**
  * TicketController implements the CRUD actions for Ticket model.
@@ -58,15 +66,43 @@ class TicketController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionCreate()
+    public function actionCreate($number = null)
     {
-        $model = new Ticket();
+    	
+    	$receptionForm = new ReceptionForm();
+    	
+    	$receptionForm->number = $number;
+    	
+    	$receptionForm->readCard();
+    	
+        $model = new  TicketCreate();
 
+        $discounts = Discount::read();
+        
+        $ticketTypes = TicketType::read();
+        
+        $accounts = Account::readAccounts();
+        
+        $user = User::findOne( [ 'id' => Yii::$app->user->id ] );
+        
+
+        $model->id_user = \Yii::$app->user->id;
+        $model->status = Ticket::STATUS_ACTIVE;
+        $model->usage_count = 0;
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_ticket]);
         } else {
+        	
+        	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+        	
             return $this->render('create', [
                 'model' => $model,
+                'discounts' => $discounts,
+                'ticketTypes' => $ticketTypes,
+                'accounts' => $accounts,
+            	'receptionForm' => $receptionForm,
+            	'userTransfers' => $userTransfers,
             ]);
         }
     }
diff --git a/frontend/models/TicketCreate.php b/frontend/models/TicketCreate.php
new file mode 100644
index 0000000..a10653d
--- /dev/null
+++ b/frontend/models/TicketCreate.php
@@ -0,0 +1,76 @@
+<?php
+namespace frontend\models;
+
+use common\models\Ticket;
+use common\models\TicketType;
+use common\models\Account;
+use common\models\Discount;
+
+
+class TicketCreate  extends Ticket{
+		
+	public function rules()
+	{
+		return [
+				/////////////////////
+				//ticket type
+				/////////////////////
+				[[  'id_ticket_type'], 'required'],
+				[[  'id_ticket_type'], 'integer'],
+				[[  'id_ticket_type'], 'validateTicketType'],
+				/////////////////////
+				//id_account
+				/////////////////////
+				[[  'id_account'], 'required'],
+				[[  'id_account'], 'integer'],
+				[[  'id_account'], 'validateAccount'],
+				/////////////////////
+				//id_discount
+				/////////////////////
+				[[  'id_discount'], 'integer'],
+				[[  'id_discount'], 'validateDiscount'],
+				/////////////////////
+				// start and end date
+				/////////////////////
+				[['start', 'end' ], 'required'],
+				[['start', 'end' ], 'date'],
+				/////////////////////
+				//id_account
+				/////////////////////
+				[[  'max_usage_count'], 'required'],
+				[[  'max_usage_count'], 'integer'],
+				/////////////////////
+				//price 
+				/////////////////////
+				[[  'price_brutto'], 'required'],
+				[[  'price_brutto'], 'integer'],
+				/////////////////////
+				//comment
+				/////////////////////
+				[['comment'], 'required'],
+				[['comment'], 'string', 'max' => 255]
+		];
+	}
+	
+	
+	public function validateTicketType($attribute,$params){
+		$type = TicketType::findOne($this->id_ticket_type);
+		if ( !isset($type)) {
+			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid ticket type' ));
+		}
+	}
+	public function validateAccount($attribute,$params){
+		$acc = Account::findOne($this->id_account);
+		if ( !isset($acc)) {
+			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid transfer' ));
+		}
+	}
+	public function validateDiscount($attribute,$params){
+		$discount = Discount::findOne($this->id_discount);
+		if ( !isset($discount)) {
+			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid discount' ));
+		}
+	}
+	
+
+}
\ No newline at end of file
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
index 40e1037..a52796e 100644
--- a/frontend/views/common/_menu_reception.php
+++ b/frontend/views/common/_menu_reception.php
@@ -66,7 +66,7 @@ function mkBtn($card, $label,$route = null ){
 			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create'  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
+			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('ticket/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )  ?>
 		</div>
 	</div>
     <div class='row'>
diff --git a/frontend/views/common/_transfer_list.php b/frontend/views/common/_transfer_list.php
new file mode 100644
index 0000000..98b4aea
--- /dev/null
+++ b/frontend/views/common/_transfer_list.php
@@ -0,0 +1,9 @@
+<?php
+use yii\bootstrap\Html;
+?>
+<div class="row">
+	<div class='col-md-12 '>
+		<div class="transfer-list-container">
+		</div>
+	</div>
+</div>
diff --git a/frontend/views/customer/create.php b/frontend/views/customer/create.php
index 9bc033f..360d9dc 100644
--- a/frontend/views/customer/create.php
+++ b/frontend/views/customer/create.php
@@ -8,6 +8,8 @@ use frontend\components\ReceptionCardNumberWidget;
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
 
+
+
 $this->title = Yii::t('common/customer', 'Create Customer');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
@@ -16,6 +18,9 @@ $this->params['breadcrumbs'][] = $this->title;
 $customer = $model;
 $card = $customer->card;
 
+
+
+
 ?>
 <div class="customer-create">
 
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
index d984294..f1aeabf 100644
--- a/frontend/views/ticket/_form.php
+++ b/frontend/views/ticket/_form.php
@@ -2,46 +2,68 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+use kartik\widgets\DatePicker;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Ticket */
+/* @var $accounts common\models\Account[] */
+/* @var $ticketTypes common\models\TicketType[] */
+/* @var $discounts common\models\Discount[] */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
-<div class="ticket-form">
+<?php 
 
-    <?php $form = ActiveForm::begin(); ?>
+	$accountOptions = HtmlHelper::mkAccountOptions($accounts);
+	$discountOptions = HtmlHelper::mkDiscountOptions($discounts);
+	$ticketTypeOptions = HtmlHelper::mkTicketTypeOptions($ticketTypes);
+	
+	
+	
+	
+?>
 
-    <?= $form->field($model, 'id_user')->textInput() ?>
-
-    <?= $form->field($model, 'id_ticket_type')->textInput() ?>
-
-    <?= $form->field($model, 'id_account')->textInput() ?>
-
-    <?= $form->field($model, 'id_discount')->textInput() ?>
-
-    <?= $form->field($model, 'start')->textInput() ?>
-
-    <?= $form->field($model, 'end')->textInput() ?>
-
-    <?= $form->field($model, 'max_usage_count')->textInput() ?>
-
-    <?= $form->field($model, 'usage_count')->textInput() ?>
-
-    <?= $form->field($model, 'status')->textInput() ?>
-
-    <?= $form->field($model, 'price_brutto')->textInput() ?>
-
-    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'created_at')->textInput() ?>
-
-    <?= $form->field($model, 'updated_at')->textInput() ?>
-
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket', 'Create') : Yii::t('common/ticket', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>
+<div class="row" >
+	<div class="col-md-12" >
+		<div class="ticket-form">
+		
+		    <?php $form = ActiveForm::begin(); ?>
+		
+		    <?= $form->field($model, 'id_ticket_type')->dropDownList($ticketTypeOptions) ?>
+		
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
+		
+		    <?= $form->field($model, 'id_discount')->dropDownList($discountOptions) ?>
+		
+		    
+		     <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+		    			 'pluginOptions' => [
+						        'autoclose'=>true,
+						        'format' => 'yyyy.mm.dd'
+						    ]
+						])  ?>
+		
+		
+			 <?= $form->field($model, 'end')->widget(DatePicker::classname(), [
+		    			 'pluginOptions' => [
+						        'autoclose'=>true,
+						        'format' => 'yyyy.mm.dd'
+						    ]
+						])  ?>
+		
+		    <?= $form->field($model, 'max_usage_count')->input('number') ?>
+		
+		    <?= $form->field($model, 'price_brutto')->input('number') ?>
+		
+		    <?= $form->field($model, 'comment')->textarea(['maxlength' => true]) ?>
+			
+		    <div class="form-group">
+		        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket', 'Create') : Yii::t('common/ticket', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+		    </div>
+		
+		    <?php ActiveForm::end(); ?>
+		
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/ticket/create.php b/frontend/views/ticket/create.php
index 67727e3..56d435d 100644
--- a/frontend/views/ticket/create.php
+++ b/frontend/views/ticket/create.php
@@ -1,21 +1,63 @@
 <?php
 
 use yii\helpers\Html;
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
+use frontend\assets\TicketSellAsset;
+use common\models\TicketType;
 
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Ticket */
+/* @var $receptionForm frotned\models\ReceptionForm */
+
+TicketSellAsset::register($this);
 
 $this->title = Yii::t('common/ticket', 'Create Ticket');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
+
+$card = $receptionForm->card;
+$customer = $receptionForm->customer;
+
+$options = [];
+
+// $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
+// $options['clear_list_url'] = Url::toRoute(['product/clear-list']);
+$options['types'] = TicketType::modelsToArray($ticketTypes);
+$options['transfer_list'] = $userTransfers;
+
+$this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
+
 ?>
 <div class="ticket-create">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+	<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+		</div>
+		<div class='col-md-4'>
+		</div>
+	</div>
 
-    <?= $this->render('_form', [
-        'model' => $model,
-    ]) ?>
+
+	<div class="row">
+		<div class="col-md-6">
+		    <h1><?= Html::encode($this->title) ?></h1>
+		    <?= $this->render('_form', [
+		        'model' => $model,
+		    		'discounts' => $discounts,
+		    		'ticketTypes' => $ticketTypes,
+		    		'accounts' => $accounts,
+		    ]) ?>
+		</div>
+		<div class="col-md-6">
+			<h1><?php  echo Yii::t('frontend/tciket', 'Cart')?></h1>
+			<?php echo $this->render( "//common/_transfer_list" ) ?>
+		</div>
+	</div>
 
 </div>
diff --git a/frontend/web/js/frontend.js b/frontend/web/js/frontend.js
new file mode 100644
index 0000000..65ee634
--- /dev/null
+++ b/frontend/web/js/frontend.js
@@ -0,0 +1,17 @@
+(function() {
+  var KeypressListener;
+
+  KeypressListener = (function() {
+    function KeypressListener(name) {
+      this.name = name;
+    }
+
+    KeypressListener.prototype.listen = function() {};
+
+    return KeypressListener;
+
+  })();
+
+}).call(this);
+
+//# sourceMappingURL=frontend.js.map
diff --git a/frontend/web/js/frontend.js.map b/frontend/web/js/frontend.js.map
new file mode 100644
index 0000000..083bfa7
--- /dev/null
+++ b/frontend/web/js/frontend.js.map
@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "file": "frontend.js",
+  "sourceRoot": "../coffee/",
+  "sources": [
+    "keypresslistener.coffee"
+  ],
+  "names": [],
+  "mappings": "AAAA;AAAA,MAAA;;EAAM;IAEQ,0BAAC,IAAD;MAAC,IAAC,CAAA,OAAD;IAAD;;+BAEb,MAAA,GAAQ,SAAA,GAAA;;;;;AAJT"
+}
\ No newline at end of file
diff --git a/frontend/web/js/ticket.sell.js b/frontend/web/js/ticket.sell.js
new file mode 100644
index 0000000..0bc6cfa
--- /dev/null
+++ b/frontend/web/js/ticket.sell.js
@@ -0,0 +1,154 @@
+function TicketSell(o){
+	
+	/**reference for the instance*/
+	var app = this;
+	
+	this.defaults = {
+			default_type: 0,
+			selected_type: 1,
+			time_unit_day : 10,
+			time_unit_month : 20,
+			time_unit_month_reference : 30,
+			/**id of filter text*/
+			types: [{
+				name :'Bérlet',
+				id_ticket_type: 0,
+				max_usage_count:0,
+				time_unit_type:1,
+				time_unit_count:1,
+				id_account:0,
+				price_brutto:1000,
+			},
+		],
+		selector_type: '#ticketcreate-id_ticket_type',
+		selector_start: '#ticketcreate-start',
+		selector_end: '#ticketcreate-end',
+		selector_account: '#ticketcreate-id_account',
+		selector_price: '#ticketcreate-price_brutto',
+		selector_max_usage_count: '#ticketcreate-max_usage_count',
+		date_format_moment: 'YYYY.MM.DD',
+		ticket_type: null,
+		start_date: null,
+		end_date: null,
+		max_usage_count: null,
+		id_account: null,
+		price: null,
+		clear_list_url: '',
+		transfer_list: []
+	};
+	
+	init();
+	
+	function init(){
+		$.extend(app.defaults, o );
+		addBehaviourTypeChangedListener();
+		useDefaults();
+		createUserSoldItemsTable();
+	}
+	
+	function useDefaults(){
+		if ( app.defaults.selected_type > 0){
+			$(app.defaults.selector_type).val( app.defaults.selected_type );
+			typeChanged();
+		}
+	}
+	
+	function createUserSoldItemsTable(){
+		$('.transfer-list-container').transferList({
+			'transfers' : app.defaults.transfer_list
+		});
+	}
+	
+	function refreshSoldUseritems(){
+		$('.transfer-list-container').transferList('option','transfers' , app.defaults.sold_items );
+	}
+	
+	function addBehaviourTypeChangedListener(){
+		$(app.defaults.selector_type).change(change);
+	}
+	
+	function change(event){
+		if ( '#'+event.target.id == app.defaults.selector_type ){
+			typeChanged();
+		}
+	}
+	
+	function typeChanged(){
+		validateTypeChanged();
+		refresh();
+	}
+	
+	function validateTypeChanged(){
+		validateType();
+		validateStartDate();
+		validateEndDate();
+		validateMaxUsageCount();
+		validatePriceBrutto();
+		validateAccount();
+	}
+	
+	function validateType(){
+		var type;
+		type =  +$(app.defaults.selector_type).val();
+		app.defaults.ticket_type = null;
+		for ( var i = 0; i < app.defaults.types.length; i++ ){
+			if ( app.defaults.types[i].id_ticket_type == type){
+				app.defaults.ticket_type =  app.defaults.types[i];
+				break;
+			}
+			
+		}
+	}
+	
+	function validateStartDate(){
+		 app.defaults.start_date =  moment( $(  app.defaults.selector_start  ).val(),  app.defaults.date_format_moment) ;
+		 
+		 if ( !app.defaults.start_date.isValid() ){
+			 app.defaults.start_date = moment();
+		 }
+		 
+	}
+	
+	function validateEndDate(){
+		var units;
+		units = app.defaults.ticket_type.time_unit_count;
+		app.defaults.end_date = moment(app.defaults.start_date);
+		switch(app.defaults.ticket_type.time_unit_type){
+		case app.defaults.time_unit_day: 
+			app.defaults.end_date.add( units, 'days');
+			app.defaults.end_date.subtract( 1, 'days');
+			break;
+		case app.defaults.time_unit_month: 
+			app.defaults.end_date.add( units, 'month');
+			app.defaults.end_date.subtract( 1, 'days');
+			break;
+		case app.defaults.time_unit_month_reference: 
+			if ( units > 1){
+				app.defaults.end_date.add( units -1, 'month');
+			}
+			app.defaults.end_date.endOf('month');
+			break;
+		}
+	}
+	
+	function validateMaxUsageCount(){
+		app.defaults.max_usage_count = app.defaults.ticket_type.max_usage_count;
+	}
+	
+	function validatePriceBrutto(){
+		app.defaults.price = app.defaults.ticket_type.price_brutto;
+	}
+	function validateAccount(){
+		app.defaults.id_account = app.defaults.ticket_type.id_account;
+	}
+	
+	function refresh(){
+		console.info( app.defaults.start_date.toDate());
+		$(app.defaults.selector_start ).val(   app.defaults.start_date.format(   app.defaults.date_format_moment ) );
+		$(app.defaults.selector_end ).val(   app.defaults.end_date.format(   app.defaults.date_format_moment ) );
+		$(app.defaults.selector_account ).val(app.defaults.id_account);
+		$(app.defaults.selector_price ).val(app.defaults.price);
+		$(app.defaults.selector_max_usage_count ).val(app.defaults.max_usage_count);
+	}
+	
+}
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..4aa1294
--- /dev/null
+++ b/package.json
@@ -0,0 +1,22 @@
+{
+  "author": "rocho",
+  "name": "coma",
+  "version": "0.0.1",
+  "private": true,
+  "dependencies": {
+  },
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "matchdep": "*",
+
+    "grunt-contrib-coffee": "*",
+    "grunt-contrib-compass": "*",
+    "grunt-contrib-watch": "*",
+    "grunt-contrib-imagemin": "*",
+    "grunt-contrib-clean": "*",
+    "grunt-concurrent": "*",
+    "grunt-jsmin-sourcemap": "*",
+    "grunt-notify": "*",
+    "grunt-newer": "*"
+  }
+}
\ No newline at end of file

From 11e7c85cf39ccc818912384a3c041c8969d02ae8 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 8 Oct 2015 17:18:18 +0200
Subject: [PATCH 038/100] add frontend ticket changes

---
 common/models/Ticket.php                      | 54 ++++++++++++++++
 common/models/Transfer.php                    | 48 +++++++++++++-
 ...5256_alter__table__ticket__add_columns.php |  6 +-
 ...er_table_ticket__alter__column_comment.php | 30 +++++++++
 ...table_ticket__alter__columns__not_null.php | 33 ++++++++++
 frontend/components/HtmlHelper.php            | 19 +++---
 frontend/controllers/TicketController.php     | 22 ++++++-
 frontend/models/TicketCreate.php              | 27 +++++---
 frontend/models/TicketSearch.php              | 10 ++-
 frontend/views/common/_menu_reception.php     |  3 +-
 frontend/views/ticket/_form.php               | 12 ++--
 frontend/views/ticket/index.php               | 62 +++++++++++++------
 frontend/views/ticket/view.php                | 38 ++++++------
 13 files changed, 294 insertions(+), 70 deletions(-)
 create mode 100644 console/migrations/m151008_101155_alter_table_ticket__alter__column_comment.php
 create mode 100644 console/migrations/m151008_101334_alter_table_ticket__alter__columns__not_null.php

diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index ccbf7e1..82c7293 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -70,4 +70,58 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
             'updated_at' => Yii::t('common/ticket', 'Updated At'),
         ];
     }
+    
+
+    public function getCard(){
+    	return $this->hasOne( Card::className(), ["id_card" =>"id_card" ] );
+    }
+
+    public function getUser(){
+    	return $this->hasOne( User::className(), ["id" =>"id_user" ] );
+    }
+    
+    public function getTicketType(){
+    	return $this->hasOne( TicketType::className(), ["id_ticket_type" =>"id_ticket_type" ] );
+    }
+    public function getDiscount(){
+    	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
+    }
+    
+    public function getAccount() {
+    	return $this->hasOne ( Account::className (), [
+    			'id_account' => 'id_account'
+    			] );
+    }
+    public function getAccountName() {
+    	$result = "";
+    	$account = $this->account;
+    	if ( isset($account) ){
+    		$result = $this->account->name;
+    	}
+    	return $result;
+    }
+    public function getDiscountName() {
+    	$result = "";
+    	$discount = $this->discount;
+    	if ( isset($discount) ){
+    		$result = $this->discount->name;
+    	}
+    	return $result;
+    }
+    public function getTicketTypeName() {
+    	$result = "";
+    	$ticketType = $this->ticketType;
+    	if ( isset($ticketType) ){
+    		$result = $ticketType->name;
+    	}
+    	return $result;
+    }
+    public function getUserName() {
+    	$result = "";
+    	$user = $this->user;
+    	if ( isset($user) ){
+    		$result = $user->username;
+    	}
+    	return $result;
+    }
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 84b141e..74a37a4 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -148,6 +148,42 @@ class Transfer extends \yii\db\ActiveRecord
     	return $transfer;
     }
     
+    /**
+     * @param $account common\models\Account
+     * @param $discount common\models\Discount
+     * @param $currency common\models\Currency
+     * @param $ticket common\models\Ticket
+     * */
+    public static function createTicketTransfer($account, $discount, $currency, $count,$ticket ){
+    	$transfer = new Transfer();
+    	
+    	$transfer->type = Transfer::TYPE_TICKET;
+    	
+    	$transfer->id_object  = $ticket->id_ticket;
+    	
+    	$transfer->item_price = $ticket->price_brutto; 
+    	$totalPrice = $transfer->item_price; 
+    	
+    	$transfer->count = $count;
+    	$totalPrice = $totalPrice * $count;
+    	
+    	if ( isset( $discount ) ){
+    		$transfer->id_discount = $discount->id_discount;
+    		$totalPrice =  Discount::applyDiscount( $totalPrice, $discount);
+    	}
+    	
+    	$transfer->money = $totalPrice;
+    	
+    	if ( isset( $currency ) ){
+    		$transfer->rate = $currency->rate;
+    		$transfer->money_currency = Currency::applyCurrency($totalPrice, $currency);
+    	}
+    	
+    	$transfer->id_account = $account->id_account;
+    	
+    	return $transfer;
+    }
+    
     public static function modelsToArray($transfers,$default = []){
     	 
     	if ( $transfers == null ){
@@ -168,7 +204,13 @@ class Transfer extends \yii\db\ActiveRecord
 	    				return $transfer->account->name;
 	    			},
 	    			'product_name' => function ($transfer) {
-	    				return $transfer->product->name;
+	    				$result = "";
+	    				if ( $transfer->type == Transfer::TYPE_TICKET ){
+		    				$result =  $transfer->ticket->type->name;
+	    				}else{
+		    				$result =  $transfer->product->name;
+	    				}
+	    				return $result;
 	    			},
 	    			'category' => function ($transfer) {
 	    				return $transfer->product->productCategoryName;
@@ -183,8 +225,8 @@ class Transfer extends \yii\db\ActiveRecord
     	
     	$query = Transfer::find();
     	
-    	$query->innerJoinWith('userSoldItem');
-    	$query->andWhere(['user_sold_item.id_user' => $user->id ]);
+//     	$query->innerJoinWith('userSoldItem');
+    	$query->andWhere(['transfer.id_user' => $user->id ]);
     	$transfers = $query->all();
     	
     	return $transfers;
diff --git a/console/migrations/m151008_065256_alter__table__ticket__add_columns.php b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
index 9e9c763..bca41ac 100644
--- a/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
+++ b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
@@ -7,7 +7,11 @@ class m151008_065256_alter__table__ticket__add_columns extends Migration
 {
     public function up()
     {
-
+    	$this->addColumn('ticket', 'id_card', 'int(11)');
+    	$this->alterColumn('ticket', 'start', 'dateTime' );
+    	$this->alterColumn('ticket', 'end', 'dateTime' );
+    	$this->alterColumn('ticket', 'created_at', 'dateTime' );
+    	$this->alterColumn('ticket', 'updated_at', 'dateTime' );
     }
 
     public function down()
diff --git a/console/migrations/m151008_101155_alter_table_ticket__alter__column_comment.php b/console/migrations/m151008_101155_alter_table_ticket__alter__column_comment.php
new file mode 100644
index 0000000..9ebba30
--- /dev/null
+++ b/console/migrations/m151008_101155_alter_table_ticket__alter__column_comment.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151008_101155_alter_table_ticket__alter__column_comment extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('ticket', 'comment', 'varchar(255) null' );
+    }
+
+    public function down()
+    {
+        echo "m151008_101155_alter_table_ticket__alter__column_comment cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151008_101334_alter_table_ticket__alter__columns__not_null.php b/console/migrations/m151008_101334_alter_table_ticket__alter__columns__not_null.php
new file mode 100644
index 0000000..a4728ee
--- /dev/null
+++ b/console/migrations/m151008_101334_alter_table_ticket__alter__columns__not_null.php
@@ -0,0 +1,33 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151008_101334_alter_table_ticket__alter__columns__not_null extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('ticket', 'id_user', 'int(11) not null' );
+    	$this->alterColumn('ticket', 'id_ticket_type', 'int(11) not null' );
+    	$this->alterColumn('ticket', 'id_account', 'int(11) not null' );
+    	$this->alterColumn('ticket', 'id_user', 'int(11) not null' );
+    }
+
+    public function down()
+    {
+        echo "m151008_101334_alter_table_ticket__alter__columns__not_null cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/components/HtmlHelper.php b/frontend/components/HtmlHelper.php
index 095e528..327d409 100644
--- a/frontend/components/HtmlHelper.php
+++ b/frontend/components/HtmlHelper.php
@@ -9,9 +9,9 @@ use yii\helpers\ArrayHelper;
 class HtmlHelper{
 	
 
-	private static function mkOptions( $models, $key, $value = 'name', $options = [] ){
+	public static function mkOptions( $models, $key, $value = 'name'   ){
 		$result = [];
-		$result = ArrayHelper::map($models, $key, $value);
+		$result = ArrayHelper::map( $models, $key, $value );
 		return $result;
 		
 	}
@@ -20,23 +20,26 @@ class HtmlHelper{
 	 * @var $models common\models\Account[]
 	 * @return 
 	 * */
-	public static function mkAccountOptions( $models,  $options = [] ){
-		return $result = self::mkOptions($models, 'id_account');
+	public static function mkAccountOptions( $models  ){
+		$result = HtmlHelper::mkOptions( $models, 'id_account' );
+		return $result;
 	}
 	/**
 	 * @var $models common\models\Discount[]
 	 * @return 
 	 * */
-	public static function mkDiscountOptions( $models,  $options = [] ){
-		return $result = self::mkOptions($models, 'id_discount');
+	public static function mkDiscountOptions( $models  ){
+		$result = HtmlHelper::mkOptions( $models, 'id_discount' );
+		return $result;
 	}
 	
 	/**
 	 * @var $models common\models\TicketType[]
 	 * @return 
 	 * */
-	public static function mkTicketTypeOptions( $models,  $options = [] ){
-		return  $result = self::mkOptions($models, 'id_ticket_type');
+	public static function mkTicketTypeOptions( $models  ){
+		$result = HtmlHelper::mkOptions( $models, 'id_ticket_type');
+		return $result;
 	}
 	
 	
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 8706659..8f95402 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -38,14 +38,24 @@ class TicketController extends Controller
      * Lists all Ticket models.
      * @return mixed
      */
-    public function actionIndex()
+    public function actionIndex($number = null)
     {
+    	$receptionForm = new ReceptionForm();
+    	$receptionForm->number = $number;
+    	$receptionForm->readCard();
+    	
+    	
+    	if ( !isset($receptionForm->card ) ){
+    		throw new NotFoundHttpException( Yii::t('frontend/ticket', 'The requested card does not exist.'));
+    	}
+    	
         $searchModel = new TicketSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $dataProvider = $searchModel->search( $receptionForm->card, Yii::$app->request->queryParams);
 
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+        	'receptionForm' => $receptionForm,
         ]);
     }
 
@@ -75,6 +85,10 @@ class TicketController extends Controller
     	
     	$receptionForm->readCard();
     	
+    	if ( !isset($receptionForm->card ) ){
+    		throw new NotFoundHttpException( Yii::t('frontend/ticket', 'The requested card does not exist.'));
+    	}
+    	
         $model = new  TicketCreate();
 
         $discounts = Discount::read();
@@ -89,9 +103,11 @@ class TicketController extends Controller
         $model->id_user = \Yii::$app->user->id;
         $model->status = Ticket::STATUS_ACTIVE;
         $model->usage_count = 0;
+        $model->id_card = $receptionForm->card->id_card;	
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Ticket added to customer') );
+            return $this->redirect(['index', 'number' => $receptionForm->card->number]);
         } else {
         	
         	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
diff --git a/frontend/models/TicketCreate.php b/frontend/models/TicketCreate.php
index a10653d..fd7cbbf 100644
--- a/frontend/models/TicketCreate.php
+++ b/frontend/models/TicketCreate.php
@@ -5,10 +5,14 @@ use common\models\Ticket;
 use common\models\TicketType;
 use common\models\Account;
 use common\models\Discount;
-
+use common\models\Transfer;
 
 class TicketCreate  extends Ticket{
-		
+
+	public $_currency;
+	public $_account;
+	public $_discount;
+	
 	public function rules()
 	{
 		return [
@@ -47,7 +51,6 @@ class TicketCreate  extends Ticket{
 				/////////////////////
 				//comment
 				/////////////////////
-				[['comment'], 'required'],
 				[['comment'], 'string', 'max' => 255]
 		];
 	}
@@ -59,18 +62,26 @@ class TicketCreate  extends Ticket{
 			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid ticket type' ));
 		}
 	}
+	
 	public function validateAccount($attribute,$params){
-		$acc = Account::findOne($this->id_account);
-		if ( !isset($acc)) {
+		$this->_account = Account::findOne($this->id_account);
+		if ( !isset($this->_account )) {
 			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid transfer' ));
 		}
 	}
+	
 	public function validateDiscount($attribute,$params){
-		$discount = Discount::findOne($this->id_discount);
-		if ( !isset($discount)) {
+		$this->_discount = Discount::findOne($this->id_discount);
+		if ( !isset($this->_discount)) {
 			$this->addError($attribute,Yii::t('frontend/ticket' , 'Invalid discount' ));
 		}
 	}
 	
-
+	public function afterSave($insert, $changedAttributes){
+		
+		$transfer = Transfer::createTicketTransfer($this->_account, $this->_discount, null, 1, $this);
+		
+	}
+	
+	
 }
\ No newline at end of file
diff --git a/frontend/models/TicketSearch.php b/frontend/models/TicketSearch.php
index 92af23b..46c075f 100644
--- a/frontend/models/TicketSearch.php
+++ b/frontend/models/TicketSearch.php
@@ -39,14 +39,19 @@ class TicketSearch extends Ticket
      *
      * @return ActiveDataProvider
      */
-    public function search($params)
+    public function search($card, $params)
     {
         $query = Ticket::find();
 
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
+        	'sort'=> ['defaultOrder' => ['end'=>SORT_DESC]]
         ]);
-
+        
+		        
+		$query->innerJoinWith( 'card' );
+		$query->andWhere( ['card.id_card' => $card->id_card ] );
+        
         $this->load($params);
 
         if (!$this->validate()) {
@@ -56,7 +61,6 @@ class TicketSearch extends Ticket
         }
 
         $query->andFilterWhere([
-            'id_ticket' => $this->id_ticket,
             'id_user' => $this->id_user,
             'id_ticket_type' => $this->id_ticket_type,
             'id_account' => $this->id_account,
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
index a52796e..22a7ab5 100644
--- a/frontend/views/common/_menu_reception.php
+++ b/frontend/views/common/_menu_reception.php
@@ -66,12 +66,11 @@ function mkBtn($card, $label,$route = null ){
 			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('ticket/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )  ?>
+			<?php echo mkCustomerBtn( $card, Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create' );  ?>
 		</div>
 	</div>
     <div class='row'>
 		<div class='col-md-12'>
-			<?php //echo Html::a(Yii::t( 'frontend/customer', 'Termékeladás') ,  'product/index'  , ['class' =>   'btn btn-primary btn-reception'] )?>
 			<?php echo mkBtn($card, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
 		</div>
 	</div>
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
index f1aeabf..8997e12 100644
--- a/frontend/views/ticket/_form.php
+++ b/frontend/views/ticket/_form.php
@@ -15,13 +15,14 @@ use kartik\widgets\DatePicker;
 
 <?php 
 
+	$accountOptions = [];
+	$discountOptions= [];
+	$ticketTypeOptions= [];
+	
 	$accountOptions = HtmlHelper::mkAccountOptions($accounts);
-	$discountOptions = HtmlHelper::mkDiscountOptions($discounts);
+	$discountOptions =  ['' => ''] + HtmlHelper::mkDiscountOptions($discounts, [ 'emptyOption' => true] );
 	$ticketTypeOptions = HtmlHelper::mkTicketTypeOptions($ticketTypes);
 	
-	
-	
-	
 ?>
 
 <div class="row" >
@@ -36,8 +37,7 @@ use kartik\widgets\DatePicker;
 		
 		    <?= $form->field($model, 'id_discount')->dropDownList($discountOptions) ?>
 		
-		    
-		     <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
 		    			 'pluginOptions' => [
 						        'autoclose'=>true,
 						        'format' => 'yyyy.mm.dd'
diff --git a/frontend/views/ticket/index.php b/frontend/views/ticket/index.php
index 3469666..fcd200f 100644
--- a/frontend/views/ticket/index.php
+++ b/frontend/views/ticket/index.php
@@ -2,45 +2,71 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use frontend\components\ReceptionMenuWidget;
+use frontend\components\ReceptionCardNumberWidget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel frontend\models\TicketSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $receptionForm frotned\models\ReceptionForm */
+
+$card = $receptionForm->card;
+$customer = $receptionForm->customer;
 
 $this->title = Yii::t('common/ticket', 'Tickets');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="ticket-index">
 
+	<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+		</div>
+		<div class='col-md-4'>
+		</div>
+	</div>
+
+
     <h1><?= Html::encode($this->title) ?></h1>
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a(Yii::t('common/ticket', 'Create Ticket'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('common/ticket', 'Create Ticket'), ['create' ,'number' => $card->number ], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
 
-            'id_ticket',
-            'id_user',
-            'id_ticket_type',
-            'id_account',
-            'id_discount',
-            // 'start',
-            // 'end',
-            // 'max_usage_count',
-            // 'usage_count',
-            // 'status',
-            // 'price_brutto',
-            // 'comment',
-            // 'created_at',
-            // 'updated_at',
+			[
+				'attribute' => 'id_account',
+				'value' => 'accountName'
+    		],
+			[
+				'attribute' => 'id_ticket_type',
+				'value' => 'ticketTypeName'
+    		],
+            'start:date',
+            'end:date',
+            'max_usage_count',
+             'usage_count',
+			[
+				'attribute' => 'id_user',
+				'value' => 'userName'
+    		],
+			[
+				'attribute' => 'id_discount',
+				'value' => 'discountName'
+    		],
+             'price_brutto',
+            'created_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+		     'template' =>'{view} {update}',
+			],
         ],
     ]); ?>
 
diff --git a/frontend/views/ticket/view.php b/frontend/views/ticket/view.php
index 7bc9143..a9ea7d1 100644
--- a/frontend/views/ticket/view.php
+++ b/frontend/views/ticket/view.php
@@ -6,7 +6,7 @@ use yii\widgets\DetailView;
 /* @var $this yii\web\View */
 /* @var $model common\models\Ticket */
 
-$this->title = $model->id_ticket;
+$this->title = Yii::t('frontend/ticket', "Update ticket");
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,32 +16,34 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <p>
         <?= Html::a(Yii::t('common/ticket', 'Update'), ['update', 'id' => $model->id_ticket], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('common/ticket', 'Delete'), ['delete', 'id' => $model->id_ticket], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/ticket', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
     </p>
 
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id_ticket',
-            'id_user',
-            'id_ticket_type',
-            'id_account',
-            'id_discount',
-            'start',
-            'end',
+            [
+				'attribute' => 'id_ticket_type',
+				'value' => $model->ticketTypeName,
+			],
+            [
+				'attribute' => 'id_account',
+				'value' => $model->accountName,
+			],
+            [
+				'attribute' => 'id_discount',
+				'value' => $model->discountName,
+			],
+            'start:date',
+            'end:date',
             'max_usage_count',
             'usage_count',
             'status',
             'price_brutto',
-            'comment',
-            'created_at',
-            'updated_at',
+            [
+				'attribute' => 'comment',
+				'type' => 'raw',
+			],
+            'created_at:datetime',
         ],
     ]) ?>
 

From fda450b801909c595a4cb5f5c68539ba1646899d Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 9 Oct 2015 08:12:39 +0200
Subject: [PATCH 039/100] add frontend ticket translations

---
 common/config/i18n.php                        |  1 +
 common/messages/hu/common/customer.php        |  2 +-
 common/messages/hu/common/ticket.php          | 44 +++++++++++++++++++
 common/messages/hu/frontend/card.php          | 21 +++++++++
 common/messages/hu/frontend/ticket.php        | 27 ++++++++++++
 common/messages/hu/frontend/transfer.php      |  5 ++-
 common/models/Customer.php                    |  1 +
 common/models/Transfer.php                    | 17 ++++---
 ...5256_alter__table__ticket__add_columns.php |  4 +-
 frontend/components/FrontendMenuStructure.php | 12 +++--
 frontend/controllers/CustomerController.php   | 22 ++++++++--
 frontend/controllers/TicketController.php     |  2 +-
 frontend/models/TicketCreate.php              | 42 +++++++++++++++++-
 frontend/views/common/_form_card_number.php   |  2 +-
 frontend/views/customer/_form_create.php      |  6 +--
 frontend/views/customer/_form_update.php      | 17 +------
 frontend/views/customer/create.php            |  6 ---
 frontend/views/layouts/main.php               |  4 +-
 frontend/views/ticket/_form.php               |  7 ++-
 frontend/views/ticket/create.php              | 13 +++---
 frontend/web/js/ticket.sell.js                | 29 ++++++++++--
 21 files changed, 227 insertions(+), 57 deletions(-)
 create mode 100644 common/messages/hu/common/ticket.php
 create mode 100644 common/messages/hu/frontend/card.php
 create mode 100644 common/messages/hu/frontend/ticket.php

diff --git a/common/config/i18n.php b/common/config/i18n.php
index 1366edf..54f5c84 100644
--- a/common/config/i18n.php
+++ b/common/config/i18n.php
@@ -43,6 +43,7 @@ return [
         '.hgignore',
         '.hgkeep',
         '/messages',
+    	'node_modules'
     ],
 
     // 'php' output format is for saving messages to php files.
diff --git a/common/messages/hu/common/customer.php b/common/messages/hu/common/customer.php
index 0885b09..f478dfb 100644
--- a/common/messages/hu/common/customer.php
+++ b/common/messages/hu/common/customer.php
@@ -19,7 +19,7 @@
 return [
     'Bérlet kártya nem üres vagy hibás kártyaszám' => 'Bérlet kártya nem üres vagy hibás kártyaszám',
     'Password' => 'Jelszó',
-    'Update customer:' => 'Jelszó újra',
+    'Update customer:' => 'Vendég módosítása:',
     'Address' => 'Cím',
     'Birthdate' => 'Születésnap',
     'Card number' => 'Kártyaszám',
diff --git a/common/messages/hu/common/ticket.php b/common/messages/hu/common/ticket.php
new file mode 100644
index 0000000..fd7c80a
--- /dev/null
+++ b/common/messages/hu/common/ticket.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
+    'Comment' => 'Megjegyzés',
+    'Create' => 'Mentés',
+    'Create Ticket' => 'Új bérlet',
+    'Create and add to cart' => 'Mentés és kosárba helyezés',
+    'Created At' => 'Hozzáadva',
+    'Delete' => 'Törlés',
+    'End' => 'Érvényesség vége',
+    'Id Account' => 'Kassza',
+    'Id Discount' => 'Kedvezmény',
+    'Id Ticket' => 'Bérlet',
+    'Id Ticket Type' => 'Bérlet típus',
+    'Id User' => 'Felhasználó',
+    'Max Usage Count' => 'Max alkalmak',
+    'Price Brutto' => 'Bruttó ár',
+    'Reset' => '',
+    'Search' => 'Keresés',
+    'Start' => 'Érvényesség kezdete',
+    'Status' => 'Státusz',
+    'Tickets' => 'Bérletek',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítva: ',
+    'Updated At' => 'Módosítás',
+    'Usage Count' => 'Felhasznált alkalmak',
+];
diff --git a/common/messages/hu/frontend/card.php b/common/messages/hu/frontend/card.php
new file mode 100644
index 0000000..2c0a972
--- /dev/null
+++ b/common/messages/hu/frontend/card.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Search' => 'Keresés',
+];
diff --git a/common/messages/hu/frontend/ticket.php b/common/messages/hu/frontend/ticket.php
new file mode 100644
index 0000000..6dc2eec
--- /dev/null
+++ b/common/messages/hu/frontend/ticket.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Cart' => 'Kosár',
+    'Invalid discount' => 'Érvénytelen kedvezmény',
+    'Invalid ticket type' => 'Érvénytelen bérlet típus',
+    'Invalid transfer' => 'Érvénytelen transfer',
+    'The requested card does not exist.' => 'A megadott bérlet kártya nem található',
+    'Ticket added to customer' => 'Bérlet hozzárendelve vendéghez',
+    'Update ticket' => 'Bérlet módosítása',
+];
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index d5286ac..90f460b 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -17,11 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Are you sure you want to delete this item?' => '',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
+    'Reset' => '',
+    'Ticket' => 'Bérlet',
     'Create' => 'Mentés',
     'Create Transfer' => 'Új pénzmozgás',
     'Delete' => 'Törlés',
-    'Reset' => '',
     'Search' => 'Keresés',
     'Termékeladás' => 'Termékeladás',
     'Transfers' => 'Pénzmozgások',
diff --git a/common/models/Customer.php b/common/models/Customer.php
index 70522e9..2e7862a 100644
--- a/common/models/Customer.php
+++ b/common/models/Customer.php
@@ -92,6 +92,7 @@ class Customer extends \yii\db\ActiveRecord
             'created_at' => Yii::t('common/customer', 'Created At'),
             'updated_at' => Yii::t('common/customer', 'Updated At'),
             'customerCardNumber' => Yii::t('common/customer', 'Card number'),
+            'cardNumber' => Yii::t('common/customer', 'Card number'),
         ];
     }
     
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 74a37a4..295409e 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -82,9 +82,12 @@ class Transfer extends \yii\db\ActiveRecord
     public function getProduct(){
     	return $this->hasOne( Product::className(), ["id_product" =>"id_object" ] );
     }
+    public function getTicket(){
+    	return $this->hasOne( Ticket::className(), ["id_ticket" =>"id_object" ] );
+    }
     
     public function getAccount(){
-    	return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] );
+    	return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] ) ;
     }
 
     public function getCurrency(){
@@ -206,14 +209,18 @@ class Transfer extends \yii\db\ActiveRecord
 	    			'product_name' => function ($transfer) {
 	    				$result = "";
 	    				if ( $transfer->type == Transfer::TYPE_TICKET ){
-		    				$result =  $transfer->ticket->type->name;
+		    				$result =  $transfer->ticket->ticketTypeName;
 	    				}else{
 		    				$result =  $transfer->product->name;
 	    				}
 	    				return $result;
 	    			},
 	    			'category' => function ($transfer) {
-	    				return $transfer->product->productCategoryName;
+	    				if ( $transfer->type == Transfer::TYPE_TICKET ){
+							return Yii::t('frontend/transfer','Ticket');
+	    				}else{
+	    					return $transfer->product->productCategoryName;
+	    				}
 	    			},
     			],
 		]);
@@ -225,8 +232,8 @@ class Transfer extends \yii\db\ActiveRecord
     	
     	$query = Transfer::find();
     	
-//     	$query->innerJoinWith('userSoldItem');
-    	$query->andWhere(['transfer.id_user' => $user->id ]);
+    	$query->innerJoinWith('userSoldItem');
+    	$query->andWhere(['user_sold_item.id_user' => $user->id ]);
     	$transfers = $query->all();
     	
     	return $transfers;
diff --git a/console/migrations/m151008_065256_alter__table__ticket__add_columns.php b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
index bca41ac..89fbee1 100644
--- a/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
+++ b/console/migrations/m151008_065256_alter__table__ticket__add_columns.php
@@ -16,9 +16,9 @@ class m151008_065256_alter__table__ticket__add_columns extends Migration
 
     public function down()
     {
-        echo "m151008_065256_alter__table__ticket__add_columns cannot be reverted.\n";
+//         echo "m151008_065256_alter__table__ticket__add_columns cannot be reverted.\n";
 
-        return false;
+//         return false;
     }
 
     /*
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 058b36e..c6f39dc 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -22,11 +22,15 @@ class FrontendMenuStructure{
 	}
 	
 	
+	protected function isLogged(){
+		return Yii::$app->user->isGuest;
+	}
 	
 	
-	
-	protected function addUserMainMenu(){
-		$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
+	protected function addRecepcio(){
+		if ( $this->isLogged() ){
+			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
+		}
 	}
 	
 	
@@ -45,7 +49,7 @@ class FrontendMenuStructure{
 	
 	
 	public function run(){
-		$this->addUserMainMenu();
+		$this->addRecepcio();
 		$this->addLoginMainMenu();
 		return $this->menuItems;
 	}
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index b28c568..2cf5187 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -31,6 +31,19 @@ class CustomerController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => ['create', 'update','reception'],
+        				'rules' => [
+        						    // allow authenticated users
+        						    [
+        								        'allow' => true,
+        								        'roles' => ['@'],
+        								    ],
+        						    // everything else is denied
+        						],
+        				],
+        		
         ];
     }
 
@@ -51,6 +64,7 @@ class CustomerController extends Controller
      * Lists all Customer models.
      * @return mixed
      */
+	/*
     public function actionIndex()
     {
         $searchModel = new CustomerSearch();
@@ -61,19 +75,20 @@ class CustomerController extends Controller
             'dataProvider' => $dataProvider,
         ]);
     }
-
+*/
     /**
      * Displays a single Customer model.
      * @param integer $id
      * @return mixed
      */
+	/*
     public function actionView($id)
     {
         return $this->render('view', [
             'model' => $this->findModel($id),
         ]);
     }
-
+*/
     /**
      * Creates a new Customer model.
      * If creation is successful, the browser will be redirected to the 'view' page.
@@ -147,13 +162,14 @@ class CustomerController extends Controller
      * @param integer $id
      * @return mixed
      */
+    /*
     public function actionDelete($id)
     {
         $this->findModel($id)->delete();
 
         return $this->redirect(['index']);
     }
-
+*/
     /**
      * Finds the Customer model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 8f95402..0f77ecc 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -107,7 +107,7 @@ class TicketController extends Controller
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
         	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Ticket added to customer') );
-            return $this->redirect(['index', 'number' => $receptionForm->card->number]);
+            return $this->redirect(['product/sale', 'number' => $receptionForm->card->number]);
         } else {
         	
         	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
diff --git a/frontend/models/TicketCreate.php b/frontend/models/TicketCreate.php
index fd7cbbf..97be293 100644
--- a/frontend/models/TicketCreate.php
+++ b/frontend/models/TicketCreate.php
@@ -6,12 +6,17 @@ use common\models\TicketType;
 use common\models\Account;
 use common\models\Discount;
 use common\models\Transfer;
+use common\models\UserSoldItem;
+use yii\base\Object;
 
 class TicketCreate  extends Ticket{
 
 	public $_currency;
 	public $_account;
 	public $_discount;
+	public $_transfer;
+	
+	public $cart;
 	
 	public function rules()
 	{
@@ -51,7 +56,11 @@ class TicketCreate  extends Ticket{
 				/////////////////////
 				//comment
 				/////////////////////
-				[['comment'], 'string', 'max' => 255]
+				[['comment'], 'string', 'max' => 255],
+				/////////////////////
+				//cart
+				/////////////////////
+				[['cart'], 'string', 'max' => 10]
 		];
 	}
 	
@@ -78,10 +87,39 @@ class TicketCreate  extends Ticket{
 	}
 	
 	public function afterSave($insert, $changedAttributes){
+		$this->addTransfer();
+		$this->addToCart();
 		
+	
+	}
+
+	protected function addTransfer(){
 		$transfer = Transfer::createTicketTransfer($this->_account, $this->_discount, null, 1, $this);
-		
+		$transfer->status = Transfer::STATUS_PAID;
+		if ( isset($this->comment)){
+			$transfer->comment = $this->comment;
+		}
+		$transfer->id_user = \Yii::$app->user->id;
+		$transfer->save();
+		$this->_transfer = $transfer;
+	}
+	
+	protected function addToCart(){
+		if ( $this->isAddToCart()){
+			$item = new UserSoldItem();
+			$item->id_transfer = $this->_transfer->id_transfer;
+			$item->id_user = \Yii::$app->user->id;
+			$item->save(false);
+		}
 	}
 	
 	
+	public function isAddToCart(){
+		$result = false;
+		if ( isset( $this->cart )  && $this->cart  == 'add' ){
+			$result = true;
+		}
+		return $result;
+	}
+	
 }
\ No newline at end of file
diff --git a/frontend/views/common/_form_card_number.php b/frontend/views/common/_form_card_number.php
index 02e05e8..15ffe85 100644
--- a/frontend/views/common/_form_card_number.php
+++ b/frontend/views/common/_form_card_number.php
@@ -33,7 +33,7 @@ if ( isset($customer) ){
 		<?php echo $customername; ?>
 	</div>
 	<div class='col-md-12'>
-		<?php echo Html::submitButton("search",[ 'class' => 'btn btn-primary']); ?>
+		<?php echo Html::submitButton(  Yii::t('frontend/card', "Search"),[ 'class' => 'btn btn-primary']); ?>
 	</div>
 </div>
 	    <?php ActiveForm::end(); ?>
diff --git a/frontend/views/customer/_form_create.php b/frontend/views/customer/_form_create.php
index 036d453..22c0fc3 100644
--- a/frontend/views/customer/_form_create.php
+++ b/frontend/views/customer/_form_create.php
@@ -23,7 +23,7 @@ use kartik\widgets\DatePicker;
 		     <?php echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
 		</div>
 		<div class='col-md-3'>
-		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		    <?php //echo $form->field($model, 'partnerCardNumber')->textInput() ?>
 		</div>
 	</div>
 
@@ -40,7 +40,7 @@ use kartik\widgets\DatePicker;
 	</div>
 
    
-
+	<?php /*?>
 	<div class='row'>
 		<div class='col-md-3'>
 		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
@@ -49,7 +49,7 @@ use kartik\widgets\DatePicker;
 		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
 		</div>
 	</div>
-
+	<?php */?>
 	<div class='row'>
 		<div class='col-md-3'>
 		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
diff --git a/frontend/views/customer/_form_update.php b/frontend/views/customer/_form_update.php
index 0823749..cebebf1 100644
--- a/frontend/views/customer/_form_update.php
+++ b/frontend/views/customer/_form_update.php
@@ -22,13 +22,13 @@ use yii\base\Widget;
 	<div class='row'>
 		<div class='col-md-3'>
 		     <?php //echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
-		     <label><?php echo $model->getAttributeLabel('id_customer_card')?></label>
+		     <label><?php echo $model->getAttributeLabel('cardNumber')?></label>
 		     <div>
 		     <?php echo $model->customerCardNumber ?>
 		     </div>
 		</div>
 		<div class='col-md-3'>
-		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
+		    <?php //echo $form->field($model, 'partnerCardNumber')->textInput() ?>
 		</div>
 	</div>
 
@@ -55,19 +55,6 @@ use yii\base\Widget;
 				        'format' => 'yyyy.mm.dd'
 				    ]
 				])  ?>
-			<?php 
-				/*echo DatePicker::widget(
-						[
-						'name' => 'CustomerUpdate[birthdate]',
-						'value' =>  Yii::$app->formatter->asDate($model->birthdate),
-						'pluginOptions' => [
-								'autoclose'=>true,
-								'format' => 'yyyy.mm.dd'
-						]
-						]
-				);
-				*/
-			?>
 		</div>
 	</div>
 
diff --git a/frontend/views/customer/create.php b/frontend/views/customer/create.php
index 360d9dc..0588016 100644
--- a/frontend/views/customer/create.php
+++ b/frontend/views/customer/create.php
@@ -8,19 +8,13 @@ use frontend\components\ReceptionCardNumberWidget;
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
 
-
-
 $this->title = Yii::t('common/customer', 'Create Customer');
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/customer', 'Customers'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-
 $customer = $model;
 $card = $customer->card;
 
-
-
-
 ?>
 <div class="customer-create">
 
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 993db33..fd2f627 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -35,14 +35,14 @@ AppAsset::register($this);
     echo AlertBlock::widget([
     		'useSessionFlash' => true,
     		'type' => AlertBlock::TYPE_GROWL,
-    		'delay' => '3000'
+    		'delay' => '1'
     		]);
     
     $menuStruct = new FrontendMenuStructure();
     $items = $menuStruct->run();
     
     NavBar::begin([
-        'brandLabel' => 'My Company',
+        'brandLabel' => 'Web Recepció',
         'brandUrl' => Yii::$app->homeUrl,
         'options' => [
             'class' => 'navbar-inverse navbar-fixed-top',
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
index 8997e12..83892b2 100644
--- a/frontend/views/ticket/_form.php
+++ b/frontend/views/ticket/_form.php
@@ -31,11 +31,13 @@ use kartik\widgets\DatePicker;
 		
 		    <?php $form = ActiveForm::begin(); ?>
 		
+		    <?= Html::activeHiddenInput($model, 'cart')?>
+		    
 		    <?= $form->field($model, 'id_ticket_type')->dropDownList($ticketTypeOptions) ?>
 		
 		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
 		
-		    <?= $form->field($model, 'id_discount')->dropDownList($discountOptions) ?>
+		    <?php  //echo $form->field($model, 'id_discount')->dropDownList($discountOptions) ?>
 		
 		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
 		    			 'pluginOptions' => [
@@ -59,7 +61,8 @@ use kartik\widgets\DatePicker;
 		    <?= $form->field($model, 'comment')->textarea(['maxlength' => true]) ?>
 			
 		    <div class="form-group">
-		        <?= Html::submitButton($model->isNewRecord ? Yii::t('common/ticket', 'Create') : Yii::t('common/ticket', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+		        <?= Html::submitButton(  Yii::t('common/ticket', 'Create')  , [  'onclick' => ' $(\'#ticketcreate-cart\').val(\'\');','class' => 'btn btn-success'  ]) ?>
+		        <?= Html::submitButton(  Yii::t('common/ticket', 'Create and add to cart')  , [ 'onclick' => ' $(\'#ticketcreate-cart\').val(\'add\');',  'class' =>  'btn btn-success'  ]) ?>
 		    </div>
 		
 		    <?php ActiveForm::end(); ?>
diff --git a/frontend/views/ticket/create.php b/frontend/views/ticket/create.php
index 56d435d..5739af6 100644
--- a/frontend/views/ticket/create.php
+++ b/frontend/views/ticket/create.php
@@ -5,25 +5,27 @@ use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
 use frontend\assets\TicketSellAsset;
 use common\models\TicketType;
+use yii\helpers\Url;
 
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Ticket */
 /* @var $receptionForm frotned\models\ReceptionForm */
 
+$card = $receptionForm->card;
+$customer = $receptionForm->customer;
+
 TicketSellAsset::register($this);
 
 $this->title = Yii::t('common/ticket', 'Create Ticket');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('common/ticket', 'Tickets'), 'url' => ['index' , 'number' => $card->number ]];
 $this->params['breadcrumbs'][] = $this->title;
 
-$card = $receptionForm->card;
-$customer = $receptionForm->customer;
 
 $options = [];
 
 // $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
-// $options['clear_list_url'] = Url::toRoute(['product/clear-list']);
+$options['clear_cart_url'] = Url::toRoute(['product/clear-list']);
 $options['types'] = TicketType::modelsToArray($ticketTypes);
 $options['transfer_list'] = $userTransfers;
 
@@ -55,8 +57,9 @@ $this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
 		    ]) ?>
 		</div>
 		<div class="col-md-6">
-			<h1><?php  echo Yii::t('frontend/tciket', 'Cart')?></h1>
+			<h1><?php  echo Yii::t('frontend/ticket', 'Cart')?></h1>
 			<?php echo $this->render( "//common/_transfer_list" ) ?>
+			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
 		</div>
 	</div>
 
diff --git a/frontend/web/js/ticket.sell.js b/frontend/web/js/ticket.sell.js
index 0bc6cfa..2c342b7 100644
--- a/frontend/web/js/ticket.sell.js
+++ b/frontend/web/js/ticket.sell.js
@@ -33,8 +33,10 @@ function TicketSell(o){
 		max_usage_count: null,
 		id_account: null,
 		price: null,
-		clear_list_url: '',
-		transfer_list: []
+		clear_cart_url: '',
+		cart_paid_message:  'Tételek fizetve',
+		transfer_list: [],
+		
 	};
 	
 	init();
@@ -44,6 +46,7 @@ function TicketSell(o){
 		addBehaviourTypeChangedListener();
 		useDefaults();
 		createUserSoldItemsTable();
+		addBehaviourBtnCartPaid();
 	}
 	
 	function useDefaults(){
@@ -59,10 +62,30 @@ function TicketSell(o){
 		});
 	}
 	
-	function refreshSoldUseritems(){
+	function refreshCart(){
 		$('.transfer-list-container').transferList('option','transfers' , app.defaults.sold_items );
 	}
 	
+	function addBehaviourBtnCartPaid(  ){
+		$('#btn_paid').on('click',function(){
+			
+			$.ajax({
+				url: app.defaults.clear_cart_url,
+				type: 'post',
+		        data: {},
+		        success: function (response) {
+		        	if ( response.code == 'success'){
+		        		app.defaults.sold_items= response.transfers;
+		        		refreshCart();
+		        		$.notify(app.defaults.cart_paid_message, { 'type' : 'success' });
+		        	}
+		        }
+			}
+			);
+		});
+	}
+	
+	
 	function addBehaviourTypeChangedListener(){
 		$(app.defaults.selector_type).change(change);
 	}

From b04cbda645b63603bdba2ef9b0eee67992f25d5f Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 13 Oct 2015 09:27:56 +0200
Subject: [PATCH 040/100] add backend transfer list changes

---
 backend/controllers/TransferController.php    |  12 ++
 backend/models/ProcurementSearch.php          |   2 +-
 backend/models/TransferSearch.php             | 132 ++++++++++++--
 backend/views/transfer/_search.php            |  66 ++++---
 backend/views/transfer/index.php              |  78 ++++++--
 backend/views/transfer/view.php               |  40 ++---
 common/models/Ticket.php                      |  23 +++
 common/models/Transfer.php                    |  75 ++++++++
 frontend/components/HtmlHelper.php            |  33 ++++
 .../ReceptionCardNumberTicketsWidget.php      |  24 +++
 frontend/components/ReceptionWidget.php       |  36 ++++
 frontend/controllers/ProductController.php    | 168 ++++++++++--------
 frontend/controllers/TicketController.php     | 103 ++++++-----
 frontend/models/ReceptionForm.php             |  12 +-
 frontend/models/TicketSearch.php              |   2 +-
 .../views/common/_card_number_tickets.php     |  41 +++++
 frontend/views/common/_menu_reception.php     |  13 +-
 frontend/views/common/_reception.php          |  18 ++
 frontend/views/product/_sale_form.php         |   2 +-
 frontend/views/ticket/index.php               |  19 +-
 20 files changed, 677 insertions(+), 222 deletions(-)
 create mode 100644 frontend/components/ReceptionCardNumberTicketsWidget.php
 create mode 100644 frontend/components/ReceptionWidget.php
 create mode 100644 frontend/views/common/_card_number_tickets.php
 create mode 100644 frontend/views/common/_reception.php

diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
index a41f25c..682f990 100644
--- a/backend/controllers/TransferController.php
+++ b/backend/controllers/TransferController.php
@@ -8,6 +8,8 @@ use backend\models\TransferSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Account;
+use common\models\User;
 
 /**
  * TransferController implements the CRUD actions for Transfer model.
@@ -34,10 +36,20 @@ class TransferController extends Controller
     {
         $searchModel = new TransferSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        
+        $accounts = Account::readAccounts();
+        $users = User::read();
+        
+        $searchModel->totals(Yii::$app->request->queryParams);
+        
+       	
 
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+        	'accounts' => $accounts,
+        	'users' => $users,
+//         	'totals' =>$totals
         ]);
     }
 
diff --git a/backend/models/ProcurementSearch.php b/backend/models/ProcurementSearch.php
index ef371da..eac7970 100644
--- a/backend/models/ProcurementSearch.php
+++ b/backend/models/ProcurementSearch.php
@@ -77,7 +77,7 @@ class ProcurementSearch extends Procurement
             'id_product' => $this->id_product,
         ]);
         
-        $query->andFilterWhere([ '>=', 'created_at', $this->date_start ]   );
+        $query->andFilterWhere([ '>=', 'created_at', $this->timestampStart ]   );
         $query->andFilterWhere([ '<', 'created_at', $this->timestampEnd ]   );
 
 
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index 903aaeb..1604c29 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -6,20 +6,39 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Transfer;
+use yii\db\Expression;
+use yii\base\Object;
+use yii\db\Query;
+use yii\helpers\ArrayHelper;
+use common\models\Account;
 
 /**
  * TransferSearch represents the model behind the search form about `common\models\Transfer`.
  */
 class TransferSearch extends Transfer
 {
+	public $searchObjectName;
+	public $searchTypeName;
+	public $searchUserName;
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+	public $accountTotals;
+	public $fullTotal;
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
-            [['comment', 'created_at', 'updated_at'], 'safe'],
+            [[  'id_account','id_user', 'type'], 'integer'],
+            [[ 'searchObjectName' ], 'string'],
+        	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+        	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         ];
     }
 
@@ -47,33 +66,108 @@ class TransferSearch extends Transfer
             'query' => $query,
         ]);
 
+        $selectObjectName = "";
+        $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end as object_name";
+        
+        $query->addSelect( ['*', new Expression($selectObjectName) ]);
+        $query->joinWith('ticket');
+        $query->joinWith('ticketType');
+        $query->joinWith('product');
+        
         $this->load($params);
 
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
+            $query->where('0=1');
             return $dataProvider;
         }
 
         $query->andFilterWhere([
-            'id_transfer' => $this->id_transfer,
-            'id_discount' => $this->id_discount,
-            'id_currency' => $this->id_currency,
-            'id_object' => $this->id_object,
-            'status' => $this->status,
-            'type' => $this->type,
-            'item_price' => $this->item_price,
-            'count' => $this->count,
-            'money' => $this->money,
-            'money_currency' => $this->money_currency,
-            'rate' => $this->rate,
-            'id_user' => $this->id_user,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'transfer.id_account' => $this->id_account,
+            'transfer.type' => $this->type,
+            'transfer.id_user' => $this->id_user,
         ]);
+        
+        $query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ]   );
+        $query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
 
-        $query->andFilterWhere(['like', 'comment', $this->comment]);
-
+        if ( isset($this->searchObjectName))
+        $query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
+        
+        
+        
         return $dataProvider;
     }
+    
+    public function totals($params){
+    	$query = new Query();
+    	
+    	$result = [	];
+    	
+    	$accountTotals = [];
+    	$fullTotal = [
+    			'label' => Yii::t('common/transfer', 'Total'),
+    			'money' => 0
+    	];
+    		
+    	$query->addSelect( [ new Expression( 'transfer.id_account as account'),  new Expression( ' COALESCE(sum( transfer.money ),0) as money' )]);
+    	$query->from('transfer');
+    	$query->leftJoin('ticket', 'transfer.type =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
+    	$query->leftJoin('ticket_type', 'ticket.id_ticket_type   = ticket_type.id_ticket_type ' );
+    	$query->leftJoin('product', 'product.id_product =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
+    	
+    	$this->load($params);
+    	
+    	if (!$this->validate()) {
+    		return  ;
+    	}
+    	
+    	$query->andFilterWhere([
+    			'transfer.id_account' => $this->id_account,
+    			'transfer.type' => $this->type,
+    			'transfer.id_user' => $this->id_user,
+    	]);
+    	
+    	$query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ]   );
+    	$query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
+    	
+    	
+    	if ( isset($this->searchObjectName)  && !empty($this->searchObjectName)){
+    		$query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
+    	}
+    	
+    	$query->groupBy('transfer.id_account');
+    	
+    	$command = $query->createCommand();
+		// $command->sql returns the actual SQL
+		$result = $command->queryAll();
+		
+		
+		$accounts =  Account::find()->orderBy("name asc")->all();
+		$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
+		
+		
+		
+		foreach ($result as $item){
+			$account = "";
+			if ( array_key_exists($item['account'], $accountMap)){
+				$account = $accountMap[$item['account']];
+			}
+				
+			 $accountTotal = [
+			 	'label' => 	$account,
+			 	'money' => $item['money']
+			 ];
+			 
+			 $accountTotals[] = $accountTotal;
+			 
+			 $fullTotal['money'] += $item['money'];
+		}
+    	
+		$this->accountTotals = $accountTotals;
+		$this->fullTotal = $fullTotal;
+		
+//     	return $result;
+    }
+    
 }
diff --git a/backend/views/transfer/_search.php b/backend/views/transfer/_search.php
index 3e67083..d55f5d4 100644
--- a/backend/views/transfer/_search.php
+++ b/backend/views/transfer/_search.php
@@ -2,52 +2,68 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+use yii\helpers\ArrayHelper;
+use common\models\Transfer;
+use kartik\widgets\DatePicker;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\TransferSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
+<?php 
 
+?>
 <div class="transfer-search">
 
     <?php $form = ActiveForm::begin([
         'action' => ['index'],
         'method' => 'get',
     ]); ?>
+    
+    <div class='row'>
+	<div class='col-md-4'>
+    	<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +HtmlHelper::mkAccountOptions($accounts) ) ?>
+	</div>
+	<div class='col-md-4'>
+    	<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  + Transfer::types() ) ?>
+	</div>
+	<div class='col-md-4'>
+    	<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +ArrayHelper::map($users,'id' , 'username') ) ?> 
+	</div>
+	</div>
 
-    <?= $form->field($model, 'id_transfer') ?>
 
-    <?= $form->field($model, 'id_discount') ?>
 
-    <?= $form->field($model, 'id_currency') ?>
 
-    <?= $form->field($model, 'id_object') ?>
 
-    <?= $form->field($model, 'status') ?>
+	
+    
+    <div class="row">
+		<div class='col-md-4'>
+	    <?php   echo $form->field($model, 'searchObjectName') ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
 
-    <?php // echo $form->field($model, 'type') ?>
-
-    <?php // echo $form->field($model, 'item_price') ?>
-
-    <?php // echo $form->field($model, 'count') ?>
-
-    <?php // echo $form->field($model, 'money') ?>
-
-    <?php // echo $form->field($model, 'money_currency') ?>
-
-    <?php // echo $form->field($model, 'rate') ?>
-
-    <?php // echo $form->field($model, 'id_user') ?>
-
-    <?php // echo $form->field($model, 'comment') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('frontend/transfer', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php
index 2d0a0c8..62670d0 100644
--- a/backend/views/transfer/index.php
+++ b/backend/views/transfer/index.php
@@ -2,6 +2,10 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\widgets\DetailView;
+use yii\base\Widget;
+use yii\base\Object;
+use yii\data\ArrayDataProvider;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\TransferSearch */
@@ -13,30 +17,68 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="transfer-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
-
-    <p>
-        <?= Html::a(Yii::t('frontend/transfer', 'Create Transfer'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
+    <?php  echo $this->render('_search', ['model' => $searchModel, 'accounts' => $accounts,'users' => $users,]); ?>
 
+	<?php 
+	?>
+	<h2>Összesen</h2>
+	<?php 
+		echo DetailView::widget([
+				'model' => $searchModel->fullTotal,
+				'attributes' => [
+						[
+								'value' => $searchModel->fullTotal['money'],
+								'label' => $searchModel->fullTotal['label'],
+						],
+					]
+		]) 
+	?>
+	<h2>Kasszák összesen</h2>
+	<?php 
+		echo GridView::widget([
+			 'dataProvider' => new ArrayDataProvider([
+				      'allModels' =>  $searchModel->accountTotals,
+				      'sort' => false,
+				      'pagination' => false,
+				  ]) ,
+			        'columns' => [
+			        		[
+			        		'label' => Yii::t('common/transfer','Account'),
+			        		'value' => 'label'
+			        		],
+			        		[
+			        		'label' => Yii::t('common/transfer','Money total'),
+			        		'value' => 'money'
+			        		],
+					] 
+				]
+		);
+	?>
+	<h2>Pénzmozgások</h2>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
 
-            'id_discount',
-            'id_currency',
-            'id_object',
-            'status',
-            // 'type',
-            // 'item_price',
-            // 'count',
-            // 'money',
-            // 'money_currency',
-            // 'rate',
-            // 'id_user',
-            // 'comment',
+        		[
+        		'attribute' => 'type',
+        		'value' => 'transferTypeName'
+        		],
+        		[
+        		'attribute' => 'id_object',
+        		'value' => 'objectName'
+        				],
+            [
+            	'attribute' => 'id_user',
+            	'value' => 'userName'	
+    		],
+            [
+            	'attribute' => 'id_account',
+            	'value' => 'accountName'	
+    		],
+        		'item_price',
+        		'count',
+        		'money',
             'created_at:datetime',
-            'updated_at:datetime',
 
             ['class' => 'yii\grid\ActionColumn',
             'template' => '{view}'
diff --git a/backend/views/transfer/view.php b/backend/views/transfer/view.php
index 9fff603..7e648a4 100644
--- a/backend/views/transfer/view.php
+++ b/backend/views/transfer/view.php
@@ -14,35 +14,33 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('frontend/transfer', 'Update'), ['update', 'id' => $model->id_transfer], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('frontend/transfer', 'Delete'), ['delete', 'id' => $model->id_transfer], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('frontend/transfer', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
-            'id_transfer',
-            'id_discount',
-            'id_currency',
-            'id_object',
-            'status',
-            'type',
+        	[
+        		'attribute' => 'id_transfer',
+    		],
+        		[
+        		'attribute' => 'id_account',
+        		'value' => $model->accountName
+        		],
+        	[
+        		'attribute' => 'type',
+        		'value' =>  $model->transferTypeName,
+    		],
+        	[
+        		'attribute' => 'id_object',
+        		'value' =>  $model->objectName,
+    		],
+        	[
+        		'attribute' => 'id_user',
+        		'value' =>  $model->userName,
+    		],
             'item_price',
             'count',
             'money',
-            'money_currency',
-            'rate',
-            'id_user',
             'comment',
             'created_at',
-            'updated_at',
         ],
     ]) ?>
 
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index 82c7293..86bbf24 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -124,4 +124,27 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     	}
     	return $result;
     }
+    
+    
+    /**
+     * @param common\models\Card $card the card to which we are looking for
+     * */
+    public static function readActive($card){
+    	
+    	if ( $card == null )
+    		return [];
+    	
+		$query = Ticket::find();
+		$today = date('Y-m-d');
+
+		$query->andWhere(['id_card' => $card->id_card]);
+		$query->andWhere( 'start <= :today' ,[ 'today' => $today] );
+		$query->andWhere( 'end >= :today' ,[ 'today' => $today] );
+		
+		$result  = $query->all();
+
+		return $result;
+		
+    }
+    
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 295409e..29a42cf 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -79,12 +79,21 @@ class Transfer extends \yii\db\ActiveRecord
         ];
     }
     
+    public function getUser(){
+    	return $this->hasOne( User::className(), ["id" =>"id_user" ] );
+    }
+    
     public function getProduct(){
     	return $this->hasOne( Product::className(), ["id_product" =>"id_object" ] );
     }
+    
     public function getTicket(){
     	return $this->hasOne( Ticket::className(), ["id_ticket" =>"id_object" ] );
     }
+
+    public function getTicketType(){
+    	return $this->hasOne( TicketType::className(), ["id_ticket_type" =>"id_ticket_type" ] )->via('ticket')  ;
+    }
     
     public function getAccount(){
     	return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] ) ;
@@ -102,6 +111,65 @@ class Transfer extends \yii\db\ActiveRecord
     	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
     }
     
+    public function getObjectName(){
+    	$result = "";
+    	if ( $this->type == Transfer::TYPE_TICKET ){
+    		$result =  $this->ticketName;
+    	}else{
+    		$result =  $this->productName;
+    	}
+    	return $result;
+    }
+    public function getUserName(){
+    	$result = "";
+    	$user = $this->user;
+    	if (isset($this->user)){
+    		$result = $user->username;
+    	}
+    	
+    	return $result;
+    }
+    
+    public function getProductName(){
+    	$result = "";
+    	$product = $this->product;
+    	if (isset($product)){
+    		$result = $product->name;
+    	}
+    	
+    	return $result;
+    }
+    
+    public function getTicketName(){
+    	$result = "";
+    	$ticket = $this->ticket;
+    	if (isset($ticket)){
+    		$result  = $this->ticket->ticketTypeName;
+    	}
+    	
+    	return $result;
+    }
+    public function getAccountName(){
+    	$result = "";
+    	$account = $this->account;
+    	if (isset($account)){
+    		$result  = $account->name;
+    	}
+    	
+    	return $result;
+    }
+    
+    public function getTransferTypeName(){
+    	$result = "";
+    	if ( $this->type == Transfer::TYPE_TICKET ){
+    		$result =  Yii::t('common/transfer','Ticket');
+    	}else{
+    		$result =  Yii::t('common/transfer','Product');
+    	}
+    	
+    	return $result;
+    }
+    
 	
     public function toProductSoldString(){
     	$s = "";
@@ -239,4 +307,11 @@ class Transfer extends \yii\db\ActiveRecord
     	return $transfers;
     }
     
+    public static function types( ) {
+    	return [
+    			self::TYPE_PRODUCT => Yii::t('common/transfer','Product'),	
+    			self::TYPE_TICKET => Yii::t('common/transfer','Ticket'),	
+    	];
+    }
+    
 }
diff --git a/frontend/components/HtmlHelper.php b/frontend/components/HtmlHelper.php
index 327d409..aeb5bf4 100644
--- a/frontend/components/HtmlHelper.php
+++ b/frontend/components/HtmlHelper.php
@@ -9,6 +9,39 @@ use yii\helpers\ArrayHelper;
 class HtmlHelper{
 	
 
+	/**
+	 * Mehtod used in reception widgets to render card dependent buttons
+	 * 
+	 * @see ReceptionCardNumberTicketsWidget
+	 * @see ReceptionCardNumberWidget
+	 * @see ReceptionMenuWidget
+	 * */
+	public static function mkReceptionCardBtn($card, $label,$route = null ){
+	
+		$url = null;
+		$classes =  'btn btn-primary btn-reception';
+		if ( $card == null ){
+			$classes .= ' disabled';
+		}
+		if ( isset($route)){
+			$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
+		}
+		return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
+	}
+	
+	public static function mkReceptionBtn($card, $label,$route = null ){
+	
+		$url = null;
+		$classes =  'btn btn-primary btn-reception';
+	
+		if ( isset($route)){
+			$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
+		}
+	
+		return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
+	}
+	
+	
 	public static function mkOptions( $models, $key, $value = 'name'   ){
 		$result = [];
 		$result = ArrayHelper::map( $models, $key, $value );
diff --git a/frontend/components/ReceptionCardNumberTicketsWidget.php b/frontend/components/ReceptionCardNumberTicketsWidget.php
new file mode 100644
index 0000000..4e8a3e9
--- /dev/null
+++ b/frontend/components/ReceptionCardNumberTicketsWidget.php
@@ -0,0 +1,24 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class ReceptionCardNumberTicketsWidget extends Widget{
+	
+	public $number;
+	public $route;
+	
+	public $customer;
+	public $card;
+	
+	public $tickets;
+	
+	public $viewFile = '//common/_card_number_tickets';
+	
+	
+	public function run(){
+		echo $this->render($this->viewFile,[ 'tickets' => $this->tickets,  'card' => $this->card, 'customer' =>$this->customer , 'route' => $this->route ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/components/ReceptionWidget.php b/frontend/components/ReceptionWidget.php
new file mode 100644
index 0000000..d7fbce4
--- /dev/null
+++ b/frontend/components/ReceptionWidget.php
@@ -0,0 +1,36 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class ReceptionWidget extends Widget{
+	
+	public $form;
+	
+	public $number;
+	public $route;
+	
+	public $customer;
+	public $card;
+	
+	public $tickets;
+	
+	public $viewFile = '//common/_reception';
+	
+	public function init(){
+		parent::init();
+		if ( isset($this->form)){
+			$this->card = $this->form->card;
+			$this->customer = $this->form->customer;
+			$this->tickets = $this->form->tickets;
+		}
+		
+	}
+	
+	
+	public function run(){
+		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer, 'tickets' => $this->tickets  ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 320f2a1..e39b015 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -39,6 +39,18 @@ class ProductController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'sale','clear-list', 'lookup'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
@@ -126,82 +138,8 @@ class ProductController extends Controller
     }
     
     
-    /**
-     * Lists all Product models.
-     * @return mixed
-     */
-    public function actionIndex()
-    {
-        $searchModel = new ProductSearch();
-        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
-        return $this->render('index', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
-        ]);
-    }
 
-    /**
-     * Displays a single Product model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-
-    /**
-     * Creates a new Product model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new Product();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_product]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Updates an existing Product model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_product]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Product model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
 
     /**
      */
@@ -250,4 +188,86 @@ class ProductController extends Controller
     	
     }
     
+    /**
+     * Lists all Product models.
+     * @return mixed
+     */
+    /*
+    public function actionIndex()
+    {
+        $searchModel = new ProductSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+*/
+    /**
+     * Displays a single Product model.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+*/
+    /**
+     * Updates an existing Product model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+    */
+    /**
+     * Deletes an existing Product model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+    */
+    /**
+     * Creates a new Product model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    /*
+    public function actionCreate()
+    {
+        $model = new Product();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_product]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+*/
 }
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 0f77ecc..f8dd1d8 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -31,6 +31,18 @@ class TicketController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => ['create', 'index' ],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
@@ -59,18 +71,6 @@ class TicketController extends Controller
         ]);
     }
 
-    /**
-     * Displays a single Ticket model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-
     /**
      * Creates a new Ticket model.
      * If creation is successful, the browser will be redirected to the 'view' page.
@@ -123,38 +123,6 @@ class TicketController extends Controller
         }
     }
 
-    /**
-     * Updates an existing Ticket model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_ticket]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Ticket model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-
     /**
      * Finds the Ticket model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
@@ -170,4 +138,51 @@ class TicketController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+    /**
+     * Displays a single Ticket model.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+	*/
+    /**
+     * Deletes an existing Ticket model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+	*/
+    /**
+     * Updates an existing Ticket model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    /*
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_ticket]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+*/
 }
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
index d8f224c..372314f 100644
--- a/frontend/models/ReceptionForm.php
+++ b/frontend/models/ReceptionForm.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use common\models\Card;
 use common\models\Customer;
+use common\models\Ticket;
 
 /**
  * ContactForm is the model behind the contact form.
@@ -15,6 +16,7 @@ class ReceptionForm extends Model
     public $number;
 	public $card;
 	public $customer;
+	public $tickets;
     
     
     /**
@@ -39,10 +41,18 @@ class ReceptionForm extends Model
     }
     
     public function readCard(){
+    	
     	$this->card = Card::findOne(['number' => $this->number]);
     	if ( $this->card != null ){
     		$this->customer = $this->card->customer;
+    		$this->readValidTickets();
     	}
     }
-
+    
+    public function readValidTickets(){
+    	$this->tickets = Ticket::readActive($this->card);
+    }
+    
+	
+    
 }
diff --git a/frontend/models/TicketSearch.php b/frontend/models/TicketSearch.php
index 46c075f..07d54aa 100644
--- a/frontend/models/TicketSearch.php
+++ b/frontend/models/TicketSearch.php
@@ -45,7 +45,7 @@ class TicketSearch extends Ticket
 
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
-        	'sort'=> ['defaultOrder' => ['end'=>SORT_DESC]]
+        	'sort'=> ['defaultOrder' => ['created_at'=>SORT_DESC]]
         ]);
         
 		        
diff --git a/frontend/views/common/_card_number_tickets.php b/frontend/views/common/_card_number_tickets.php
new file mode 100644
index 0000000..3061142
--- /dev/null
+++ b/frontend/views/common/_card_number_tickets.php
@@ -0,0 +1,41 @@
+<?php
+use yii\base\Object;
+use common\models\Ticket;
+?>
+<style>
+.reception-tickets-container{
+	max-height: 300px;
+	overflow-y: auto;
+}
+</style>
+<div class="reception-tickets-container">
+<table class="table table-bordered table-striped">
+	<?php $model = new Ticket() ;?>
+	<thead>
+	<tr>
+	<th><?php echo $model->getAttributeLabel('id_ticket_type') ?></th>
+	<th><?php echo $model->getAttributeLabel('start') ?></th>
+	<th><?php echo $model->getAttributeLabel('end') ?></th>
+	</tr>
+	</thead>
+
+		<?php if (isset($tickets)  && count($tickets) ) {?>
+		<tbody>
+		<?php foreach ($tickets  as $ticket){  ?>
+			<tr>
+				<td>
+					<?php echo $ticket->ticketTypeName ?>
+				</td>
+				<td>
+					<?php echo Yii::$app->formatter->asDate( $ticket->start ) ?>
+				</td>
+				<td>
+					<?php echo Yii::$app->formatter->asDate( $ticket->end ) ?>
+				</td>
+			</tr>
+		<?php }?>
+		</tbody>
+		<?php }?>
+
+</table>
+</div>
\ No newline at end of file
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
index 22a7ab5..64d6f9c 100644
--- a/frontend/views/common/_menu_reception.php
+++ b/frontend/views/common/_menu_reception.php
@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use yii\helpers\Url;
+use frontend\components\HtmlHelper;
 
 /* @var $this yii\web\View */
 /* @var $card common\models\Card */
@@ -25,7 +26,7 @@ if ( isset($customer ) ){
 	$customername = $customer->name; 
 }
 
-
+/*
 function mkCustomerBtn($card, $label,$route = null ){
 
 	$url = null;
@@ -38,7 +39,6 @@ function mkCustomerBtn($card, $label,$route = null ){
 	}
 	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
 }
-
 function mkBtn($card, $label,$route = null ){
 
 	$url = null;
@@ -50,12 +50,13 @@ function mkBtn($card, $label,$route = null ){
 	
 	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
 }
+*/
 
 
 ?>
     <div class='row'>
 		<div class='col-md-8'>
-			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
+			<?php echo   HtmlHelper::mkReceptionCardBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
 		</div>
 		<div class='col-md-4'>
 			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('customer/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
@@ -63,15 +64,15 @@ function mkBtn($card, $label,$route = null ){
 	</div>
     <div class='row'>
 		<div class='col-md-8'>
-			<?php echo mkCustomerBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
+			<?php echo HtmlHelper::mkReceptionCardBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo mkCustomerBtn( $card, Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create' );  ?>
+			<?php echo HtmlHelper::mkReceptionCardBtn( $card, Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create' );  ?>
 		</div>
 	</div>
     <div class='row'>
 		<div class='col-md-12'>
-			<?php echo mkBtn($card, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
+			<?php echo  HtmlHelper::mkReceptionBtn($card, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
 		</div>
 	</div>
 
diff --git a/frontend/views/common/_reception.php b/frontend/views/common/_reception.php
new file mode 100644
index 0000000..3315a8f
--- /dev/null
+++ b/frontend/views/common/_reception.php
@@ -0,0 +1,18 @@
+<?php 
+use frontend\components\ReceptionCardNumberWidget;
+use frontend\components\ReceptionMenuWidget;
+use frontend\models\ReceptionForm;
+use frontend\components\ReceptionCardNumberTicketsWidget;
+use yii\base\Widget;
+?>
+<div class='row'>
+		<div class='col-md-3'>
+			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo ReceptionCardNumberTicketsWidget::widget([ 'tickets' => $tickets,  'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] ) ?>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index ae42348..60c9a03 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -78,7 +78,7 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 	</div>
 	<div class="row">
 		<div class='col-md-12'>
-			<?php echo $form->field($model,'id_currency')->dropDownList($currencyOptions)  ?>
+			<?php //echo $form->field($model,'id_currency')->dropDownList($currencyOptions)  ?>
 		</div>
 	</div>
 	<div class="row">
diff --git a/frontend/views/ticket/index.php b/frontend/views/ticket/index.php
index fcd200f..1d9b78d 100644
--- a/frontend/views/ticket/index.php
+++ b/frontend/views/ticket/index.php
@@ -4,6 +4,8 @@ use yii\helpers\Html;
 use yii\grid\GridView;
 use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
+use frontend\components\ReceptionWidget;
+use yii\base\Widget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel frontend\models\TicketSearch */
@@ -18,16 +20,8 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="ticket-index">
 
-	<div class='row'>
-		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
-		</div>
-		<div class='col-md-4'>
-		</div>
-	</div>
+
+	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
 
 
     <h1><?= Html::encode($this->title) ?></h1>
@@ -57,16 +51,19 @@ $this->params['breadcrumbs'][] = $this->title;
 				'attribute' => 'id_user',
 				'value' => 'userName'
     		],
+        		/*
 			[
 				'attribute' => 'id_discount',
 				'value' => 'discountName'
     		],
+    		*/
              'price_brutto',
             'created_at:datetime',
-
+			/*
             ['class' => 'yii\grid\ActionColumn',
 		     'template' =>'{view} {update}',
 			],
+			*/
         ],
     ]); ?>
 

From 9145f21371bba685637b4e902055ebd6f04b78a0 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 19 Oct 2015 07:48:46 +0200
Subject: [PATCH 041/100] add changes to account state

---
 backend/components/AdminMenuStructure.php     |   3 +-
 .../AccountStateController.php}               |  43 ++--
 backend/controllers/UserController.php        |  49 +++-
 backend/models/AccountStateSearch.php         |  82 +++++++
 backend/models/TransferSearch.php             |   1 +
 backend/models/UserCreate.php                 |   9 +-
 backend/models/UserUpdate.php                 |  10 +-
 backend/views/account-state/_form.php         |  55 +++++
 backend/views/account-state/_item_view.php    |  13 +
 backend/views/account-state/_search.php       |  68 ++++++
 backend/views/account-state/create.php        |  21 ++
 backend/views/account-state/index.php         |  39 +++
 backend/views/account-state/update.php        |  23 ++
 backend/views/account-state/view.php          |  56 +++++
 backend/views/user/_form.php                  |  39 +++
 backend/views/user/create.php                 |   1 +
 backend/views/user/update.php                 |   1 +
 common/components/ArrayValidator.php          |  49 ++++
 common/messages/hu/common/transfer.php        |   6 +
 common/models/Account.php                     |  20 ++
 common/models/AccountState.php                | 227 ++++++++++++++++++
 common/models/Transfer.php                    |   4 +
 common/models/User.php                        |   4 +
 common/models/UserAccountAssignment.php       |  45 ++++
 composer.json                                 |   3 +-
 composer.lock                                 |  18 +-
 ...4_add__table__user__account_assignment.php |  40 +++
 ...51014_053236_add__table__account_state.php |  56 +++++
 ...lumns__comment__prev_state__prev_money.php |  32 +++
 ..._table_transfer__add_column__dircetion.php |  30 +++
 frontend/assets/AccountStateAsset.php         |  29 +++
 frontend/assets/AccountingAsset.php           |  16 ++
 .../AccountStateBanknoteCountWidget.php       | 173 +++++++++++++
 frontend/components/FrontendMenuStructure.php |  10 +-
 frontend/components/HtmlHelper.php            |   9 +
 .../controllers/AccountStateController.php    | 175 ++++++++++++++
 frontend/models/AccountstateSearch.php        |  66 +++++
 frontend/views/account-state/_form.php        |  57 +++++
 frontend/views/account-state/_form_close.php  |  63 +++++
 frontend/views/account-state/_form_open.php   |  80 ++++++
 frontend/views/account-state/_item_view.php   |  13 +
 frontend/views/account-state/_notes.php       |  31 +++
 frontend/views/account-state/_search.php      |  63 +++++
 frontend/views/account-state/close.php        |  28 +++
 frontend/views/account-state/create.php       |  21 ++
 frontend/views/account-state/index.php        |  38 +++
 frontend/views/account-state/open.php         |  29 +++
 frontend/views/account-state/update.php       |  23 ++
 frontend/views/account-state/view.php         |  53 ++++
 frontend/web/js/accountstate.js               | 142 +++++++++++
 50 files changed, 2139 insertions(+), 27 deletions(-)
 rename backend/{models/AccountController.php => controllers/AccountStateController.php} (73%)
 create mode 100644 backend/models/AccountStateSearch.php
 create mode 100644 backend/views/account-state/_form.php
 create mode 100644 backend/views/account-state/_item_view.php
 create mode 100644 backend/views/account-state/_search.php
 create mode 100644 backend/views/account-state/create.php
 create mode 100644 backend/views/account-state/index.php
 create mode 100644 backend/views/account-state/update.php
 create mode 100644 backend/views/account-state/view.php
 create mode 100644 common/components/ArrayValidator.php
 create mode 100644 common/models/AccountState.php
 create mode 100644 common/models/UserAccountAssignment.php
 create mode 100644 console/migrations/m151013_154204_add__table__user__account_assignment.php
 create mode 100644 console/migrations/m151014_053236_add__table__account_state.php
 create mode 100644 console/migrations/m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money.php
 create mode 100644 console/migrations/m151018_103040_alter__table_transfer__add_column__dircetion.php
 create mode 100644 frontend/assets/AccountStateAsset.php
 create mode 100644 frontend/assets/AccountingAsset.php
 create mode 100644 frontend/components/AccountStateBanknoteCountWidget.php
 create mode 100644 frontend/controllers/AccountStateController.php
 create mode 100644 frontend/models/AccountstateSearch.php
 create mode 100644 frontend/views/account-state/_form.php
 create mode 100644 frontend/views/account-state/_form_close.php
 create mode 100644 frontend/views/account-state/_form_open.php
 create mode 100644 frontend/views/account-state/_item_view.php
 create mode 100644 frontend/views/account-state/_notes.php
 create mode 100644 frontend/views/account-state/_search.php
 create mode 100644 frontend/views/account-state/close.php
 create mode 100644 frontend/views/account-state/create.php
 create mode 100644 frontend/views/account-state/index.php
 create mode 100644 frontend/views/account-state/open.php
 create mode 100644 frontend/views/account-state/update.php
 create mode 100644 frontend/views/account-state/view.php
 create mode 100644 frontend/web/js/accountstate.js

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 0a51e6c..593093b 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -45,7 +45,8 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
 		$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 		$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
-		$items[] = ['label' => 'Transfer', 'url' => ['/transfer/index'] ];
+		$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index'] ];
+		$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 		
 		if ( count($items) > 0 ){
 			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/models/AccountController.php b/backend/controllers/AccountStateController.php
similarity index 73%
rename from backend/models/AccountController.php
rename to backend/controllers/AccountStateController.php
index dadd3eb..df77cd8 100644
--- a/backend/models/AccountController.php
+++ b/backend/controllers/AccountStateController.php
@@ -1,18 +1,20 @@
 <?php
 
-namespace backend\models;
+namespace backend\controllers;
 
 use Yii;
-use common\models\Account;
-use backend\models\AccountSearch;
+use common\models\AccountState;
+use backend\models\AccountStateSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Account;
+use common\models\User;
 
 /**
- * AccountController implements the CRUD actions for Account model.
+ * AccountStateController implements the CRUD actions for AccountState model.
  */
-class AccountController extends Controller
+class AccountStateController extends Controller
 {
     public function behaviors()
     {
@@ -27,22 +29,29 @@ class AccountController extends Controller
     }
 
     /**
-     * Lists all Account models.
+     * Lists all AccountState models.
      * @return mixed
      */
     public function actionIndex()
     {
-        $searchModel = new AccountSearch();
+        $searchModel = new AccountStateSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
+        $accounts = Account::read();
+        $users = User::read();
+        
+        
+        
         return $this->render('index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
+        		'accounts' => $accounts,
+        		'users' => $users,
         ]);
     }
 
     /**
-     * Displays a single Account model.
+     * Displays a single AccountState model.
      * @param integer $id
      * @return mixed
      */
@@ -54,16 +63,16 @@ class AccountController extends Controller
     }
 
     /**
-     * Creates a new Account model.
+     * Creates a new AccountState model.
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
     public function actionCreate()
     {
-        $model = new Account();
+        $model = new AccountState();
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account]);
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
         } else {
             return $this->render('create', [
                 'model' => $model,
@@ -72,7 +81,7 @@ class AccountController extends Controller
     }
 
     /**
-     * Updates an existing Account model.
+     * Updates an existing AccountState model.
      * If update is successful, the browser will be redirected to the 'view' page.
      * @param integer $id
      * @return mixed
@@ -82,7 +91,7 @@ class AccountController extends Controller
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account]);
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
         } else {
             return $this->render('update', [
                 'model' => $model,
@@ -91,7 +100,7 @@ class AccountController extends Controller
     }
 
     /**
-     * Deletes an existing Account model.
+     * Deletes an existing AccountState model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
      * @return mixed
@@ -104,15 +113,15 @@ class AccountController extends Controller
     }
 
     /**
-     * Finds the Account model based on its primary key value.
+     * Finds the AccountState model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
      * @param integer $id
-     * @return Account the loaded model
+     * @return AccountState the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */
     protected function findModel($id)
     {
-        if (($model = Account::findOne($id)) !== null) {
+        if (($model = AccountState::findOne($id)) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index 88a61e5..cca3c77 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -11,12 +11,15 @@ use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\base\Object;
 use backend\models\UserUpdate;
+use common\models\Account;
+use common\models\UserAccountAssignment;
 
 /**
  * UserController implements the CRUD actions for User model.
  */
 class UserController extends Controller
 {
+	
     public function behaviors()
     {
         return [
@@ -37,6 +40,8 @@ class UserController extends Controller
     {
         $searchModel = new UserSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        
+        
 
         return $this->render('index', [
             'searchModel' => $searchModel,
@@ -64,14 +69,35 @@ class UserController extends Controller
     public function actionCreate()
     {
         $model = new UserCreate();
+        
+        $accounts = Account::readAccounts();
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
-        } else {
+        	
+        	$this->updateAccountAssignments($model);
+        	
+//             return $this->redirect(['view', 'id' => $model->id]);
+            
+        } 
+        
             return $this->render('create', [
                 'model' => $model,
+            	'accounts' => $accounts,
             ]);
-        }
+    }
+    
+    public function updateAccountAssignments($model){
+    		
+    		echo "saving accounts";
+    		UserAccountAssignment::deleteAll(['id_user' => $model->id]);
+        	foreach ( $model->selected_accounts as $id_account ){
+        		echo "saving account";
+        		$uaa = new UserAccountAssignment();
+        		$uaa->id_user = $model->id;
+        		$uaa->id_account = $id_account;
+        		$uaa->save();
+        	}
+        	
     }
 
     /**
@@ -87,14 +113,29 @@ class UserController extends Controller
         if ( $model == null ){
         	throw new NotFoundHttpException('The requested page does not exist.');
         }
+        
+        $accounts = Account::readAccounts();
+        
+        $this->applyAccounts($model);
+
+        
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        	$this->updateAccountAssignments($model);
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
+        }
             return $this->render('update', [
                 'model' => $model,
+                'accounts' => $accounts,
             ]);
-        }
+    }
+    
+    private function applyAccounts($model ){
+    	$assignedAccounts = $model->userAccountAssignments;
+    	foreach ($assignedAccounts as $acc ){
+    		$model->selected_accounts[] = $acc->id_account;
+    	}
     }
 
     /**
diff --git a/backend/models/AccountStateSearch.php b/backend/models/AccountStateSearch.php
new file mode 100644
index 0000000..9e18585
--- /dev/null
+++ b/backend/models/AccountStateSearch.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\AccountState;
+
+/**
+ * AccountStateSearch represents the model behind the search form about `common\models\AccountState`.
+ */
+class AccountStateSearch extends AccountState
+{
+	
+	public $type;
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [[ 'id_account', 'type', 'id_user'], 'integer'],
+        	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+        	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
+        		
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = AccountState::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        	'sort' => false,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            $query->where('0=1');
+            return $dataProvider;
+        }
+        
+        $query->orderBy(['created_at'  => SORT_DESC]);
+
+        $query->andFilterWhere([
+            'id_user' => $this->id_user,
+            'id_account' => $this->id_account,
+            'type' => $this->type,
+        ]);
+
+        $query->andFilterWhere([ '>=', 'created_at', $this->timestampStart ]   );
+        $query->andFilterWhere([ '<', 'created_at', $this->timestampEnd ]   );
+        
+        return $dataProvider;
+    }
+}
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index 1604c29..99112a9 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -66,6 +66,7 @@ class TransferSearch extends Transfer
             'query' => $query,
         ]);
 
+//         $query->distinct();
         $selectObjectName = "";
         $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end as object_name";
         
diff --git a/backend/models/UserCreate.php b/backend/models/UserCreate.php
index 2e59786..b6b2945 100644
--- a/backend/models/UserCreate.php
+++ b/backend/models/UserCreate.php
@@ -8,6 +8,7 @@ class UserCreate extends User{
 
 	public $password_plain;
 	public $password_repeat;
+	public $selected_accounts = [];
 	
 	/**
 	 * @inheritdoc
@@ -16,11 +17,17 @@ class UserCreate extends User{
 	{
 		return [
 				[['username','email','password_plain','password_repeat'], 'required' ],
+				['selected_accounts',function ($attribute, $params) {
+					if (!is_array($this->$attribute)) {
+						$this->addError($attribute, 'Invalid array');
+					}
+				}
+				],
 				['email' ,'email' ],
 				['email' ,'unique' ],
 				['username' ,'unique' ],
 				[['password_plain' ,'password_repeat'] ,'string','min' =>6 ],
-				[['password_repeat']   ,'validatePasswordRepeat' ]
+				[['password_repeat']   ,'validatePasswordRepeat' ],
 		];
 	}
 	
diff --git a/backend/models/UserUpdate.php b/backend/models/UserUpdate.php
index 077d07a..c6d900f 100644
--- a/backend/models/UserUpdate.php
+++ b/backend/models/UserUpdate.php
@@ -8,6 +8,7 @@ use common\models\User;
 class UserUpdate extends User {
 	public $password_plain;
 	public $password_repeat;
+	public $selected_accounts = [];
 	
 	/**
 	 * @inheritdoc
@@ -21,9 +22,16 @@ class UserUpdate extends User {
 				['email' ,'unique' , 'targetClass' => User::className(), 'targetAttribute' => 'email'],
 				['username' ,'unique', 'targetClass' => User::className(), 'targetAttribute' => 'username'],
 				[['password_plain' ,'password_repeat'] ,'string','min' =>6 ],
-				[['password_repeat']   ,'validatePasswordRepeat' ]
+				[['password_repeat']   ,'validatePasswordRepeat' ],
+				['selected_accounts',function ($attribute, $params) {
+					if (!is_array($this->$attribute)) {
+						$this->addError($attribute, 'Invalid array');
+					}
+				}
+				]
 		];
 	}
+	
 	/**
 	 * @formatter:on
 	 */
diff --git a/backend/views/account-state/_form.php b/backend/views/account-state/_form.php
new file mode 100644
index 0000000..806ef69
--- /dev/null
+++ b/backend/views/account-state/_form.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-state-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_5_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_10_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_20_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_50_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_100_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_200_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_500_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_1000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_2000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_5000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_10000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_20000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'prev_state')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/account-state', 'Create') : Yii::t('backend/account-state', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/account-state/_item_view.php b/backend/views/account-state/_item_view.php
new file mode 100644
index 0000000..7c58dce
--- /dev/null
+++ b/backend/views/account-state/_item_view.php
@@ -0,0 +1,13 @@
+<?php
+use frontend\components\AccountStateBanknoteCountWidget;
+use yii\base\Widget;
+
+?>
+
+<?php 
+ echo AccountStateBanknoteCountWidget::widget([
+ 		'model' => $model,
+ ]);
+?>
+
+ 
diff --git a/backend/views/account-state/_search.php b/backend/views/account-state/_search.php
new file mode 100644
index 0000000..fe23edf
--- /dev/null
+++ b/backend/views/account-state/_search.php
@@ -0,0 +1,68 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use common\models\AccountState;
+use frontend\components\HtmlHelper;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AccountStateSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<?php 
+
+$accountOptions = ['' => 'Mind'] +  HtmlHelper::mkAccountOptions($accounts);
+$userOptions = ['' => 'Mind'] +  HtmlHelper::mkOptions($users,'id','username')
+?>
+
+<div class="account-state-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+	<div class='row'>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_user')->dropDownList($userOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'type')->dropDownList(['' => 'Mind']+AccountState::types()) ?>
+		</div>
+	</div>
+
+
+
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		
+	</div>
+
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('backend/account-state', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/account-state/create.php b/backend/views/account-state/create.php
new file mode 100644
index 0000000..b6e544c
--- /dev/null
+++ b/backend/views/account-state/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('backend/account-state', 'Create Account State');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-state-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/account-state/index.php b/backend/views/account-state/index.php
new file mode 100644
index 0000000..e2a5fd9
--- /dev/null
+++ b/backend/views/account-state/index.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\widgets\ListView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\AccountStateSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('backend/account-state', 'Account States');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-state-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php   echo $this->render('_search', ['model' => $searchModel,'accounts' => $accounts,'users' => $users,]); ?>
+
+
+    <?php /*echo  GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+
+            'typeName',
+            'money',
+            'created_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn',
+             'template'		=> '{view}'
+        ],
+        ],
+    ]); */?>
+    
+     <?php echo ListView::widget([
+    		'dataProvider' => $dataProvider,
+    		'itemView' => '_item_view'
+    ])?>
+
+</div>
diff --git a/backend/views/account-state/update.php b/backend/views/account-state/update.php
new file mode 100644
index 0000000..fe8cf6c
--- /dev/null
+++ b/backend/views/account-state/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('backend/account-state', 'Update {modelClass}: ', [
+    'modelClass' => 'Account State',
+]) . ' ' . $model->id_account_state;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_account_state, 'url' => ['view', 'id' => $model->id_account_state]];
+$this->params['breadcrumbs'][] = Yii::t('backend/account-state', 'Update');
+?>
+<div class="account-state-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/account-state/view.php b/backend/views/account-state/view.php
new file mode 100644
index 0000000..61cc88e
--- /dev/null
+++ b/backend/views/account-state/view.php
@@ -0,0 +1,56 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = $model->id_account_state;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-state-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('backend/account-state', 'Update'), ['update', 'id' => $model->id_account_state], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('backend/account-state', 'Delete'), ['delete', 'id' => $model->id_account_state], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('backend/account-state', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_account_state',
+            'id_account',
+            'type',
+            'money',
+            'banknote_5_ft',
+            'banknote_10_ft',
+            'banknote_20_ft',
+            'banknote_50_ft',
+            'banknote_100_ft',
+            'banknote_200_ft',
+            'banknote_500_ft',
+            'banknote_1000_ft',
+            'banknote_2000_ft',
+            'banknote_5000_ft',
+            'banknote_10000_ft',
+            'banknote_20000_ft',
+            'id_user',
+            'created_at',
+            'updated_at',
+            'comment',
+            'prev_state',
+            'prev_money',
+        ],
+    ]) ?>
+
+</div>
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index fd35256..e0ca38f 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -2,6 +2,10 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\grid\GridView;
+use yii\base\Widget;
+use yii\base\Object;
+use yii\data\ArrayDataProvider;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\User */
@@ -18,6 +22,41 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'password_plain')->passwordInput() ?>
     <?= $form->field($model, 'password_repeat')->passwordInput() ?>
 
+	<?php 
+	
+	$selectedAccounts = $model->selected_accounts;
+	
+	?>
+
+	<h3>Engedélyezett kasszák</h3>
+	<?php echo GridView::widget([
+			'dataProvider' => new ArrayDataProvider( [
+	      	'allModels' => $accounts,
+	      	'sort' => false,
+	      	'pagination' => false,
+  		]),
+			'columns' => [
+					[
+			          'class' => 'yii\grid\CheckboxColumn',
+					  'name' =>  (new ReflectionClass( $model->classname() ))->getShortName()  . '[selected_accounts]',
+					  'checkboxOptions' => function ($model, $key, $index, $column)  use ($selectedAccounts){
+						    $result = [];
+							$result['value'] =  $model->id_account   ;
+							
+							if ( isset($selectedAccounts) ){
+								if ( is_array($selectedAccounts) ){
+								    if ( array_search($model->id_account , $selectedAccounts ) !== false){
+								    	$result['checked'] = 'checked'  ;
+									}
+								}
+							}
+							
+					     	return $result;
+					 }
+			      ],
+					[ 'attribute' => 'name' ],
+				],
+	])?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Mentés') : Yii::t('app', 'Mentés'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
diff --git a/backend/views/user/create.php b/backend/views/user/create.php
index 04a8d93..e84dfba 100644
--- a/backend/views/user/create.php
+++ b/backend/views/user/create.php
@@ -16,6 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= $this->render('_form', [
         'model' => $model,
+    	'accounts' => $accounts,
     ]) ?>
 
 </div>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
index 2e03759..802d116 100644
--- a/backend/views/user/update.php
+++ b/backend/views/user/update.php
@@ -18,6 +18,7 @@ $this->params['breadcrumbs'][] = Yii::t('app', 'Update');
 
     <?= $this->render('_form', [
         'model' => $model,
+    	'accounts' => $accounts
     ]) ?>
 
 </div>
diff --git a/common/components/ArrayValidator.php b/common/components/ArrayValidator.php
new file mode 100644
index 0000000..bc0695e
--- /dev/null
+++ b/common/components/ArrayValidator.php
@@ -0,0 +1,49 @@
+<?php
+namespace common\components;
+
+use yii\base\InvalidConfigException;
+use Yii;
+use yii\base\Model;
+
+class ArrayValidator extends Validator
+{
+	
+	public $arrayAttributeName;
+	
+
+	/**
+	 * @inheritdoc
+	 */
+	public function init()
+	{
+		parent::init();
+		if ($this->message === null) {
+			$this->message = Yii::t('yii', '{attribute} is invalid.');
+		}
+	}
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function validateAttribute($model, $attribute)
+	{
+		$value = $model->$attribute;
+		if (!is_array($value)) {
+			$this->addError($model, $attribute, $this->message);
+			return;
+		}
+	}
+	
+	/**
+	 * @inheritdoc
+	 */
+	protected function validateValue($value)
+	{
+		if (!is_array($value)) {
+			return [Yii::t('yii', '{attribute} is invalid.'), []];
+		}
+		return null;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
index b0cc91b..ce9c8e3 100644
--- a/common/messages/hu/common/transfer.php
+++ b/common/messages/hu/common/transfer.php
@@ -17,6 +17,12 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Account' => 'Kassza',
+    'All' => 'Mind',
+    'Money total' => 'Összesen',
+    'Product' => 'Termék',
+    'Ticket' => 'Bérlet',
+    'Total' => 'Összesen',
     'Comment' => 'Megjegyzés',
     'Count' => 'Mennyiség',
     'Created At' => 'Dátum',
diff --git a/common/models/Account.php b/common/models/Account.php
index b50733f..6633ca0 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -72,6 +72,10 @@ class Account extends \yii\db\ActiveRecord
         ];
     }
     
+    public function getUserAccountAssignments(){
+    	return $this->hasMany(UserAccountAssignment::className(), ['id_account' => 'id_account']);
+    }
+    
    static function statuses() {
     	return [
     			self::STATUS_ACTIVE => Yii::t('common/account', 'Active'),
@@ -123,6 +127,22 @@ class Account extends \yii\db\ActiveRecord
     	return $accounts;
     }
     
+    public static  function read($forceIncludeAccount = null){
+    	$accounts = null;
+    	$query =  Account::find();
+    	$query->innerJoinWith('userAccountAssignments');
+    	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
+    	$query->andWhere(['status' => Account::STATUS_ACTIVE]);
+    	if ( $forceIncludeAccount  == null){
+    		 $query->andWhere(['status' => Account::STATUS_ACTIVE])->all();
+    	}else{
+    		$query->andWhere( ['or', ['status' => Account::STATUS_ACTIVE], ['id_account' =>  $forceIncludeAccount ] ])->all();
+    	}
+    	 
+    	$accounts = $query->all();
+    	return $accounts;
+    }
+    
     
     
 }
diff --git a/common/models/AccountState.php b/common/models/AccountState.php
new file mode 100644
index 0000000..9fc4d44
--- /dev/null
+++ b/common/models/AccountState.php
@@ -0,0 +1,227 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\db\QueryBuilder;
+use yii\helpers\ArrayHelper;
+
+/**
+ * This is the model class for table "account_state".
+ *
+ * @property integer $id_account_state
+ * @property integer $id_account
+ * @property integer $type
+ * @property integer $money
+ * @property integer $banknote_5_ft
+ * @property integer $banknote_10_ft
+ * @property integer $banknote_20_ft
+ * @property integer $banknote_50_ft
+ * @property integer $banknote_100_ft
+ * @property integer $banknote_200_ft
+ * @property integer $banknote_500_ft
+ * @property integer $banknote_1000_ft
+ * @property integer $banknote_2000_ft
+ * @property integer $banknote_5000_ft
+ * @property integer $banknote_10000_ft
+ * @property integer $banknote_20000_ft
+ * @property integer $id_user
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class AccountState extends \common\models\BaseFitnessActiveRecord
+{
+	
+	const TYPE_OPEN = 10;
+	const TYPE_CLOSE = 20;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'account_state';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        	[['id_account','money' ], 'required'],
+            [['id_account', 'type', 'money', 'banknote_5_ft', 'banknote_10_ft', 'banknote_20_ft', 'banknote_50_ft', 'banknote_100_ft', 'banknote_200_ft', 'banknote_500_ft', 'banknote_1000_ft', 'banknote_2000_ft', 'banknote_5000_ft', 'banknote_10000_ft', 'banknote_20000_ft' ], 'integer'],
+        	[['comment' ], 'string' ,'max' => 255],
+        	[['prev_state'  ], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_account_state' => Yii::t('common/account_state', 'Id Account State'),
+            'id_account' => Yii::t('common/account_state', 'Id Account'),
+            'type' => Yii::t('common/account_state', 'Type'),
+            'money' => Yii::t('common/account_state', 'Money'),
+            'banknote_5_ft' => Yii::t('common/account_state', 'Banknote 5 Ft'),
+            'banknote_10_ft' => Yii::t('common/account_state', 'Banknote 10 Ft'),
+            'banknote_20_ft' => Yii::t('common/account_state', 'Banknote 20 Ft'),
+            'banknote_50_ft' => Yii::t('common/account_state', 'Banknote 50 Ft'),
+            'banknote_100_ft' => Yii::t('common/account_state', 'Banknote 100 Ft'),
+            'banknote_200_ft' => Yii::t('common/account_state', 'Banknote 200 Ft'),
+            'banknote_500_ft' => Yii::t('common/account_state', 'Banknote 500 Ft'),
+            'banknote_1000_ft' => Yii::t('common/account_state', 'Banknote 1000 Ft'),
+            'banknote_2000_ft' => Yii::t('common/account_state', 'Banknote 2000 Ft'),
+            'banknote_5000_ft' => Yii::t('common/account_state', 'Banknote 5000 Ft'),
+            'banknote_10000_ft' => Yii::t('common/account_state', 'Banknote 10000 Ft'),
+            'banknote_20000_ft' => Yii::t('common/account_state', 'Banknote 20000 Ft'),
+            'id_user' => Yii::t('common/account_state', 'Id User'),
+            'created_at' => Yii::t('common/account_state', 'Created At'),
+            'updated_at' => Yii::t('common/account_state', 'Updated At'),
+            'comment' => Yii::t('common/account_state', 'Comment'),
+        ];
+    }
+    
+    public static function banknoteValues()
+    {
+        return [
+            'banknote_5_ft' => 5,
+            'banknote_10_ft' => 10,
+            'banknote_20_ft' => 20,
+            'banknote_50_ft' =>  50,
+            'banknote_100_ft' => 100,
+            'banknote_200_ft' => 200,
+            'banknote_500_ft' => 500,
+            'banknote_1000_ft' => 1000,
+            'banknote_2000_ft' => 2000,
+            'banknote_5000_ft' => 5000,
+            'banknote_10000_ft' => 10000,
+            'banknote_20000_ft' => 20000,
+        ];
+    }
+    
+    
+    public function getAccount(){
+    	return $this->hasOne( Account::className(), ["id_account" =>"id_account" ] ) ;
+    }
+    
+    public function getAccountName(){
+    	$result = "";
+    	$account = $this->account;
+    	if (isset($account)){
+    		$result  = $account->name;
+    	}
+    	 
+    	return $result;
+    }
+    
+    public function getUser(){
+    	return $this->hasOne( User::className(), ["id" =>"id_user" ] );
+    }
+    
+    public function getUserName(){
+    	$result = "";
+    	$user = $this->user;
+    	if (isset($this->user)){
+    		$result = $user->username;
+    	}
+    	 
+    	return $result;
+    }
+    public function getTypeName(){
+    	$result = "";
+    	$type =  AccountState::findType($this->type);
+    	if (isset($type)){
+    		$result = $type;
+    	}
+    	 
+    	return $result;
+    }
+    
+    public static function types(){
+    	return [
+    			self::TYPE_OPEN => Yii::t('common/account-state','Open'),
+    			self::TYPE_CLOSE => Yii::t('common/account-state','Close'),
+    	];
+    }
+    
+    public static function findType($type){
+    	$result = null;
+    	$types = self::types();
+    	if ( array_key_exists($type, $types)){
+    		$result = $types[ $type ];
+    	}
+    	return $result; 
+    }
+    
+    /**
+     * Read last accountstates
+     * @param $type int the type of accountstate to load
+     * @param $user $id of user to load the account
+     * */
+    public static function readLast($type, $user = null){
+    	$result = null;
+    	$query = AccountState::find();
+    	//filter user
+    	if ( isset($user)){
+	    	$query->innerJoinWith("account");
+	    	$query->innerJoinWith("account.userAccountAssignments");
+	    	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
+    	}
+    	//filter type
+    	if ( isset($type)){
+    		$query->andWhere(['account_state.type' => $type]);
+    	}
+    	//filter last
+    	$query->join("INNER JOIN ",
+    				"(select max(created_at) as cdate, id_account  from account_state  group by id_account)  as sq1"
+    				,"sq1.cdate = account_state.created_at and sq1.id_account = account_state.id_account");
+    	$query->orderBy(['created_at' => SORT_DESC]);
+    	$result = $query->all();
+    	return $result;
+    }
+    
+    function beforeSave($insert){
+    	$result = parent::beforeSave($insert);
+    	if ( $result ){
+	    	$prev = null;
+	    	
+	    	if  ( isset($this->prev_state) ){
+	    		$prev = AccountState::findOne($this->prev_state);
+	    	}
+	    	
+	    	if ( $prev != null){
+	    		$this->prev_money = $prev->money;
+	    	}
+    	}
+    	return $result;
+    	
+    }
+    
+    public function hasDifferenceToPrevState(){
+    	$result = false;
+    	if ( isset( $this->prev_state ) ){
+    		$result = $this->prev_money != $this->money;
+    	}
+    	return $result;
+    }
+    
+    public static function readLastForUser($type){
+    	return static::readLast($type, Yii::$app->user->id);
+    }
+    
+    
+    public static function modelsToArray($models){
+    	return ArrayHelper::toArray($models, [
+    			'common\models\AccountState' => [
+    					'id_account_state',
+    					'id_account',
+    					'money',
+    			],
+    	]);
+    }
+    
+}
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 29a42cf..1086a6c 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -35,6 +35,9 @@ class Transfer extends \yii\db\ActiveRecord
 	const STATUS_NOT_PAID = 10;
 	const STATUS_PAID = 20;
 	
+	const DIRECTION_IN = 10;// MONEY GOES OUT FROM ACCOUNT ( COMPANY LOST MONEY )
+	const DIRECTION_OUT = 20;//MONEY GOES IN TO THE ACCOUNT ( COMPANY EARN MONEY )
+	
     /**
      * @inheritdoc
      */
@@ -62,6 +65,7 @@ class Transfer extends \yii\db\ActiveRecord
     {
         return [
             'id_transfer' => Yii::t('common/transfer', 'Id Transfer'),
+            'id_account' => Yii::t('common/transfer', 'Account'),
             'id_discount' => Yii::t('common/transfer', 'Id Discount'),
             'id_currency' => Yii::t('common/transfer', 'Id Currency'),
             'id_object' => Yii::t('common/transfer', 'Id Object'),
diff --git a/common/models/User.php b/common/models/User.php
index d8108ef..1ea992d 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -186,6 +186,10 @@ class User extends ActiveRecord implements IdentityInterface
         $this->password_reset_token = null;
     }
     
+    public function getUserAccountAssignments(){
+    	return $this->hasMany(UserAccountAssignment::className(), ['id_user' =>'id']);
+    }
+    
     static function statuses() {
     	return [
     			self::STATUS_ACTIVE => Yii::t('app', 'Aktív'),
diff --git a/common/models/UserAccountAssignment.php b/common/models/UserAccountAssignment.php
new file mode 100644
index 0000000..0b3d340
--- /dev/null
+++ b/common/models/UserAccountAssignment.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "user_account_assignment".
+ *
+ * @property integer $id_user_account_assignment
+ * @property integer $id_user
+ * @property integer $id_account
+ */
+class UserAccountAssignment extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'user_account_assignment';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_user', 'id_account'], 'integer']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_user_account_assignment' => Yii::t('common/user-account-assignment', 'Id User Account Assignment'),
+            'id_user' => Yii::t('common/user-account-assignment', 'Id User'),
+            'id_account' => Yii::t('common/user-account-assignment', 'Id Account'),
+        ];
+    }
+}
diff --git a/composer.json b/composer.json
index 411126e..5b626c0 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "kartik-v/yii2-widget-typeahead": "*",
         "bower-asset/remarkable-bootstrap-notify": "^3.1",
         "yiisoft/yii2-jui": "^2.0",
-        "bower-asset/moment": "^2.10"
+        "bower-asset/moment": "^2.10",
+        "bower-asset/accounting": "^0.3.2"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index 745d589..14ec993 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,24 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ade53c29b13f5eaa8367e21defe51905",
+    "hash": "357aedc9b70234f38508aac35c6272cd",
     "packages": [
+        {
+            "name": "bower-asset/accounting",
+            "version": "v0.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/josscrowcroft/accounting.js.git",
+                "reference": "9ff4a4022e5c08f028d652d2b0ba1d4b65588bde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/josscrowcroft/accounting.js/zipball/9ff4a4022e5c08f028d652d2b0ba1d4b65588bde",
+                "reference": "9ff4a4022e5c08f028d652d2b0ba1d4b65588bde",
+                "shasum": ""
+            },
+            "type": "bower-asset-library"
+        },
         {
             "name": "bower-asset/bootstrap",
             "version": "v3.3.5",
diff --git a/console/migrations/m151013_154204_add__table__user__account_assignment.php b/console/migrations/m151013_154204_add__table__user__account_assignment.php
new file mode 100644
index 0000000..c15120e
--- /dev/null
+++ b/console/migrations/m151013_154204_add__table__user__account_assignment.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151013_154204_add__table__user__account_assignment extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%user_account_assignment}}', [
+    			'id_user_account_assignment' => $this->primaryKey(),
+    			'id_user' =>  $this->integer(11) ,
+    			'id_account' =>  $this->integer(11) ,
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151013_154204_add__table__user__account_assignment cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151014_053236_add__table__account_state.php b/console/migrations/m151014_053236_add__table__account_state.php
new file mode 100644
index 0000000..2118f47
--- /dev/null
+++ b/console/migrations/m151014_053236_add__table__account_state.php
@@ -0,0 +1,56 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151014_053236_add__table__account_state extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	 
+    	$this->createTable('{{%account_state}}', [
+    			'id_account_state' => $this->primaryKey(),
+    			'id_account' => $this->integer(11),
+    			'type' => $this->smallInteger(),
+    			'money' => $this->integer(11),
+    			'banknote_5_ft' => $this->integer(11),
+    			'banknote_10_ft' => $this->integer(11),
+    			'banknote_20_ft' => $this->integer(11),
+    			'banknote_50_ft' => $this->integer(11),
+    			'banknote_100_ft' => $this->integer(11),
+    			'banknote_200_ft' => $this->integer(11),
+    			'banknote_500_ft' => $this->integer(11),
+    			'banknote_1000_ft' => $this->integer(11),
+    			'banknote_2000_ft' => $this->integer(11),
+    			'banknote_5000_ft' => $this->integer(11),
+    			'banknote_10000_ft' => $this->integer(11),
+    			'banknote_20000_ft' => $this->integer(11),
+    			'id_user' => $this->integer(11),
+    			'created_at' => $this->dateTime()->notNull(),
+    			'updated_at' =>  $this->dateTime()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151014_053236_add__table__account_state cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money.php b/console/migrations/m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money.php
new file mode 100644
index 0000000..8cd6635
--- /dev/null
+++ b/console/migrations/m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money.php
@@ -0,0 +1,32 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn('account_state','comment',  'varchar(255)' );
+    	$this->addColumn('account_state','prev_state',  'int(11)' );
+    	$this->addColumn('account_state','prev_money',  'int(11)' );
+    }
+
+    public function down()
+    {
+        echo "m151016_100724_alter__table__account_state__add__columns__comment__prev_state__prev_money cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151018_103040_alter__table_transfer__add_column__dircetion.php b/console/migrations/m151018_103040_alter__table_transfer__add_column__dircetion.php
new file mode 100644
index 0000000..826f538
--- /dev/null
+++ b/console/migrations/m151018_103040_alter__table_transfer__add_column__dircetion.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151018_103040_alter__table_transfer__add_column__dircetion extends Migration
+{
+    public function up()
+    {
+		$this->addColumn('transfer', "direction", "int(11)");
+    }
+
+    public function down()
+    {
+        echo "m151018_103040_alter__table_transfer__add_column__dircetion cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/assets/AccountStateAsset.php b/frontend/assets/AccountStateAsset.php
new file mode 100644
index 0000000..47d080b
--- /dev/null
+++ b/frontend/assets/AccountStateAsset.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class AccountStateAsset extends AssetBundle
+{
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+    ];
+     public $js = [
+    	'js/accountstate.js',
+    ];
+    public $depends = [
+        'frontend\assets\AppAsset',
+        'frontend\assets\AccountingAsset',
+    ];
+}
diff --git a/frontend/assets/AccountingAsset.php b/frontend/assets/AccountingAsset.php
new file mode 100644
index 0000000..040ac4f
--- /dev/null
+++ b/frontend/assets/AccountingAsset.php
@@ -0,0 +1,16 @@
+<?php
+namespace frontend\assets;
+
+use yii\web\AssetBundle;
+
+class AccountingAsset extends AssetBundle
+{
+	public $sourcePath = '@bower';
+	
+	public $js = [
+		'accounting/accounting.min.js'
+	];
+	
+	public $depends = [
+	];
+}
\ No newline at end of file
diff --git a/frontend/components/AccountStateBanknoteCountWidget.php b/frontend/components/AccountStateBanknoteCountWidget.php
new file mode 100644
index 0000000..a874368
--- /dev/null
+++ b/frontend/components/AccountStateBanknoteCountWidget.php
@@ -0,0 +1,173 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+use common\models\AccountState;
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+use yii\grid\GridView;
+use yii\base\Object;
+use yii\data\ArrayDataProvider;
+
+class AccountStateBanknoteCountWidget extends Widget{
+	
+	 public $model;
+	 public $layout;
+	
+	public function run(){
+		
+		$panelStyleClas = 'panel-default';
+		if ( $this->model->hasDifferenceToPrevState()){
+			$panelStyleClas = 'panel-danger';
+		}
+			
+		$s = "";
+		$s .= Html::beginTag("div",['class' => 'panel '.$panelStyleClas] );
+		$s .= Html::beginTag("div",['class' => 'panel-heading    '] );
+		$s .=  "Kassza művelet - " . $this->model->typeName;
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div",['class' => 'panel-body    '] );
+		$s .= $this->generateInfoRow();
+		$s .= $this->generateNotes();
+		$s .= $this->generateComment();
+		$s .= Html::endTag("div");
+		$s .= Html::endTag("div");
+		
+		echo $s;
+	}
+
+	
+	protected function generateInfoRow(){
+		$s = "";
+	
+		$s .= Html::beginTag("div", ['class' => 'row', 'style' => 'margin-top: 6px;']);
+		$s .= Html::beginTag("div", ['class' => 'col-md-6']);
+		$s .= DetailView::widget([
+				'model' => $this->model,
+				'attributes' => [
+						[ 
+								'attribute' => 'id_user',
+								'value' =>  $this->model->userName
+						],
+						'created_at:datetime',
+				]
+		]);		
+		 
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div", ['class' => 'col-md-6']);
+		$s .= DetailView::widget([
+				'model' => $this->model,
+				'attributes' => [
+						'typeName',
+						'accountName',
+						'money:integer'
+				]
+		]);		
+		 
+		$s .= Html::endTag("div");
+		$s .= Html::endTag("div");
+		
+		return $s;
+		
+	}
+	
+	
+	protected function generateComment(){
+		$s = "";
+		if ( isset($this->model->comment) && !empty($this->model->comment)){
+			
+			$s .= Html::beginTag("div", ['class' => 'row', 'style' => 'margin-top: 6px;']);
+			$s .= Html::beginTag("div", ['class' => 'col-md-12']);
+			$s .= Html::beginTag("table", ['class' => 'table table-striped table-bordered']);
+			$s .= Html::beginTag("thead", ['class' => ' ']);
+			$s .= Html::beginTag("tr", ['class' => ' ']);
+			$s .= Html::beginTag("th", ['class' => ' ']);
+			$s .= $this->model->getAttributeLabel('comment');
+			$s .= Html::endTag("tr");
+			$s .= Html::endTag("th");
+			$s .= Html::endTag("thead");
+			$s .= Html::beginTag("tbody", ['class' => ' ']);
+			$s .= Html::beginTag("tr", ['class' => ' ']);
+			$s .= Html::beginTag("td", ['class' => ' ']);
+			$s .= $this->model->comment;
+			$s .= Html::endTag("td");
+			$s .= Html::endTag("th");
+			$s .= Html::endTag("tbody");
+			$s .= Html::endTag("table");
+			$s .= Html::endTag("div");
+			$s .= Html::endTag("div");
+			
+		}
+		return $s;
+	}
+	protected function generateNotes(){
+		$s = "";
+		$s .= Html::beginTag("div", ['class' => 'row', 'style' => 'margin-top: 6px;']);
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_5_ft','banknote_10_ft','banknote_20_ft','banknote_50_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_100_ft','banknote_200_ft','banknote_500_ft','banknote_1000_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::beginTag("div", ['class' => 'col-md-4']);
+		$s .= $this->generateBanknoteGrid( [ 'banknote_2000_ft','banknote_5000_ft','banknote_10000_ft','banknote_20000_ft'  ]);
+		$s .= Html::endTag("div");
+		$s .= Html::endTag("div");
+		return $s;
+	}
+	
+	protected function generateBanknoteGrid($attributes){
+		
+		return $this->generateBanknoteColumn( $this->mkColumnData($attributes));
+	}
+	
+	protected function mkColumnData( $attributes){
+		
+		$values = AccountState::banknoteValues();
+		$items = [];
+		foreach ($attributes as $note){
+			$value = $values[$note];
+			$count = $this->model->$note;
+			if ( !isset($count)  || empty($count)){
+				$count = 0;
+			}
+			$value = \Yii::$app->formatter->asInteger($value);
+			$item = [
+					'note' => $value . " Ft",
+					'count' =>   $count
+			];
+			$items[] = $item;
+		}
+		
+		return $items;
+	}
+	
+	protected function generateBanknoteColumn($data){
+		$dp = new ArrayDataProvider(
+			[
+					'allModels' => $data,
+					'sort' => false,
+					'pagination' => false
+			]		
+		);
+		$s = GridView::widget([
+				'dataProvider' => $dp,
+				'layout' => '{items}',
+				'options' => ['class' => 'grid-view notes-view'],
+				'columns' =>[
+					[
+						'value' => 'note',
+						'label' => 'Címlet'
+					],
+					[
+						'value' => 'count',
+						'label' => 'Db'
+					],
+				]
+		]);
+		return $s;
+	}
+	
+	 
+	
+}
\ No newline at end of file
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index c6f39dc..c910b16 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -23,13 +23,21 @@ class FrontendMenuStructure{
 	
 	
 	protected function isLogged(){
-		return Yii::$app->user->isGuest;
+		return !Yii::$app->user->isGuest;
 	}
 	
 	
 	protected function addRecepcio(){
 		if ( $this->isLogged() ){
 			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
+			$this->menuItems[]  = ['label' => 'Kassza',   
+					'items' => [
+							['label' => 'Account states', 'url' => ['/account-state/index'] ],
+							['label' => 'Open account state', 'url' => ['/account-state/open'] ],
+							['label' => 'Close account state', 'url' => ['/account-state/close'] ],
+					]
+					
+			];
 		}
 	}
 	
diff --git a/frontend/components/HtmlHelper.php b/frontend/components/HtmlHelper.php
index aeb5bf4..e399098 100644
--- a/frontend/components/HtmlHelper.php
+++ b/frontend/components/HtmlHelper.php
@@ -5,6 +5,7 @@ use Yii;
 use common\models\Order;
 use yii\helpers\Html;
 use yii\helpers\ArrayHelper;
+use common\models\AccountState;
 
 class HtmlHelper{
 	
@@ -75,5 +76,13 @@ class HtmlHelper{
 		return $result;
 	}
 	
+	public static function formatMoney($money){
+		$s = $money;
+		return $s;
+	}
+	
+	
+	
+	
 	
 }
\ No newline at end of file
diff --git a/frontend/controllers/AccountStateController.php b/frontend/controllers/AccountStateController.php
new file mode 100644
index 0000000..d9c271e
--- /dev/null
+++ b/frontend/controllers/AccountStateController.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\AccountState;
+use frontend\models\AccountstateSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\Account;
+
+/**
+ * AccountStateController implements the CRUD actions for AccountState model.
+ */
+class AccountStateController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all AccountState models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new AccountstateSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single AccountState model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new AccountState model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionOpen()
+    {
+    	
+    	$lastStates =  AccountState::readLastForUser(AccountState::TYPE_CLOSE	);
+    	$lastStates = AccountState::modelsToArray($lastStates);
+    	
+        $model = new AccountState();
+		$model->type = AccountState::TYPE_OPEN;
+		$model->id_user  = Yii::$app->user->id;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+//             return $this->redirect(['view', 'id' => $model->id_account_state]);
+            return $this->redirect(['index' ]);
+        } else {
+        	
+        	$accounts = Account::read();
+        	
+            return $this->render('open', [
+                'model' => $model,
+                'accounts' => $accounts,
+            	'lastStates' => $lastStates,
+            ]);
+        }
+    }
+    /**
+     * Creates a new AccountState model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionClose()
+    {
+        $model = new AccountState();
+        $model->type = AccountState::TYPE_CLOSE;
+        $model->id_user  = Yii::$app->user->id;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index' ]);
+//             return $this->redirect(['view', 'id' => $model->id_account_state]);
+        } else {
+        	
+        	$accounts = Account::read();
+        	
+            return $this->render('close', [
+                'model' => $model,
+            	'accounts' => $accounts,
+            ]);
+        }
+    }
+    
+    
+    /**
+     * Creates a new AccountState model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new AccountState();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing AccountState model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing AccountState model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the AccountState model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return AccountState the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = AccountState::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/AccountstateSearch.php b/frontend/models/AccountstateSearch.php
new file mode 100644
index 0000000..d18c225
--- /dev/null
+++ b/frontend/models/AccountstateSearch.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\AccountState;
+
+/**
+ * AccountstateSearch represents the model behind the search form about `common\models\AccountState`.
+ */
+class AccountstateSearch extends AccountState
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = AccountState::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        	'sort' => false
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->innerJoinWith('account');
+        $query->innerJoinWith('account.userAccountAssignments');
+        $query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
+        $query->orderBy( 'created_at desc'  );
+
+        $query->limit = 20;
+        
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/account-state/_form.php b/frontend/views/account-state/_form.php
new file mode 100644
index 0000000..ece6dc1
--- /dev/null
+++ b/frontend/views/account-state/_form.php
@@ -0,0 +1,57 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-state-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_5_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_10_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_20_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_50_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_100_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_200_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_500_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_1000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_2000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_5000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_10000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'banknote_20000_ft')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/account-state', 'Create') : Yii::t('frontend/account-state', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account-state/_form_close.php b/frontend/views/account-state/_form_close.php
new file mode 100644
index 0000000..11839c0
--- /dev/null
+++ b/frontend/views/account-state/_form_close.php
@@ -0,0 +1,63 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+
+
+<div class="account-state-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+<div class='row'>
+		<div class='col-md-6'>
+    <?= $form->field($model, 'id_account')->dropDownList(  HtmlHelper::mkAccountOptions($accounts)   ) ?>
+</div>
+		<div class='col-md-6'>
+    <?= $form->field($model, 'money')->textInput(['class' => 'form-control text-right']);  ?>
+</div>
+</div>
+
+	<?php echo $this->render('_notes',[  'form' => $form, 'model' => $model])?>
+
+	<table class="table table-striped">
+			<tr>
+				<th class="text-left">
+					<?php echo $model->getAttributeLabel('money') ?>
+				</th>
+				<td class="text-right">
+					<span class="money "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t('frontend/account-state', "Notes total")?>
+				</th>
+				<td class="text-right">
+					<span class="notes-total "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t('frontend/account-state', "Difference total")?>
+				</th>
+				<td class="text-right">
+					<span class="diff-total "></span> Ft
+				</td>
+			</tr>
+	</table>
+
+	<?= $form->field($model, 'comment')->textarea() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(  Yii::t('frontend/account-state', 'Close account'), ['class' =>   'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account-state/_form_open.php b/frontend/views/account-state/_form_open.php
new file mode 100644
index 0000000..7878103
--- /dev/null
+++ b/frontend/views/account-state/_form_open.php
@@ -0,0 +1,80 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-state-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+	<?php echo Html::activeHiddenInput($model, "prev_state") ?>
+
+<div class='row'>
+		<div class='col-md-6'>
+    <?= $form->field($model, 'id_account')->dropDownList(  HtmlHelper::mkAccountOptions($accounts)   ) ?>
+</div>
+		<div class='col-md-6'>
+    <?= $form->field($model, 'money')->textInput(['class' => 'form-control text-right']);  ?>
+</div>
+</div>
+
+	<?php echo $this->render('_notes',[  'form' => $form, 'model' => $model])?>
+	
+	<table class="table table-striped">
+			<tr>
+				<th class="text-left">
+					<?php echo $model->getAttributeLabel('money') ?>
+				</th>
+				<td class="text-right">
+					<span class="money "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t('frontend/account-state', "Notes total")?>
+				</th>
+				<td class="text-right">
+					<span class="notes-total "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t('frontend/account-state', "Difference total")?>
+				</th>
+				<td class="text-right">
+					<span class="diff-total "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t("frontend/account-state", "Last closing money")?>
+				</th>
+				<td class="text-right">
+					<span class="last-closing-money "></span> Ft
+				</td>
+			</tr>
+			<tr>
+				<th class="text-left">
+					<?php echo Yii::t('frontend/account-state', "Difference closing money")?>
+				</th>
+				<td class="text-right">
+					<span class="diff-closing "></span> Ft
+				</td>
+			</tr>
+	</table>
+	
+	<?= $form->field($model, 'comment')->textarea() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/account-state', 'Create') : Yii::t('frontend/account-state', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account-state/_item_view.php b/frontend/views/account-state/_item_view.php
new file mode 100644
index 0000000..7c58dce
--- /dev/null
+++ b/frontend/views/account-state/_item_view.php
@@ -0,0 +1,13 @@
+<?php
+use frontend\components\AccountStateBanknoteCountWidget;
+use yii\base\Widget;
+
+?>
+
+<?php 
+ echo AccountStateBanknoteCountWidget::widget([
+ 		'model' => $model,
+ ]);
+?>
+
+ 
diff --git a/frontend/views/account-state/_notes.php b/frontend/views/account-state/_notes.php
new file mode 100644
index 0000000..fa614dd
--- /dev/null
+++ b/frontend/views/account-state/_notes.php
@@ -0,0 +1,31 @@
+<?php
+?>
+<div class='row'>
+<div class='col-md-4'>
+		    <?= $form->field($model, 'banknote_5_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '5']) ?>
+		
+		    <?= $form->field($model, 'banknote_10_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '10']) ?>
+		
+		    <?= $form->field($model, 'banknote_20_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '15']) ?>
+		
+		    <?= $form->field($model, 'banknote_50_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20']) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'banknote_100_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '100']) ?>
+		
+		    <?= $form->field($model, 'banknote_200_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '200']) ?>
+		
+		    <?= $form->field($model, 'banknote_500_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '500']) ?>
+		
+		    <?= $form->field($model, 'banknote_1000_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '1000']) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'banknote_2000_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '2000']) ?>
+		
+		    <?= $form->field($model, 'banknote_5000_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '5000']) ?>
+		
+		    <?= $form->field($model, 'banknote_10000_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '10000']) ?>
+		
+		    <?= $form->field($model, 'banknote_20000_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20000']) ?>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/frontend/views/account-state/_search.php b/frontend/views/account-state/_search.php
new file mode 100644
index 0000000..c68771e
--- /dev/null
+++ b/frontend/views/account-state/_search.php
@@ -0,0 +1,63 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\AccountstateSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-state-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_account_state') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'money') ?>
+
+    <?= $form->field($model, 'banknote_5_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_10_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_20_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_50_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_100_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_200_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_500_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_1000_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_2000_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_5000_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_10000_ft') ?>
+
+    <?php // echo $form->field($model, 'banknote_20000_ft') ?>
+
+    <?php // echo $form->field($model, 'id_user') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/account-state', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/account-state', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account-state/close.php b/frontend/views/account-state/close.php
new file mode 100644
index 0000000..8d792e1
--- /dev/null
+++ b/frontend/views/account-state/close.php
@@ -0,0 +1,28 @@
+<?php
+
+use yii\helpers\Html;
+use frontend\assets\AccountStateAsset;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('frontend/account-state', 'Close Account State');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+
+AccountStateAsset::register($this);
+$options = [];
+
+$this->registerJs ( 'new AccountState( '. json_encode($options).');' );
+?>
+<div class="account-state-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_close', [
+        'model' => $model,
+    		'accounts' => $accounts,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account-state/create.php b/frontend/views/account-state/create.php
new file mode 100644
index 0000000..0c796e4
--- /dev/null
+++ b/frontend/views/account-state/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('frontend/account-state', 'Create Account State');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-state-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account-state/index.php b/frontend/views/account-state/index.php
new file mode 100644
index 0000000..3c102ad
--- /dev/null
+++ b/frontend/views/account-state/index.php
@@ -0,0 +1,38 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\widgets\ListView;
+use yii\base\Widget;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\AccountstateSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/account-state', 'Account States');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<style>
+.notes-view table thead th,
+.notes-view table td{
+	text-align: right;
+}
+
+</style>
+<div class="account-state-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/account-state', 'Open Account State'), ['open'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('frontend/account-state', 'Close Account State'), ['close'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?php echo ListView::widget([
+    		'dataProvider' => $dataProvider,
+    		'itemView' => '_item_view'
+    ])?>
+
+</div>
diff --git a/frontend/views/account-state/open.php b/frontend/views/account-state/open.php
new file mode 100644
index 0000000..9768481
--- /dev/null
+++ b/frontend/views/account-state/open.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use frontend\assets\AccountStateAsset;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('frontend/account-state', 'Open Account State');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+
+AccountStateAsset::register($this);
+$options = [];
+$options['last_states'] = $lastStates;
+$options['open'] = true;
+$this->registerJs ( 'new AccountState( '. json_encode($options).');' );
+?>
+<div class="account-state-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_open', [
+        'model' => $model,
+    		'accounts' => $accounts,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account-state/update.php b/frontend/views/account-state/update.php
new file mode 100644
index 0000000..2948d33
--- /dev/null
+++ b/frontend/views/account-state/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = Yii::t('frontend/account-state', 'Update {modelClass}: ', [
+    'modelClass' => 'Account State',
+]) . ' ' . $model->id_account_state;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_account_state, 'url' => ['view', 'id' => $model->id_account_state]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/account-state', 'Update');
+?>
+<div class="account-state-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account-state/view.php b/frontend/views/account-state/view.php
new file mode 100644
index 0000000..f56074c
--- /dev/null
+++ b/frontend/views/account-state/view.php
@@ -0,0 +1,53 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\AccountState */
+
+$this->title = $model->id_account_state;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account-state', 'Account States'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-state-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/account-state', 'Update'), ['update', 'id' => $model->id_account_state], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/account-state', 'Delete'), ['delete', 'id' => $model->id_account_state], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/account-state', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_account_state',
+            'id_account',
+            'type',
+            'money',
+            'banknote_5_ft',
+            'banknote_10_ft',
+            'banknote_20_ft',
+            'banknote_50_ft',
+            'banknote_100_ft',
+            'banknote_200_ft',
+            'banknote_500_ft',
+            'banknote_1000_ft',
+            'banknote_2000_ft',
+            'banknote_5000_ft',
+            'banknote_10000_ft',
+            'banknote_20000_ft',
+            'id_user',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/frontend/web/js/accountstate.js b/frontend/web/js/accountstate.js
new file mode 100644
index 0000000..6ed70ee
--- /dev/null
+++ b/frontend/web/js/accountstate.js
@@ -0,0 +1,142 @@
+function AccountState(o){
+	
+	/**reference for the instance*/
+	var app = this;
+	
+	var total = 0;// sum of banknotes
+	var money = 0;//value of money field
+	var diff = 0;//diff of total and money
+	var id_account;//selected account
+	var last_state;//last state of selected account
+	var last_money;//last moeny on selected account
+	var last_diff;// diff on last money and money
+	
+	var notes ;
+	var moneyInput ;
+	var ddAccount;
+	
+	this.defaults = {
+			'open' : false,
+			'notes' : '.note-input',
+			'last_states' : [],
+			'selector_money' :  '#accountstate-money',
+			'selector_dd_account' : '#accountstate-id_account',
+	}
+	init();
+	
+	function init(){
+		$.extend(app.defaults, o );
+		notes = $(app.defaults.notes);
+		moneyInput = $(app.defaults.selector_money);
+		notes.change(run);
+		moneyInput.change(run);
+		if ( app.defaults.open ){
+			ddAccount = $(app.defaults.selector_dd_account);
+			ddAccount.change(run);
+		}
+		
+		run();
+	}
+	
+	
+	
+	function run(){
+		calcTotal();
+		calcDiff();
+		calcAccount();
+		calcLastDiff();
+		updateTotal();
+		updateDiff();
+		updateMoney();
+		updateLastMoney();
+		updateLastDiff();
+		updatePrevState();
+	}
+	
+	function calcAccount(){
+		if ( app.defaults.open){
+			app.last_money = 0;
+			app.id_account = ddAccount.val();
+			app.last_state = findLastState();
+			if ( app.last_state != null){
+				app.last_money = app.last_state['money'];
+			}
+		}
+	}
+	
+	function calcLastDiff(){
+		app.diff = Math.abs(app.last_money - app.money );
+		
+	}
+	function calcDiff(){
+		app.money = 0;
+		app.money = +moneyInput.val();
+		if ( isNaN(money)){
+			app.money = 0;
+		}
+		app.diff = Math.abs(app.total - app.money );
+		
+	}
+	function calcTotal(){
+		app.total = 0;
+		notes.each(function(i,e){
+			var value, count;
+			value = +$(e).data('value');
+			count = +$(e).val();
+			if ( isNaN(count))
+				count = 0;
+			app.total +=  value * count;
+		});
+	}
+	
+	function updateTotal(){		
+		var money;
+		money = accounting.formatNumber(app.total, 0, " "); // 9 876 543.210
+		$('.notes-total').html(money);
+	}
+	function updateDiff(){		
+		var money;
+		money = accounting.formatNumber(app.diff, 0, " "); // 9 876 543.210
+		$('.diff-total').html(money);
+	}
+	function updateMoney(){		
+		var money;
+		money = accounting.formatNumber(app.money, 0, " "); // 9 876 543.210
+		$('.money').html(money);
+	}
+	
+	function updateLastMoney(){		
+		var money;
+		money = accounting.formatNumber(app.last_money, 0, " "); // 9 876 543 
+		$('.last-closing-money ').html(money);
+	}
+	
+	function updateLastDiff(){		
+		var money;
+		money = accounting.formatNumber(app.diff, 0, " "); // 9 876 543.210
+		$('.diff-closing').html(money);
+	}
+	
+	function updatePrevState(){
+		
+		if ( app.defaults.open){
+				$("#accountstate-prev_state").val(  app.last_state == null  ? '' : app.last_state.id_account_state);
+		}
+		
+		
+	}
+	
+	function findLastState(){
+		var i,result;
+		result = null;
+		for ( var i = 0; i < app.defaults.last_states.length; i++){
+			if ( app.defaults.last_states[i].id_account ==  app.id_account){
+				result = app.defaults.last_states[i];
+				break;
+			}
+		}
+		return result;
+	}
+	
+	
+}
\ No newline at end of file

From 5be26aa1088a429dd231de83fb03b88d1dcda0e0 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 19 Oct 2015 08:09:48 +0200
Subject: [PATCH 042/100] add account state translations

---
 common/messages/hu/backend/account-state.php  |  28 ++++
 common/messages/hu/common/account-state.php   |  22 +++
 common/messages/hu/common/account_state.php   |  40 ++++++
 .../hu/common/user-account-assignment.php     |  23 +++
 common/messages/hu/frontend/account-state.php |  39 +++++
 common/models/AccountState.php                |   2 +
 frontend/components/FrontendMenuStructure.php |   6 +-
 .../controllers/AccountStateController.php    | 135 +++++++++---------
 8 files changed, 228 insertions(+), 67 deletions(-)
 create mode 100644 common/messages/hu/backend/account-state.php
 create mode 100644 common/messages/hu/common/account-state.php
 create mode 100644 common/messages/hu/common/account_state.php
 create mode 100644 common/messages/hu/common/user-account-assignment.php
 create mode 100644 common/messages/hu/frontend/account-state.php

diff --git a/common/messages/hu/backend/account-state.php b/common/messages/hu/backend/account-state.php
new file mode 100644
index 0000000..10946f7
--- /dev/null
+++ b/common/messages/hu/backend/account-state.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Account States' => 'Kassza művelet',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a műveletet?',
+    'Create' => 'Mentés',
+    'Create Account State' => 'Új kassza művelet',
+    'Delete' => 'Törlés',
+    'Search' => 'Keresés',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+];
diff --git a/common/messages/hu/common/account-state.php b/common/messages/hu/common/account-state.php
new file mode 100644
index 0000000..8b3c8c4
--- /dev/null
+++ b/common/messages/hu/common/account-state.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Close' => 'Nyitás',
+    'Open' => 'Zárás',
+];
diff --git a/common/messages/hu/common/account_state.php b/common/messages/hu/common/account_state.php
new file mode 100644
index 0000000..1bc3391
--- /dev/null
+++ b/common/messages/hu/common/account_state.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Banknote 10 Ft' => '10 Ft',
+    'Banknote 100 Ft' => '100 Ft',
+    'Banknote 1000 Ft' => '1 000 Ft',
+    'Banknote 10000 Ft' => '10 000 Ft',
+    'Banknote 20 Ft' => '20 Ft',
+    'Banknote 200 Ft' => '200 Ft',
+    'Banknote 2000 Ft' => '2 000 Ft',
+    'Banknote 20000 Ft' => '20 000 Ft',
+    'Banknote 5 Ft' => '5 Ft',
+    'Banknote 50 Ft' => '50 Ft',
+    'Banknote 500 Ft' => '500 Ft',
+    'Banknote 5000 Ft' => '5 000Ft',
+    'Comment' => 'Megjegyzés',
+    'Created At' => 'Létrehozás ideje',
+    'Id Account' => 'Kassza',
+    'Id Account State' => 'Kassza művelet',
+    'Id User' => 'Felhasználó',
+    'Money' => 'Összeg',
+    'Type' => 'Típus',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/user-account-assignment.php b/common/messages/hu/common/user-account-assignment.php
new file mode 100644
index 0000000..70a8a37
--- /dev/null
+++ b/common/messages/hu/common/user-account-assignment.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Id Account' => 'Kassza',
+    'Id User' => 'Felhasználó',
+    'Id User Account Assignment' => 'Felhasználó - kassza hozzárendelés',
+];
diff --git a/common/messages/hu/frontend/account-state.php b/common/messages/hu/frontend/account-state.php
new file mode 100644
index 0000000..020a37e
--- /dev/null
+++ b/common/messages/hu/frontend/account-state.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Account states' => 'Kassza műveletek',
+    'Close account state' => 'Kassza zárás',
+    'Open account state' => 'Kassza nyitás',
+    'Account States' => 'Kassza műveletek',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szereté ezt a műveletet?',
+    'Close Account State' => 'Kassza Zárás',
+    'Close account' => 'Kassza zárás',
+    'Create' => 'Mentés',
+    'Create Account State' => 'Új kassza művelet',
+    'Delete' => 'Törlés',
+    'Difference closing money' => 'Záró összeg különbözet',
+    'Difference total' => 'Összeg különbözet',
+    'Last closing money' => 'Útolsó záró összeg',
+    'Notes total' => 'Címletek összesen',
+    'Open Account State' => 'Kassza nyitás',
+    'Reset' => 'Reset',
+    'Search' => 'Keresés',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+];
diff --git a/common/models/AccountState.php b/common/models/AccountState.php
index 9fc4d44..ed9e1f1 100644
--- a/common/models/AccountState.php
+++ b/common/models/AccountState.php
@@ -64,7 +64,9 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
         return [
             'id_account_state' => Yii::t('common/account_state', 'Id Account State'),
             'id_account' => Yii::t('common/account_state', 'Id Account'),
+            'accountName' => Yii::t('common/account_state', 'Id Account'),
             'type' => Yii::t('common/account_state', 'Type'),
+            'typeName' => Yii::t('common/account_state', 'Type'),
             'money' => Yii::t('common/account_state', 'Money'),
             'banknote_5_ft' => Yii::t('common/account_state', 'Banknote 5 Ft'),
             'banknote_10_ft' => Yii::t('common/account_state', 'Banknote 10 Ft'),
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index c910b16..091efa4 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -32,9 +32,9 @@ class FrontendMenuStructure{
 			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'items' => [
-							['label' => 'Account states', 'url' => ['/account-state/index'] ],
-							['label' => 'Open account state', 'url' => ['/account-state/open'] ],
-							['label' => 'Close account state', 'url' => ['/account-state/close'] ],
+							['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'] ],
 					]
 					
 			];
diff --git a/frontend/controllers/AccountStateController.php b/frontend/controllers/AccountStateController.php
index d9c271e..d5b3229 100644
--- a/frontend/controllers/AccountStateController.php
+++ b/frontend/controllers/AccountStateController.php
@@ -18,12 +18,18 @@ class AccountStateController extends Controller
     public function behaviors()
     {
         return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','open','close'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
@@ -42,17 +48,6 @@ class AccountStateController extends Controller
         ]);
     }
 
-    /**
-     * Displays a single AccountState model.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
 
     /**
      * Creates a new AccountState model.
@@ -107,55 +102,8 @@ class AccountStateController extends Controller
     }
     
     
-    /**
-     * Creates a new AccountState model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new AccountState();
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account_state]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
-    }
 
-    /**
-     * Updates an existing AccountState model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_account_state]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing AccountState model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
 
     /**
      * Finds the AccountState model based on its primary key value.
@@ -172,4 +120,63 @@ class AccountStateController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+    /**
+     * Creates a new AccountState model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+    public function actionCreate()
+    {
+        $model = new AccountState();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+     */
+    /**
+     * Updates an existing AccountState model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account_state]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+     */
+    /**
+     * Deletes an existing AccountState model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+     */
+    /**
+     * Displays a single AccountState model.
+     * @param integer $id
+     * @return mixed
+    
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+     */
 }

From ab40f937a3883764915c536c01a18339e773c8a2 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 19 Oct 2015 10:19:19 +0200
Subject: [PATCH 043/100] add money movement crud and table

---
 common/models/MoneyMovement.php               |  61 +++++++++
 ...019_061146_add__table__money__movement.php |  46 +++++++
 frontend/components/FrontendMenuStructure.php |   1 +
 .../controllers/MoneyMovementController.php   | 121 ++++++++++++++++++
 frontend/models/MoneyMovementSearch.php       |  73 +++++++++++
 frontend/views/money-movement/_form.php       |  37 ++++++
 frontend/views/money-movement/_search.php     |  43 +++++++
 frontend/views/money-movement/create.php      |  21 +++
 frontend/views/money-movement/index.php       |  42 ++++++
 frontend/views/money-movement/update.php      |  23 ++++
 frontend/views/money-movement/view.php        |  43 +++++++
 11 files changed, 511 insertions(+)
 create mode 100644 common/models/MoneyMovement.php
 create mode 100644 console/migrations/m151019_061146_add__table__money__movement.php
 create mode 100644 frontend/controllers/MoneyMovementController.php
 create mode 100644 frontend/models/MoneyMovementSearch.php
 create mode 100644 frontend/views/money-movement/_form.php
 create mode 100644 frontend/views/money-movement/_search.php
 create mode 100644 frontend/views/money-movement/create.php
 create mode 100644 frontend/views/money-movement/index.php
 create mode 100644 frontend/views/money-movement/update.php
 create mode 100644 frontend/views/money-movement/view.php

diff --git a/common/models/MoneyMovement.php b/common/models/MoneyMovement.php
new file mode 100644
index 0000000..d2c2e32
--- /dev/null
+++ b/common/models/MoneyMovement.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "money_movement".
+ *
+ * @property integer $id_money_movement
+ * @property integer $id_account
+ * @property integer $id_user
+ * @property string $name
+ * @property integer $type
+ * @property integer $money
+ * @property string $comment
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class MoneyMovement extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'money_movement';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_account', 'id_user', 'name', 'type', 'money', 'created_at', 'updated_at'], 'required'],
+            [['id_account', 'id_user', 'type', 'money'], 'integer'],
+            [['created_at', 'updated_at'], 'safe'],
+            [['name'], 'string', 'max' => 64],
+            [['comment'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_money_movement' => Yii::t('common/money-movement', 'Id Money Movement'),
+            'id_account' => Yii::t('common/money-movement', 'Id Account'),
+            'id_user' => Yii::t('common/money-movement', 'Id User'),
+            'name' => Yii::t('common/money-movement', 'Name'),
+            'type' => Yii::t('common/money-movement', 'Type'),
+            'money' => Yii::t('common/money-movement', 'Money'),
+            'comment' => Yii::t('common/money-movement', 'Comment'),
+            'created_at' => Yii::t('common/money-movement', 'Created At'),
+            'updated_at' => Yii::t('common/money-movement', 'Updated At'),
+        ];
+    }
+}
diff --git a/console/migrations/m151019_061146_add__table__money__movement.php b/console/migrations/m151019_061146_add__table__money__movement.php
new file mode 100644
index 0000000..d7736e5
--- /dev/null
+++ b/console/migrations/m151019_061146_add__table__money__movement.php
@@ -0,0 +1,46 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151019_061146_add__table__money__movement extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%money_movement}}', [
+    			'id_money_movement' => $this->primaryKey(),
+    			'id_account' => $this->integer()->notNull(),
+    			'id_user' => $this->integer()->notNull(),
+    			'name' => $this->string(64)->notNull(),
+    			'type' => $this->integer()->notNull(),
+    			'money' => $this->integer()->notNull(),
+    			'comment' => $this->string(255),
+    			'created_at' => $this->dateTime()->notNull(),
+    			'updated_at' =>  $this->dateTime()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151019_061146_add__table__money__movement cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 091efa4..e076884 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -30,6 +30,7 @@ class FrontendMenuStructure{
 	protected function addRecepcio(){
 		if ( $this->isLogged() ){
 			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
+			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => ['/money-movement/index'] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'items' => [
 							['label' =>  Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index'] ],
diff --git a/frontend/controllers/MoneyMovementController.php b/frontend/controllers/MoneyMovementController.php
new file mode 100644
index 0000000..6cbc383
--- /dev/null
+++ b/frontend/controllers/MoneyMovementController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\MoneyMovement;
+use frontend\models\MoneyMovementSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * MoneyMovementController implements the CRUD actions for MoneyMovement model.
+ */
+class MoneyMovementController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all MoneyMovement models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new MoneyMovementSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single MoneyMovement model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new MoneyMovement model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new MoneyMovement();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_money_movement]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing MoneyMovement model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_money_movement]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing MoneyMovement model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the MoneyMovement model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return MoneyMovement the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = MoneyMovement::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/MoneyMovementSearch.php b/frontend/models/MoneyMovementSearch.php
new file mode 100644
index 0000000..2f9109f
--- /dev/null
+++ b/frontend/models/MoneyMovementSearch.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\MoneyMovement;
+
+/**
+ * MoneyMovementSearch represents the model behind the search form about `common\models\MoneyMovement`.
+ */
+class MoneyMovementSearch extends MoneyMovement
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_money_movement', 'id_account', 'id_user', 'type', 'money'], 'integer'],
+            [['name', 'comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = MoneyMovement::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_money_movement' => $this->id_money_movement,
+            'id_account' => $this->id_account,
+            'id_user' => $this->id_user,
+            'type' => $this->type,
+            'money' => $this->money,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/money-movement/_form.php b/frontend/views/money-movement/_form.php
new file mode 100644
index 0000000..c23f1b2
--- /dev/null
+++ b/frontend/views/money-movement/_form.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\MoneyMovement */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="money-movement-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/money-movement', 'Create') : Yii::t('backend/money-movement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/money-movement/_search.php b/frontend/views/money-movement/_search.php
new file mode 100644
index 0000000..79e99aa
--- /dev/null
+++ b/frontend/views/money-movement/_search.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\MoneyMovementSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="money-movement-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_money_movement') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?php // echo $form->field($model, 'money') ?>
+
+    <?php // echo $form->field($model, 'comment') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('backend/money-movement', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('backend/money-movement', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/money-movement/create.php b/frontend/views/money-movement/create.php
new file mode 100644
index 0000000..b726f7e
--- /dev/null
+++ b/frontend/views/money-movement/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\MoneyMovement */
+
+$this->title = Yii::t('backend/money-movement', 'Create Money Movement');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/money-movement', 'Money Movements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="money-movement-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/money-movement/index.php b/frontend/views/money-movement/index.php
new file mode 100644
index 0000000..a4b1133
--- /dev/null
+++ b/frontend/views/money-movement/index.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\MoneyMovementSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('backend/money-movement', 'Money Movements');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="money-movement-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('backend/money-movement', 'Create Money Movement'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_money_movement',
+            'id_account',
+            'id_user',
+            'name',
+            'type',
+            // 'money',
+            // 'comment',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/money-movement/update.php b/frontend/views/money-movement/update.php
new file mode 100644
index 0000000..5e380bb
--- /dev/null
+++ b/frontend/views/money-movement/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\MoneyMovement */
+
+$this->title = Yii::t('backend/money-movement', 'Update {modelClass}: ', [
+    'modelClass' => 'Money Movement',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/money-movement', 'Money Movements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_money_movement]];
+$this->params['breadcrumbs'][] = Yii::t('backend/money-movement', 'Update');
+?>
+<div class="money-movement-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/money-movement/view.php b/frontend/views/money-movement/view.php
new file mode 100644
index 0000000..34fc19f
--- /dev/null
+++ b/frontend/views/money-movement/view.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\MoneyMovement */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/money-movement', 'Money Movements'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="money-movement-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('backend/money-movement', 'Update'), ['update', 'id' => $model->id_money_movement], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('backend/money-movement', 'Delete'), ['delete', 'id' => $model->id_money_movement], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('backend/money-movement', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_money_movement',
+            'id_account',
+            'id_user',
+            'name',
+            'type',
+            'money',
+            'comment',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>

From 71384b64536a7b9cc05363b385cc557a3abc7221 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 19 Oct 2015 17:22:50 +0200
Subject: [PATCH 044/100] add transfer-moneymovement

---
 common/components/AccountAwareBehavior.php    | 25 ++++++
 common/components/UserAwareBehavior.php       | 25 ++++++
 common/models/MoneyMovement.php               | 28 ++++++-
 common/models/Transfer.php                    | 33 +++++++-
 frontend/controllers/TransferController.php   | 80 ++++++++++---------
 .../models/TransferMoneyMovementSearch.php    | 79 ++++++++++++++++++
 frontend/views/money-movement/_form.php       |  4 -
 frontend/views/money-movement/index.php       | 17 ++--
 frontend/views/money-movement/view.php        | 25 +++---
 .../money_movement/_form_money_movement.php   | 29 +++++++
 .../money_movement/create_money_movement.php  | 21 +++++
 .../money_movement/money_movement_index.php   | 46 +++++++++++
 12 files changed, 341 insertions(+), 71 deletions(-)
 create mode 100644 common/components/AccountAwareBehavior.php
 create mode 100644 common/components/UserAwareBehavior.php
 create mode 100644 frontend/models/TransferMoneyMovementSearch.php
 create mode 100644 frontend/views/transfer/money_movement/_form_money_movement.php
 create mode 100644 frontend/views/transfer/money_movement/create_money_movement.php
 create mode 100644 frontend/views/transfer/money_movement/money_movement_index.php

diff --git a/common/components/AccountAwareBehavior.php b/common/components/AccountAwareBehavior.php
new file mode 100644
index 0000000..6d474b1
--- /dev/null
+++ b/common/components/AccountAwareBehavior.php
@@ -0,0 +1,25 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Account;
+
+class AccountAwareBehavior extends Behavior{
+	
+	
+	public function getAccountName(){
+		$result = "";
+		$account = $this->owner->account;
+		if (isset($account)){
+			$result  = $account->name;
+		}
+		 
+		return $result;
+	}
+
+	
+	public function getAccount(){
+		return $this->owner->hasOne( Account::className(), ["id_account" =>"id_account" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/UserAwareBehavior.php b/common/components/UserAwareBehavior.php
new file mode 100644
index 0000000..c8d716c
--- /dev/null
+++ b/common/components/UserAwareBehavior.php
@@ -0,0 +1,25 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\User;
+
+class UserAwareBehavior extends Behavior{
+	
+	
+	public function getUserName(){
+		$result = "";
+		$user = $this->owner->user;
+		if (isset($user)){
+			$result  = $user->username;
+		}
+		 
+		return $result;
+	}
+
+	
+	public function getUser(){
+		return $this->owner->hasOne( User::className(), ["id" =>"id_user" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/models/MoneyMovement.php b/common/models/MoneyMovement.php
index d2c2e32..fd36f17 100644
--- a/common/models/MoneyMovement.php
+++ b/common/models/MoneyMovement.php
@@ -3,6 +3,10 @@
 namespace common\models;
 
 use Yii;
+use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
+use common\components\AccountAwareBehavior;
+use common\components\UserAwareBehavior;
 
 /**
  * This is the model class for table "money_movement".
@@ -19,6 +23,7 @@ use Yii;
  */
 class MoneyMovement extends \yii\db\ActiveRecord
 {
+	
     /**
      * @inheritdoc
      */
@@ -27,15 +32,34 @@ class MoneyMovement extends \yii\db\ActiveRecord
         return 'money_movement';
     }
 
+    
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return ArrayHelper::merge(  [
+    			[
+    			'class' => TimestampBehavior::className(),
+    			'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			],
+    			[
+    			'class' => AccountAwareBehavior::className(),
+    			],
+    			[
+    			'class' => UserAwareBehavior::className(),
+    			],
+    	], parent::behaviors());
+    }
+    
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['id_account', 'id_user', 'name', 'type', 'money', 'created_at', 'updated_at'], 'required'],
+            [['id_account', 'id_user', 'name', 'type', 'money'], 'required'],
             [['id_account', 'id_user', 'type', 'money'], 'integer'],
-            [['created_at', 'updated_at'], 'safe'],
             [['name'], 'string', 'max' => 64],
             [['comment'], 'string', 'max' => 255]
         ];
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 1086a6c..0186340 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -5,6 +5,9 @@ namespace common\models;
 use Yii;
 use yii\base\Object;
 use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
+use common\components\AccountAwareBehavior;
+use common\components\UserAwareBehavior;
 
 /**
  * This is the model class for table "transfer".
@@ -25,18 +28,40 @@ use yii\helpers\ArrayHelper;
  * @property string $comment
  * @property string $created_at
  * @property string $updated_at
+ * @property integer $direction
  */
-class Transfer extends \yii\db\ActiveRecord
+class Transfer extends \common\models\BaseFitnessActiveRecord
 {
 	
 	const TYPE_PRODUCT = 10;
 	const TYPE_TICKET  = 20;
+	const TYPE_MONEY_MOVEMENT_OUT  = 30; //MONEY OUT FROM ACCOUNT  
 	
 	const STATUS_NOT_PAID = 10;
 	const STATUS_PAID = 20;
 	
-	const DIRECTION_IN = 10;// MONEY GOES OUT FROM ACCOUNT ( COMPANY LOST MONEY )
-	const DIRECTION_OUT = 20;//MONEY GOES IN TO THE ACCOUNT ( COMPANY EARN MONEY )
+	const DIRECTION_OUT = 10;// MONEY GOES OUT FROM ACCOUNT ( COMPANY LOST MONEY )
+	const DIRECTION_IN = 20;//MONEY GOES IN TO THE ACCOUNT ( COMPANY EARN MONEY )
+	
+	
+	/**
+	 * @inheritdoc
+	 */
+	public function behaviors()
+	{
+		return ArrayHelper::merge(  [
+				[
+				'class' => TimestampBehavior::className(),
+				'value' => function(){ return date('Y-m-d H:i:s' ); }
+		],
+// 		[
+// 			'class' => AccountAwareBehavior::className(),
+// 		],
+// 		[
+// 			'class' => UserAwareBehavior::className(),
+// 		],
+		], parent::behaviors());
+	}
 	
     /**
      * @inheritdoc
@@ -318,4 +343,6 @@ class Transfer extends \yii\db\ActiveRecord
     	];
     }
     
+    
+    
 }
diff --git a/frontend/controllers/TransferController.php b/frontend/controllers/TransferController.php
index a0677f8..03bebad 100644
--- a/frontend/controllers/TransferController.php
+++ b/frontend/controllers/TransferController.php
@@ -8,6 +8,7 @@ use frontend\models\TransferSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use frontend\models\TransferMoneyMovementSearch;
 
 /**
  * TransferController implements the CRUD actions for Transfer model.
@@ -30,12 +31,12 @@ class TransferController extends Controller
      * Lists all Transfer models.
      * @return mixed
      */
-    public function actionIndex()
+    public function actionMoneyMovementIndex()
     {
-        $searchModel = new TransferSearch();
+        $searchModel = new TransferMoneyMovementSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
 
-        return $this->render('index', [
+        return $this->render('money_movement/money_movement_index', [
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
@@ -58,50 +59,22 @@ class TransferController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionCreate()
+    public function actionMoneyMovementCreate()
     {
         $model = new Transfer();
-
+		
+        $model->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
+        $model->direction = Transfer::DIRECTION_OUT;
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_transfer]);
         } else {
-            return $this->render('create', [
+            return $this->render('money_movement/create_money_movement', [
                 'model' => $model,
             ]);
         }
     }
 
-    /**
-     * Updates an existing Transfer model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_transfer]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Transfer model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
 
     /**
      * Finds the Transfer model based on its primary key value.
@@ -118,4 +91,37 @@ class TransferController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+    
+    
+    /**
+     * Updates an existing Transfer model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_transfer]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+     */
+
+    /**
+     * Deletes an existing Transfer model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+     */
 }
diff --git a/frontend/models/TransferMoneyMovementSearch.php b/frontend/models/TransferMoneyMovementSearch.php
new file mode 100644
index 0000000..67dba8f
--- /dev/null
+++ b/frontend/models/TransferMoneyMovementSearch.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Transfer;
+
+/**
+ * TransferSearch represents the model behind the search form about `common\models\Transfer`.
+ */
+class TransferMoneyMovementSearch extends Transfer
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
+            [['comment', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Transfer::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_transfer' => $this->id_transfer,
+            'id_discount' => $this->id_discount,
+            'id_currency' => $this->id_currency,
+            'id_object' => $this->id_object,
+            'status' => $this->status,
+            'type' => $this->type,
+            'item_price' => $this->item_price,
+            'count' => $this->count,
+            'money' => $this->money,
+            'money_currency' => $this->money_currency,
+            'rate' => $this->rate,
+            'id_user' => $this->id_user,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'comment', $this->comment]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/money-movement/_form.php b/frontend/views/money-movement/_form.php
index c23f1b2..6fc0514 100644
--- a/frontend/views/money-movement/_form.php
+++ b/frontend/views/money-movement/_form.php
@@ -24,10 +24,6 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'created_at')->textInput() ?>
-
-    <?= $form->field($model, 'updated_at')->textInput() ?>
-
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/money-movement', 'Create') : Yii::t('backend/money-movement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
diff --git a/frontend/views/money-movement/index.php b/frontend/views/money-movement/index.php
index a4b1133..4e5cc7f 100644
--- a/frontend/views/money-movement/index.php
+++ b/frontend/views/money-movement/index.php
@@ -21,21 +21,18 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
 
-            'id_money_movement',
-            'id_account',
-            'id_user',
+            'accountName',
+            'userName',
             'name',
             'type',
-            // 'money',
-            // 'comment',
-            // 'created_at',
-            // 'updated_at',
+            'money',
+            'created_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+				'template' => '{view}'
+			],
         ],
     ]); ?>
 
diff --git a/frontend/views/money-movement/view.php b/frontend/views/money-movement/view.php
index 34fc19f..7704ef9 100644
--- a/frontend/views/money-movement/view.php
+++ b/frontend/views/money-movement/view.php
@@ -14,29 +14,24 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('backend/money-movement', 'Update'), ['update', 'id' => $model->id_money_movement], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('backend/money-movement', 'Delete'), ['delete', 'id' => $model->id_money_movement], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('backend/money-movement', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
 
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
             'id_money_movement',
-            'id_account',
-            'id_user',
+			[
+            	'attribute' => 'id_account' ,
+				'value' => $model->accountName
+			],
+			[
+            	'attribute' => 'id_user' ,
+				'value' => $model->userName
+			],
             'name',
             'type',
-            'money',
+            'money:integer',
             'comment',
-            'created_at',
-            'updated_at',
+            'created_at:datetime',
         ],
     ]) ?>
 
diff --git a/frontend/views/transfer/money_movement/_form_money_movement.php b/frontend/views/transfer/money_movement/_form_money_movement.php
new file mode 100644
index 0000000..3ae544d
--- /dev/null
+++ b/frontend/views/transfer/money_movement/_form_money_movement.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="transfer-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_object')->textInput() ?>
+
+    <?= $form->field($model, 'item_price')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/transfer', 'Create') : Yii::t('frontend/transfer', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/transfer/money_movement/create_money_movement.php b/frontend/views/transfer/money_movement/create_money_movement.php
new file mode 100644
index 0000000..599da33
--- /dev/null
+++ b/frontend/views/transfer/money_movement/create_money_movement.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+$this->title = Yii::t('frontend/transfer', 'Create Money Movement');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/transfer', 'Transfers'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form_money_movement', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/transfer/money_movement/money_movement_index.php b/frontend/views/transfer/money_movement/money_movement_index.php
new file mode 100644
index 0000000..483446d
--- /dev/null
+++ b/frontend/views/transfer/money_movement/money_movement_index.php
@@ -0,0 +1,46 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\models\TransferSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/transfer', 'Transfers');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="transfer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/transfer', 'Create Money Movement'), ['money-movement-create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+
+            'id_transfer',
+            'id_discount',
+            'id_currency',
+            'id_object',
+            'status',
+            // 'type',
+            // 'item_price',
+            // 'count',
+            // 'money',
+            // 'money_currency',
+            // 'rate',
+            // 'id_user',
+            // 'comment',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>

From 1a1477b26be5b802c0713efb3644a11500cca6b9 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 20 Oct 2015 09:02:57 +0200
Subject: [PATCH 045/100] add changes to backend transfers2

---
 backend/components/AdminMenuStructure.php     |  9 ++-
 backend/models/TransferSearch.php             | 45 +++++++++------
 backend/views/transfer/_search.php            | 28 +++-------
 backend/views/transfer/index.php              | 29 ++++++++--
 common/components/AccountAwareBehavior.php    |  1 -
 common/messages/hu/common/transfer.php        |  2 +-
 common/messages/hu/frontend/transfer.php      |  2 +-
 common/models/MoneyMovement.php               | 36 +++++++++++-
 common/models/Transfer.php                    | 55 +++++++++++++++++--
 .../controllers/MoneyMovementController.php   | 10 +++-
 .../models/TransferMoneyMovementSearch.php    |  3 +-
 frontend/views/money-movement/_form.php       | 13 +++--
 frontend/views/money-movement/create.php      |  1 +
 frontend/views/money-movement/view.php        |  1 -
 14 files changed, 174 insertions(+), 61 deletions(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 593093b..88d4379 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -30,6 +30,9 @@ class AdminMenuStructure{
 		$userMainMenu = null;
 		$items = [];
 		
+		//$today = \Yii::$app->formatter->asDate( time() );
+		$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
+		$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 +  time()));
 		
 // 		if ( $this->can('backend.user.index')){
 			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
@@ -45,7 +48,11 @@ class AdminMenuStructure{
 		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
 		$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 		$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
-		$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index'] ];
+		
+		
+		
+		
+		$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 		$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 		
 		if ( count($items) > 0 ){
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index 99112a9..e6a1b2e 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -36,7 +36,7 @@ class TransferSearch extends Transfer
     {
         return [
             [[  'id_account','id_user', 'type'], 'integer'],
-            [[ 'searchObjectName' ], 'string'],
+//             [[ 'searchObjectName' ], 'string'],
         	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         ];
@@ -66,14 +66,17 @@ class TransferSearch extends Transfer
             'query' => $query,
         ]);
 
-//         $query->distinct();
-        $selectObjectName = "";
-        $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end as object_name";
+//         $selectObjectName = "";
+//         $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name  ";
+//         $selectObjectName .= "  when transfer.type = " .self::TYPE_TICKET  ." then ticket_type.name ";
+//         $selectObjectName .= "  when transfer.type = " .self::TYPE_MONEY_MOVEMENT_OUT  ." then 'Pénzmozgás' ";
+//         $selectObjectName .= " else '' ";
+//         $selectObjectName .= " end as object_name";
         
-        $query->addSelect( ['*', new Expression($selectObjectName) ]);
-        $query->joinWith('ticket');
-        $query->joinWith('ticketType');
-        $query->joinWith('product');
+        $query->addSelect( ['*'  ]);
+//         $query->joinWith('ticket');
+//         $query->joinWith('ticketType');
+//         $query->joinWith('product');
         
         $this->load($params);
 
@@ -92,14 +95,22 @@ class TransferSearch extends Transfer
         $query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ]   );
         $query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
 
-        if ( isset($this->searchObjectName))
-        $query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
+//         if ( isset($this->searchObjectName))
+//         $query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
         
         
         
         return $dataProvider;
     }
     
+    
+    public function search2(){
+    	$query = new Query() ;
+    	$query->select('*');
+    	
+    	 
+    }
+    
     public function totals($params){
     	$query = new Query();
     	
@@ -111,11 +122,11 @@ class TransferSearch extends Transfer
     			'money' => 0
     	];
     		
-    	$query->addSelect( [ new Expression( 'transfer.id_account as account'),  new Expression( ' COALESCE(sum( transfer.money ),0) as money' )]);
+    	$query->addSelect( [ new Expression( 'transfer.id_account as account'),  new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )]);
     	$query->from('transfer');
-    	$query->leftJoin('ticket', 'transfer.type =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
-    	$query->leftJoin('ticket_type', 'ticket.id_ticket_type   = ticket_type.id_ticket_type ' );
-    	$query->leftJoin('product', 'product.id_product =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
+//     	$query->leftJoin('ticket', 'transfer.type =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
+//     	$query->leftJoin('ticket_type', 'ticket.id_ticket_type   = ticket_type.id_ticket_type ' );
+//     	$query->leftJoin('product', 'product.id_product =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
     	
     	$this->load($params);
     	
@@ -133,9 +144,9 @@ class TransferSearch extends Transfer
     	$query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
     	
     	
-    	if ( isset($this->searchObjectName)  && !empty($this->searchObjectName)){
-    		$query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
-    	}
+//     	if ( isset($this->searchObjectName)  && !empty($this->searchObjectName)){
+//     		$query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
+//     	}
     	
     	$query->groupBy('transfer.id_account');
     	
diff --git a/backend/views/transfer/_search.php b/backend/views/transfer/_search.php
index d55f5d4..1c41156 100644
--- a/backend/views/transfer/_search.php
+++ b/backend/views/transfer/_search.php
@@ -22,27 +22,18 @@ use kartik\widgets\DatePicker;
     ]); ?>
     
     <div class='row'>
-	<div class='col-md-4'>
-    	<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +HtmlHelper::mkAccountOptions($accounts) ) ?>
+		<div class='col-md-4'>
+	    	<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +HtmlHelper::mkAccountOptions($accounts) ) ?>
+		</div>
+		<div class='col-md-4'>
+	    	<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  + Transfer::types() ) ?>
+		</div>
+		<div class='col-md-4'>
+	    	<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +ArrayHelper::map($users,'id' , 'username') ) ?> 
+		</div>
 	</div>
-	<div class='col-md-4'>
-    	<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  + Transfer::types() ) ?>
-	</div>
-	<div class='col-md-4'>
-    	<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +ArrayHelper::map($users,'id' , 'username') ) ?> 
-	</div>
-	</div>
-
-
-
-
-
-	
     
     <div class="row">
-		<div class='col-md-4'>
-	    <?php   echo $form->field($model, 'searchObjectName') ?>
-		</div>
 		<div class="col-md-4">
 		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
     			 'pluginOptions' => [
@@ -61,7 +52,6 @@ use kartik\widgets\DatePicker;
 		</div>
 	</div>
 
-
     <div class="form-group">
         <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
     </div>
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php
index 62670d0..1046315 100644
--- a/backend/views/transfer/index.php
+++ b/backend/views/transfer/index.php
@@ -14,6 +14,15 @@ use yii\data\ArrayDataProvider;
 $this->title = Yii::t('frontend/transfer', 'Transfers');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+<style>
+	.table-transfer .money,
+	.table-transfer .count,
+	.table-transfer .item-price
+	{
+		text-align: right;	
+	}
+</style>
+
 <div class="transfer-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
@@ -56,6 +65,7 @@ $this->params['breadcrumbs'][] = $this->title;
 	?>
 	<h2>Pénzmozgások</h2>
     <?= GridView::widget([
+    	'tableOptions' => ['class' => 'table table-striped table-bordered table-transfer'],	
         'dataProvider' => $dataProvider,
         'columns' => [
 
@@ -64,8 +74,7 @@ $this->params['breadcrumbs'][] = $this->title;
         		'value' => 'transferTypeName'
         		],
         		[
-        		'attribute' => 'id_object',
-        		'value' => 'objectName'
+        		'attribute' => 'objectName',
         				],
             [
             	'attribute' => 'id_user',
@@ -75,9 +84,19 @@ $this->params['breadcrumbs'][] = $this->title;
             	'attribute' => 'id_account',
             	'value' => 'accountName'	
     		],
-        		'item_price',
-        		'count',
-        		'money',
+        		[
+        			'contentOptions' =>[ 'class' => 'item-price' ],		
+        			'attribute' =>  'item_price',
+    			],
+        		[
+        			'contentOptions' =>[ 'class' => 'count' ],		
+        			'attribute' =>  'count',
+    			],
+        		[
+        			'contentOptions' =>[ 'class' => 'money' ],		
+        			'attribute' => 'money',
+        			'value' => 'signedMoney'	
+    			],
             'created_at:datetime',
 
             ['class' => 'yii\grid\ActionColumn',
diff --git a/common/components/AccountAwareBehavior.php b/common/components/AccountAwareBehavior.php
index 6d474b1..fd46b6b 100644
--- a/common/components/AccountAwareBehavior.php
+++ b/common/components/AccountAwareBehavior.php
@@ -13,7 +13,6 @@ class AccountAwareBehavior extends Behavior{
 		if (isset($account)){
 			$result  = $account->name;
 		}
-		 
 		return $result;
 	}
 
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
index ce9c8e3..c6eda43 100644
--- a/common/messages/hu/common/transfer.php
+++ b/common/messages/hu/common/transfer.php
@@ -32,7 +32,7 @@ return [
     'Id Transfer' => 'Pénzmozgás',
     'Id User' => 'Felhasználó',
     'Item Price' => 'Termék ár',
-    'Money' => 'Ár',
+    'Money' => 'Összeg',
     'Money Currency' => 'Ár valuta',
     'Rate' => 'Árfolyam',
     'Status' => 'Státusz',
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index 90f460b..4593754 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -25,7 +25,7 @@ return [
     'Delete' => 'Törlés',
     'Search' => 'Keresés',
     'Termékeladás' => 'Termékeladás',
-    'Transfers' => 'Pénzmozgások',
+    'Transfers' => 'Tranzakciók',
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítás: ',
     'pieces' => 'db',
diff --git a/common/models/MoneyMovement.php b/common/models/MoneyMovement.php
index fd36f17..fb22fca 100644
--- a/common/models/MoneyMovement.php
+++ b/common/models/MoneyMovement.php
@@ -7,6 +7,8 @@ use yii\helpers\ArrayHelper;
 use yii\behaviors\TimestampBehavior;
 use common\components\AccountAwareBehavior;
 use common\components\UserAwareBehavior;
+use yii\base\Object;
+use common\models\Transfer;
 
 /**
  * This is the model class for table "money_movement".
@@ -23,6 +25,10 @@ use common\components\UserAwareBehavior;
  */
 class MoneyMovement extends \yii\db\ActiveRecord
 {
+
+	const TYPE_OUT = 10;
+	
+	public $_account;
 	
     /**
      * @inheritdoc
@@ -58,13 +64,22 @@ class MoneyMovement extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['id_account', 'id_user', 'name', 'type', 'money'], 'required'],
-            [['id_account', 'id_user', 'type', 'money'], 'integer'],
+            [['id_account',   'name',   'money'], 'required'],
+            [['id_account' ,  'money'], 'integer'],
             [['name'], 'string', 'max' => 64],
-            [['comment'], 'string', 'max' => 255]
+            [['comment'], 'string', 'max' => 255],
+            [['id_account'], 'validateAccount'],
         ];
     }
 
+    public function validateAccount($attribute,$params){
+    	$this->_account  = Account::findOne(['id_account' => $this->id_account]  );
+    	if (  !isset( $this->_account )  ){
+    		$this->addError($attribute, Yii::t('common/money-movement', 'Invalid account!'));
+    	}
+    	
+    }
+    
     /**
      * @inheritdoc
      */
@@ -82,4 +97,19 @@ class MoneyMovement extends \yii\db\ActiveRecord
             'updated_at' => Yii::t('common/money-movement', 'Updated At'),
         ];
     }
+    
+    public function afterSave($insert, $changedAttributes){
+    	parent::afterSave($insert, $changedAttributes);
+    	if ( $insert) {
+    		$this->createTransfer();
+    	}
+    	
+    }
+    
+    protected function createTransfer(){
+    	$transfer = Transfer::createMoneyMovementOutTransfer($this->_account, $this);
+    	$transfer->id_user = Yii::$app->user->id;
+    	$transfer->save();
+    }
+    
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 0186340..b37da55 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -94,6 +94,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
             'id_discount' => Yii::t('common/transfer', 'Id Discount'),
             'id_currency' => Yii::t('common/transfer', 'Id Currency'),
             'id_object' => Yii::t('common/transfer', 'Id Object'),
+            'objectName' => Yii::t('common/transfer', 'Id Object'),
             'status' => Yii::t('common/transfer', 'Status'),
             'type' => Yii::t('common/transfer', 'Type'),
             'item_price' => Yii::t('common/transfer', 'Item Price'),
@@ -115,9 +116,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     public function getProduct(){
     	return $this->hasOne( Product::className(), ["id_product" =>"id_object" ] );
     }
+    public function getMoneyMovement(){
+    	return $this->hasOne( MoneyMovement::className(), ["id_money_movement" =>"id_object" ] );
+    }
     
     public function getTicket(){
-    	return $this->hasOne( Ticket::className(), ["id_ticket" =>"id_object" ] );
+    	return $this->hasOne( Ticket::className(), ["id_ticket" =>"id_object",  ] ) ;
     }
 
     public function getTicketType(){
@@ -192,13 +196,30 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	$result = "";
     	if ( $this->type == Transfer::TYPE_TICKET ){
     		$result =  Yii::t('common/transfer','Ticket');
-    	}else{
+    	}else if ( $this->type == Transfer::TYPE_PRODUCT ){
     		$result =  Yii::t('common/transfer','Product');
+    	}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
+    		$result =  Yii::t('common/transfer','Money movement');
     	}
     	
+//     	$result .= " xx";
+//     	$result .=  $this->type;
+    	
     	return $result;
     }
     
+    public function  getSignedMoney(){
+    	$m = 1;
+    	$result = $this->money;
+    	if ( $this->direction == self::DIRECTION_OUT ){
+    		$m = -1;
+    	}
+    	
+    	$result = $result * $m;
+    	
+    	return $result;
+    	
+    }
 	
     public function toProductSoldString(){
     	$s = "";
@@ -248,6 +269,27 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $transfer;
     }
     
+    /**
+     * @param $account common\models\Account
+     * @param $discount common\models\Discount
+     * @param $currency common\models\Currency
+     * @param $moneyMovement common\models\MoneyMovement
+     * */
+    public static function createMoneyMovementOutTransfer($account , $moneyMovement ){
+    	$transfer = new Transfer();
+    	
+    	$transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
+    	$transfer->status = Transfer::STATUS_PAID;
+    	$transfer->direction = Transfer::DIRECTION_OUT;
+    	$transfer->count = 0;
+    	
+    	$transfer->id_object = $moneyMovement->id_money_movement;
+    	$transfer->money = $moneyMovement->money;
+    	
+    	$transfer->id_account = $account->id_account;
+    	
+    	return $transfer;
+    }
     /**
      * @param $account common\models\Account
      * @param $discount common\models\Discount
@@ -307,16 +349,20 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
 	    				$result = "";
 	    				if ( $transfer->type == Transfer::TYPE_TICKET ){
 		    				$result =  $transfer->ticket->ticketTypeName;
-	    				}else{
+	    				}else if ( $transfer->type == Transfer::TYPE_PRODUCT ){
 		    				$result =  $transfer->product->name;
+	    				}else if ( $transfer->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
+	    					$result = "Pénzmozgás";
 	    				}
 	    				return $result;
 	    			},
 	    			'category' => function ($transfer) {
 	    				if ( $transfer->type == Transfer::TYPE_TICKET ){
 							return Yii::t('frontend/transfer','Ticket');
-	    				}else{
+						}else if ( $transfer->type == Transfer::TYPE_PRODUCT ){
 	    					return $transfer->product->productCategoryName;
+	    				}else if ( $transfer->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
+	    					return "Pénzmozgás";	
 	    				}
 	    			},
     			],
@@ -338,6 +384,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     
     public static function types( ) {
     	return [
+    			self::TYPE_MONEY_MOVEMENT_OUT => Yii::t('common/transfer','Pénzmozgás'),	
     			self::TYPE_PRODUCT => Yii::t('common/transfer','Product'),	
     			self::TYPE_TICKET => Yii::t('common/transfer','Ticket'),	
     	];
diff --git a/frontend/controllers/MoneyMovementController.php b/frontend/controllers/MoneyMovementController.php
index 6cbc383..ec5ebba 100644
--- a/frontend/controllers/MoneyMovementController.php
+++ b/frontend/controllers/MoneyMovementController.php
@@ -8,6 +8,7 @@ use frontend\models\MoneyMovementSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Account;
 
 /**
  * MoneyMovementController implements the CRUD actions for MoneyMovement model.
@@ -61,12 +62,19 @@ class MoneyMovementController extends Controller
     public function actionCreate()
     {
         $model = new MoneyMovement();
-
+	
+        $model->id_user = Yii::$app->user->id;
+        $model->type = MoneyMovement::TYPE_OUT;
+        
+        $accounts = Account::read();
+        
+        
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_money_movement]);
         } else {
             return $this->render('create', [
                 'model' => $model,
+            	'accounts' => $accounts
             ]);
         }
     }
diff --git a/frontend/models/TransferMoneyMovementSearch.php b/frontend/models/TransferMoneyMovementSearch.php
index 67dba8f..935566d 100644
--- a/frontend/models/TransferMoneyMovementSearch.php
+++ b/frontend/models/TransferMoneyMovementSearch.php
@@ -43,6 +43,8 @@ class TransferMoneyMovementSearch extends Transfer
     {
         $query = Transfer::find();
 
+        $query->andWhere(['type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
@@ -69,7 +71,6 @@ class TransferMoneyMovementSearch extends Transfer
             'rate' => $this->rate,
             'id_user' => $this->id_user,
             'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
 
         $query->andFilterWhere(['like', 'comment', $this->comment]);
diff --git a/frontend/views/money-movement/_form.php b/frontend/views/money-movement/_form.php
index 6fc0514..a9680de 100644
--- a/frontend/views/money-movement/_form.php
+++ b/frontend/views/money-movement/_form.php
@@ -2,27 +2,28 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\MoneyMovement */
 /* @var $form yii\widgets\ActiveForm */
 ?>
+<?php 
 
+$accountOptions = HtmlHelper::mkAccountOptions($accounts);
+
+?>
 <div class="money-movement-form">
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'id_account')->textInput() ?>
-
-    <?= $form->field($model, 'id_user')->textInput() ?>
+    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
 
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'type')->textInput() ?>
-
     <?= $form->field($model, 'money')->textInput() ?>
 
-    <?= $form->field($model, 'comment')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'comment')->textarea(['maxlength' => true]) ?>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/money-movement', 'Create') : Yii::t('backend/money-movement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/frontend/views/money-movement/create.php b/frontend/views/money-movement/create.php
index b726f7e..3b0e964 100644
--- a/frontend/views/money-movement/create.php
+++ b/frontend/views/money-movement/create.php
@@ -16,6 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= $this->render('_form', [
         'model' => $model,
+    		'accounts' => $accounts
     ]) ?>
 
 </div>
diff --git a/frontend/views/money-movement/view.php b/frontend/views/money-movement/view.php
index 7704ef9..21e9c49 100644
--- a/frontend/views/money-movement/view.php
+++ b/frontend/views/money-movement/view.php
@@ -28,7 +28,6 @@ $this->params['breadcrumbs'][] = $this->title;
 				'value' => $model->userName
 			],
             'name',
-            'type',
             'money:integer',
             'comment',
             'created_at:datetime',

From f2e30779f0e3b8adc350216b1c11eaa6d4ec0155 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 20 Oct 2015 17:23:52 +0200
Subject: [PATCH 046/100] add product sell discount js changes

---
 common/models/Discount.php                    | 18 +++++-
 common/models/Transfer.php                    | 10 ++--
 frontend/components/FrontendMenuStructure.php | 31 +++++++++-
 frontend/models/MoneyMovementSearch.php       | 31 +++++-----
 frontend/views/layouts/main.php               | 15 -----
 frontend/views/money-movement/_search.php     | 38 ++++++------
 frontend/views/money-movement/index.php       |  2 +-
 frontend/views/product/sale.php               |  3 +
 frontend/views/transfer/_search.php           | 48 ++++++---------
 frontend/web/js/product.sell.js               | 59 ++++++++++++++++++-
 10 files changed, 165 insertions(+), 90 deletions(-)

diff --git a/common/models/Discount.php b/common/models/Discount.php
index 6e65bbf..6aad798 100644
--- a/common/models/Discount.php
+++ b/common/models/Discount.php
@@ -4,6 +4,7 @@ namespace common\models;
 
 use Yii;
 use yii\behaviors\TimestampBehavior;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "discount".
@@ -113,9 +114,24 @@ class Discount extends \yii\db\ActiveRecord
      * */
     public static function applyDiscount($money,$discount){
     	$result  = $money;
-    	$valueOfDiscount =  $money  * $discount->value * 100;
+    	$valueOfDiscount =  $money  * $discount->value / 100;
     	$result = $money - $valueOfDiscount;
     	return $result;
     }
     
+    
+    public static function modelsToArray($discounts,$default = []){
+    
+    	if ( $discounts == null ){
+    		return $default;
+    	}
+    
+    	return ArrayHelper::toArray($discounts, [
+    			'common\models\Discount' => [
+    			'id_discount',
+    			'value',
+    			],
+    			]);
+    }
+    
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index b37da55..47ca74b 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -148,8 +148,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	$result = "";
     	if ( $this->type == Transfer::TYPE_TICKET ){
     		$result =  $this->ticketName;
-    	}else{
+    	}else if ( $this->type == Transfer::TYPE_PRODUCT ){
     		$result =  $this->productName;
+    	}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
+    		$result =  "Pénz kivétel - " . $this->moneyMovement->name;
     	}
     	return $result;
     }
@@ -201,10 +203,6 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	}else if ( $this->type == Transfer::TYPE_MONEY_MOVEMENT_OUT ){
     		$result =  Yii::t('common/transfer','Money movement');
     	}
-    	
-//     	$result .= " xx";
-//     	$result .=  $this->type;
-    	
     	return $result;
     }
     
@@ -281,7 +279,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	$transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
     	$transfer->status = Transfer::STATUS_PAID;
     	$transfer->direction = Transfer::DIRECTION_OUT;
-    	$transfer->count = 0;
+    	$transfer->count = null;
     	
     	$transfer->id_object = $moneyMovement->id_money_movement;
     	$transfer->money = $moneyMovement->money;
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index e076884..505d3d5 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -4,15 +4,41 @@ namespace frontend\components;
 use Yii;
 use common\models\Order;
 use yii\helpers\Html;
+use common\models\MoneyMovement;
+use yii\db\Query;
+use common\models\AccountState;
 
 class FrontendMenuStructure{
 	
 	public $menuItems;
+	public $start;
+	public $tomorrow;
 	
-	public function FrontendMenuStructure(){
+	public function __construct(){
 		$this->menuItems = [];
+// 		print('abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>');
+		
+		$this->start =  Yii::$app->formatter->asDatetime(  strtotime('today UTC') );
+		$this->tomorrow =  Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
+		
+		Yii::info("Start date is : ". $this->start);
+		
+		
+		
+		if ( $this->isLogged()  ){
+			$lastAccountState = AccountState::find()->andWhere(['id_user' => Yii::$app->user->id])->orderBy(['account_state.created_at' => SORT_DESC])->limit(1)->one();
+			if ( isset($lastAccountState) ){
+				$this->start = strtotime( $lastAccountState->created_at . ' UTC' );
+			}
+		}
+
+// 		print_r($this->start);
+// 		print_r($this->tomorrow);
+		
 	}
 	
+	
+	
 	protected function can($authItem){
 		$result = false;
 		if (\Yii::$app->user->can($authItem)) {
@@ -30,7 +56,8 @@ class FrontendMenuStructure{
 	protected function addRecepcio(){
 		if ( $this->isLogged() ){
 			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
-			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => ['/money-movement/index'] ];
+// 			, 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow
+			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'items' => [
 							['label' =>  Yii::t('frontend/account-state', 'Account states'), 'url' => ['/account-state/index'] ],
diff --git a/frontend/models/MoneyMovementSearch.php b/frontend/models/MoneyMovementSearch.php
index 2f9109f..e51e175 100644
--- a/frontend/models/MoneyMovementSearch.php
+++ b/frontend/models/MoneyMovementSearch.php
@@ -12,14 +12,22 @@ use common\models\MoneyMovement;
  */
 class MoneyMovementSearch extends MoneyMovement
 {
+	
+	
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
     /**
      * @inheritdoc
      */
     public function rules()
-    {
+    {	
         return [
-            [['id_money_movement', 'id_account', 'id_user', 'type', 'money'], 'integer'],
-            [['name', 'comment', 'created_at', 'updated_at'], 'safe'],
+            [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+            [[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],            
         ];
     }
 
@@ -51,22 +59,13 @@ class MoneyMovementSearch extends MoneyMovement
 
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
+            $query->where('0=1');
             return $dataProvider;
         }
 
-        $query->andFilterWhere([
-            'id_money_movement' => $this->id_money_movement,
-            'id_account' => $this->id_account,
-            'id_user' => $this->id_user,
-            'type' => $this->type,
-            'money' => $this->money,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ]);
-
-        $query->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'comment', $this->comment]);
+        
+        $query->andFilterWhere([ '>=', 'money_movement.created_at', $this->timestampStart ]   );
+        $query->andFilterWhere([ '<', 'money_movement.created_at', $this->timestampEnd ]   );
 
         return $dataProvider;
     }
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index fd2f627..8725ef0 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -48,21 +48,6 @@ AppAsset::register($this);
             'class' => 'navbar-inverse navbar-fixed-top',
         ],
     ]);
-    $menuItems = [
-        ['label' => 'Home', 'url' => ['/site/index']],
-        ['label' => 'About', 'url' => ['/site/about']],
-        ['label' => 'Contact', 'url' => ['/site/contact']],
-    ];
-    if (Yii::$app->user->isGuest) {
-        $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
-        $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
-    } else {
-        $menuItems[] = [
-            'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
-            'url' => ['/site/logout'],
-            'linkOptions' => ['data-method' => 'post']
-        ];
-    }
     echo Nav::widget([
         'options' => ['class' => 'navbar-nav navbar-right'],
         'items' => $items,
diff --git a/frontend/views/money-movement/_search.php b/frontend/views/money-movement/_search.php
index 79e99aa..f5b2c84 100644
--- a/frontend/views/money-movement/_search.php
+++ b/frontend/views/money-movement/_search.php
@@ -2,6 +2,8 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use kartik\widgets\DatePicker;
+use kartik\widgets\DateTimePicker;
 
 /* @var $this yii\web\View */
 /* @var $model frontend\models\MoneyMovementSearch */
@@ -15,27 +17,27 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_money_movement') ?>
-
-    <?= $form->field($model, 'id_account') ?>
-
-    <?= $form->field($model, 'id_user') ?>
-
-    <?= $form->field($model, 'name') ?>
-
-    <?= $form->field($model, 'type') ?>
-
-    <?php // echo $form->field($model, 'money') ?>
-
-    <?php // echo $form->field($model, 'comment') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
+ 	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])  ?>
+		</div>
+	</div>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('backend/money-movement', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('backend/money-movement', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/frontend/views/money-movement/index.php b/frontend/views/money-movement/index.php
index 4e5cc7f..3063fe2 100644
--- a/frontend/views/money-movement/index.php
+++ b/frontend/views/money-movement/index.php
@@ -13,7 +13,7 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="money-movement-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
         <?= Html::a(Yii::t('backend/money-movement', 'Create Money Movement'), ['create'], ['class' => 'btn btn-success']) ?>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 497226a..602350e 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -8,6 +8,7 @@ use frontend\assets\ProductSellAsset;
 use yii\helpers\Url;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\ArrayHelper;
+use common\models\Discount;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
@@ -20,6 +21,8 @@ $options = [];
 $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
 $options['clear_list_url'] = Url::toRoute(['product/clear-list']);
 $options['sold_items'] = $userTransfers;
+$options['discounts'] = Discount::modelsToArray($discounts);
+
 
 
 $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
index d910cf8..c4ef840 100644
--- a/frontend/views/transfer/_search.php
+++ b/frontend/views/transfer/_search.php
@@ -15,35 +15,25 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_transfer') ?>
-
-    <?= $form->field($model, 'id_discount') ?>
-
-    <?= $form->field($model, 'id_currency') ?>
-
-    <?= $form->field($model, 'id_object') ?>
-
-    <?= $form->field($model, 'status') ?>
-
-    <?php // echo $form->field($model, 'type') ?>
-
-    <?php // echo $form->field($model, 'item_price') ?>
-
-    <?php // echo $form->field($model, 'count') ?>
-
-    <?php // echo $form->field($model, 'money') ?>
-
-    <?php // echo $form->field($model, 'money_currency') ?>
-
-    <?php // echo $form->field($model, 'rate') ?>
-
-    <?php // echo $form->field($model, 'id_user') ?>
-
-    <?php // echo $form->field($model, 'comment') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
+    
+     <div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 93dd66e..0a719b5 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -19,6 +19,7 @@ function ProductSell(o){
 	    message_paid: 'Tételek fizetve',
 	    /**list of sold items by current user*/
 	    sold_items: [],
+	    discounts: [],
 	};
 	
 	init();
@@ -34,12 +35,17 @@ function ProductSell(o){
 		setFocus();
 		addEnterPressedBehaviours();
 		addBehaviorCountChangedListener();
+		addBehaviourDisocuntChanged();
 		createUserSoldItemsTable();
 		addBehaviourBtnPaid();
 		productChanged();
 		addDocumentKeypressedListener();
 	}
 	
+	function addBehaviourDisocuntChanged(){
+		$("#productsaleform-id_discount").change(refreshCalculatedValues);
+	}
+	
 	function addDocumentKeypressedListener(){
 		$(  document ).keypress(function( event ) {
 			
@@ -235,15 +241,23 @@ function ProductSell(o){
 	}
 		
 	function refreshCalculatedValues(){
-		var count,price;
+		var count,price,id_discount,discount;
 		var table;
 		table = $('.table-product');
 		count = $("#productsaleform-count").val();
+		id_discount = $("#productsaleform-id_discount").val();
+		app.discount = findDiscount( id_discount );
 		count = +count;
 		if ( isNaN(count)){
 			count = 0;
 		}
 		price = count * app.product.sale_price;
+		
+		
+		discount = calcDiscount(price, app.discount);
+		price = deductDiscount(price,discount);
+		price = normalizePrice(price);
+		
 		table.find('.product-count').html(count);
 		table.find('.product-price').html(price);
 	}
@@ -345,13 +359,54 @@ function ProductSell(o){
 		});
 	}
 	
-	
 	function createUserSoldItemsTable(){
 		$('.sold-items-container').transferList({
 			'transfers' : app.defaults.sold_items
 		});
 	}
 	
+	function findDiscount(id_discount){
+		var discount;
+		discount = null;
+		$.each( app.defaults.discounts , function(e,i){
+			if ( e.id_discount == id_discount ){
+				discount = e;
+			}
+			
+		});
+		return discount;
+	}
 	
+	function calcDiscount(price,discount){
+		var result, discountMoney;
+		result = 0;
+		
+		if ( discount ){
+			result = price * ( discount.value / 100 );
+		}
+		
+		return result;
+	}
+	
+	function deductDiscount( price , discount ){
+			var result;
+			result = price - discount;
+			return result;
+	}
+	
+	function normalizePrice( price ){
+		var result;
+		result = hufRound(price);
+		return result;
+	}
+	
+	function hufRound(x)
+    {
+        if (x > 0) {
+            return (x % 5) >= 2.5 ? parseInt(x / 5) * 5 + 5 : parseInt(x / 5) * 5;
+        } else {
+            return ((Math.abs(x) % 5) >= 2.5 ? parseInt(Math.abs(x) / 5) * 5 + 5 : parseInt(Math.abs(x) / 5) * 5)*-1;
+        }
+    }
 	
 }

From 4e0442540343325b4acc6af92ce5aa9d6b1f0d58 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 21 Oct 2015 07:46:15 +0200
Subject: [PATCH 047/100] add discount to product sell js

---
 backend/controllers/DiscountController.php    |  4 +--
 backend/models/DiscountSearch.php             |  4 +--
 backend/views/discount/update.php             |  2 +-
 backend/views/discount/view.php               |  4 +--
 common/components/Helper.php                  | 16 ++++++++++
 common/models/Transfer.php                    |  5 ++-
 ...936_alter__table__discount__timestamps.php | 31 +++++++++++++++++++
 frontend/models/ProductSaleForm.php           |  5 ++-
 frontend/web/js/product.sell.js               |  2 +-
 9 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 common/components/Helper.php
 create mode 100644 console/migrations/m151020_164936_alter__table__discount__timestamps.php

diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
index 91a75b8..62aae81 100644
--- a/backend/controllers/DiscountController.php
+++ b/backend/controllers/DiscountController.php
@@ -65,7 +65,7 @@ class DiscountController extends Controller
         $model->status = Discount::STATUS_ACTIVE;
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+            return $this->redirect(['view', 'id' => $model->id_discount]);
         } else {
             return $this->render('create', [
                 'model' => $model,
@@ -84,7 +84,7 @@ class DiscountController extends Controller
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_warehouse]);
+            return $this->redirect(['view', 'id' => $model->id_discount]);
         } else {
             return $this->render('update', [
                 'model' => $model,
diff --git a/backend/models/DiscountSearch.php b/backend/models/DiscountSearch.php
index 8c97f7f..0a2f640 100644
--- a/backend/models/DiscountSearch.php
+++ b/backend/models/DiscountSearch.php
@@ -18,7 +18,7 @@ class DiscountSearch extends Discount
     public function rules()
     {
         return [
-            [['id_warehouse', 'status', 'type', 'value'], 'integer'],
+            [['id_discount', 'status', 'type', 'value'], 'integer'],
             [['name', 'created_at', 'updated_at'], 'safe'],
         ];
     }
@@ -56,7 +56,7 @@ class DiscountSearch extends Discount
         }
 
         $query->andFilterWhere([
-            'id_warehouse' => $this->id_warehouse,
+            'id_discount' => $this->id_discount,
             'status' => $this->status,
             'type' => $this->type,
             'value' => $this->value,
diff --git a/backend/views/discount/update.php b/backend/views/discount/update.php
index 8fc2572..b43a463 100644
--- a/backend/views/discount/update.php
+++ b/backend/views/discount/update.php
@@ -9,7 +9,7 @@ $this->title = Yii::t('common/discount', 'Update {modelClass}: ', [
     'modelClass' => 'Discount',
 ]) . ' ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('common/discount', 'Discounts'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_warehouse]];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_discount]];
 $this->params['breadcrumbs'][] = Yii::t('common/discount', 'Update');
 ?>
 <div class="discount-update">
diff --git a/backend/views/discount/view.php b/backend/views/discount/view.php
index 1365857..5ce89f3 100644
--- a/backend/views/discount/view.php
+++ b/backend/views/discount/view.php
@@ -15,9 +15,9 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_warehouse], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_discount], ['class' => 'btn btn-primary']) ?>
         <?php 
-/*        Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_warehouse], [
+/*        Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_discount], [
             'class' => 'btn btn-danger',
             'data' => [
                 'confirm' => Yii::t('common/discount', 'Are you sure you want to delete this item?'),
diff --git a/common/components/Helper.php b/common/components/Helper.php
new file mode 100644
index 0000000..b705b20
--- /dev/null
+++ b/common/components/Helper.php
@@ -0,0 +1,16 @@
+<?php
+namespace common\components;
+
+use yii\base\InvalidConfigException;
+use Yii;
+use yii\base\Model;
+
+class Helper
+{
+
+	public static function hufRound($m){
+		$result =  round($m/5, 0) * 5;
+		return $result;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 47ca74b..ad0812e 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -237,7 +237,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
      * @param $currency common\models\Currency
      * @param $product common\models\Product
      * */
-    public static function createProductTransfer($account, $discount, $currency, $count,$product ){
+    public static function createProductTransfer($account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID){
     	$transfer = new Transfer();
     	
     	$transfer->type = Transfer::TYPE_PRODUCT;
@@ -262,6 +262,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     		$transfer->money_currency = Currency::applyCurrency($totalPrice, $currency);
     	}
     	
+    	$transfer->direction = Transfer::DIRECTION_IN;
+    	$transfer->status = $status;
+    	
     	$transfer->id_account = $account->id_account;
     	
     	return $transfer;
diff --git a/console/migrations/m151020_164936_alter__table__discount__timestamps.php b/console/migrations/m151020_164936_alter__table__discount__timestamps.php
new file mode 100644
index 0000000..d9ebb16
--- /dev/null
+++ b/console/migrations/m151020_164936_alter__table__discount__timestamps.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151020_164936_alter__table__discount__timestamps extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('discount', 'created_at', 'datetime' );
+    	$this->alterColumn('discount', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151020_164936_alter__table__discount__timestamps cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 524f2a5..3085f80 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -60,7 +60,6 @@ class ProductSaleForm extends Model
             [['id_currency' ], 'validateCurrency'],
             [['id_account' ], 'validateAccount'],
             [['id_discount' ], 'validateDiscount'],
-            [['id_discount' ], 'validateDiscount'],
         ];
     }
 
@@ -130,6 +129,10 @@ class ProductSaleForm extends Model
     	return false;
     }
     
+//     protected function applyDiscount(){
+//     	Discount::applyDiscount($this->, $discount);
+//     }
+    
     protected function saveTransfer(){
     	
     	$this->transfer =  Transfer::createProductTransfer($this->account, $this->discount, $this->currency, $this->count,   $this->product);
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 0a719b5..e734e23 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -368,7 +368,7 @@ function ProductSell(o){
 	function findDiscount(id_discount){
 		var discount;
 		discount = null;
-		$.each( app.defaults.discounts , function(e,i){
+		$.each( app.defaults.discounts , function(i,e){
 			if ( e.id_discount == id_discount ){
 				discount = e;
 			}

From baf7c79d04797a2d932e1927a73e47a05debe317 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 21 Oct 2015 08:30:30 +0200
Subject: [PATCH 048/100] add new tables: customer_cart, sale, alter timestamp
 fields in tables

---
 ...51021_055338_add__table__customer_cart.php | 40 ++++++++++++++
 .../m151021_060337_add__table__sale.php       | 55 +++++++++++++++++++
 ..._transfer__timestamp__fields__to__date.php | 31 +++++++++++
 ...ble__card__timestamp__fields__to__date.php | 31 +++++++++++
 ..._currency__timestamp__fields__to__date.php | 31 +++++++++++
 ..._customer__timestamp__fields__to__date.php | 31 +++++++++++
 ...ocurement__timestamp__fields__to__date.php | 31 +++++++++++
 ...__product__timestamp__fields__to__date.php | 31 +++++++++++
 ..._category__timestamp__fields__to__date.php | 31 +++++++++++
 ...cket_type__timestamp__fields__to__date.php | 31 +++++++++++
 ...warehouse__timestamp__fields__to__date.php | 31 +++++++++++
 11 files changed, 374 insertions(+)
 create mode 100644 console/migrations/m151021_055338_add__table__customer_cart.php
 create mode 100644 console/migrations/m151021_060337_add__table__sale.php
 create mode 100644 console/migrations/m151021_061514_alter__table__transfer__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_061653_alter__table__card__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_061831_alter__table__currency__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_061918_alter__table__customer__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_062026_alter__table__procurement__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_062249_alter__table__product__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_062314_alter__table__product_category__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_062520_alter__table__ticket_type__timestamp__fields__to__date.php
 create mode 100644 console/migrations/m151021_062816_alter__table__warehouse__timestamp__fields__to__date.php

diff --git a/console/migrations/m151021_055338_add__table__customer_cart.php b/console/migrations/m151021_055338_add__table__customer_cart.php
new file mode 100644
index 0000000..3527fba
--- /dev/null
+++ b/console/migrations/m151021_055338_add__table__customer_cart.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_055338_add__table__customer_cart extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%shopping_cart}}', [
+    			'id_shopping_cart' => $this->primaryKey(),
+    			'id_customer' =>  $this->integer(11) ,
+    			'id_sale' =>  $this->integer(11) ,
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151021_055338_add__table__customer_cart cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_060337_add__table__sale.php b/console/migrations/m151021_060337_add__table__sale.php
new file mode 100644
index 0000000..e703a13
--- /dev/null
+++ b/console/migrations/m151021_060337_add__table__sale.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_060337_add__table__sale extends Migration
+{
+    public function up()
+    {
+
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%sale}}', [
+    			'id_sale' => $this->primaryKey(),
+    			'id_discount' => $this->integer(11) ,
+    			'id_currency' => $this->integer(11) ,
+    			'id_discount' => $this->integer(11) ,
+    			'id_product' => $this->integer(11) ,
+    			'status' => $this->smallInteger(),
+    			'type' => $this->smallInteger(),
+    			'item_price' => $this->integer(11),
+    			'count' => $this->integer(11),
+    			'money' => $this->integer(11),
+    			'money_currency' => $this->integer(11),
+    			'rate' => $this->integer(11),
+    			'id_user' => $this->integer(11),
+    			'comment' => $this->string(255),
+    			'created_at' => $this->dateTime()->notNull(),
+    			'updated_at' =>  $this->dateTime()->notNull(),
+    	], $tableOptions);
+    	
+    }
+
+    public function down()
+    {
+        echo "m151021_060337_add__table__sale cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_061514_alter__table__transfer__timestamp__fields__to__date.php b/console/migrations/m151021_061514_alter__table__transfer__timestamp__fields__to__date.php
new file mode 100644
index 0000000..eb2a286
--- /dev/null
+++ b/console/migrations/m151021_061514_alter__table__transfer__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_061514_alter__table__transfer__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('transfer', 'created_at', 'datetime' );
+    	$this->alterColumn('transfer', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_061514_alter__table__transfer__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_061653_alter__table__card__timestamp__fields__to__date.php b/console/migrations/m151021_061653_alter__table__card__timestamp__fields__to__date.php
new file mode 100644
index 0000000..3275664
--- /dev/null
+++ b/console/migrations/m151021_061653_alter__table__card__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_061653_alter__table__card__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('card', 'created_at', 'datetime' );
+    	$this->alterColumn('card', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_061653_alter__table__card__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_061831_alter__table__currency__timestamp__fields__to__date.php b/console/migrations/m151021_061831_alter__table__currency__timestamp__fields__to__date.php
new file mode 100644
index 0000000..b4931cb
--- /dev/null
+++ b/console/migrations/m151021_061831_alter__table__currency__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_061831_alter__table__currency__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('currency', 'created_at', 'datetime' );
+    	$this->alterColumn('currency', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_061831_alter__table__currency__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_061918_alter__table__customer__timestamp__fields__to__date.php b/console/migrations/m151021_061918_alter__table__customer__timestamp__fields__to__date.php
new file mode 100644
index 0000000..296b188
--- /dev/null
+++ b/console/migrations/m151021_061918_alter__table__customer__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_061918_alter__table__customer__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('customer', 'created_at', 'datetime' );
+    	$this->alterColumn('customer', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_061918_alter__table__customer__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_062026_alter__table__procurement__timestamp__fields__to__date.php b/console/migrations/m151021_062026_alter__table__procurement__timestamp__fields__to__date.php
new file mode 100644
index 0000000..984504b
--- /dev/null
+++ b/console/migrations/m151021_062026_alter__table__procurement__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_062026_alter__table__procurement__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('procurement', 'created_at', 'datetime' );
+    	$this->alterColumn('procurement', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_062026_alter__table__procurement__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_062249_alter__table__product__timestamp__fields__to__date.php b/console/migrations/m151021_062249_alter__table__product__timestamp__fields__to__date.php
new file mode 100644
index 0000000..5cfda93
--- /dev/null
+++ b/console/migrations/m151021_062249_alter__table__product__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_062249_alter__table__product__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('product', 'created_at', 'datetime' );
+    	$this->alterColumn('product', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_062249_alter__table__product__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_062314_alter__table__product_category__timestamp__fields__to__date.php b/console/migrations/m151021_062314_alter__table__product_category__timestamp__fields__to__date.php
new file mode 100644
index 0000000..6bab311
--- /dev/null
+++ b/console/migrations/m151021_062314_alter__table__product_category__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_062314_alter__table__product_category__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('product_category', 'created_at', 'datetime' );
+    	$this->alterColumn('product_category', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_062314_alter__table__product_category__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_062520_alter__table__ticket_type__timestamp__fields__to__date.php b/console/migrations/m151021_062520_alter__table__ticket_type__timestamp__fields__to__date.php
new file mode 100644
index 0000000..33617ca
--- /dev/null
+++ b/console/migrations/m151021_062520_alter__table__ticket_type__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_062520_alter__table__ticket_type__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('ticket_type', 'created_at', 'datetime' );
+    	$this->alterColumn('ticket_type', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_062520_alter__table__ticket_type__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151021_062816_alter__table__warehouse__timestamp__fields__to__date.php b/console/migrations/m151021_062816_alter__table__warehouse__timestamp__fields__to__date.php
new file mode 100644
index 0000000..697eec9
--- /dev/null
+++ b/console/migrations/m151021_062816_alter__table__warehouse__timestamp__fields__to__date.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_062816_alter__table__warehouse__timestamp__fields__to__date extends Migration
+{
+    public function up()
+    {
+    	$this->alterColumn('warehouse', 'created_at', 'datetime' );
+    	$this->alterColumn('warehouse', 'updated_at', 'datetime' );
+    }
+
+    public function down()
+    {
+        echo "m151021_062816_alter__table__warehouse__timestamp__fields__to__date cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 23a0390a27661a743831728ab7ea243f51c0b4f8 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 21 Oct 2015 17:57:16 +0200
Subject: [PATCH 049/100] add customer cart

---
 common/components/CurrencyAwareBehavior.php   |  24 +++
 common/components/DiscountAwareBehavior.php   |  25 +++
 common/components/ProductAwareBehavior.php    |  25 +++
 common/components/SaleAwareBehavior.php       |  24 +++
 common/models/Sale.php                        | 143 ++++++++++++++++++
 common/models/ShoppingCart.php                |  66 ++++++++
 common/models/Transfer.php                    |  22 ++-
 ...20_alter__table__sale__add__id_account.php |  30 ++++
 frontend/controllers/ProductController.php    |   6 +-
 frontend/models/ProductSaleForm.php           |  49 +++++-
 frontend/views/product/_customer_cart.php     |  36 +++++
 frontend/views/product/_sale_form.php         |   9 +-
 frontend/views/product/sale.php               |   8 +-
 frontend/web/js/product.sell.js               |  16 ++
 14 files changed, 467 insertions(+), 16 deletions(-)
 create mode 100644 common/components/CurrencyAwareBehavior.php
 create mode 100644 common/components/DiscountAwareBehavior.php
 create mode 100644 common/components/ProductAwareBehavior.php
 create mode 100644 common/components/SaleAwareBehavior.php
 create mode 100644 common/models/Sale.php
 create mode 100644 common/models/ShoppingCart.php
 create mode 100644 console/migrations/m151021_091320_alter__table__sale__add__id_account.php
 create mode 100644 frontend/views/product/_customer_cart.php

diff --git a/common/components/CurrencyAwareBehavior.php b/common/components/CurrencyAwareBehavior.php
new file mode 100644
index 0000000..18f9380
--- /dev/null
+++ b/common/components/CurrencyAwareBehavior.php
@@ -0,0 +1,24 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Currency;
+
+class CurrencyAwareBehavior extends Behavior{
+	
+	
+	public function getCurrencyName(){
+		$result = "";
+		$currency = $this->owner->currency;
+		if (isset($currency)){
+			$result  = $currency->name;
+		}
+		return $result;
+	}
+
+	
+	public function getCurrency(){
+		return $this->owner->hasOne( Currency::className(), ["id_currency" =>"id_currency" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/DiscountAwareBehavior.php b/common/components/DiscountAwareBehavior.php
new file mode 100644
index 0000000..68ccdc3
--- /dev/null
+++ b/common/components/DiscountAwareBehavior.php
@@ -0,0 +1,25 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Account;
+use common\models\Discount;
+
+class DiscountAwareBehavior extends Behavior{
+	
+	
+	public function getDiscountName(){
+		$result = "";
+		$discount = $this->owner->discount;
+		if (isset($discount)){
+			$result  = $discount->name;
+		}
+		return $result;
+	}
+
+	
+	public function getDiscount(){
+		return $this->owner->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/ProductAwareBehavior.php b/common/components/ProductAwareBehavior.php
new file mode 100644
index 0000000..da4427b
--- /dev/null
+++ b/common/components/ProductAwareBehavior.php
@@ -0,0 +1,25 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Account;
+use common\models\Product;
+
+class ProductAwareBehavior extends Behavior{
+	
+	/** @var $product common\models\Product*/
+	public function getProductName(){
+		$result = "";
+		$product = $this->owner->product;
+		if (isset($product)){
+			$result  = $product->name;
+		}
+		return $result;
+	}
+
+	
+	public function getProduct(){
+		return $this->owner->hasOne( Product::className(), ["id_product" =>"id_product" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/components/SaleAwareBehavior.php b/common/components/SaleAwareBehavior.php
new file mode 100644
index 0000000..cc934bc
--- /dev/null
+++ b/common/components/SaleAwareBehavior.php
@@ -0,0 +1,24 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Sale;
+
+class SaleAwareBehavior extends Behavior{
+	
+	
+	public function getSaleName(){
+		$result = "";
+		$sale = $this->owner->sale;
+		if (isset($sale)){
+			$result  = $sale->name;
+		}
+		return $result;
+	}
+
+	
+	public function getSale(){
+		return $this->owner->hasOne( Sale::className(), ["id_sale" =>"id_sale" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/models/Sale.php b/common/models/Sale.php
new file mode 100644
index 0000000..d3a6e5c
--- /dev/null
+++ b/common/models/Sale.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+use common\components\AccountAwareBehavior;
+use common\components\UserAwareBehavior;
+use common\components\DiscountAwareBehavior;
+use yii\helpers\ArrayHelper;
+use common\components\ProductAwareBehavior;
+use common\components\CurrencyAwareBehavior;
+
+/**
+ * This is the model class for table "sale".
+ *
+ * @property integer $id_sale
+ * @property integer $id_account
+ * @property integer $id_discount
+ * @property integer $id_currency
+ * @property integer $id_product
+ * @property integer $status
+ * @property integer $type
+ * @property integer $item_price
+ * @property integer $count
+ * @property integer $money
+ * @property integer $money_currency
+ * @property integer $rate
+ * @property integer $id_user
+ * @property string $comment
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Sale extends \yii\db\ActiveRecord
+{
+	const TYPE_PRODUCT = 10;
+	
+	const STATUS_NOT_PAID = 10;
+	const STATUS_PAID = 20;
+	
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'sale';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+        ];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return ArrayHelper::merge(  [
+    			[
+    			'class' => TimestampBehavior::className(),
+    			'value' => function(){ return date('Y-m-d H:i:s' ); }
+    	],
+    	[
+    	'class' => AccountAwareBehavior::className(),
+    	],
+    	[
+    	'class' => UserAwareBehavior::className(),
+    	],
+    	[
+    	'class' => DiscountAwareBehavior::className(),
+    	],
+    	[
+    	'class' => ProductAwareBehavior::className(),
+    	],
+    	[
+    	'class' => CurrencyAwareBehavior::className(),
+    	],
+    	], parent::behaviors());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_sale' => Yii::t('common/sale', 'Id Sale'),
+            'id_discount' => Yii::t('common/sale', 'Id Discount'),
+            'id_currency' => Yii::t('common/sale', 'Id Currency'),
+            'id_product' => Yii::t('common/sale', 'Id Product'),
+            'status' => Yii::t('common/sale', 'Status'),
+            'type' => Yii::t('common/sale', 'Type'),
+            'item_price' => Yii::t('common/sale', 'Item Price'),
+            'count' => Yii::t('common/sale', 'Count'),
+            'money' => Yii::t('common/sale', 'Money'),
+            'money_currency' => Yii::t('common/sale', 'Money Currency'),
+            'rate' => Yii::t('common/sale', 'Rate'),
+            'id_user' => Yii::t('common/sale', 'Id User'),
+            'comment' => Yii::t('common/sale', 'Comment'),
+            'created_at' => Yii::t('common/sale', 'Created At'),
+            'updated_at' => Yii::t('common/sale', 'Updated At'),
+        ];
+    }
+    
+    
+    public static function createSale($account, $discount, $currency, $count,$product , $status = Sale::STATUS_PAID){
+    	$sale = new Sale();
+    	 
+    	$sale->type = Sale::TYPE_PRODUCT;
+    	 
+    	$sale->id_product  = $product->id_product;
+    	 
+    	$sale->item_price = $product->sale_price;
+    	$totalPrice = $sale->item_price;
+    	 
+    	$sale->count = $count;
+    	$totalPrice = $totalPrice * $count;
+    	 
+    	if ( isset( $discount ) ){
+    		$sale->id_discount = $discount->id_discount;
+    		$totalPrice =  Discount::applyDiscount( $totalPrice, $discount);
+    	}
+    	 
+    	$sale->money = $totalPrice;
+    	 
+    	if ( isset( $currency ) ){
+    		$sale->rate = $currency->rate;
+    		$sale->money_currency = Currency::applyCurrency($totalPrice, $currency);
+    	}
+    	 
+    	$sale->status = $status;
+    	 
+    	$sale->id_account = $account->id_account;
+    	 
+    	return $sale;
+    }
+    
+}
diff --git a/common/models/ShoppingCart.php b/common/models/ShoppingCart.php
new file mode 100644
index 0000000..5af2b9b
--- /dev/null
+++ b/common/models/ShoppingCart.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "shopping_cart".
+ *
+ * @property integer $id_shopping_cart
+ * @property integer $id_customer
+ * @property integer $id_sale
+ */
+class ShoppingCart extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'shopping_cart';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_customer', 'id_sale'], 'integer']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_shopping_cart' => Yii::t('common/shopping-cart', 'Id Shopping Cart'),
+            'id_customer' => Yii::t('common/shopping-cart', 'Id Customer'),
+            'id_sale' => Yii::t('common/shopping-cart', 'Id Sale'),
+        ];
+    }
+    
+    public function getSale(){
+    	$this->hasOne(Sale::className(), ['id_sale' => 'id_sale']);
+    }
+    public function getProduct(){
+    	$this->hasOne(Product::className(), ['id_product' => 'id_product'])->via('sale');
+    }
+    
+    /**
+     * @param $customer common\models\Customer
+     * */
+    public static function readCustomerCart($customer = null){
+    	$sales = [];
+    	if ( isset($customer)){
+	    	$query  = ShoppingCart::find()->andWhere( ['id_customer' => $customer->id_customer] );
+	    	$query->with('product');
+	    	$sales = $query->all();	
+    	}
+    	return $sales;
+    }
+    
+}
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index ad0812e..037bfbc 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -114,7 +114,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     }
     
     public function getProduct(){
-    	return $this->hasOne( Product::className(), ["id_product" =>"id_object" ] );
+    	return $this->hasOne( Product::className(), ["id_product" =>"id_product" ] )->via('sale');
     }
     public function getMoneyMovement(){
     	return $this->hasOne( MoneyMovement::className(), ["id_money_movement" =>"id_object" ] );
@@ -144,6 +144,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
     }
     
+    public function getSale(){
+    	return $this->hasOne( Sale::className(), ["id_sale" =>"id_object" ] ) ;
+    }
+    
     public function getObjectName(){
     	$result = "";
     	if ( $this->type == Transfer::TYPE_TICKET ){
@@ -206,6 +210,18 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $result;
     }
     
+    
+    public function getSaleName(){
+    	$result = "";
+    	$sale = $this->sale;
+    	if (isset($sale)){
+    		$result  = $sale->name;
+    	}
+    	return $result;
+    }
+    
+    
+    
     public function  getSignedMoney(){
     	$m = 1;
     	$result = $this->money;
@@ -237,12 +253,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
      * @param $currency common\models\Currency
      * @param $product common\models\Product
      * */
-    public static function createProductTransfer($account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID){
+    public static function createProductTransfer($sale,$account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID){
     	$transfer = new Transfer();
     	
     	$transfer->type = Transfer::TYPE_PRODUCT;
     	
-    	$transfer->id_object  = $product->id_product;
+    	$transfer->id_object  = $sale->id_sale;
     	
     	$transfer->item_price = $product->sale_price; 
     	$totalPrice = $transfer->item_price; 
diff --git a/console/migrations/m151021_091320_alter__table__sale__add__id_account.php b/console/migrations/m151021_091320_alter__table__sale__add__id_account.php
new file mode 100644
index 0000000..6fd73b2
--- /dev/null
+++ b/console/migrations/m151021_091320_alter__table__sale__add__id_account.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_091320_alter__table__sale__add__id_account extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn("sale", "id_account", "integer(11)");
+    }
+
+    public function down()
+    {
+        echo "m151021_091320_alter__table__sale__add__id_account cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index e39b015..3202a6e 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -20,6 +20,7 @@ use common\models\Discount;
 use common\models\Transfer;
 use common\models\User;
 use common\models\UserSoldItem;
+use common\models\ShoppingCart;
 
 /**
  * ProductController implements the CRUD actions for Product model.
@@ -71,6 +72,8 @@ class ProductController extends Controller
     	
     	$user = User::findOne(Yii::$app->user->id ); 
     	
+    	$model->customer = $this->customer;
+    	
     	if (Yii::$app->request->isAjax) {
     		
     		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
@@ -103,6 +106,7 @@ class ProductController extends Controller
     		
 //     		$userTransfers = Transfer::readUserSoldTransfers( $user );
     		$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+    		$model->customerCart = ShoppingCart::readCustomerCart(	$this->customer	);
     		
 	    	return $this->render("sale",[
 	    			'customer' => $this->customer,
@@ -112,7 +116,7 @@ class ProductController extends Controller
 	    			'currencies' => $currencies,
 	    			'accounts' => $accounts,
 	    			'discounts' => $discounts,
-	    			'userTransfers' => $userTransfers
+	    			'userTransfers' => $userTransfers,
 	    	]);
     	}
     	
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 3085f80..f49502c 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -13,6 +13,8 @@ use common\models\Account;
 use common\models\Discount;
 use common\models\Currency;
 use common\models\UserSoldItem;
+use common\models\Sale;
+use common\models\ShoppingCart;
 
 /**
  * ContactForm is the model behind the contact form.
@@ -42,8 +44,12 @@ class ProductSaleForm extends Model
 	public $account;
 	public $currency;
 	public $discount;
+	public $customer;
 	
 	public $transfer;
+	public $sale;
+	
+	public $customerCart;
 	
     /**
      * @inheritdoc
@@ -121,21 +127,32 @@ class ProductSaleForm extends Model
     
     public function save(){
     	if ( $this->validate() ){
+    		$this->saveSale();
 	    	$this->saveTransfer();
 	    	$this->saveProduct();
-	    	$this->appendToSoldList();
+	    	$this->appendToUserCart();
+	    	$this->appendToCustomerCart();
 	    	return true;
     	} 
     	return false;
     }
     
-//     protected function applyDiscount(){
-//     	Discount::applyDiscount($this->, $discount);
-//     }
+    
+    protected function saveSale(){
+    	$this->sale =  Sale::createSale($this->account, $this->discount, $this->currency, $this->count,   $this->product);
+    	/*
+ 		*/
+    	$this->sale->status = Sale::STATUS_PAID;
+    	if ( isset($this->comment)){
+ 			$this->sale->comment = $this->comment;
+    	}
+ 		$this->sale->id_user = Yii::$app->user->id;
+ 		$this->sale->save();
+    }
     
     protected function saveTransfer(){
     	
-    	$this->transfer =  Transfer::createProductTransfer($this->account, $this->discount, $this->currency, $this->count,   $this->product);
+    	$this->transfer =  Transfer::createProductTransfer($this->sale,$this->account, $this->discount, $this->currency, $this->count,   $this->product);
     	/*
  		*/
     	$this->transfer->status = Transfer::STATUS_PAID;
@@ -151,7 +168,7 @@ class ProductSaleForm extends Model
     	$this->product->save();
     }
     
-    public function isAppendToList(){
+    public function isAppendToUserCart(){
     	$result = false;
     	if ( isset( $this->append_to_sold_list )  && $this->append_to_sold_list  == 'append' ){
     		$result = true;
@@ -159,12 +176,28 @@ class ProductSaleForm extends Model
     	return $result;
     }
     
-    public function appendToSoldList(){
-    	if ( $this->isAppendToList() ){
+    public function appendToUserCart(){
+    	if ( $this->isAppendToUserCart() ){
     		$item = new UserSoldItem();
     		$item->id_transfer = $this->transfer->id_transfer;
     		$item->id_user = Yii::$app->user->id;
     		$item->save(false);
     	}
     }
+    public function isAppendToCustomerCart(){
+    	$result = false;
+    	if ( isset( $this->add_to_customer )  && $this->add_to_customer  == 'append' ){
+    		$result = true;
+    	}
+    	return $result;
+    }
+    
+    public function appendToCustomerCart(){
+    	if ( $this->isAppendToCustomerCart() && isset($this->customer)  ){
+    		$item = new ShoppingCart();
+    		$item->id_customer = $this->customer->id_customer;
+    		$item->id_sale = $this->sale->id_sale;
+    		$item->save(false);
+    	}
+    }
 }
diff --git a/frontend/views/product/_customer_cart.php b/frontend/views/product/_customer_cart.php
new file mode 100644
index 0000000..b5b5dd6
--- /dev/null
+++ b/frontend/views/product/_customer_cart.php
@@ -0,0 +1,36 @@
+<?php
+use yii\bootstrap\Html;
+?>
+
+
+<h1><?php  echo Yii::t('frontend/product','Customer cart')?></h1>
+<div class="row">
+	<div class='col-md-12 '>
+		<div class="customer-cart">
+		<table class="table table-bordered table-striped">
+			<thead>
+				<tr>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Product name')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Count')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Currency')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Item Price')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Total Price')?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+		</div>
+	</div>
+</div>
+<?php echo Html::a(Yii::t('frontend/product', "Fizetve"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index 60c9a03..3c23e63 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -97,11 +97,14 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 		</div>
 	</div>
 	<div class="row">
-		<div class='col-md-5'>
+		<div class='col-md-4'>
 			<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success', 'id' => 'btn_sell'] );?>
 		</div>
-		<div class='col-md-7'>
-			<?php echo Html::a(Yii::t("frontend/product","Sell product and add to total"),null,['class' => 'btn btn-success', 'id' => 'btn_sell_append'] );?>
+		<div class='col-md-4'>
+			<?php echo Html::a(Yii::t("frontend/product","To cart"),null,['class' => 'btn btn-success', 'id' => 'btn_sell_append'] );?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success', 'id' => 'btn_add_to_customer_cart'] );?>
 		</div>
 	</div>
 <?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 602350e..0173e78 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -74,11 +74,17 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 	<div class='row '>
 		<div class='col-md-6 product-form'>
 			<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
-			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts,]) ?>	
+			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts ]) ?>	
 		</div>
 		<div class='col-md-6'>
+			<?php echo $this->render('_customer_cart' ) ?>
+			
 			<h1><?php  echo Yii::t('frontend/product','Cart')?></h1>
 			<?php echo $this->render('_sold_items' ) ?>
 			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
+			
+			
+			
+			
 		</div>
 	</div>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index e734e23..b58e6db 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -20,6 +20,7 @@ function ProductSell(o){
 	    /**list of sold items by current user*/
 	    sold_items: [],
 	    discounts: [],
+	    customer_cart: []
 	};
 	
 	init();
@@ -37,6 +38,7 @@ function ProductSell(o){
 		addBehaviorCountChangedListener();
 		addBehaviourDisocuntChanged();
 		createUserSoldItemsTable();
+		createCustomerCartTable();
 		addBehaviourBtnPaid();
 		productChanged();
 		addDocumentKeypressedListener();
@@ -269,6 +271,10 @@ function ProductSell(o){
 	function addBehaviourBtnSellAndAppendToBill(){
 		$('#btn_sell_append').on('click',submitSellAndAppend);
 	}
+
+	function addBehaviourBtnAddToCustomerCart(){
+		$('#btn_add_to_customer_cart').on('click',submitAddToCustomerCart);
+	}
 	
 	function submitSell(){
 		$('#productsaleform-append_to_sold_list').val('');
@@ -280,6 +286,11 @@ function ProductSell(o){
 	}
 	
 	
+	function submitAddToCustomerCart(){
+		$('#productsaleform-append_to_sold_list').val('append');
+		$('#product_form').submit();
+	}
+	
 	function refreshSoldUseritems(){
 		$('.sold-items-container').transferList('option','transfers' , app.defaults.sold_items );
 	}
@@ -364,6 +375,11 @@ function ProductSell(o){
 			'transfers' : app.defaults.sold_items
 		});
 	}
+	function createCustomerCartTable(){
+		$('.customer-cart').transferList({
+			'transfers' : app.defaults.customer_cart
+		});
+	}
 	
 	function findDiscount(id_discount){
 		var discount;

From 0c92fdf167cc7d60defc531130b63c8ea83e6a73 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 23 Oct 2015 20:39:10 +0200
Subject: [PATCH 050/100] add customer cart

---
 common/models/ShoppingCart.php                |  33 +++--
 common/models/Transfer.php                    |  16 ++
 ...lter__column__id_sale__to__id_transfer.php |  30 ++++
 frontend/controllers/ProductController.php    |  44 +++++-
 frontend/models/ProductSaleForm.php           |  74 ++++++---
 frontend/views/product/_customer_cart.php     |   2 +-
 frontend/views/product/_sale_form.php         |   9 +-
 .../{_sold_items.php => _user_cart.php}       |   5 +-
 frontend/views/product/sale.php               |  20 +--
 frontend/web/js/product.sell.js               | 140 +++++++++++++-----
 frontend/web/js/transferlist.js               |   1 -
 11 files changed, 293 insertions(+), 81 deletions(-)
 create mode 100644 console/migrations/m151021_204300_alter__table__shopping_cart__alter__column__id_sale__to__id_transfer.php
 rename frontend/views/product/{_sold_items.php => _user_cart.php} (74%)

diff --git a/common/models/ShoppingCart.php b/common/models/ShoppingCart.php
index 5af2b9b..5349e7d 100644
--- a/common/models/ShoppingCart.php
+++ b/common/models/ShoppingCart.php
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $id_shopping_cart
  * @property integer $id_customer
- * @property integer $id_sale
+ * @property integer $id_transfer
  */
 class ShoppingCart extends \yii\db\ActiveRecord
 {
@@ -27,7 +27,7 @@ class ShoppingCart extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['id_customer', 'id_sale'], 'integer']
+            [['id_customer', 'id_transfer'], 'integer']
         ];
     }
 
@@ -39,28 +39,43 @@ class ShoppingCart extends \yii\db\ActiveRecord
         return [
             'id_shopping_cart' => Yii::t('common/shopping-cart', 'Id Shopping Cart'),
             'id_customer' => Yii::t('common/shopping-cart', 'Id Customer'),
-            'id_sale' => Yii::t('common/shopping-cart', 'Id Sale'),
+            'id_transfer' => Yii::t('common/shopping-cart', 'Id Transfer'),
         ];
     }
     
-    public function getSale(){
-    	$this->hasOne(Sale::className(), ['id_sale' => 'id_sale']);
+    public function getTransfer(){
+    	return $this->hasOne(Transfer::className(), ['id_transfer' => 'id_transfer']);
     }
     public function getProduct(){
-    	$this->hasOne(Product::className(), ['id_product' => 'id_product'])->via('sale');
+    	return $this->hasOne(Product::className(), ['id_product' => 'id_product'])->via('transfer');
     }
     
     /**
      * @param $customer common\models\Customer
      * */
     public static function readCustomerCart($customer = null){
-    	$sales = [];
+    	$transfers = [];
     	if ( isset($customer)){
 	    	$query  = ShoppingCart::find()->andWhere( ['id_customer' => $customer->id_customer] );
 	    	$query->with('product');
-	    	$sales = $query->all();	
+	    	$transfers = $query->all();	
     	}
-    	return $sales;
+    	return $transfers;
+    }
+    
+    public static function payout( $customer) {
+    	//apply transfer object
+    	//delete cart
+    	$sql = "UPDATE transfer AS t
+				INNER JOIN shopping_cart AS s ON t.id_transfer = s.id_transfer
+				SET t.status = "  . Transfer::STATUS_PAID
+				. " WHERE  t.status = " . Transfer::STATUS_NOT_PAID;
+    	
+    	$q1 = Yii::$app->db->createCommand($sql);
+    	$q1->execute();
+    	
+    	ShoppingCart::deleteAll(['id_customer' => $customer->id_customer]);
+    	
     }
     
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 037bfbc..7c4b6cb 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -144,6 +144,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
     }
     
+    public function getCustomerCart(){
+    	return $this->hasOne( ShoppingCart::className(), ["id_transfer" =>"id_transfer" ] );
+    }
+    
     public function getSale(){
     	return $this->hasOne( Sale::className(), ["id_sale" =>"id_object" ] ) ;
     }
@@ -398,6 +402,18 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	return $transfers;
     }
+    public static function readCustomerCart($customer){
+    	$transfers = [];
+    	
+    	if ( isset($customer) ){
+	    	$query = Transfer::find();
+	    	$query->innerJoinWith('customerCart');
+	    	$query->andWhere(['shopping_cart.id_customer' => $customer->id_customer ]);
+	    	$transfers = $query->all();
+    	}
+    	
+    	return $transfers;
+    }
     
     public static function types( ) {
     	return [
diff --git a/console/migrations/m151021_204300_alter__table__shopping_cart__alter__column__id_sale__to__id_transfer.php b/console/migrations/m151021_204300_alter__table__shopping_cart__alter__column__id_sale__to__id_transfer.php
new file mode 100644
index 0000000..d22b463
--- /dev/null
+++ b/console/migrations/m151021_204300_alter__table__shopping_cart__alter__column__id_sale__to__id_transfer.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151021_204300_alter__table__shopping_cart__alter__column__id_sale__to__id_transfer extends Migration
+{
+    public function up()
+    {
+    	$this->renameColumn("shopping_cart", "id_sale", "id_transfer");
+    }
+
+    public function down()
+    {
+        echo "m151021_204300_alter__table__sale__alter__column__id_sale__to__id_transfer cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 3202a6e..c135d35 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -42,7 +42,7 @@ class ProductController extends Controller
             ],
         		'access' => [
         				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'sale','clear-list', 'lookup'],
+        				'only' => [   'sale','payout-customer-cart','payout-user-cart', 'lookup'],
         				'rules' => [
         						// allow authenticated users
         						[
@@ -73,6 +73,7 @@ class ProductController extends Controller
     	$user = User::findOne(Yii::$app->user->id ); 
     	
     	$model->customer = $this->customer;
+    	$model->card = $this->card;
     	
     	if (Yii::$app->request->isAjax) {
     		
@@ -97,16 +98,18 @@ class ProductController extends Controller
 	     		}
 	     	}
 
-	     	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+	     	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers( $user ) );
+	     	$customerCart = Transfer::modelsToArray( Transfer::readCustomerCart( $this->customer ) );
 	     	$result['transfers'] = $userTransfers;
+	     	$result['customer_cart'] = $customerCart;
 	     	
     		return $result;
     	
     	}else{
     		
 //     		$userTransfers = Transfer::readUserSoldTransfers( $user );
+    		$model->customerCart = Transfer::modelsToArray( Transfer::readCustomerCart($this->customer) );
     		$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
-    		$model->customerCart = ShoppingCart::readCustomerCart(	$this->customer	);
     		
 	    	return $this->render("sale",[
 	    			'customer' => $this->customer,
@@ -122,7 +125,7 @@ class ProductController extends Controller
     	
     }
     
-    public function actionClearList(){
+    public function actionPayoutUserCart(){
     	
     	if (Yii::$app->request->isAjax) {    	
     		$result = [];
@@ -140,6 +143,39 @@ class ProductController extends Controller
     	}
     	
     }
+    public function actionPayoutCustomerCart($number){
+    	
+    	$cart = [];
+    	$code = 'error';
+    	$message = 'Hiba történt';
+    	
+    	if (Yii::$app->request->isAjax) {    	
+    		$result = [];
+    		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    		
+    		$this->findByNumber($number);
+    	
+    		if ( isset($this->customer)){
+    			$connection = \Yii::$app->db;
+    			$transaction = $connection->beginTransaction();
+    			try {
+		   			ShoppingCart::payout($this->customer);
+		   			$transaction->commit();
+		    		$cart = Transfer::modelsToArray( Transfer::readCustomerCart($this->customer) );
+		    		$code =  'success';
+		   			$message = 'Bevásárlókoosár fizetve: ' .$this->card->number;
+		   		} catch(Exception $e) {
+		   			$transaction->rollback();
+		   		}
+    		}
+    		$result['customer_cart'] = $cart;
+    		$result['code'] = $code;
+    		$result['message'] = $message;
+    		
+    		return $result;
+    	}
+    	
+    }
     
     
 
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index f49502c..a71254f 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -18,11 +18,35 @@ use common\models\ShoppingCart;
 
 /**
  * ContactForm is the model behind the contact form.
+ * 
+ *  @property integer $id_product
+ *  @property integer $count
+ *  @property integer $id_currency
+ *  @property integer $id_discount
+ *  @property string $comment
+ *  @property string $barcode
+ *  @property string $product_number
+ *  @property integer $sale_price
+ *  @property string $product_name
+ *  @property common\models\Account[] $accounts
+ *  @property common\models\Currency[] $currencies
+ *  @property common\models\Discount[] $discounts
+ *  @property common\models\Product $product
+ *  @property common\models\Account $account
+ *  @property common\models\Currency $currency
+ *  @property common\models\Discount $discount
+ *  @property common\models\Customer $customer
+ *  @property common\models\Card $card
+ *  @property common\models\Transfer $transfer
+ *  @property common\models\Sale $sale
+ *  @property common\models\ShoppingCart[] $customerCart
+ *  
+ *  
  */
 class ProductSaleForm extends Model
 {
 	
-	public $append_to_sold_list;
+	public $cart;
 	
 	public $id_product;
 	public $count;
@@ -45,6 +69,7 @@ class ProductSaleForm extends Model
 	public $currency;
 	public $discount;
 	public $customer;
+	public $card;
 	
 	public $transfer;
 	public $sale;
@@ -60,7 +85,7 @@ class ProductSaleForm extends Model
             [['id_product','count','id_account'], 'required'],
             [['id_product','id_currency','id_account', 'id_discount','count'], 'integer'],
             [['comment'], 'string' ,'max' => 255],
-            [['append_to_sold_list'], 'string' ,'max' => 10],
+            [['cart'], 'string' ,'max' => 20],
             [['id_product' ], 'validateProduct'],
             [['count' ], 'validateCount'],
             [['id_currency' ], 'validateCurrency'],
@@ -127,11 +152,21 @@ class ProductSaleForm extends Model
     
     public function save(){
     	if ( $this->validate() ){
-    		$this->saveSale();
-	    	$this->saveTransfer();
-	    	$this->saveProduct();
-	    	$this->appendToUserCart();
-	    	$this->appendToCustomerCart();
+    		$connection = \Yii::$app->db;
+    		$transaction = $connection->beginTransaction();
+    		try {
+	    		$this->saveSale();
+		    	$this->saveTransfer();
+		    	$this->saveProduct();
+		    	$this->appendToUserCart();
+		    	$this->appendToCustomerCart();
+		    	$transaction->commit();
+		    	return true;
+	    	} catch(Exception $e) {
+	    		$transaction->rollback();
+	    		return false;
+	    	}
+	    	
 	    	return true;
     	} 
     	return false;
@@ -139,10 +174,8 @@ class ProductSaleForm extends Model
     
     
     protected function saveSale(){
-    	$this->sale =  Sale::createSale($this->account, $this->discount, $this->currency, $this->count,   $this->product);
-    	/*
- 		*/
-    	$this->sale->status = Sale::STATUS_PAID;
+    	
+    	$this->sale =  Sale::createSale($this->account, $this->discount, $this->currency, $this->count,   $this->product );
     	if ( isset($this->comment)){
  			$this->sale->comment = $this->comment;
     	}
@@ -151,11 +184,14 @@ class ProductSaleForm extends Model
     }
     
     protected function saveTransfer(){
+    	$status  = Transfer::STATUS_PAID;
+    	if (   $this->isAppendToUserCart() ){
+    		$status  = Transfer::STATUS_NOT_PAID;
+    	}else if ( $this->isAppendToCustomerCart() ){
+    		$status = Transfer::STATUS_NOT_PAID; 
+    	}
     	
-    	$this->transfer =  Transfer::createProductTransfer($this->sale,$this->account, $this->discount, $this->currency, $this->count,   $this->product);
-    	/*
- 		*/
-    	$this->transfer->status = Transfer::STATUS_PAID;
+    	$this->transfer =  Transfer::createProductTransfer($this->sale,$this->account, $this->discount, $this->currency, $this->count,   $this->product,$status);
     	if ( isset($this->comment)){
  			$this->transfer->comment = $this->comment;
     	}
@@ -170,7 +206,7 @@ class ProductSaleForm extends Model
     
     public function isAppendToUserCart(){
     	$result = false;
-    	if ( isset( $this->append_to_sold_list )  && $this->append_to_sold_list  == 'append' ){
+    	if ( isset( $this->cart )  && $this->cart  == 'user' ){
     		$result = true;
     	}
     	return $result;
@@ -186,17 +222,19 @@ class ProductSaleForm extends Model
     }
     public function isAppendToCustomerCart(){
     	$result = false;
-    	if ( isset( $this->add_to_customer )  && $this->add_to_customer  == 'append' ){
+    	if ( isset( $this->cart )  && $this->cart  == 'customer' ){
     		$result = true;
     	}
     	return $result;
     }
     
     public function appendToCustomerCart(){
+//     	print_r("cart: ".$this->cart );
+//     	print_r("customer:: ".$this->customer );
     	if ( $this->isAppendToCustomerCart() && isset($this->customer)  ){
     		$item = new ShoppingCart();
     		$item->id_customer = $this->customer->id_customer;
-    		$item->id_sale = $this->sale->id_sale;
+    		$item->id_transfer = $this->transfer->id_transfer;
     		$item->save(false);
     	}
     }
diff --git a/frontend/views/product/_customer_cart.php b/frontend/views/product/_customer_cart.php
index b5b5dd6..3ccf07d 100644
--- a/frontend/views/product/_customer_cart.php
+++ b/frontend/views/product/_customer_cart.php
@@ -33,4 +33,4 @@ use yii\bootstrap\Html;
 		</div>
 	</div>
 </div>
-<?php echo Html::a(Yii::t('frontend/product', "Fizetve"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
+<?php echo Html::a(Yii::t('frontend/product', "Fizetve"),null,[ 'id' => 'btn_pay_customer_cart', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index 3c23e63..ebd9850 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -69,7 +69,8 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 		]	
 	); ?>
 	<?php echo Html::activeHiddenInput($model, 'id_product') ?>
-	<?php echo Html::activeHiddenInput($model, 'append_to_sold_list') ?>
+	<?php echo Html::activeHiddenInput($model, 'cart') ?>
+	
 
 	<div class="row">
 		<div class='col-md-12'>
@@ -104,7 +105,11 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 			<?php echo Html::a(Yii::t("frontend/product","To cart"),null,['class' => 'btn btn-success', 'id' => 'btn_sell_append'] );?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success', 'id' => 'btn_add_to_customer_cart'] );?>
+			<?php 
+				if ( isset($model->card) ){
+					echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success', 'id' => 'btn_add_to_customer_cart'] );
+				}			
+			?>
 		</div>
 	</div>
 <?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/frontend/views/product/_sold_items.php b/frontend/views/product/_user_cart.php
similarity index 74%
rename from frontend/views/product/_sold_items.php
rename to frontend/views/product/_user_cart.php
index fddf34c..6b095ba 100644
--- a/frontend/views/product/_sold_items.php
+++ b/frontend/views/product/_user_cart.php
@@ -3,10 +3,10 @@ use yii\bootstrap\Html;
 ?>
 
 
-
+<h1><?php  echo Yii::t('frontend/product','User Cart')?></h1>
 <div class="row">
 	<div class='col-md-12 '>
-		<div class="sold-items-container">
+		<div class="user-cart">
 		<table class="table table-bordered table-striped">
 			<thead>
 				<tr>
@@ -33,3 +33,4 @@ use yii\bootstrap\Html;
 		</div>
 	</div>
 </div>
+<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 0173e78..66476a4 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -19,8 +19,12 @@ ProductSellAsset::register($this);
 $options = [];
 
 $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
-$options['clear_list_url'] = Url::toRoute(['product/clear-list']);
-$options['sold_items'] = $userTransfers;
+$options['url_pay_user_cart'] = Url::toRoute(['product/payout-user-cart']);
+$options['user_cart'] = $userTransfers;
+if ( isset($model->card) ){
+	$options['url_pay_customer_card'] = Url::toRoute(['product/payout-customer-cart','number' => $model->card->number]);
+	$options['customer_cart'] = $model->customerCart;
+}
 $options['discounts'] = Discount::modelsToArray($discounts);
 
 
@@ -77,14 +81,10 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts ]) ?>	
 		</div>
 		<div class='col-md-6'>
-			<?php echo $this->render('_customer_cart' ) ?>
-			
-			<h1><?php  echo Yii::t('frontend/product','Cart')?></h1>
-			<?php echo $this->render('_sold_items' ) ?>
-			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
-			
-			
-			
+			<?php if (  isset($card) ){ ?>
+				<?php echo $this->render('_customer_cart' ) ?>
+			<?php }?>
+			<?php echo $this->render('_user_cart' ) ?>
 			
 		</div>
 	</div>
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index b58e6db..c7f5055 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -3,24 +3,31 @@ function ProductSell(o){
 	/**reference for the instance*/
 	var app = this;
 	/**currently loaded product*/
-	var product = null;
+	this.product = null;
 	
 	this.defaults = {
 		/**id of filter text*/
 		selector_filter_text: '#filter_text',
+		/**selector for customer cart container*/
+		selector_customer_cart: '.customer-cart',
+		selector_user_cart: '.user-cart',
+		selector_btn_pay_customer_cart: '#btn_pay_customer_cart',
+		selector_btn_pay_user_cart: '#btn_pay_user_cart',
+		url_pay_customer_card: '-',
 		/** ajax url for lookup service*/
 		lookup_product_url: '',
 		/**mark list paid url*/
-		clear_list_url: '',
+		url_pay_user_cart: '',
 		/**the id of form*/
 	    selector_form: '#product_form',
 	    /**form contains error text*/
 	    form_invalid: 'Az ürlap hibákat tartalmaz',
 	    message_paid: 'Tételek fizetve',
 	    /**list of sold items by current user*/
-	    sold_items: [],
+	    user_cart: [],
 	    discounts: [],
-	    customer_cart: []
+	    customer_cart: [],
+	    
 	};
 	
 	init();
@@ -30,20 +37,60 @@ function ProductSell(o){
 		app.keyDate = null;
 		app.keySeq = '';
 		app.enterPressed = 0;
-		addBehaviourBtnSell();
-		addBehaviourBtnSellAndAppendToBill();
-		addBehaviorAjaxSubmit();
+		
+		addSellBehaiours();
+		
 		setFocus();
-		addEnterPressedBehaviours();
-		addBehaviorCountChangedListener();
-		addBehaviourDisocuntChanged();
-		createUserSoldItemsTable();
-		createCustomerCartTable();
-		addBehaviourBtnPaid();
+		
+		addListenerBehaviours();
+		
+		createCarts();
+		
+		addPayoutButtons();
+		
 		productChanged();
 		addDocumentKeypressedListener();
 	}
 	
+	/**
+	 * payout out user or customer cart
+	 * */
+	function addPayoutButtons(){
+		addBehaviourPayoutUserCart();
+		addBehaviourPayoutCustomerCart();
+	}
+	/**
+	 * display user and customer cart on page load
+	 * */
+	function createCarts(){
+		createUserCartTable();
+		createCustomerCartTable();
+	}
+	
+	/**
+	 * add change and   enter pressed listeners
+	 * */
+	function addListenerBehaviours(){
+		addEnterPressedBehaviours();
+		addBehaviorCountChangedListener();
+		addBehaviourDisocuntChanged();
+	}
+	
+	/**
+	 * sell a product. there are three type of sell:
+	 *  - sell inmadietly
+	 *  - sell and put it to user cart
+	 *  - sell and put it to customer cart
+	 * */
+	function addSellBehaiours(){
+		addBehaviourBtnSell();
+		addBehaviourBtnSellAndAppendToBill();
+		addBehaviourBtnAddToCustomerCart();
+		
+		addBehaviorAjaxSubmit();
+	}
+	
+	
 	function addBehaviourDisocuntChanged(){
 		$("#productsaleform-id_discount").change(refreshCalculatedValues);
 	}
@@ -103,6 +150,9 @@ function ProductSell(o){
 		}
 	}
 	
+	/**
+	 * Add traversing between input elements on enter key pressed
+	 * */
 	function addEnterPressedBehaviours(){
 		addBehaviorEnterPressedListener();
 		addBehaviorCountEnterPressedListener();
@@ -277,24 +327,20 @@ function ProductSell(o){
 	}
 	
 	function submitSell(){
-		$('#productsaleform-append_to_sold_list').val('');
+		$('#productsaleform-cart').val('');
 		$('#product_form').submit();
 	}
 	function submitSellAndAppend(){
-		$('#productsaleform-append_to_sold_list').val('append');
+		$('#productsaleform-cart').val('user');
 		$('#product_form').submit();
 	}
 	
 	
 	function submitAddToCustomerCart(){
-		$('#productsaleform-append_to_sold_list').val('append');
+		$('#productsaleform-cart').val('customer');
 		$('#product_form').submit();
 	}
 	
-	function refreshSoldUseritems(){
-		$('.sold-items-container').transferList('option','transfers' , app.defaults.sold_items );
-	}
-	
 	function addBehaviorAjaxSubmit(){
 		
 		$('body').on('afterValidate', '#product_form', function () {
@@ -327,8 +373,10 @@ function ProductSell(o){
 			        		  refreshCalculatedValues();
 			        		  $("#filter_text").val('');
 			        		  setFocus();
-			        		  app.defaults.sold_items = response.transfers; 
-			        		  refreshSoldItemsList();
+			        		  app.defaults.user_cart = response.transfers; 
+			        		  app.defaults.customer_cart = response.customer_cart;
+			        		  refreshUserCart();
+			        		  refreshCustomerCart();
 			        	  }else if ( response.code == 'invalid'){
 			        		  if ( response.errors ){
 			        			  	$.each(response.errors, function (key, value){
@@ -347,36 +395,60 @@ function ProductSell(o){
 	}
 	
 	
-	function refreshSoldItemsList(){
-		$('.sold-items-container').transferList( 'option', 'transfers' , app.defaults.sold_items );
+	function refreshUserCart(){
+		$(app.defaults.selector_user_cart).transferList( 'option', 'transfers' , app.defaults.user_cart );
+	}
+	function refreshCustomerCart(){
+		$(app.defaults.selector_customer_cart ).transferList( 'option', 'transfers' , app.defaults.customer_cart );
 	}
 	
-	function addBehaviourBtnPaid(  ){
-		$('#btn_paid').on('click',function(){
+	function addBehaviourPayoutUserCart(  ){
+		$( app.defaults.selector_btn_pay_user_cart ).on('click',function(){
 			
 			$.ajax({
-				url: app.defaults.clear_list_url,
+				url: app.defaults.url_pay_user_cart,
+				type: 'post',
+				data: {},
+				success: function (response) {
+					if ( response.code == 'success'){
+						app.defaults.user_cart = response.transfers;
+						refreshUserCart();
+						$.notify(app.defaults.message_paid, { 'type' : 'success' });
+					}
+				}
+			}
+			);
+		});
+	}
+	function addBehaviourPayoutCustomerCart(  ){
+		$( app.defaults.selector_btn_pay_customer_cart ).on('click',function(){
+			alert('ok');
+			$.ajax({
+				url: app.defaults.url_pay_customer_card,
 				type: 'post',
 		        data: {},
 		        success: function (response) {
 		        	if ( response.code == 'success'){
-		        		app.defaults.sold_items= response.transfers;
-		        		refreshSoldItemsList();
-		        		$.notify(app.defaults.message_paid, { 'type' : 'success' });
+		        		app.defaults.customer_cart = response.customer_cart;
+		        		refreshCustomerCart();
 		        	}
+		        	$.notify(response.message, { 'type' : response.code });
+		        },
+		        error: function(){
+		        	alert('Hiba történt');
 		        }
 			}
 			);
 		});
 	}
 	
-	function createUserSoldItemsTable(){
-		$('.sold-items-container').transferList({
-			'transfers' : app.defaults.sold_items
+	function createUserCartTable(){
+		$(app.defaults.selector_user_cart).transferList({
+			'transfers' : app.defaults.user_cart
 		});
 	}
 	function createCustomerCartTable(){
-		$('.customer-cart').transferList({
+		$(app.defaults.selector_customer_cart).transferList({
 			'transfers' : app.defaults.customer_cart
 		});
 	}
diff --git a/frontend/web/js/transferlist.js b/frontend/web/js/transferlist.js
index 465cc7d..7c48c49 100644
--- a/frontend/web/js/transferlist.js
+++ b/frontend/web/js/transferlist.js
@@ -136,7 +136,6 @@ $.widget( "fitness.transferList", {
 					self._refresh();
 				},
 			};	
-		 
 			// base
 			this._super(key, value);
 		 

From 01da3c470c5b919d5031ade8784f9e2ae31da46b Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 26 Oct 2015 07:49:10 +0100
Subject: [PATCH 051/100] add default account to frontend

---
 common/models/Account.php                     |  11 ++
 common/models/ShoppingCart.php                |   2 +-
 common/models/Ticket.php                      |   3 +-
 ...228_alter__table__add__column__paid_at.php |  30 ++++
 frontend/components/FrontendMenuStructure.php |   3 +-
 frontend/components/HtmlHelper.php            |  22 ++-
 .../components/ReceptionCardNumberWidget.php  |   8 +-
 .../components/ReceptionCustomerWidget.php    |  22 +++
 frontend/components/ReceptionMenuWidget.php   |   5 +-
 frontend/components/ReceptionTicketWidget.php |  22 +++
 frontend/components/ReceptionWidget.php       |  11 +-
 frontend/controllers/AccountController.php    | 145 ++++++++++++++++++
 frontend/controllers/CustomerController.php   |  19 +++
 .../controllers/MoneyMovementController.php   |   1 +
 frontend/controllers/ProductController.php    |  13 +-
 frontend/controllers/TicketController.php     |   3 +-
 frontend/models/AccountSearch.php             |  70 +++++++++
 frontend/models/AccountSelect.php             |  42 +++++
 frontend/models/CustomerCreate.php            |  24 ++-
 frontend/models/CustomerUpdate.php            |  19 +++
 frontend/models/ReceptionForm.php             |  35 +++++
 frontend/views/account/_form.php              |  27 ++++
 frontend/views/account/_search.php            |  37 +++++
 frontend/views/account/create.php             |  21 +++
 frontend/views/account/index.php              |  39 +++++
 frontend/views/account/select.php             |  24 +++
 frontend/views/account/update.php             |  23 +++
 frontend/views/account/view.php               |  40 +++++
 frontend/views/common/_form_card_number.php   |  42 -----
 frontend/views/common/_menu_reception.php     |  80 ----------
 frontend/views/common/_reception.php          |  13 +-
 frontend/views/common/_reception_customer.php |  45 ++++++
 .../common/_reception_form_card_number.php    |  50 ++++++
 frontend/views/common/_reception_menu.php     |  59 +++++++
 frontend/views/common/_reception_ticket.php   |  60 ++++++++
 frontend/views/customer/create.php            |  12 +-
 frontend/views/customer/reception.php         |  19 +--
 frontend/views/customer/update.php            |  13 +-
 frontend/views/product/_sale_form.php         |   8 +-
 frontend/views/product/_user_cart.php         |   6 +-
 frontend/views/product/sale.php               |  18 +--
 frontend/views/ticket/_form.php               |   4 +
 frontend/views/ticket/create.php              |  13 +-
 frontend/web/js/product.sell.js               |   3 +-
 frontend/web/js/ticket.sell.js                |   2 +-
 45 files changed, 948 insertions(+), 220 deletions(-)
 create mode 100644 console/migrations/m151025_152228_alter__table__add__column__paid_at.php
 create mode 100644 frontend/components/ReceptionCustomerWidget.php
 create mode 100644 frontend/components/ReceptionTicketWidget.php
 create mode 100644 frontend/controllers/AccountController.php
 create mode 100644 frontend/models/AccountSearch.php
 create mode 100644 frontend/models/AccountSelect.php
 create mode 100644 frontend/views/account/_form.php
 create mode 100644 frontend/views/account/_search.php
 create mode 100644 frontend/views/account/create.php
 create mode 100644 frontend/views/account/index.php
 create mode 100644 frontend/views/account/select.php
 create mode 100644 frontend/views/account/update.php
 create mode 100644 frontend/views/account/view.php
 delete mode 100644 frontend/views/common/_form_card_number.php
 delete mode 100644 frontend/views/common/_menu_reception.php
 create mode 100644 frontend/views/common/_reception_customer.php
 create mode 100644 frontend/views/common/_reception_form_card_number.php
 create mode 100644 frontend/views/common/_reception_menu.php
 create mode 100644 frontend/views/common/_reception_ticket.php

diff --git a/common/models/Account.php b/common/models/Account.php
index 6633ca0..df458f6 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -143,6 +143,17 @@ class Account extends \yii\db\ActiveRecord
     	return $accounts;
     }
     
+    public static function writeDefault($account){
+    	$session = Yii::$app->session;
+    	$session->set('id_account',  $account->id_account);
+    	 
+    }
     
+    public static function readDefault( ){
+    	$session = Yii::$app->session;
+	    $result =	$session->get('id_account');
+	    return $result;
+    
+    }
     
 }
diff --git a/common/models/ShoppingCart.php b/common/models/ShoppingCart.php
index 5349e7d..a955c0b 100644
--- a/common/models/ShoppingCart.php
+++ b/common/models/ShoppingCart.php
@@ -68,7 +68,7 @@ class ShoppingCart extends \yii\db\ActiveRecord
     	//delete cart
     	$sql = "UPDATE transfer AS t
 				INNER JOIN shopping_cart AS s ON t.id_transfer = s.id_transfer
-				SET t.status = "  . Transfer::STATUS_PAID
+				SET t.status = "  . Transfer::STATUS_PAID . " t.paid_at = " . date('Y-m-d H:i:s' )
 				. " WHERE  t.status = " . Transfer::STATUS_NOT_PAID;
     	
     	$q1 = Yii::$app->db->createCommand($sql);
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index 86bbf24..1f1152b 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\db\ActiveRecord;
 
 /**
  * This is the model class for table "ticket".
@@ -140,7 +141,7 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
 		$query->andWhere(['id_card' => $card->id_card]);
 		$query->andWhere( 'start <= :today' ,[ 'today' => $today] );
 		$query->andWhere( 'end >= :today' ,[ 'today' => $today] );
-		
+		$query->orderBy([  "created_at"  =>SORT_DESC]  );		
 		$result  = $query->all();
 
 		return $result;
diff --git a/console/migrations/m151025_152228_alter__table__add__column__paid_at.php b/console/migrations/m151025_152228_alter__table__add__column__paid_at.php
new file mode 100644
index 0000000..4bf5888
--- /dev/null
+++ b/console/migrations/m151025_152228_alter__table__add__column__paid_at.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151025_152228_alter__table__add__column__paid_at extends Migration
+{
+    public function up()
+    {
+		$this->addColumn("transfer", "paid_at", "datetime");
+    }
+
+    public function down()
+    {
+        echo "m151025_152228_alter__table__add__column__paid_at cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 505d3d5..6e61ed1 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -28,7 +28,7 @@ class FrontendMenuStructure{
 		if ( $this->isLogged()  ){
 			$lastAccountState = AccountState::find()->andWhere(['id_user' => Yii::$app->user->id])->orderBy(['account_state.created_at' => SORT_DESC])->limit(1)->one();
 			if ( isset($lastAccountState) ){
-				$this->start = strtotime( $lastAccountState->created_at . ' UTC' );
+				$this->start =  Yii::$app->formatter->asDatetime(strtotime( $lastAccountState->created_at . ' UTC' ));
 			}
 		}
 
@@ -60,6 +60,7 @@ class FrontendMenuStructure{
 			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'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'] ],
diff --git a/frontend/components/HtmlHelper.php b/frontend/components/HtmlHelper.php
index e399098..af28f4a 100644
--- a/frontend/components/HtmlHelper.php
+++ b/frontend/components/HtmlHelper.php
@@ -17,9 +17,10 @@ class HtmlHelper{
 	 * @see ReceptionCardNumberWidget
 	 * @see ReceptionMenuWidget
 	 * */
-	public static function mkReceptionCardBtn($card, $label,$route = null ){
+	public static function mkReceptionCardBtn($recptionForm, $label,$route = null ){
 	
 		$url = null;
+		$card = $recptionForm->card;
 		$classes =  'btn btn-primary btn-reception';
 		if ( $card == null ){
 			$classes .= ' disabled';
@@ -29,10 +30,25 @@ class HtmlHelper{
 		}
 		return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
 	}
-	
-	public static function mkReceptionBtn($card, $label,$route = null ){
+	public static function mkReceptionCustomerBtn($recptionForm, $label,$route = null ){
 	
 		$url = null;
+		$card = $recptionForm->card;
+		$customer = $recptionForm->customer;
+		$classes =  'btn btn-primary btn-reception';
+		if ( $card == null || $customer == null){
+			$classes .= ' disabled';
+		}
+		if ( isset($route)){
+			$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
+		}
+		return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
+	}
+	
+	public static function mkReceptionBtn($recptionForm, $label,$route = null ){
+	
+		$url = null;
+		$card = $recptionForm->card;
 		$classes =  'btn btn-primary btn-reception';
 	
 		if ( isset($route)){
diff --git a/frontend/components/ReceptionCardNumberWidget.php b/frontend/components/ReceptionCardNumberWidget.php
index 983b6c1..5741966 100644
--- a/frontend/components/ReceptionCardNumberWidget.php
+++ b/frontend/components/ReceptionCardNumberWidget.php
@@ -8,14 +8,12 @@ class ReceptionCardNumberWidget extends Widget{
 	public $number;
 	public $route;
 	
-	public $customer;
-	public $card;
-	
-	public $viewFile = '//common/_form_card_number';
+	public $model;	
+	public $viewFile = '//common/_reception_form_card_number';
 	
 	
 	public function run(){
-		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer , 'route' => $this->route ]);
+		echo $this->render($this->viewFile,['model' => $this->model, 'route' => $this->route ]);
 	}
 	
 	
diff --git a/frontend/components/ReceptionCustomerWidget.php b/frontend/components/ReceptionCustomerWidget.php
new file mode 100644
index 0000000..96255e2
--- /dev/null
+++ b/frontend/components/ReceptionCustomerWidget.php
@@ -0,0 +1,22 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+/**
+ * This is the model class for table "customer".
+ *
+ * @property string $viewFile
+ * @property common\models\ReceptionForm $model
+ * */
+class ReceptionCustomerWidget extends Widget{
+	
+	
+	public $viewFile = '//common/_reception_customer';
+	public $model;
+	
+	public function run(){
+			echo $this->render($this->viewFile,[  'model' => $this->model ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/components/ReceptionMenuWidget.php b/frontend/components/ReceptionMenuWidget.php
index a1cd23d..656cb4b 100644
--- a/frontend/components/ReceptionMenuWidget.php
+++ b/frontend/components/ReceptionMenuWidget.php
@@ -11,11 +11,12 @@ class ReceptionMenuWidget extends Widget{
 	public $customer;
 	public $card;
 	
-	public $viewFile = '//common/_menu_reception';
+	public $viewFile = '//common/_reception_menu';
 	
+	public $model;
 	
 	public function run(){
-		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer ]);
+		echo $this->render($this->viewFile,[ 'model' => $this->model  ]);
 	}
 	
 	
diff --git a/frontend/components/ReceptionTicketWidget.php b/frontend/components/ReceptionTicketWidget.php
new file mode 100644
index 0000000..bb10d71
--- /dev/null
+++ b/frontend/components/ReceptionTicketWidget.php
@@ -0,0 +1,22 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+/**
+ * This is the model class for table "customer".
+ *
+ * @property string $viewFile
+ * @property common\models\ReceptionForm $model
+ * */
+class ReceptionTicketWidget extends Widget{
+	
+	
+	public $viewFile = '//common/_reception_ticket';
+	public $model;
+	
+	public function run(){
+			echo $this->render($this->viewFile,[  'model' => $this->model ]);
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/frontend/components/ReceptionWidget.php b/frontend/components/ReceptionWidget.php
index d7fbce4..f83e227 100644
--- a/frontend/components/ReceptionWidget.php
+++ b/frontend/components/ReceptionWidget.php
@@ -10,26 +10,17 @@ class ReceptionWidget extends Widget{
 	public $number;
 	public $route;
 	
-	public $customer;
-	public $card;
-	
-	public $tickets;
 	
 	public $viewFile = '//common/_reception';
 	
 	public function init(){
 		parent::init();
-		if ( isset($this->form)){
-			$this->card = $this->form->card;
-			$this->customer = $this->form->customer;
-			$this->tickets = $this->form->tickets;
-		}
 		
 	}
 	
 	
 	public function run(){
-		echo $this->render($this->viewFile,['card' => $this->card, 'customer' =>$this->customer, 'tickets' => $this->tickets  ]);
+		echo $this->render($this->viewFile,[ 'model' => $this->form ]);
 	}
 	
 	
diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php
new file mode 100644
index 0000000..febe2ea
--- /dev/null
+++ b/frontend/controllers/AccountController.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Account;
+use frontend\models\AccountSearch;
+use frontend\models\AccountSelect;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+
+/**
+ * AccountController implements the CRUD actions for Account model.
+ */
+class AccountController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    
+    /**
+     * Lists all Account models.
+     * @return mixed
+     */
+    public function actionSelect()
+    {
+      $model = new AccountSelect();
+
+      $model->id_account = Account::readDefault();
+      
+      $accounts = Account::read();
+      
+        if ($model->load(Yii::$app->request->post()) && $model->writeToSession()) {
+        	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Default session is set!') );
+        }
+            return $this->render('select', [
+                'model' => $model,
+            	'accounts' =>  $accounts
+            ]);
+    }
+    
+    /**
+     * Lists all Account models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new AccountSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Account model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Account model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Account();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Account model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_account]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Account model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Account model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Account the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Account::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/controllers/CustomerController.php b/frontend/controllers/CustomerController.php
index 2cf5187..4024fcf 100644
--- a/frontend/controllers/CustomerController.php
+++ b/frontend/controllers/CustomerController.php
@@ -55,6 +55,14 @@ class CustomerController extends Controller
 		$model->readCard();
 		
 		
+		if ( $model->isFreeCard() ){
+			return $this->redirect([ 'create',  'number' => $model->card->number ]);
+		}else if ( $model->isCustomerWithTicket()){
+			return $this->redirect([ 'product/sale',  'number' => $model->card->number ]);
+		}else if ( $model->isCardWithCustomer()  ){
+			return $this->redirect([ 'ticket/create',  'number' => $model->card->number ]);
+		}
+		
 		return $this->render('reception',['model' => $model]);
 	}
 
@@ -102,6 +110,10 @@ class CustomerController extends Controller
         $model->id_user = Yii::$app->user->id;
         
 
+        $receptionForm = new ReceptionForm();
+        $receptionForm->number = $number;
+        $receptionForm->readCard();
+        
         if ( isset($number)){
         	$model->cardNumber = $number;
         }
@@ -112,6 +124,7 @@ class CustomerController extends Controller
         } else {
             return $this->render('create', [
                 'model' => $model,
+            	'receptionForm' => $receptionForm
             ]);
         }
     }
@@ -126,6 +139,11 @@ class CustomerController extends Controller
     {
     	$card = null;
     	$model = null;
+    	
+    	$receptionForm = new ReceptionForm();
+    	$receptionForm->number = $number;
+    	$receptionForm->readCard();
+    	
     	if ( $number != null ){
 	    	$card = Card::readCard($number);
     		if ( $card != null ){
@@ -151,6 +169,7 @@ class CustomerController extends Controller
         	
             return $this->render('update', [
                 'model' => $model,
+            	'receptionForm' => $receptionForm
             ]);
         }
     }
diff --git a/frontend/controllers/MoneyMovementController.php b/frontend/controllers/MoneyMovementController.php
index ec5ebba..40fb172 100644
--- a/frontend/controllers/MoneyMovementController.php
+++ b/frontend/controllers/MoneyMovementController.php
@@ -65,6 +65,7 @@ class MoneyMovementController extends Controller
 	
         $model->id_user = Yii::$app->user->id;
         $model->type = MoneyMovement::TYPE_OUT;
+        $model->id_account = Account::readDefault();
         
         $accounts = Account::read();
         
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index c135d35..77299a0 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -21,7 +21,7 @@ use common\models\Transfer;
 use common\models\User;
 use common\models\UserSoldItem;
 use common\models\ShoppingCart;
-
+use frontend\models\ReceptionForm;
 /**
  * ProductController implements the CRUD actions for Product model.
  */
@@ -58,7 +58,14 @@ class ProductController extends Controller
     
     public function actionSale( $number = null){
     	
-    	$this->findByNumber($number);
+//     	$this->findByNumber($number);
+    	
+    	$receptionForm = new ReceptionForm() ;
+    	$receptionForm->number = $number;
+    	$receptionForm->readCard();
+    	
+    	$this->card = $receptionForm->card;
+    	$this->customer = $receptionForm->customer;
     	
     	$model = new ProductSaleForm();
     	
@@ -83,6 +90,7 @@ class ProductController extends Controller
     		$model->accounts   = $accounts;
     		$model->discounts  = $discounts;
     		
+    		$model->id_account = Account::readDefault();
     		
     		$result = [];
     		$result['code'] = 'unknown';
@@ -120,6 +128,7 @@ class ProductController extends Controller
 	    			'accounts' => $accounts,
 	    			'discounts' => $discounts,
 	    			'userTransfers' => $userTransfers,
+	    			'receptionForm' => $receptionForm,
 	    	]);
     	}
     	
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index f8dd1d8..890af5e 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -80,9 +80,7 @@ class TicketController extends Controller
     {
     	
     	$receptionForm = new ReceptionForm();
-    	
     	$receptionForm->number = $number;
-    	
     	$receptionForm->readCard();
     	
     	if ( !isset($receptionForm->card ) ){
@@ -104,6 +102,7 @@ class TicketController extends Controller
         $model->status = Ticket::STATUS_ACTIVE;
         $model->usage_count = 0;
         $model->id_card = $receptionForm->card->id_card;	
+        $model->id_account = Account::readDefault();
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
         	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Ticket added to customer') );
diff --git a/frontend/models/AccountSearch.php b/frontend/models/AccountSearch.php
new file mode 100644
index 0000000..750469d
--- /dev/null
+++ b/frontend/models/AccountSearch.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Account;
+
+/**
+ * AccountSearch represents the model behind the search form about `common\models\Account`.
+ */
+class AccountSearch extends Account
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_account', 'status', 'type'], 'integer'],
+            [['name', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Account::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_account' => $this->id_account,
+            'status' => $this->status,
+            'type' => $this->type,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name]);
+
+        return $dataProvider;
+    }
+}
diff --git a/frontend/models/AccountSelect.php b/frontend/models/AccountSelect.php
new file mode 100644
index 0000000..49ada27
--- /dev/null
+++ b/frontend/models/AccountSelect.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use common\models\Account;
+
+/**
+ * AccountSearch represents the model behind the search form about `common\models\Account`.
+ */
+class AccountSelect  extends Model
+{
+	
+	public $id_account;
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_account',   'type'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    public function writeToSession(){
+    	$account = Account::findOne($this->id_account);
+    	Account::writeDefault($account);
+    	return true;
+    }
+     
+}
diff --git a/frontend/models/CustomerCreate.php b/frontend/models/CustomerCreate.php
index 41f47eb..7b88074 100644
--- a/frontend/models/CustomerCreate.php
+++ b/frontend/models/CustomerCreate.php
@@ -68,6 +68,15 @@ class CustomerCreate extends \common\models\Customer
         		[['email'], 'string', 'max' => 255],
         		[['email'], 'email' ],
         		[['email'], 'unique' ],
+        		[['email'], 'required', 'when' => function($model) {
+			        return  !isset(  $model->email )  || empty($model->phone) ;
+			    } ,
+// 			     'enableClientValidation' => false,
+			    'whenClient' => "function (attribute, value) {
+				    return false;
+				}",
+			    'message' => Yii::t('customer/frontend','E-mail or phone number required!')
+			    ],
         		
         		[['password_plain','password_repeat'], 'string', 'max' => 32],
         		
@@ -80,13 +89,24 @@ class CustomerCreate extends \common\models\Customer
         		
         		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
         		
+        		[['phone'], 'required', 'when' => function($model) {
+        			return   !isset(  $model->email )  || empty(  $model->email ) ;
+        		} ,
+//         		'enableClientValidation' => false,
+        		'whenClient' => "function (attribute, value) {
+				    return false;
+				}",
+        		'message' => Yii::t('customer/frontend','E-mail or phone number required!')
+        		],
+        		
         		[['zip'], 'string', 'max' => 8],
         		
-        		[['city'], 'string', 'max' => 30]
+        		[['city'], 'string', 'max' => 30],
+        		
+//         		[['email','phone'], 'validateEmailOrPhoneRequired' ],
         ];
     }
 
-    
     public function validateCustomerCard($a,$p){
     	$card =  null;
     	
diff --git a/frontend/models/CustomerUpdate.php b/frontend/models/CustomerUpdate.php
index 8f1967f..dab17eb 100644
--- a/frontend/models/CustomerUpdate.php
+++ b/frontend/models/CustomerUpdate.php
@@ -68,6 +68,16 @@ class CustomerUpdate extends \common\models\Customer
         		[['email'], 'email' ],
         		[['email'], 'unique' ],
         		
+        		[['email'], 'required', 'when' => function($model) {
+	        			return  !isset(  $model->email )  || empty($model->phone) ;
+	        		} ,
+	        		'whenClient' => "function (attribute, value) {
+					    return false;
+					}",
+ 					'message' => Yii::t('customer/frontend','E-mail or phone number required!')
+				],
+        		
+        		
 //         		[['password_plain','password_repeat'], 'string', 'max' => 32],
         		
         		[['sex'], 'integer'],
@@ -79,6 +89,15 @@ class CustomerUpdate extends \common\models\Customer
         		
         		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
         		
+        		[['phone'], 'required', 'when' => function($model) {
+        			return   !isset(  $model->email )  || empty(  $model->email ) ;
+        			} ,
+	        		'whenClient' => "function (attribute, value) {
+					    return false;
+					}",
+					'message' => Yii::t('customer/frontend','E-mail or phone number required!')
+				],
+        		
         		[['zip'], 'string', 'max' => 8],
         		
         		[['city'], 'string', 'max' => 30]
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
index 372314f..83be5df 100644
--- a/frontend/models/ReceptionForm.php
+++ b/frontend/models/ReceptionForm.php
@@ -53,6 +53,41 @@ class ReceptionForm extends Model
     	$this->tickets = Ticket::readActive($this->card);
     }
     
+    /**
+     * @return true , if card found without customer
+     * */
+    public function isFreeCard(){
+    	$result = isset($this->card) && !isset($this->customer);
+    	return $result;
+    }
+    /**
+     * @return true , if card found with customer
+     * */
+    public function isCardWithCustomer(){
+    	$result = isset($this->card) &&  isset($this->customer);
+    	return $result;
+    }
+    
+    /**
+     * @return true , if card and customer found with at least one valid tickets
+     * */
+    public function isCustomerWithTicket(){
+    	$result = false;
+    	if ( isset($this->card) && isset($this->customer) ){
+    		if ( isset($this->tickets) && count($this->tickets) > 0 ){
+    			$result = true;
+    		}
+    	}
+    	return $result;
+    }
+    
+    /**
+     * @return true, if no card and customer found
+     * */
+    public function isInvalidNumber(){
+    	$result = !isset($this->card)  && !isset($this->customer);
+    	return $result;
+    }
 	
     
 }
diff --git a/frontend/views/account/_form.php b/frontend/views/account/_form.php
new file mode 100644
index 0000000..cf488db
--- /dev/null
+++ b/frontend/views/account/_form.php
@@ -0,0 +1,27 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/account', 'Create') : Yii::t('frontend/account', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account/_search.php b/frontend/views/account/_search.php
new file mode 100644
index 0000000..337bb59
--- /dev/null
+++ b/frontend/views/account/_search.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\AccountSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/account', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('frontend/account', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account/create.php b/frontend/views/account/create.php
new file mode 100644
index 0000000..d6cd64e
--- /dev/null
+++ b/frontend/views/account/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = Yii::t('frontend/account', 'Create Account');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account/index.php b/frontend/views/account/index.php
new file mode 100644
index 0000000..0a24e42
--- /dev/null
+++ b/frontend/views/account/index.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\AccountSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/account', 'Accounts');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/account', 'Create Account'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_account',
+            'name',
+            'status',
+            'type',
+            'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/account/select.php b/frontend/views/account/select.php
new file mode 100644
index 0000000..33ac305
--- /dev/null
+++ b/frontend/views/account/select.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="account-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+	<?php echo $form->field($model, 'id_account')->dropDownList(HtmlHelper::mkAccountOptions($accounts))  ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(  Yii::t('frontend/account', 'Update'), ['class' =>  'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/account/update.php b/frontend/views/account/update.php
new file mode 100644
index 0000000..267b397
--- /dev/null
+++ b/frontend/views/account/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = Yii::t('frontend/account', 'Update {modelClass}: ', [
+    'modelClass' => 'Account',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id_account]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/account', 'Update');
+?>
+<div class="account-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/account/view.php b/frontend/views/account/view.php
new file mode 100644
index 0000000..8aa3ed7
--- /dev/null
+++ b/frontend/views/account/view.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Account */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/account', 'Accounts'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="account-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/account', 'Update'), ['update', 'id' => $model->id_account], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/account', 'Delete'), ['delete', 'id' => $model->id_account], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/account', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_account',
+            'name',
+            'status',
+            'type',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/frontend/views/common/_form_card_number.php b/frontend/views/common/_form_card_number.php
deleted file mode 100644
index 15ffe85..0000000
--- a/frontend/views/common/_form_card_number.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model common\models\Customer */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<?php 
-$customername = "";
-$number = "";
-if ( isset($card)){
-	$number = $card->number;
-}
-if ( isset($customer) ){
-	$customername = $customer->name; 
-}
-
-?>
-	
-	    <?php $form = ActiveForm::begin([
-			'enableAjaxValidation' => false,
-	    	'method' => 'get',
-	    	'action' => $route
-	    ]); ?>
-<div  class="row" >
-	<div class='col-md-12'>
-			<?php echo Html::textInput("number", $number )?>
-	</div>
-	<div class='col-md-12'>
-		<?php echo $customername; ?>
-	</div>
-	<div class='col-md-12'>
-		<?php echo Html::submitButton(  Yii::t('frontend/card', "Search"),[ 'class' => 'btn btn-primary']); ?>
-	</div>
-</div>
-	    <?php ActiveForm::end(); ?>
-
-
-
diff --git a/frontend/views/common/_menu_reception.php b/frontend/views/common/_menu_reception.php
deleted file mode 100644
index 64d6f9c..0000000
--- a/frontend/views/common/_menu_reception.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-use yii\helpers\Url;
-use frontend\components\HtmlHelper;
-
-/* @var $this yii\web\View */
-/* @var $card common\models\Card */
-/* @var $customer common\models\Customer */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<style >
-	 .btn.btn-reception{
-		width:100%;
-		margin-top: 6px;
-		margin-bottom: 6px;
-	}
-
-</style>
-
-<?php 
-$customername = "";
-if ( isset($customer ) ){
-	$customername = $customer->name; 
-}
-
-/*
-function mkCustomerBtn($card, $label,$route = null ){
-
-	$url = null;
-	$classes =  'btn btn-primary btn-reception';
-	if ( $card == null ){
-		$classes .= ' disabled';
-	}
-	if ( isset($route)){
-		$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
-	}
-	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
-}
-function mkBtn($card, $label,$route = null ){
-
-	$url = null;
-	$classes =  'btn btn-primary btn-reception';
-	
-	if ( isset($route)){
-		$url = [$route, 'number' => ( isset( $card ) ?   $card->number : '' )];
-	}
-	
-	return  Html::a(  $label   , $url,  ['class' =>   $classes ] );
-}
-*/
-
-
-?>
-    <div class='row'>
-		<div class='col-md-8'>
-			<?php echo   HtmlHelper::mkReceptionCardBtn( $card, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('customer/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
-		</div>
-	</div>
-    <div class='row'>
-		<div class='col-md-8'>
-			<?php echo HtmlHelper::mkReceptionCardBtn( $card, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo HtmlHelper::mkReceptionCardBtn( $card, Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create' );  ?>
-		</div>
-	</div>
-    <div class='row'>
-		<div class='col-md-12'>
-			<?php echo  HtmlHelper::mkReceptionBtn($card, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
-		</div>
-	</div>
-
-
-
diff --git a/frontend/views/common/_reception.php b/frontend/views/common/_reception.php
index 3315a8f..cd5f30b 100644
--- a/frontend/views/common/_reception.php
+++ b/frontend/views/common/_reception.php
@@ -4,15 +4,20 @@ use frontend\components\ReceptionMenuWidget;
 use frontend\models\ReceptionForm;
 use frontend\components\ReceptionCardNumberTicketsWidget;
 use yii\base\Widget;
+use frontend\components\ReceptionTicketWidget;
+use frontend\components\ReceptionCustomerWidget;
 ?>
 <div class='row'>
 		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
+			<?php echo ReceptionMenuWidget::widget( [  'model' => $model ] ) ?>
+		</div>
+		<div class='col-md-2'>
+			<?php echo ReceptionCardNumberWidget::widget( [ 'model' => $model, 'route' => ['customer/reception'] ] )?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
+			<?php echo ReceptionCustomerWidget::widget([  'model' => $model ] ) ?>
 		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberTicketsWidget::widget([ 'tickets' => $tickets,  'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] ) ?>
+		<div class='col-md-3'>
+			<?php echo ReceptionTicketWidget::widget([  'model' => $model ] ) ?>
 		</div>
 	</div>
\ No newline at end of file
diff --git a/frontend/views/common/_reception_customer.php b/frontend/views/common/_reception_customer.php
new file mode 100644
index 0000000..b79b290
--- /dev/null
+++ b/frontend/views/common/_reception_customer.php
@@ -0,0 +1,45 @@
+<?php 
+use common\models\Ticket;
+use frontend\model\ReceptionForm;
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+use yii\base\Widget;
+/* @var $this yii\web\View */
+/* @var $model frontend\model\ReceptionForm */
+
+?>
+
+<?php
+if (  $model->isCardWithCustomer()   ){
+?>
+	<div class="row">
+		<div class="col-md-12">
+			<?php 
+				echo DetailView::widget([
+						'model' => $model,
+						'attributes' =>[
+							[
+								'label' =>  'Kártyaszám',		
+								'value' =>  $model->card->number		
+							],
+							[
+								'label' =>  'Vendég',		
+								'value' =>  $model->customer->name		
+							],
+							[
+								'label' =>  'E-Mail',		
+								'value' =>  $model->customer->email		
+							],
+							[
+								'label' =>  'Telefon',		
+								'value' =>  $model->customer->phone		
+							],
+						]
+						
+				])
+			?>
+		</div>
+	</div>
+<?php 
+}
+?>
\ No newline at end of file
diff --git a/frontend/views/common/_reception_form_card_number.php b/frontend/views/common/_reception_form_card_number.php
new file mode 100644
index 0000000..d551fbf
--- /dev/null
+++ b/frontend/views/common/_reception_form_card_number.php
@@ -0,0 +1,50 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Customer */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<style>
+
+.form-card-number input, .form-card-number button{
+
+	margin-top: 6px;
+	margin-bottom: 6px;
+
+}
+
+</style>
+
+<?php 
+$number = "";
+if ( isset($model->card)){
+	$number = $model->card->number;
+}
+
+?>
+	
+	    <div class="form-card-number">
+	    <?php $form = ActiveForm::begin([
+			'enableAjaxValidation' => false,
+	    	'method' => 'get',
+	    	'action' => $route
+	    ]); ?>
+			<div  class="row" >
+				<div class='col-md-12'>
+						<?php echo Html::textInput("number", $number ,['class' => 'form-control'])?>
+				</div>
+			</div>
+			<div  class="row" >
+				<div class='col-md-12'>
+					<?php echo Html::submitButton(  Yii::t('frontend/card', "Search"),[ 'class' => 'btn btn-primary btn-block']); ?>
+				</div>
+			</div>
+	    <?php ActiveForm::end(); ?>
+	    </div>
+
+
+
diff --git a/frontend/views/common/_reception_menu.php b/frontend/views/common/_reception_menu.php
new file mode 100644
index 0000000..313a00c
--- /dev/null
+++ b/frontend/views/common/_reception_menu.php
@@ -0,0 +1,59 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\helpers\Url;
+use frontend\components\HtmlHelper;
+
+/* @var $this yii\web\View */
+/* @var $card common\models\Card */
+/* @var $customer common\models\Customer */
+/* @var $model frontend\models\ReceptionForm */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<style >
+	 .btn.btn-reception{
+		width:100%;
+		margin-top: 6px;
+		margin-bottom: 6px;
+	}
+
+</style>
+
+<?php 
+$customername = "";
+if ( isset($model->customer ) ){
+	$customername = $model->customer->name; 
+}
+
+$card = $model->card;
+
+ 
+
+
+?>
+    <div class='row'>
+		<div class='col-md-8'>
+			<?php echo   HtmlHelper::mkReceptionCustomerBtn( $model, Yii::t( 'frontend/customer' , 'Adatlap') , 'customer/update' );  ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo Html::a(Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , Url::toRoute('customer/create')  ,  ['class' =>   'btn btn-primary btn-reception'] )?>
+		</div>
+	</div>
+    <div class='row'>
+		<div class='col-md-8'>
+			<?php echo HtmlHelper::mkReceptionCustomerBtn( $model, Yii::t( 'frontend/customer' , 'Befizetések')  , 'ticket/index');  ?>
+		</div>
+		<div class='col-md-4'>
+			<?php echo HtmlHelper::mkReceptionCustomerBtn( $model, Html::tag("i","", [ 'class' => 'glyphicon glyphicon-plus' ]  )   , 'ticket/create' );  ?>
+		</div>
+	</div>
+    <div class='row'>
+		<div class='col-md-12'>
+			<?php echo  HtmlHelper::mkReceptionBtn($model, Yii::t( 'frontend/transfer', 'Termékeladás'),  'product/sale')?>
+		</div>
+	</div>
+
+
+
diff --git a/frontend/views/common/_reception_ticket.php b/frontend/views/common/_reception_ticket.php
new file mode 100644
index 0000000..dfb9655
--- /dev/null
+++ b/frontend/views/common/_reception_ticket.php
@@ -0,0 +1,60 @@
+<?php
+use yii\base\Object;
+use common\models\Ticket;
+use frontend\model\ReceptionForm;
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\model\ReceptionForm */
+?>
+<style>
+</style>
+<?php 
+$ticket = null;
+if ( count($model->tickets) > 0 ){
+	$ticket = $model->tickets[0];
+}
+
+if ( isset($model->card)){
+	if ( isset($model->customer)){
+		if ( isset($ticket)){
+			echo Html::beginTag("div",['class'=>"alert alert-success" , "role"=>"alert"]);
+			echo Html::beginTag("strong",[ ]);
+			echo "Érvényes bérlet!" ;
+			echo Html::endTag("strong");
+			echo Html::tag("br");
+			echo Html::beginTag("strong",[ ]);
+			echo "Típus: " ;
+			echo Html::endTag("strong");
+			echo  $ticket->ticketTypeName ;
+			echo Html::tag("br");
+			echo Html::beginTag("strong",[ ]);
+			echo "Érvényes: " ;
+			echo Html::endTag("strong");
+			echo Yii::$app->formatter->asDate($ticket->start);
+			echo "&nbsp;-&nbsp;";
+			echo Yii::$app->formatter->asDate($ticket->end);
+			echo Html::endTag("div");
+		}else{
+			echo Html::beginTag("div",['class'=>"alert alert-danger", "role"=>"alert"]);
+			echo Html::beginTag("strong",[ ]);
+			echo "Bérlet lejárt vagy nem érvényes!";
+			echo Html::endTag("strong");
+			echo Html::endTag("div");
+		}
+	}else{
+		echo Html::beginTag("div",['class'=>"alert alert-info" ,"role"=>"alert"]);
+		echo Html::beginTag("strong",[ ]);
+		echo "Üres bérlet!";
+		echo Html::endTag("strong");
+		echo Html::endTag("div");
+	}
+}else{
+	echo Html::beginTag("div",['class'=>"alert alert-warning" ,"role"=>"alert"]);
+	echo Html::beginTag("strong",[ ]);
+	echo "Nincs bérlet megadva!";
+	echo Html::endTag("strong");
+	echo Html::endTag("div");
+}
+
+?>
\ No newline at end of file
diff --git a/frontend/views/customer/create.php b/frontend/views/customer/create.php
index 0588016..5708176 100644
--- a/frontend/views/customer/create.php
+++ b/frontend/views/customer/create.php
@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
+use frontend\components\ReceptionWidget;
 
 
 /* @var $this yii\web\View */
@@ -18,16 +19,7 @@ $card = $customer->card;
 ?>
 <div class="customer-create">
 
-	<div class='row'>
-		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
-		</div>
-		<div class='col-md-4'>
-		</div>
-	</div>
+	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/create'] ] )?>
 
     <h1><?= Html::encode($this->title) ?></h1>
 
diff --git a/frontend/views/customer/reception.php b/frontend/views/customer/reception.php
index fefac02..2f9a03b 100644
--- a/frontend/views/customer/reception.php
+++ b/frontend/views/customer/reception.php
@@ -2,23 +2,8 @@
 use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
 use yii\base\Widget;
-
-
-
+use frontend\components\ReceptionWidget;
 ?>
 
 <h1>Recepció</h1>
-<?php 
-
-?>
-<?php  // echo $this->render('_form_reception', [ 'model' => $model ]); ?>
-<div class='row'>
-	<div class='col-md-3'>
-		<?php echo ReceptionMenuWidget::widget( [ 'customer' => $model->customer, 'card' =>$model->card ] ) ?>
-	</div>
-	<div class='col-md-4'>
-		<?php echo ReceptionCardNumberWidget::widget([ 'customer' => $model->customer, 'card' =>$model->card, 'route' => ['customer/reception'] ] )?>
-	</div>
-	<div class='col-md-4'>
-	</div>
-</div>
\ No newline at end of file
+<?php echo ReceptionWidget::widget( ['form' => $model, 'route' => ['customer/reception'] ] )?>
diff --git a/frontend/views/customer/update.php b/frontend/views/customer/update.php
index debcd50..5a7175a 100644
--- a/frontend/views/customer/update.php
+++ b/frontend/views/customer/update.php
@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use frontend\components\ReceptionMenuWidget;
 use frontend\components\ReceptionCardNumberWidget;
+use frontend\components\ReceptionWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Customer */
@@ -19,16 +20,8 @@ $card = $customer->card;
 <div class="customer-update">
 
 
-	<div class='row'>
-		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
-		</div>
-		<div class='col-md-4'>
-		</div>
-	</div>
+	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
+
 
     <h1><?= Html::encode($this->title) ?></h1>
     <?= $this->render('_form_update', [
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index ebd9850..2e3069d 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -99,15 +99,15 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 	</div>
 	<div class="row">
 		<div class='col-md-4'>
-			<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success', 'id' => 'btn_sell'] );?>
+			<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_sell'] );?>
 		</div>
 		<div class='col-md-4'>
-			<?php echo Html::a(Yii::t("frontend/product","To cart"),null,['class' => 'btn btn-success', 'id' => 'btn_sell_append'] );?>
+			<?php echo Html::a(Yii::t("frontend/product","To cart"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_sell_append'] );?>
 		</div>
 		<div class='col-md-4'>
 			<?php 
-				if ( isset($model->card) ){
-					echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success', 'id' => 'btn_add_to_customer_cart'] );
+				if ( $receptionForm->isCardWithCustomer() ){
+					echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_add_to_customer_cart'] );
 				}			
 			?>
 		</div>
diff --git a/frontend/views/product/_user_cart.php b/frontend/views/product/_user_cart.php
index 6b095ba..1f4a1be 100644
--- a/frontend/views/product/_user_cart.php
+++ b/frontend/views/product/_user_cart.php
@@ -33,4 +33,8 @@ use yii\bootstrap\Html;
 		</div>
 	</div>
 </div>
-<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
+<div class='row' >
+	<div class='col-md-3'>
+		<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary btn-block' ]) ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index 66476a4..d4347a4 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -9,6 +9,8 @@ use yii\helpers\Url;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\ArrayHelper;
 use common\models\Discount;
+use frontend\components\ReceptionWidget;
+use common\models\Account;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
@@ -26,7 +28,7 @@ if ( isset($model->card) ){
 	$options['customer_cart'] = $model->customerCart;
 }
 $options['discounts'] = Discount::modelsToArray($discounts);
-
+$options['id_account'] = Account::readDefault();
 
 
 $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
@@ -67,21 +69,15 @@ $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 	
 </style>
 
-<div class='row'>
-		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['product/sale'] ] )?>
-		</div>
-	</div>
+	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
+
 	<div class='row '>
 		<div class='col-md-6 product-form'>
 			<h1><?php  echo Yii::t('frontend/product','Sell product')?></h1>
-			<?php echo $this->render('_sale_form' ,['model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts ]) ?>	
+			<?php echo $this->render('_sale_form' ,[ 'receptionForm' => $receptionForm, 'model' =>$model , 'lookupModel' =>$lookupModel,  'currencies' => $currencies, 'accounts' => $accounts,'discounts' => $discounts ]) ?>	
 		</div>
 		<div class='col-md-6'>
-			<?php if (  isset($card) ){ ?>
+			<?php if (  $receptionForm->isCardWithCustomer()  ){ ?>
 				<?php echo $this->render('_customer_cart' ) ?>
 			<?php }?>
 			<?php echo $this->render('_user_cart' ) ?>
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
index 83892b2..3813fdc 100644
--- a/frontend/views/ticket/_form.php
+++ b/frontend/views/ticket/_form.php
@@ -4,6 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use frontend\components\HtmlHelper;
 use kartik\widgets\DatePicker;
+use common\models\Account;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Ticket */
@@ -22,6 +23,9 @@ use kartik\widgets\DatePicker;
 	$accountOptions = HtmlHelper::mkAccountOptions($accounts);
 	$discountOptions =  ['' => ''] + HtmlHelper::mkDiscountOptions($discounts, [ 'emptyOption' => true] );
 	$ticketTypeOptions = HtmlHelper::mkTicketTypeOptions($ticketTypes);
+
+// 	echo "default kassza: " . Account::readDefault();
+// 	echo "  kassza: " . $model->id_account;
 	
 ?>
 
diff --git a/frontend/views/ticket/create.php b/frontend/views/ticket/create.php
index 5739af6..31369d1 100644
--- a/frontend/views/ticket/create.php
+++ b/frontend/views/ticket/create.php
@@ -6,6 +6,7 @@ use frontend\components\ReceptionCardNumberWidget;
 use frontend\assets\TicketSellAsset;
 use common\models\TicketType;
 use yii\helpers\Url;
+use frontend\components\ReceptionWidget;
 
 
 /* @var $this yii\web\View */
@@ -34,16 +35,8 @@ $this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
 ?>
 <div class="ticket-create">
 
-	<div class='row'>
-		<div class='col-md-3'>
-			<?php echo ReceptionMenuWidget::widget( [ 'customer' => $customer, 'card' => $card] ) ?>
-		</div>
-		<div class='col-md-4'>
-			<?php echo ReceptionCardNumberWidget::widget( [ 'customer' => $customer, 'card' =>$card, 'route' => ['customer/reception'] ] )?>
-		</div>
-		<div class='col-md-4'>
-		</div>
-	</div>
+	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
+
 
 
 	<div class="row">
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index c7f5055..157ea1d 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -27,6 +27,7 @@ function ProductSell(o){
 	    user_cart: [],
 	    discounts: [],
 	    customer_cart: [],
+	    id_account: null,
 	    
 	};
 	
@@ -275,7 +276,7 @@ function ProductSell(o){
 		table.find('.product-price').html('-');
 		table.find('.product-sale-price').html('-');
 		$('#productsaleform-id_product').val('');
-		$('#productsaleform-id_account').val('');
+		$('#productsaleform-id_account').val( app.defaults.id_account ?  app.defaults.id_account  : '');
 		$("#productsaleform-count").val(1);
 	}
 	
diff --git a/frontend/web/js/ticket.sell.js b/frontend/web/js/ticket.sell.js
index 2c342b7..0790e6b 100644
--- a/frontend/web/js/ticket.sell.js
+++ b/frontend/web/js/ticket.sell.js
@@ -162,7 +162,7 @@ function TicketSell(o){
 		app.defaults.price = app.defaults.ticket_type.price_brutto;
 	}
 	function validateAccount(){
-		app.defaults.id_account = app.defaults.ticket_type.id_account;
+		app.defaults.id_account = $('#ticketcreate-id_account').val();
 	}
 	
 	function refresh(){

From 4a04c9efa2c7e909c7cc4f6b8b34d959a5b61287 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 26 Oct 2015 08:08:03 +0100
Subject: [PATCH 052/100] add translations

---
 common/messages/hu/backend/money-movement.php | 26 ++++++++++++++
 common/messages/hu/common/money-movement.php  | 30 ++++++++++++++++
 common/messages/hu/common/sale.php            | 35 +++++++++++++++++++
 common/messages/hu/common/shopping-cart.php   | 23 ++++++++++++
 common/messages/hu/common/transfer.php        | 10 +++---
 common/messages/hu/customer/frontend.php      | 21 +++++++++++
 common/messages/hu/frontend/account-state.php |  7 ++--
 common/messages/hu/frontend/account.php       | 29 +++++++++++++++
 common/messages/hu/frontend/product.php       | 15 ++++----
 common/messages/hu/frontend/ticket.php        |  1 +
 common/messages/hu/frontend/transfer.php      |  5 +--
 frontend/controllers/AccountController.php    |  2 +-
 12 files changed, 188 insertions(+), 16 deletions(-)
 create mode 100644 common/messages/hu/backend/money-movement.php
 create mode 100644 common/messages/hu/common/money-movement.php
 create mode 100644 common/messages/hu/common/sale.php
 create mode 100644 common/messages/hu/common/shopping-cart.php
 create mode 100644 common/messages/hu/customer/frontend.php
 create mode 100644 common/messages/hu/frontend/account.php

diff --git a/common/messages/hu/backend/money-movement.php b/common/messages/hu/backend/money-movement.php
new file mode 100644
index 0000000..ca22f50
--- /dev/null
+++ b/common/messages/hu/backend/money-movement.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Create' => 'Mentés',
+    'Create Money Movement' => 'Új pénzmozágs',
+    'Money Movements' => 'Pénzmozgások',
+    'Search' => 'Keresés',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása:',
+];
diff --git a/common/messages/hu/common/money-movement.php b/common/messages/hu/common/money-movement.php
new file mode 100644
index 0000000..4928d29
--- /dev/null
+++ b/common/messages/hu/common/money-movement.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Comment' => 'Megjegyzés',
+    'Created At' => 'Létrehozás ideje',
+    'Id Account' => 'Kassza',
+    'Id Money Movement' => 'Pénzmozgás',
+    'Id User' => 'Felhasználó',
+    'Invalid account!' => 'Érvénytelen kassza!',
+    'Money' => 'Összeg',
+    'Name' => 'Név',
+    'Type' => 'Típus',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/sale.php b/common/messages/hu/common/sale.php
new file mode 100644
index 0000000..135675b
--- /dev/null
+++ b/common/messages/hu/common/sale.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Comment' => 'Megjegyzés',
+    'Count' => 'Darab',
+    'Created At' => 'Létrehozás ideje',
+    'Id Currency' => 'Pénznem',
+    'Id Discount' => 'Kedvezmény',
+    'Id Product' => 'Termék',
+    'Id Sale' => 'Termékeladás',
+    'Id User' => 'Felhasználó',
+    'Item Price' => 'Egységár',
+    'Money' => 'Összeg',
+    'Money Currency' => 'Összeg valutában',
+    'Rate' => 'Árfolyam',
+    'Status' => 'Státusz',
+    'Type' => 'Típus',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/shopping-cart.php b/common/messages/hu/common/shopping-cart.php
new file mode 100644
index 0000000..c840552
--- /dev/null
+++ b/common/messages/hu/common/shopping-cart.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Id Customer' => 'Vendég',
+    'Id Shopping Cart' => 'Bevásárlókosár',
+    'Id Transfer' => 'Tranzakció',
+];
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
index c6eda43..18ef6f3 100644
--- a/common/messages/hu/common/transfer.php
+++ b/common/messages/hu/common/transfer.php
@@ -17,12 +17,10 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Money movement' => 'Pénzmozgás',
+    'Pénzmozgás' => 'Pénzmozgás',
     'Account' => 'Kassza',
     'All' => 'Mind',
-    'Money total' => 'Összesen',
-    'Product' => 'Termék',
-    'Ticket' => 'Bérlet',
-    'Total' => 'Összesen',
     'Comment' => 'Megjegyzés',
     'Count' => 'Mennyiség',
     'Created At' => 'Dátum',
@@ -34,8 +32,12 @@ return [
     'Item Price' => 'Termék ár',
     'Money' => 'Összeg',
     'Money Currency' => 'Ár valuta',
+    'Money total' => 'Összesen',
+    'Product' => 'Termék',
     'Rate' => 'Árfolyam',
     'Status' => 'Státusz',
+    'Ticket' => 'Bérlet',
+    'Total' => 'Összesen',
     'Type' => 'Típus',
     'Updated At' => 'Módosíáts',
 ];
diff --git a/common/messages/hu/customer/frontend.php b/common/messages/hu/customer/frontend.php
new file mode 100644
index 0000000..b27dd02
--- /dev/null
+++ b/common/messages/hu/customer/frontend.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'E-mail or phone number required!' => 'E-mail vagy telefon kötelező!',
+];
diff --git a/common/messages/hu/frontend/account-state.php b/common/messages/hu/frontend/account-state.php
index 020a37e..b88017e 100644
--- a/common/messages/hu/frontend/account-state.php
+++ b/common/messages/hu/frontend/account-state.php
@@ -17,13 +17,13 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Account states' => 'Kassza műveletek',
-    'Close account state' => 'Kassza zárás',
-    'Open account state' => 'Kassza nyitás',
+    'Default account' => 'Alapértelmezett kassza',
     'Account States' => 'Kassza műveletek',
+    'Account states' => 'Kassza műveletek',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szereté ezt a műveletet?',
     'Close Account State' => 'Kassza Zárás',
     'Close account' => 'Kassza zárás',
+    'Close account state' => 'Kassza zárás',
     'Create' => 'Mentés',
     'Create Account State' => 'Új kassza művelet',
     'Delete' => 'Törlés',
@@ -32,6 +32,7 @@ return [
     'Last closing money' => 'Útolsó záró összeg',
     'Notes total' => 'Címletek összesen',
     'Open Account State' => 'Kassza nyitás',
+    'Open account state' => 'Kassza nyitás',
     'Reset' => 'Reset',
     'Search' => 'Keresés',
     'Update' => 'Módosítás',
diff --git a/common/messages/hu/frontend/account.php b/common/messages/hu/frontend/account.php
new file mode 100644
index 0000000..86fa3c3
--- /dev/null
+++ b/common/messages/hu/frontend/account.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Accounts' => 'Kasszák',
+    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt az element?',
+    'Create' => 'Mentés',
+    'Create Account' => 'Új kassza',
+    'Delete' => 'Törlés',
+    'Reset' => 'Reset',
+    'Search' => 'Keresés',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítás: ',
+];
diff --git a/common/messages/hu/frontend/product.php b/common/messages/hu/frontend/product.php
index 3799713..3d0864d 100644
--- a/common/messages/hu/frontend/product.php
+++ b/common/messages/hu/frontend/product.php
@@ -17,25 +17,29 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Customer cart' => 'Vendég kosár',
+    'Fizetve' => 'Fizetve',
+    'To cart' => 'Kosárba',
+    'User Cart' => 'Kosárba',
+    'Write up' => 'Felír',
     'Account' => 'Kassza',
-    'Barcode or product code' => 'Vonalkód vagy termék kód',
-    'Comment' => 'Megjegyzés',
-    'Discount' => 'Kedvezmény',
-    'Product' => 'Termék',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
     'Barcode' => 'Vonalkód',
-    'Cart' => 'Kosár',
+    'Barcode or product code' => 'Vonalkód vagy termék kód',
+    'Comment' => 'Megjegyzés',
     'Count' => 'Mennyiség',
     'Create' => 'Mentés',
     'Create Product' => 'Új termék',
     'Currency' => 'Valuta',
     'Currency not found' => 'Valuta nem található',
     'Delete' => 'Törlés',
+    'Discount' => 'Kedvezmény',
     'Discount not found' => 'Kedvezmény nem található',
     'Item Price' => 'Termék ár',
     'Name' => 'Név',
     'Paid' => 'Fizetve',
     'Price' => 'Ár',
+    'Product' => 'Termék',
     'Product name' => 'Termék név',
     'Product not found!' => 'Termék nem található',
     'Product number' => 'Termák kód',
@@ -44,7 +48,6 @@ return [
     'Sale Price' => 'Eladási ár',
     'Search' => 'Keresés',
     'Sell product' => 'Termék eladás',
-    'Sell product and add to total' => 'Termék eladás és kosárba helyezés',
     'Stock' => 'Raktáron',
     'Stock {stock} lower then {count}!' => 'Raktáron {stock} kevesebb mint {count}!',
     'Total Price' => 'Összesen',
diff --git a/common/messages/hu/frontend/ticket.php b/common/messages/hu/frontend/ticket.php
index 6dc2eec..b4ffac3 100644
--- a/common/messages/hu/frontend/ticket.php
+++ b/common/messages/hu/frontend/ticket.php
@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Default account is set!' => 'Alapértelmezett kassza beállítva!',
     'Cart' => 'Kosár',
     'Invalid discount' => 'Érvénytelen kedvezmény',
     'Invalid ticket type' => 'Érvénytelen bérlet típus',
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index 4593754..8a2619f 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -17,14 +17,15 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Create Money Movement' => 'Új pénzmozgás',
+    'Reset' => 'Reset',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
-    'Reset' => '',
-    'Ticket' => 'Bérlet',
     'Create' => 'Mentés',
     'Create Transfer' => 'Új pénzmozgás',
     'Delete' => 'Törlés',
     'Search' => 'Keresés',
     'Termékeladás' => 'Termékeladás',
+    'Ticket' => 'Bérlet',
     'Transfers' => 'Tranzakciók',
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítás: ',
diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php
index febe2ea..31088de 100644
--- a/frontend/controllers/AccountController.php
+++ b/frontend/controllers/AccountController.php
@@ -42,7 +42,7 @@ class AccountController extends Controller
       $accounts = Account::read();
       
         if ($model->load(Yii::$app->request->post()) && $model->writeToSession()) {
-        	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Default session is set!') );
+        	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Default account is set!') );
         }
             return $this->render('select', [
                 'model' => $model,

From e34b150d742e57ea3f827134b30a4032642ecd1f Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 30 Oct 2015 09:28:58 +0100
Subject: [PATCH 053/100] add frontend changes

---
 backend/models/TransferSearch.php             |   6 +-
 common/components/CustomerAwareBehavior.php   |  24 ++
 common/messages/hu/common/transfer.php        |   2 +-
 .../messages/hu/frontend/money-movement.php   |  24 ++
 common/messages/hu/frontend/product.php       |   2 +-
 common/models/MoneyMovement.php               |   2 +
 common/models/ShoppingCart.php                |   5 +-
 common/models/Transfer.php                    |  50 +++-
 common/models/UserSoldItem.php                |  19 ++
 ...le__transfer__add__column__id_customer.php |  30 ++
 ...ansfer__fix__id_customer__column__name.php |  30 ++
 frontend/components/FrontendController.php    |  62 +++++
 frontend/components/FrontendMenuStructure.php |  14 +-
 frontend/controllers/AccountController.php    |   1 +
 frontend/controllers/ProductController.php    |   3 +-
 frontend/controllers/SiteController.php       |   7 +-
 frontend/controllers/TicketController.php     |  93 ++-----
 frontend/controllers/TransferController.php   |  22 ++
 frontend/models/AccountSelect.php             |   8 +
 frontend/models/MoneyMovementSearch.php       |  10 +
 frontend/models/ProductSaleForm.php           |   6 +-
 frontend/models/TicketCreate.php              |  62 ++++-
 frontend/models/TransferSearch.php            | 259 ++++++++++++++++--
 frontend/views/account/select.php             |   3 +-
 frontend/views/money-movement/index.php       |   1 -
 frontend/views/product/_customer_cart.php     |   6 +-
 frontend/views/product/_sale_form.php         |   7 +-
 frontend/views/product/_user_cart.php         |   9 +-
 frontend/views/product/create.php             |   1 +
 frontend/views/product/sale.php               |   3 +
 frontend/views/ticket/_customer_cart.php      |  41 +++
 frontend/views/ticket/_form.php               |  21 +-
 frontend/views/ticket/_user_cart.php          |  43 +++
 frontend/views/ticket/create.php              |  19 +-
 frontend/views/transfer/_index_stat.php       |  96 +++++++
 frontend/views/transfer/_search.php           |  39 ++-
 frontend/views/transfer/_view.php             |  65 +++++
 frontend/views/transfer/index.php             |  61 +++--
 frontend/views/transfer/view.php              |  46 ++--
 frontend/web/js/product.sell.js               |   7 +-
 frontend/web/js/ticket.sell.js                | 128 +++++++--
 41 files changed, 1083 insertions(+), 254 deletions(-)
 create mode 100644 common/components/CustomerAwareBehavior.php
 create mode 100644 common/messages/hu/frontend/money-movement.php
 create mode 100644 console/migrations/m151029_090850_alter__table__transfer__add__column__id_customer.php
 create mode 100644 console/migrations/m151029_095915_alter__table__transfer__fix__id_customer__column__name.php
 create mode 100644 frontend/components/FrontendController.php
 create mode 100644 frontend/views/ticket/_customer_cart.php
 create mode 100644 frontend/views/ticket/_user_cart.php
 create mode 100644 frontend/views/transfer/_index_stat.php
 create mode 100644 frontend/views/transfer/_view.php

diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index e6a1b2e..7f9e7e7 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -37,7 +37,7 @@ class TransferSearch extends Transfer
         return [
             [[  'id_account','id_user', 'type'], 'integer'],
 //             [[ 'searchObjectName' ], 'string'],
-        	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+        	[[ 'start', ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         ];
     }
@@ -92,8 +92,8 @@ class TransferSearch extends Transfer
             'transfer.id_user' => $this->id_user,
         ]);
         
-        $query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ]   );
-        $query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
+        $query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
+        $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
 
 //         if ( isset($this->searchObjectName))
 //         $query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
diff --git a/common/components/CustomerAwareBehavior.php b/common/components/CustomerAwareBehavior.php
new file mode 100644
index 0000000..30b02f9
--- /dev/null
+++ b/common/components/CustomerAwareBehavior.php
@@ -0,0 +1,24 @@
+<?php
+namespace common\components;
+
+use yii\base\Behavior;
+use common\models\Customer;
+
+class CustomerAwareBehavior extends Behavior{
+	
+	
+	public function getCustomerName(){
+		$result = "";
+		$customer = $this->owner->customer;
+		if (isset($customer)){
+			$result  = $customer->name;
+		}
+		return $result;
+	}
+
+	
+	public function getCustomer(){
+		return $this->owner->hasOne( Customer::className(), ["id_customer" =>"id_customer" ] ) ;
+	}
+	
+}
\ No newline at end of file
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
index 18ef6f3..43caddd 100644
--- a/common/messages/hu/common/transfer.php
+++ b/common/messages/hu/common/transfer.php
@@ -27,7 +27,7 @@ return [
     'Id Currency' => 'Valuta',
     'Id Discount' => 'Kedvezmény',
     'Id Object' => 'Termék',
-    'Id Transfer' => 'Pénzmozgás',
+    'Id Transfer' => 'Tranzakció',
     'Id User' => 'Felhasználó',
     'Item Price' => 'Termék ár',
     'Money' => 'Összeg',
diff --git a/common/messages/hu/frontend/money-movement.php b/common/messages/hu/frontend/money-movement.php
new file mode 100644
index 0000000..f6f0126
--- /dev/null
+++ b/common/messages/hu/frontend/money-movement.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Account' => 'Kassza',
+    'User' => 'Felhasználó',
+    'End' => 'Időintervallum vége',
+    'Start' => 'Időintervallum kezdete',
+];
diff --git a/common/messages/hu/frontend/product.php b/common/messages/hu/frontend/product.php
index 3d0864d..6df19ec 100644
--- a/common/messages/hu/frontend/product.php
+++ b/common/messages/hu/frontend/product.php
@@ -20,7 +20,7 @@ return [
     'Customer cart' => 'Vendég kosár',
     'Fizetve' => 'Fizetve',
     'To cart' => 'Kosárba',
-    'User Cart' => 'Kosárba',
+    'User Cart' => 'Recepció kosár',
     'Write up' => 'Felír',
     'Account' => 'Kassza',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
diff --git a/common/models/MoneyMovement.php b/common/models/MoneyMovement.php
index fb22fca..4c45d40 100644
--- a/common/models/MoneyMovement.php
+++ b/common/models/MoneyMovement.php
@@ -95,6 +95,8 @@ class MoneyMovement extends \yii\db\ActiveRecord
             'comment' => Yii::t('common/money-movement', 'Comment'),
             'created_at' => Yii::t('common/money-movement', 'Created At'),
             'updated_at' => Yii::t('common/money-movement', 'Updated At'),
+        	'accountName' => Yii::t('frontend/money-movement', 'Account'),
+        	'userName' => Yii::t('frontend/money-movement', 'User'),
         ];
     }
     
diff --git a/common/models/ShoppingCart.php b/common/models/ShoppingCart.php
index a955c0b..af46e66 100644
--- a/common/models/ShoppingCart.php
+++ b/common/models/ShoppingCart.php
@@ -68,8 +68,9 @@ class ShoppingCart extends \yii\db\ActiveRecord
     	//delete cart
     	$sql = "UPDATE transfer AS t
 				INNER JOIN shopping_cart AS s ON t.id_transfer = s.id_transfer
-				SET t.status = "  . Transfer::STATUS_PAID . " t.paid_at = " . date('Y-m-d H:i:s' )
-				. " WHERE  t.status = " . Transfer::STATUS_NOT_PAID;
+				SET t.status = "  . Transfer::STATUS_PAID . ", t.paid_at = '" . date('Y-m-d H:i:s' ) ."'"
+				. " WHERE  t.status = " . Transfer::STATUS_NOT_PAID
+    			. " and s.id_customer = " . $customer->id_customer ;
     	
     	$q1 = Yii::$app->db->createCommand($sql);
     	$q1->execute();
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 7c4b6cb..a06a8ba 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -8,6 +8,8 @@ use yii\helpers\ArrayHelper;
 use yii\behaviors\TimestampBehavior;
 use common\components\AccountAwareBehavior;
 use common\components\UserAwareBehavior;
+use common\components\DiscountAwareBehavior;
+use common\components\CustomerAwareBehavior;
 
 /**
  * This is the model class for table "transfer".
@@ -29,6 +31,8 @@ use common\components\UserAwareBehavior;
  * @property string $created_at
  * @property string $updated_at
  * @property integer $direction
+ * @property string $paid_at
+ * @property integer $id_customer
  */
 class Transfer extends \common\models\BaseFitnessActiveRecord
 {
@@ -54,12 +58,12 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
 				'class' => TimestampBehavior::className(),
 				'value' => function(){ return date('Y-m-d H:i:s' ); }
 		],
-// 		[
-// 			'class' => AccountAwareBehavior::className(),
-// 		],
-// 		[
-// 			'class' => UserAwareBehavior::className(),
-// 		],
+				[
+				'class' => DiscountAwareBehavior::className(),
+		],
+				[
+				'class' => CustomerAwareBehavior::className(),
+		],
 		], parent::behaviors());
 	}
 	
@@ -103,9 +107,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
             'money_currency' => Yii::t('common/transfer', 'Money Currency'),
             'rate' => Yii::t('common/transfer', 'Rate'),
             'id_user' => Yii::t('common/transfer', 'Id User'),
+            'id_customer' => Yii::t('common/transfer', 'Customer'),
             'comment' => Yii::t('common/transfer', 'Comment'),
             'created_at' => Yii::t('common/transfer', 'Created At'),
             'updated_at' => Yii::t('common/transfer', 'Updated At'),
+            'paid_at' => Yii::t('common/transfer', 'Paid At'),
         ];
     }
     
@@ -136,9 +142,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $this->hasOne( Currency::className(), ["id_currency" =>"id_currency" ] );
     }
     
-    public function getDiscount(){
-    	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
-    }
+//     public function getDiscount(){
+//     	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
+//     }
     
     public function getUserSoldItem(){
     	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );
@@ -256,8 +262,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
      * @param $discount common\models\Discount
      * @param $currency common\models\Currency
      * @param $product common\models\Product
+     * @param $customer common\models\Customer
      * */
-    public static function createProductTransfer($sale,$account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID){
+    public static function createProductTransfer($sale,$account, $discount, $currency, $count,$product , $status = Transfer::STATUS_PAID,$customer = null){
     	$transfer = new Transfer();
     	
     	$transfer->type = Transfer::TYPE_PRODUCT;
@@ -287,6 +294,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	$transfer->id_account = $account->id_account;
     	
+    	if ( isset( $customer ) ){
+    		$transfer->id_customer = $customer->id_customer;
+    	}
+    	
     	return $transfer;
     }
     
@@ -309,6 +320,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	$transfer->id_account = $account->id_account;
     	
+    	$transfer->paid_at =  date('Y-m-d H:i:s' ) ;
+    	
     	return $transfer;
     }
     /**
@@ -317,9 +330,10 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
      * @param $currency common\models\Currency
      * @param $ticket common\models\Ticket
      * */
-    public static function createTicketTransfer($account, $discount, $currency, $count,$ticket ){
+    public static function createTicketTransfer($account, $discount, $currency, $count,$ticket ,$status = Transfer::STATUS_NOT_PAID){
     	$transfer = new Transfer();
     	
+    	$transfer->status = $status;
     	$transfer->type = Transfer::TYPE_TICKET;
     	
     	$transfer->id_object  = $ticket->id_ticket;
@@ -422,6 +436,20 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     			self::TYPE_TICKET => Yii::t('common/transfer','Ticket'),	
     	];
     }
+    public static function statuses( ) {
+    	return [
+    			self::STATUS_NOT_PAID => Yii::t('common/transfer','Nincs fizetve'),	
+    			self::STATUS_PAID => Yii::t('common/transfer','Fizetve'),	
+    	];
+    }
+    public   function getStatusName( ) {
+    	$status = null;
+    	$statuses = self::statuses();
+    	if ( array_key_exists($this->status, $statuses)){
+    		$status = $statuses[$this->status];
+    	}
+    	return $status;
+    }
     
     
     
diff --git a/common/models/UserSoldItem.php b/common/models/UserSoldItem.php
index 2d3ad74..ff40dd0 100644
--- a/common/models/UserSoldItem.php
+++ b/common/models/UserSoldItem.php
@@ -61,5 +61,24 @@ class UserSoldItem extends \yii\db\ActiveRecord
     }
     
     
+    /**
+     * @param common\models\User $user
+     * */
+    public static function payout( $user ) {
+    	//apply transfer object
+    	//delete cart
+    	$sql = "UPDATE transfer AS t
+				INNER JOIN user_sold_item AS s ON t.id_transfer = s.id_transfer
+				SET t.status = "  . Transfer::STATUS_PAID . ", t.paid_at = '" . date('Y-m-d H:i:s' ) ."'"
+				. " WHERE  t.status = " . Transfer::STATUS_NOT_PAID
+    			. " and s.id_user =" . $user->id ;
+    	 
+    	$q1 = Yii::$app->db->createCommand($sql);
+    	$q1->execute();
+    	 
+    	UserSoldItem::deleteAll(['id_user' => Yii::$app->user->id]);
+    	 
+    }
+    
     
 }
diff --git a/console/migrations/m151029_090850_alter__table__transfer__add__column__id_customer.php b/console/migrations/m151029_090850_alter__table__transfer__add__column__id_customer.php
new file mode 100644
index 0000000..899b057
--- /dev/null
+++ b/console/migrations/m151029_090850_alter__table__transfer__add__column__id_customer.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151029_090850_alter__table__transfer__add__column__id_customer extends Migration
+{
+    public function up()
+    {
+		$this->addColumn("transfer", 'id_customer"', 'int(11)');
+    }
+
+    public function down()
+    {
+        echo "m151029_090850_alter__table__transfer__add__column__id_customer cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151029_095915_alter__table__transfer__fix__id_customer__column__name.php b/console/migrations/m151029_095915_alter__table__transfer__fix__id_customer__column__name.php
new file mode 100644
index 0000000..b8b66f5
--- /dev/null
+++ b/console/migrations/m151029_095915_alter__table__transfer__fix__id_customer__column__name.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151029_095915_alter__table__transfer__fix__id_customer__column__name extends Migration
+{
+    public function up()
+    {
+		$this->renameColumn("transfer", 'id_customer"', "id_customer");
+    }
+
+    public function down()
+    {
+        echo "m151029_095915_alter__table__transfer__fix__id_customer__column__name cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/components/FrontendController.php b/frontend/components/FrontendController.php
new file mode 100644
index 0000000..02a148d
--- /dev/null
+++ b/frontend/components/FrontendController.php
@@ -0,0 +1,62 @@
+<?php
+namespace frontend\components;
+
+use Yii;
+use common\models\Order;
+use yii\helpers\Html;
+use common\models\MoneyMovement;
+use yii\db\Query;
+use common\models\AccountState;
+use yii\web\Controller;
+use yii\base\Object;
+use frontend\models\ReceptionForm;
+use common\models\UserSoldItem;
+use common\models\ShoppingCart;
+use common\models\Transfer;
+use common\models\User;
+
+class FrontendController extends  Controller{
+	
+	 
+	
+	protected function mkReceptionForm($number){
+		$receptionForm = new ReceptionForm();
+		$receptionForm->number = $number;
+		$receptionForm->readCard();
+		return $receptionForm;
+	}
+	
+	
+	protected function payoutCustomerCart($receptionForm){
+		$result = false;
+		if ( isset($receptionForm->customer)){
+			$connection = \Yii::$app->db;
+			$transaction = $connection->beginTransaction();
+			try {
+				ShoppingCart::payout($receptionForm->customer);
+				$transaction->commit();
+				Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Customer cart paid!') );
+				$result = true;
+			} catch(Exception $e) {
+				$transaction->rollback();
+			}
+		}
+		return $result;
+	}
+	
+	protected function payoutUserCart($receptionForm){
+		$connection = \Yii::$app->db;
+		$transaction = $connection->beginTransaction();
+		try {
+			$user = User::findOne(Yii::$app->user->id );
+			UserSoldItem::payout($user);
+			$transaction->commit();
+			Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'User cart paid!') );
+			return $this->redirect(['customer/reception'   ]);
+		} catch(Exception $e) {
+			$transaction->rollback();
+		}
+		return true;
+	}
+	
+}
\ No newline at end of file
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 6e61ed1..85bbe5e 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -11,15 +11,19 @@ use common\models\AccountState;
 class FrontendMenuStructure{
 	
 	public $menuItems;
-	public $start;
-	public $tomorrow;
+	public $start;//start date and time
+	public $tomorrow;//tomorrow date and time
+	
+	public $startDate;//start date
+	public $tomorrowDate;//tomorrow date 
 	
 	public function __construct(){
 		$this->menuItems = [];
-// 		print('abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>abcd<br>');
 		
 		$this->start =  Yii::$app->formatter->asDatetime(  strtotime('today UTC') );
 		$this->tomorrow =  Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
+		$this->startDate =  Yii::$app->formatter->asDate(  strtotime('today UTC') );
+		$this->tomorrowDate =  Yii::$app->formatter->asDate( strtotime('tomorrow UTC') );
 		
 		Yii::info("Start date is : ". $this->start);
 		
@@ -57,13 +61,15 @@ class FrontendMenuStructure{
 		if ( $this->isLogged() ){
 			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
 // 			, 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow
-			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ];
+// 			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'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/transfer','Transfers'), 'url' => ['/transfer/index',  'TransferSearch[start]' => $this->start, 'TransferSearch[end]' => $this->tomorrow ] ],
 					]
 					
 			];
diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php
index 31088de..f1d44e9 100644
--- a/frontend/controllers/AccountController.php
+++ b/frontend/controllers/AccountController.php
@@ -43,6 +43,7 @@ class AccountController extends Controller
       
         if ($model->load(Yii::$app->request->post()) && $model->writeToSession()) {
         	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Default account is set!') );
+        	return $this->redirect(['product/sale']);
         }
             return $this->render('select', [
                 'model' => $model,
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 77299a0..19942ea 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -141,8 +141,7 @@ class ProductController extends Controller
     		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
     	
     		$user = User::findOne(Yii::$app->user->id );
-    		
-    		UserSoldItem::deleteAll(['id_user' => Yii::$app->user->id]);
+    		UserSoldItem::payout($user);
     		
     		$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
     		$result['transfers'] = $userTransfers;
diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index cf691ae..66882c3 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -88,11 +88,10 @@ class SiteController extends Controller
 
         $model = new LoginForm();
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
-            return $this->goBack();
+//             return $this->goBack();
+				return $this->redirect(['account/select']);
         } else {
-            return $this->render('login', [
-                'model' => $model,
-            ]);
+            return $this->render('login', ['model' => $model,]);
         }
     }
 
diff --git a/frontend/controllers/TicketController.php b/frontend/controllers/TicketController.php
index 890af5e..0e72397 100644
--- a/frontend/controllers/TicketController.php
+++ b/frontend/controllers/TicketController.php
@@ -16,11 +16,14 @@ use common\models\Account;
 use yii\base\Object;
 use common\models\Transfer;
 use common\models\User;
+use common\models\ShoppingCart;
+use common\models\UserSoldItem;
+use frontend\components\FrontendController;
 
 /**
  * TicketController implements the CRUD actions for Ticket model.
  */
-class TicketController extends Controller
+class TicketController extends FrontendController
 {
     public function behaviors()
     {
@@ -52,9 +55,7 @@ class TicketController extends Controller
      */
     public function actionIndex($number = null)
     {
-    	$receptionForm = new ReceptionForm();
-    	$receptionForm->number = $number;
-    	$receptionForm->readCard();
+    	$receptionForm = $this->mkReceptionForm($number);
     	
     	
     	if ( !isset($receptionForm->card ) ){
@@ -79,14 +80,19 @@ class TicketController extends Controller
     public function actionCreate($number = null)
     {
     	
-    	$receptionForm = new ReceptionForm();
-    	$receptionForm->number = $number;
-    	$receptionForm->readCard();
+    	$receptionForm =$this->mkReceptionForm($number);
     	
     	if ( !isset($receptionForm->card ) ){
     		throw new NotFoundHttpException( Yii::t('frontend/ticket', 'The requested card does not exist.'));
     	}
     	
+    	if ( isset($_POST['payout_customer_cart']) &&  $this->payoutCustomerCart($receptionForm) ){
+    		return $this->redirect(['customer/reception'   ]);
+    	}else if ( isset($_POST['payout_user_cart']) && $this->payoutUserCart($receptionForm)){
+    			return $this->redirect(['customer/reception'   ]);
+    	}
+    	
+    	
         $model = new  TicketCreate();
 
         $discounts = Discount::read();
@@ -97,7 +103,7 @@ class TicketController extends Controller
         
         $user = User::findOne( [ 'id' => Yii::$app->user->id ] );
         
-
+		$model->customer = $receptionForm->customer;
         $model->id_user = \Yii::$app->user->id;
         $model->status = Ticket::STATUS_ACTIVE;
         $model->usage_count = 0;
@@ -107,9 +113,10 @@ class TicketController extends Controller
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
         	Yii::$app->session->setFlash('success', Yii::t('frontend/ticket', 'Ticket added to customer') );
             return $this->redirect(['product/sale', 'number' => $receptionForm->card->number]);
-        } else {
+        } 
         	
-        	$userTransfers = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+        	$model->userCart = Transfer::modelsToArray( Transfer::readUserSoldTransfers($user) );
+        	$model->customerCart = Transfer::modelsToArray( Transfer::readCustomerCart( $receptionForm->customer ) );
         	
             return $this->render('create', [
                 'model' => $model,
@@ -117,71 +124,7 @@ class TicketController extends Controller
                 'ticketTypes' => $ticketTypes,
                 'accounts' => $accounts,
             	'receptionForm' => $receptionForm,
-            	'userTransfers' => $userTransfers,
             ]);
-        }
     }
-
-    /**
-     * Finds the Ticket model based on its primary key value.
-     * If the model is not found, a 404 HTTP exception will be thrown.
-     * @param integer $id
-     * @return Ticket the loaded model
-     * @throws NotFoundHttpException if the model cannot be found
-     */
-    protected function findModel($id)
-    {
-        if (($model = Ticket::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-    /**
-     * Displays a single Ticket model.
-     * @param integer $id
-     * @return mixed
-     */
-    /*
-    public function actionView($id)
-    {
-        return $this->render('view', [
-            'model' => $this->findModel($id),
-        ]);
-    }
-	*/
-    /**
-     * Deletes an existing Ticket model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    /*
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-	*/
-    /**
-     * Updates an existing Ticket model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    /*
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_ticket]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-*/
+ 
 }
diff --git a/frontend/controllers/TransferController.php b/frontend/controllers/TransferController.php
index 03bebad..11ae4f6 100644
--- a/frontend/controllers/TransferController.php
+++ b/frontend/controllers/TransferController.php
@@ -9,6 +9,7 @@ use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use frontend\models\TransferMoneyMovementSearch;
+use common\models\Account;
 
 /**
  * TransferController implements the CRUD actions for Transfer model.
@@ -41,6 +42,27 @@ class TransferController extends Controller
             'dataProvider' => $dataProvider,
         ]);
     }
+    /**
+     * Lists all Transfer models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new TransferSearch();
+        $searchModel->accounts = Account::read();
+        $searchModel->load(Yii::$app->request->queryParams);
+        
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        
+        $searchModel->totalsTransfers(Yii::$app->request->queryParams);
+
+        
+        
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
 
     /**
      * Displays a single Transfer model.
diff --git a/frontend/models/AccountSelect.php b/frontend/models/AccountSelect.php
index 49ada27..9be8e0a 100644
--- a/frontend/models/AccountSelect.php
+++ b/frontend/models/AccountSelect.php
@@ -38,5 +38,13 @@ class AccountSelect  extends Model
     	Account::writeDefault($account);
     	return true;
     }
+    
+    /*  */
+    
+    public function attributeLabels(){
+    	return [
+    			'id_account' =>Yii::t('frontend/account', 'Account')
+    	];
+    }
      
 }
diff --git a/frontend/models/MoneyMovementSearch.php b/frontend/models/MoneyMovementSearch.php
index e51e175..45896ea 100644
--- a/frontend/models/MoneyMovementSearch.php
+++ b/frontend/models/MoneyMovementSearch.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\MoneyMovement;
+use yii\helpers\ArrayHelper;
 
 /**
  * MoneyMovementSearch represents the model behind the search form about `common\models\MoneyMovement`.
@@ -69,4 +70,13 @@ class MoneyMovementSearch extends MoneyMovement
 
         return $dataProvider;
     }
+    
+    public function attributeLabels( ) {
+    	return ArrayHelper::merge(parent::attributeLabels(), 
+    			[
+    					'start' => Yii::t('frontend/money-movement', 'Start'),
+    					'end' => Yii::t('frontend/money-movement', 'End'),
+    			]
+    			);
+    }
 }
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index a71254f..4516c38 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -184,14 +184,16 @@ class ProductSaleForm extends Model
     }
     
     protected function saveTransfer(){
+    	$customer = null;
     	$status  = Transfer::STATUS_PAID;
     	if (   $this->isAppendToUserCart() ){
     		$status  = Transfer::STATUS_NOT_PAID;
     	}else if ( $this->isAppendToCustomerCart() ){
     		$status = Transfer::STATUS_NOT_PAID; 
+    		$customer = $this->customer;
     	}
     	
-    	$this->transfer =  Transfer::createProductTransfer($this->sale,$this->account, $this->discount, $this->currency, $this->count,   $this->product,$status);
+    	$this->transfer =  Transfer::createProductTransfer($this->sale,$this->account, $this->discount, $this->currency, $this->count,   $this->product,$status,$customer);
     	if ( isset($this->comment)){
  			$this->transfer->comment = $this->comment;
     	}
@@ -229,8 +231,6 @@ class ProductSaleForm extends Model
     }
     
     public function appendToCustomerCart(){
-//     	print_r("cart: ".$this->cart );
-//     	print_r("customer:: ".$this->customer );
     	if ( $this->isAppendToCustomerCart() && isset($this->customer)  ){
     		$item = new ShoppingCart();
     		$item->id_customer = $this->customer->id_customer;
diff --git a/frontend/models/TicketCreate.php b/frontend/models/TicketCreate.php
index 97be293..2824943 100644
--- a/frontend/models/TicketCreate.php
+++ b/frontend/models/TicketCreate.php
@@ -7,8 +7,16 @@ use common\models\Account;
 use common\models\Discount;
 use common\models\Transfer;
 use common\models\UserSoldItem;
+use common\models\ShoppingCart;
 use yii\base\Object;
 
+/**
+ *  @property $cart string  name of cart, into we put the ticket
+ *  @property $userCart common\models\Transfer[]  items in user cart
+ *  @property $customerCart common\models\Transfer[]  items in customer cart
+ *  @property $customer common\models\Customer  selected customer
+ *  
+ *  */
 class TicketCreate  extends Ticket{
 
 	public $_currency;
@@ -16,6 +24,12 @@ class TicketCreate  extends Ticket{
 	public $_discount;
 	public $_transfer;
 	
+	
+	public $customer;
+	public $userCart;
+	public $customerCart;
+	
+	
 	public $cart;
 	
 	public function rules()
@@ -88,14 +102,15 @@ class TicketCreate  extends Ticket{
 	
 	public function afterSave($insert, $changedAttributes){
 		$this->addTransfer();
-		$this->addToCart();
+    	$this->appendToUserCart();
+    	$this->appendToCustomerCart();
 		
 	
 	}
 
 	protected function addTransfer(){
 		$transfer = Transfer::createTicketTransfer($this->_account, $this->_discount, null, 1, $this);
-		$transfer->status = Transfer::STATUS_PAID;
+// 		$transfer->status = Transfer::STATUS_PAID;
 		if ( isset($this->comment)){
 			$transfer->comment = $this->comment;
 		}
@@ -114,12 +129,41 @@ class TicketCreate  extends Ticket{
 	}
 	
 	
-	public function isAddToCart(){
-		$result = false;
-		if ( isset( $this->cart )  && $this->cart  == 'add' ){
-			$result = true;
-		}
-		return $result;
-	}
+	public function isAppendToUserCart(){
+    	$result = false;
+    	if ( isset( $this->cart )  && $this->cart  == 'user' ){
+    		$result = true;
+    	}
+    	return $result;
+    }
+    
+    public function isAppendToCustomerCart(){
+    	$result = false;
+    	if ( isset( $this->cart )  && $this->cart  == 'customer' ){
+    		$result = true;
+    	}
+    	return $result;
+    }
+    
+    
+    public function appendToUserCart(){
+    	if ( $this->isAppendToUserCart() ){
+    		$item = new UserSoldItem();
+    		$item->id_transfer = $this->_transfer->id_transfer;
+    		$item->id_user = \Yii::$app->user->id;
+    		$item->save(false);
+    	}
+    }
+    
+    public function appendToCustomerCart(){
+    	if ( $this->isAppendToCustomerCart() && isset($this->customer)  ){
+    		$item = new ShoppingCart();
+    		$item->id_customer = $this->customer->id_customer;
+    		$item->id_transfer = $this->_transfer->id_transfer;
+    		$item->save(false);
+    	}
+    }
+    
+   
 	
 }
\ No newline at end of file
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
index e920478..4080b91 100644
--- a/frontend/models/TransferSearch.php
+++ b/frontend/models/TransferSearch.php
@@ -6,31 +6,56 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Transfer;
+use yii\base\Object;
+use yii\db\Query;
+use yii\db\Expression;
+use common\models\Account;
 
+use yii\helpers\ArrayHelper;
 /**
  * TransferSearch represents the model behind the search form about `common\models\Transfer`.
  */
 class TransferSearch extends Transfer
 {
+	
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+	public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
+	public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
+	public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
+	public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
+	
+	
+	public $accounts;
+	
+	public $types;
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['id_transfer', 'id_discount', 'id_currency', 'id_object', 'status', 'type', 'item_price', 'count', 'money', 'money_currency', 'rate', 'id_user'], 'integer'],
-            [['comment', 'created_at', 'updated_at'], 'safe'],
+//         	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+//         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
+        		
+        	[[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        		
+			[ [ 'id_account'  ] , 'integer'],
+        	['types', 'each', 'rule' => ['integer']],
+// 			[ [ 'types'  ], function ($attribute, $params) {
+// 					if (!is_array($this->$attribute)) {
+// 						$this->addError($attribute, 'Invalid array');
+// 					}
+// 				}],
         ];
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
 
     /**
      * Creates data provider instance with search query applied
@@ -56,24 +81,208 @@ class TransferSearch extends Transfer
         }
 
         $query->andFilterWhere([
-            'id_transfer' => $this->id_transfer,
-            'id_discount' => $this->id_discount,
-            'id_currency' => $this->id_currency,
-            'id_object' => $this->id_object,
-            'status' => $this->status,
+            'id_account' => $this->id_account,
             'type' => $this->type,
-            'item_price' => $this->item_price,
-            'count' => $this->count,
-            'money' => $this->money,
-            'money_currency' => $this->money_currency,
-            'rate' => $this->rate,
-            'id_user' => $this->id_user,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
+        
+        $query->andFilterWhere(['in' ,'type', $this->types]);
 
-        $query->andFilterWhere(['like', 'comment', $this->comment]);
-
+        $created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ]  ];
+        $paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ]  ];
+        
+        $query->andFilterWhere(['or' , $created_condition , $paid_condition]);
+        
         return $dataProvider;
     }
+    
+    
+    protected function mkTotalQuery($mode){
+    	
+    	$query = new Query();
+    	
+    	$query->addSelect( [
+    			new Expression( 'transfer.id_account as account'),
+    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )
+    	
+    	]);
+    	$query->from('transfer');
+    	
+    	$query->andFilterWhere([
+    			'id_account' => $this->id_account,
+    			'type' => $this->type,
+    			]);
+
+    	$query->andWhere(['id_user' => Yii::$app->user->id]);
+    	
+    	$query->andFilterWhere(['in' ,'type', $this->types]);
+    	
+    	
+    	if ( $mode == 'created_at'){
+	     	$query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
+    	}else if ( $mode == 'paid_at'){
+	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $this->timestampStart ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.paid_at'  , $this->timestampEnd ]   );
+    	}else if ( $mode == 'created_at_not_paid'){
+	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_NOT_PAID  ]   );
+    	    $query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
+    	}else if ( $mode == 'created_at_paid'){
+	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
+    	   	$query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
+    	}
+    	
+    	$query->groupBy('transfer.id_account');
+    	
+    	return $query;
+    	
+    	
+    }
+    
+    protected function mkTransferTotalsWithZeroValue( ){
+    	$result = [];
+    	
+    	foreach (  $this->accounts as $a ){
+    		$accountTotal = [
+    				'id_account' => $a->id_account,
+    				'label' => $a->name,
+    				'money' => 0
+    		];
+    		
+    		$result[] = $accountTotal;
+    	}
+    	return $result;
+    }
+    
+   
+    
+    protected function mkTotalsResult($queryResult,$accountMap){
+    	
+    	$totals = [];
+    	$totals['total'] = 0;
+    	
+    	$totals['accounts'] = [];
+    	
+    	foreach ($queryResult as $item){
+    		$account = "";
+    		if ( array_key_exists($item['account'], $accountMap)){
+    			$account = $accountMap[$item['account']];
+    		}
+    		 
+    		$accountTotal = [
+    				'id_account' => $item['account'],
+    				'label' => 	$account,
+    				'money' => $item['money']
+    		];
+    		$totals['accounts'][] = $accountTotal;
+    		$totals['total'] += $item['money'];
+    	}
+    	return $totals;
+    }
+    
+    protected function findByAccountInQueryResult($queryResult, $account){
+    	$result = null;
+    	foreach ($queryResult as $item){
+    		if( $item['account'] == $account->id_account ){
+    			$result = $item;
+    		}
+    	}
+    	return $result;
+    }
+    
+    protected function mkTotalsResultWithAllAvailableAccount($queryResult,$accountMap){
+    	
+    	$totals = [];
+    	$totals['total'] = 0;
+    	
+    	$totals['accounts'] = [];
+    	
+    	foreach ($this->accounts as $account){
+//     		echo  'account="'. $this->id_account .'"<br>';
+    		if ( isset($this->id_account) &&  is_numeric($this->id_account)  && $this->id_account != $account->id_account  ){
+    			continue ;
+    		}
+    		$accountTotal = [
+    				'id_account' => $account->id_account,
+    				'label' => 	$account->name,
+    				'money' => 0,
+    		];
+    		
+    		$item = $this->findByAccountInQueryResult($queryResult, $account);
+    		
+    		if ( isset($item)){
+    			$accountTotal['money'] = $item['money'];
+    		}
+    		 
+    		$totals['accounts'][] = $accountTotal;
+    		$totals['total'] += $accountTotal['money'];
+    	}
+    	return $totals;
+    }
+    
+    
+    public function mkPaidAtTotals($accountMap){
+    	$query =  $this->mkTotalQuery('paid_at');
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	
+//     	$paidAtTotals = $this->mkTotalsResult($result, $accountMap);
+    	$paidAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
+    	
+    	return $paidAtTotals;
+    }
+    
+    public function mkCreatedAtTotals($accountMap){
+    	$query =  $this->mkTotalQuery('created_at');
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	
+    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
+    	
+    	return $createdAtTotals;
+    }
+    
+    public function mkCreatedAtNotPaidTotals($accountMap){
+    	$query =  $this->mkTotalQuery('created_at_not_paid');
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	
+    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
+    	
+    	return $createdAtTotals;
+    }
+    
+    public function mkCreatedAtPaidTotals($accountMap){
+    	$query =  $this->mkTotalQuery('created_at_paid');
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	 
+    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
+    	 
+    	return $createdAtTotals;
+    }
+    
+    
+    public function totalsTransfers($params){
+    	$accountTotals = [];
+    	$fullTotal = [
+    			'label' => Yii::t('common/transfer', 'Total'),
+    			'money' => 0
+    	];
+    	
+    	if ( $this->hasErrors() ){
+    		return;	
+    	}
+    	
+    	$accounts =  Account::find()->orderBy("name asc")->all();
+    	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
+    	
+		$this->totalsCreatedAt = $this->mkCreatedAtTotals($accountMap);
+		$this->totalsPaidAt = $this->mkPaidAtTotals($accountMap);
+		$this->totalsCreatedAtPaid = $this->mkCreatedAtPaidTotals($accountMap);
+		$this->totalsCreatedAtNotPaid = $this->mkCreatedAtNotPaidTotals($accountMap);
+    
+    }
+    
 }
diff --git a/frontend/views/account/select.php b/frontend/views/account/select.php
index 33ac305..0bf61f4 100644
--- a/frontend/views/account/select.php
+++ b/frontend/views/account/select.php
@@ -9,8 +9,9 @@ use frontend\components\HtmlHelper;
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<h1><?php echo Yii::t('frontend/account','Select account!')?></h1>
 <div class="account-form">
-
+	
     <?php $form = ActiveForm::begin(); ?>
 
 	<?php echo $form->field($model, 'id_account')->dropDownList(HtmlHelper::mkAccountOptions($accounts))  ?>
diff --git a/frontend/views/money-movement/index.php b/frontend/views/money-movement/index.php
index 3063fe2..ef198b8 100644
--- a/frontend/views/money-movement/index.php
+++ b/frontend/views/money-movement/index.php
@@ -26,7 +26,6 @@ $this->params['breadcrumbs'][] = $this->title;
             'accountName',
             'userName',
             'name',
-            'type',
             'money',
             'created_at:datetime',
 
diff --git a/frontend/views/product/_customer_cart.php b/frontend/views/product/_customer_cart.php
index 3ccf07d..551d3d0 100644
--- a/frontend/views/product/_customer_cart.php
+++ b/frontend/views/product/_customer_cart.php
@@ -33,4 +33,8 @@ use yii\bootstrap\Html;
 		</div>
 	</div>
 </div>
-<?php echo Html::a(Yii::t('frontend/product', "Fizetve"),null,[ 'id' => 'btn_pay_customer_cart', 'class' => 'btn btn-primary' ]) ?>
\ No newline at end of file
+<div class="row">
+	<div class='col-md-3 '>
+		<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_pay_customer_cart', 'class' => 'btn btn-primary btn-block' , 'name' => 'payout_customer_cart']) ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index 2e3069d..ad3bcf5 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -98,13 +98,10 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 		</div>
 	</div>
 	<div class="row">
-		<div class='col-md-4'>
-			<?php echo Html::a(Yii::t("frontend/product","Sell product"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_sell'] );?>
-		</div>
-		<div class='col-md-4'>
+		<div class='col-md-6'>
 			<?php echo Html::a(Yii::t("frontend/product","To cart"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_sell_append'] );?>
 		</div>
-		<div class='col-md-4'>
+		<div class='col-md-6'>
 			<?php 
 				if ( $receptionForm->isCardWithCustomer() ){
 					echo Html::a(Yii::t("frontend/product","Write up"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_add_to_customer_cart'] );
diff --git a/frontend/views/product/_user_cart.php b/frontend/views/product/_user_cart.php
index 1f4a1be..62416d5 100644
--- a/frontend/views/product/_user_cart.php
+++ b/frontend/views/product/_user_cart.php
@@ -1,5 +1,6 @@
 <?php
 use yii\bootstrap\Html;
+use kartik\widgets\ActiveForm;
 ?>
 
 
@@ -33,8 +34,10 @@ use yii\bootstrap\Html;
 		</div>
 	</div>
 </div>
-<div class='row' >
-	<div class='col-md-3'>
-		<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary btn-block' ]) ?>
+<div class="row">
+	<div class='col-md-3 '>
+		<?php $form = ActiveForm::begin([]); ?>
+			<?php echo Html::submitButton( Yii::t('frontend/product', "Paid"), [ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary btn-block' ,  'name' => 'payout_user_cart']) ?>
+		<?php ActiveForm::end(); ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/frontend/views/product/create.php b/frontend/views/product/create.php
index d24804f..114670f 100644
--- a/frontend/views/product/create.php
+++ b/frontend/views/product/create.php
@@ -16,6 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <?= $this->render('_form', [
         'model' => $model,
+    	'receptionForm' => $receptionForm,
     ]) ?>
 
 </div>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index d4347a4..67ebf81 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -33,6 +33,9 @@ $options['id_account'] = Account::readDefault();
 
 $this->registerJs ( 'new ProductSell( '. json_encode($options).');' );
 
+$this->params['breadcrumbs'][] =  Yii::t('frontend/product', 'Products') ;
+$this->params['breadcrumbs'][] = Yii::t('frontend/product', 'Sale');
+
 ?>
 
 <style>
diff --git a/frontend/views/ticket/_customer_cart.php b/frontend/views/ticket/_customer_cart.php
new file mode 100644
index 0000000..46ae78e
--- /dev/null
+++ b/frontend/views/ticket/_customer_cart.php
@@ -0,0 +1,41 @@
+<?php
+use yii\bootstrap\Html;
+use kartik\widgets\ActiveForm;
+?>
+<h1><?php  echo Yii::t('frontend/product','Customer cart')?></h1>
+<div class="row">
+	<div class='col-md-12 '>
+		<div class="customer-cart">
+			<table class="table table-bordered table-striped">
+				<thead>
+					<tr>
+						<th>
+							<?php echo Yii::t('frontend/product', 'Product name')?>
+						</th>
+						<th>
+							<?php echo Yii::t('frontend/product', 'Count')?>
+						</th>
+						<th>
+							<?php echo Yii::t('frontend/product', 'Currency')?>
+						</th>
+						<th>
+							<?php echo Yii::t('frontend/product', 'Item Price')?>
+						</th>
+						<th>
+							<?php echo Yii::t('frontend/product', 'Total Price')?>
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+<div class="row">
+	<div class='col-md-3 '>
+		<?php $form = ActiveForm::begin([]); ?>
+			<?php echo Html::submitButton( Yii::t('frontend/product', "Paid") , [ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary btn-block', 'name' => 'payout_customer_cart' ] ) ?>
+		<?php ActiveForm::end(); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/ticket/_form.php b/frontend/views/ticket/_form.php
index 3813fdc..948e46f 100644
--- a/frontend/views/ticket/_form.php
+++ b/frontend/views/ticket/_form.php
@@ -33,7 +33,9 @@ use common\models\Account;
 	<div class="col-md-12" >
 		<div class="ticket-form">
 		
-		    <?php $form = ActiveForm::begin(); ?>
+		    <?php $form = ActiveForm::begin([
+		    		'id' => 'ticket_form',
+		    ]); ?>
 		
 		    <?= Html::activeHiddenInput($model, 'cart')?>
 		    
@@ -64,11 +66,18 @@ use common\models\Account;
 		
 		    <?= $form->field($model, 'comment')->textarea(['maxlength' => true]) ?>
 			
-		    <div class="form-group">
-		        <?= Html::submitButton(  Yii::t('common/ticket', 'Create')  , [  'onclick' => ' $(\'#ticketcreate-cart\').val(\'\');','class' => 'btn btn-success'  ]) ?>
-		        <?= Html::submitButton(  Yii::t('common/ticket', 'Create and add to cart')  , [ 'onclick' => ' $(\'#ticketcreate-cart\').val(\'add\');',  'class' =>  'btn btn-success'  ]) ?>
-		    </div>
-		
+			<div class="row">
+				<div class='col-md-6'>
+					<?php echo Html::a(Yii::t("frontend/ticket","To cart"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_add_to_user_cart'] );?>
+				</div>
+				<div class='col-md-6'>
+					<?php 
+						if ( $receptionForm->isCardWithCustomer() ){
+							echo Html::a(Yii::t("frontend/ticket","Write up"),null,['class' => 'btn btn-success btn-block', 'id' => 'btn_add_to_customer_cart'] );
+						}			
+					?>
+				</div>
+			</div>
 		    <?php ActiveForm::end(); ?>
 		
 		</div>
diff --git a/frontend/views/ticket/_user_cart.php b/frontend/views/ticket/_user_cart.php
new file mode 100644
index 0000000..c9e55c8
--- /dev/null
+++ b/frontend/views/ticket/_user_cart.php
@@ -0,0 +1,43 @@
+<?php
+use yii\bootstrap\Html;
+use kartik\widgets\ActiveForm;
+?>
+
+
+<h1><?php  echo Yii::t('frontend/product','User Cart')?></h1>
+<div class="row">
+	<div class='col-md-12 '>
+		<div class="user-cart">
+		<table class="table table-bordered table-striped">
+			<thead>
+				<tr>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Product name')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Count')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Currency')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Item Price')?>
+					</th>
+					<th>
+						<?php echo Yii::t('frontend/product', 'Total Price')?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+			</tbody>
+		</table>
+		</div>
+	</div>
+</div>
+<div class='row' >
+	<div class='col-md-3'>
+		<?php $form = ActiveForm::begin([]); ?>
+			<?php echo Html::submitButton(Yii::t('frontend/product', "Paid"),[ 'id' => 'btn_pay_user_cart', 'class' => 'btn btn-primary btn-block' , 'name' => 'payout_user_cart']) ?>
+		<?php ActiveForm::end(); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/ticket/create.php b/frontend/views/ticket/create.php
index 31369d1..cb033a4 100644
--- a/frontend/views/ticket/create.php
+++ b/frontend/views/ticket/create.php
@@ -28,17 +28,13 @@ $options = [];
 // $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
 $options['clear_cart_url'] = Url::toRoute(['product/clear-list']);
 $options['types'] = TicketType::modelsToArray($ticketTypes);
-$options['transfer_list'] = $userTransfers;
+$options['user_cart'] = $model->userCart;
+$options['customer_cart'] = $model->customerCart;
 
 $this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
-
 ?>
 <div class="ticket-create">
-
 	<?php echo ReceptionWidget::widget( ['form' => $receptionForm, 'route' => ['customer/reception'] ] )?>
-
-
-
 	<div class="row">
 		<div class="col-md-6">
 		    <h1><?= Html::encode($this->title) ?></h1>
@@ -47,13 +43,14 @@ $this->registerJs ( 'new TicketSell( '. json_encode($options).');' );
 		    		'discounts' => $discounts,
 		    		'ticketTypes' => $ticketTypes,
 		    		'accounts' => $accounts,
+		    		'receptionForm' => $receptionForm,
 		    ]) ?>
 		</div>
-		<div class="col-md-6">
-			<h1><?php  echo Yii::t('frontend/ticket', 'Cart')?></h1>
-			<?php echo $this->render( "//common/_transfer_list" ) ?>
-			<?php echo Html::a(Yii::t('frontend/product', "Paid"),null,[ 'id' => 'btn_paid', 'class' => 'btn btn-primary' ]) ?>
+		<div class='col-md-6'>
+			<?php if (  $receptionForm->isCardWithCustomer()  ){ ?>
+				<?php echo $this->render('_customer_cart' ) ?>
+			<?php }?>
+			<?php echo $this->render('_user_cart' ) ?>
 		</div>
 	</div>
-
 </div>
diff --git a/frontend/views/transfer/_index_stat.php b/frontend/views/transfer/_index_stat.php
new file mode 100644
index 0000000..b026fc2
--- /dev/null
+++ b/frontend/views/transfer/_index_stat.php
@@ -0,0 +1,96 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\widgets\ListView;
+use yii\base\Widget;
+
+?>
+<div>
+		<div class="row">
+			<div class="col-md-4">
+				<div class="panel panel-info">
+					<div class="panel-heading">Kiadva az adott időszakban</div>
+					<div class="panel-body">
+						<dl class="dl-horizontal dl-totals">
+							<?php 
+								 foreach ($searchModel->totalsCreatedAt['accounts'] as $acc ){
+							?>							
+								   <dt><?php echo $acc['label'] ?></dt>
+								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+									
+							<?php 
+								} 
+							?>
+							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
+						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAt['total'] ?></dd>
+						   
+						</dl>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4">
+				<div class="panel panel-info">
+					<div class="panel-heading">Kiadva/nem fizetve az adott időszakban</div>
+					<div class="panel-body">
+						<dl class="dl-horizontal dl-totals">
+							<?php 
+								 foreach ($searchModel->totalsCreatedAtNotPaid['accounts'] as $acc ){
+							?>							
+								   <dt><?php echo $acc['label'] ?></dt>
+								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+									
+							<?php 
+								} 
+							?>
+							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
+						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAtNotPaid['total'] ?></dd>
+						</dl>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-4  ">
+				<div class="panel panel-info">
+					<div class="panel-heading">Kifizetve az adott időszakban</div>
+					<div class="panel-body">
+						<dl class="dl-horizontal dl-totals">
+							<?php 
+								 foreach ($searchModel->totalsPaidAt['accounts'] as $acc ){
+							?>							
+								   <dt><?php echo $acc['label'] ?></dt>
+								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+									
+							<?php 
+								} 
+							?>
+							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
+						   	 <dd class="text-right"><?php echo $searchModel->totalsPaidAt['total'] ?></dd>
+						   
+						</dl>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-4 col-md-offset-4">
+				<div class="panel panel-info">
+					<div class="panel-heading">Kiadva/fizetve az adott időszakban</div>
+					<div class="panel-body">
+						<dl class="dl-horizontal dl-totals">
+							<?php 
+								 foreach ($searchModel->totalsCreatedAtPaid['accounts'] as $acc ){
+							?>							
+								   <dt><?php echo $acc['label'] ?></dt>
+								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+									
+							<?php 
+								} 
+							?>
+							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
+						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAtPaid['total'] ?></dd>
+						</dl>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
index c4ef840..d3abf24 100644
--- a/frontend/views/transfer/_search.php
+++ b/frontend/views/transfer/_search.php
@@ -2,12 +2,20 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use kartik\widgets\DatePicker;
+use frontend\components\HtmlHelper;
+use common\models\Transfer;
+use kartik\widgets\DateTimePicker;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\TransferSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<?php 
+	$accountOptions =   ['' =>'Mind']+ HtmlHelper::mkAccountOptions(  $model->accounts );
+?>
+
 <div class="transfer-search">
 
     <?php $form = ActiveForm::begin([
@@ -18,28 +26,41 @@ use yii\widgets\ActiveForm;
     
      <div class="row">
 		<div class="col-md-4">
-		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+		    <?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
     			 'pluginOptions' => [
 				        'autoclose'=>true,
-				        'format' => 'yyyy.mm.dd'
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])  ?>
+				
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
 				    ]
 				])  ?>
 		</div>
+	</div>
+     <div class="row">
 		<div class="col-md-4">
-		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
-    			 'pluginOptions' => [
-				        'autoclose'=>true,
-				        'format' => 'yyyy.mm.dd'
-				    ]
-				])  ?>
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions)  ?>
+		</div>
+		<div class="col-md-4">
+		    <?php  //echo $form->field($model, 'type')->dropDownList( ['' =>'Mind']+ Transfer::types())  ?>
+		    <?php  echo $form->field($model, 'types')->checkboxList( Transfer::types())  ?>
 		</div>
 	</div>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('frontend/transfer', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
+	<?php
+	echo "types:";
+	print_r($model->types) ?>
+
     <?php ActiveForm::end(); ?>
 
 </div>
diff --git a/frontend/views/transfer/_view.php b/frontend/views/transfer/_view.php
new file mode 100644
index 0000000..4c9d727
--- /dev/null
+++ b/frontend/views/transfer/_view.php
@@ -0,0 +1,65 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Transfer */
+
+?>
+<?php 
+$formatter = Yii::$app->formatter;
+?>
+<div class="row">
+	<div class="col-md-12">
+		<div class='row row-transfer'>
+			<div class='col-md-4'>
+				<dl class="dl-horizontal dl-transfer">
+				
+					
+				
+				   <dt><?php echo $model->getAttributeLabel( 'id_transfer')  ?></dt>
+				   <dd><?php   echo   ( Html::getAttributeValue($model, 'id_transfer') ) ?></dd>
+				   
+				   <dt><?php echo $model->getAttributeLabel( 'created_at')  ?></dt>
+				   <dd><?php   echo  $formatter->asDatetime( Html::getAttributeValue($model, 'created_at') ) ?></dd>
+				   
+				   <dt><?php echo $model->getAttributeLabel( 'paid_at')  ?></dt>
+				   <dd><?php   echo  $formatter->asDatetime( Html::getAttributeValue($model, 'paid_at') ) ?></dd>
+				   
+				   <dt><?php echo $model->getAttributeLabel( 'status')  ?></dt>
+				   <dd><?php   echo   Html::getAttributeValue($model, 'statusName')   ?></dd>
+				</dl>
+			</div>
+			<div class='col-md-4'>
+				<dl class="dl-horizontal dl-transfer">
+				   <dt><?php echo $model->getAttributeLabel( 'type')  ?></dt>
+				   <dd><?php   echo   Html::getAttributeValue($model, 'transferTypeName')   ?></dd>
+		
+				   <dt><?php echo $model->getAttributeLabel( 'id_user')  ?></dt>
+				   <dd><?php   echo   Html::getAttributeValue($model, 'userName')   ?></dd>
+				   
+				   <dt><?php echo $model->getAttributeLabel( 'id_customer')  ?></dt>
+				   <dd><?php   echo    Html::getAttributeValue($model, 'customerName')   ?></dd>
+				</dl>
+			</div>
+			<div class='col-md-3'>
+				<dl class="dl-horizontal dl-transfer">
+				   <dt><?php echo   $model->getAttributeLabel( 'item_price')  ?></dt>
+				   <dd class="text-right"><?php   echo   Html::getAttributeValue($model, 'item_price')   ?></dd>
+		
+				   <dt><?php echo $model->getAttributeLabel( 'count')  ?></dt>
+				   <dd class="text-right"><?php   echo   Html::getAttributeValue($model, 'count')   ?></dd>
+				   
+				   <dt><?php echo $model->getAttributeLabel( 'id_discount')  ?></dt>
+				   <dd class="text-right"><?php   echo    Html::getAttributeValue($model, 'discountName')   ?></dd>
+		
+				   <dt><?php echo $model->getAttributeLabel( 'money')  ?></dt>
+				   <dd class="text-right"><?php   echo    Html::getAttributeValue($model, 'signedMoney')   ?></dd>
+				</dl>
+			</div>
+		</div>
+	</div>
+</div>
+
+
diff --git a/frontend/views/transfer/index.php b/frontend/views/transfer/index.php
index 43c9b60..3aeff9f 100644
--- a/frontend/views/transfer/index.php
+++ b/frontend/views/transfer/index.php
@@ -2,6 +2,8 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\widgets\ListView;
+use yii\base\Widget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel common\models\TransferSearch */
@@ -10,39 +12,38 @@ use yii\grid\GridView;
 $this->title = Yii::t('frontend/transfer', 'Transfers');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
+<style>
+	.dl-transfer{
+		margin-bottom: 0px;
+	}
+	
+	.item-transfer{
+		border: 1px solid #b4b4b4;
+		margin-top: 12px;
+		padding-top: 6px;
+		padding-bottom: 6px;
+	}
+	
+	
+	
+</style>
+
 <div class="transfer-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php   echo $this->render('_index_stat', ['searchModel' => $searchModel]); ?>
 
-    <p>
-        <?= Html::a(Yii::t('frontend/transfer', 'Create Transfer'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
-
-    <?= GridView::widget([
-        'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id_transfer',
-            'id_discount',
-            'id_currency',
-            'id_object',
-            'status',
-            // 'type',
-            // 'item_price',
-            // 'count',
-            // 'money',
-            // 'money_currency',
-            // 'rate',
-            // 'id_user',
-            // 'comment',
-            // 'created_at',
-            // 'updated_at',
-
-            ['class' => 'yii\grid\ActionColumn'],
-        ],
-    ]); ?>
+	
+   
+    
+    
+    <?php echo ListView::widget([
+    		
+    		'dataProvider' => $dataProvider,
+			'itemView' => '_view'    ,
+    		'itemOptions' => ['class' => 'item-transfer']
+	    ] 	)
+    ?>
 
 </div>
diff --git a/frontend/views/transfer/view.php b/frontend/views/transfer/view.php
index 9fff603..bb2225b 100644
--- a/frontend/views/transfer/view.php
+++ b/frontend/views/transfer/view.php
@@ -14,35 +14,43 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('frontend/transfer', 'Update'), ['update', 'id' => $model->id_transfer], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('frontend/transfer', 'Delete'), ['delete', 'id' => $model->id_transfer], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('frontend/transfer', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
-
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
             'id_transfer',
-            'id_discount',
-            'id_currency',
-            'id_object',
+        	[
+        		'attribute' => 'id_discount',
+        		'value' =>  Html::getAttributeValue($model, 'discountName')
+        			
+    		],
+           [
+        		'attribute' => 'type',
+        		'value' =>  $model->getTransferTypeName(),
+           		'label' => 'Típus'
+        			
+    		],
+           [
+        		'attribute' => 'id_object',
+        		'value' =>  $model->getObjectName(),
+           		'label' => 'Megnevezés'
+        			
+    		],
             'status',
             'type',
             'item_price',
             'count',
             'money',
-            'money_currency',
-            'rate',
-            'id_user',
+//             'money_currency',
+//             'rate',
+        		[
+        		'attribute' => 'id_user',
+        		'value' =>  $model->getUserName(),
+//         		'label' => 'Megnevezés'
+      
+        				],
+            'created_at:datetime',
+            'paid_at:datetime',
             'comment',
-            'created_at',
-            'updated_at',
         ],
     ]) ?>
 
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 157ea1d..0fb5a37 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -13,11 +13,11 @@ function ProductSell(o){
 		selector_user_cart: '.user-cart',
 		selector_btn_pay_customer_cart: '#btn_pay_customer_cart',
 		selector_btn_pay_user_cart: '#btn_pay_user_cart',
+		/**mark list paid url*/
 		url_pay_customer_card: '-',
+		url_pay_user_cart: '',
 		/** ajax url for lookup service*/
 		lookup_product_url: '',
-		/**mark list paid url*/
-		url_pay_user_cart: '',
 		/**the id of form*/
 	    selector_form: '#product_form',
 	    /**form contains error text*/
@@ -289,7 +289,8 @@ function ProductSell(o){
 		table.find('.product-barcode').html(product.barcode);
 		table.find('.product-stock').html(product.stock);
 		$('#productsaleform-id_product').val(product.id_product);
-		$('#productsaleform-id_account').val(product.id_account);
+		if ( app.defaults.id_account == null)
+			$('#productsaleform-id_account').val(product.id_account);
 		
 	}
 		
diff --git a/frontend/web/js/ticket.sell.js b/frontend/web/js/ticket.sell.js
index 0790e6b..456ea04 100644
--- a/frontend/web/js/ticket.sell.js
+++ b/frontend/web/js/ticket.sell.js
@@ -35,7 +35,16 @@ function TicketSell(o){
 		price: null,
 		clear_cart_url: '',
 		cart_paid_message:  'Tételek fizetve',
-		transfer_list: [],
+		user_cart: [],
+		customer_cart: [],
+		/**selector for customer cart container*/
+		selector_customer_cart: '.customer-cart',
+		selector_user_cart: '.user-cart',
+		selector_btn_pay_customer_cart: '#btn_pay_customer_cart',
+		selector_btn_pay_user_cart: '#btn_pay_user_cart',
+		/**mark list paid url*/
+		url_pay_customer_card: '-',
+		url_pay_user_cart: '',
 		
 	};
 	
@@ -45,8 +54,10 @@ function TicketSell(o){
 		$.extend(app.defaults, o );
 		addBehaviourTypeChangedListener();
 		useDefaults();
-		createUserSoldItemsTable();
-		addBehaviourBtnCartPaid();
+		createCarts();
+		addPayoutButtons();
+		addSellButtons();
+//		addBehaviourBtnCartPaid();
 	}
 	
 	function useDefaults(){
@@ -56,33 +67,100 @@ function TicketSell(o){
 		}
 	}
 	
-	function createUserSoldItemsTable(){
-		$('.transfer-list-container').transferList({
-			'transfers' : app.defaults.transfer_list
+	
+	
+	////////////////////////////////////////
+	//	carts
+	////////////////////////////////////////
+	
+	/**
+	 * payout out user or customer cart
+	 * */
+	function addPayoutButtons(){
+		addBehaviourPayoutUserCart();
+		addBehaviourPayoutCustomerCart();
+	}
+	
+	/**
+	 * display user and customer cart on page load
+	 * */
+	function createCarts(){
+		createUserCartTable();
+		createCustomerCartTable();
+	}
+	
+	function createUserCartTable(){
+		$(app.defaults.selector_user_cart).transferList({
+			'transfers' : app.defaults.user_cart
+		});
+	}
+	function createCustomerCartTable(){
+		$(app.defaults.selector_customer_cart).transferList({
+			'transfers' : app.defaults.customer_cart
 		});
 	}
 	
-	function refreshCart(){
-		$('.transfer-list-container').transferList('option','transfers' , app.defaults.sold_items );
+	function addSellButtons(){
+		addBehaviourBtnSellAndAppendToUserCart();
+		addBehaviourBtnAddToCustomerCart();
 	}
 	
-	function addBehaviourBtnCartPaid(  ){
-		$('#btn_paid').on('click',function(){
-			
-			$.ajax({
-				url: app.defaults.clear_cart_url,
-				type: 'post',
-		        data: {},
-		        success: function (response) {
-		        	if ( response.code == 'success'){
-		        		app.defaults.sold_items= response.transfers;
-		        		refreshCart();
-		        		$.notify(app.defaults.cart_paid_message, { 'type' : 'success' });
-		        	}
-		        }
-			}
-			);
-		});
+	function addBehaviourBtnSellAndAppendToUserCart(){
+		$('#btn_add_to_user_cart').on('click',submitAddTicketToUserCart);
+	}
+
+	function addBehaviourBtnAddToCustomerCart(){
+		$('#btn_add_to_customer_cart').on('click',submitAddTicketToCustomerCart);
+	}
+	
+	function submitAddTicketToUserCart(){
+		$('#ticketcreate-cart').val('user');
+		$('#ticket_form').submit();
+	}
+	
+	function submitAddTicketToCustomerCart(){
+		$('#ticketcreate-cart').val('customer');
+		$('#ticket_form').submit();
+	}
+	
+	
+	function addBehaviourPayoutUserCart(  ){
+//		$( app.defaults.selector_btn_pay_user_cart ).on('click',function(){
+//			
+//			$.ajax({
+//				url: app.defaults.url_pay_user_cart,
+//				type: 'post',
+//				data: {},
+//				success: function (response) {
+//					if ( response.code == 'success'){
+//						app.defaults.user_cart = response.transfers;
+//						refreshUserCart();
+//						$.notify(app.defaults.message_paid, { 'type' : 'success' });
+//					}
+//				}
+//			}
+//			);
+//		});
+	}
+	function addBehaviourPayoutCustomerCart(  ){
+//		$( app.defaults.selector_btn_pay_customer_cart ).on('click',function(){
+//			$.ajax({
+//				url: app.defaults.url_pay_customer_card,
+//				type: 'post',
+//		        data: {},
+//		        success: function (response) {
+//		        	if ( response.code == 'success'){
+//		        		app.defaults.customer_cart = response.customer_cart;
+//		        		refreshCustomerCart();
+//		        	}
+//		        	$.notify(response.message, { 'type' : response.code });
+//		        },
+//		        error: function(){
+//		        	alert('Hiba történt');
+//		        }
+//			}
+//			);
+//		});
 	}
 	
 	

From 1ee0a6bbe9683c3610632d1b6cc4aebb4e3680d5 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Mon, 2 Nov 2015 14:32:19 +0100
Subject: [PATCH 054/100] add access control to backend

---
 backend/controllers/AccountController.php         | 12 ++++++++++++
 backend/controllers/DiscountController.php        | 12 ++++++++++++
 backend/controllers/ProcurementController.php     | 12 ++++++++++++
 backend/controllers/ProductCategoryController.php | 13 +++++++++++++
 backend/controllers/ProductController.php         | 13 +++++++++++++
 backend/controllers/TicketTypeController.php      | 12 ++++++++++++
 backend/controllers/UserController.php            | 12 ++++++++++++
 backend/controllers/WarehouseController.php       | 12 ++++++++++++
 backend/views/user/index.php                      |  4 +++-
 backend/views/user/view.php                       |  7 -------
 common/messages/hu/common/account.php             |  2 +-
 common/models/User.php                            |  4 +++-
 composer.json                                     |  2 +-
 13 files changed, 106 insertions(+), 11 deletions(-)

diff --git a/backend/controllers/AccountController.php b/backend/controllers/AccountController.php
index eae1482..3a9d660 100644
--- a/backend/controllers/AccountController.php
+++ b/backend/controllers/AccountController.php
@@ -23,6 +23,18 @@ class AccountController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
index 62aae81..da298d8 100644
--- a/backend/controllers/DiscountController.php
+++ b/backend/controllers/DiscountController.php
@@ -23,6 +23,18 @@ class DiscountController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
index dc86e98..e73b687 100644
--- a/backend/controllers/ProcurementController.php
+++ b/backend/controllers/ProcurementController.php
@@ -26,6 +26,18 @@ class ProcurementController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/controllers/ProductCategoryController.php b/backend/controllers/ProductCategoryController.php
index 5bf3544..bde97af 100644
--- a/backend/controllers/ProductCategoryController.php
+++ b/backend/controllers/ProductCategoryController.php
@@ -23,6 +23,19 @@ class ProductCategoryController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
+        		
         ];
     }
 
diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php
index 24da95f..736c907 100644
--- a/backend/controllers/ProductController.php
+++ b/backend/controllers/ProductController.php
@@ -25,9 +25,22 @@ class ProductController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
+    
     /**
      * Lists all Product models.
      * @return mixed
diff --git a/backend/controllers/TicketTypeController.php b/backend/controllers/TicketTypeController.php
index 4f98888..01009c3 100644
--- a/backend/controllers/TicketTypeController.php
+++ b/backend/controllers/TicketTypeController.php
@@ -24,6 +24,18 @@ class TicketTypeController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index','view','create','update'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index cca3c77..19aa76e 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -29,6 +29,18 @@ class UserController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'index', 'create','update','view'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php
index 325c8fc..fe34b2d 100644
--- a/backend/controllers/WarehouseController.php
+++ b/backend/controllers/WarehouseController.php
@@ -24,6 +24,18 @@ class WarehouseController extends Controller
                     'delete' => ['post'],
                 ],
             ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'only' => [   'create','update','view','index'],
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
 
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 30e1329..591af23 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -28,7 +28,9 @@ $this->params['breadcrumbs'][] = $this->title;
             'email:email',
             'created_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+             'template' => '{view} {update}'
+    ],
         ],
     ]); ?>
 
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index f5494f3..f681530 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -16,13 +16,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <p>
         <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->id], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
     </p>
 
     <?= DetailView::widget([
diff --git a/common/messages/hu/common/account.php b/common/messages/hu/common/account.php
index ada5708..7d92753 100644
--- a/common/messages/hu/common/account.php
+++ b/common/messages/hu/common/account.php
@@ -20,7 +20,7 @@ return [
     'Accounts' => 'Kasszák',
     'Account' => 'Kassza',
     'Active' => 'Aktív',
-    'Create' => 'Inaktív',
+    'Create' => 'Mentés',
     'Create Account' => 'Új kassza',
     'Created At' => 'Létrehozás ideje',
     'Id Account' => 'Azonosító',
diff --git a/common/models/User.php b/common/models/User.php
index 1ea992d..44880f5 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -209,7 +209,9 @@ class User extends ActiveRecord implements IdentityInterface
     
     public function attributeLabels(){
     	return [
-    			
+    		'username' => Yii::t('backend/user', 'Username'),
+    		'email' => Yii::t('backend/user', 'E-Mail'),
+    		'created_at' => Yii::t('backend/user', 'Created at'),
     	];
     }
     
diff --git a/composer.json b/composer.json
index 5b626c0..48af075 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.6",
+        "yiisoft/yii2": "2.0.6",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*",
         "kartik-v/yii2-widgets": "^3.4",

From ed1e0b6c2a86db343df534a4fba1bfc44291fc14 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Mon, 2 Nov 2015 17:27:47 +0100
Subject: [PATCH 055/100] Add BackendController/AccesControl

Add the BackendController for all the backend controllers.
Add AccesControl
---
 backend/components/AdminMenuStructure.php     | 65 +++++++++----------
 backend/controllers/AccountController.php     | 37 +----------
 .../controllers/AccountStateController.php    | 15 +----
 backend/controllers/BackendController.php     | 40 ++++++++++++
 backend/controllers/CardController.php        | 31 +++++----
 backend/controllers/CityController.php        | 23 ++++---
 backend/controllers/CurrencyController.php    | 13 +---
 backend/controllers/CustomerController.php    | 15 +----
 backend/controllers/DiscountController.php    | 25 +------
 backend/controllers/ProcurementController.php | 45 ++++++-------
 .../controllers/ProductCategoryController.php | 26 +-------
 backend/controllers/ProductController.php     | 25 +------
 backend/controllers/TicketController.php      | 13 +---
 backend/controllers/TicketTypeController.php  | 25 +------
 backend/controllers/TransferController.php    | 33 ++++++----
 backend/controllers/UserController.php        | 25 +------
 backend/controllers/WarehouseController.php   | 25 +------
 17 files changed, 160 insertions(+), 321 deletions(-)
 create mode 100644 backend/controllers/BackendController.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 88d4379..d0bcf7f 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -29,43 +29,42 @@ class AdminMenuStructure{
 		
 		$userMainMenu = null;
 		$items = [];
-		
-		//$today = \Yii::$app->formatter->asDate( time() );
-		$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
-		$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 +  time()));
-		
-// 		if ( $this->can('backend.user.index')){
-			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
-// 		}
-		
-		$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
-		$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
-		$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
-		$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
-		$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
-		$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
-		$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
-		$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
-		$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
-		$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
+		if (!Yii::$app->user->isGuest) {
 		
 		
-		
-		
-		$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
-		$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
-		
-		if ( count($items) > 0 ){
-			$userMainMenu = ['label' => 'Beállítások', 'url' => null,
-				'items' =>  $items
-			];
+			//$today = \Yii::$app->formatter->asDate( time() );
+			$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
+			$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 +  time()));
+			
+	// 		if ( $this->can('backend.user.index')){
+				$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
+	// 		}
+			
+			$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
+			$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
+			$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
+			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
+			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
+			$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
+			$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
+			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
+			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
+			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
+			
+			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
+			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
+			
+			if ( count($items) > 0 ){
+				$userMainMenu = ['label' => 'Beállítások', 'url' => null,
+					'items' =>  $items
+				];
+			}
+			
+			if ( isset($userMainMenu)){
+				$this->menuItems[]  = $userMainMenu;
+			}
 		}
 		
-		if ( isset($userMainMenu)){
-			$this->menuItems[]  = $userMainMenu;
-		}
-		
-		
 	}
 	
 	
diff --git a/backend/controllers/AccountController.php b/backend/controllers/AccountController.php
index 3a9d660..6140193 100644
--- a/backend/controllers/AccountController.php
+++ b/backend/controllers/AccountController.php
@@ -12,31 +12,8 @@ use yii\filters\VerbFilter;
 /**
  * AccountController implements the CRUD actions for Account model.
  */
-class AccountController extends Controller
+class AccountController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     /**
      * Lists all Account models.
@@ -102,18 +79,6 @@ class AccountController extends Controller
         }
     }
 
-    /**
-     * Deletes an existing Account model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-//     public function actionDelete($id)
-//     {
-//         $this->findModel($id)->delete();
-
-//         return $this->redirect(['index']);
-//     }
 
     /**
      * Finds the Account model based on its primary key value.
diff --git a/backend/controllers/AccountStateController.php b/backend/controllers/AccountStateController.php
index df77cd8..2fcad74 100644
--- a/backend/controllers/AccountStateController.php
+++ b/backend/controllers/AccountStateController.php
@@ -14,19 +14,8 @@ use common\models\User;
 /**
  * AccountStateController implements the CRUD actions for AccountState model.
  */
-class AccountStateController extends Controller
+class AccountStateController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
 
     /**
      * Lists all AccountState models.
@@ -104,13 +93,13 @@ class AccountStateController extends Controller
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
      * @return mixed
-     */
     public function actionDelete($id)
     {
         $this->findModel($id)->delete();
 
         return $this->redirect(['index']);
     }
+     */
 
     /**
      * Finds the AccountState model based on its primary key value.
diff --git a/backend/controllers/BackendController.php b/backend/controllers/BackendController.php
new file mode 100644
index 0000000..0cb1a83
--- /dev/null
+++ b/backend/controllers/BackendController.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\City;
+use backend\models\CitySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use yii\base\Object;
+use yii\db\Query;
+use yii\helpers\Json;
+
+/**
+ * CityController implements the CRUD actions for City model.
+ */
+class BackendController extends Controller
+{
+
+	public function behaviors()
+    {
+        return [
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'actions' => ['create','index','view','update'],
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
+        ];
+    }
+
+    
+}
diff --git a/backend/controllers/CardController.php b/backend/controllers/CardController.php
index eb5777d..5b537a8 100644
--- a/backend/controllers/CardController.php
+++ b/backend/controllers/CardController.php
@@ -16,19 +16,26 @@ use yii\helpers\Json;
 /**
  * CardController implements the CRUD actions for Card model.
  */
-class CardController extends Controller
+class CardController  extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+				// allow authenticated users
+					[
+						'actions' => ['create','index','view','update','list'],
+						'allow' => true,
+						'roles' => ['@'],
+					],
+				// everything else is denied
+				],
+			],
+		];
+	}
 
     /**
      * Lists all Card models.
diff --git a/backend/controllers/CityController.php b/backend/controllers/CityController.php
index 4a22b53..4437598 100644
--- a/backend/controllers/CityController.php
+++ b/backend/controllers/CityController.php
@@ -15,19 +15,26 @@ use yii\helpers\Json;
 /**
  * CityController implements the CRUD actions for City model.
  */
-class CityController extends Controller
+class CityController extends \backend\controllers\BackendController
 {
-    public function behaviors()
+	public function behaviors()
     {
         return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
+        		'access' => [
+        				'class' => \yii\filters\AccessControl::className(),
+        				'rules' => [
+        						// allow authenticated users
+        						[
+        								'actions' => [ 'create','index','view','update','name-list','zip-list'],
+        								'allow' => true,
+        								'roles' => ['@'],
+        						],
+        						// everything else is denied
+        				],
+        		],
         ];
     }
+	
 
     /**
      * Lists all City models.
diff --git a/backend/controllers/CurrencyController.php b/backend/controllers/CurrencyController.php
index 6f77f3a..f21e26f 100644
--- a/backend/controllers/CurrencyController.php
+++ b/backend/controllers/CurrencyController.php
@@ -12,19 +12,8 @@ use yii\filters\VerbFilter;
 /**
  * CurrencyController implements the CRUD actions for Currency model.
  */
-class CurrencyController extends Controller
+class CurrencyController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
 
     /**
      * Lists all Currency models.
diff --git a/backend/controllers/CustomerController.php b/backend/controllers/CustomerController.php
index e6e23e5..c18a626 100644
--- a/backend/controllers/CustomerController.php
+++ b/backend/controllers/CustomerController.php
@@ -15,19 +15,8 @@ use backend\models\CustomerUpdate;
 /**
  * CustomerController implements the CRUD actions for Customer model.
  */
-class CustomerController extends Controller
+class CustomerController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
 
     /**
      * Lists all Customer models.
@@ -105,7 +94,6 @@ class CustomerController extends Controller
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
      * @return mixed
-     */
     public function actionDelete($id)
     {
         $this->findModel($id)->delete();
@@ -113,6 +101,7 @@ class CustomerController extends Controller
         return $this->redirect(['index']);
     }
 
+     */
     /**
      * Finds the Customer model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
index da298d8..5da9ce1 100644
--- a/backend/controllers/DiscountController.php
+++ b/backend/controllers/DiscountController.php
@@ -12,31 +12,8 @@ use yii\filters\VerbFilter;
 /**
  * DiscountController implements the CRUD actions for Discount model.
  */
-class DiscountController extends Controller
+class DiscountController  extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     /**
      * Lists all Discount models.
diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
index e73b687..6cab09f 100644
--- a/backend/controllers/ProcurementController.php
+++ b/backend/controllers/ProcurementController.php
@@ -15,32 +15,29 @@ use common\models\User;
 /**
  * ProcurementController implements the CRUD actions for Procurement model.
  */
-class ProcurementController extends Controller
+class ProcurementController  extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+				// allow authenticated users
+					[
+						'actions' => ['create','index','view', 'create-product'],
+						'allow' => true,
+						'roles' => ['@'],
+					],
+				// everything else is denied
+				],
+			],
+		];
+	}
+	
+	
     /**
      * Lists all Procurement models.
      * @return mixed
diff --git a/backend/controllers/ProductCategoryController.php b/backend/controllers/ProductCategoryController.php
index bde97af..5ed8385 100644
--- a/backend/controllers/ProductCategoryController.php
+++ b/backend/controllers/ProductCategoryController.php
@@ -12,32 +12,8 @@ use yii\filters\VerbFilter;
 /**
  * ProductCategoryController implements the CRUD actions for ProductCategory model.
  */
-class ProductCategoryController extends Controller
+class ProductCategoryController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        		
-        ];
-    }
 
     /**
      * Lists all ProductCategory models.
diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php
index 736c907..d2e742d 100644
--- a/backend/controllers/ProductController.php
+++ b/backend/controllers/ProductController.php
@@ -14,31 +14,8 @@ use common\models\ProductCategory;
 /**
  * ProductController implements the CRUD actions for Product model.
  */
-class ProductController extends Controller
+class ProductController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     
     /**
diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
index 39b2f67..9c80307 100644
--- a/backend/controllers/TicketController.php
+++ b/backend/controllers/TicketController.php
@@ -15,19 +15,8 @@ use common\models\Account;
 /**
  * TicketController implements the CRUD actions for Ticket model.
  */
-class TicketController extends Controller
+class TicketController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
 
     /**
      * Lists all Ticket models.
diff --git a/backend/controllers/TicketTypeController.php b/backend/controllers/TicketTypeController.php
index 01009c3..d3f1c51 100644
--- a/backend/controllers/TicketTypeController.php
+++ b/backend/controllers/TicketTypeController.php
@@ -13,31 +13,8 @@ use common\models\Account;
 /**
  * TicketTypeController implements the CRUD actions for TicketType model.
  */
-class TicketTypeController extends Controller
+class TicketTypeController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index','view','create','update'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     /**
      * Lists all TicketType models.
diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
index 682f990..4d02a83 100644
--- a/backend/controllers/TransferController.php
+++ b/backend/controllers/TransferController.php
@@ -14,19 +14,26 @@ use common\models\User;
 /**
  * TransferController implements the CRUD actions for Transfer model.
  */
-class TransferController extends Controller
+class TransferController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        ];
-    }
+	public function behaviors()
+	    {
+	        return [
+	        		'access' => [
+	        				'class' => \yii\filters\AccessControl::className(),
+	        				'rules' => [
+	        						// allow authenticated users
+	        						[
+	        								'actions' => [ 'index','view' ],
+	        								'allow' => true,
+	        								'roles' => ['@'],
+	        						],
+	        						// everything else is denied
+	        				],
+	        		],
+	        ];
+	    }
+	
 
     /**
      * Lists all Transfer models.
@@ -71,7 +78,6 @@ class TransferController extends Controller
      * If update is successful, the browser will be redirected to the 'view' page.
      * @param integer $id
      * @return mixed
-     */
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
@@ -85,6 +91,7 @@ class TransferController extends Controller
         }
     }
 
+     */
 
     /**
      * Finds the Transfer model based on its primary key value.
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index 19aa76e..93759f4 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -17,32 +17,9 @@ use common\models\UserAccountAssignment;
 /**
  * UserController implements the CRUD actions for User model.
  */
-class UserController extends Controller
+class UserController extends \backend\controllers\BackendController
 {
 	
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'index', 'create','update','view'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     /**
      * Lists all User models.
diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php
index fe34b2d..b0a1cc6 100644
--- a/backend/controllers/WarehouseController.php
+++ b/backend/controllers/WarehouseController.php
@@ -13,31 +13,8 @@ use yii\base\Object;
 /**
  * WarehouseController implements the CRUD actions for Warehouse model.
  */
-class WarehouseController extends Controller
+class WarehouseController extends \backend\controllers\BackendController
 {
-    public function behaviors()
-    {
-        return [
-            'verbs' => [
-                'class' => VerbFilter::className(),
-                'actions' => [
-                    'delete' => ['post'],
-                ],
-            ],
-        		'access' => [
-        				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'create','update','view','index'],
-        				'rules' => [
-        						// allow authenticated users
-        						[
-        								'allow' => true,
-        								'roles' => ['@'],
-        						],
-        						// everything else is denied
-        				],
-        		],
-        ];
-    }
 
     /**
      * Lists all Warehouse models.

From b6b51931208d9a90f19712db21782882394b09c2 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Mon, 2 Nov 2015 18:41:36 +0100
Subject: [PATCH 056/100] Fix customer backend forms , fix site\index

backend create\update customer forms must display the same as the frontend
forms

site\index action should be friendly and related to this app
---
 backend/controllers/CardController.php     |  7 +++-
 backend/controllers/CustomerController.php |  2 +
 backend/models/CustomerCreate.php          | 18 +++++++++
 backend/models/CustomerUpdate.php          | 19 +++++++++
 backend/views/card/_form.php               |  1 +
 backend/views/customer/_form_create.php    | 14 -------
 backend/views/customer/_form_update.php    | 14 -------
 backend/views/site/index.php               | 44 ++-------------------
 frontend/models/CustomerCreate.php         |  2 -
 frontend/views/site/index.php              | 45 ++--------------------
 10 files changed, 53 insertions(+), 113 deletions(-)

diff --git a/backend/controllers/CardController.php b/backend/controllers/CardController.php
index 5b537a8..c06d8a4 100644
--- a/backend/controllers/CardController.php
+++ b/backend/controllers/CardController.php
@@ -75,7 +75,12 @@ class CardController  extends \backend\controllers\BackendController
 		$model->status = Card::STATUS_ACTIVE;
 		$model->type = Card::TYPE_RFID;
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_card]);
+        	\Yii::$app->session->setFlash( 'success','Card created!' );
+        	if ( isset($_POST['create_next'])){
+            	return $this->redirect(['create' ]);
+        	}else{
+            	return $this->redirect(['view', 'id' => $model->id_card]);
+        	}
         } else {
             return $this->render('create', [
                 'model' => $model,
diff --git a/backend/controllers/CustomerController.php b/backend/controllers/CustomerController.php
index c18a626..c1482af 100644
--- a/backend/controllers/CustomerController.php
+++ b/backend/controllers/CustomerController.php
@@ -79,6 +79,8 @@ class CustomerController extends \backend\controllers\BackendController
             throw new NotFoundHttpException('The requested page does not exist.');
         }
         
+        $model->birthdate= isset($model->birthdate ) ? Yii::$app->formatter->asDate($model->birthdate) :'';
+        
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_customer]);
diff --git a/backend/models/CustomerCreate.php b/backend/models/CustomerCreate.php
index 1e6cb40..2f00b07 100644
--- a/backend/models/CustomerCreate.php
+++ b/backend/models/CustomerCreate.php
@@ -68,6 +68,15 @@ class CustomerCreate extends \common\models\Customer
         		[['email'], 'string', 'max' => 255],
         		[['email'], 'email' ],
         		[['email'], 'unique' ],
+        		[['email'], 'required', 'when' => function($model) {
+        			return  !isset(  $model->email )  || empty($model->phone) ;
+        		} ,
+        		'whenClient' => "function (attribute, value) {
+				    return false;
+				}",
+        		'message' => Yii::t('customer/backend','E-mail or phone number required!')
+        		],
+        		
         		
         		[['password_plain','password_repeat'], 'string', 'max' => 32],
         		
@@ -80,6 +89,15 @@ class CustomerCreate extends \common\models\Customer
         		
         		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
         		
+        		[['phone'], 'required', 'when' => function($model) {
+        			return   !isset(  $model->email )  || empty(  $model->email ) ;
+        		} ,
+        		'whenClient' => "function (attribute, value) {
+				    return false;
+				}",
+        			'message' => Yii::t('customer/backend','E-mail or phone number required!')
+        		],
+        		
         		[['zip'], 'string', 'max' => 8],
         		
         		[['city'], 'string', 'max' => 30]
diff --git a/backend/models/CustomerUpdate.php b/backend/models/CustomerUpdate.php
index c715954..cef9ec9 100644
--- a/backend/models/CustomerUpdate.php
+++ b/backend/models/CustomerUpdate.php
@@ -68,6 +68,16 @@ class CustomerUpdate extends \common\models\Customer
         		[['email'], 'email' ],
         		[['email'], 'unique' ],
         		
+        		[['email'], 'required', 'when' => function($model) {
+        			return  !isset(  $model->email )  || empty($model->phone) ;
+        		} ,
+        		'whenClient' => "function (attribute, value) {
+					    return false;
+					}",
+        		'message' => Yii::t('customer/backend','E-mail or phone number required!')
+        		],
+        		
+        		
         		[['password_plain','password_repeat'], 'string', 'max' => 32],
         		
         		[['sex'], 'integer'],
@@ -79,6 +89,15 @@ class CustomerUpdate extends \common\models\Customer
         		
         		[['phone', 'tax_number', 'country'], 'string', 'max' => 20],
         		
+        		[['phone'], 'required', 'when' => function($model) {
+        			return   !isset(  $model->email )  || empty(  $model->email ) ;
+        		} ,
+        			'whenClient' => "function (attribute, value) {
+					    return false;
+					}",
+        			'message' => Yii::t('customer/backend','E-mail or phone number required!')
+        		],
+        		
         		[['zip'], 'string', 'max' => 8],
         		
         		[['city'], 'string', 'max' => 30]
diff --git a/backend/views/card/_form.php b/backend/views/card/_form.php
index df5a94b..dfa41b0 100644
--- a/backend/views/card/_form.php
+++ b/backend/views/card/_form.php
@@ -22,6 +22,7 @@ use common\models\Card;
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('common/card', 'Create') : Yii::t('common/card', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton(  Yii::t('common/card', 'Create/Next')  ,['class' =>   'btn btn-primary','name'=>'create_next']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/customer/_form_create.php b/backend/views/customer/_form_create.php
index 036d453..1b9949e 100644
--- a/backend/views/customer/_form_create.php
+++ b/backend/views/customer/_form_create.php
@@ -22,9 +22,6 @@ use kartik\widgets\DatePicker;
 		<div class='col-md-3'>
 		     <?php echo $form->field($model, 'cardNumber')->widget(CardNumberTypeahead::className(),[]) ?>
 		</div>
-		<div class='col-md-3'>
-		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
-		</div>
 	</div>
 
 
@@ -39,17 +36,6 @@ use kartik\widgets\DatePicker;
 		</div>
 	</div>
 
-   
-
-	<div class='row'>
-		<div class='col-md-3'>
-		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
-		</div>
-		<div class='col-md-3'>
-		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
-		</div>
-	</div>
-
 	<div class='row'>
 		<div class='col-md-3'>
 		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
diff --git a/backend/views/customer/_form_update.php b/backend/views/customer/_form_update.php
index 020ed85..ed36c4e 100644
--- a/backend/views/customer/_form_update.php
+++ b/backend/views/customer/_form_update.php
@@ -26,9 +26,6 @@ use kartik\widgets\DatePicker;
 		     <?php echo $model->customerCardNumber ?>
 		     </div>
 		</div>
-		<div class='col-md-3'>
-		    <?= $form->field($model, 'partnerCardNumber')->textInput() ?>
-		</div>
 	</div>
 
 
@@ -43,17 +40,6 @@ use kartik\widgets\DatePicker;
 		</div>
 	</div>
 
-   
-
-	<div class='row'>
-		<div class='col-md-3'>
-		   <?= $form->field($model, 'password_plain')->passwordInput(['maxlength' => true]) ?>
-		</div>
-		<div class='col-md-3'>
-		    <?= $form->field($model, 'password_repeat')->passwordInput(['maxlength' => true]) ?>
-		</div>
-	</div>
-
 	<div class='row'>
 		<div class='col-md-3'>
 		    <?= $form->field($model, 'sex')->dropDownList(Customer::sexes()) ?>
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index f780610..8b029ca 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -7,47 +7,11 @@ $this->title = 'My Yii Application';
 <div class="site-index">
 
     <div class="jumbotron">
-        <h1>Congratulations!</h1>
+        <h1>Web Admin</h1>
 
-        <p class="lead">You have successfully created your Yii-powered application.</p>
-
-        <p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
-    </div>
-
-    <div class="body-content">
-
-        <div class="row">
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
-            </div>
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
-            </div>
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
-            </div>
-        </div>
+        <p class="lead">Üdvözöljük adminisztrációs felületünkön</p>
 
     </div>
+
+
 </div>
diff --git a/frontend/models/CustomerCreate.php b/frontend/models/CustomerCreate.php
index 7b88074..6ce1f7b 100644
--- a/frontend/models/CustomerCreate.php
+++ b/frontend/models/CustomerCreate.php
@@ -71,7 +71,6 @@ class CustomerCreate extends \common\models\Customer
         		[['email'], 'required', 'when' => function($model) {
 			        return  !isset(  $model->email )  || empty($model->phone) ;
 			    } ,
-// 			     'enableClientValidation' => false,
 			    'whenClient' => "function (attribute, value) {
 				    return false;
 				}",
@@ -92,7 +91,6 @@ class CustomerCreate extends \common\models\Customer
         		[['phone'], 'required', 'when' => function($model) {
         			return   !isset(  $model->email )  || empty(  $model->email ) ;
         		} ,
-//         		'enableClientValidation' => false,
         		'whenClient' => "function (attribute, value) {
 				    return false;
 				}",
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index f780610..6aa245e 100644
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -7,47 +7,8 @@ $this->title = 'My Yii Application';
 <div class="site-index">
 
     <div class="jumbotron">
-        <h1>Congratulations!</h1>
-
-        <p class="lead">You have successfully created your Yii-powered application.</p>
-
-        <p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
+        <h1>Web Recepció</h1>
+        <p class="lead">Üdvözöljük Web Recepció oldalunkon!</p>
     </div>
 
-    <div class="body-content">
-
-        <div class="row">
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
-            </div>
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
-            </div>
-            <div class="col-lg-4">
-                <h2>Heading</h2>
-
-                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-                    fugiat nulla pariatur.</p>
-
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
-            </div>
-        </div>
-
-    </div>
-</div>
+ </div>

From 33bf52df60696d972fa811e7a6f0b261d3573771 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Tue, 3 Nov 2015 09:50:54 +0100
Subject: [PATCH 057/100] add collection

---
 backend/components/AdminMenuStructure.php     |   1 +
 backend/controllers/CollectionController.php  | 110 +++++++++++++++
 backend/models/CollectionSearch.php           |  73 ++++++++++
 backend/views/collection/_form.php            |  39 ++++++
 backend/views/collection/_search.php          |  45 ++++++
 backend/views/collection/create.php           |  21 +++
 backend/views/collection/index.php            |  42 ++++++
 backend/views/collection/update.php           |  23 +++
 backend/views/collection/view.php             |  44 ++++++
 common/models/Collection.php                  | 104 ++++++++++++++
 common/models/CollectionCreate.php            |  31 ++++
 common/models/Transfer.php                    |  76 ++++++++++
 ...51102_175009_create__table__collection.php |  37 +++++
 frontend/components/FrontendMenuStructure.php |   1 +
 frontend/controllers/CollectionController.php | 132 ++++++++++++++++++
 frontend/models/CollectionSearch.php          |  72 ++++++++++
 frontend/views/collection/_form.php           |  31 ++++
 frontend/views/collection/_search.php         |  55 ++++++++
 frontend/views/collection/create.php          |  30 ++++
 frontend/views/collection/index.php           |  39 ++++++
 frontend/views/collection/update.php          |  23 +++
 frontend/views/collection/view.php            |  44 ++++++
 22 files changed, 1073 insertions(+)
 create mode 100644 backend/controllers/CollectionController.php
 create mode 100644 backend/models/CollectionSearch.php
 create mode 100644 backend/views/collection/_form.php
 create mode 100644 backend/views/collection/_search.php
 create mode 100644 backend/views/collection/create.php
 create mode 100644 backend/views/collection/index.php
 create mode 100644 backend/views/collection/update.php
 create mode 100644 backend/views/collection/view.php
 create mode 100644 common/models/Collection.php
 create mode 100644 common/models/CollectionCreate.php
 create mode 100644 console/migrations/m151102_175009_create__table__collection.php
 create mode 100644 frontend/controllers/CollectionController.php
 create mode 100644 frontend/models/CollectionSearch.php
 create mode 100644 frontend/views/collection/_form.php
 create mode 100644 frontend/views/collection/_search.php
 create mode 100644 frontend/views/collection/create.php
 create mode 100644 frontend/views/collection/index.php
 create mode 100644 frontend/views/collection/update.php
 create mode 100644 frontend/views/collection/view.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index d0bcf7f..06a0c75 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -53,6 +53,7 @@ class AdminMenuStructure{
 			
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
+			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$today,'CollectionSearch[end]' => $tomorrow ] ];
 			
 			if ( count($items) > 0 ){
 				$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/CollectionController.php b/backend/controllers/CollectionController.php
new file mode 100644
index 0000000..aed7761
--- /dev/null
+++ b/backend/controllers/CollectionController.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Collection;
+use backend\models\CollectionSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * CollectionController implements the CRUD actions for Collection model.
+ */
+class CollectionController extends \backend\controllers\BackendController
+{
+
+    /**
+     * Lists all Collection models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CollectionSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Collection model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Collection model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Collection();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_collection]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Collection model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_collection]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Collection model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Collection model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Collection the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Collection::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/CollectionSearch.php b/backend/models/CollectionSearch.php
new file mode 100644
index 0000000..e185d52
--- /dev/null
+++ b/backend/models/CollectionSearch.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Collection;
+
+/**
+ * CollectionSearch represents the model behind the search form about `common\models\Collection`.
+ */
+class CollectionSearch extends Collection
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_collection', 'id_user', 'created_by', 'id_account', 'money', 'type'], 'integer'],
+            [['start', 'end', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Collection::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_collection' => $this->id_collection,
+            'id_user' => $this->id_user,
+            'created_by' => $this->created_by,
+            'id_account' => $this->id_account,
+            'money' => $this->money,
+            'start' => $this->start,
+            'end' => $this->end,
+            'type' => $this->type,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/collection/_form.php b/backend/views/collection/_form.php
new file mode 100644
index 0000000..ca618e7
--- /dev/null
+++ b/backend/views/collection/_form.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="collection-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'id_user')->textInput() ?>
+
+    <?= $form->field($model, 'created_by')->textInput() ?>
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'start')->textInput() ?>
+
+    <?= $form->field($model, 'end')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/collection', 'Create') : Yii::t('backend/collection', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/collection/_search.php b/backend/views/collection/_search.php
new file mode 100644
index 0000000..e2f80ec
--- /dev/null
+++ b/backend/views/collection/_search.php
@@ -0,0 +1,45 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\CollectionSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="collection-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_collection') ?>
+
+    <?= $form->field($model, 'id_user') ?>
+
+    <?= $form->field($model, 'created_by') ?>
+
+    <?= $form->field($model, 'id_account') ?>
+
+    <?= $form->field($model, 'money') ?>
+
+    <?php // echo $form->field($model, 'start') ?>
+
+    <?php // echo $form->field($model, 'end') ?>
+
+    <?php // echo $form->field($model, 'type') ?>
+
+    <?php // echo $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('backend/collection', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('backend/collection', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/collection/create.php b/backend/views/collection/create.php
new file mode 100644
index 0000000..fcef1e2
--- /dev/null
+++ b/backend/views/collection/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = Yii::t('backend/collection', 'Create Collection');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/collection/index.php b/backend/views/collection/index.php
new file mode 100644
index 0000000..fabcd50
--- /dev/null
+++ b/backend/views/collection/index.php
@@ -0,0 +1,42 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\CollectionSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('backend/collection', 'Collections');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('backend/collection', 'Create Collection'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_collection',
+            'id_user',
+            'created_by',
+            'id_account',
+            'money',
+            // 'start',
+            // 'end',
+            // 'type',
+            // 'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/collection/update.php b/backend/views/collection/update.php
new file mode 100644
index 0000000..eee672c
--- /dev/null
+++ b/backend/views/collection/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = Yii::t('backend/collection', 'Update {modelClass}: ', [
+    'modelClass' => 'Collection',
+]) . ' ' . $model->id_collection;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_collection, 'url' => ['view', 'id' => $model->id_collection]];
+$this->params['breadcrumbs'][] = Yii::t('backend/collection', 'Update');
+?>
+<div class="collection-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/collection/view.php b/backend/views/collection/view.php
new file mode 100644
index 0000000..b8985f6
--- /dev/null
+++ b/backend/views/collection/view.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = $model->id_collection;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('backend/collection', 'Update'), ['update', 'id' => $model->id_collection], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('backend/collection', 'Delete'), ['delete', 'id' => $model->id_collection], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('backend/collection', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_collection',
+            'id_user',
+            'created_by',
+            'id_account',
+            'money',
+            'start',
+            'end',
+            'type',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Collection.php b/common/models/Collection.php
new file mode 100644
index 0000000..5705a95
--- /dev/null
+++ b/common/models/Collection.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use common\components\AccountAwareBehavior;
+use common\components\UserAwareBehavior;
+use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "collection".
+ *
+ * @property integer $id_collection
+ * @property integer $id_user
+ * @property integer $created_by
+ * @property integer $id_account
+ * @property integer $money
+ * @property string $start
+ * @property string $end
+ * @property integer $type
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Collection extends \common\models\BaseFitnessActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'collection';
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return ArrayHelper::merge(  [
+    			[
+    					'class' => TimestampBehavior::className(),
+    					'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			],
+    			[
+    					'class' => UserAwareBehavior::className(),
+    			],
+    			[
+    					'class' => AccountAwareBehavior::className(),
+    			],
+    			], parent::behaviors());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_user', 'created_by', 'id_account', 'money', 'type'], 'integer'],
+            [['money', 'type', 'created_at', 'updated_at'], 'required'],
+            [['start', 'end', 'created_at', 'updated_at'], 'safe']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_collection' => Yii::t('common/collection', 'Id Collection'),
+            'id_user' => Yii::t('common/collection', 'Id User'),
+            'created_by' => Yii::t('common/collection', 'Created By'),
+            'id_account' => Yii::t('common/collection', 'Id Account'),
+            'money' => Yii::t('common/collection', 'Money'),
+            'start' => Yii::t('common/collection', 'Start'),
+            'end' => Yii::t('common/collection', 'End'),
+            'type' => Yii::t('common/collection', 'Type'),
+            'created_at' => Yii::t('common/collection', 'Created At'),
+            'updated_at' => Yii::t('common/collection', 'Updated At'),
+        ];
+    }
+    
+    
+    /**
+     * @param \common\models\User $user the user 
+     * */
+    public static function readLast($user){
+    	$result = null;
+    	$query = Collection::find();
+    	if ( isset($user)){
+    		$query->andWhere($user->id);
+    	}
+    	
+    	$query->orderBy(['end' => SORT_DESC]);
+    	
+    	$query->limit(1);
+    	
+    	$result = $query->one();
+    	
+    	return $result;
+    }
+}
diff --git a/common/models/CollectionCreate.php b/common/models/CollectionCreate.php
new file mode 100644
index 0000000..5aaccad
--- /dev/null
+++ b/common/models/CollectionCreate.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use common\components\AccountAwareBehavior;
+use common\components\UserAwareBehavior;
+use yii\helpers\ArrayHelper;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "collection".
+ *
+ * @property integer $id_collection
+ * @property integer $id_user
+ * @property integer $created_by
+ * @property integer $id_account
+ * @property integer $money
+ * @property string $start
+ * @property string $end
+ * @property integer $type
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class CollectionCreate extends \common\models\Collection
+{
+    
+	public $lastCollection;
+	
+	
+}
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index a06a8ba..ea1d17d 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -451,6 +451,82 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $status;
     }
     
+    /**
+     * @param string $mode The mode to load
+     * Available modes
+     * <ul>
+     * 	<li>
+     * 	<h2>created_at</h2>
+     *  <p>Load all transfer which were created </p>
+     * </li>
+     * 	<li>
+     * 	<h2>paid_at</h2>
+     *  <p>Load all transfer which were paid  </p>
+     * </li>
+     * 	<li>
+     * 	<h2>created_at_paid</h2>
+     *  <p>Load all transfer which were created and paid  </p>
+     * </li>
+     * 	<li>
+     * 	<h2>created_at_not_paid</h2>
+     *  <p>Load all transfer which were created but not paid </p>
+     * </li>
+     * 	<li>
+     * 	<h2>paid_at_not_created_at</h2>
+     *  <p>Load all transfer which were not  created but  paid . Works correctly only, 
+     *  when start and end date given
+     *   </p>
+     * </li>
+     * </ul> 
+     * 
+     * */
+	public static function mkTotalQuery($mode,$start,$end,$idUser,$types,$idAccount){
+    	
+    	$query = new Query();
+    	
+    	$query->addSelect( [
+    			new Expression( 'transfer.id_account as account'),
+    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )
+    	
+    	]);
+    	$query->from('transfer');
+    	
+    	$query->andFilterWhere([
+    			'id_account' => $idAccount,
+    			]);
+
+    	$query->andFilterWhere(['id_user' => $idUser]);
+    	
+    	$query->andFilterWhere(['in' ,'type', $types]);
+    	
+    	
+    	if ( $mode == 'created_at'){
+	     	$query->andFilterWhere([ '>=', 'transfer.created_at' , $start]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+    	}else if ( $mode == 'paid_at'){
+	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $start ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.paid_at'  , $end ]   );
+    	}else if ( $mode == 'created_at_not_paid'){
+	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_NOT_PAID  ]   );
+    	    $query->andFilterWhere([ '>=', 'transfer.created_at' , $start ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+    	}else if ( $mode == 'created_at_paid'){
+	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
+    	   	$query->andFilterWhere([ '>=', 'transfer.created_at' , $start ]   );
+    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+    	}else if ( $mode == 'paid_at_not_created_at'){
+	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
+	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $start ]   );
+	     	$query->andFilterWhere([ '<' , 'transfer.paid_at'  , $end ]   );
+    	   	$query->andFilterWhere( ['or', [ '<', 'transfer.created_at' , $start ]  ,[ '>=' , 'transfer.created_at'  , $end ]  ] );
+    	}
+    	
+    	$query->groupBy('transfer.id_account');
+    	
+    	return $query;
+    	
+    	
+    }
     
     
 }
diff --git a/console/migrations/m151102_175009_create__table__collection.php b/console/migrations/m151102_175009_create__table__collection.php
new file mode 100644
index 0000000..b444244
--- /dev/null
+++ b/console/migrations/m151102_175009_create__table__collection.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151102_175009_create__table__collection extends Migration
+{
+    public function up()
+    {
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%collection}}', [
+    			'id_collection' => $this->primaryKey(),
+    			'id_user' => $this->integer() ,
+    			'created_by' => $this->integer() ,
+    			'id_account' => $this->integer() ,
+    			'money' => $this->integer()->notNull() ,
+    			'start' => $this->dateTime(),
+    			'end' =>  $this->dateTime(),
+    			'type' => $this->integer(11)->notNull(),
+    			'created_at' => $this->dateTime()->notNull(),
+    			'updated_at' =>  $this->dateTime()->notNull(),
+    	], $tableOptions);
+    }
+
+    public function down()
+    {
+        echo "m151102_175009_create__table__collection cannot be reverted.\n";
+
+        return false;
+    }
+
+}
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 85bbe5e..21a79d3 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -70,6 +70,7 @@ class FrontendMenuStructure{
 							['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/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 ] ]
 					]
 					
 			];
diff --git a/frontend/controllers/CollectionController.php b/frontend/controllers/CollectionController.php
new file mode 100644
index 0000000..c0b094c
--- /dev/null
+++ b/frontend/controllers/CollectionController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Collection;
+use frontend\models\CollectionSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\Account;
+use common\models\User;
+use common\models\CollectionCreate;
+
+/**
+ * CollectionController implements the CRUD actions for Collection model.
+ */
+class CollectionController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Collection models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CollectionSearch();
+        
+        $searchModel->accounts = Account::read();
+        
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Collection model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Collection model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new CollectionCreate();
+        
+        $user  = User::findOne(Yii::$app->user->id);
+        
+        $model->lastCollection = Collection::readLast($user);
+		$model->id_user = $user->id;
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_collection]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Collection model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_collection]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Collection model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Collection model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Collection the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Collection::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/frontend/models/CollectionSearch.php b/frontend/models/CollectionSearch.php
new file mode 100644
index 0000000..3bcf41d
--- /dev/null
+++ b/frontend/models/CollectionSearch.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Collection;
+
+/**
+ * CollectionSearch represents the model behind the search form about `common\models\Collection`.
+ */
+class CollectionSearch extends Collection
+{
+	public $accounts;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Collection::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_account' => $this->id_account,
+        ]);
+
+        $query->andFilterWhere([ '>=', 'collection.end', $this->timestampStart ]   );
+        $query->andFilterWhere([ '<', 'collection.end', $this->timestampEnd ]   );
+        
+        return $dataProvider;
+    }
+}
diff --git a/frontend/views/collection/_form.php b/frontend/views/collection/_form.php
new file mode 100644
index 0000000..226cb0a
--- /dev/null
+++ b/frontend/views/collection/_form.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="collection-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+
+    <?= $form->field($model, 'id_account')->textInput() ?>
+
+    <?= $form->field($model, 'money')->textInput() ?>
+
+    <?= $form->field($model, 'start')->textInput() ?>
+
+    <?= $form->field($model, 'end')->textInput() ?>
+
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/collection', 'Create') : Yii::t('frontend/collection', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/collection/_search.php b/frontend/views/collection/_search.php
new file mode 100644
index 0000000..ef8ea74
--- /dev/null
+++ b/frontend/views/collection/_search.php
@@ -0,0 +1,55 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use kartik\widgets\DateTimePicker;
+use frontend\components\HtmlHelper;
+
+/* @var $this yii\web\View */
+/* @var $model frontend\models\CollectionSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+
+$accountOptions =  ['' =>Yii::t('frontend/collection','All')]+ HtmlHelper::mkAccountOptions($model->accounts);
+
+?>
+
+<div class="collection-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+
+	<div class='row'>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_account')->dropDownList( $accountOptions ) ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+			])  ?>
+		</div>
+		
+	</div>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/collection', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/frontend/views/collection/create.php b/frontend/views/collection/create.php
new file mode 100644
index 0000000..304f3d9
--- /dev/null
+++ b/frontend/views/collection/create.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = Yii::t('frontend/collection', 'Create Collection');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+	<dl class='dl-horizontal'>
+	<dt>Utolsó zárás</dt>
+	<dd>asdf</dd>
+	<dt></dt>
+	<dd></dd>
+	<dt></dt>
+	<dd></dd>
+</dl>
+	
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/collection/index.php b/frontend/views/collection/index.php
new file mode 100644
index 0000000..c8dfd17
--- /dev/null
+++ b/frontend/views/collection/index.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel frontend\models\CollectionSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/collection', 'Collections');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/collection', 'Create Collection'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+            'id_collection',
+            'id_user',
+            'id_account',
+            'money',
+            'start:datetime',
+            'end:datetime',
+            'created_at:datetime',
+
+            ['class' => 'yii\grid\ActionColumn',
+             'template' => '{view}'
+    ],
+        ],
+    ]); ?>
+
+</div>
diff --git a/frontend/views/collection/update.php b/frontend/views/collection/update.php
new file mode 100644
index 0000000..136c74e
--- /dev/null
+++ b/frontend/views/collection/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = Yii::t('frontend/collection', 'Update {modelClass}: ', [
+    'modelClass' => 'Collection',
+]) . ' ' . $model->id_collection;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_collection, 'url' => ['view', 'id' => $model->id_collection]];
+$this->params['breadcrumbs'][] = Yii::t('frontend/collection', 'Update');
+?>
+<div class="collection-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/frontend/views/collection/view.php b/frontend/views/collection/view.php
new file mode 100644
index 0000000..5ce6db7
--- /dev/null
+++ b/frontend/views/collection/view.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = $model->id_collection;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="collection-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('frontend/collection', 'Update'), ['update', 'id' => $model->id_collection], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/collection', 'Delete'), ['delete', 'id' => $model->id_collection], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('frontend/collection', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_collection',
+            'id_user',
+            'created_by',
+            'id_account',
+            'money',
+            'start',
+            'end',
+            'type',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>

From 931b83040b6e38b326f9165303ec56b8289c3bb8 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Tue, 3 Nov 2015 17:27:14 +0100
Subject: [PATCH 058/100] add reception collection basics

---
 common/models/Account.php                     |  22 +++-
 common/models/CollectionCreate.php            |   6 +
 common/models/Transfer.php                    | 124 +++++++++++++++++-
 frontend/components/TransferTotalWidget.php   |  28 ++++
 frontend/controllers/CollectionController.php |  39 +++++-
 frontend/models/CreateAccountSelectForm.php   |  57 ++++++++
 frontend/models/TransferSearch.php            |   2 -
 .../collection/_create_select_account.php     |  50 +++++++
 frontend/views/collection/_form.php           |  17 +--
 frontend/views/collection/create.php          |  43 +++++-
 frontend/views/collection/index.php           |   2 +-
 frontend/views/common/_transfer_total.php     |  21 +++
 12 files changed, 385 insertions(+), 26 deletions(-)
 create mode 100644 frontend/components/TransferTotalWidget.php
 create mode 100644 frontend/models/CreateAccountSelectForm.php
 create mode 100644 frontend/views/collection/_create_select_account.php
 create mode 100644 frontend/views/common/_transfer_total.php

diff --git a/common/models/Account.php b/common/models/Account.php
index df458f6..295e603 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -132,13 +132,14 @@ class Account extends \yii\db\ActiveRecord
     	$query =  Account::find();
     	$query->innerJoinWith('userAccountAssignments');
     	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
-    	$query->andWhere(['status' => Account::STATUS_ACTIVE]);
     	if ( $forceIncludeAccount  == null){
     		 $query->andWhere(['status' => Account::STATUS_ACTIVE])->all();
     	}else{
     		$query->andWhere( ['or', ['status' => Account::STATUS_ACTIVE], ['id_account' =>  $forceIncludeAccount ] ])->all();
     	}
-    	 
+
+    	$query->orderBy( ['name' => SORT_ASC]);
+    	
     	$accounts = $query->all();
     	return $accounts;
     }
@@ -156,4 +157,21 @@ class Account extends \yii\db\ActiveRecord
     
     }
     
+    
+    /**
+     * read assigned account
+     * */
+    public static  function readOne($idAccount){
+    	$accounts = null;
+    	
+    	$query =  Account::find();
+    	$query->innerJoinWith('userAccountAssignments');
+    	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
+    	$query->andWhere(['status' => Account::STATUS_ACTIVE]);
+    	$query->andWhere(['account.id_account' => $idAccount]);
+    	$accounts = $query->one();
+    	
+    	return $accounts;
+    }
+    
 }
diff --git a/common/models/CollectionCreate.php b/common/models/CollectionCreate.php
index 5aaccad..e8e4f5d 100644
--- a/common/models/CollectionCreate.php
+++ b/common/models/CollectionCreate.php
@@ -26,6 +26,12 @@ class CollectionCreate extends \common\models\Collection
 {
     
 	public $lastCollection;
+	public $accounts;
+	public $account;
+	public $totals;
+	
+
+	
 	
 	
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index ea1d17d..79a3d0c 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -10,6 +10,8 @@ use common\components\AccountAwareBehavior;
 use common\components\UserAwareBehavior;
 use common\components\DiscountAwareBehavior;
 use common\components\CustomerAwareBehavior;
+use yii\db\Query;
+use yii\db\Expression;
 
 /**
  * This is the model class for table "transfer".
@@ -486,7 +488,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	$query->addSelect( [
     			new Expression( 'transfer.id_account as account'),
-    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )
+    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money /** '. $mode.'*/' )
     	
     	]);
     	$query->from('transfer');
@@ -518,7 +520,8 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
 	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
 	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $start ]   );
 	     	$query->andFilterWhere([ '<' , 'transfer.paid_at'  , $end ]   );
-    	   	$query->andFilterWhere( ['or', [ '<', 'transfer.created_at' , $start ]  ,[ '>=' , 'transfer.created_at'  , $end ]  ] );
+	     	
+    	   	$query->andFilterWhere( ['or', [ '<', 'transfer.created_at' , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , 'transfer.created_at'  , $end ]  ] );
     	}
     	
     	$query->groupBy('transfer.id_account');
@@ -529,4 +532,121 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     }
     
     
+    
+    
+    /**
+     * 
+     * Parse query results so, that all available account will be display, even then , if $queryResult does not contain any result for the given account
+     * 
+     * @param mixed $queryResult an array, wchic contains items. each item has to key - value pairs: [ id_account => 0, money => 0 ]
+     * */
+    public static function mkTotalsResultWithAllAvailableAccount($queryResult,$accounts,$accountMap,$idAccount){
+    	 
+    	$totals = [];
+    	$totals['total'] = 0;
+    	 
+    	$totals['accounts'] = [];
+    	 
+    	foreach ($accounts as $account){
+    		if ( isset($idAccount) &&  is_numeric($idAccount)  && $idAccount != $account->id_account  ){
+    			continue ;
+    		}
+    		
+    		$accountTotal = [
+	    		'id_account' => $account->id_account,
+	    		'label' => 	$account->name,
+	    		'money' => 0,
+    		];
+    
+    		$item = self::findByAccountInQueryResult($queryResult, $account);
+    
+    		if ( isset($item)){
+    			$accountTotal['money'] = $item['money'];
+    		}
+    		 
+    		$totals['accounts'][] = $accountTotal;
+    		$totals['total'] += $accountTotal['money'];
+    	}
+    	return $totals;
+    }
+    
+   	public static function findByAccountInQueryResult( $queryResult, $account ){
+    	$result = null;
+    	foreach ($queryResult as $item){
+    		if( $item['account'] == $account->id_account ){
+    			$result = $item;
+    		}
+    	}
+    	return $result;
+    }
+    
+    
+    /**create and execute a "total" query*/
+    public static function exTotalQuery($mode,$start,$end,$idUser,$types,$idAccount){
+    	$query =  self::mkTotalQuery($mode, $start, $end, $idUser, $types, $idAccount );
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	return $result;
+    }
+    
+    /**
+     *find all transfers which were paid in the period 
+     * */
+    public static function mkPaidAtTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('paid_at', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
+    
+    /**find all transfers in the period ( doesn't matter if paid or not )*/
+    public static function mkCreatedAtTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('created_at', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
+    
+    /**find transfers which were created but not paid in the period*/
+    public static function mkCreatedAtNotPaidTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('created_at_not_paid', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
+    
+    /**
+     * find transfers which were created and paid in the period
+     * 
+     * */
+    public static function mkCreatedAtPaidTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('created_at_paid', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
+    
+    /**
+     * 
+     * find transfers, where depth was paid
+     * */
+    public static function mkPaidAtNotCreatedAtPaidTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('paid_at_not_created_at', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
+    
+    
+   public static function mkTotals( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap ){
+   		$result = [];
+   		
+   		$result['paid_at'] 		= self::mkPaidAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap);
+   		$result['created_at'] 	= self::mkCreatedAtTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap);
+   		$result['created_at_not_paid'] = self::mkCreatedAtNotPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap);
+   		$result['created_at_paid'] 	   = self::mkCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap);
+   		$result['paid_at_not_created_at'] = self::mkPaidAtNotCreatedAtPaidTotals($start, $end, $idUser, $types, $idAccount, $accounts, $accountMap);
+   		
+   		return $result;
+   }
 }
diff --git a/frontend/components/TransferTotalWidget.php b/frontend/components/TransferTotalWidget.php
new file mode 100644
index 0000000..f96f748
--- /dev/null
+++ b/frontend/components/TransferTotalWidget.php
@@ -0,0 +1,28 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class TransferTotalWidget extends Widget{
+	
+	public $options = [
+		'totalHeading' => 'Összessen'
+	];
+	
+	
+	public $viewFile = '//common/_transfer_total';
+	
+	public function init(){
+		parent::init();
+		
+		if ( !isset($this->options['totalHeading'] ) ){
+			$this->options['totalHeading'] = 'Összesen';
+		}
+		
+	}
+	
+	public function run(){
+		echo $this->render($this->viewFile,[ 'options' => $this->options ]);
+	}
+	
+}
\ No newline at end of file
diff --git a/frontend/controllers/CollectionController.php b/frontend/controllers/CollectionController.php
index c0b094c..37bc4e3 100644
--- a/frontend/controllers/CollectionController.php
+++ b/frontend/controllers/CollectionController.php
@@ -11,6 +11,9 @@ use yii\filters\VerbFilter;
 use common\models\Account;
 use common\models\User;
 use common\models\CollectionCreate;
+use common\models\Transfer;
+use frontend\models\CreateAccountSelectForm;
+use yii\helpers\ArrayHelper;
 
 /**
  * CollectionController implements the CRUD actions for Collection model.
@@ -64,15 +67,27 @@ class CollectionController extends Controller
      * If creation is successful, the browser will be redirected to the 'view' page.
      * @return mixed
      */
-    public function actionCreate()
+    public function actionCreate($id_account)
     {
         $model = new CollectionCreate();
         
         $user  = User::findOne(Yii::$app->user->id);
+
+//         $accounts =  Account::find()->orderBy("name asc")->all();
         
+        $model->accounts = Account::read();
         $model->lastCollection = Collection::readLast($user);
 		$model->id_user = $user->id;
-        
+		$model->id_account = Account::readDefault();
+		$model->account = Account::readOne($model->id_account);
+        $accountMap = ArrayHelper::map( $model->accounts ,'id_account','name' );
+		
+		$model->start = isset($model->lastCollection) ? $model->lastCollection->end :null; 
+		$model->end   =  date("Y-m-d H:i:s"); 
+		
+		
+		$model->totals = Transfer::mkTotals($model->start, $model->end, $model->user->id, null, $model->account->id_account,  $model->accounts, $accountMap);
+		
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id_collection]);
         } else {
@@ -81,6 +96,26 @@ class CollectionController extends Controller
             ]);
         }
     }
+    /**
+     * Select account for which we will create collection
+     * If selection is successful, the browser will be redirected to the 'create' page.
+     * @return mixed
+     */
+    public function actionSelectAccount()
+    {
+        $model = new CreateAccountSelectForm();
+        $model->accounts = Account::read();
+
+        $model->id_account = Account::readDefault();
+        
+          if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+          	return $this->redirect(['create', 'id_account' => $model->id_account]);
+          }
+        
+		return $this->render('_create_select_account.php', [
+			'model' => $model,
+		]);
+    }
 
     /**
      * Updates an existing Collection model.
diff --git a/frontend/models/CreateAccountSelectForm.php b/frontend/models/CreateAccountSelectForm.php
new file mode 100644
index 0000000..f141273
--- /dev/null
+++ b/frontend/models/CreateAccountSelectForm.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace frontend\models;
+
+use Yii;
+use yii\base\Model;
+use common\models\Card;
+use common\models\Customer;
+use common\models\Product;
+use common\models\Transfer;
+use yii\base\Object;
+use common\models\Account;
+use common\models\Discount;
+use common\models\Currency;
+use common\models\UserSoldItem;
+use common\models\Sale;
+use common\models\ShoppingCart;
+
+/**
+ * ContactForm is the model behind the contact form.
+ * 
+ *  @property integer id_account
+ *  @property common\models\Account $account
+ *  
+ *  
+ */
+class CreateAccountSelectForm extends Model
+{
+
+		public $id_account;
+		public $account;
+		public $accounts;
+		
+		public function rules(){
+			return [
+				[['id_account'],  'integer'   ],
+				[['id_account'],  'validateAccount'   ],
+			
+			];
+		}
+		
+		public function validateAccount($attribute,$params){
+			$this->account = Account::readOne($this->id_account);
+			if ( !isset($this->account)){
+				$this->addError($attribute, Yii::t('frontend/collection', 'Invalid transfer!'));
+			}
+		}
+		
+		public function attributeLabels(){
+			return [
+	
+				'id_account' => Yii::t('frontend/collection', 'Account'),
+			
+			];
+		}
+	 
+}
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
index 4080b91..9ef1e5c 100644
--- a/frontend/models/TransferSearch.php
+++ b/frontend/models/TransferSearch.php
@@ -199,7 +199,6 @@ class TransferSearch extends Transfer
     	$totals['accounts'] = [];
     	
     	foreach ($this->accounts as $account){
-//     		echo  'account="'. $this->id_account .'"<br>';
     		if ( isset($this->id_account) &&  is_numeric($this->id_account)  && $this->id_account != $account->id_account  ){
     			continue ;
     		}
@@ -227,7 +226,6 @@ class TransferSearch extends Transfer
     	$command = $query->createCommand();
     	$result = $command->queryAll();
     	
-//     	$paidAtTotals = $this->mkTotalsResult($result, $accountMap);
     	$paidAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
     	
     	return $paidAtTotals;
diff --git a/frontend/views/collection/_create_select_account.php b/frontend/views/collection/_create_select_account.php
new file mode 100644
index 0000000..69fb455
--- /dev/null
+++ b/frontend/views/collection/_create_select_account.php
@@ -0,0 +1,50 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Collection */
+
+$this->title = Yii::t('frontend/collection', 'Create Collection - Select Account');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/collection', 'Collections'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+
+$accountOptions =    HtmlHelper::mkAccountOptions($model->accounts);
+
+?>
+<div class="collection-create select-account">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+<div class="collection-form">
+
+    <?php $form = ActiveForm::begin(
+		[
+    		'method' => 'post',
+    		'action' => ['collection/select-account'],
+    	]
+    		
+    ); ?>
+
+    
+    <div class="row">
+	    <div class="col-md-4">
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
+	    </div>
+    </div>
+
+
+
+
+    <div class="form-group">
+        <?= Html::submitButton( Yii::t('frontend/collection', 'Next') ,['class' =>'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+
+</div>
diff --git a/frontend/views/collection/_form.php b/frontend/views/collection/_form.php
index 226cb0a..107f57b 100644
--- a/frontend/views/collection/_form.php
+++ b/frontend/views/collection/_form.php
@@ -2,26 +2,23 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Collection */
 /* @var $form yii\widgets\ActiveForm */
+?>
+
+<?php 
+
+
+
 ?>
 
 <div class="collection-form">
 
     <?php $form = ActiveForm::begin(); ?>
 
-
-    <?= $form->field($model, 'id_account')->textInput() ?>
-
-    <?= $form->field($model, 'money')->textInput() ?>
-
-    <?= $form->field($model, 'start')->textInput() ?>
-
-    <?= $form->field($model, 'end')->textInput() ?>
-
-
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/collection', 'Create') : Yii::t('frontend/collection', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
diff --git a/frontend/views/collection/create.php b/frontend/views/collection/create.php
index 304f3d9..c1b10e8 100644
--- a/frontend/views/collection/create.php
+++ b/frontend/views/collection/create.php
@@ -1,6 +1,7 @@
 <?php
 
 use yii\helpers\Html;
+use frontend\components\TransferTotalWidget;
 
 
 /* @var $this yii\web\View */
@@ -15,13 +16,41 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
 
 	<dl class='dl-horizontal'>
-	<dt>Utolsó zárás</dt>
-	<dd>asdf</dd>
-	<dt></dt>
-	<dd></dd>
-	<dt></dt>
-	<dd></dd>
-</dl>
+		<dt><?= Yii::t('frontend/collection', "Last collection")?></dt>
+		<dd><?php  echo isset($model->lastCollection) ? Yii::$app->formatter->asDatetime($model->lastCollection->end) : Yii::t('frontend/collection', "No collection found") ?></dd> 
+		
+		<dt><?= Yii::t('frontend/collection', "Start of interval")?></dt>
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->start)  ?></dd> 
+		
+		<dt><?= Yii::t('frontend/collection', "End of interval")?></dt>
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->end)  ?></dd> 
+	</dl>
+	
+	
+	<?php 
+	
+		echo TransferTotalWidget::widget([
+			'options' => [
+				'statistic' => $model->totals['paid_at'],
+				'panelHeading' =>  'Fizetve'   ,
+				]
+		]);
+		echo TransferTotalWidget::widget([
+			'options' => [
+				'statistic' => $model->totals['created_at'],
+				'panelHeading' => 'Kiadva',
+				]
+		]);
+		echo TransferTotalWidget::widget([
+			'options' => [
+				'statistic' => $model->totals['created_at_paid'],
+				'panelHeading' => 'Kiadva és fizetve',
+				]
+		]);
+
+
+	
+	?>
 	
     <?= $this->render('_form', [
         'model' => $model,
diff --git a/frontend/views/collection/index.php b/frontend/views/collection/index.php
index c8dfd17..275848c 100644
--- a/frontend/views/collection/index.php
+++ b/frontend/views/collection/index.php
@@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
     <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a(Yii::t('frontend/collection', 'Create Collection'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('frontend/collection', 'Create Collection'), ['select-account'], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= GridView::widget([
diff --git a/frontend/views/common/_transfer_total.php b/frontend/views/common/_transfer_total.php
new file mode 100644
index 0000000..4083a72
--- /dev/null
+++ b/frontend/views/common/_transfer_total.php
@@ -0,0 +1,21 @@
+<div class="row">
+<div class="col-md-4 col-md-offset-4">
+<div class="panel panel-info">
+<div class="panel-heading"><?php echo $options['panelHeading']?></div>
+<div class="panel-body">
+<dl class="dl-horizontal dl-totals">
+				<?php
+					foreach ($options['statistic']['accounts'] as $acc ){
+					?>
+						   <dt><?php echo $acc['label'] ?></dt>
+						   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+					<?php 
+					} 
+					?>
+					<dt><?php echo $options['totalHeading']?></dt>
+				   	<dd class="text-right"><?php echo $options['statistic']['total'] ?></dd>
+				</dl>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file

From ed9c1e77cd221bd8e217e75c74d57a0f84998511 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 08:59:20 +0100
Subject: [PATCH 059/100] add collection changes

---
 common/models/Collection.php                  |   9 +-
 common/models/CollectionCreate.php            |  32 ++-
 common/models/Transfer.php                    |  35 ++--
 frontend/components/TransferTotalWidget.php   |   4 +
 frontend/controllers/CollectionController.php |  20 +-
 frontend/models/TransferSearch.php            | 182 ++----------------
 frontend/views/collection/_form.php           |   2 +
 frontend/views/collection/create.php          |  77 ++++++--
 frontend/views/collection/view.php            |  31 ++-
 frontend/views/common/_transfer_total.php     |  16 +-
 frontend/views/transfer/_index_stat.php       | 125 +++++-------
 frontend/views/transfer/_search.php           |   3 -
 12 files changed, 210 insertions(+), 326 deletions(-)

diff --git a/common/models/Collection.php b/common/models/Collection.php
index 5705a95..513a602 100644
--- a/common/models/Collection.php
+++ b/common/models/Collection.php
@@ -24,6 +24,9 @@ use yii\behaviors\TimestampBehavior;
  */
 class Collection extends \common\models\BaseFitnessActiveRecord
 {
+	
+	const TYPE_RECEPTION = 10;
+	
     /**
      * @inheritdoc
      */
@@ -86,17 +89,17 @@ class Collection extends \common\models\BaseFitnessActiveRecord
     /**
      * @param \common\models\User $user the user 
      * */
-    public static function readLast($user){
+    public static function readLast($user,$types = [Collection::TYPE_RECEPTION]){
     	$result = null;
     	$query = Collection::find();
     	if ( isset($user)){
-    		$query->andWhere($user->id);
+    		$query->andWhere(['id_user' =>$user->id]);
     	}
+    	$query->andFilterWhere([ 'in', 'type' ,$types]);
     	
     	$query->orderBy(['end' => SORT_DESC]);
     	
     	$query->limit(1);
-    	
     	$result = $query->one();
     	
     	return $result;
diff --git a/common/models/CollectionCreate.php b/common/models/CollectionCreate.php
index e8e4f5d..0ec535e 100644
--- a/common/models/CollectionCreate.php
+++ b/common/models/CollectionCreate.php
@@ -27,11 +27,41 @@ class CollectionCreate extends \common\models\Collection
     
 	public $lastCollection;
 	public $accounts;
+	public $accountMap;
 	public $account;
 	public $totals;
 	
-
+	public $timestampEnd;
+	public $timestampStart;
 	
 	
+	public function rules(){
+		return [
+			['end','required'],
+			[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+			[[ 'end' ], 'validateEndDate' ]
+		];
+	}
+	
+	public function validateEndDate($attribute,$params){
+		if ( isset($this->lastCollection)){
+			if ( strtotime( $this->lastCollection->end ) >= strtotime( $this->timestampEnd ) ){
+				$this->addError($attribute,Yii::t('frontend/collection' ,'End date is invalid') );
+			}
+		}
+	}
+
+	public function beforeSave($insert){
+		if (parent::beforeSave($insert)) {
+			$this->id_user = Yii::$app->user->id;
+			$this->created_by = Yii::$app->user->id;
+			$paidAt = Transfer::mkPaidAtTotals($this->timestampStart, $this->timestampEnd, $this->user->id, null, $this->account->id_account,  $this->accounts, $this->accountMap);
+			$this->money = $paidAt['total'];
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
 	
 }
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 79a3d0c..673325e 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -503,25 +503,18 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	
     	if ( $mode == 'created_at'){
-	     	$query->andFilterWhere([ '>=', 'transfer.created_at' , $start]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+	     	self::inInterval($query, 'transfer.created_at', $start, $end);
     	}else if ( $mode == 'paid_at'){
-	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $start ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.paid_at'  , $end ]   );
+	     	self::inInterval($query, 'transfer.paid_at' , $start, $end);
     	}else if ( $mode == 'created_at_not_paid'){
-	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_NOT_PAID  ]   );
-    	    $query->andFilterWhere([ '>=', 'transfer.created_at' , $start ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+	     	self::notPaid($query, 'transfer.paid_at', $start, $end);
+    	    self::inInterval($query, 'transfer.created_at', $start, $end);
     	}else if ( $mode == 'created_at_paid'){
-	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
-    	   	$query->andFilterWhere([ '>=', 'transfer.created_at' , $start ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $end ]   );
+    	    self::inInterval($query, 'transfer.created_at', $start, $end);
+    	    self::inInterval($query, 'transfer.paid_at', $start, $end);
     	}else if ( $mode == 'paid_at_not_created_at'){
-	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
-	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $start ]   );
-	     	$query->andFilterWhere([ '<' , 'transfer.paid_at'  , $end ]   );
-	     	
-    	   	$query->andFilterWhere( ['or', [ '<', 'transfer.created_at' , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , 'transfer.created_at'  , $end ]  ] );
+	     	self::inInterval($query, 'transfer.paid_at' , $start, $end);
+	     	self::notInInterval($query, 'transfer.created_at', $start, $end);
     	}
     	
     	$query->groupBy('transfer.id_account');
@@ -531,6 +524,18 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     }
     
+    public static function notInInterval($query ,$field , $start,$end ){
+    	$query->andFilterWhere( ['or', [ '<', $field , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , $field  , isset($end) ? $end : '3000-01-01' ]  ] );
+    }
+    
+    public static function notPaid($query ,$field , $start,$end ){
+    	$query->andFilterWhere( ['or', [ '<', $field , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , $field  , isset($end) ? $end : '3000-01-01' ] ,[ "transfer.status" => Transfer::STATUS_NOT_PAID  ]  ] );
+    }
+    public static function inInterval($query ,$field , $start,$end ){
+   	   	$query->andFilterWhere([ '>=', $field , $start ]   );
+   	    $query->andFilterWhere([ '<' , $field  , $end ]   );
+    }
+    
     
     
     
diff --git a/frontend/components/TransferTotalWidget.php b/frontend/components/TransferTotalWidget.php
index f96f748..b76a6a0 100644
--- a/frontend/components/TransferTotalWidget.php
+++ b/frontend/components/TransferTotalWidget.php
@@ -18,6 +18,10 @@ class TransferTotalWidget extends Widget{
 		if ( !isset($this->options['totalHeading'] ) ){
 			$this->options['totalHeading'] = 'Összesen';
 		}
+
+		if ( !isset($this->options['panel-type'] ) ){
+			$this->options['panel-type'] = 'panel-info';
+		}
 		
 	}
 	
diff --git a/frontend/controllers/CollectionController.php b/frontend/controllers/CollectionController.php
index 37bc4e3..8b6d973 100644
--- a/frontend/controllers/CollectionController.php
+++ b/frontend/controllers/CollectionController.php
@@ -73,24 +73,26 @@ class CollectionController extends Controller
         
         $user  = User::findOne(Yii::$app->user->id);
 
-//         $accounts =  Account::find()->orderBy("name asc")->all();
-        
         $model->accounts = Account::read();
         $model->lastCollection = Collection::readLast($user);
 		$model->id_user = $user->id;
-		$model->id_account = Account::readDefault();
+		$model->id_account = $id_account;
 		$model->account = Account::readOne($model->id_account);
-        $accountMap = ArrayHelper::map( $model->accounts ,'id_account','name' );
+        $model->accountMap = ArrayHelper::map( $model->accounts ,'id_account','name' );
 		
-		$model->start = isset($model->lastCollection) ? $model->lastCollection->end :null; 
-		$model->end   =  date("Y-m-d H:i:s"); 
+		$model->timestampStart = isset($model->lastCollection) ? $model->lastCollection->end :null; 
+		$model->timestampEnd   =  date("Y-m-d H:i:s");
+		
+		$model->start = isset($model->timestampStart) ? Yii::$app->formatter->asDatetime( $model->timestampStart ) : '';
+		$model->end = isset($model->timestampEnd) ? Yii::$app->formatter->asDatetime( $model->timestampEnd ): '';
+		
+		$model->type = Collection::TYPE_RECEPTION;
 		
 		
-		$model->totals = Transfer::mkTotals($model->start, $model->end, $model->user->id, null, $model->account->id_account,  $model->accounts, $accountMap);
-		
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ( $model->load(Yii::$app->request->post()) && $model->save() ) {
             return $this->redirect(['view', 'id' => $model->id_collection]);
         } else {
+			$model->totals = Transfer::mkTotals($model->timestampStart, $model->timestampEnd, $model->user->id, null, $model->account->id_account,  $model->accounts, $model->accountMap);
             return $this->render('create', [
                 'model' => $model,
             ]);
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
index 9ef1e5c..a2b48a9 100644
--- a/frontend/models/TransferSearch.php
+++ b/frontend/models/TransferSearch.php
@@ -28,6 +28,7 @@ class TransferSearch extends Transfer
 	public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
 	public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
 	public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
+	public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
 	
 	
 	public $accounts;
@@ -95,173 +96,6 @@ class TransferSearch extends Transfer
         return $dataProvider;
     }
     
-    
-    protected function mkTotalQuery($mode){
-    	
-    	$query = new Query();
-    	
-    	$query->addSelect( [
-    			new Expression( 'transfer.id_account as account'),
-    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )
-    	
-    	]);
-    	$query->from('transfer');
-    	
-    	$query->andFilterWhere([
-    			'id_account' => $this->id_account,
-    			'type' => $this->type,
-    			]);
-
-    	$query->andWhere(['id_user' => Yii::$app->user->id]);
-    	
-    	$query->andFilterWhere(['in' ,'type', $this->types]);
-    	
-    	
-    	if ( $mode == 'created_at'){
-	     	$query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
-    	}else if ( $mode == 'paid_at'){
-	     	$query->andFilterWhere([ '>=', 'transfer.paid_at' , $this->timestampStart ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.paid_at'  , $this->timestampEnd ]   );
-    	}else if ( $mode == 'created_at_not_paid'){
-	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_NOT_PAID  ]   );
-    	    $query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
-    	}else if ( $mode == 'created_at_paid'){
-	     	$query->andFilterWhere([ "transfer.status" => Transfer::STATUS_PAID  ]   );
-    	   	$query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
-    	    $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
-    	}
-    	
-    	$query->groupBy('transfer.id_account');
-    	
-    	return $query;
-    	
-    	
-    }
-    
-    protected function mkTransferTotalsWithZeroValue( ){
-    	$result = [];
-    	
-    	foreach (  $this->accounts as $a ){
-    		$accountTotal = [
-    				'id_account' => $a->id_account,
-    				'label' => $a->name,
-    				'money' => 0
-    		];
-    		
-    		$result[] = $accountTotal;
-    	}
-    	return $result;
-    }
-    
-   
-    
-    protected function mkTotalsResult($queryResult,$accountMap){
-    	
-    	$totals = [];
-    	$totals['total'] = 0;
-    	
-    	$totals['accounts'] = [];
-    	
-    	foreach ($queryResult as $item){
-    		$account = "";
-    		if ( array_key_exists($item['account'], $accountMap)){
-    			$account = $accountMap[$item['account']];
-    		}
-    		 
-    		$accountTotal = [
-    				'id_account' => $item['account'],
-    				'label' => 	$account,
-    				'money' => $item['money']
-    		];
-    		$totals['accounts'][] = $accountTotal;
-    		$totals['total'] += $item['money'];
-    	}
-    	return $totals;
-    }
-    
-    protected function findByAccountInQueryResult($queryResult, $account){
-    	$result = null;
-    	foreach ($queryResult as $item){
-    		if( $item['account'] == $account->id_account ){
-    			$result = $item;
-    		}
-    	}
-    	return $result;
-    }
-    
-    protected function mkTotalsResultWithAllAvailableAccount($queryResult,$accountMap){
-    	
-    	$totals = [];
-    	$totals['total'] = 0;
-    	
-    	$totals['accounts'] = [];
-    	
-    	foreach ($this->accounts as $account){
-    		if ( isset($this->id_account) &&  is_numeric($this->id_account)  && $this->id_account != $account->id_account  ){
-    			continue ;
-    		}
-    		$accountTotal = [
-    				'id_account' => $account->id_account,
-    				'label' => 	$account->name,
-    				'money' => 0,
-    		];
-    		
-    		$item = $this->findByAccountInQueryResult($queryResult, $account);
-    		
-    		if ( isset($item)){
-    			$accountTotal['money'] = $item['money'];
-    		}
-    		 
-    		$totals['accounts'][] = $accountTotal;
-    		$totals['total'] += $accountTotal['money'];
-    	}
-    	return $totals;
-    }
-    
-    
-    public function mkPaidAtTotals($accountMap){
-    	$query =  $this->mkTotalQuery('paid_at');
-    	$command = $query->createCommand();
-    	$result = $command->queryAll();
-    	
-    	$paidAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
-    	
-    	return $paidAtTotals;
-    }
-    
-    public function mkCreatedAtTotals($accountMap){
-    	$query =  $this->mkTotalQuery('created_at');
-    	$command = $query->createCommand();
-    	$result = $command->queryAll();
-    	
-    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
-    	
-    	return $createdAtTotals;
-    }
-    
-    public function mkCreatedAtNotPaidTotals($accountMap){
-    	$query =  $this->mkTotalQuery('created_at_not_paid');
-    	$command = $query->createCommand();
-    	$result = $command->queryAll();
-    	
-    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
-    	
-    	return $createdAtTotals;
-    }
-    
-    public function mkCreatedAtPaidTotals($accountMap){
-    	$query =  $this->mkTotalQuery('created_at_paid');
-    	$command = $query->createCommand();
-    	$result = $command->queryAll();
-    	 
-    	$createdAtTotals = $this->mkTotalsResultWithAllAvailableAccount($result, $accountMap);
-    	 
-    	return $createdAtTotals;
-    }
-    
-    
     public function totalsTransfers($params){
     	$accountTotals = [];
     	$fullTotal = [
@@ -273,13 +107,19 @@ class TransferSearch extends Transfer
     		return;	
     	}
     	
+    	
+    	
     	$accounts =  Account::find()->orderBy("name asc")->all();
     	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
+    	$idUser = Yii::$app->user->id;
     	
-		$this->totalsCreatedAt = $this->mkCreatedAtTotals($accountMap);
-		$this->totalsPaidAt = $this->mkPaidAtTotals($accountMap);
-		$this->totalsCreatedAtPaid = $this->mkCreatedAtPaidTotals($accountMap);
-		$this->totalsCreatedAtNotPaid = $this->mkCreatedAtNotPaidTotals($accountMap);
+    	$totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
+    	
+		$this->totalsCreatedAt = $totals['created_at'];
+		$this->totalsPaidAt = $totals['paid_at'];
+		$this->totalsCreatedAtPaid = $totals['created_at_paid'];
+		$this->totalsCreatedAtNotPaid = $totals['created_at_not_paid'];
+		$this->totalsPaidAtNotCreatedAt = $totals['paid_at_not_created_at'];
     
     }
     
diff --git a/frontend/views/collection/_form.php b/frontend/views/collection/_form.php
index 107f57b..7f5dd26 100644
--- a/frontend/views/collection/_form.php
+++ b/frontend/views/collection/_form.php
@@ -19,6 +19,8 @@ use frontend\components\HtmlHelper;
 
     <?php $form = ActiveForm::begin(); ?>
 
+	<?php echo $form->field($model, 'end')->hiddenInput()->label(false) ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('frontend/collection', 'Create') : Yii::t('frontend/collection', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
diff --git a/frontend/views/collection/create.php b/frontend/views/collection/create.php
index c1b10e8..79da8d7 100644
--- a/frontend/views/collection/create.php
+++ b/frontend/views/collection/create.php
@@ -20,37 +20,88 @@ $this->params['breadcrumbs'][] = $this->title;
 		<dd><?php  echo isset($model->lastCollection) ? Yii::$app->formatter->asDatetime($model->lastCollection->end) : Yii::t('frontend/collection', "No collection found") ?></dd> 
 		
 		<dt><?= Yii::t('frontend/collection', "Start of interval")?></dt>
-		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->start)  ?></dd> 
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampStart)  ?></dd> 
 		
 		<dt><?= Yii::t('frontend/collection', "End of interval")?></dt>
-		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->end)  ?></dd> 
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampEnd)  ?></dd> 
 	</dl>
 	
+	<p>
+        <?= Html::a(Yii::t('frontend/collection', 'Refresh'), ['create', 'id_account' => $model->id_account], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('frontend/collection', 'Select another account'), ['select-account' ], ['class' => 'btn btn-primary']) ?>
+    </p>
 	
-	<?php 
-	
-		echo TransferTotalWidget::widget([
-			'options' => [
-				'statistic' => $model->totals['paid_at'],
-				'panelHeading' =>  'Fizetve'   ,
-				]
-		]);
+	<div class='row'>
+	<div class='col-md-4'>
+		<?php 
 		echo TransferTotalWidget::widget([
 			'options' => [
 				'statistic' => $model->totals['created_at'],
 				'panelHeading' => 'Kiadva',
 				]
 		]);
+		?>
+	</div>
+	<div class='col-md-4'>
+		<?php 
 		echo TransferTotalWidget::widget([
 			'options' => [
 				'statistic' => $model->totals['created_at_paid'],
-				'panelHeading' => 'Kiadva és fizetve',
+				'panelHeading' => 'Kiadva/fizetve',
 				]
 		]);
+		?>
+	</div>
+	<div class='col-md-4'>
+		<?php 
+			echo TransferTotalWidget::widget([
+				'options' => [
+					'statistic' => $model->totals['created_at_not_paid'],
+					'panelHeading' => 'Kiadva/nem fizetve (Hitel)',
+						'panel-type' => 'panel-danger'
+					]
+			]);
+		?>
+	</div>
+</div>
+<div class='row'>
+	<div class='col-md-4'>
 
+	</div>
+	<div class='col-md-4'>
+			<?php 
+			echo TransferTotalWidget::widget([
+				'options' => [
+					'statistic' => $model->totals['paid_at_not_created_at'],
+					'panelHeading' =>  'Adósság (Hitel)/Fizetve'   ,
+					]
+			]);
+		?>	
+	</div>
+	<div class='col-md-4'>
 
-	
-	?>
+	</div>
+</div>
+
+<div class='row'>
+	<div class='col-md-4'>
+
+	</div>
+	<div class='col-md-4'>
+		<?php 
+			echo TransferTotalWidget::widget([
+				'options' => [
+					'statistic' => $model->totals['paid_at'],
+					'panelHeading' =>  'Fizetve'   ,
+					'panel-type' => 'panel-success'
+					]
+			]);
+		?>
+	</div>
+	<div class='col-md-4'>
+
+	</div>
+</div>
 	
     <?= $this->render('_form', [
         'model' => $model,
diff --git a/frontend/views/collection/view.php b/frontend/views/collection/view.php
index 5ce6db7..61b8f0c 100644
--- a/frontend/views/collection/view.php
+++ b/frontend/views/collection/view.php
@@ -14,30 +14,23 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('frontend/collection', 'Update'), ['update', 'id' => $model->id_collection], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('frontend/collection', 'Delete'), ['delete', 'id' => $model->id_collection], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('frontend/collection', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
 
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
             'id_collection',
-            'id_user',
-            'created_by',
-            'id_account',
-            'money',
-            'start',
-            'end',
-            'type',
-            'created_at',
-            'updated_at',
+            [
+            	'attribute' =>'id_user',
+            	'value' => $model->userName
+		    ],
+            [
+            	'attribute' =>'id_account',
+            	'value' => $model->accountName
+		    ],
+            'money:integer',
+            'start:datetime',
+            'end:datetime',
+            'created_at:datetime',
         ],
     ]) ?>
 
diff --git a/frontend/views/common/_transfer_total.php b/frontend/views/common/_transfer_total.php
index 4083a72..296dd45 100644
--- a/frontend/views/common/_transfer_total.php
+++ b/frontend/views/common/_transfer_total.php
@@ -1,10 +1,8 @@
-<div class="row">
-<div class="col-md-4 col-md-offset-4">
-<div class="panel panel-info">
-<div class="panel-heading"><?php echo $options['panelHeading']?></div>
-<div class="panel-body">
-<dl class="dl-horizontal dl-totals">
-				<?php
+		<div class="panel <?= $options['panel-type']?>">
+			<div class="panel-heading"><?php echo $options['panelHeading']?></div>
+			<div class="panel-body">
+				<dl class="dl-horizontal dl-totals">
+					<?php
 					foreach ($options['statistic']['accounts'] as $acc ){
 					?>
 						   <dt><?php echo $acc['label'] ?></dt>
@@ -16,6 +14,4 @@
 				   	<dd class="text-right"><?php echo $options['statistic']['total'] ?></dd>
 				</dl>
 			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+		</div>
\ No newline at end of file
diff --git a/frontend/views/transfer/_index_stat.php b/frontend/views/transfer/_index_stat.php
index b026fc2..b808064 100644
--- a/frontend/views/transfer/_index_stat.php
+++ b/frontend/views/transfer/_index_stat.php
@@ -1,96 +1,57 @@
 <?php
 
-use yii\helpers\Html;
-use yii\grid\GridView;
-use yii\widgets\ListView;
-use yii\base\Widget;
-
+use frontend\components\TransferTotalWidget;
 ?>
 <div>
 		<div class="row">
 			<div class="col-md-4">
-				<div class="panel panel-info">
-					<div class="panel-heading">Kiadva az adott időszakban</div>
-					<div class="panel-body">
-						<dl class="dl-horizontal dl-totals">
-							<?php 
-								 foreach ($searchModel->totalsCreatedAt['accounts'] as $acc ){
-							?>							
-								   <dt><?php echo $acc['label'] ?></dt>
-								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
-									
-							<?php 
-								} 
-							?>
-							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
-						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAt['total'] ?></dd>
-						   
-						</dl>
-					</div>
-				</div>
-			</div>
-			<div class="col-md-4">
-				<div class="panel panel-info">
-					<div class="panel-heading">Kiadva/nem fizetve az adott időszakban</div>
-					<div class="panel-body">
-						<dl class="dl-horizontal dl-totals">
-							<?php 
-								 foreach ($searchModel->totalsCreatedAtNotPaid['accounts'] as $acc ){
-							?>							
-								   <dt><?php echo $acc['label'] ?></dt>
-								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
-									
-							<?php 
-								} 
-							?>
-							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
-						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAtNotPaid['total'] ?></dd>
-						</dl>
-					</div>
-				</div>
+				<?php echo TransferTotalWidget::widget([
+					'options'=>[
+						'statistic' => $searchModel->totalsCreatedAt,
+						'panelHeading' => 'Kiadva az adott időszakban'
+					]
+				]);?>
 			</div>
 			<div class="col-md-4  ">
-				<div class="panel panel-info">
-					<div class="panel-heading">Kifizetve az adott időszakban</div>
-					<div class="panel-body">
-						<dl class="dl-horizontal dl-totals">
-							<?php 
-								 foreach ($searchModel->totalsPaidAt['accounts'] as $acc ){
-							?>							
-								   <dt><?php echo $acc['label'] ?></dt>
-								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
-									
-							<?php 
-								} 
-							?>
-							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
-						   	 <dd class="text-right"><?php echo $searchModel->totalsPaidAt['total'] ?></dd>
-						   
-						</dl>
-					</div>
-				</div>
+				<?php echo TransferTotalWidget::widget([
+					'options'=>[
+						'statistic' => $searchModel->totalsCreatedAtPaid,
+						'panelHeading' => 'Kiadva/fizetve az adott időszakban'
+					]
+				]);?>
+			</div>
+			<div class="col-md-4  ">
+				<?php echo TransferTotalWidget::widget([
+					'options'=>[
+						'statistic' => $searchModel->totalsCreatedAtNotPaid,
+						'panelHeading' => 'Kiadva/nem fizetve az adott időszakban'
+					]
+				]);?>
 			</div>
 		</div>
 		<div class="row">
-			<div class="col-md-4 col-md-offset-4">
-				<div class="panel panel-info">
-					<div class="panel-heading">Kiadva/fizetve az adott időszakban</div>
-					<div class="panel-body">
-						<dl class="dl-horizontal dl-totals">
-							<?php 
-								 foreach ($searchModel->totalsCreatedAtPaid['accounts'] as $acc ){
-							?>							
-								   <dt><?php echo $acc['label'] ?></dt>
-								   <dd class="text-right"><?php echo $acc['money'] ?></dd>
-									
-							<?php 
-								} 
-							?>
-							 <dt><?php echo Yii::t('frontend/transfer','Total') ?></dt>
-						   	 <dd class="text-right"><?php echo $searchModel->totalsCreatedAtPaid['total'] ?></dd>
-						</dl>
-					</div>
-				</div>
+			<div class="col-md-4 ">
+				
+			</div>
+			<div class="col-md-4 ">
+				<?php echo TransferTotalWidget::widget([
+					'options'=>[
+						'statistic' => $searchModel->totalsPaidAtNotCreatedAt,
+						'panelHeading' => 'Adósságok fizetve az adott időszakban'
+					]
+				]);?>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-4 ">
+			</div>
+			<div class="col-md-4 ">
+				<?php echo TransferTotalWidget::widget([
+					'options'=>[
+						'statistic' => $searchModel->totalsPaidAt,
+						'panelHeading' => 'Kiadva fizetve/adósság fizetve az adott időszakban'
+					]
+				]);?>
 			</div>
 		</div>
 	</div>
\ No newline at end of file
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
index d3abf24..7f11b47 100644
--- a/frontend/views/transfer/_search.php
+++ b/frontend/views/transfer/_search.php
@@ -57,9 +57,6 @@ use kartik\widgets\DateTimePicker;
         <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
     </div>
 
-	<?php
-	echo "types:";
-	print_r($model->types) ?>
 
     <?php ActiveForm::end(); ?>
 

From 48a00e4bdc487cb51f3b5e0d539d22a7880a9c8f Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 12:33:45 +0100
Subject: [PATCH 060/100] add frontend collection

---
 common/components/AccountTotalWidget.php      | 26 +++++
 common/models/Account.php                     |  5 +
 common/models/Collection.php                  | 96 +++++++++++++++++++
 common/models/CollectionCreate.php            |  6 +-
 common/models/UserSoldItem.php                | 25 +++++
 common/views/common/_account_total.php        | 17 ++++
 .../components/AccountStatisticWidget.php     | 23 +++++
 frontend/components/FrontendMenuStructure.php |  8 +-
 frontend/controllers/CollectionController.php | 49 ++++------
 frontend/models/CollectionSearch.php          |  7 ++
 frontend/models/TransferSearch.php            | 37 ++++---
 frontend/views/collection/create.php          | 90 ++++-------------
 frontend/views/collection/index.php           | 38 +++++++-
 frontend/views/collection/view.php            | 10 +-
 frontend/views/common/_account_statistic.php  | 64 +++++++++++++
 frontend/views/transfer/_index_stat.php       | 61 ++----------
 frontend/views/transfer/index.php             |  2 +-
 17 files changed, 370 insertions(+), 194 deletions(-)
 create mode 100644 common/components/AccountTotalWidget.php
 create mode 100644 common/views/common/_account_total.php
 create mode 100644 frontend/components/AccountStatisticWidget.php
 create mode 100644 frontend/views/common/_account_statistic.php

diff --git a/common/components/AccountTotalWidget.php b/common/components/AccountTotalWidget.php
new file mode 100644
index 0000000..93f9dbd
--- /dev/null
+++ b/common/components/AccountTotalWidget.php
@@ -0,0 +1,26 @@
+<?php
+namespace common\components;
+
+use yii\base\Widget;
+
+class AccountTotalWidget extends Widget{
+	
+	public $totalHeading = 'Össesen';
+	public $panelHeading = 'Össesen';
+	public $panelType = 'panel-info';
+	
+	public $statistic = ['total' => 0, 'accounts' => [] ];
+	
+	
+	public $viewFile = '@common/views/common/_account_total';
+	
+	public function init(){
+		parent::init();
+		
+	}
+	
+	public function run(){
+		echo $this->render($this->viewFile,[ 'model' => $this  ]);
+	}
+	
+}
\ No newline at end of file
diff --git a/common/models/Account.php b/common/models/Account.php
index 295e603..bfab0d5 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -4,6 +4,7 @@ namespace common\models;
 
 use Yii;
 use yii\behaviors\TimestampBehavior;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "account".
@@ -174,4 +175,8 @@ class Account extends \yii\db\ActiveRecord
     	return $accounts;
     }
     
+    public static function toAccaountMap($accounts){
+    	return  ArrayHelper::map( $accounts,'id_account','name' );
+    }
+    
 }
diff --git a/common/models/Collection.php b/common/models/Collection.php
index 513a602..9372b54 100644
--- a/common/models/Collection.php
+++ b/common/models/Collection.php
@@ -7,6 +7,8 @@ use common\components\AccountAwareBehavior;
 use common\components\UserAwareBehavior;
 use yii\helpers\ArrayHelper;
 use yii\behaviors\TimestampBehavior;
+use yii\db\Query;
+use yii\db\Expression;
 
 /**
  * This is the model class for table "collection".
@@ -104,4 +106,98 @@ class Collection extends \common\models\BaseFitnessActiveRecord
     	
     	return $result;
     }
+    
+    
+    /**
+     * 
+     * */
+public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$types,$idAccount){
+    	
+    	$query = new Query();
+    	
+    	$query->addSelect( [
+    			new Expression( ' collection.id_account as account'),
+    			new Expression( ' COALESCE(sum( collection.money ) ,0) as money /** collections total money */' )
+    	
+    	]);
+    	$query->from('collection');
+    	
+    	$query->andFilterWhere([
+    			'id_account' => $idAccount,
+    			]);
+
+    	$query->andFilterWhere(['id_user' => $idUser]);
+    	$query->andFilterWhere(['in' ,'type', $types]);
+    	self::inInterval($query, 'collection.end' , $start, $end);
+    	
+    	$query->groupBy('collection.id_account');
+    	
+    	return $query;
+    	
+    	
+    }
+    
+    public static function mkTotalsResultWithAllAvailableAccount($queryResult,$accounts,$accountMap,$idAccount){
+    
+    	$totals = [];
+    	$totals['total'] = 0;
+    
+    	$totals['accounts'] = [];
+    
+    	foreach ($accounts as $account){
+    		if ( isset($idAccount) &&  is_numeric($idAccount)  && $idAccount != $account->id_account  ){
+    			continue ;
+    		}
+    
+    		$accountTotal = [
+    		'id_account' => $account->id_account,
+    		'label' => 	$account->name,
+    		'money' => 0,
+    		];
+    
+    		$item = self::findByAccountInQueryResult($queryResult, $account);
+    
+    		if ( isset($item)){
+    			$accountTotal['money'] = $item['money'];
+    		}
+    		 
+    		$totals['accounts'][] = $accountTotal;
+    		$totals['total'] += $accountTotal['money'];
+    	}
+    	return $totals;
+    }
+    
+    public static function findByAccountInQueryResult( $queryResult, $account ){
+    	$result = null;
+    	foreach ($queryResult as $item){
+    		if( $item['account'] == $account->id_account ){
+    			$result = $item;
+    		}
+    	}
+    	return $result;
+    }
+    
+    public static function inInterval($query ,$field , $start,$end ){
+    	$query->andFilterWhere([ '>=', $field , $start ]   );
+    	$query->andFilterWhere([ '<' , $field  , $end ]   );
+    }
+    
+    
+    /**create and execute a "total" query*/
+    public static function exTotalQuery($mode,$start,$end,$idUser,$types,$idAccount){
+    	$query =  self::mkTotalQuery($mode, $start, $end, $idUser, $types, $idAccount );
+    	$command = $query->createCommand();
+    	$result = $command->queryAll();
+    	return $result;
+    }
+    
+    /**
+     *find all transfers which were paid in the period
+     * */
+    public static function mkReceptionTotal( $start, $end, $idUser, $types, $idAccount, $accounts, $accountMap){
+    	$result = [];
+    	$queryResult =  self::exTotalQuery('reception', $start, $end, $idUser, $types, $idAccount );
+    	$result = self::mkTotalsResultWithAllAvailableAccount($queryResult, $accounts, $accountMap, $idAccount);
+    	return $result;
+    }
 }
diff --git a/common/models/CollectionCreate.php b/common/models/CollectionCreate.php
index 0ec535e..9108501 100644
--- a/common/models/CollectionCreate.php
+++ b/common/models/CollectionCreate.php
@@ -30,6 +30,7 @@ class CollectionCreate extends \common\models\Collection
 	public $accountMap;
 	public $account;
 	public $totals;
+	public $userCartTotal;
 	
 	public $timestampEnd;
 	public $timestampStart;
@@ -38,7 +39,10 @@ class CollectionCreate extends \common\models\Collection
 	public function rules(){
 		return [
 			['end','required'],
-			[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+			/**enable seconds*/
+			[[ 'end' , ], 'date'  ,'format' => 'yyyy-MM-dd HH:mm:ss' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm:ss' ,'timeZone' => 'UTC' ],
+			/*enable only minutes*/
+// 			[[ 'end' , ], 'date'  ,'format' => 'yyyy-MM-dd HH:mm' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
 			[[ 'end' ], 'validateEndDate' ]
 		];
 	}
diff --git a/common/models/UserSoldItem.php b/common/models/UserSoldItem.php
index ff40dd0..b74dbe2 100644
--- a/common/models/UserSoldItem.php
+++ b/common/models/UserSoldItem.php
@@ -3,6 +3,8 @@
 namespace common\models;
 
 use Yii;
+use yii\db\Query;
+use yii\db\Expression;
 
 /**
  * This is the model class for table "user_sold_item".
@@ -60,6 +62,29 @@ class UserSoldItem extends \yii\db\ActiveRecord
     	
     }
     
+    public static function readTotalForAccount($idUser,$idAccount){
+    	 
+    	$query = new Query();
+    	
+    	$query->addSelect( [
+    			new Expression( ' COALESCE(sum( transfer.money ) ,0) as money /** total unpaid reception cart */' )
+    	
+    	]);
+    	$query->innerJoin('transfer',['user_sold_item.id_transfer' =>'transfer.id_transfer']);
+    	
+    	$query->from('user_sold_item');
+    	
+    	$query->andFilterWhere([
+    			'transfer.id_account' => $idAccount,
+    			]);
+
+    	$query->andFilterWhere(['user_sold_item.id_user' => $idUser]);
+    	
+    	
+    	return $query->scalar();
+    	 
+    }
+    
     
     /**
      * @param common\models\User $user
diff --git a/common/views/common/_account_total.php b/common/views/common/_account_total.php
new file mode 100644
index 0000000..9c9617d
--- /dev/null
+++ b/common/views/common/_account_total.php
@@ -0,0 +1,17 @@
+		<div class="panel <?=$model->panelType ?>">
+			<div class="panel-heading"><?php echo $model->panelHeading?></div>
+			<div class="panel-body">
+				<dl class="dl-horizontal dl-totals">
+					<?php
+					foreach ($model->statistic['accounts'] as $acc ){
+					?>
+						   <dt><?php echo $acc['label'] ?></dt>
+						   <dd class="text-right"><?php echo $acc['money'] ?></dd>
+					<?php 
+					} 
+					?>
+					<dt><?php echo $model->totalHeading ?></dt>
+				   	<dd class="text-right"><?php echo $model->statistic['total'] ?></dd>
+				</dl>
+			</div>
+		</div>
\ No newline at end of file
diff --git a/frontend/components/AccountStatisticWidget.php b/frontend/components/AccountStatisticWidget.php
new file mode 100644
index 0000000..be610b6
--- /dev/null
+++ b/frontend/components/AccountStatisticWidget.php
@@ -0,0 +1,23 @@
+<?php
+namespace frontend\components;
+
+use yii\base\Widget;
+
+class AccountStatisticWidget extends Widget{
+	
+	public $totals;
+	
+	
+	public $viewFile = '//common/_account_statistic';
+	
+	public function init(){
+		parent::init();
+		
+		
+	}
+	
+	public function run(){
+		echo $this->render($this->viewFile,[ 'model' => $this ]);
+	}
+	
+}
\ No newline at end of file
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index 21a79d3..9b6f243 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -36,9 +36,6 @@ class FrontendMenuStructure{
 			}
 		}
 
-// 		print_r($this->start);
-// 		print_r($this->tomorrow);
-		
 	}
 	
 	
@@ -59,9 +56,7 @@ class FrontendMenuStructure{
 	
 	protected function addRecepcio(){
 		if ( $this->isLogged() ){
-			$this->menuItems[]  = ['label' => 'Recepcio', 'url' => ['/customer/reception'] ];
-// 			, 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow
-// 			$this->menuItems[]  = ['label' => 'Pénzmozgások', 'url' => [ '/money-movement/index', 'MoneyMovementSearch[start]' => $this->start, 'MoneyMovementSearch[end]' => $this->tomorrow ] ];
+			$this->menuItems[]  = ['label' => 'Recepció', 'url' => ['/customer/reception'] ];
 			$this->menuItems[]  = ['label' => 'Kassza',   
 					'items' => [
 							['label' =>  Yii::t('frontend/account-state','Default account'), 'url' => ['/account/select'] ],
@@ -72,7 +67,6 @@ class FrontendMenuStructure{
 							['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 ] ]
 					]
-					
 			];
 		}
 	}
diff --git a/frontend/controllers/CollectionController.php b/frontend/controllers/CollectionController.php
index 8b6d973..fbf5c89 100644
--- a/frontend/controllers/CollectionController.php
+++ b/frontend/controllers/CollectionController.php
@@ -14,6 +14,7 @@ use common\models\CollectionCreate;
 use common\models\Transfer;
 use frontend\models\CreateAccountSelectForm;
 use yii\helpers\ArrayHelper;
+use common\models\UserSoldItem;
 
 /**
  * CollectionController implements the CRUD actions for Collection model.
@@ -41,8 +42,10 @@ class CollectionController extends Controller
         $searchModel = new CollectionSearch();
         
         $searchModel->accounts = Account::read();
+        $searchModel->accountMap = Account::toAccaountMap($searchModel->accounts);
         
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $searchModel->searchTotal();
 
         return $this->render('index', [
             'searchModel' => $searchModel,
@@ -57,8 +60,16 @@ class CollectionController extends Controller
      */
     public function actionView($id)
     {
+    	$model = $this->findModel($id);
+    	
+    	$accounts = Account::read();
+    	$accountMap = Account::toAccaountMap($accounts);
+    	
+    	$totals = Transfer::mkTotals($model->start, $model->end, $model->id_user, null, $model->id_account, $accounts, $accountMap);
+    	
         return $this->render('view', [
-            'model' => $this->findModel($id),
+            'model' => $model,
+        	'totals' => $totals,
         ]);
     }
 
@@ -83,12 +94,14 @@ class CollectionController extends Controller
 		$model->timestampStart = isset($model->lastCollection) ? $model->lastCollection->end :null; 
 		$model->timestampEnd   =  date("Y-m-d H:i:s");
 		
-		$model->start = isset($model->timestampStart) ? Yii::$app->formatter->asDatetime( $model->timestampStart ) : '';
-		$model->end = isset($model->timestampEnd) ? Yii::$app->formatter->asDatetime( $model->timestampEnd ): '';
+		$model->start = isset($model->timestampStart) ? Yii::$app->formatter->asDatetime( $model->timestampStart ,'yyyy-MM-dd HH:mm:ss') : '';
+		$model->end = isset($model->timestampEnd) ? Yii::$app->formatter->asDatetime( $model->timestampEnd ,'yyyy-MM-dd HH:mm:ss'): '';
 		
 		$model->type = Collection::TYPE_RECEPTION;
 		
 		
+		$model->userCartTotal = UserSoldItem::readTotalForAccount($model->id_user, $model->id_account);
+		
         if ( $model->load(Yii::$app->request->post()) && $model->save() ) {
             return $this->redirect(['view', 'id' => $model->id_collection]);
         } else {
@@ -119,37 +132,7 @@ class CollectionController extends Controller
 		]);
     }
 
-    /**
-     * Updates an existing Collection model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_collection]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Collection model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
 
     /**
      * Finds the Collection model based on its primary key value.
diff --git a/frontend/models/CollectionSearch.php b/frontend/models/CollectionSearch.php
index 3bcf41d..1e6a6ff 100644
--- a/frontend/models/CollectionSearch.php
+++ b/frontend/models/CollectionSearch.php
@@ -13,10 +13,13 @@ use common\models\Collection;
 class CollectionSearch extends Collection
 {
 	public $accounts;
+	public $accountMap;
 	
 	public $timestampStart;
 	public $timestampEnd;
 	
+	public $totals;
+	
     /**
      * @inheritdoc
      */
@@ -69,4 +72,8 @@ class CollectionSearch extends Collection
         
         return $dataProvider;
     }
+    
+    public function searchTotal(){
+    	$this->totals = Collection::mkReceptionTotal($this->timestampStart, $this->timestampEnd , Yii::$app->user->id, [Collection::TYPE_RECEPTION], $this->id_account, $this->accounts, $this->accountMap);
+    }
 }
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
index a2b48a9..f768d46 100644
--- a/frontend/models/TransferSearch.php
+++ b/frontend/models/TransferSearch.php
@@ -24,13 +24,15 @@ class TransferSearch extends Transfer
 	public $timestampStart;
 	public $timestampEnd;
 	
-	public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
-	public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
-	public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
-	public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
-	public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
+// 	public $totalsCreatedAt = ['total' => 0, 'accounts' =>[] ];
+// 	public $totalsCreatedAtNotPaid= ['total' => 0, 'accounts' =>[]];
+// 	public $totalsCreatedAtPaid= ['total' => 0, 'accounts' =>[]];
+// 	public $totalsPaidAt= ['total' => 0, 'accounts' =>[]];
+// 	public $totalsPaidAtNotCreatedAt= ['total' => 0, 'accounts' =>[]];
 	
 	
+	public $totals;
+	
 	public $accounts;
 	
 	public $types;
@@ -41,19 +43,12 @@ class TransferSearch extends Transfer
     public function rules()
     {
         return [
-//         	[[ 'start',  ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
-//         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
         		
         	[[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
         	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
         		
 			[ [ 'id_account'  ] , 'integer'],
         	['types', 'each', 'rule' => ['integer']],
-// 			[ [ 'types'  ], function ($attribute, $params) {
-// 					if (!is_array($this->$attribute)) {
-// 						$this->addError($attribute, 'Invalid array');
-// 					}
-// 				}],
         ];
     }
 
@@ -103,9 +98,9 @@ class TransferSearch extends Transfer
     			'money' => 0
     	];
     	
-    	if ( $this->hasErrors() ){
-    		return;	
-    	}
+//     	if ( $this->hasErrors() ){
+//     		return;	
+//     	}
     	
     	
     	
@@ -113,13 +108,13 @@ class TransferSearch extends Transfer
     	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
     	$idUser = Yii::$app->user->id;
     	
-    	$totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
+    	$this->totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
     	
-		$this->totalsCreatedAt = $totals['created_at'];
-		$this->totalsPaidAt = $totals['paid_at'];
-		$this->totalsCreatedAtPaid = $totals['created_at_paid'];
-		$this->totalsCreatedAtNotPaid = $totals['created_at_not_paid'];
-		$this->totalsPaidAtNotCreatedAt = $totals['paid_at_not_created_at'];
+// 		$this->totalsCreatedAt = $totals['created_at'];
+// 		$this->totalsPaidAt = $totals['paid_at'];
+// 		$this->totalsCreatedAtPaid = $totals['created_at_paid'];
+// 		$this->totalsCreatedAtNotPaid = $totals['created_at_not_paid'];
+// 		$this->totalsPaidAtNotCreatedAt = $totals['paid_at_not_created_at'];
     
     }
     
diff --git a/frontend/views/collection/create.php b/frontend/views/collection/create.php
index 79da8d7..f3cd0f9 100644
--- a/frontend/views/collection/create.php
+++ b/frontend/views/collection/create.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use frontend\components\TransferTotalWidget;
+use frontend\components\AccountStatisticWidget;
 
 
 /* @var $this yii\web\View */
@@ -20,10 +21,10 @@ $this->params['breadcrumbs'][] = $this->title;
 		<dd><?php  echo isset($model->lastCollection) ? Yii::$app->formatter->asDatetime($model->lastCollection->end) : Yii::t('frontend/collection', "No collection found") ?></dd> 
 		
 		<dt><?= Yii::t('frontend/collection', "Start of interval")?></dt>
-		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampStart)  ?></dd> 
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampStart,'yyyy-MM-dd HH:mm:ss')  ?> (inkluzív)</dd> 
 		
 		<dt><?= Yii::t('frontend/collection', "End of interval")?></dt>
-		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampEnd)  ?></dd> 
+		<dd><?php  echo   Yii::$app->formatter->asDatetime($model->timestampEnd,'yyyy-MM-dd HH:mm:ss')  ?> (exkluzív)</dd> 
 	</dl>
 	
 	<p>
@@ -31,78 +32,23 @@ $this->params['breadcrumbs'][] = $this->title;
         <?= Html::a(Yii::t('frontend/collection', 'Select another account'), ['select-account' ], ['class' => 'btn btn-primary']) ?>
     </p>
 	
-	<div class='row'>
-	<div class='col-md-4'>
-		<?php 
-		echo TransferTotalWidget::widget([
-			'options' => [
-				'statistic' => $model->totals['created_at'],
-				'panelHeading' => 'Kiadva',
-				]
-		]);
-		?>
-	</div>
-	<div class='col-md-4'>
-		<?php 
-		echo TransferTotalWidget::widget([
-			'options' => [
-				'statistic' => $model->totals['created_at_paid'],
-				'panelHeading' => 'Kiadva/fizetve',
-				]
-		]);
-		?>
-	</div>
-	<div class='col-md-4'>
-		<?php 
-			echo TransferTotalWidget::widget([
-				'options' => [
-					'statistic' => $model->totals['created_at_not_paid'],
-					'panelHeading' => 'Kiadva/nem fizetve (Hitel)',
-						'panel-type' => 'panel-danger'
-					]
-			]);
-		?>
-	</div>
-</div>
-<div class='row'>
-	<div class='col-md-4'>
-
-	</div>
-	<div class='col-md-4'>
+	<?php 
+		if ( $model->userCartTotal > 0){
+			?>
+			<p class="bg-danger">
+				Figyelem! A recepció kassza tartalmaz még fizetetlen elemeket!
+			</p>
 			<?php 
-			echo TransferTotalWidget::widget([
-				'options' => [
-					'statistic' => $model->totals['paid_at_not_created_at'],
-					'panelHeading' =>  'Adósság (Hitel)/Fizetve'   ,
-					]
-			]);
-		?>	
-	</div>
-	<div class='col-md-4'>
-
-	</div>
-</div>
-
-<div class='row'>
-	<div class='col-md-4'>
-
-	</div>
-	<div class='col-md-4'>
-		<?php 
-			echo TransferTotalWidget::widget([
-				'options' => [
-					'statistic' => $model->totals['paid_at'],
-					'panelHeading' =>  'Fizetve'   ,
-					'panel-type' => 'panel-success'
-					]
-			]);
-		?>
-	</div>
-	<div class='col-md-4'>
-
-	</div>
-</div>
+		}
+	?>
 	
+	
+	<?php 
+	
+		echo AccountStatisticWidget::widget([
+			'totals' =>  $model->totals
+		]);
+	?>
     <?= $this->render('_form', [
         'model' => $model,
     ]) ?>
diff --git a/frontend/views/collection/index.php b/frontend/views/collection/index.php
index 275848c..1560c04 100644
--- a/frontend/views/collection/index.php
+++ b/frontend/views/collection/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\AccountTotalWidget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel frontend\models\CollectionSearch */
@@ -19,15 +20,42 @@ $this->params['breadcrumbs'][] = $this->title;
         <?= Html::a(Yii::t('frontend/collection', 'Create Collection'), ['select-account'], ['class' => 'btn btn-success']) ?>
     </p>
 
+
+    <div class="row">
+	    <div class="col-md-4 ">
+	    	<?php 
+	    	echo AccountTotalWidget::widget([
+				'statistic' => $searchModel->totals
+	    	])?>
+	    </div>
+    </div>
+    
+    
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
             'id_collection',
-            'id_user',
-            'id_account',
-            'money',
-            'start:datetime',
-            'end:datetime',
+			[
+				'attribute' => 'id_user',
+				'value' => 'userName',
+				],
+			[
+				'attribute' => 'id_account',
+				'value' => 'accountName',
+			],
+            'money:integer',
+			[
+				'attribute' => 'start',
+				'value' => function($model){
+					return Yii::$app->formatter->asDatetime($model->start,'yyyy-MM-dd HH:mm:ss');
+				}
+			],
+			[
+				'attribute' => 'end',
+				'value' => function($model){
+					return Yii::$app->formatter->asDatetime($model->end,'yyyy-MM-dd HH:mm:ss');
+				}
+			],
             'created_at:datetime',
 
             ['class' => 'yii\grid\ActionColumn',
diff --git a/frontend/views/collection/view.php b/frontend/views/collection/view.php
index 61b8f0c..7db6f06 100644
--- a/frontend/views/collection/view.php
+++ b/frontend/views/collection/view.php
@@ -2,11 +2,12 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use frontend\components\AccountStatisticWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Collection */
 
-$this->title = $model->id_collection;
+$this->title = Yii::t('frontend/collection','Reception collection') . ' #'. $model->id_collection;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('frontend/collection', 'Collections'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -34,4 +35,11 @@ $this->params['breadcrumbs'][] = $this->title;
         ],
     ]) ?>
 
+	<?php 
+		echo AccountStatisticWidget::widget([
+			'totals' =>  $totals
+		]);
+	?>
+
+
 </div>
diff --git a/frontend/views/common/_account_statistic.php b/frontend/views/common/_account_statistic.php
new file mode 100644
index 0000000..7f54d89
--- /dev/null
+++ b/frontend/views/common/_account_statistic.php
@@ -0,0 +1,64 @@
+<?php 
+use common\components\AccountTotalWidget;
+?>
+<div class='row'>
+	<div class='col-md-4'>
+		<?php 
+		echo AccountTotalWidget::widget([
+				'statistic' => $model->totals['created_at'],
+				'panelHeading' => 'Kiadva',
+		]);
+		?>
+	</div>
+	<div class='col-md-4'>
+		<?php 
+		echo AccountTotalWidget::widget([
+				'statistic' => $model->totals['created_at_paid'],
+				'panelHeading' => 'Kiadva/fizetve',
+		]);
+		?>
+	</div>
+	<div class='col-md-4'>
+		<?php 
+			echo AccountTotalWidget::widget([
+					'statistic' => $model->totals['created_at_not_paid'],
+					'panelHeading' => 'Kiadva/nem fizetve (Hitel)',
+					'panelType' => 'panel-danger'
+			]);
+		?>
+	</div>
+</div>
+<div class='row'>
+	<div class='col-md-4'>
+
+	</div>
+	<div class='col-md-4'>
+			<?php 
+			echo AccountTotalWidget::widget([
+					'statistic' => $model->totals['paid_at_not_created_at'],
+					'panelHeading' =>  'Adósság (Hitel)/Fizetve'   ,
+			]);
+		?>	
+	</div>
+	<div class='col-md-4'>
+
+	</div>
+</div>
+
+<div class='row'>
+	<div class='col-md-4'>
+
+	</div>
+	<div class='col-md-4'>
+		<?php 
+			echo AccountTotalWidget::widget([
+					'statistic' => $model->totals['paid_at'],
+					'panelHeading' =>  'Fizetve'   ,
+					'panelType' => 'panel-success'
+			]);
+		?>
+	</div>
+	<div class='col-md-4'>
+
+	</div>
+</div>
\ No newline at end of file
diff --git a/frontend/views/transfer/_index_stat.php b/frontend/views/transfer/_index_stat.php
index b808064..7092190 100644
--- a/frontend/views/transfer/_index_stat.php
+++ b/frontend/views/transfer/_index_stat.php
@@ -1,57 +1,12 @@
 <?php
 
 use frontend\components\TransferTotalWidget;
+use frontend\components\AccountStatisticWidget;
 ?>
-<div>
-		<div class="row">
-			<div class="col-md-4">
-				<?php echo TransferTotalWidget::widget([
-					'options'=>[
-						'statistic' => $searchModel->totalsCreatedAt,
-						'panelHeading' => 'Kiadva az adott időszakban'
-					]
-				]);?>
-			</div>
-			<div class="col-md-4  ">
-				<?php echo TransferTotalWidget::widget([
-					'options'=>[
-						'statistic' => $searchModel->totalsCreatedAtPaid,
-						'panelHeading' => 'Kiadva/fizetve az adott időszakban'
-					]
-				]);?>
-			</div>
-			<div class="col-md-4  ">
-				<?php echo TransferTotalWidget::widget([
-					'options'=>[
-						'statistic' => $searchModel->totalsCreatedAtNotPaid,
-						'panelHeading' => 'Kiadva/nem fizetve az adott időszakban'
-					]
-				]);?>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-md-4 ">
-				
-			</div>
-			<div class="col-md-4 ">
-				<?php echo TransferTotalWidget::widget([
-					'options'=>[
-						'statistic' => $searchModel->totalsPaidAtNotCreatedAt,
-						'panelHeading' => 'Adósságok fizetve az adott időszakban'
-					]
-				]);?>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-md-4 ">
-			</div>
-			<div class="col-md-4 ">
-				<?php echo TransferTotalWidget::widget([
-					'options'=>[
-						'statistic' => $searchModel->totalsPaidAt,
-						'panelHeading' => 'Kiadva fizetve/adósság fizetve az adott időszakban'
-					]
-				]);?>
-			</div>
-		</div>
-	</div>
\ No newline at end of file
+<?php 
+
+echo AccountStatisticWidget::widget([
+		'totals' =>  $model->totals
+		]);
+
+?>
\ No newline at end of file
diff --git a/frontend/views/transfer/index.php b/frontend/views/transfer/index.php
index 3aeff9f..8772692 100644
--- a/frontend/views/transfer/index.php
+++ b/frontend/views/transfer/index.php
@@ -32,7 +32,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
     <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
-    <?php   echo $this->render('_index_stat', ['searchModel' => $searchModel]); ?>
+    <?php   echo $this->render('_index_stat', ['model' => $searchModel]); ?>
 
 	
    

From 4303409fe207eb0c4629561d83f7381b5112fe90 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 15:39:02 +0100
Subject: [PATCH 061/100] add collections to backend

---
 backend/components/AdminMenuStructure.php     |   6 +-
 backend/controllers/CollectionController.php  |  89 ++++++--------
 backend/controllers/TransferController.php    |   6 +-
 backend/models/CollectionSearch.php           |  36 ++++--
 backend/models/TransferSearch.php             | 111 ++++--------------
 backend/views/collection/_search.php          |  56 +++++----
 backend/views/collection/index.php            |  40 ++++---
 backend/views/collection/view.php             |  38 +++---
 backend/views/transfer/_search.php            |   2 +-
 backend/views/transfer/index.php              |  42 ++-----
 .../components/AccountStatisticWidget.php     |   4 +-
 common/components/Helper.php                  |  14 +++
 common/models/Transfer.php                    |   3 +
 .../views/common/_account_statistic.php       |   0
 frontend/controllers/CollectionController.php |   3 +-
 frontend/models/CollectionSearch.php          |   1 +
 frontend/models/TransferSearch.php            |  17 +--
 frontend/views/collection/_search.php         |   2 +-
 frontend/views/collection/create.php          |   2 +-
 frontend/views/collection/view.php            |   2 +-
 frontend/views/transfer/_index_stat.php       |   3 +-
 frontend/views/transfer/_search.php           |   1 -
 22 files changed, 212 insertions(+), 266 deletions(-)
 rename {frontend => common}/components/AccountStatisticWidget.php (72%)
 rename {frontend => common}/views/common/_account_statistic.php (100%)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 06a0c75..98ab72c 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -36,6 +36,10 @@ class AdminMenuStructure{
 			$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
 			$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 +  time()));
 			
+			$todayDatetime = \Yii::$app->formatter->asDatetime( strtotime('today UTC') );
+			$tomorrowDatetime = \Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
+			
+			
 	// 		if ( $this->can('backend.user.index')){
 				$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
 	// 		}
@@ -53,7 +57,7 @@ class AdminMenuStructure{
 			
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
-			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$today,'CollectionSearch[end]' => $tomorrow ] ];
+			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
 			
 			if ( count($items) > 0 ){
 				$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/CollectionController.php b/backend/controllers/CollectionController.php
index aed7761..a7b517c 100644
--- a/backend/controllers/CollectionController.php
+++ b/backend/controllers/CollectionController.php
@@ -8,6 +8,9 @@ use backend\models\CollectionSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
+use common\models\Account;
+use common\models\Transfer;
+use common\models\User;
 
 /**
  * CollectionController implements the CRUD actions for Collection model.
@@ -15,6 +18,25 @@ use yii\filters\VerbFilter;
 class CollectionController extends \backend\controllers\BackendController
 {
 
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+					// allow authenticated users
+					[
+					'actions' => [ 'index','view' ],
+					'allow' => true,
+					'roles' => ['@'],
+					],
+					// everything else is denied
+				],
+			],
+		];
+	}
+	
     /**
      * Lists all Collection models.
      * @return mixed
@@ -22,7 +44,13 @@ class CollectionController extends \backend\controllers\BackendController
     public function actionIndex()
     {
         $searchModel = new CollectionSearch();
+        $searchModel->accounts = Account::read();
+        $searchModel->accountMap = Account::toAccaountMap($searchModel->accounts);
+        
+        $searchModel->users = User::find()->all(    );
+        
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $searchModel->searchTotal();
 
         return $this->render('index', [
             'searchModel' => $searchModel,
@@ -37,61 +65,20 @@ class CollectionController extends \backend\controllers\BackendController
      */
     public function actionView($id)
     {
+    	
+    	$model = $this->findModel($id);
+    	 
+    	$accounts = Account::read();
+    	$accountMap = Account::toAccaountMap($accounts);
+    	 
+    	$totals = Transfer::mkTotals($model->start, $model->end, $model->id_user, null, $model->id_account, $accounts, $accountMap);
         return $this->render('view', [
-            'model' => $this->findModel($id),
+            'model' => $model,
+        	'totals' => $totals,
         ]);
     }
 
-    /**
-     * Creates a new Collection model.
-     * If creation is successful, the browser will be redirected to the 'view' page.
-     * @return mixed
-     */
-    public function actionCreate()
-    {
-        $model = new Collection();
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_collection]);
-        } else {
-            return $this->render('create', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Updates an existing Collection model.
-     * If update is successful, the browser will be redirected to the 'view' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionUpdate($id)
-    {
-        $model = $this->findModel($id);
-
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id_collection]);
-        } else {
-            return $this->render('update', [
-                'model' => $model,
-            ]);
-        }
-    }
-
-    /**
-     * Deletes an existing Collection model.
-     * If deletion is successful, the browser will be redirected to the 'index' page.
-     * @param integer $id
-     * @return mixed
-     */
-    public function actionDelete($id)
-    {
-        $this->findModel($id)->delete();
-
-        return $this->redirect(['index']);
-    }
-
+    
     /**
      * Finds the Collection model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
index 4d02a83..90806d6 100644
--- a/backend/controllers/TransferController.php
+++ b/backend/controllers/TransferController.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace backend\controllers;
 
 use Yii;
@@ -45,11 +44,10 @@ class TransferController extends \backend\controllers\BackendController
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
         
         $accounts = Account::readAccounts();
-        $users = User::read();
-        
-        $searchModel->totals(Yii::$app->request->queryParams);
         
+        $searchModel->totalsTransfers();
        	
+        $users = User::read();
 
         return $this->render('index', [
             'searchModel' => $searchModel,
diff --git a/backend/models/CollectionSearch.php b/backend/models/CollectionSearch.php
index e185d52..8656fbe 100644
--- a/backend/models/CollectionSearch.php
+++ b/backend/models/CollectionSearch.php
@@ -6,21 +6,34 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Collection;
+use common\components\Helper;
 
 /**
  * CollectionSearch represents the model behind the search form about `common\models\Collection`.
  */
 class CollectionSearch extends Collection
 {
+	
+	public $accounts;
+	public $accountMap;
+
+	public $users;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+	public $totals;
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
-        return [
-            [['id_collection', 'id_user', 'created_by', 'id_account', 'money', 'type'], 'integer'],
-            [['start', 'end', 'created_at', 'updated_at'], 'safe'],
-        ];
+         return [
+            [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+			[['id_account','id_user'],'integer']
+		];
     }
 
     /**
@@ -56,18 +69,17 @@ class CollectionSearch extends Collection
         }
 
         $query->andFilterWhere([
-            'id_collection' => $this->id_collection,
             'id_user' => $this->id_user,
-            'created_by' => $this->created_by,
             'id_account' => $this->id_account,
-            'money' => $this->money,
-            'start' => $this->start,
-            'end' => $this->end,
-            'type' => $this->type,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
+        
+        Helper::inInterval($query, 'collection.end', $this->timestampStart, $this->timestampEnd);
 
         return $dataProvider;
     }
+    
+    public function searchTotal(){
+    	$this->totals = Collection::mkReceptionTotal($this->timestampStart, $this->timestampEnd , Yii::$app->user->id, [Collection::TYPE_RECEPTION], $this->id_account, $this->accounts, $this->accountMap);
+    }
+    
 }
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index 7f9e7e7..f91ce60 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -11,6 +11,7 @@ use yii\base\Object;
 use yii\db\Query;
 use yii\helpers\ArrayHelper;
 use common\models\Account;
+use common\components\Helper;
 
 /**
  * TransferSearch represents the model behind the search form about `common\models\Transfer`.
@@ -29,6 +30,9 @@ class TransferSearch extends Transfer
 	public $accountTotals;
 	public $fullTotal;
 	
+	public $types;
+	public $totals;
+	
     /**
      * @inheritdoc
      */
@@ -39,6 +43,7 @@ class TransferSearch extends Transfer
 //             [[ 'searchObjectName' ], 'string'],
         	[[ 'start', ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
+        	['types', 'each', 'rule' => ['integer']],
         ];
     }
 
@@ -66,17 +71,8 @@ class TransferSearch extends Transfer
             'query' => $query,
         ]);
 
-//         $selectObjectName = "";
-//         $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name  ";
-//         $selectObjectName .= "  when transfer.type = " .self::TYPE_TICKET  ." then ticket_type.name ";
-//         $selectObjectName .= "  when transfer.type = " .self::TYPE_MONEY_MOVEMENT_OUT  ." then 'Pénzmozgás' ";
-//         $selectObjectName .= " else '' ";
-//         $selectObjectName .= " end as object_name";
         
         $query->addSelect( ['*'  ]);
-//         $query->joinWith('ticket');
-//         $query->joinWith('ticketType');
-//         $query->joinWith('product');
         
         $this->load($params);
 
@@ -92,94 +88,33 @@ class TransferSearch extends Transfer
             'transfer.id_user' => $this->id_user,
         ]);
         
-        $query->andFilterWhere([ '>=', 'transfer.created_at' , $this->timestampStart ]   );
-        $query->andFilterWhere([ '<' , 'transfer.created_at'  , $this->timestampEnd ]   );
-
-//         if ( isset($this->searchObjectName))
-//         $query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
-        
+		$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ]  ];
+        $paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ]  ];
         
+        $query->andFilterWhere(['or' , $created_condition , $paid_condition]);
         
         return $dataProvider;
     }
     
     
-    public function search2(){
-    	$query = new Query() ;
-    	$query->select('*');
-    	
-    	 
-    }
-    
-    public function totals($params){
-    	$query = new Query();
-    	
-    	$result = [	];
-    	
+    public function totalsTransfers( ){
     	$accountTotals = [];
     	$fullTotal = [
-    			'label' => Yii::t('common/transfer', 'Total'),
-    			'money' => 0
+    	'label' => Yii::t('common/transfer', 'Total'),
+    	'money' => 0
     	];
-    		
-    	$query->addSelect( [ new Expression( 'transfer.id_account as account'),  new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money' )]);
-    	$query->from('transfer');
-//     	$query->leftJoin('ticket', 'transfer.type =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
-//     	$query->leftJoin('ticket_type', 'ticket.id_ticket_type   = ticket_type.id_ticket_type ' );
-//     	$query->leftJoin('product', 'product.id_product =  ' .self::TYPE_TICKET  .' and transfer.id_object = ticket.id_ticket ' );
-    	
-    	$this->load($params);
-    	
-    	if (!$this->validate()) {
-    		return  ;
-    	}
-    	
-    	$query->andFilterWhere([
-    			'transfer.id_account' => $this->id_account,
-    			'transfer.type' => $this->type,
-    			'transfer.id_user' => $this->id_user,
-    	]);
-    	
-    	$query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ]   );
-    	$query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ]   );
-    	
-    	
-//     	if ( isset($this->searchObjectName)  && !empty($this->searchObjectName)){
-//     		$query->andWhere(   new Expression(" case when transfer.type = " .self::TYPE_PRODUCT  ." then product.name else ticket_type.name end  like '%"  . $this->searchObjectName  ."%'"));
-//     	}
-    	
-    	$query->groupBy('transfer.id_account');
-    	
-    	$command = $query->createCommand();
-		// $command->sql returns the actual SQL
-		$result = $command->queryAll();
-		
-		
-		$accounts =  Account::find()->orderBy("name asc")->all();
-		$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
-		
-		
-		
-		foreach ($result as $item){
-			$account = "";
-			if ( array_key_exists($item['account'], $accountMap)){
-				$account = $accountMap[$item['account']];
-			}
-				
-			 $accountTotal = [
-			 	'label' => 	$account,
-			 	'money' => $item['money']
-			 ];
-			 
-			 $accountTotals[] = $accountTotal;
-			 
-			 $fullTotal['money'] += $item['money'];
-		}
-    	
-		$this->accountTotals = $accountTotals;
-		$this->fullTotal = $fullTotal;
-		
-//     	return $result;
+    	 
+    	 
+    	$accounts =  Account::find()->orderBy("name asc")->all();
+    	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
+    	$idUser = Yii::$app->user->id;
+    	 
+    	$this->totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
+    	 
+    
     }
     
+    
+    
+    
 }
diff --git a/backend/views/collection/_search.php b/backend/views/collection/_search.php
index e2f80ec..9ebdada 100644
--- a/backend/views/collection/_search.php
+++ b/backend/views/collection/_search.php
@@ -2,12 +2,22 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+use kartik\widgets\DateTimePicker;
+use yii\helpers\ArrayHelper;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\CollectionSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<?php 
+
+$accountOptions =  ['' =>Yii::t('frontend/collection','All')]+ HtmlHelper::mkAccountOptions($model->accounts);
+$userOptions =  ['' =>Yii::t('frontend/collection','All')]+ ArrayHelper::map($model->users,'id','username');
+
+?>
+
 <div class="collection-search">
 
     <?php $form = ActiveForm::begin([
@@ -15,29 +25,35 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_collection') ?>
 
-    <?= $form->field($model, 'id_user') ?>
-
-    <?= $form->field($model, 'created_by') ?>
-
-    <?= $form->field($model, 'id_account') ?>
-
-    <?= $form->field($model, 'money') ?>
-
-    <?php // echo $form->field($model, 'start') ?>
-
-    <?php // echo $form->field($model, 'end') ?>
-
-    <?php // echo $form->field($model, 'type') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
+	<div class='row'>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'id_account')->dropDownList( $accountOptions ) ?>
+		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'id_user')->dropDownList( $userOptions ) ?>
+		</div>
+		<div class="col-md-3">
+		    <?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-3">
+		    <?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd hh:ii'
+				    ]
+			])  ?>
+		</div>
+		
+	</div>
 
     <div class="form-group">
-        <?= Html::submitButton(Yii::t('backend/collection', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('backend/collection', 'Reset'), ['class' => 'btn btn-default']) ?>
+        <?= Html::submitButton(Yii::t('frontend/collection', 'Search'), ['class' => 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/collection/index.php b/backend/views/collection/index.php
index fabcd50..e01f6de 100644
--- a/backend/views/collection/index.php
+++ b/backend/views/collection/index.php
@@ -15,27 +15,37 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php echo $this->render('_search', ['model' => $searchModel]); ?>
 
-    <p>
-        <?= Html::a(Yii::t('backend/collection', 'Create Collection'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
             'id_collection',
-            'id_user',
-            'created_by',
-            'id_account',
-            'money',
-            // 'start',
-            // 'end',
-            // 'type',
-            // 'created_at',
-            // 'updated_at',
+			[
+				'attribute' => 'id_user',
+				'value' => 'userName',
+				],
+			[
+				'attribute' => 'id_account',
+				'value' => 'accountName',
+			],
+            'money:integer',
+			[
+				'attribute' => 'start',
+				'value' => function($model){
+					return Yii::$app->formatter->asDatetime($model->start,'yyyy-MM-dd HH:mm:ss');
+				}
+			],
+			[
+				'attribute' => 'end',
+				'value' => function($model){
+					return Yii::$app->formatter->asDatetime($model->end,'yyyy-MM-dd HH:mm:ss');
+				}
+			],
+            'created_at:datetime',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+             'template' => '{view}'
+    ],
         ],
     ]); ?>
 
diff --git a/backend/views/collection/view.php b/backend/views/collection/view.php
index b8985f6..44a64a8 100644
--- a/backend/views/collection/view.php
+++ b/backend/views/collection/view.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\AccountStatisticWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Collection */
@@ -14,31 +15,30 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('backend/collection', 'Update'), ['update', 'id' => $model->id_collection], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('backend/collection', 'Delete'), ['delete', 'id' => $model->id_collection], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('backend/collection', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
+
 
     <?= DetailView::widget([
         'model' => $model,
         'attributes' => [
             'id_collection',
-            'id_user',
-            'created_by',
-            'id_account',
-            'money',
-            'start',
-            'end',
-            'type',
-            'created_at',
-            'updated_at',
+            [
+            	'attribute' =>'id_user',
+            	'value' => $model->userName
+		    ],
+            [
+            	'attribute' =>'id_account',
+            	'value' => $model->accountName
+		    ],
+            'money:integer',
+            'start:datetime',
+            'end:datetime',
+            'created_at:datetime',
         ],
     ]) ?>
 
+	<?php 
+		echo AccountStatisticWidget::widget([
+			'totals' =>  $totals
+		]);
+	?>
 </div>
diff --git a/backend/views/transfer/_search.php b/backend/views/transfer/_search.php
index 1c41156..e2172d3 100644
--- a/backend/views/transfer/_search.php
+++ b/backend/views/transfer/_search.php
@@ -26,7 +26,7 @@ use kartik\widgets\DatePicker;
 	    	<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +HtmlHelper::mkAccountOptions($accounts) ) ?>
 		</div>
 		<div class='col-md-4'>
-	    	<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  + Transfer::types() ) ?>
+	    	 <?php  echo $form->field($model, 'types')->checkboxList( Transfer::types())  ?>
 		</div>
 		<div class='col-md-4'>
 	    	<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +ArrayHelper::map($users,'id' , 'username') ) ?> 
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php
index 1046315..8ddc5f9 100644
--- a/backend/views/transfer/index.php
+++ b/backend/views/transfer/index.php
@@ -6,6 +6,7 @@ use yii\widgets\DetailView;
 use yii\base\Widget;
 use yii\base\Object;
 use yii\data\ArrayDataProvider;
+use common\components\AccountStatisticWidget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\TransferSearch */
@@ -28,42 +29,15 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php  echo $this->render('_search', ['model' => $searchModel, 'accounts' => $accounts,'users' => $users,]); ?>
 
+ 
 	<?php 
+	echo AccountStatisticWidget::widget([
+			'totals' =>  $searchModel->totals
+			]);
+	
 	?>
-	<h2>Összesen</h2>
-	<?php 
-		echo DetailView::widget([
-				'model' => $searchModel->fullTotal,
-				'attributes' => [
-						[
-								'value' => $searchModel->fullTotal['money'],
-								'label' => $searchModel->fullTotal['label'],
-						],
-					]
-		]) 
-	?>
-	<h2>Kasszák összesen</h2>
-	<?php 
-		echo GridView::widget([
-			 'dataProvider' => new ArrayDataProvider([
-				      'allModels' =>  $searchModel->accountTotals,
-				      'sort' => false,
-				      'pagination' => false,
-				  ]) ,
-			        'columns' => [
-			        		[
-			        		'label' => Yii::t('common/transfer','Account'),
-			        		'value' => 'label'
-			        		],
-			        		[
-			        		'label' => Yii::t('common/transfer','Money total'),
-			        		'value' => 'money'
-			        		],
-					] 
-				]
-		);
-	?>
-	<h2>Pénzmozgások</h2>
+	
+	<h2>Tranzakciók</h2>
     <?= GridView::widget([
     	'tableOptions' => ['class' => 'table table-striped table-bordered table-transfer'],	
         'dataProvider' => $dataProvider,
diff --git a/frontend/components/AccountStatisticWidget.php b/common/components/AccountStatisticWidget.php
similarity index 72%
rename from frontend/components/AccountStatisticWidget.php
rename to common/components/AccountStatisticWidget.php
index be610b6..ab94b6a 100644
--- a/frontend/components/AccountStatisticWidget.php
+++ b/common/components/AccountStatisticWidget.php
@@ -1,5 +1,5 @@
 <?php
-namespace frontend\components;
+namespace common\components;
 
 use yii\base\Widget;
 
@@ -8,7 +8,7 @@ class AccountStatisticWidget extends Widget{
 	public $totals;
 	
 	
-	public $viewFile = '//common/_account_statistic';
+	public $viewFile = '@common/views/common/_account_statistic';
 	
 	public function init(){
 		parent::init();
diff --git a/common/components/Helper.php b/common/components/Helper.php
index b705b20..9f74fc4 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -13,4 +13,18 @@ class Helper
 		return $result;
 	}
 	
+	
+	
+	public static function notInInterval($query ,$field , $start,$end ){
+		$query->andFilterWhere( ['or', [ '<', $field , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , $field  , isset($end) ? $end : '3000-01-01' ]  ] );
+	}
+	
+	public static function notPaid($query ,$field , $start,$end ){
+		$query->andFilterWhere( ['or', [ '<', $field , isset( $start ) ? $start : '1900-01-01' ]  ,[ '>=' , $field  , isset($end) ? $end : '3000-01-01' ] ,[ "transfer.status" => Transfer::STATUS_NOT_PAID  ]  ] );
+	}
+	public static function inInterval($query ,$field , $start,$end ){
+		$query->andFilterWhere([ '>=', $field , $start ]   );
+		$query->andFilterWhere([ '<' , $field  , $end ]   );
+	}
+	
 }
\ No newline at end of file
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 673325e..9f4282d 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -114,6 +114,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
             'created_at' => Yii::t('common/transfer', 'Created At'),
             'updated_at' => Yii::t('common/transfer', 'Updated At'),
             'paid_at' => Yii::t('common/transfer', 'Paid At'),
+            'types' => Yii::t('common/transfer', 'Types'),
+            'start' => Yii::t('common/transfer', 'Start'),
+            'end' => Yii::t('common/transfer', 'End'),
         ];
     }
     
diff --git a/frontend/views/common/_account_statistic.php b/common/views/common/_account_statistic.php
similarity index 100%
rename from frontend/views/common/_account_statistic.php
rename to common/views/common/_account_statistic.php
diff --git a/frontend/controllers/CollectionController.php b/frontend/controllers/CollectionController.php
index fbf5c89..f0fa37a 100644
--- a/frontend/controllers/CollectionController.php
+++ b/frontend/controllers/CollectionController.php
@@ -44,6 +44,7 @@ class CollectionController extends Controller
         $searchModel->accounts = Account::read();
         $searchModel->accountMap = Account::toAccaountMap($searchModel->accounts);
         
+        
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
         $searchModel->searchTotal();
 
@@ -62,7 +63,7 @@ class CollectionController extends Controller
     {
     	$model = $this->findModel($id);
     	
-    	$accounts = Account::read();
+    	$accounts   = Account::read();
     	$accountMap = Account::toAccaountMap($accounts);
     	
     	$totals = Transfer::mkTotals($model->start, $model->end, $model->id_user, null, $model->id_account, $accounts, $accountMap);
diff --git a/frontend/models/CollectionSearch.php b/frontend/models/CollectionSearch.php
index 1e6a6ff..13a19e6 100644
--- a/frontend/models/CollectionSearch.php
+++ b/frontend/models/CollectionSearch.php
@@ -14,6 +14,7 @@ class CollectionSearch extends Collection
 {
 	public $accounts;
 	public $accountMap;
+	public $users;
 	
 	public $timestampStart;
 	public $timestampEnd;
diff --git a/frontend/models/TransferSearch.php b/frontend/models/TransferSearch.php
index f768d46..5116cca 100644
--- a/frontend/models/TransferSearch.php
+++ b/frontend/models/TransferSearch.php
@@ -68,13 +68,16 @@ class TransferSearch extends Transfer
             'query' => $query,
         ]);
 
+        
+        
         $this->load($params);
+        
 
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
+            $query->where('0=1');
         }
+        $query->andWhere(['id_user' => Yii::$app->user->id ] );
 
         $query->andFilterWhere([
             'id_account' => $this->id_account,
@@ -98,11 +101,6 @@ class TransferSearch extends Transfer
     			'money' => 0
     	];
     	
-//     	if ( $this->hasErrors() ){
-//     		return;	
-//     	}
-    	
-    	
     	
     	$accounts =  Account::find()->orderBy("name asc")->all();
     	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
@@ -110,11 +108,6 @@ class TransferSearch extends Transfer
     	
     	$this->totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
     	
-// 		$this->totalsCreatedAt = $totals['created_at'];
-// 		$this->totalsPaidAt = $totals['paid_at'];
-// 		$this->totalsCreatedAtPaid = $totals['created_at_paid'];
-// 		$this->totalsCreatedAtNotPaid = $totals['created_at_not_paid'];
-// 		$this->totalsPaidAtNotCreatedAt = $totals['paid_at_not_created_at'];
     
     }
     
diff --git a/frontend/views/collection/_search.php b/frontend/views/collection/_search.php
index ef8ea74..e143267 100644
--- a/frontend/views/collection/_search.php
+++ b/frontend/views/collection/_search.php
@@ -2,8 +2,8 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-use kartik\widgets\DateTimePicker;
 use frontend\components\HtmlHelper;
+use kartik\widgets\DateTimePicker;
 
 /* @var $this yii\web\View */
 /* @var $model frontend\models\CollectionSearch */
diff --git a/frontend/views/collection/create.php b/frontend/views/collection/create.php
index f3cd0f9..4eb3b26 100644
--- a/frontend/views/collection/create.php
+++ b/frontend/views/collection/create.php
@@ -2,7 +2,7 @@
 
 use yii\helpers\Html;
 use frontend\components\TransferTotalWidget;
-use frontend\components\AccountStatisticWidget;
+use common\components\AccountStatisticWidget;
 
 
 /* @var $this yii\web\View */
diff --git a/frontend/views/collection/view.php b/frontend/views/collection/view.php
index 7db6f06..5dfb30c 100644
--- a/frontend/views/collection/view.php
+++ b/frontend/views/collection/view.php
@@ -2,7 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
-use frontend\components\AccountStatisticWidget;
+use common\components\AccountStatisticWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Collection */
diff --git a/frontend/views/transfer/_index_stat.php b/frontend/views/transfer/_index_stat.php
index 7092190..65d0bf4 100644
--- a/frontend/views/transfer/_index_stat.php
+++ b/frontend/views/transfer/_index_stat.php
@@ -1,7 +1,6 @@
 <?php
 
-use frontend\components\TransferTotalWidget;
-use frontend\components\AccountStatisticWidget;
+use common\components\AccountStatisticWidget;
 ?>
 <?php 
 
diff --git a/frontend/views/transfer/_search.php b/frontend/views/transfer/_search.php
index 7f11b47..038d103 100644
--- a/frontend/views/transfer/_search.php
+++ b/frontend/views/transfer/_search.php
@@ -48,7 +48,6 @@ use kartik\widgets\DateTimePicker;
 		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions)  ?>
 		</div>
 		<div class="col-md-4">
-		    <?php  //echo $form->field($model, 'type')->dropDownList( ['' =>'Mind']+ Transfer::types())  ?>
 		    <?php  echo $form->field($model, 'types')->checkboxList( Transfer::types())  ?>
 		</div>
 	</div>

From 16df363e369133652800b02bf1d3b79580e772eb Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 15:42:58 +0100
Subject: [PATCH 062/100] remove commented code

---
 common/models/Transfer.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 9f4282d..6373bfc 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -147,9 +147,6 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $this->hasOne( Currency::className(), ["id_currency" =>"id_currency" ] );
     }
     
-//     public function getDiscount(){
-//     	return $this->hasOne( Discount::className(), ["id_discount" =>"id_discount" ] );
-//     }
     
     public function getUserSoldItem(){
     	return $this->hasOne( UserSoldItem::className(), ["id_transfer" =>"id_transfer" ] );

From cee5d60d9daceacd80f1e83c784946becb7a8888 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 15:56:12 +0100
Subject: [PATCH 063/100] add translations

---
 common/messages/hu/app.php                 |  4 +--
 common/messages/hu/backend/collection.php  | 25 ++++++++++++++
 common/messages/hu/backend/user.php        | 23 +++++++++++++
 common/messages/hu/common/card.php         |  1 +
 common/messages/hu/common/collection.php   | 30 +++++++++++++++++
 common/messages/hu/common/ticket.php       |  3 +-
 common/messages/hu/common/transfer.php     | 12 +++++--
 common/messages/hu/customer/backend.php    | 21 ++++++++++++
 common/messages/hu/frontend/account.php    |  2 ++
 common/messages/hu/frontend/collection.php | 39 ++++++++++++++++++++++
 common/messages/hu/frontend/product.php    | 10 +++---
 common/messages/hu/frontend/ticket.php     |  5 ++-
 common/messages/hu/frontend/transfer.php   |  5 +--
 13 files changed, 162 insertions(+), 18 deletions(-)
 create mode 100644 common/messages/hu/backend/collection.php
 create mode 100644 common/messages/hu/backend/user.php
 create mode 100644 common/messages/hu/common/collection.php
 create mode 100644 common/messages/hu/customer/backend.php
 create mode 100644 common/messages/hu/frontend/collection.php

diff --git a/common/messages/hu/app.php b/common/messages/hu/app.php
index fa06131..cb0ff66 100644
--- a/common/messages/hu/app.php
+++ b/common/messages/hu/app.php
@@ -17,12 +17,10 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'It is recommended you use an upgraded browser to display the {type} control properly.' => 'Ajánlott újabb böngésző verziót használni!',
     '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',
+    'It is recommended you use an upgraded browser to display the {type} control properly.' => 'Ajánlott újabb böngésző verziót használni!',
     'Jelszó' => 'Jelszó',
     'Jelszó és jelszó újra nem egyezik!' => 'Jelszó és jelszó újra nem egyezik!',
     'Jelszó újra' => 'Jelszó újra',
diff --git a/common/messages/hu/backend/collection.php b/common/messages/hu/backend/collection.php
new file mode 100644
index 0000000..56fb65d
--- /dev/null
+++ b/common/messages/hu/backend/collection.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Collections' => 'Zárás',
+    'Create' => 'Mentés',
+    'Create Collection' => 'Új zárás',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása: ',
+];
diff --git a/common/messages/hu/backend/user.php b/common/messages/hu/backend/user.php
new file mode 100644
index 0000000..0767089
--- /dev/null
+++ b/common/messages/hu/backend/user.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Created at' => 'Létrehozás ideje',
+    'E-Mail' => 'E-Mail',
+    'Username' => 'Felhasználónév',
+];
diff --git a/common/messages/hu/common/card.php b/common/messages/hu/common/card.php
index 2f6cf77..1e3d4b7 100644
--- a/common/messages/hu/common/card.php
+++ b/common/messages/hu/common/card.php
@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Create/Next' => 'Mentés/Következő',
     'Active' => 'Aktív',
     'BARCODE' => 'VONALKÓD',
     'Card: ' => 'Bérletkártya: ',
diff --git a/common/messages/hu/common/collection.php b/common/messages/hu/common/collection.php
new file mode 100644
index 0000000..7babb3e
--- /dev/null
+++ b/common/messages/hu/common/collection.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Created At' => 'Létrehozás ideje',
+    'Created By' => 'Létrehozta',
+    'End' => 'Időszak vége',
+    'Id Account' => 'Kassza',
+    'Id Collection' => 'Zárás azonosító',
+    'Id User' => 'Felhasználó',
+    'Money' => 'Összeg',
+    'Start' => 'Időszak kezdete',
+    'Type' => 'Típus',
+    'Updated At' => 'Módosítás ideje',
+];
diff --git a/common/messages/hu/common/ticket.php b/common/messages/hu/common/ticket.php
index fd7c80a..c906fe4 100644
--- a/common/messages/hu/common/ticket.php
+++ b/common/messages/hu/common/ticket.php
@@ -17,11 +17,11 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Reset' => 'Reset',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
     'Comment' => 'Megjegyzés',
     'Create' => 'Mentés',
     'Create Ticket' => 'Új bérlet',
-    'Create and add to cart' => 'Mentés és kosárba helyezés',
     'Created At' => 'Hozzáadva',
     'Delete' => 'Törlés',
     'End' => 'Érvényesség vége',
@@ -32,7 +32,6 @@ return [
     'Id User' => 'Felhasználó',
     'Max Usage Count' => 'Max alkalmak',
     'Price Brutto' => 'Bruttó ár',
-    'Reset' => '',
     'Search' => 'Keresés',
     'Start' => 'Érvényesség kezdete',
     'Status' => 'Státusz',
diff --git a/common/messages/hu/common/transfer.php b/common/messages/hu/common/transfer.php
index 43caddd..cf8f4af 100644
--- a/common/messages/hu/common/transfer.php
+++ b/common/messages/hu/common/transfer.php
@@ -17,8 +17,13 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Money movement' => 'Pénzmozgás',
-    'Pénzmozgás' => 'Pénzmozgás',
+    'Customer' => 'Vendég',
+    'End' => 'Időszak vége',
+    'Fizetve' => 'Fizetve',
+    'Nincs fizetve' => 'Nincs fizetve',
+    'Paid At' => 'Fizetés ideje',
+    'Start' => 'Időszak kezdete',
+    'Types' => 'Típusok',
     'Account' => 'Kassza',
     'All' => 'Mind',
     'Comment' => 'Megjegyzés',
@@ -32,8 +37,9 @@ return [
     'Item Price' => 'Termék ár',
     'Money' => 'Összeg',
     'Money Currency' => 'Ár valuta',
-    'Money total' => 'Összesen',
+    'Money movement' => 'Pénzmozgás',
     'Product' => 'Termék',
+    'Pénzmozgás' => 'Pénzmozgás',
     'Rate' => 'Árfolyam',
     'Status' => 'Státusz',
     'Ticket' => 'Bérlet',
diff --git a/common/messages/hu/customer/backend.php b/common/messages/hu/customer/backend.php
new file mode 100644
index 0000000..5e56d21
--- /dev/null
+++ b/common/messages/hu/customer/backend.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'E-mail or phone number required!' => 'E-mail vagy telefonszám megadása kötelező!',
+];
diff --git a/common/messages/hu/frontend/account.php b/common/messages/hu/frontend/account.php
index 86fa3c3..e3b0dff 100644
--- a/common/messages/hu/frontend/account.php
+++ b/common/messages/hu/frontend/account.php
@@ -17,6 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Account' => 'Kassza',
+    'Select account!' => 'Válasszon kasszát!',
     'Accounts' => 'Kasszák',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt az element?',
     'Create' => 'Mentés',
diff --git a/common/messages/hu/frontend/collection.php b/common/messages/hu/frontend/collection.php
new file mode 100644
index 0000000..c6eec2c
--- /dev/null
+++ b/common/messages/hu/frontend/collection.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Account' => 'Kassza',
+    'All' => 'Mind',
+    'Collections' => 'Zárások',
+    'Create' => 'Mentés',
+    'Create Collection' => 'Új zárás',
+    'Create Collection - Select Account' => 'Új zárás - kassza választás',
+    'End date is invalid' => 'Idészak vége dátum érvénytelen',
+    'End of interval' => 'Időszak vége',
+    'Invalid transfer!' => 'Érvénytelen tranzakció!',
+    'Last collection' => 'Utolsó zárás',
+    'Next' => 'Következő',
+    'No collection found' => 'Nem találtam zárást',
+    'Reception collection' => 'Recepció zárás',
+    'Refresh' => 'Frissítés',
+    'Search' => 'Keresés',
+    'Select another account' => 'Másik kassza választása',
+    'Start of interval' => 'Időszak kezdete',
+    'Update' => 'Módosítás',
+    'Update {modelClass}: ' => '{modelClass} módosítása: ',
+];
diff --git a/common/messages/hu/frontend/product.php b/common/messages/hu/frontend/product.php
index 6df19ec..408021f 100644
--- a/common/messages/hu/frontend/product.php
+++ b/common/messages/hu/frontend/product.php
@@ -17,11 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Customer cart' => 'Vendég kosár',
-    'Fizetve' => 'Fizetve',
-    'To cart' => 'Kosárba',
-    'User Cart' => 'Recepció kosár',
-    'Write up' => 'Felír',
+    'Sale' => 'Eladás',
     'Account' => 'Kassza',
     'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné ezt a vendéget?',
     'Barcode' => 'Vonalkód',
@@ -32,6 +28,7 @@ return [
     'Create Product' => 'Új termék',
     'Currency' => 'Valuta',
     'Currency not found' => 'Valuta nem található',
+    'Customer cart' => 'Vendég kosár',
     'Delete' => 'Törlés',
     'Discount' => 'Kedvezmény',
     'Discount not found' => 'Kedvezmény nem található',
@@ -50,7 +47,10 @@ return [
     'Sell product' => 'Termék eladás',
     'Stock' => 'Raktáron',
     'Stock {stock} lower then {count}!' => 'Raktáron {stock} kevesebb mint {count}!',
+    'To cart' => 'Kosárba',
     'Total Price' => 'Összesen',
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => 'Módosítás {modelClass}: ',
+    'User Cart' => 'Recepció kosár',
+    'Write up' => 'Felír',
 ];
diff --git a/common/messages/hu/frontend/ticket.php b/common/messages/hu/frontend/ticket.php
index b4ffac3..93d1851 100644
--- a/common/messages/hu/frontend/ticket.php
+++ b/common/messages/hu/frontend/ticket.php
@@ -17,8 +17,11 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Customer cart paid!' => 'Vendég kosrá fizetve!',
+    'To cart' => 'Kosárba',
+    'User cart paid!' => 'Recepció kosár fizetve!',
+    'Write up' => 'Felír',
     'Default account is set!' => 'Alapértelmezett kassza beállítva!',
-    'Cart' => 'Kosár',
     'Invalid discount' => 'Érvénytelen kedvezmény',
     'Invalid ticket type' => 'Érvénytelen bérlet típus',
     'Invalid transfer' => 'Érvénytelen transfer',
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index 8a2619f..b562ffd 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -17,12 +17,9 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Create Money Movement' => 'Új pénzmozgás',
-    'Reset' => 'Reset',
-    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
     'Create' => 'Mentés',
+    'Create Money Movement' => 'Új pénzmozgás',
     'Create Transfer' => 'Új pénzmozgás',
-    'Delete' => 'Törlés',
     'Search' => 'Keresés',
     'Termékeladás' => 'Termékeladás',
     'Ticket' => 'Bérlet',

From 9751e7756e1539f25ec63bdff8cb692036b2bff3 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 16:36:40 +0100
Subject: [PATCH 064/100] add totals to frontend collection/index

---
 backend/views/collection/index.php   | 11 +++++++++++
 frontend/models/CollectionSearch.php |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/backend/views/collection/index.php b/backend/views/collection/index.php
index e01f6de..b056d51 100644
--- a/backend/views/collection/index.php
+++ b/backend/views/collection/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\AccountTotalWidget;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CollectionSearch */
@@ -15,6 +16,16 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    
+	<div class="row">
+	    <div class="col-md-4 ">
+	    	<?php 
+	    	echo AccountTotalWidget::widget([
+				'statistic' => $searchModel->totals
+	    	])?>
+	    </div>
+    </div>
+    
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
diff --git a/frontend/models/CollectionSearch.php b/frontend/models/CollectionSearch.php
index 13a19e6..7b604bc 100644
--- a/frontend/models/CollectionSearch.php
+++ b/frontend/models/CollectionSearch.php
@@ -29,7 +29,8 @@ class CollectionSearch extends Collection
         return [
             [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
         	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
-        ];
+			[['id_account'],'integer']        
+];
     }
 
     /**
@@ -58,12 +59,15 @@ class CollectionSearch extends Collection
 
         $this->load($params);
 
+        $this->id_user = Yii::$app->user->id;
+        
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
             // $query->where('0=1');
             return $dataProvider;
         }
 
+        
         $query->andFilterWhere([
             'id_account' => $this->id_account,
         ]);

From 3fe60f3706f1f3fc71b313c5d5b9910f056220a8 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 18:14:10 +0100
Subject: [PATCH 065/100] change init file linux mode

---
 init | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 init

diff --git a/init b/init
old mode 100644
new mode 100755

From 5cb37861c59921b6a4f595c23ad39d5dfe333ced Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 18:56:44 +0100
Subject: [PATCH 066/100] add different session for backend and frontend

---
 backend/config/main.php  | 8 ++++++++
 frontend/config/main.php | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/backend/config/main.php b/backend/config/main.php
index a0b5fc9..c2da5b4 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -16,7 +16,15 @@ return [
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
+        	'identityCookie' => [
+        			'name' => '_backendUser', // unique for backend
+       				'path'=>'/backend/web'  // correct path for the backend app.
+       		]
         ],
+    	'session' => [
+    			'name' => '_backendSessionId', // unique for backend
+   				'savePath' => __DIR__ . '/../runtime', // a temporary folder on backend
+   		],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 1ed8305..066ed97 100644
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -15,7 +15,15 @@ return [
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
+        	'identityCookie' => [
+        			'name' => '_frontendUser', // unique for frontend
+       				'path'=>'/frontend/web'  // correct path for the frontend app.
+       		]
         ],
+    	'session' => [
+ 			'name' => '_frontendSessionId', // unique for frontend
+ 			'savePath' => __DIR__ . '/../runtime', // a temporary folder on frontend
+   		],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [

From fea44b5ed0ca40756e9cbdeca36694d4b86e9d64 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Wed, 4 Nov 2015 19:06:28 +0100
Subject: [PATCH 067/100] add composer lock change

---
 composer.lock | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 14ec993..aaa7637 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "357aedc9b70234f38508aac35c6272cd",
+    "hash": "eae88fa0f2daec7b60e8779c8881f167",
+    "content-hash": "246d974f7a8d14e65a24bb4d5af20079",
     "packages": [
         {
             "name": "bower-asset/accounting",
@@ -612,16 +613,16 @@
         },
         {
             "name": "kartik-v/yii2-widget-activeform",
-            "version": "v1.4.4",
+            "version": "v1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-activeform.git",
-                "reference": "c62c8b92e8ee38892cc4e2b29851864a7a20ee01"
+                "reference": "076f49747309f30658085eb008276ecd3370b151"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/c62c8b92e8ee38892cc4e2b29851864a7a20ee01",
-                "reference": "c62c8b92e8ee38892cc4e2b29851864a7a20ee01",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/076f49747309f30658085eb008276ecd3370b151",
+                "reference": "076f49747309f30658085eb008276ecd3370b151",
                 "shasum": ""
             },
             "require": {
@@ -655,7 +656,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2015-07-08 11:36:38"
+            "time": "2015-10-22 14:36:24"
         },
         {
             "name": "kartik-v/yii2-widget-affix",

From 43d5598f23df87a1f9d4d7709b99af28a85179e9 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Thu, 5 Nov 2015 09:26:08 +0100
Subject: [PATCH 068/100] add role to user

---
 backend/controllers/UserController.php |  2 +-
 backend/models/UserCreate.php          | 11 +++--
 backend/models/UserUpdate.php          | 17 ++++---
 backend/views/user/_form.php           | 11 ++++-
 backend/views/user/index.php           | 10 ++++
 backend/views/user/view.php            |  4 ++
 common/components/Helper.php           | 28 +++++++++--
 common/components/RoleDefinition.php   | 65 ++++++++++++++++++++++++++
 common/models/User.php                 | 20 +++++++-
 9 files changed, 151 insertions(+), 17 deletions(-)
 create mode 100644 common/components/RoleDefinition.php

diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index 93759f4..d437bf3 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -65,7 +65,7 @@ class UserController extends \backend\controllers\BackendController
         	
         	$this->updateAccountAssignments($model);
         	
-//             return $this->redirect(['view', 'id' => $model->id]);
+            return $this->redirect(['index' ]);
             
         } 
         
diff --git a/backend/models/UserCreate.php b/backend/models/UserCreate.php
index b6b2945..710765c 100644
--- a/backend/models/UserCreate.php
+++ b/backend/models/UserCreate.php
@@ -10,6 +10,8 @@ class UserCreate extends User{
 	public $password_repeat;
 	public $selected_accounts = [];
 	
+	public $role;
+	
 	/**
 	 * @inheritdoc
 	 */
@@ -28,6 +30,9 @@ class UserCreate extends User{
 				['username' ,'unique' ],
 				[['password_plain' ,'password_repeat'] ,'string','min' =>6 ],
 				[['password_repeat']   ,'validatePasswordRepeat' ],
+				
+				[['role'], 'required'],
+				[['role'], 'string', 'max' => 20],
 		];
 	}
 	
@@ -66,9 +71,9 @@ class UserCreate extends User{
 	
 	public function afterSave($insert, $changedAttributes){
 	 	parent::afterSave($insert, $changedAttributes); 
-// 		$am = Yii::$app->authManager;
-//     	$role = $am->getRole('admin');
-// 		Yii::$app->authManager->assign($role, $this->id);
+		$am = Yii::$app->authManager;
+    	$role = $am->getRole($this->role);
+		Yii::$app->authManager->assign($role, $this->id);
 	}
 	
 }
\ No newline at end of file
diff --git a/backend/models/UserUpdate.php b/backend/models/UserUpdate.php
index c6d900f..03a47f8 100644
--- a/backend/models/UserUpdate.php
+++ b/backend/models/UserUpdate.php
@@ -9,6 +9,8 @@ class UserUpdate extends User {
 	public $password_plain;
 	public $password_repeat;
 	public $selected_accounts = [];
+
+	public $role;
 	
 	/**
 	 * @inheritdoc
@@ -28,7 +30,9 @@ class UserUpdate extends User {
 						$this->addError($attribute, 'Invalid array');
 					}
 				}
-				]
+				],
+				[['role'], 'required'],
+				[['role'], 'string', 'max' => 20],
 		];
 	}
 	
@@ -68,10 +72,11 @@ class UserUpdate extends User {
 			return false;
 		}
 	}
-	public function afterSave($insert, $changedAttributes) {
-		parent::afterSave ( $insert, $changedAttributes );
-		// $am = Yii::$app->authManager;
-		// $role = $am->getRole('admin');
-		// Yii::$app->authManager->assign($role, $this->id);
+	public function afterSave($insert, $changedAttributes){
+	 	parent::afterSave($insert, $changedAttributes); 
+		$am = Yii::$app->authManager;
+		$am->revokeAll($this->id);
+    	$role = $am->getRole($this->role);
+		Yii::$app->authManager->assign($role, $this->id);
 	}
 }
\ No newline at end of file
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index e0ca38f..7a8afe7 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -3,15 +3,21 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use yii\grid\GridView;
-use yii\base\Widget;
-use yii\base\Object;
 use yii\data\ArrayDataProvider;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\User */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<?php 
+
+$roleOptions = RoleDefinition::roleLabels();
+asort($roleOptions);
+
+?>
+
 <div class="user-form">
 
     <?php $form = ActiveForm::begin(); ?>
@@ -21,6 +27,7 @@ use yii\data\ArrayDataProvider;
     <?= $form->field($model, 'email')->textInput() ?>
     <?= $form->field($model, 'password_plain')->passwordInput() ?>
     <?= $form->field($model, 'password_repeat')->passwordInput() ?>
+    <?= $form->field($model, 'role')->dropDownList($roleOptions) ?>
 
 	<?php 
 	
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 591af23..792fa55 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $searchModel frontend\models\UserSearch */
@@ -28,6 +29,15 @@ $this->params['breadcrumbs'][] = $this->title;
             'email:email',
             'created_at:datetime',
 
+        	[
+        		'attribute' => 'role',
+        		'value' => function ($model){
+    				$roles = \Yii::$app->authManager->getRolesByUser($model->id );
+    				
+    				return implode(', ', array_map(function ($role) { return sprintf("%s", RoleDefinition::getRoleLabel($role->name)); }, $roles ));
+    			}
+    		]	,
+        		
             ['class' => 'yii\grid\ActionColumn',
              'template' => '{view} {update}'
     ],
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index f681530..2b76d2b 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -25,6 +25,10 @@ $this->params['breadcrumbs'][] = $this->title;
             'email:email',
             'statusHuman',
             'created_at:datetime',
+        	[
+        		'attribute' => 'role',
+        		'value' => $model->roleString
+    ]
         ],
     ]) ?>
 
diff --git a/common/components/Helper.php b/common/components/Helper.php
index 9f74fc4..4255b7f 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -1,10 +1,6 @@
 <?php
 namespace common\components;
 
-use yii\base\InvalidConfigException;
-use Yii;
-use yii\base\Model;
-
 class Helper
 {
 
@@ -27,4 +23,28 @@ class Helper
 		$query->andFilterWhere([ '<' , $field  , $end ]   );
 	}
 	
+	public static function roleLabels(){
+		return [
+				'reception' => Yii::t('common/role' ,'Reception'),
+				'admin' => Yii::t('common/role' ,'Administrator'),
+				'employee' => Yii::t('common/role' ,'Alkalmazott'),
+		];
+	}
+	
+	public static function roleDefinitions(){
+		return [
+				'employee' =>  [
+					'canAllow' => [  'employee'],
+				],
+				'admin' =>  [
+					'canAllow' => ['admin','reception','employee'],
+				],
+				'reception' =>  [
+					'canAllow' => [ ],
+				],
+		];
+	}
+	
+	
+	
 }
\ No newline at end of file
diff --git a/common/components/RoleDefinition.php b/common/components/RoleDefinition.php
new file mode 100644
index 0000000..b208c46
--- /dev/null
+++ b/common/components/RoleDefinition.php
@@ -0,0 +1,65 @@
+<?php
+namespace common\components;
+
+use \Yii;
+
+class RoleDefinition{
+	
+	
+	
+	public static function roleLabels(){
+		return [
+				'reception' => Yii::t('common/role' ,'Reception'),
+				'admin' => Yii::t('common/role' ,'Administrator'),
+				'employee' => Yii::t('common/role' ,'Employee'),
+		];
+	}
+	
+	public static function getRoleLabel($role){
+		$result = null;
+		$roleLabels = self::roleLabels();
+		if ( array_key_exists($role, $roleLabels)){
+			$result = $roleLabels[$role];
+		}
+		return $result;
+	}
+	
+	
+	public static function roleDefinitions(){
+		return [
+				'employee' =>  [
+						'canAllow' => [  'employee'],
+				],
+				'admin' =>  [
+						'canAllow' => ['admin','reception','employee'],
+				],
+				'reception' =>  [
+						'canAllow' => [ ],
+				],
+		];
+	}
+	
+	
+	public static function getRoleDefinition($role){
+		$defs = self::roleDefinitions();
+		$result = null;
+		if ( array_key_exists($role, $defs)){
+			$result = $defs[$role];
+		}
+		$result = $defs[$role];
+		return $result;
+	}
+	
+	public static function getRolesCanAllow($role){
+		$result = [];
+		$def = self::getRoleDefinition($role);
+		if ( isset($def)){
+			$result = $def['canAllow'];
+		}
+	
+		return $result;
+	}
+
+	
+	
+}
\ No newline at end of file
diff --git a/common/models/User.php b/common/models/User.php
index 44880f5..d255786 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -6,6 +6,7 @@ use yii\base\NotSupportedException;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
 use yii\web\IdentityInterface;
+use common\components\RoleDefinition;
 
 /**
  * User model
@@ -212,10 +213,27 @@ class User extends ActiveRecord implements IdentityInterface
     		'username' => Yii::t('backend/user', 'Username'),
     		'email' => Yii::t('backend/user', 'E-Mail'),
     		'created_at' => Yii::t('backend/user', 'Created at'),
+    		'role' => Yii::t('backend/user', 'Role'),
     	];
     }
     
-    
+    /**
+     * 
+     * 
+     * @return \yii\rbac\Role[]*/
+    public function getRoles(){
+    	$roles = \Yii::$app->authManager->getRolesByUser($this->id );
+		return $roles;    	
+    }
+
+    /**
+     * @return string
+     * */
+    public function getRoleString(){
+    	$roles = \Yii::$app->authManager->getRolesByUser($this->id );
+    	
+    	return implode(', ', array_map(function ($role) { return sprintf("%s", RoleDefinition::getRoleLabel($role->name)); }, $roles ));
+    }
     
     /**
      * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive

From cc83ccf7615073cdfe11fe192516637edcaf0118 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 5 Nov 2015 17:24:09 +0100
Subject: [PATCH 069/100] add role checking to controllers

---
 backend/components/AdminMenuStructure.php     |  2 +-
 backend/controllers/AccountController.php     | 26 +++++++++++
 backend/controllers/BackendController.php     |  2 +-
 backend/controllers/CollectionController.php  |  2 +-
 backend/controllers/DiscountController.php    | 24 +++++++++++
 backend/controllers/ProcurementController.php | 10 ++++-
 backend/controllers/ProductController.php     |  2 +-
 backend/controllers/TicketTypeController.php  | 25 +++++++++++
 backend/controllers/TransferController.php    |  5 +--
 backend/controllers/UserController.php        | 34 +++++++++++++++
 backend/models/AccountSearch.php              |  7 +++
 backend/models/AccountStateSearch.php         |  7 +++
 backend/models/CollectionSearch.php           | 13 ++++--
 backend/models/ProcurementSearch.php          |  5 +++
 backend/models/ProductSearch.php              | 12 ++++--
 backend/models/TransferSearch.php             |  9 +++-
 backend/views/account/index.php               |  5 ++-
 backend/views/account/view.php                | 12 ++----
 backend/views/discount/index.php              |  5 ++-
 backend/views/discount/view.php               | 18 +++-----
 backend/views/layouts/main.php                | 10 ++++-
 backend/views/procurement/_form.php           |  1 +
 backend/views/product/_search.php             |  2 +-
 backend/views/ticket-type/index.php           |  6 ++-
 backend/views/ticket-type/view.php            | 14 ++----
 backend/views/user/index.php                  |  5 ++-
 backend/views/user/update.php                 | 10 ++---
 backend/views/user/view.php                   |  9 ++--
 common/components/AccountTotalWidget.php      |  4 +-
 common/components/Helper.php                  |  4 ++
 common/components/RoleDefinition.php          | 43 +++++++++++++++++++
 common/models/Account.php                     |  1 +
 common/models/Collection.php                  | 10 ++++-
 common/models/Transfer.php                    | 14 ++++--
 common/models/User.php                        | 16 ++++---
 common/models/UserSoldItem.php                |  2 +-
 .../m151105_114421_add__role__employee.php    | 31 +++++++++++++
 .../m151105_151357_add__role__reception.php   | 31 +++++++++++++
 frontend/controllers/ProductController.php    |  2 +-
 39 files changed, 362 insertions(+), 78 deletions(-)
 create mode 100644 console/migrations/m151105_114421_add__role__employee.php
 create mode 100644 console/migrations/m151105_151357_add__role__reception.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 98ab72c..357f19b 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -53,7 +53,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
 			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
 			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
-			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
+// 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
 			
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
diff --git a/backend/controllers/AccountController.php b/backend/controllers/AccountController.php
index 6140193..cc91a32 100644
--- a/backend/controllers/AccountController.php
+++ b/backend/controllers/AccountController.php
@@ -14,6 +14,32 @@ use yii\filters\VerbFilter;
  */
 class AccountController extends \backend\controllers\BackendController
 {
+	
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+					'rules' => [
+					// allow authenticated users
+						[
+						'actions' => [ 'index','view' ],
+						'allow' => true,
+						'roles' => ['employee','admin','reception'],
+						],
+						// allow authenticated users
+						[
+						'actions' => [ 'create', 'update'],
+						'allow' => true,
+						'roles' => ['admin'],
+						],
+				// everything else is denied
+				],
+			],
+		];
+	}
+	
 
     /**
      * Lists all Account models.
diff --git a/backend/controllers/BackendController.php b/backend/controllers/BackendController.php
index 0cb1a83..3905997 100644
--- a/backend/controllers/BackendController.php
+++ b/backend/controllers/BackendController.php
@@ -28,7 +28,7 @@ class BackendController extends Controller
         						[
         								'actions' => ['create','index','view','update'],
         								'allow' => true,
-        								'roles' => ['@'],
+        								'roles' => ['admin','employee','reception'],
         						],
         						// everything else is denied
         				],
diff --git a/backend/controllers/CollectionController.php b/backend/controllers/CollectionController.php
index a7b517c..6db22eb 100644
--- a/backend/controllers/CollectionController.php
+++ b/backend/controllers/CollectionController.php
@@ -47,7 +47,7 @@ class CollectionController extends \backend\controllers\BackendController
         $searchModel->accounts = Account::read();
         $searchModel->accountMap = Account::toAccaountMap($searchModel->accounts);
         
-        $searchModel->users = User::find()->all(    );
+        $searchModel->users = User::read();
         
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
         $searchModel->searchTotal();
diff --git a/backend/controllers/DiscountController.php b/backend/controllers/DiscountController.php
index 5da9ce1..1b7b4f0 100644
--- a/backend/controllers/DiscountController.php
+++ b/backend/controllers/DiscountController.php
@@ -14,6 +14,30 @@ use yii\filters\VerbFilter;
  */
 class DiscountController  extends \backend\controllers\BackendController
 {
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+					// allow authenticated users
+					[
+					'actions' => [ 'index','view' ],
+					'allow' => true,
+					'roles' => ['admin','employee','reception'],
+					],
+					[
+					'actions' => ['create','update'],
+					'allow' => true,
+					'roles' => ['admin'  ],
+					],
+					// everything else is denied
+			],
+			],
+		];
+	}
+	
 
     /**
      * Lists all Discount models.
diff --git a/backend/controllers/ProcurementController.php b/backend/controllers/ProcurementController.php
index 6cab09f..1acb89d 100644
--- a/backend/controllers/ProcurementController.php
+++ b/backend/controllers/ProcurementController.php
@@ -11,6 +11,7 @@ use yii\filters\VerbFilter;
 use common\models\Warehouse;
 use common\models\Product;
 use common\models\User;
+use common\components\Helper;
 
 /**
  * ProcurementController implements the CRUD actions for Procurement model.
@@ -118,14 +119,21 @@ class ProcurementController  extends \backend\controllers\BackendController
         			$transaction->commit();
         		} else {
         			$transaction->rollback();
+        			Helper::flash('error', "Hiba történt!");
+        			throw new NotFoundHttpException( Yii::t('common/procurement' ,'Failed to fullfill procurement.' ));
         		}
+        		Helper::flash('success', Yii::t('backend/procurement', 'Beszerzés mentve'));
         	} catch (\Exception $e) {
         		$transaction->rollback();
         		throw $e;
         	}
         	
         	
-            return $this->redirect(['index' ]);
+        	if ( isset($_POST['_next'])){
+            	return $this->redirect(['create' ]);
+        	}else{
+	            return $this->redirect(['index' ]);
+        	}
         } else {
             return $this->render('create', [
                 'model' => $model,
diff --git a/backend/controllers/ProductController.php b/backend/controllers/ProductController.php
index d2e742d..178fd0f 100644
--- a/backend/controllers/ProductController.php
+++ b/backend/controllers/ProductController.php
@@ -55,7 +55,7 @@ class ProductController extends \backend\controllers\BackendController
         $model = new Product();
         $model->stock = 0;
         $model->status = Product::STATUS_ACTIVE;
-		$accounts = Account::readAccounts(null);
+		$accounts = Account::read(null);
 		$categories = ProductCategory::read(null);
         
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
diff --git a/backend/controllers/TicketTypeController.php b/backend/controllers/TicketTypeController.php
index d3f1c51..a1be1ab 100644
--- a/backend/controllers/TicketTypeController.php
+++ b/backend/controllers/TicketTypeController.php
@@ -15,6 +15,31 @@ use common\models\Account;
  */
 class TicketTypeController extends \backend\controllers\BackendController
 {
+	
+	
+	public function behaviors()
+	{
+		return [
+		'access' => [
+			'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+					// allow authenticated users
+					[
+						'actions' => [ 'index','view'],
+						'allow' => true,
+						'roles' => ['admin','employee','reception'],
+					],
+					[
+						'actions' => ['create' , 'update'],
+						'allow' => true,
+						'roles' => ['admin' ],
+					],
+					// everything else is denied
+				],
+			],
+		];
+	}
+	
 
     /**
      * Lists all TicketType models.
diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
index 90806d6..17327b5 100644
--- a/backend/controllers/TransferController.php
+++ b/backend/controllers/TransferController.php
@@ -25,7 +25,7 @@ class TransferController extends \backend\controllers\BackendController
 	        						[
 	        								'actions' => [ 'index','view' ],
 	        								'allow' => true,
-	        								'roles' => ['@'],
+	        								'roles' => ['admin','employee','reception'],
 	        						],
 	        						// everything else is denied
 	        				],
@@ -43,7 +43,7 @@ class TransferController extends \backend\controllers\BackendController
         $searchModel = new TransferSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
         
-        $accounts = Account::readAccounts();
+        $accounts = Account::read();
         
         $searchModel->totalsTransfers();
        	
@@ -54,7 +54,6 @@ class TransferController extends \backend\controllers\BackendController
             'dataProvider' => $dataProvider,
         	'accounts' => $accounts,
         	'users' => $users,
-//         	'totals' =>$totals
         ]);
     }
 
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index d437bf3..6a41097 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -13,6 +13,7 @@ use yii\base\Object;
 use backend\models\UserUpdate;
 use common\models\Account;
 use common\models\UserAccountAssignment;
+use common\components\RoleDefinition;
 
 /**
  * UserController implements the CRUD actions for User model.
@@ -21,6 +22,31 @@ class UserController extends \backend\controllers\BackendController
 {
 	
 
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+				'rules' => [
+					// allow authenticated users
+					[
+					'actions' => [ 'index','view' ],
+					'allow' => true,
+					'roles' => ['employee','admin','reception'],
+					],
+					// allow authenticated users
+					[
+					'actions' => [ 'create', 'update'],
+					'allow' => true,
+					'roles' => ['admin'],
+					],
+				// everything else is denied
+				],
+			],
+		];
+	}
+	
+	
     /**
      * Lists all User models.
      * @return mixed
@@ -99,6 +125,14 @@ class UserController extends \backend\controllers\BackendController
     {
         $model =  UserUpdate::findOne(['id' => $id]);
         
+        if ( Yii::$app->authManager->checkAccess($model->id, 'admin')){
+        	$model->role = 'admin';
+        } else if ( Yii::$app->authManager->checkAccess($model->id, 'employee')){
+        	$model->role = 'employee';
+        }else if ( Yii::$app->authManager->checkAccess($model->id, 'reception')){
+        	$model->role = 'reception';
+        }
+        
         if ( $model == null ){
         	throw new NotFoundHttpException('The requested page does not exist.');
         }
diff --git a/backend/models/AccountSearch.php b/backend/models/AccountSearch.php
index 7543b38..63095d3 100644
--- a/backend/models/AccountSearch.php
+++ b/backend/models/AccountSearch.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Account;
+use common\components\RoleDefinition;
 
 /**
  * AccountSearch represents the model behind the search form about `common\models\Account`.
@@ -43,6 +44,12 @@ class AccountSearch extends Account
     {
         $query = Account::find();
 
+        
+     if ( !RoleDefinition::isAdmin() ){
+        	$query->innerJoin("user_account_assignment",'account.id_account = user_account_assignment.id_account' );
+        	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+        }
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
diff --git a/backend/models/AccountStateSearch.php b/backend/models/AccountStateSearch.php
index 9e18585..c11b175 100644
--- a/backend/models/AccountStateSearch.php
+++ b/backend/models/AccountStateSearch.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\AccountState;
+use common\components\RoleDefinition;
 
 /**
  * AccountStateSearch represents the model behind the search form about `common\models\AccountState`.
@@ -53,6 +54,12 @@ class AccountStateSearch extends AccountState
     {
         $query = AccountState::find();
 
+        
+        if ( !RoleDefinition::isAdmin() ){
+        	$query->innerJoin("user_account_assignment",'account_state.id_account = user_account_assignment.id_account' );
+        	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+        }
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         	'sort' => false,
diff --git a/backend/models/CollectionSearch.php b/backend/models/CollectionSearch.php
index 8656fbe..a07a715 100644
--- a/backend/models/CollectionSearch.php
+++ b/backend/models/CollectionSearch.php
@@ -7,6 +7,7 @@ use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Collection;
 use common\components\Helper;
+use common\components\RoleDefinition;
 
 /**
  * CollectionSearch represents the model behind the search form about `common\models\Collection`.
@@ -31,7 +32,7 @@ class CollectionSearch extends Collection
     {
          return [
             [[ 'start',  ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
-        	[[ 'end' , ], 'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
+        	[[ 'end' , ],   'date'  ,'format' =>Yii::$app->formatter->datetimeFormat  , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
 			[['id_account','id_user'],'integer']
 		];
     }
@@ -56,6 +57,12 @@ class CollectionSearch extends Collection
     {
         $query = Collection::find();
 
+        
+        if ( !RoleDefinition::isAdmin() ){
+        	$query->innerJoin("user_account_assignment",'collection.id_account = user_account_assignment.id_account' );
+        	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+        }
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
@@ -69,8 +76,8 @@ class CollectionSearch extends Collection
         }
 
         $query->andFilterWhere([
-            'id_user' => $this->id_user,
-            'id_account' => $this->id_account,
+            'collection.id_user' => $this->id_user,
+            'collection.id_account' => $this->id_account,
         ]);
         
         Helper::inInterval($query, 'collection.end', $this->timestampStart, $this->timestampEnd);
diff --git a/backend/models/ProcurementSearch.php b/backend/models/ProcurementSearch.php
index eac7970..6e6a42c 100644
--- a/backend/models/ProcurementSearch.php
+++ b/backend/models/ProcurementSearch.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Procurement;
+use common\components\RoleDefinition;
 
 /**
  * ProcurementSearch represents the model behind the search form about `common\models\Procurement`.
@@ -55,6 +56,10 @@ class ProcurementSearch extends Procurement
             'query' => $query,
         ]);
 
+        if ( RoleDefinition::isReception()){
+        	$query->andWhere(['id_user' => Yii::$app->user->id ]);
+        }
+        
         $this->load($params);
 
         if (!$this->validate()) {
diff --git a/backend/models/ProductSearch.php b/backend/models/ProductSearch.php
index a74a216..44319eb 100644
--- a/backend/models/ProductSearch.php
+++ b/backend/models/ProductSearch.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Product;
+use common\components\RoleDefinition;
 
 /**
  * ProductSearch represents the model behind the search form about `common\models\Product`.
@@ -43,6 +44,11 @@ class ProductSearch extends Product
     {
         $query = Product::find();
 
+        if ( !RoleDefinition::isAdmin() ){
+        	$query->innerJoin("user_account_assignment",'product.id_account = user_account_assignment.id_account' );
+        	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+        }
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
@@ -56,9 +62,9 @@ class ProductSearch extends Product
         }
 
         $query->andFilterWhere([
-            'id_product_category' => $this->id_product_category,
-            'id_account' => $this->id_account,
-            'status' => $this->status,
+            'product.id_product_category' => $this->id_product_category,
+            'product.id_account' => $this->id_account,
+            'product.status' => $this->status,
         ]);
 
         $query->andFilterWhere(['like', 'product_number', $this->product_number])
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index f91ce60..c76bc00 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -12,6 +12,7 @@ use yii\db\Query;
 use yii\helpers\ArrayHelper;
 use common\models\Account;
 use common\components\Helper;
+use common\components\RoleDefinition;
 
 /**
  * TransferSearch represents the model behind the search form about `common\models\Transfer`.
@@ -67,6 +68,12 @@ class TransferSearch extends Transfer
     {
         $query = Transfer::find();
 
+        
+        if ( !RoleDefinition::isAdmin() ){
+        	$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
+        	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+        }
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
@@ -105,7 +112,7 @@ class TransferSearch extends Transfer
     	];
     	 
     	 
-    	$accounts =  Account::find()->orderBy("name asc")->all();
+    	$accounts =  Account::read();
     	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
     	$idUser = Yii::$app->user->id;
     	 
diff --git a/backend/views/account/index.php b/backend/views/account/index.php
index e6405a1..982ff19 100644
--- a/backend/views/account/index.php
+++ b/backend/views/account/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\AccountSearch */
@@ -15,9 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    <?php if ( RoleDefinition::isAdmin()) {?>
     <p>
         <?= Html::a(Yii::t('common/account', 'Create Account'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
+    <?php }?>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -35,7 +38,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'updated_at:datetime',
 
             ['class' => 'yii\grid\ActionColumn',
-             'template' => '{view} {update}'
+             'template' => RoleDefinition::getRoleTemplate( ['admin' =>  '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
             		
     ],
         ],
diff --git a/backend/views/account/view.php b/backend/views/account/view.php
index 16a1f80..f277bd0 100644
--- a/backend/views/account/view.php
+++ b/backend/views/account/view.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Account */
@@ -14,18 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
+    <?php if ( RoleDefinition::isAdmin()  ){?>
     <p>
         <?= Html::a(Yii::t('common/account', 'Update'), ['update', 'id' => $model->id_account], ['class' => 'btn btn-primary']) ?>
-        <?php
-        /*Html::a(Yii::t('common/account', 'Delete'), ['delete', 'id' => $model->id_account], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/account', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) */
-        ?>
     </p>
+    <?php }?>
 
     <?= DetailView::widget([
         'model' => $model,
diff --git a/backend/views/discount/index.php b/backend/views/discount/index.php
index ea37fc9..1307d05 100644
--- a/backend/views/discount/index.php
+++ b/backend/views/discount/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\DiscountSearch */
@@ -15,9 +16,11 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    <?php if ( RoleDefinition::isAdmin() ) {?>
     <p>
         <?= Html::a(Yii::t('common/discount', 'Create Discount'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
+    <?php }?>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -37,7 +40,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
             [
 				'class' => 'yii\grid\ActionColumn',
-				'template' => '{view} {update}'
+				 'template' => RoleDefinition::getRoleTemplate( ['admin' =>  '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
 			],
         ],
     ]); ?>
diff --git a/backend/views/discount/view.php b/backend/views/discount/view.php
index 5ce89f3..f1df9b9 100644
--- a/backend/views/discount/view.php
+++ b/backend/views/discount/view.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Discount */
@@ -14,18 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_discount], ['class' => 'btn btn-primary']) ?>
-        <?php 
-/*        Html::a(Yii::t('common/discount', 'Delete'), ['delete', 'id' => $model->id_discount], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/discount', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ])*/
-        ?>
-    </p>
+    <?php if ( RoleDefinition::isAdmin()) {?>
+	    <p>
+	        <?= Html::a(Yii::t('common/discount', 'Update'), ['update', 'id' => $model->id_discount], ['class' => 'btn btn-primary']) ?>
+	    </p>
+    <?php }?>
 
     <?= DetailView::widget([
         'model' => $model,
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index 0a2b5e6..24c6332 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -10,6 +10,7 @@ use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 use common\widgets\Alert;
 use backend\components\AdminMenuStructure;
+use kartik\widgets\AlertBlock;
 
 AppAsset::register($this);
 
@@ -49,7 +50,14 @@ $items = $adminMenu->run();
         <?= Breadcrumbs::widget([
             'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
         ]) ?>
-        <?= Alert::widget() ?>
+        <?php //echo Alert::widget() ?>
+        <?php 
+        echo AlertBlock::widget([
+        		'useSessionFlash' => true,
+        		'type' => AlertBlock::TYPE_GROWL,
+        		'delay' => '1'
+        		]);
+        ?>
         <?= $content ?>
     </div>
 </div>
diff --git a/backend/views/procurement/_form.php b/backend/views/procurement/_form.php
index b402e8a..3035e6a 100644
--- a/backend/views/procurement/_form.php
+++ b/backend/views/procurement/_form.php
@@ -31,6 +31,7 @@ $warehouseOptions = ArrayHelper::map($warehouses, 'id_warehouse', 'name') ;
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('common/procurement', 'Create') : Yii::t('common/procurement', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton(  Yii::t('common/procurement', 'Save/Next'), [ 'class' => 'btn btn-primary' ,'name' => '_next']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/product/_search.php b/backend/views/product/_search.php
index 0ce8aa3..5186a56 100644
--- a/backend/views/product/_search.php
+++ b/backend/views/product/_search.php
@@ -23,7 +23,7 @@ $statusOptions = mkOptions( Product::statuses() );
 
 $productCategories =  mkOptions(  ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') );
 
-$accounts =  mkOptions( ArrayHelper::map( Account::readAccounts(null) ,'id_account','name'));
+$accounts =  mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','name'));
 
 ?>
 <div class="product-search">
diff --git a/backend/views/ticket-type/index.php b/backend/views/ticket-type/index.php
index 4db42f4..96abced 100644
--- a/backend/views/ticket-type/index.php
+++ b/backend/views/ticket-type/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\TicketTypeSearch */
@@ -13,11 +14,12 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="ticket-type-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    <?php if ( RoleDefinition::isAdmin()) {?>
     <p>
         <?= Html::a(Yii::t('common/ticket_type', 'Create Ticket Type'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
+    <?php  }?>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -51,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
             [
             	'class' => 'yii\grid\ActionColumn',
-            	'template' =>'{view} {update}'
+            	'template' => RoleDefinition::getRoleTemplate( ['admin' =>  '{view} {update}','employee' => '{view}' , 'reception' => '{view}']),
             		
     		],
         ],
diff --git a/backend/views/ticket-type/view.php b/backend/views/ticket-type/view.php
index 3483836..edd246a 100644
--- a/backend/views/ticket-type/view.php
+++ b/backend/views/ticket-type/view.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\TicketType */
@@ -14,20 +15,11 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
+    <?php if ( RoleDefinition::isAdmin()) {?>
     <p>
         <?= Html::a(Yii::t('common/ticket_type', 'Update'), ['update', 'id' => $model->id_ticket_type], ['class' => 'btn btn-primary']) ?>
-        <?php
-	/*        	
-        	echo Html::a(Yii::t('common/ticket_type', 'Delete'), ['delete', 'id' => $model->id_ticket_type], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/ticket_type', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) 
-      */  	
-        	?>
     </p>
+    <?php }?>
 
     <?= DetailView::widget([
         'model' => $model,
diff --git a/backend/views/user/index.php b/backend/views/user/index.php
index 792fa55..6ecfb7f 100644
--- a/backend/views/user/index.php
+++ b/backend/views/user/index.php
@@ -16,9 +16,12 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php  echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    <?php if ( RoleDefinition::isAdmin()){ ?>
     <p>
         <?= Html::a(Yii::t('app', 'Új felhasználó'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
+    
+    <?php } ?>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
@@ -39,7 +42,7 @@ $this->params['breadcrumbs'][] = $this->title;
     		]	,
         		
             ['class' => 'yii\grid\ActionColumn',
-             'template' => '{view} {update}'
+             'template' => RoleDefinition::getRoleTemplate([ 'admin' => '{view} {update}', 'employee' => '{view}' ] )
     ],
         ],
     ]); ?>
diff --git a/backend/views/user/update.php b/backend/views/user/update.php
index 802d116..3508fd2 100644
--- a/backend/views/user/update.php
+++ b/backend/views/user/update.php
@@ -5,12 +5,10 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\User */
 
-$this->title = Yii::t('app', 'Update {modelClass}: ', [
-    'modelClass' => 'User',
-]) . ' ' . $model->id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Users'), 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+$this->title = Yii::t('backend/user', 'Edit user' );
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/user', 'Users'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->username, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = Yii::t('backend/user', 'Update');
 ?>
 <div class="user-update">
 
diff --git a/backend/views/user/view.php b/backend/views/user/view.php
index 2b76d2b..0b13262 100644
--- a/backend/views/user/view.php
+++ b/backend/views/user/view.php
@@ -2,21 +2,24 @@
 
 use yii\helpers\Html;
 use yii\widgets\DetailView;
+use common\components\RoleDefinition;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\User */
 
-$this->title = $model->id;
-$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Felhasználók'), 'url' => ['index']];
+$this->title = $model->username;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/user', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="user-view">
 
     <h1><?= Html::encode($this->title) ?></h1>
 
+    <?php if ( RoleDefinition::isAdmin()) {?>
     <p>
-        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('backend/user', 'Update'), ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
     </p>
+    <?php }?>
 
     <?= DetailView::widget([
         'model' => $model,
diff --git a/common/components/AccountTotalWidget.php b/common/components/AccountTotalWidget.php
index 93f9dbd..00d1ee7 100644
--- a/common/components/AccountTotalWidget.php
+++ b/common/components/AccountTotalWidget.php
@@ -5,8 +5,8 @@ use yii\base\Widget;
 
 class AccountTotalWidget extends Widget{
 	
-	public $totalHeading = 'Össesen';
-	public $panelHeading = 'Össesen';
+	public $totalHeading = 'Összesen';
+	public $panelHeading = 'Összesen';
 	public $panelType = 'panel-info';
 	
 	public $statistic = ['total' => 0, 'accounts' => [] ];
diff --git a/common/components/Helper.php b/common/components/Helper.php
index 4255b7f..639f67d 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -45,6 +45,10 @@ class Helper
 		];
 	}
 	
+	public static function flash($mode,$message){
+		\Yii::$app->session->setFlash($mode, $message );
+	}
+	
 	
 	
 }
\ No newline at end of file
diff --git a/common/components/RoleDefinition.php b/common/components/RoleDefinition.php
index b208c46..0816437 100644
--- a/common/components/RoleDefinition.php
+++ b/common/components/RoleDefinition.php
@@ -60,6 +60,49 @@ class RoleDefinition{
 		return $result;
 	}
 
+	public static function can($role){
+		$result = false;
+		if ( !Yii::$app->user->isGuest ){
+			if ( isset(  $role)){
+				if ( is_array($role)){
+					foreach ($role as $r){
+						$result |= Yii::$app->user->can($r);
+					}
+				}else if ( is_string($role)){
+					$result = Yii::$app->user->can($role);
+				}
+			}
+		}
+		return $result;
+	}
 	
+	public static function isAdmin(){
+		return self::can('admin');
+	}
+	
+	public static function isReception(){
+		return self::can('reception');
+	}
+
+	public static function isEmployee(){
+		return self::can('employee');
+	}
+	
+	/*
+	 * [
+	 *  	'role1' => 'template1',
+	 *      'role2' => 'template2,
+	 *      ]
+	 * */
+	public static function getRoleTemplate($templates){
+		$result = "";
+		foreach ($templates as $role => $template ){
+			if ( Yii::$app->user->can($role)){
+				$result = $template;
+				break;
+			}
+		}
+		return $result;
+	}
 	
 }
\ No newline at end of file
diff --git a/common/models/Account.php b/common/models/Account.php
index bfab0d5..e778f8c 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -131,6 +131,7 @@ class Account extends \yii\db\ActiveRecord
     public static  function read($forceIncludeAccount = null){
     	$accounts = null;
     	$query =  Account::find();
+    	
     	$query->innerJoinWith('userAccountAssignments');
     	$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id]);
     	if ( $forceIncludeAccount  == null){
diff --git a/common/models/Collection.php b/common/models/Collection.php
index 9372b54..4914f53 100644
--- a/common/models/Collection.php
+++ b/common/models/Collection.php
@@ -9,6 +9,7 @@ use yii\helpers\ArrayHelper;
 use yii\behaviors\TimestampBehavior;
 use yii\db\Query;
 use yii\db\Expression;
+use common\components\RoleDefinition;
 
 /**
  * This is the model class for table "collection".
@@ -115,6 +116,11 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
     	
     	$query = new Query();
     	
+    	if ( !RoleDefinition::isAdmin() ){
+    		$query->innerJoin("user_account_assignment",'collection.id_account = user_account_assignment.id_account' );
+    		$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+    	}
+    	
     	$query->addSelect( [
     			new Expression( ' collection.id_account as account'),
     			new Expression( ' COALESCE(sum( collection.money ) ,0) as money /** collections total money */' )
@@ -126,8 +132,8 @@ public static function mkTotalQuery($mode = 'reception', $start,$end,$idUser,$ty
     			'id_account' => $idAccount,
     			]);
 
-    	$query->andFilterWhere(['id_user' => $idUser]);
-    	$query->andFilterWhere(['in' ,'type', $types]);
+    	$query->andFilterWhere(['collection.id_user' => $idUser]);
+    	$query->andFilterWhere(['in' ,'collection.type', $types]);
     	self::inInterval($query, 'collection.end' , $start, $end);
     	
     	$query->groupBy('collection.id_account');
diff --git a/common/models/Transfer.php b/common/models/Transfer.php
index 6373bfc..8d33d9c 100644
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -12,6 +12,7 @@ use common\components\DiscountAwareBehavior;
 use common\components\CustomerAwareBehavior;
 use yii\db\Query;
 use yii\db\Expression;
+use common\components\RoleDefinition;
 
 /**
  * This is the model class for table "transfer".
@@ -488,18 +489,23 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	$query->addSelect( [
     			new Expression( 'transfer.id_account as account'),
-    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money /** '. $mode.'*/' )
+    			new Expression( ' COALESCE(sum(  ( case when direction =  '.Transfer::DIRECTION_OUT.' then  -1 else  1 end )*  transfer.money ),0) as money /** --'. $mode.'*/' )
     	
     	]);
     	$query->from('transfer');
     	
+    	if ( !RoleDefinition::isAdmin() ){
+    		$query->innerJoin("user_account_assignment", 'transfer.id_account = user_account_assignment.id_account' );
+    		$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+    	}
+    	
     	$query->andFilterWhere([
-    			'id_account' => $idAccount,
+    			'transfer.id_account' => $idAccount,
     			]);
 
-    	$query->andFilterWhere(['id_user' => $idUser]);
+    	$query->andFilterWhere(['transfer.id_user' => $idUser]);
     	
-    	$query->andFilterWhere(['in' ,'type', $types]);
+    	$query->andFilterWhere(['in' ,'transfer.type', $types]);
     	
     	
     	if ( $mode == 'created_at'){
diff --git a/common/models/User.php b/common/models/User.php
index d255786..7da2036 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -214,6 +214,7 @@ class User extends ActiveRecord implements IdentityInterface
     		'email' => Yii::t('backend/user', 'E-Mail'),
     		'created_at' => Yii::t('backend/user', 'Created at'),
     		'role' => Yii::t('backend/user', 'Role'),
+    		'statusHuman' => Yii::t('backend/user', 'Status'),
     	];
     }
     
@@ -239,15 +240,20 @@ class User extends ActiveRecord implements IdentityInterface
      * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
      * */
     public static  function read($forceIncludeObjectWithId = null){
-    	$warehouses = null;
-    
+    	$users = null;
+    	$query = User::find();
+    	
+    	if ( RoleDefinition::isReception()){
+    		$query->andWhere(['id' => Yii::$app->user->id ]);
+    	}
+    	
     	if ( $forceIncludeObjectWithId  == null){
-    		$warehouses = User::find()->andWhere(['status' => User::STATUS_ACTIVE])->all();
+    		$users = $query->andWhere(['status' => User::STATUS_ACTIVE])->all();
     	}else{
-    		$warehouses = User::find()->andWhere( ['or', ['status' => User::STATUS_ACTIVE], ['id' =>  $forceIncludeObjectWithId ] ])->all();
+    		$users = $query->andWhere( ['or', ['status' => User::STATUS_ACTIVE], ['id' =>  $forceIncludeObjectWithId ] ])->all();
     	}
     
-    	return $warehouses;
+    	return $users;
     }
     
 }
diff --git a/common/models/UserSoldItem.php b/common/models/UserSoldItem.php
index b74dbe2..63653a4 100644
--- a/common/models/UserSoldItem.php
+++ b/common/models/UserSoldItem.php
@@ -70,7 +70,7 @@ class UserSoldItem extends \yii\db\ActiveRecord
     			new Expression( ' COALESCE(sum( transfer.money ) ,0) as money /** total unpaid reception cart */' )
     	
     	]);
-    	$query->innerJoin('transfer',['user_sold_item.id_transfer' =>'transfer.id_transfer']);
+    	$query->innerJoin('transfer','user_sold_item.id_transfer = transfer.id_transfer');
     	
     	$query->from('user_sold_item');
     	
diff --git a/console/migrations/m151105_114421_add__role__employee.php b/console/migrations/m151105_114421_add__role__employee.php
new file mode 100644
index 0000000..a37fef8
--- /dev/null
+++ b/console/migrations/m151105_114421_add__role__employee.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151105_114421_add__role__employee extends Migration
+{
+    public function up()
+    {
+    	$role = Yii::$app->authManager->createRole('employee');
+    	Yii::$app->authManager->add($role);
+    }
+
+    public function down()
+    {
+        echo "m151105_114421_add__role__employee cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151105_151357_add__role__reception.php b/console/migrations/m151105_151357_add__role__reception.php
new file mode 100644
index 0000000..56c57fa
--- /dev/null
+++ b/console/migrations/m151105_151357_add__role__reception.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151105_151357_add__role__reception extends Migration
+{
+    public function up()
+    {
+    	$role = Yii::$app->authManager->createRole('reception');
+    	Yii::$app->authManager->add($role);
+    }
+
+    public function down()
+    {
+        echo "m151105_151357_add__role__reception cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index 19942ea..abb7a33 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -73,7 +73,7 @@ class ProductController extends Controller
     	
     	$currencies = Currency::find()->all();
     	
-    	$accounts = Account::readAccounts();
+    	$accounts = Account::read();
     	
     	$discounts = Discount::read();
     	

From 6847c6d0e7234d0eba5d9067cf6f71553f963f9e Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Thu, 5 Nov 2015 17:27:14 +0100
Subject: [PATCH 070/100] add translation fixes

---
 common/messages/hu/app.php                 |  3 ---
 common/messages/hu/backend/procurement.php | 21 +++++++++++++++++++
 common/messages/hu/backend/user.php        |  5 +++++
 common/messages/hu/common/procurement.php  |  4 +++-
 common/messages/hu/common/role.php         | 24 ++++++++++++++++++++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 common/messages/hu/backend/procurement.php
 create mode 100644 common/messages/hu/common/role.php

diff --git a/common/messages/hu/app.php b/common/messages/hu/app.php
index cb0ff66..44bf645 100644
--- a/common/messages/hu/app.php
+++ b/common/messages/hu/app.php
@@ -26,8 +26,5 @@ return [
     '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/backend/procurement.php b/common/messages/hu/backend/procurement.php
new file mode 100644
index 0000000..1f01c3a
--- /dev/null
+++ b/common/messages/hu/backend/procurement.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Beszerzés mentve' => 'Beszerzés mentve',
+];
diff --git a/common/messages/hu/backend/user.php b/common/messages/hu/backend/user.php
index 0767089..8d4154d 100644
--- a/common/messages/hu/backend/user.php
+++ b/common/messages/hu/backend/user.php
@@ -17,6 +17,11 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Edit user' => 'Felhasználó módosítása',
+    'Role' => 'Szerepkör',
+    'Status' => 'Státusz',
+    'Update' => 'Módosítás',
+    'Users' => 'Felhasználók',
     'Created at' => 'Létrehozás ideje',
     'E-Mail' => 'E-Mail',
     'Username' => 'Felhasználónév',
diff --git a/common/messages/hu/common/procurement.php b/common/messages/hu/common/procurement.php
index 032889e..d18cb17 100644
--- a/common/messages/hu/common/procurement.php
+++ b/common/messages/hu/common/procurement.php
@@ -17,6 +17,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    'Failed to fullfill procurement.' => 'Nem sikerült teljesíteni a beszerzést!',
+    'Save/Next' => 'Mentés/Következő',
     'Count' => 'Beszerzett mennyiség',
     'Create' => 'Mentés',
     'Create Procurement' => 'Új beszerzés',
@@ -37,4 +39,4 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítása: ',
     'Updated At' => 'Módosítva',
-];
\ No newline at end of file
+];
diff --git a/common/messages/hu/common/role.php b/common/messages/hu/common/role.php
new file mode 100644
index 0000000..7c509e4
--- /dev/null
+++ b/common/messages/hu/common/role.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Administrator' => 'Adminisztrátor',
+    'Alkalmazott' => 'Alkalmazott',
+    'Employee' => 'Alkalmazott',
+    'Reception' => 'Recepciós',
+];

From f1fd37f61524fc1d70c749911bbaaa72a0c9ee65 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Thu, 5 Nov 2015 18:23:47 +0100
Subject: [PATCH 071/100] add version displaying to layouts

---
 backend/config/main.php        | 1 +
 backend/views/layouts/main.php | 2 +-
 common/config/params.php       | 4 ++--
 frontend/config/main.php       | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/config/main.php b/backend/config/main.php
index c2da5b4..fbb4bd2 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -8,6 +8,7 @@ $params = array_merge(
 
 return [
     'id' => 'app-backend',
+	'name' => 'Fitness Adminisztráció',
     'basePath' => dirname(__DIR__),
     'controllerNamespace' => 'backend\controllers',
     'bootstrap' => ['log'],
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index 24c6332..b5af7e6 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -64,7 +64,7 @@ $items = $adminMenu->run();
 
 <footer class="footer">
     <div class="container">
-        <p class="pull-left">&copy; Botond <?= date('Y') ?></p>
+        <p class="pull-left">&copy;  <?= Yii::$app->name ?> <?= Yii::$app->params['version']  ?> Fitness - WebAdmin <?= date('Y') ?></p>
 
         <p class="pull-right"><?= Yii::powered() ?></p>
     </div>
diff --git a/common/config/params.php b/common/config/params.php
index a7b1ac3..96cf988 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -1,7 +1,7 @@
 <?php
 return [
-    'adminEmail' => 'admin@example.com',
-    'supportEmail' => 'support@example.com',
+    'adminEmail' => 'rocho02@gmail.com',
+    'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
 	'version' => 'v0.0.2'
 ];
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 066ed97..1169f65 100644
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -8,6 +8,7 @@ $params = array_merge(
 
 return [
     'id' => 'app-frontend',
+	'name' =>'Fitness recepció',
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'controllerNamespace' => 'frontend\controllers',

From e752352e8a2f5b5dc1f07931f7a0aa85e5a35e62 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Thu, 5 Nov 2015 18:24:54 +0100
Subject: [PATCH 072/100] edit changelog

---
 changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index d69e9d9..b14d9e6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,2 +1,4 @@
+-0.0.2
+	alpha verzió
 -0.0.1
 	alap alkalmazás
\ No newline at end of file

From de8991b88f8b58f27d649fbacf9c14088d065b89 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 08:57:39 +0100
Subject: [PATCH 073/100] add backend ticket stat basics

---
 backend/components/AdminMenuStructure.php |  1 +
 backend/controllers/TicketController.php  |  7 +++
 backend/models/TicketSearch.php           | 72 ++++++++++++++++-----
 backend/views/ticket/_search.php          | 77 +++++++++++++++--------
 backend/views/ticket/index.php            | 46 +++++++-------
 backend/views/ticket/view.php             | 10 ---
 common/components/Helper.php              | 21 +++++++
 common/models/Ticket.php                  | 45 +++++++++++++
 8 files changed, 206 insertions(+), 73 deletions(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 357f19b..8abde20 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -58,6 +58,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
+			$items[] = ['label' => 'Bérletek', 'url' => ['/ticket/index' , 'TicketSearch[start]' =>$today,'TicketSearch[end]' => $tomorrow ] ];
 			
 			if ( count($items) > 0 ){
 				$userMainMenu = ['label' => 'Beállítások', 'url' => null,
diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
index 9c80307..0a5a966 100644
--- a/backend/controllers/TicketController.php
+++ b/backend/controllers/TicketController.php
@@ -11,6 +11,7 @@ use yii\filters\VerbFilter;
 use common\models\Discount;
 use common\models\TicketType;
 use common\models\Account;
+use common\models\User;
 
 /**
  * TicketController implements the CRUD actions for Ticket model.
@@ -26,6 +27,12 @@ class TicketController extends \backend\controllers\BackendController
     {
         $searchModel = new TicketSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        
+        $searchModel->users = User::read();
+        $searchModel->accounts = Account::read();
+        $searchModel->ticketTypes = TicketType::read();
+        
+        
 
         return $this->render('index', [
             'searchModel' => $searchModel,
diff --git a/backend/models/TicketSearch.php b/backend/models/TicketSearch.php
index 19d5813..83e9662 100644
--- a/backend/models/TicketSearch.php
+++ b/backend/models/TicketSearch.php
@@ -6,12 +6,26 @@ use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use common\models\Ticket;
+use common\components\Helper;
+use yii\db\ActiveRecord;
 
 /**
  * TicketSearch represents the model behind the search form about `common\models\Ticket`.
  */
 class TicketSearch extends Ticket
 {
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+	public $users;
+	public $accounts;
+	public $ticketTypes;
+	
+	public $valid_in_interval;
+	public $created_in_interval;
+	public $expire_in_interval;
+	
     /**
      * @inheritdoc
      */
@@ -19,7 +33,10 @@ class TicketSearch extends Ticket
     {
         return [
             [['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'id_discount', 'max_usage_count', 'usage_count', 'status', 'price_brutto'], 'integer'],
-            [['start', 'end', 'comment', 'created_at', 'updated_at'], 'safe'],
+            [[ 'start', ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+        	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
+       		[['valid_in_interval','created_in_interval','expire_in_interval'],'boolean'] 
+        		
         ];
     }
 
@@ -43,35 +60,60 @@ class TicketSearch extends Ticket
     {
         $query = Ticket::find();
 
+        Helper::queryAccountConstraint($query, 'ticket.id_account');
+        
+        $query->with('ticketType' );
+        $query->with('user');
+        
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
         ]);
 
         $this->load($params);
 
+        
         if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
-            return $dataProvider;
+            $query->where('0=1');
+//             return $dataProvider;
         }
 
         $query->andFilterWhere([
-            'id_ticket' => $this->id_ticket,
             'id_user' => $this->id_user,
             'id_ticket_type' => $this->id_ticket_type,
             'id_account' => $this->id_account,
-            'id_discount' => $this->id_discount,
-            'start' => $this->start,
-            'end' => $this->end,
-            'max_usage_count' => $this->max_usage_count,
-            'usage_count' => $this->usage_count,
-            'status' => $this->status,
-            'price_brutto' => $this->price_brutto,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
         ]);
 
-        $query->andFilterWhere(['like', 'comment', $this->comment]);
+        
+        $all = (!($this->valid_in_interval)  && !($this->expire_in_interval) && !($this->created_in_interval) )
+        		||
+        		($this->valid_in_interval == true && $this->expire_in_interval == true && $this->created_in_interval);
+        
+       $dateConditions = [];
+       $start = $this->timestampStart;
+       $end = $this->timestampEnd;
+        Yii::info('valid all: ' .$all);
+       
+        if( $all || $this->created_in_interval ){
+        	$dateConditions[] = Helper::queryInIntervalRule('ticket.created_at', $start, $end);
+        }
+        		
+        if ( $all || $this->valid_in_interval ){
+        	$dateConditions[] = Helper::queryValidRule('ticket.start', 'ticket.end', $start, $end);
+        }
+        
+        if ( $all || $this->expire_in_interval ){
+        	$dateConditions[] =  Helper::queryExpireRule('ticket.start', 'ticket.end', $start, $end);
+        }
+        
+        if ( count($dateConditions) == 1 ){
+        	$query->andWhere($dateConditions[0]);
+        }else if ( count($dateConditions) > 1 ){
+        	$cond = ['or'];
+        	foreach ($dateConditions as $c){
+        		$cond[] = $c;
+        	}
+        	$query->andWhere($cond);
+        }
 
         return $dataProvider;
     }
diff --git a/backend/views/ticket/_search.php b/backend/views/ticket/_search.php
index c89f75f..04e7bf5 100644
--- a/backend/views/ticket/_search.php
+++ b/backend/views/ticket/_search.php
@@ -2,12 +2,21 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+use kartik\widgets\DatePicker;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\TicketSearch */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
+<?php 
+$ticketTypeOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->ticketTypes, 'id_ticket_type', 'name');
+$accountOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->accounts, 'id_account', 'name');
+$userOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->users, 'id', 'username');
+
+?>
+
 <div class="ticket-search">
 
     <?php $form = ActiveForm::begin([
@@ -15,37 +24,51 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_ticket') ?>
 
-    <?= $form->field($model, 'id_user') ?>
-
-    <?= $form->field($model, 'id_ticket_type') ?>
-
-    <?= $form->field($model, 'id_account') ?>
-
-    <?= $form->field($model, 'id_discount') ?>
-
-    <?php // echo $form->field($model, 'start') ?>
-
-    <?php // echo $form->field($model, 'end') ?>
-
-    <?php // echo $form->field($model, 'max_usage_count') ?>
-
-    <?php // echo $form->field($model, 'usage_count') ?>
-
-    <?php // echo $form->field($model, 'status') ?>
-
-    <?php // echo $form->field($model, 'price_brutto') ?>
-
-    <?php // echo $form->field($model, 'comment') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
+	<div class='row'>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_user')->dropDownList($userOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_ticket_type')->dropDownList($ticketTypeOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
+		</div>
+	</div>
+	
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'valid_in_interval')->checkbox(  )  ?>
+		</div>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'created_in_interval')->checkbox(  )  ?>
+		</div>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'expire_in_interval')->checkbox(  )  ?>
+		</div>
+	</div>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('common/ticket', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('common/ticket', 'Reset'), ['class' => 'btn btn-default']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/ticket/index.php b/backend/views/ticket/index.php
index 0b4ee0e..8e63bb2 100644
--- a/backend/views/ticket/index.php
+++ b/backend/views/ticket/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\ArrayHelper;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\TicketSearch */
@@ -9,38 +10,41 @@ use yii\grid\GridView;
 
 $this->title = Yii::t('common/ticket', 'Tickets');
 $this->params['breadcrumbs'][] = $this->title;
+
+
+
 ?>
+
 <div class="ticket-index">
 
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
 
-    <p>
-        <?= Html::a(Yii::t('common/ticket', 'Create Ticket'), ['create'], ['class' => 'btn btn-success']) ?>
-    </p>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
 
-            'id_ticket',
-            'id_user',
-            'id_ticket_type',
-            'id_account',
-            'id_discount',
-            // 'start',
-            // 'end',
-            // 'max_usage_count',
-            // 'usage_count',
-            // 'status',
-            // 'price_brutto',
-            // 'comment',
-            // 'created_at',
-            // 'updated_at',
+        	[
+	           'attribute' => 'id_user',
+        		'value' => 'userName'
+    		],
+        	[
+        		'attribute' => 'id_ticket_type',
+        		'value' => 'ticketTypeName'
+        	],
+        	[
+        		'attribute' => 'id_account',
+        		'value' => 'accountName'
+        	],
+            'start:date',
+            'end:date',
+            'max_usage_count',
+            'usage_count',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            ['class' => 'yii\grid\ActionColumn',
+            	'template' => '{view}'		
+    		],
         ],
     ]); ?>
 
diff --git a/backend/views/ticket/view.php b/backend/views/ticket/view.php
index 7bc9143..2cf4115 100644
--- a/backend/views/ticket/view.php
+++ b/backend/views/ticket/view.php
@@ -14,16 +14,6 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>
-        <?= Html::a(Yii::t('common/ticket', 'Update'), ['update', 'id' => $model->id_ticket], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a(Yii::t('common/ticket', 'Delete'), ['delete', 'id' => $model->id_ticket], [
-            'class' => 'btn btn-danger',
-            'data' => [
-                'confirm' => Yii::t('common/ticket', 'Are you sure you want to delete this item?'),
-                'method' => 'post',
-            ],
-        ]) ?>
-    </p>
 
     <?= DetailView::widget([
         'model' => $model,
diff --git a/common/components/Helper.php b/common/components/Helper.php
index 639f67d..8435daa 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -23,6 +23,27 @@ class Helper
 		$query->andFilterWhere([ '<' , $field  , $end ]   );
 	}
 	
+	public static function queryInIntervalRule( $field , $start,$end ){
+		return ['and',[ '>=', $field , $start ]   , [ '<' , $field  , $end ]   ];
+	}
+	
+	public static function queryExpireRule( $field_start,$field_end , $start,$end ){
+		 
+		 return ['and' ,['<',$field_start, $end], ['>=' , $field_end , $start ], ['<' , $field_end , $end ] ];
+	}
+	
+	public static function queryValidRule( $field_start ,$field_end , $start,$end ){
+		 return ['and' ,['<',$field_start, $end], ['>=' , $field_end , $start ] ];
+	}
+	
+	public static function queryAccountConstraint($query,$field){
+		if ( !RoleDefinition::isAdmin() ){
+			$query->innerJoin("user_account_assignment",  $field . ' = user_account_assignment.id_account' );
+			$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+		}
+	}
+	
+	
 	public static function roleLabels(){
 		return [
 				'reception' => Yii::t('common/role' ,'Reception'),
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index 1f1152b..511f737 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -4,6 +4,8 @@ namespace common\models;
 
 use Yii;
 use yii\db\ActiveRecord;
+use yii\db\Query;
+use yii\db\Expression;
 
 /**
  * This is the model class for table "ticket".
@@ -148,4 +150,47 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
 		
     }
     
+    
+    public static function statistic($start,$end){
+//     	$sql = "select 
+// 	ticket_type.name, 
+// 	count(ticket.id_ticket) as total	,
+// 	sum(case when ticket.end > '2015-11-05' and ticket.start <= '2015-11-05' then 1 else 0 end) as valid,
+// 	sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' then 1 else 0 end) as created,
+// 	sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05'   then transfer.money else 0 end) as created_money,
+// 	sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is not null then transfer.money else 0 end) as created_money_paid,
+// 	sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is null then transfer.money else 0 end) as created_money_not_paid,
+// 	sum(case when ticket.created_at >= '2015-11-06' and ticket.created_at < '2015-11-05' and transfer.paid_at < '2015-11-06' and transfer.paid_at >= '2015-11-05' then transfer.money else 0 end) as dept_paid,
+// 	sum(case when ticket.end < '2015-11-06' and ticket.created_at >= '2015-11-05' then 1 else 0 end) as expired
+// 	from ticket_type  
+// 	inner join ticket on ticket.id_ticket_type = ticket_type.id_ticket_type 
+// 	inner join transfer on ticket.id_ticket = transfer.id_object and transfer.type = 20
+// 	group by ticket_type.name;";
+    	
+    	$query = new Query();
+    	$query->addSelect( [
+    			new Expression( 'ticket_type.id as id'),
+    			new Expression( 'ticket_type.name as name'),
+    			new Expression( 'count(ticket.id_ticket) as total'),
+    			new Expression( "sum( case when ticket.end > ':start' and ticket.start <= ':end' then 1 else 0 end) as valid" ),
+    			new Expression( "sum(case when ticket.created_at < ':end' and ticket.created_at >= ':start' then 1 else 0 end) as created" ),
+    			new Expression( "sum(case when ticket.created_at < ':end' and ticket.created_at >= ':start'   then transfer.money else 0 end) as created_money" ),
+    			new Expression( "sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is not null then transfer.money else 0 end) as created_money_paid" ),
+    			new Expression( "sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is null then transfer.money else 0 end) as created_money_not_paid" ),
+    			new Expression( "sum(case when ticket.created_at >= '2015-11-06' and ticket.created_at < '2015-11-05' and transfer.paid_at < '2015-11-06' and transfer.paid_at >= '2015-11-05' then transfer.money else 0 end) as dept_paid" ),
+    			new Expression( "sum(case when ticket.end < '2015-11-06' and ticket.created_at >= '2015-11-05' then 1 else 0 end) as expired" ),
+    			
+    			
+    	]);
+    	
+    	$query->from('ticket_type');
+    	$query->innerJoin('ticket', 'ticket.id_ticket_type = ticket_type.id_ticket_type');
+    	$query->innerJoin('transfer', 'ticket.id_ticket = transfer.id_object and transfer.type = 20');
+    	
+    	$query->groupBy("ticket_type.id_ticket, ticket_type.name");
+    	
+    	$query->params([':start' => $start, ':end' => $end]);
+    	
+    }
+    
 }

From a6e34bff61eed365068089f91b2d36415a28f253 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 14:42:16 +0100
Subject: [PATCH 074/100] Add backend ticket changes

---
 backend/controllers/TicketController.php |   1 +
 backend/models/TicketSearch.php          | 100 ++++++++++++++++++++++-
 backend/views/ticket/index.php           |  70 ++++++++++++++--
 common/components/Helper.php             |  16 +++-
 common/messages/hu/backend/ticket.php    |  27 ++++++
 common/messages/hu/common/ticket.php     |   4 +-
 common/models/Ticket.php                 |  59 ++++++++++---
 7 files changed, 254 insertions(+), 23 deletions(-)
 create mode 100644 common/messages/hu/backend/ticket.php

diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
index 0a5a966..ea687ff 100644
--- a/backend/controllers/TicketController.php
+++ b/backend/controllers/TicketController.php
@@ -27,6 +27,7 @@ class TicketController extends \backend\controllers\BackendController
     {
         $searchModel = new TicketSearch();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+        $searchModel->searchTotals();
         
         $searchModel->users = User::read();
         $searchModel->accounts = Account::read();
diff --git a/backend/models/TicketSearch.php b/backend/models/TicketSearch.php
index 83e9662..46f7b46 100644
--- a/backend/models/TicketSearch.php
+++ b/backend/models/TicketSearch.php
@@ -8,6 +8,7 @@ use yii\data\ActiveDataProvider;
 use common\models\Ticket;
 use common\components\Helper;
 use yii\db\ActiveRecord;
+use yii\helpers\ArrayHelper;
 
 /**
  * TicketSearch represents the model behind the search form about `common\models\Ticket`.
@@ -26,6 +27,9 @@ class TicketSearch extends Ticket
 	public $created_in_interval;
 	public $expire_in_interval;
 	
+	public $statistics;
+	public $statisticsTotal;
+	
     /**
      * @inheritdoc
      */
@@ -48,7 +52,29 @@ class TicketSearch extends Ticket
         // bypass scenarios() implementation in the parent class
         return Model::scenarios();
     }
+    
+    public function attributeLabels(){
+    	return ArrayHelper::merge(parent::attributeLabels(), [
+			'start' => Yii::t('backend/ticket','Start of interval'),
+			'end' => Yii::t('backend/ticket','End of interval'),
+			'valid_in_interval' => Yii::t('backend/ticket','Valid in interval'),
+			'created_in_interval' => Yii::t('backend/ticket','Created in interval'),
+			'expire_in_interval' => Yii::t('backend/ticket','Expire in interval'),
+    	]);
+    }
 
+    public function afterValidate(){
+        
+    	if ( !isset($this->timestampStart)) {
+        	$this->timestampStart ='1900-01-01';
+        }
+        
+        if ( !isset($this->timestampEnd)) {
+        	$this->timestampEnd ='3000-01-01';
+        }
+    	
+    }
+    
     /**
      * Creates data provider instance with search query applied
      *
@@ -64,6 +90,9 @@ class TicketSearch extends Ticket
         
         $query->with('ticketType' );
         $query->with('user');
+        $query->with('customer');
+        
+        
         
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
@@ -74,8 +103,9 @@ class TicketSearch extends Ticket
         
         if (!$this->validate()) {
             $query->where('0=1');
-//             return $dataProvider;
+            return $query;
         }
+        
 
         $query->andFilterWhere([
             'id_user' => $this->id_user,
@@ -91,7 +121,6 @@ class TicketSearch extends Ticket
        $dateConditions = [];
        $start = $this->timestampStart;
        $end = $this->timestampEnd;
-        Yii::info('valid all: ' .$all);
        
         if( $all || $this->created_in_interval ){
         	$dateConditions[] = Helper::queryInIntervalRule('ticket.created_at', $start, $end);
@@ -117,4 +146,71 @@ class TicketSearch extends Ticket
 
         return $dataProvider;
     }
+    
+    
+    
+    public function searchTotals(){
+    	$query = Ticket::mkStatisticQuery($this->timestampStart, $this->timestampEnd);
+    	$this->statistics = $query->all();
+    	
+    	$this->statisticsTotal =[
+			'valid' => 0,
+			'created' => 0,
+			'created_at_money' => 0,
+			'expired' => 0,
+    	];
+    	
+   		$this->statisticsTotal['valid'] = array_sum(array_column($this->statistics, 'valid'));
+   		$this->statisticsTotal['created'] = array_sum(array_column($this->statistics, 'created'));
+   		$this->statisticsTotal['created_money'] = array_sum(array_column($this->statistics, 'created_money'));
+   		$this->statisticsTotal['expired'] = array_sum(array_column($this->statistics, 'expired'));
+    }
+    
+    
+    public static function mkSearchCondition( $timestampStart, $timestampEnd,  $id_user,$id_ticket_tpye,$id_account,$valid_in_interval ,$expire_in_interval,$created_in_interval ){
+    	$query = Ticket::find();
+    	
+    	Helper::queryAccountConstraint($query, 'ticket.id_account');
+    	
+    	$query->with('ticketType' );
+    	$query->with('user');
+    	$query->with('customer');
+    	
+    	$query->andFilterWhere([
+    			'id_user' => $id_user,
+    			'id_ticket_type' => $id_ticket_type,
+    			'id_account' => $id_account,
+    			]);
+    	
+    	$all = (!($valid_in_interval)  && !($expire_in_interval) && !($created_in_interval) )
+    	||
+    	($valid_in_interval == true && $expire_in_interval == true && $created_in_interval);
+    	
+    	$dateConditions = [];
+    	$start = $timestampStart;
+    	$end = $timestampEnd;
+    	 
+    	if( $all || $created_in_interval ){
+    		$dateConditions[] = Helper::queryInIntervalRule('ticket.created_at', $start, $end);
+    	}
+    	
+    	if ( $all || $valid_in_interval ){
+    		$dateConditions[] = Helper::queryValidRule('ticket.start', 'ticket.end', $start, $end);
+    	}
+    	
+    	if ( $all || $expire_in_interval ){
+    		$dateConditions[] =  Helper::queryExpireRule('ticket.start', 'ticket.end', $start, $end);
+    	}
+    	
+    	if ( count($dateConditions) == 1 ){
+    		$query->andWhere($dateConditions[0]);
+    	}else if ( count($dateConditions) > 1 ){
+    		$cond = ['or'];
+    		foreach ($dateConditions as $c){
+    			$cond[] = $c;
+    		}
+    		$query->andWhere($cond);
+    	}
+    }
+    
 }
diff --git a/backend/views/ticket/index.php b/backend/views/ticket/index.php
index 8e63bb2..19b2d50 100644
--- a/backend/views/ticket/index.php
+++ b/backend/views/ticket/index.php
@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
 use yii\helpers\ArrayHelper;
+use yii\data\ArrayDataProvider;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\TicketSearch */
@@ -20,11 +21,72 @@ $this->params['breadcrumbs'][] = $this->title;
     <h1><?= Html::encode($this->title) ?></h1>
     <?php   echo $this->render('_search', ['model' => $searchModel]); ?>
 
+    
+    
+    <div class="panel panel-default">
+    	<div class="panel-heading">Bérlet statisztika</div>
+	    <div class="panel-body">
+	        <p>Bérlet statisztika a kiválasztott időszakra</p>
+	    <?php 
+	    
+	    	echo GridView::widget([
+				'dataProvider' => new ArrayDataProvider([
+					'allModels' => $searchModel->statistics,
+	     			'sort' => false,
+	     			'pagination' =>  false,
+				]),
+	    		'showFooter'=>TRUE,
+	    		'footerRowOptions'=>['style'=>'font-weight:bold; '],
+				'columns' =>[
+					[
+						'attribute' => 'name',
+						'label' => 'Bérlet',
+	    				'footer' => 'Összesen'
+					],
+					[
+						'attribute' => 'created',
+						'label' => 'Kiadva (Db)',
+	    				'footer' => $searchModel->statisticsTotal['created']
+					],
+					[
+						'attribute' => 'created_money',
+						'label' => 'Kiadott érték (Ft)',
+	    				'footer' => $searchModel->statisticsTotal['created_money']
+					],
+					[
+						'attribute' => 'valid',
+						'label' => 'Érvényes (Db)',
+						'footer' => $searchModel->statisticsTotal['valid']
+	
+					],
+	    			[
+						'attribute' => 'expired',
+						'label' => 'Lejár az adott időszakban (Db)',
+	    				'footer' => $searchModel->statisticsTotal['expired']
+	    			]
+		
+				]
+			]);
+	    
+	    ?>
+	    </div>
+	    </div>
+	   
+    
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
         'columns' => [
-
+        	[
+        		'attribute' => 'id_customer',
+        		'value' => 'customerName'
+        	],
+        	[
+        		'attribute' => 'id_card',
+        		'value' => 'cardNumber'
+        	],
+            'start:date',
+            'end:date',
         	[
 	           'attribute' => 'id_user',
         		'value' => 'userName'
@@ -37,10 +99,8 @@ $this->params['breadcrumbs'][] = $this->title;
         		'attribute' => 'id_account',
         		'value' => 'accountName'
         	],
-            'start:date',
-            'end:date',
-            'max_usage_count',
-            'usage_count',
+//             'max_usage_count',
+//             'usage_count',
 
             ['class' => 'yii\grid\ActionColumn',
             	'template' => '{view}'		
diff --git a/common/components/Helper.php b/common/components/Helper.php
index 8435daa..fa1199b 100644
--- a/common/components/Helper.php
+++ b/common/components/Helper.php
@@ -1,6 +1,8 @@
 <?php
 namespace common\components;
 
+use \Yii;
+
 class Helper
 {
 
@@ -29,13 +31,25 @@ class Helper
 	
 	public static function queryExpireRule( $field_start,$field_end , $start,$end ){
 		 
-		 return ['and' ,['<',$field_start, $end], ['>=' , $field_end , $start ], ['<' , $field_end , $end ] ];
+		 return ['and' ,['<',$field_start, $end], ['>=' , $field_end , $start ], ['<=' , $field_end , $end ] ];
 	}
 	
 	public static function queryValidRule( $field_start ,$field_end , $start,$end ){
 		 return ['and' ,['<',$field_start, $end], ['>=' , $field_end , $start ] ];
 	}
 	
+	public static function sqlInIntervalRule( $field , $paramStart,$paramEnd ){
+		return ' ' .$field . ' >= ' . $paramStart  . ' and ' . $field . ' < ' . $paramEnd ;
+	}
+	
+	public static function sqlExpireRule( $field_start,$field_end  , $paramStart,$paramEnd ){
+		 return ' ' .$field_start . ' < ' . $paramEnd  . ' and ' . $field_end . ' < ' . $paramEnd ;
+	}
+	
+	public static function sqlValidRule( $field_start ,$field_end   , $paramStart,$paramEnd ){
+		 return ' ' .$field_start . ' < ' . $paramEnd  . ' and ' . $field_end . ' >=' . $paramStart ;
+	}
+	
 	public static function queryAccountConstraint($query,$field){
 		if ( !RoleDefinition::isAdmin() ){
 			$query->innerJoin("user_account_assignment",  $field . ' = user_account_assignment.id_account' );
diff --git a/common/messages/hu/backend/ticket.php b/common/messages/hu/backend/ticket.php
new file mode 100644
index 0000000..f42c821
--- /dev/null
+++ b/common/messages/hu/backend/ticket.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Card' => 'Bérlet kártya',
+    'Customer' => 'Vendég',
+    'Created in interval' => 'Létrehozva az időszakban',
+    'End of interval' => 'Időszak vége',
+    'Expire in interval' => 'Lejár az időszakban',
+    'Start of interval' => 'Idászak kezdete',
+    'Valid in interval' => 'Érvényes az időszakban',
+];
diff --git a/common/messages/hu/common/ticket.php b/common/messages/hu/common/ticket.php
index c906fe4..7a812ae 100644
--- a/common/messages/hu/common/ticket.php
+++ b/common/messages/hu/common/ticket.php
@@ -17,13 +17,10 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Reset' => 'Reset',
-    'Are you sure you want to delete this item?' => 'Biztosan törölni szeretné a bérletet?',
     'Comment' => 'Megjegyzés',
     'Create' => 'Mentés',
     'Create Ticket' => 'Új bérlet',
     'Created At' => 'Hozzáadva',
-    'Delete' => 'Törlés',
     'End' => 'Érvényesség vége',
     'Id Account' => 'Kassza',
     'Id Discount' => 'Kedvezmény',
@@ -32,6 +29,7 @@ return [
     'Id User' => 'Felhasználó',
     'Max Usage Count' => 'Max alkalmak',
     'Price Brutto' => 'Bruttó ár',
+    'Reset' => 'Reset',
     'Search' => 'Keresés',
     'Start' => 'Érvényesség kezdete',
     'Status' => 'Státusz',
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index 511f737..f881b42 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\db\ActiveRecord;
 use yii\db\Query;
 use yii\db\Expression;
+use common\components\Helper;
 
 /**
  * This is the model class for table "ticket".
@@ -71,6 +72,8 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
             'comment' => Yii::t('common/ticket', 'Comment'),
             'created_at' => Yii::t('common/ticket', 'Created At'),
             'updated_at' => Yii::t('common/ticket', 'Updated At'),
+            'id_card' => Yii::t('backend/ticket','Card'),
+            'id_customer' => Yii::t('backend/ticket','Customer'),
         ];
     }
     
@@ -78,6 +81,27 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     public function getCard(){
     	return $this->hasOne( Card::className(), ["id_card" =>"id_card" ] );
     }
+    public function getCardNumber(){
+    $result = "";
+    $card = $this->card;
+    if ( isset($card)){
+    	$result = $card->number;
+    }
+    return $result;
+    }
+    
+    public function getCustomer(){
+    	return $this->hasOne( Customer::className(), ["id_customer_card" =>"id_card" ] )->via('card');
+    }
+    
+    public function getCustomerName(){
+    	$result = "";
+    	$customer = $this->customer;
+    	if ( isset($customer)){
+    		$result = $customer->name;
+    	}
+    	return $result;
+    }
 
     public function getUser(){
     	return $this->hasOne( User::className(), ["id" =>"id_user" ] );
@@ -151,7 +175,7 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     }
     
     
-    public static function statistic($start,$end){
+    public static function mkStatisticQuery($start,$end){
 //     	$sql = "select 
 // 	ticket_type.name, 
 // 	count(ticket.id_ticket) as total	,
@@ -169,28 +193,39 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     	
     	$query = new Query();
     	$query->addSelect( [
-    			new Expression( 'ticket_type.id as id'),
+    			new Expression( 'ticket_type.id_ticket_type as id'),
     			new Expression( 'ticket_type.name as name'),
-    			new Expression( 'count(ticket.id_ticket) as total'),
-    			new Expression( "sum( case when ticket.end > ':start' and ticket.start <= ':end' then 1 else 0 end) as valid" ),
-    			new Expression( "sum(case when ticket.created_at < ':end' and ticket.created_at >= ':start' then 1 else 0 end) as created" ),
-    			new Expression( "sum(case when ticket.created_at < ':end' and ticket.created_at >= ':start'   then transfer.money else 0 end) as created_money" ),
-    			new Expression( "sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is not null then transfer.money else 0 end) as created_money_paid" ),
-    			new Expression( "sum(case when ticket.created_at < '2015-11-06' and ticket.created_at >= '2015-11-05' and transfer.paid_at is null then transfer.money else 0 end) as created_money_not_paid" ),
-    			new Expression( "sum(case when ticket.created_at >= '2015-11-06' and ticket.created_at < '2015-11-05' and transfer.paid_at < '2015-11-06' and transfer.paid_at >= '2015-11-05' then transfer.money else 0 end) as dept_paid" ),
-    			new Expression( "sum(case when ticket.end < '2015-11-06' and ticket.created_at >= '2015-11-05' then 1 else 0 end) as expired" ),
+    			new Expression( 'coalesce( count(ticket.id_ticket),0) as total'),
+    			
+    			new Expression( "coalesce( sum( case when ". Helper::sqlValidRule('ticket.start', 'ticket.end', ':start', ':end') . " then 1 else 0 end) , 0) as valid" ), //valid
+    			new Expression( "coalesce( sum( case when ". Helper::sqlInIntervalRule('ticket.created_at', ':start', ':end') . " then 1 else 0 end)  , 0) as created" ),//created
+    			new Expression( "coalesce( sum( case when ". Helper::sqlInIntervalRule('ticket.created_at', ':start', ':end') . " then transfer.money else 0 end)  , 0) as created_money" ),//created_money
+    			new Expression( "coalesce( sum( case when " . Helper::sqlExpireRule('ticket.start', 'ticket.end', ':start', ":end")  . " then 1 else 0 end)  , 0) as expired" ),
     			
     			
     	]);
     	
     	$query->from('ticket_type');
     	$query->innerJoin('ticket', 'ticket.id_ticket_type = ticket_type.id_ticket_type');
-    	$query->innerJoin('transfer', 'ticket.id_ticket = transfer.id_object and transfer.type = 20');
+    	$query->innerJoin('transfer', 'ticket.id_ticket = transfer.id_object and transfer.type = '. Transfer::TYPE_TICKET );
     	
-    	$query->groupBy("ticket_type.id_ticket, ticket_type.name");
+    	Helper::queryAccountConstraint($query, 'ticket.id_account');
+    	
+    	$query->andWhere(
+			[
+    			'or',
+    			Helper::queryInIntervalRule('ticket.created_at', $start, $end),
+    			Helper::queryValidRule('ticket.start', 'ticket.end', $start, $end),
+    			Helper::queryExpireRule('ticket.start', 'ticket.end', $start, $end),
+			]
+    	);
+    	
+    	
+    	$query->groupBy("ticket_type.id_ticket_type, ticket_type.name");
     	
     	$query->params([':start' => $start, ':end' => $end]);
     	
+    	return $query;
     }
     
 }

From afac709d04f536d277d34069ef2abc879417f59a Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 15:33:58 +0100
Subject: [PATCH 075/100] change admin menu structure

---
 backend/components/AdminMenuStructure.php | 60 ++++++++++++++++-------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 8abde20..a324dd8 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -40,40 +40,64 @@ class AdminMenuStructure{
 			$tomorrowDatetime = \Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
 			
 			
-	// 		if ( $this->can('backend.user.index')){
-				$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
-	// 		}
+			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
 			
+			/////////////////////////////
+			// Beállítások
+			/////////////////////////////
+			$this->menuItems[]  = ['label' => 'Beállítások', 'url' => null,
+				'items' =>  $items
+			];
+			
+			/////////////////////////////
+			// Törszadatok
+			/////////////////////////////
+			$items = [];
 			$items[] = ['label' => 'Raktárak', 'url' =>['/warehouse/index']];
 			$items[] = ['label' => 'Kasszák', 'url' =>['/account/index']];
 			$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
-			$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
-			$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
-			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
-			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
 			
+			$this->menuItems[] = ['label' => 'Törszadatok', 'url' => null,
+			'items' =>  $items
+			];
+			$items = [];
+			/////////////////////////////
+			// BÉRLETEK
+			/////////////////////////////
+			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
+			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
+			$items[] = ['label' => 'Bérletek', 'url' => ['/ticket/index' , 'TicketSearch[start]' =>$today,'TicketSearch[end]' => $tomorrow ] ];
+			$this->menuItems[] = ['label' => 'Bérletek/Vendégek', 'url' => null,
+			'items' =>  $items
+			];
+			
+			/////////////////////////////
+			// Termékek
+			/////////////////////////////
+			$items = [];
+			$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
+			$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
+			$this->menuItems[] = ['label' => 'Termékek', 'url' => null,
+			'items' =>  $items
+			];
+			/////////////////////////////
+			// Pénzügy
+			/////////////////////////////
+			$items = [];
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
-			$items[] = ['label' => 'Bérletek', 'url' => ['/ticket/index' , 'TicketSearch[start]' =>$today,'TicketSearch[end]' => $tomorrow ] ];
+			$this->menuItems[] = ['label' => 'Pénzügy', 'url' => null,
+			'items' =>  $items
+			];
 			
-			if ( count($items) > 0 ){
-				$userMainMenu = ['label' => 'Beállítások', 'url' => null,
-					'items' =>  $items
-				];
-			}
-			
-			if ( isset($userMainMenu)){
-				$this->menuItems[]  = $userMainMenu;
-			}
 		}
 		
 	}
 	
-	
 	protected function addLoginMainMenu(){
 		if (Yii::$app->user->isGuest) {
 			$mainMenuItem= ['label' => 'Login', 'url' => ['/site/login']];

From b3dd9f67e8e3b9e5e2ab1f90b5c3e59fa7d61ab7 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 15:40:05 +0100
Subject: [PATCH 076/100] change admin menu structure

---
 backend/components/AdminMenuStructure.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index a324dd8..3020108 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -31,7 +31,6 @@ class AdminMenuStructure{
 		$items = [];
 		if (!Yii::$app->user->isGuest) {
 		
-		
 			//$today = \Yii::$app->formatter->asDate( time() );
 			$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
 			$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 +  time()));
@@ -40,11 +39,10 @@ class AdminMenuStructure{
 			$tomorrowDatetime = \Yii::$app->formatter->asDatetime( strtotime('tomorrow UTC') );
 			
 			
-			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
-			
 			/////////////////////////////
 			// Beállítások
 			/////////////////////////////
+			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
 			$this->menuItems[]  = ['label' => 'Beállítások', 'url' => null,
 				'items' =>  $items
 			];
@@ -59,14 +57,14 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
-			
 			$this->menuItems[] = ['label' => 'Törszadatok', 'url' => null,
 			'items' =>  $items
 			];
-			$items = [];
+			
 			/////////////////////////////
 			// BÉRLETEK
 			/////////////////////////////
+			$items = [];
 			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
 			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 			$items[] = ['label' => 'Bérletek', 'url' => ['/ticket/index' , 'TicketSearch[start]' =>$today,'TicketSearch[end]' => $tomorrow ] ];

From 2654a501dbf73649427d9cb567fecd7ed4f17c73 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 17:10:25 +0100
Subject: [PATCH 077/100] add customer ticket statistics

---
 backend/components/AdminMenuStructure.php |   2 +-
 backend/controllers/TicketController.php  |  57 +++++++++++
 backend/models/TicketSearch.php           |  13 ++-
 backend/views/customer/index.php          |  36 +++----
 backend/views/ticket/_search_customer.php |  76 ++++++++++++++
 backend/views/ticket/index_customer.php   | 116 ++++++++++++++++++++++
 common/messages/hu/backend/ticket.php     |   2 +-
 common/models/Ticket.php                  |   5 +-
 8 files changed, 284 insertions(+), 23 deletions(-)
 create mode 100644 backend/views/ticket/_search_customer.php
 create mode 100644 backend/views/ticket/index_customer.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 3020108..67d11cb 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -9,7 +9,7 @@ class AdminMenuStructure{
 	
 	public $menuItems;
 	
-	public function AdminMenu(){
+	public function __construct(){
 		$this->menuItems = [];
 	}
 	
diff --git a/backend/controllers/TicketController.php b/backend/controllers/TicketController.php
index ea687ff..68793a6 100644
--- a/backend/controllers/TicketController.php
+++ b/backend/controllers/TicketController.php
@@ -12,6 +12,8 @@ use common\models\Discount;
 use common\models\TicketType;
 use common\models\Account;
 use common\models\User;
+use common\models\Customer;
+use common\models\Card;
 
 /**
  * TicketController implements the CRUD actions for Ticket model.
@@ -19,6 +21,25 @@ use common\models\User;
 class TicketController extends \backend\controllers\BackendController
 {
 
+	
+	public function behaviors()
+	{
+		return [
+			'access' => [
+				'class' => \yii\filters\AccessControl::className(),
+					'rules' => [
+						// allow authenticated users
+						[
+						'actions' => ['create','index','view','update','index-customer'],
+						'allow' => true,
+						'roles' => ['admin','employee','reception'],
+						],
+						// everything else is denied
+					],
+			],
+		];
+	}
+	
     /**
      * Lists all Ticket models.
      * @return mixed
@@ -40,6 +61,42 @@ class TicketController extends \backend\controllers\BackendController
             'dataProvider' => $dataProvider,
         ]);
     }
+    
+    
+    /**
+     * Lists all Ticket models.
+     * @return mixed
+     */
+    public function actionIndexCustomer($id)
+    {
+    	
+    	$customer = Customer::findOne($id);
+    	$card = Card::findOne($id);
+    	
+    	
+    	if ( $customer == null ){
+    		throw new NotFoundHttpException('The requested page does not exist.');
+    	}
+    	
+    	$searchModel = new TicketSearch();
+    	$searchModel->id_card =  $customer->id_customer_card;
+    	$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+    	$searchModel->searchTotals();
+    
+    	$searchModel->users = User::read();
+    	$searchModel->accounts = Account::read();
+    	$searchModel->ticketTypes = TicketType::read();
+    
+    
+    
+    	return $this->render('index_customer', [
+    			'searchModel' => $searchModel,
+    			'dataProvider' => $dataProvider,
+    			'customer' => $customer,
+    			'card' => $card
+    			]);
+    }
+    
 
     /**
      * Displays a single Ticket model.
diff --git a/backend/models/TicketSearch.php b/backend/models/TicketSearch.php
index 46f7b46..c71bbf5 100644
--- a/backend/models/TicketSearch.php
+++ b/backend/models/TicketSearch.php
@@ -30,16 +30,17 @@ class TicketSearch extends Ticket
 	public $statistics;
 	public $statisticsTotal;
 	
+	
     /**
      * @inheritdoc
      */
     public function rules()
     {
         return [
-            [['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'id_discount', 'max_usage_count', 'usage_count', 'status', 'price_brutto'], 'integer'],
+            [[  'id_user', 'id_ticket_type', 'id_account'], 'integer'],
             [[ 'start', ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
         	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
-       		[['valid_in_interval','created_in_interval','expire_in_interval'],'boolean'] 
+       		[['valid_in_interval','created_in_interval','expire_in_interval'],'boolean'] ,
         		
         ];
     }
@@ -96,6 +97,10 @@ class TicketSearch extends Ticket
         
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
+        	'sort' =>[
+				'defaultOrder' => ['end' => SORT_DESC],
+        		'attributes' => ['end']
+     	   ]
         ]);
 
         $this->load($params);
@@ -111,9 +116,11 @@ class TicketSearch extends Ticket
             'id_user' => $this->id_user,
             'id_ticket_type' => $this->id_ticket_type,
             'id_account' => $this->id_account,
+        	'id_card' => $this->id_card,
         ]);
 
         
+        
         $all = (!($this->valid_in_interval)  && !($this->expire_in_interval) && !($this->created_in_interval) )
         		||
         		($this->valid_in_interval == true && $this->expire_in_interval == true && $this->created_in_interval);
@@ -150,7 +157,7 @@ class TicketSearch extends Ticket
     
     
     public function searchTotals(){
-    	$query = Ticket::mkStatisticQuery($this->timestampStart, $this->timestampEnd);
+    	$query = Ticket::mkStatisticQuery($this->timestampStart, $this->timestampEnd,$this->id_card);
     	$this->statistics = $query->all();
     	
     	$this->statisticsTotal =[
diff --git a/backend/views/customer/index.php b/backend/views/customer/index.php
index db4c9e4..a4c7a25 100644
--- a/backend/views/customer/index.php
+++ b/backend/views/customer/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\CustomerSearch */
@@ -24,30 +25,31 @@ $this->params['breadcrumbs'][] = $this->title;
         'columns' => [
 			[
 				'attribute' => 'customerCardNumber'	,
-// 				'value' => 'customerCardNumber'
 			],
-//             'id_user',
-//             'id_partner_card',
-//             'id_proposer',
             'name',
             'email:email',
-            // 'password',
             'phone',
-            // 'sex',
-            // 'date_stundent_card_expire',
-            // 'birthdate',
-            // 'image',
-            // 'description',
-            // 'tax_number',
-            // 'country',
-            // 'zip',
-            // 'city',
-            // 'address',
             'created_at:datetime',
-            // 'updated_at',
 
             ['class' => 'yii\grid\ActionColumn',
-             'template' =>'{view}{update}'		
+             'template' =>'{view} {update} {ticket/index-customer}',
+    		 'buttons' => [
+				'ticket/index-customer' => function ($url) { return Html::a( '<span class="glyphicon  glyphicon-list-alt"> </span>', $url, [ 'title' => 'Bérletek'  ] ); } 
+    		],
+    		'urlCreator' =>function  ($action, $model, $key, $index){
+		            	$params = is_array($key) ? $key : ['id' => (string) $key];
+						if ( $action == 'ticket/index-customer' ){
+							$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
+							$tomorrow = \Yii::$app->formatter->asDate( strtotime( 'tomorrow UTC'  ));
+							
+							$params['TicketSearch[start]'] = $today;
+							$params['TicketSearch[end]'] = $tomorrow;
+							
+			            }
+			            $params[0] =   $action;
+			
+			            return Url::toRoute($params);
+	    		}		
             		
     ],
         ],
diff --git a/backend/views/ticket/_search_customer.php b/backend/views/ticket/_search_customer.php
new file mode 100644
index 0000000..04e7bf5
--- /dev/null
+++ b/backend/views/ticket/_search_customer.php
@@ -0,0 +1,76 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\TicketSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<?php 
+$ticketTypeOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->ticketTypes, 'id_ticket_type', 'name');
+$accountOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->accounts, 'id_account', 'name');
+$userOptions =  ['' => 'Mind'] +	  ArrayHelper::map($model->users, 'id', 'username');
+
+?>
+
+<div class="ticket-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+
+	<div class='row'>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_user')->dropDownList($userOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_ticket_type')->dropDownList($ticketTypeOptions) ?>
+		</div>
+		<div class='col-md-4'>
+		    <?= $form->field($model, 'id_account')->dropDownList($accountOptions) ?>
+		</div>
+	</div>
+	
+	<div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+	<div class='row'>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'valid_in_interval')->checkbox(  )  ?>
+		</div>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'created_in_interval')->checkbox(  )  ?>
+		</div>
+		<div class='col-md-4'>
+	 		<?php  echo $form->field($model, 'expire_in_interval')->checkbox(  )  ?>
+		</div>
+	</div>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('common/ticket', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/ticket/index_customer.php b/backend/views/ticket/index_customer.php
new file mode 100644
index 0000000..e02beff
--- /dev/null
+++ b/backend/views/ticket/index_customer.php
@@ -0,0 +1,116 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\helpers\ArrayHelper;
+use yii\data\ArrayDataProvider;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\TicketSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$customer = $customer->name;
+if ( isset($card)){
+	$customer .= " (" .$card->number . ")";
+}
+
+$this->title = Yii::t('common/ticket', '{customer} Tickets', ['customer'=>$customer]);
+$this->params['breadcrumbs'][] = $this->title;
+
+
+
+?>
+
+<div class="ticket-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php   echo $this->render('_search_customer', ['model' => $searchModel]); ?>
+
+    
+    
+    <div class="panel panel-default">
+    	<div class="panel-heading">Bérlet statisztika</div>
+	    <div class="panel-body">
+	        <p>Bérlet statisztika a kiválasztott időszakra</p>
+	    <?php 
+	    
+	    	echo GridView::widget([
+				'dataProvider' => new ArrayDataProvider([
+					'allModels' => $searchModel->statistics,
+	     			'sort' => false,
+	     			'pagination' =>  false,
+				]),
+	    		'showFooter'=>TRUE,
+	    		'footerRowOptions'=>['style'=>'font-weight:bold; '],
+				'columns' =>[
+					[
+						'attribute' => 'name',
+						'label' => 'Bérlet',
+	    				'footer' => 'Összesen'
+					],
+					[
+						'attribute' => 'created',
+						'label' => 'Kiadva (Db)',
+	    				'footer' => $searchModel->statisticsTotal['created']
+					],
+					[
+						'attribute' => 'created_money',
+						'label' => 'Kiadott érték (Ft)',
+	    				'footer' => $searchModel->statisticsTotal['created_money']
+					],
+					[
+						'attribute' => 'valid',
+						'label' => 'Érvényes (Db)',
+						'footer' => $searchModel->statisticsTotal['valid']
+	
+					],
+	    			[
+						'attribute' => 'expired',
+						'label' => 'Lejár az adott időszakban (Db)',
+	    				'footer' => $searchModel->statisticsTotal['expired']
+	    			]
+		
+				]
+			]);
+	    
+	    ?>
+	    </div>
+	    </div>
+	   
+    
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'columns' => [
+        	[
+        		'attribute' => 'id_customer',
+        		'value' => 'customerName'
+        	],
+        	[
+        		'attribute' => 'id_card',
+        		'value' => 'cardNumber'
+        	],
+            'start:date',
+            'end:date',
+        	[
+	           'attribute' => 'id_user',
+        		'value' => 'userName'
+    		],
+        	[
+        		'attribute' => 'id_ticket_type',
+        		'value' => 'ticketTypeName'
+        	],
+        	[
+        		'attribute' => 'id_account',
+        		'value' => 'accountName'
+        	],
+//             'max_usage_count',
+//             'usage_count',
+
+            ['class' => 'yii\grid\ActionColumn',
+            	'template' => '{view}'		
+    		],
+        ],
+    ]); ?>
+
+</div>
diff --git a/common/messages/hu/backend/ticket.php b/common/messages/hu/backend/ticket.php
index f42c821..392eae7 100644
--- a/common/messages/hu/backend/ticket.php
+++ b/common/messages/hu/backend/ticket.php
@@ -19,7 +19,7 @@
 return [
     'Card' => 'Bérlet kártya',
     'Customer' => 'Vendég',
-    'Created in interval' => 'Létrehozva az időszakban',
+    'Created in interval' => 'Kiadva az időszakban',
     'End of interval' => 'Időszak vége',
     'Expire in interval' => 'Lejár az időszakban',
     'Start of interval' => 'Idászak kezdete',
diff --git a/common/models/Ticket.php b/common/models/Ticket.php
index f881b42..0079d76 100644
--- a/common/models/Ticket.php
+++ b/common/models/Ticket.php
@@ -16,6 +16,7 @@ use common\components\Helper;
  * @property integer $id_ticket_type
  * @property integer $id_account
  * @property integer $id_discount
+ * @property integer $id_card
  * @property string $start
  * @property string $end
  * @property integer $max_usage_count
@@ -175,7 +176,7 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     }
     
     
-    public static function mkStatisticQuery($start,$end){
+    public static function mkStatisticQuery($start,$end,$id_card = null){
 //     	$sql = "select 
 // 	ticket_type.name, 
 // 	count(ticket.id_ticket) as total	,
@@ -211,6 +212,8 @@ class Ticket  extends \common\models\BaseFitnessActiveRecord
     	
     	Helper::queryAccountConstraint($query, 'ticket.id_account');
     	
+    	$query->andFilterWhere(['id_card' =>$id_card]);
+    	
     	$query->andWhere(
 			[
     			'or',

From 032707e4f13c345942d6a23abd70ad6967b0a3e9 Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 17:14:23 +0100
Subject: [PATCH 078/100] add translations

---
 common/messages/hu/common/ticket.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/messages/hu/common/ticket.php b/common/messages/hu/common/ticket.php
index 7a812ae..0ce934b 100644
--- a/common/messages/hu/common/ticket.php
+++ b/common/messages/hu/common/ticket.php
@@ -17,6 +17,7 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    '{customer} Tickets' => '{customer} bérlet történet',
     'Comment' => 'Megjegyzés',
     'Create' => 'Mentés',
     'Create Ticket' => 'Új bérlet',

From d1fa7e27cf7e534e9cf4125a0d472009c379b901 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Fri, 6 Nov 2015 19:18:19 +0100
Subject: [PATCH 079/100] set version v.0.0.3

---
 changelog.txt            | 4 ++++
 common/config/params.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index b14d9e6..746add5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+-0.0.3
+	admin oldal bérlet statisztika
+	admin oldal módosított menü
+	admin oldal vendég bérlet történet
 -0.0.2
 	alpha verzió
 -0.0.1
diff --git a/common/config/params.php b/common/config/params.php
index 96cf988..a6e6005 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.2'
+	'version' => 'v0.0.3'
 ];

From 07c2d4c36a581448d9225f71ed4a3b8ca44257b1 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sat, 21 Nov 2015 20:36:46 +0100
Subject: [PATCH 080/100] add translateions

---
 backend/components/AdminMenuStructure.php     |  4 +--
 backend/controllers/SiteController.php        |  1 +
 backend/views/site/login.php                  |  6 ++--
 common/config/main.php                        |  1 +
 common/messages/hu/common/account-state.php   |  4 +--
 common/messages/hu/common/site.php            | 32 +++++++++++++++++++
 common/messages/hu/frontend/customer.php      |  3 +-
 .../messages/hu/frontend/money-movement.php   |  3 +-
 common/messages/hu/frontend/site.php          | 22 +++++++++++++
 common/messages/hu/frontend/transfer.php      |  1 +
 common/models/AccountState.php                |  2 +-
 common/models/LoginForm.php                   |  8 +++++
 common/models/Transfer.php                    |  2 +-
 .../prod/common/config/main-local.php         |  2 ++
 frontend/components/FrontendMenuStructure.php | 12 +++----
 frontend/models/ResetPasswordForm.php         |  6 ++++
 frontend/views/product/sale.php               | 29 ++++++++++-------
 frontend/views/site/login.php                 |  6 ++--
 .../views/site/requestPasswordResetToken.php  |  6 ++--
 frontend/views/site/resetPassword.php         |  4 +--
 20 files changed, 118 insertions(+), 36 deletions(-)
 create mode 100644 common/messages/hu/common/site.php
 create mode 100644 common/messages/hu/frontend/site.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 67d11cb..68ff846 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -98,10 +98,10 @@ class AdminMenuStructure{
 	
 	protected function addLoginMainMenu(){
 		if (Yii::$app->user->isGuest) {
-			$mainMenuItem= ['label' => 'Login', 'url' => ['/site/login']];
+			$mainMenuItem= ['label' => Yii::t('common/site','Login'), 'url' => ['/site/login']];
 		} else {
 			$mainMenuItem= [
-					'label' => 'Kijelentkezés (' . Yii::$app->user->identity->username . ')',
+					'label' => Yii::t('common/site','Logout') . '(' . Yii::$app->user->identity->username . ')',
 					'url' => ['/site/logout'],
 					'linkOptions' => ['data-method' => 'post']
 			];
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index db3259a..52a7eac 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -55,6 +55,7 @@ class SiteController extends Controller
 
     public function actionIndex()
     {
+    	Yii::$app->security->generatePasswordHash('test');
         return $this->render('index');
     }
 
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index ec9cc06..29bffcd 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -7,13 +7,13 @@
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
 
-$this->title = 'Login';
+$this->title =   Yii::t('common/site' , 'Login');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-login">
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>Please fill out the following fields to login:</p>
+    <p><?php echo Yii::t('common/site' , 'Please fill out the following fields to login:') ?> </p>
 
     <div class="row">
         <div class="col-lg-5">
@@ -26,7 +26,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= $form->field($model, 'rememberMe')->checkbox() ?>
 
                 <div class="form-group">
-                    <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+                    <?= Html::submitButton( Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
                 </div>
 
             <?php ActiveForm::end(); ?>
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 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Logout' => '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 @@
+<?php
+/**
+ * Message translations.
+ *
+ * This file is automatically generated by 'yii message' command.
+ * It contains the localizable messages extracted from source code.
+ * You may modify this file by translating the extracted messages.
+ *
+ * Each array element represents the translation (value) of a message (key).
+ * If the value is empty, the message is considered as not translated.
+ * Messages that no longer need translation will have their translations
+ * enclosed between a pair of '@@' marks.
+ *
+ * Message string can be used with plural forms format. Check i18n section
+ * of the guide for details.
+ *
+ * NOTE: this file must be saved in UTF-8 encoding.
+ */
+return [
+    'Login' => '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 @@
 <?php 
 
-use frontend\components\ReceptionMenuWidget;
-use frontend\components\ReceptionCardNumberWidget;
-use yii\helpers\Html;
-use common\models\Product;
-use frontend\assets\ProductSellAsset;
-use yii\helpers\Url;
-use yii\bootstrap\ActiveForm;
-use yii\helpers\ArrayHelper;
-use common\models\Discount;
-use frontend\components\ReceptionWidget;
 use common\models\Account;
+use common\models\Discount;
+use frontend\assets\ProductSellAsset;
+use frontend\components\ReceptionWidget;
+use yii\bootstrap\ActiveForm;
+use yii\helpers\Url;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
@@ -67,7 +62,19 @@ $this->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;
 	}
 	
 </style>
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;
 ?>
 <div class="site-login">
@@ -26,11 +26,11 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= $form->field($model, 'rememberMe')->checkbox() ?>
 
                 <div style="color:#999;margin:1em 0">
-                    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']) ?>.
                 </div>
 
                 <div class="form-group">
-                    <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+                    <?= Html::submitButton(Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
                 </div>
 
             <?php ActiveForm::end(); ?>
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;
 ?>
 <div class="site-request-password-reset">
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>Please fill out your email. A link to reset password will be sent there.</p>
+    <p><?php  echo  Yii::t('common/site' ,'Please fill out your email. A link to reset password will be sent there.') ?></p>
 
     <div class="row">
         <div class="col-lg-5">
@@ -22,7 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
                 <?= $form->field($model, 'email') ?>
 
                 <div class="form-group">
-                    <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
+                    <?= Html::submitButton( Yii::t('common/site' ,'Send'), ['class' => 'btn btn-primary']) ?>
                 </div>
 
             <?php ActiveForm::end(); ?>
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;
 ?>
 <div class="site-reset-password">
     <h1><?= Html::encode($this->title) ?></h1>
 
-    <p>Please choose your new password:</p>
+    <p><?php  echo Yii::t('common/site' ,'Please choose your new password:') ?></p>
 
     <div class="row">
         <div class="col-lg-5">

From e13866d7da4b4b8b3ae1644fae9a899009a2c97b Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sat, 21 Nov 2015 20:46:12 +0100
Subject: [PATCH 081/100] change version to 0.0.4

---
 common/config/params.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config/params.php b/common/config/params.php
index a6e6005..f8d2974 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.3'
+	'version' => 'v0.0.4'
 ];

From bcae71155ebcb3b75c335032fc895af193b66913 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Mon, 23 Nov 2015 19:55:49 +0100
Subject: [PATCH 082/100] add backend theme AdminLte, bind
 reception/transaction to a permission

---
 backend/components/AdminMenuStructure.php     |  16 +-
 backend/components/LTEAdminMenu.php           |  78 ++++++
 backend/controllers/SiteController.php        |   4 +
 backend/controllers/UserController.php        |  42 +++-
 backend/models/RoleForm.php                   |  46 ++++
 backend/views/layouts-orig/main.php           |  79 ++++++
 backend/views/layouts/content.php             |  26 ++
 backend/views/layouts/header.php              |  69 ++++++
 backend/views/layouts/left.php                |  20 ++
 backend/views/layouts/main-login.php          |  29 +++
 backend/views/layouts/main.php                | 124 +++++-----
 backend/views/site/error.php                  |  46 ++--
 backend/views/site/index.php                  |   7 +-
 backend/views/site/login.php                  |  74 ++++--
 backend/views/site_orig/error.php             |  27 ++
 backend/views/site_orig/index.php             |  17 ++
 backend/views/site_orig/login.php             |  35 +++
 backend/views/user/role.php                   |  72 ++++++
 common/models/Account.php                     |   4 +-
 common/models/LoginForm.php                   |  18 +-
 common/models/User.php                        |   2 +
 composer.json                                 |   3 +-
 composer.lock                                 | 230 +++++++++++++++++-
 ...500_add_permission_reception_transfers.php |  29 +++
 frontend/components/FrontendMenuStructure.php |  24 +-
 25 files changed, 993 insertions(+), 128 deletions(-)
 create mode 100644 backend/components/LTEAdminMenu.php
 create mode 100644 backend/models/RoleForm.php
 create mode 100644 backend/views/layouts-orig/main.php
 create mode 100644 backend/views/layouts/content.php
 create mode 100644 backend/views/layouts/header.php
 create mode 100644 backend/views/layouts/left.php
 create mode 100644 backend/views/layouts/main-login.php
 create mode 100644 backend/views/site_orig/error.php
 create mode 100644 backend/views/site_orig/index.php
 create mode 100644 backend/views/site_orig/login.php
 create mode 100644 backend/views/user/role.php
 create mode 100644 console/migrations/m151123_172500_add_permission_reception_transfers.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 68ff846..5976176 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -8,6 +8,7 @@ use yii\helpers\Html;
 class AdminMenuStructure{
 	
 	public $menuItems;
+	public $emptyUrl = '#';//maybe null
 	
 	public function __construct(){
 		$this->menuItems = [];
@@ -43,7 +44,8 @@ class AdminMenuStructure{
 			// Beállítások
 			/////////////////////////////
 			$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
-			$this->menuItems[]  = ['label' => 'Beállítások', 'url' => null,
+			$items[] = ['label' => 'Jogosultságok', 'url' =>['/user/role']];
+			$this->menuItems[]  = ['label' => 'Beállítások', 'url' => $this->emptyUrl,
 				'items' =>  $items
 			];
 			
@@ -57,7 +59,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
-			$this->menuItems[] = ['label' => 'Törszadatok', 'url' => null,
+			$this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl,
 			'items' =>  $items
 			];
 			
@@ -65,10 +67,10 @@ class AdminMenuStructure{
 			// BÉRLETEK
 			/////////////////////////////
 			$items = [];
-			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
+			$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] , 'target_url' => ['/customer/index' ,'/customer/view','/ticket/index-customer'] ];
 			$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
 			$items[] = ['label' => 'Bérletek', 'url' => ['/ticket/index' , 'TicketSearch[start]' =>$today,'TicketSearch[end]' => $tomorrow ] ];
-			$this->menuItems[] = ['label' => 'Bérletek/Vendégek', 'url' => null,
+			$this->menuItems[] = ['label' => 'Bérletek/Vendégek', 'url' =>  $this->emptyUrl,
 			'items' =>  $items
 			];
 			
@@ -78,7 +80,7 @@ class AdminMenuStructure{
 			$items = [];
 			$items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ];
 			$items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ];
-			$this->menuItems[] = ['label' => 'Termékek', 'url' => null,
+			$this->menuItems[] = ['label' => 'Termékek', 'url' =>  $this->emptyUrl,
 			'items' =>  $items
 			];
 			/////////////////////////////
@@ -88,7 +90,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
-			$this->menuItems[] = ['label' => 'Pénzügy', 'url' => null,
+			$this->menuItems[] = ['label' => 'Pénzügy', 'url' =>  $this->emptyUrl,
 			'items' =>  $items
 			];
 			
@@ -112,7 +114,7 @@ class AdminMenuStructure{
 	
 	public function run(){
 		$this->addUserMainMenu();
-		$this->addLoginMainMenu();
+// 		$this->addLoginMainMenu();
 		return $this->menuItems;
 	}
 	
diff --git a/backend/components/LTEAdminMenu.php b/backend/components/LTEAdminMenu.php
new file mode 100644
index 0000000..700cd08
--- /dev/null
+++ b/backend/components/LTEAdminMenu.php
@@ -0,0 +1,78 @@
+<?php 
+namespace backend\components;
+
+use \Yii;
+	
+	
+	
+class LTEAdminMenu extends \dmstr\widgets\Menu{
+		
+		
+		
+		
+		/**
+		 * Checks whether a menu item is active.
+		 * This is done by checking if [[route]] and [[params]] match that specified in the `url` option of the menu item.
+		 * When the `url` option of a menu item is specified in terms of an array, its first element is treated
+		 * as the route for the item and the rest of the elements are the associated parameters.
+		 * Only when its route and parameters match [[route]] and [[params]], respectively, will a menu item
+		 * be considered active.
+		 * @param array $item the menu item to be checked
+		 * @return boolean whether the menu item is active
+		 */
+		protected function isItemActive($item)
+		{
+			
+			if (isset($item['target_url']) && is_array($item['target_url'])  ) {
+				foreach ($item['target_url'] as $target){
+					$route = $target;
+					if ($route[0] !== '/' && Yii::$app->controller) {
+						$route = Yii::$app->controller->module->getUniqueId() . '/' . $route;
+					}
+					$arrayRoute = explode('/', ltrim($route, '/'));
+					$arrayThisRoute = explode('/', $this->route);
+					if ($arrayRoute[0] !== $arrayThisRoute[0]) {
+						continue;
+					}
+					if (isset($arrayRoute[1]) && $arrayRoute[1] !== $arrayThisRoute[1]) {
+						continue;
+					}
+					if (isset($arrayRoute[2]) && $arrayRoute[2] !== $arrayThisRoute[2]) {
+						continue;
+					}
+				return true;
+				}
+				return false;
+			}else if (isset($item['url']) && is_array($item['url']) && isset($item['url'][0])) {
+				$route = $item['url'][0];
+				if ($route[0] !== '/' && Yii::$app->controller) {
+					$route = Yii::$app->controller->module->getUniqueId() . '/' . $route;
+				}
+				$arrayRoute = explode('/', ltrim($route, '/'));
+				$arrayThisRoute = explode('/', $this->route);
+				if ($arrayRoute[0] !== $arrayThisRoute[0]) {
+					return false;
+				}
+				if (isset($arrayRoute[1]) && $arrayRoute[1] !== $arrayThisRoute[1]) {
+					return false;
+				}
+				if (isset($arrayRoute[2]) && $arrayRoute[2] !== $arrayThisRoute[2]) {
+					return false;
+				}
+// 				unset($item['url']['#']);
+// 				if (count($item['url']) > 1) {
+// 					foreach (array_splice($item['url'], 1) as $name => $value) {
+// 						if ($value !== null && (!isset($this->params[$name]) || $this->params[$name] != $value)) {
+// 							return false;
+// 						}
+// 					}
+// 				}
+				return true;
+			}
+			return false;
+		}
+		
+	}
+
+
+?>
\ No newline at end of file
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index 52a7eac..73bd4ec 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -66,6 +66,10 @@ class SiteController extends Controller
         }
 
         $model = new LoginForm();
+        $model->roles = [
+        		'admin',
+        		'employee'
+        ];
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
             return $this->goBack();
         } else {
diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php
index 6a41097..60c42f4 100644
--- a/backend/controllers/UserController.php
+++ b/backend/controllers/UserController.php
@@ -30,9 +30,9 @@ class UserController extends \backend\controllers\BackendController
 				'rules' => [
 					// allow authenticated users
 					[
-					'actions' => [ 'index','view' ],
+					'actions' => [ 'index','view' ,'role'],
 					'allow' => true,
-					'roles' => ['employee','admin','reception'],
+					'roles' => ['employee','admin' ],
 					],
 					// allow authenticated users
 					[
@@ -176,6 +176,44 @@ class UserController extends \backend\controllers\BackendController
 
         return $this->redirect(['index']);
     }
+    
+    /**
+     * Creates a new User model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionRole()
+    {
+    	$model = new  \backend\models\RoleForm();
+    
+    		$model->availablePermissions = [
+    				[
+	    				'name' =>  "reception.transfers",
+    					'description' => 'Tranzakciók'
+    				]
+    		];
+    
+    		
+    		
+    		
+    	if ($model->load(Yii::$app->request->post())   ) {
+    		if ( $model->validate() &&  $model->save()){
+    			Yii::$app->session->setFlash('success', 'Jogosultságok elmentve');
+	    		return $this->redirect(['role' ]);
+    		}
+    	}else{
+	    	$am = Yii::$app->authManager;
+	    	$children = $am->getChildren(User::ROLE_RECEPTION);
+	    	$model->permissions = [];
+	    	foreach ($children as $child){
+	    		$model->permissions[] = $child->name;
+	    	}
+    	}
+    
+    	return $this->render('role', [
+    			'model' => $model,
+    	]);
+    }
 
     /**
      * Finds the User model based on its primary key value.
diff --git a/backend/models/RoleForm.php b/backend/models/RoleForm.php
new file mode 100644
index 0000000..40f555b
--- /dev/null
+++ b/backend/models/RoleForm.php
@@ -0,0 +1,46 @@
+<?php
+namespace backend\models;
+
+use yii\base\Model;
+use common\models\User;
+
+class RoleForm extends Model{
+	
+	
+	public $permissions =[];
+	public $availablePermissions = [];
+	/**
+	 * @inheritdoc
+	 * @formatter:off
+	 */
+	public function rules()
+	{
+		return [
+				['permissions',function ($attribute, $params) {
+					if (!is_array($this->$attribute)) {
+						echo "invalid arr";
+						$this->addError($attribute, 'Invalid array');
+					}
+				}
+				],
+				];
+	}
+	
+	public function save(){
+		$am = \Yii::$app->authManager;
+		//remove all reception permission
+		$receptionItem = $am->getRole(User::ROLE_RECEPTION);
+		$am->removeChildren($receptionItem);
+		
+		if ( isset($receptionItem)){
+			foreach ($this->permissions as $permissionName){
+				$permission = $am->getPermission($permissionName);
+				if ( isset( $permission )){
+					$am->addChild($receptionItem, $permission);
+				}
+			}
+		}
+		return true;
+	}
+	
+}
\ No newline at end of file
diff --git a/backend/views/layouts-orig/main.php b/backend/views/layouts-orig/main.php
new file mode 100644
index 0000000..88466f6
--- /dev/null
+++ b/backend/views/layouts-orig/main.php
@@ -0,0 +1,79 @@
+<?php
+
+/* @var $this \yii\web\View */
+/* @var $content string */
+
+use backend\assets\AppAsset;
+use yii\helpers\Html;
+use yii\bootstrap\Nav;
+use yii\bootstrap\NavBar;
+use yii\widgets\Breadcrumbs;
+use common\widgets\Alert;
+use backend\components\AdminMenuStructure;
+use kartik\widgets\AlertBlock;
+
+AppAsset::register($this);
+
+$adminMenu = new AdminMenuStructure();
+$items = $adminMenu->run();
+?>
+<?php $this->beginPage() ?>
+<!DOCTYPE html>
+<html lang="<?= Yii::$app->language ?>">
+<head>
+    <meta charset="<?= Yii::$app->charset ?>">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <?= Html::csrfMetaTags() ?>
+    <title><?= Html::encode($this->title) ?></title>
+    
+    
+    <?php $this->head() ?>
+    
+</head>
+<body>
+<?php $this->beginBody() ?>
+
+<div class="wrap">
+    <?php
+    NavBar::begin([
+        'brandLabel' => 'Botond Fitness WebAdmin',
+        'brandUrl' => Yii::$app->homeUrl,
+        'options' => [
+            'class' => 'navbar-inverse navbar-fixed-top',
+        ],
+    ]);
+    echo Nav::widget([
+        'options' => ['class' => 'navbar-nav navbar-right'],
+        'items' => $items,
+    ]);
+    NavBar::end();
+    ?>
+
+    <div class="container">
+        <?= Breadcrumbs::widget([
+            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+        ]) ?>
+        <?php //echo Alert::widget() ?>
+        <?php 
+        echo AlertBlock::widget([
+        		'useSessionFlash' => true,
+        		'type' => AlertBlock::TYPE_GROWL,
+        		'delay' => '1'
+        		]);
+        ?>
+        <?= $content ?>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="pull-left">&copy;  <?= Yii::$app->name ?> <?= Yii::$app->params['version']  ?> Fitness - WebAdmin <?= date('Y') ?></p>
+
+        <p class="pull-right"><?= Yii::powered() ?></p>
+    </div>
+</footer>
+
+<?php $this->endBody() ?>
+</body>
+</html>
+<?php $this->endPage() ?>
diff --git a/backend/views/layouts/content.php b/backend/views/layouts/content.php
new file mode 100644
index 0000000..d38d50d
--- /dev/null
+++ b/backend/views/layouts/content.php
@@ -0,0 +1,26 @@
+<?php
+use yii\widgets\Breadcrumbs;
+use dmstr\widgets\Alert;
+
+?>
+<div class="content-wrapper">
+    <section class="content-header clearfix">
+
+        <?=
+        Breadcrumbs::widget(
+            [
+                'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+            ]
+        ) ?>
+    </section>
+
+    <section class="content">
+        <?= Alert::widget() ?>
+        <?= $content ?>
+    </section>
+</div>
+
+<footer class="main-footer">
+   &copy;  <?= Yii::$app->name ?> <?= Yii::$app->params['version']  ?> Fitness - WebAdmin <?= date('Y') ?>
+</footer>
+
diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php
new file mode 100644
index 0000000..969b2c3
--- /dev/null
+++ b/backend/views/layouts/header.php
@@ -0,0 +1,69 @@
+<?php
+use yii\helpers\Html;
+
+/* @var $this \yii\web\View */
+/* @var $content string */
+?>
+
+<header class="main-header">
+
+    <?= Html::a('<span class="logo-mini">A</span><span class="logo-lg">Fitness Admin</span>', Yii::$app->homeUrl, ['class' => 'logo']) ?>
+
+    <nav class="navbar navbar-static-top" role="navigation">
+
+        <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+            <span class="sr-only">Toggle navigation</span>
+        </a>
+
+		<div class="navbar-header">
+			 <a class="navbar-brand" href="#">Web Recepció</a>
+		</div>
+
+        <div class="navbar-custom-menu">
+
+            <ul class="nav navbar-nav">
+
+                <!-- User Account: style can be found in dropdown.less -->
+
+                <li class="dropdown user user-menu">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                    	<span class='glyphicon glyphicon-user'></span>
+                        <span class="hidden-xs"><?php echo Yii::$app->user->identity->username?></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <!-- User image -->
+                        <li class="user-header">
+
+                            <p>
+                                <?php echo Yii::$app->user->identity->username?>
+                                <small>Felhasználó</small>
+                            </p>
+                        </li>
+                        <!-- Menu Footer-->
+                        <li class="user-footer">
+                            <div class="pull-left">
+                            	<!-- 
+                                <a href="#" class="btn btn-default btn-flat">Profile</a>
+                            	 -->
+                            </div>
+                            <div class="pull-right">
+                                <?= Html::a(
+                                    Yii::t('common/site','Logout'),
+                                    ['/site/logout'],
+                                    ['data-method' => 'post', 'class' => 'btn btn-default btn-flat']
+                                ) ?>
+                            </div>
+                        </li>
+                    </ul>
+                </li>
+
+                <!-- User Account: style can be found in dropdown.less -->
+                <!--  
+                <li>
+                    <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
+                </li>
+                -->
+            </ul>
+        </div>
+    </nav>
+</header>
diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php
new file mode 100644
index 0000000..3546f98
--- /dev/null
+++ b/backend/views/layouts/left.php
@@ -0,0 +1,20 @@
+<?php 
+use backend\components\AdminMenuStructure;
+?>
+
+<?php 
+	$menu = new AdminMenuStructure();
+	$menu = $menu->run();
+	$items = $menu;
+	
+?>
+<aside class="main-sidebar">
+    <section class="sidebar">
+        <?=  \backend\components\LTEAdminMenu::widget(
+            [
+                'options' => ['class' => 'sidebar-menu'],
+                'items' => $items
+            ]
+        ) ?>
+    </section>
+</aside>
diff --git a/backend/views/layouts/main-login.php b/backend/views/layouts/main-login.php
new file mode 100644
index 0000000..c6525db
--- /dev/null
+++ b/backend/views/layouts/main-login.php
@@ -0,0 +1,29 @@
+<?php
+use backend\assets\AppAsset;
+use yii\helpers\Html;
+
+/* @var $this \yii\web\View */
+/* @var $content string */
+
+dmstr\web\AdminLteAsset::register($this);
+?>
+<?php $this->beginPage() ?>
+<!DOCTYPE html>
+<html lang="<?= Yii::$app->language ?>">
+<head>
+    <meta charset="<?= Yii::$app->charset ?>"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <?= Html::csrfMetaTags() ?>
+    <title><?= Html::encode($this->title) ?></title>
+    <?php $this->head() ?>
+</head>
+<body class="login-page">
+
+<?php $this->beginBody() ?>
+
+    <?= $content ?>
+
+<?php $this->endBody() ?>
+</body>
+</html>
+<?php $this->endPage() ?>
diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index b5af7e6..a0b545e 100644
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -1,76 +1,74 @@
 <?php
+use yii\helpers\Html;
 
 /* @var $this \yii\web\View */
 /* @var $content string */
 
-use backend\assets\AppAsset;
-use yii\helpers\Html;
-use yii\bootstrap\Nav;
-use yii\bootstrap\NavBar;
-use yii\widgets\Breadcrumbs;
-use common\widgets\Alert;
-use backend\components\AdminMenuStructure;
-use kartik\widgets\AlertBlock;
 
-AppAsset::register($this);
+if (Yii::$app->controller->action->id === 'login') { 
+/**
+ * Do not use this code in your template. Remove it. 
+ * Instead, use the code  $this->layout = '//main-login'; in your controller.
+ */
+    echo $this->render(
+        'main-login',
+        ['content' => $content]
+    );
+} else {
 
-$adminMenu = new AdminMenuStructure();
-$items = $adminMenu->run();
-?>
-<?php $this->beginPage() ?>
-<!DOCTYPE html>
-<html lang="<?= Yii::$app->language ?>">
-<head>
-    <meta charset="<?= Yii::$app->charset ?>">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <?= Html::csrfMetaTags() ?>
-    <title><?= Html::encode($this->title) ?></title>
-    <?php $this->head() ?>
-</head>
-<body>
-<?php $this->beginBody() ?>
+    if (class_exists('backend\assets\AppAsset')) {
+        backend\assets\AppAsset::register($this);
+    } else {
+        app\assets\AppAsset::register($this);
+    }
 
-<div class="wrap">
-    <?php
-    NavBar::begin([
-        'brandLabel' => 'Botond Fitness WebAdmin',
-        'brandUrl' => Yii::$app->homeUrl,
-        'options' => [
-            'class' => 'navbar-inverse navbar-fixed-top',
-        ],
-    ]);
-    echo Nav::widget([
-        'options' => ['class' => 'navbar-nav navbar-right'],
-        'items' => $items,
-    ]);
-    NavBar::end();
+    dmstr\web\AdminLteAsset::register($this);
+
+    $directoryAsset = Yii::$app->assetManager->getPublishedUrl('@vendor/almasaeed2010/adminlte/dist');
     ?>
+    <?php $this->beginPage() ?>
+    <!DOCTYPE html>
+    <html lang="<?= Yii::$app->language ?>">
+    <head>
+        <meta charset="<?= Yii::$app->charset ?>"/>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <?= Html::csrfMetaTags() ?>
+        <title><?= Html::encode($this->title) ?></title>
+        <?php $this->head() ?>
+        <style type="text/css">
+    	.content-header > .breadcrumb{
+    		position: static;
+    		top: auto;
+    		left: auto;
+    		right: auto;
+    		float: left;
+    	}
+    </style>
+    </head>
+    <body class="hold-transition skin-red sidebar-mini">
+    <?php $this->beginBody() ?>
+    <div class="wrapper">
 
-    <div class="container">
-        <?= Breadcrumbs::widget([
-            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-        ]) ?>
-        <?php //echo Alert::widget() ?>
-        <?php 
-        echo AlertBlock::widget([
-        		'useSessionFlash' => true,
-        		'type' => AlertBlock::TYPE_GROWL,
-        		'delay' => '1'
-        		]);
+        <?= $this->render(
+            'header.php',
+            ['directoryAsset' => $directoryAsset]
+        ) ?>
+
+        <?= $this->render(
+            'left.php',
+            ['directoryAsset' => $directoryAsset]
+        )
         ?>
-        <?= $content ?>
+
+        <?= $this->render(
+            'content.php',
+            ['content' => $content, 'directoryAsset' => $directoryAsset]
+        ) ?>
+
     </div>
-</div>
 
-<footer class="footer">
-    <div class="container">
-        <p class="pull-left">&copy;  <?= Yii::$app->name ?> <?= Yii::$app->params['version']  ?> Fitness - WebAdmin <?= date('Y') ?></p>
-
-        <p class="pull-right"><?= Yii::powered() ?></p>
-    </div>
-</footer>
-
-<?php $this->endBody() ?>
-</body>
-</html>
-<?php $this->endPage() ?>
+    <?php $this->endBody() ?>
+    </body>
+    </html>
+    <?php $this->endPage() ?>
+<?php } ?>
diff --git a/backend/views/site/error.php b/backend/views/site/error.php
index 0ba2574..fe51789 100644
--- a/backend/views/site/error.php
+++ b/backend/views/site/error.php
@@ -1,27 +1,45 @@
 <?php
 
+use yii\helpers\Html;
+
 /* @var $this yii\web\View */
 /* @var $name string */
 /* @var $message string */
 /* @var $exception Exception */
 
-use yii\helpers\Html;
-
 $this->title = $name;
 ?>
-<div class="site-error">
+<!-- Main content -->
+<section class="content">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <div class="error-page">
+        <h2 class="headline text-info"><i class="fa fa-warning text-yellow"></i></h2>
 
-    <div class="alert alert-danger">
-        <?= nl2br(Html::encode($message)) ?>
+        <div class="error-content">
+            <h3><?= $name ?></h3>
+
+            <p>
+                <?= nl2br(Html::encode($message)) ?>
+            </p>
+
+            <p>
+                The above error occurred while the Web server was processing your request.
+                Please contact us if you think this is a server error. Thank you.
+                Meanwhile, you may <a href='<?= Yii::$app->homeUrl ?>'>return to dashboard</a> or try using the search
+                form.
+            </p>
+
+            <form class='search-form'>
+                <div class='input-group'>
+                    <input type="text" name="search" class='form-control' placeholder="Search"/>
+
+                    <div class="input-group-btn">
+                        <button type="submit" name="submit" class="btn btn-primary"><i class="fa fa-search"></i>
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
     </div>
 
-    <p>
-        The above error occurred while the Web server was processing your request.
-    </p>
-    <p>
-        Please contact us if you think this is a server error. Thank you.
-    </p>
-
-</div>
+</section>
diff --git a/backend/views/site/index.php b/backend/views/site/index.php
index 8b029ca..d2d663c 100644
--- a/backend/views/site/index.php
+++ b/backend/views/site/index.php
@@ -2,16 +2,11 @@
 
 /* @var $this yii\web\View */
 
-$this->title = 'My Yii Application';
+$this->title =   Yii::$app->name;
 ?>
 <div class="site-index">
-
     <div class="jumbotron">
         <h1>Web Admin</h1>
-
         <p class="lead">Üdvözöljük adminisztrációs felületünkön</p>
-
     </div>
-
-
 </div>
diff --git a/backend/views/site/login.php b/backend/views/site/login.php
index 29bffcd..cc236dc 100644
--- a/backend/views/site/login.php
+++ b/backend/views/site/login.php
@@ -1,35 +1,59 @@
 <?php
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model \common\models\LoginForm */
 
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
+$this->title = 'Bejelentkezés';
 
-$this->title =   Yii::t('common/site' , 'Login');
-$this->params['breadcrumbs'][] = $this->title;
+$fieldOptions1 = [
+    'options' => ['class' => 'form-group has-feedback'],
+    'inputTemplate' => "{input}<span class='glyphicon glyphicon-envelope form-control-feedback'></span>"
+];
+
+$fieldOptions2 = [
+    'options' => ['class' => 'form-group has-feedback'],
+    'inputTemplate' => "{input}<span class='glyphicon glyphicon-lock form-control-feedback'></span>"
+];
 ?>
-<div class="site-login">
-    <h1><?= Html::encode($this->title) ?></h1>
 
-    <p><?php echo Yii::t('common/site' , 'Please fill out the following fields to login:') ?> </p>
-
-    <div class="row">
-        <div class="col-lg-5">
-            <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
-
-                <?= $form->field($model, 'username') ?>
-
-                <?= $form->field($model, 'password')->passwordInput() ?>
-
-                <?= $form->field($model, 'rememberMe')->checkbox() ?>
-
-                <div class="form-group">
-                    <?= Html::submitButton( Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
-                </div>
-
-            <?php ActiveForm::end(); ?>
-        </div>
+<div class="login-box">
+    <div class="login-logo">
+        <a href="#"><b>Fitness</b>Adminisztráció</a>
     </div>
-</div>
+    <!-- /.login-logo -->
+    <div class="login-box-body">
+        <p class="login-box-msg">Kérem jelentkezzen be</p>
+
+        <?php $form = ActiveForm::begin(['id' => 'login-form', 'enableClientValidation' => false]); ?>
+
+        <?= $form
+            ->field($model, 'username', $fieldOptions1)
+            ->label(false)
+            ->textInput(['placeholder' => $model->getAttributeLabel('username')]) ?>
+
+        <?= $form
+            ->field($model, 'password', $fieldOptions2)
+            ->label(false)
+            ->passwordInput(['placeholder' => $model->getAttributeLabel('password')]) ?>
+
+        <div class="row">
+            <div class="col-xs-6">
+                <?= $form->field($model, 'rememberMe')->checkbox() ?>
+            </div>
+            <!-- /.col -->
+            <div class="col-xs-6">
+                <?= Html::submitButton('Bejelentkezés', ['class' => 'btn btn-primary btn-block btn-flat', 'name' => 'login-button']) ?>
+            </div>
+            <!-- /.col -->
+        </div>
+
+
+        <?php ActiveForm::end(); ?>
+
+
+    </div>
+    <!-- /.login-box-body -->
+</div><!-- /.login-box -->
diff --git a/backend/views/site_orig/error.php b/backend/views/site_orig/error.php
new file mode 100644
index 0000000..0ba2574
--- /dev/null
+++ b/backend/views/site_orig/error.php
@@ -0,0 +1,27 @@
+<?php
+
+/* @var $this yii\web\View */
+/* @var $name string */
+/* @var $message string */
+/* @var $exception Exception */
+
+use yii\helpers\Html;
+
+$this->title = $name;
+?>
+<div class="site-error">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <div class="alert alert-danger">
+        <?= nl2br(Html::encode($message)) ?>
+    </div>
+
+    <p>
+        The above error occurred while the Web server was processing your request.
+    </p>
+    <p>
+        Please contact us if you think this is a server error. Thank you.
+    </p>
+
+</div>
diff --git a/backend/views/site_orig/index.php b/backend/views/site_orig/index.php
new file mode 100644
index 0000000..47f3b2a
--- /dev/null
+++ b/backend/views/site_orig/index.php
@@ -0,0 +1,17 @@
+<?php
+
+/* @var $this yii\web\View */
+
+$this->title =  Yii::$app->name;
+?>
+<div class="site-index">
+
+    <div class="jumbotron">
+        <h1>Web Admin</h1>
+
+        <p class="lead">Üdvözöljük adminisztrációs felületünkön</p>
+
+    </div>
+
+
+</div>
diff --git a/backend/views/site_orig/login.php b/backend/views/site_orig/login.php
new file mode 100644
index 0000000..29bffcd
--- /dev/null
+++ b/backend/views/site_orig/login.php
@@ -0,0 +1,35 @@
+<?php
+
+/* @var $this yii\web\View */
+/* @var $form yii\bootstrap\ActiveForm */
+/* @var $model \common\models\LoginForm */
+
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+
+$this->title =   Yii::t('common/site' , 'Login');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="site-login">
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p><?php echo Yii::t('common/site' , 'Please fill out the following fields to login:') ?> </p>
+
+    <div class="row">
+        <div class="col-lg-5">
+            <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
+
+                <?= $form->field($model, 'username') ?>
+
+                <?= $form->field($model, 'password')->passwordInput() ?>
+
+                <?= $form->field($model, 'rememberMe')->checkbox() ?>
+
+                <div class="form-group">
+                    <?= Html::submitButton( Yii::t('common/site' ,'Login'), ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+                </div>
+
+            <?php ActiveForm::end(); ?>
+        </div>
+    </div>
+</div>
diff --git a/backend/views/user/role.php b/backend/views/user/role.php
new file mode 100644
index 0000000..d12ae6b
--- /dev/null
+++ b/backend/views/user/role.php
@@ -0,0 +1,72 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use yii\grid\GridView;
+use yii\data\ArrayDataProvider;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\User */
+
+$this->title = Yii::t('app', 'Jogosultság szerkesztő');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Felhasználók'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<?php 
+	
+	$availablePermissions = $model->availablePermissions ;
+
+	$permissions = $model->permissions;
+	
+?>
+<div class="user-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+
+	<div class="user-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+    
+    	
+    	
+    	<h3>Engedélyezett jogosultságok</h3>
+	<?php echo GridView::widget([
+			'dataProvider' => new ArrayDataProvider( [
+	      	'allModels' => $availablePermissions,
+	      	'sort' => false,
+	      	'pagination' => false,
+  		]),
+			'columns' => [
+					[
+			          'class' => 'yii\grid\CheckboxColumn',
+					  'name' =>  (new ReflectionClass( $model->classname() ))->getShortName()  . '[permissions]',
+					  'checkboxOptions' => function ($model, $key, $index, $column)  use ($permissions){
+						    $result = [];
+							$result['value'] =  $model['name']   ;
+							
+							if ( isset($permissions) ){
+								if ( is_array($permissions) ){
+								    if ( array_search($model['name'] , $permissions ) !== false){
+								    	$result['checked'] = 'checked'  ;
+									}
+								}
+							}
+							
+					     	return $result;
+					 }
+			      ],
+					[ 'attribute' => 'description' ],
+				],
+	])?>
+
+      <div class="form-group">
+        <?= Html::submitButton(  Yii::t('app', 'Mentés'), ['class' =>  'btn btn-primary' ,'name' => 'RoleForm[save]']) ?>
+    	</div>
+    <?php ActiveForm::end(); ?>
+    </div>
+    
+
+</div>
diff --git a/common/models/Account.php b/common/models/Account.php
index e778f8c..a51e780 100644
--- a/common/models/Account.php
+++ b/common/models/Account.php
@@ -95,8 +95,8 @@ class Account extends \yii\db\ActiveRecord
     
     static function types() {
     	return [
-    			self::TYPE_ALL => Yii::t('common/account', 'Visible for all'),
-    			self::TYPE_VALUE_HIDDEN => Yii::t('common/account', 'Only the name is visible'),
+    			self::TYPE_ALL => Yii::t('common/account', 'Account'),
+//     			self::TYPE_VALUE_HIDDEN => Yii::t('common/account', 'Only the name is visible'),
     	];
     }
     
diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php
index 6dffc8b..d83907b 100644
--- a/common/models/LoginForm.php
+++ b/common/models/LoginForm.php
@@ -14,6 +14,8 @@ class LoginForm extends Model
     public $rememberMe = true;
 
     private $_user;
+    
+    public $roles = null ;
 
 
     /**
@@ -80,7 +82,21 @@ class LoginForm extends Model
         if ($this->_user === null) {
             $this->_user = User::findByUsername($this->username);
         }
-
+        
+        if ( $this->_user != null ){
+        	if ( $this->roles != null ){
+		        $canLogin = false;
+        		foreach ($this->roles as $role){
+        			$canLogin = $canLogin || Yii::$app->authManager->checkAccess($this->_user->id, $role);
+        		}
+        		
+        		if ( !$canLogin ){
+        			\Yii::info("user ".$this->_user->username." has no permission to login to administration area!");
+        			$this->_user = null;
+        		}
+        	}
+        }
+        
         return $this->_user;
     }
 }
diff --git a/common/models/User.php b/common/models/User.php
index 7da2036..d61b17f 100644
--- a/common/models/User.php
+++ b/common/models/User.php
@@ -26,6 +26,8 @@ class User extends ActiveRecord implements IdentityInterface
 {
     const STATUS_DELETED = 0;
     const STATUS_ACTIVE = 10;
+    
+    const ROLE_RECEPTION = 'receptionist';
 
     /**
      * @inheritdoc
diff --git a/composer.json b/composer.json
index 48af075..3f207c2 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
         "bower-asset/remarkable-bootstrap-notify": "^3.1",
         "yiisoft/yii2-jui": "^2.0",
         "bower-asset/moment": "^2.10",
-        "bower-asset/accounting": "^0.3.2"
+        "bower-asset/accounting": "^0.3.2",
+        "dmstr/yii2-adminlte-asset": "2.*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index aaa7637..ef0da64 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,49 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "eae88fa0f2daec7b60e8779c8881f167",
-    "content-hash": "246d974f7a8d14e65a24bb4d5af20079",
+    "hash": "48dcd434e58d6b2167477f208c700dc3",
+    "content-hash": "2678695117e871d59f193589465751cf",
     "packages": [
+        {
+            "name": "almasaeed2010/adminlte",
+            "version": "v2.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/almasaeed2010/AdminLTE.git",
+                "reference": "1ee281b3b99e8d8cccdc72fb8437c6888149cb46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/almasaeed2010/AdminLTE/zipball/1ee281b3b99e8d8cccdc72fb8437c6888149cb46",
+                "reference": "1ee281b3b99e8d8cccdc72fb8437c6888149cb46",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Abdullah Almsaeed",
+                    "email": "support@almsaeedstudio.com"
+                }
+            ],
+            "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3",
+            "homepage": "http://almsaeedstudio.com/",
+            "keywords": [
+                "JS",
+                "admin",
+                "back-end",
+                "css",
+                "less",
+                "responsive",
+                "template",
+                "theme",
+                "web"
+            ],
+            "time": "2015-10-23 14:50:49"
+        },
         {
             "name": "bower-asset/accounting",
             "version": "v0.3.2",
@@ -72,6 +112,43 @@
                 "web"
             ]
         },
+        {
+            "name": "bower-asset/fontawesome",
+            "version": "v4.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FortAwesome/Font-Awesome.git",
+                "reference": "e554555d73a44e0a7d11b0361ad7a5325a5f551c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/e554555d73a44e0a7d11b0361ad7a5325a5f551c",
+                "reference": "e554555d73a44e0a7d11b0361ad7a5325a5f551c",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "less/font-awesome.less",
+                    "scss/font-awesome.scss"
+                ],
+                "bower-asset-ignore": [
+                    "*/.*",
+                    "*.json",
+                    "src",
+                    "*.yml",
+                    "Gemfile",
+                    "Gemfile.lock",
+                    "*.md"
+                ]
+            },
+            "license": [
+                "OFL-1.1",
+                "MIT",
+                "CC-BY-3.0"
+            ],
+            "description": "Font Awesome"
+        },
         {
             "name": "bower-asset/jquery",
             "version": "2.1.4",
@@ -390,6 +467,103 @@
             ],
             "time": "2015-03-06 05:28:07"
         },
+        {
+            "name": "cebe/yii2-gravatar",
+            "version": "1.1",
+            "target-dir": "cebe/gravatar",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cebe/yii2-gravatar.git",
+                "reference": "c9c01bd14c9bdee9e5ae1ef1aad23f80c182c057"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cebe/yii2-gravatar/zipball/c9c01bd14c9bdee9e5ae1ef1aad23f80c182c057",
+                "reference": "c9c01bd14c9bdee9e5ae1ef1aad23f80c182c057",
+                "shasum": ""
+            },
+            "require": {
+                "yiisoft/yii2": "*"
+            },
+            "type": "yii2-extension",
+            "autoload": {
+                "psr-0": {
+                    "cebe\\gravatar\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Carsten Brandt",
+                    "email": "mail@cebe.cc",
+                    "homepage": "http://cebe.cc/",
+                    "role": "Core framework development"
+                }
+            ],
+            "description": "Gravatar Widget for Yii 2",
+            "keywords": [
+                "gravatar",
+                "yii"
+            ],
+            "time": "2013-12-10 17:49:58"
+        },
+        {
+            "name": "dmstr/yii2-adminlte-asset",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dmstr/yii2-adminlte-asset.git",
+                "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/c842a15ceef4e903f70ac927ec3246e6d53e1148",
+                "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148",
+                "shasum": ""
+            },
+            "require": {
+                "almasaeed2010/adminlte": "~2.0",
+                "cebe/yii2-gravatar": "1.*",
+                "rmrevin/yii2-fontawesome": "~2.9",
+                "yiisoft/yii2": "2.*",
+                "yiisoft/yii2-bootstrap": "2.*"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "dmstr\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Tobias Munk",
+                    "email": "tobias@diemeisterei.de"
+                },
+                {
+                    "name": "Evgeniy Tkachenko",
+                    "email": "et.coder@gmail.com"
+                }
+            ],
+            "description": "Backend theme for Yii2 Framework",
+            "keywords": [
+                "AdminLTE",
+                "extension",
+                "yii2"
+            ],
+            "time": "2015-11-06 10:35:36"
+        },
         {
             "name": "ezyang/htmlpurifier",
             "version": "v4.6.0",
@@ -1556,6 +1730,58 @@
             ],
             "time": "2014-11-09 19:54:17"
         },
+        {
+            "name": "rmrevin/yii2-fontawesome",
+            "version": "2.12.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rmrevin/yii2-fontawesome.git",
+                "reference": "62308687477734c166753de0ad9e2333dc7dce32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/62308687477734c166753de0ad9e2333dc7dce32",
+                "reference": "62308687477734c166753de0ad9e2333dc7dce32",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/fontawesome": "4.4.*",
+                "php": ">=5.4.0",
+                "yiisoft/yii2": "2.0.*"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "asset-installer-paths": {
+                    "npm-asset-library": "vendor/npm",
+                    "bower-asset-library": "vendor/bower"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "rmrevin\\yii\\fontawesome\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Revin Roman",
+                    "email": "roman@rmrevin.com",
+                    "homepage": "https://rmrevin.com/"
+                }
+            ],
+            "description": "Asset Bundle for Yii2 with Font Awesome",
+            "keywords": [
+                "asset",
+                "awesome",
+                "bundle",
+                "font",
+                "yii"
+            ],
+            "time": "2015-11-20 09:17:45"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.1",
diff --git a/console/migrations/m151123_172500_add_permission_reception_transfers.php b/console/migrations/m151123_172500_add_permission_reception_transfers.php
new file mode 100644
index 0000000..16af5ea
--- /dev/null
+++ b/console/migrations/m151123_172500_add_permission_reception_transfers.php
@@ -0,0 +1,29 @@
+<?php
+
+use yii\db\Migration;
+
+class m151123_172500_add_permission_reception_transfers extends Migration
+{
+    public function up()
+    {
+		$am = Yii::$app->authManager;
+		$permission = $am->createPermission("reception.transfers");
+		$permission->description = "Recepció.Tranzakciók";
+		$am->add($permission);
+    }
+
+    public function down()
+    {
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/components/FrontendMenuStructure.php b/frontend/components/FrontendMenuStructure.php
index f21d05e..78e2f4b 100644
--- a/frontend/components/FrontendMenuStructure.php
+++ b/frontend/components/FrontendMenuStructure.php
@@ -56,17 +56,31 @@ class FrontendMenuStructure{
 	
 	protected function addRecepcio(){
 		if ( $this->isLogged() ){
+			
+		$isadmin =Yii::$app->user->can('admin') ||Yii::$app->user->can('employee');
+			
 			$this->menuItems[]  = ['label' => Yii::t('frontend/customer','Reception'), 'url' => ['/customer/reception'] ];
-			$this->menuItems[]  = ['label' => Yii::t('frontend/account', 'Account'),   
-					'items' => [
+			
+			$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' =>  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' =>  Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ]
-					]
+					];
+			
+			if ( $isadmin ||  Yii::$app->user->can('reception.transfers') ){
+				$items[] = ['label' =>  Yii::t('frontend/transfer','Transfers'), 'url' => ['/transfer/index',  'TransferSearch[start]' => $this->start, 'TransferSearch[end]' => $this->tomorrow ] ];
+			}
+				
+				$items[] = ['label' =>  Yii::t('frontend/collection','Collections'), 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$this->start,'CollectionSearch[end]' => $this->tomorrow ] ];
+			
+			$this->menuItems[]  = ['label' => Yii::t('frontend/account', 'Account'),   
+					'items' => $items
+					
+						
+						 	
+							
 			];
 		}
 	}

From 4e82c8ce7130419f7bd253397be41a4fd82bd162 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Mon, 23 Nov 2015 19:59:58 +0100
Subject: [PATCH 083/100] add changelog

---
 changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 746add5..920719a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+-0.0.4
+	új admin theme : admin lte
+	recepció/tranzakciók menü ki/bekapcsolható
 -0.0.3
 	admin oldal bérlet statisztika
 	admin oldal módosított menü

From 40509961cdf571a91920fd3286d5d58deac562be Mon Sep 17 00:00:00 2001
From: rocho <rocho02@gmail.com>
Date: Fri, 27 Nov 2015 15:27:46 +0100
Subject: [PATCH 084/100] add UploadController 'rest' controller

---
 .gitignore                               |  3 ++
 backend/controllers/SiteController.php   | 11 ++++--
 backend/controllers/UploadController.php | 46 ++++++++++++++++++++++++
 backend/models/UploadForm.php            | 24 +++++++++++++
 backend/views/layouts/header.php         |  6 +++-
 backend/views/site/upload.php            | 24 +++++++++++++
 frontend/web/profile/.gitkeep            |  0
 7 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 backend/controllers/UploadController.php
 create mode 100644 backend/models/UploadForm.php
 create mode 100644 backend/views/site/upload.php
 create mode 100644 frontend/web/profile/.gitkeep

diff --git a/.gitignore b/.gitignore
index e587688..9b126c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ phpunit.phar
 /phpunit.xml
 
 /node_modules
+
+/frontend/web/profile/**
+!/frontend/web/profile/.gitkeep
\ No newline at end of file
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index 73bd4ec..a72bc07 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -6,6 +6,7 @@ use yii\filters\AccessControl;
 use yii\web\Controller;
 use common\models\LoginForm;
 use yii\filters\VerbFilter;
+use backend\models\UploadForm;
 
 /**
  * Site controller
@@ -22,7 +23,7 @@ class SiteController extends Controller
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error'],
+                        'actions' => ['login', 'error','upload-image'],
                         'allow' => true,
                     ],
                     [
@@ -55,7 +56,6 @@ class SiteController extends Controller
 
     public function actionIndex()
     {
-    	Yii::$app->security->generatePasswordHash('test');
         return $this->render('index');
     }
 
@@ -85,4 +85,11 @@ class SiteController extends Controller
 
         return $this->goHome();
     }
+    
+    public function actionUploadImage(){
+    	\yii::$app->request->enableCsrfValidation = false;
+    	$model = new UploadForm();
+    	
+    	return $this->render('upload', ['model' =>$model]);
+    }
 }
diff --git a/backend/controllers/UploadController.php b/backend/controllers/UploadController.php
new file mode 100644
index 0000000..b043596
--- /dev/null
+++ b/backend/controllers/UploadController.php
@@ -0,0 +1,46 @@
+<?php
+namespace backend\controllers;
+
+use yii\rest\ActiveController;
+use yii\rest\Controller;
+
+class UploadController extends  Controller
+{
+
+	
+	
+
+//     public function verbs()
+//     {
+//         $verbs = [];
+//         $verbs[ "upload" ] = ['POST' ];
+//         return $verbs;
+//     }
+
+    public function actionUpload()
+    {
+        $postdata = fopen( $_FILES[ 'data' ][ 'tmp_name' ], "r" );
+//         /* Get file extension */
+        $extension = substr( $_FILES[ 'data' ][ 'name' ], strrpos( $_FILES[ 'data' ][ 'name' ], '.' ) );
+
+//         /* Generate unique name */
+        $filename =  \Yii::getAlias('@frontend') ."/web/profile/" . uniqid() . $extension;
+        echo $filename;
+
+//         /* Open a file for writing */
+        $fp = fopen( $filename, "w" );
+
+        /* Read the data 1 KB at a time
+          and write to the file */
+        while( $data = fread( $postdata, 1024 ) )
+            fwrite( $fp, $data );
+
+        /* Close the streams */
+        fclose( $fp );
+        fclose( $postdata );
+
+		/* the result object that is sent to client*/
+
+		echo "ok"; 
+    }
+}
\ No newline at end of file
diff --git a/backend/models/UploadForm.php b/backend/models/UploadForm.php
new file mode 100644
index 0000000..a98d27f
--- /dev/null
+++ b/backend/models/UploadForm.php
@@ -0,0 +1,24 @@
+<?php
+namespace backend\models;
+
+use yii\base\Model;
+use common\models\User;
+
+class UploadForm extends Model{
+	
+	
+	public $image ;
+	/**
+	 * @inheritdoc
+	 * @formatter:off
+	 */
+	public function rules()
+	{
+		return [['image',function ($attribute, $params) {}],	];
+	}
+	
+	public function save(){
+		return true;
+	}
+	
+}
\ No newline at end of file
diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php
index 969b2c3..6360048 100644
--- a/backend/views/layouts/header.php
+++ b/backend/views/layouts/header.php
@@ -21,10 +21,11 @@ use yii\helpers\Html;
 
         <div class="navbar-custom-menu">
 
+        	<?php if (  !Yii::$app->user->isGuest  ){?>
             <ul class="nav navbar-nav">
 
                 <!-- User Account: style can be found in dropdown.less -->
-
+				
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                     	<span class='glyphicon glyphicon-user'></span>
@@ -63,6 +64,9 @@ use yii\helpers\Html;
                     <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
                 </li>
                 -->
+              	<?php 
+                }
+                ?>
             </ul>
         </div>
     </nav>
diff --git a/backend/views/site/upload.php b/backend/views/site/upload.php
new file mode 100644
index 0000000..57e9f0a
--- /dev/null
+++ b/backend/views/site/upload.php
@@ -0,0 +1,24 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use backend\models\UploadForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Ticket */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="ticket-form">
+
+     <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
+    
+    
+     <div class="form-group">
+        <?= Html::submitButton(  Yii::t('common/ticket', 'Create') ,['class' =>  'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+    
\ No newline at end of file
diff --git a/frontend/web/profile/.gitkeep b/frontend/web/profile/.gitkeep
new file mode 100644
index 0000000..e69de29

From ed80f8720dd83a834cb471bb2805e73d2bdda66f Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 08:28:09 +0100
Subject: [PATCH 085/100] add Image and Upload helper classes

---
 .gitignore                                    |   3 +-
 backend/controllers/UploadController.php      |  51 +++---
 backend/models/UploadForm.php                 |  25 ++-
 backend/views/site/upload.php                 |   1 +
 common/components/GD.php                      | 164 ++++++++++++++++++
 common/components/Image.php                   |  99 +++++++++++
 common/components/Upload.php                  |  50 ++++++
 common/models/Image.php                       |  60 +++++++
 .../m151127_152631_add__table__image.php      |  43 +++++
 ...table__customer__add__column__id_image.php |  30 ++++
 10 files changed, 501 insertions(+), 25 deletions(-)
 create mode 100644 common/components/GD.php
 create mode 100644 common/components/Image.php
 create mode 100644 common/components/Upload.php
 create mode 100644 common/models/Image.php
 create mode 100644 console/migrations/m151127_152631_add__table__image.php
 create mode 100644 console/migrations/m151127_214503_alter__table__customer__add__column__id_image.php

diff --git a/.gitignore b/.gitignore
index 9b126c3..1d62e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,5 @@ phpunit.phar
 /node_modules
 
 /frontend/web/profile/**
-!/frontend/web/profile/.gitkeep
\ No newline at end of file
+!/frontend/web/profile/.gitkeep
+/frontend/web/uploads/**
\ No newline at end of file
diff --git a/backend/controllers/UploadController.php b/backend/controllers/UploadController.php
index b043596..bd75a0e 100644
--- a/backend/controllers/UploadController.php
+++ b/backend/controllers/UploadController.php
@@ -1,8 +1,11 @@
 <?php
 namespace backend\controllers;
 
-use yii\rest\ActiveController;
 use yii\rest\Controller;
+use common\models\Image;
+use backend\models\UploadForm;
+use yii\web\UploadedFile;
+USE Yii;
 
 class UploadController extends  Controller
 {
@@ -19,28 +22,30 @@ class UploadController extends  Controller
 
     public function actionUpload()
     {
-        $postdata = fopen( $_FILES[ 'data' ][ 'tmp_name' ], "r" );
-//         /* Get file extension */
-        $extension = substr( $_FILES[ 'data' ][ 'name' ], strrpos( $_FILES[ 'data' ][ 'name' ], '.' ) );
+    	$model = new UploadForm();
+    	$resp = [];
+    	
+    	if ( $model->load(Yii::$app->request->post()) && $model->validate()) {
+    		
+    		
+    		$model->image =  UploadedFile::getInstance($model, 'image');
+    		
+    		/**save into frontend/web/uploads/profile*/
+    		$path = \common\components\Image::upload($model->image,'profile');
+	
+	        $image = new Image();
+	        $image->path = $path;
+	        $image->save();
+        
+			/* the result object that is sent to client*/
 
-//         /* Generate unique name */
-        $filename =  \Yii::getAlias('@frontend') ."/web/profile/" . uniqid() . $extension;
-        echo $filename;
-
-//         /* Open a file for writing */
-        $fp = fopen( $filename, "w" );
-
-        /* Read the data 1 KB at a time
-          and write to the file */
-        while( $data = fread( $postdata, 1024 ) )
-            fwrite( $fp, $data );
-
-        /* Close the streams */
-        fclose( $fp );
-        fclose( $postdata );
-
-		/* the result object that is sent to client*/
-
-		echo "ok"; 
+			$resp['ok'] = 1;
+			$resp['id_image'] = $image->id_image;
+    	}else{
+			$resp['ok'] = 0;
+    		$resp['message'] = print_r($model->errors,true);
+    	}
+    	
+    	return $resp;
     }
 }
\ No newline at end of file
diff --git a/backend/models/UploadForm.php b/backend/models/UploadForm.php
index a98d27f..38a9090 100644
--- a/backend/models/UploadForm.php
+++ b/backend/models/UploadForm.php
@@ -3,22 +3,45 @@ namespace backend\models;
 
 use yii\base\Model;
 use common\models\User;
+use common\models\Image;
 
 class UploadForm extends Model{
 	
 	
+	const SECRET= "aN6obLS2wMFzXw2VQBar";
+	
 	public $image ;
+	public $secret;
+	
 	/**
 	 * @inheritdoc
 	 * @formatter:off
 	 */
 	public function rules()
 	{
-		return [['image',function ($attribute, $params) {}],	];
+		return [ 
+				
+				[['image'], 'image', 'mimeTypes' => 'image/jpeg, image/png', 'extensions'=>'jpg, png'],
+				[['image'], 'required',],
+				[['secret'], 'required'],
+				[['secret'], 'validSecret'],
+				
+		];
 	}
 	
+	public function validSecret(){
+		if ( $this->secret != self::SECRET ){
+			$this->addError("secret","Invalid secret");
+		}
+	}
+
+	
 	public function save(){
+		
+		$image = new Image();
+		
 		return true;
 	}
+
 	
 }
\ No newline at end of file
diff --git a/backend/views/site/upload.php b/backend/views/site/upload.php
index 57e9f0a..5006035 100644
--- a/backend/views/site/upload.php
+++ b/backend/views/site/upload.php
@@ -13,6 +13,7 @@ use backend\models\UploadForm;
 
      <?php $form = ActiveForm::begin(['options' => ['enctype' => 'multipart/form-data']]); ?>
     
+    <?php  echo $form->field($model, "image")->fileInput()?>
     
      <div class="form-group">
         <?= Html::submitButton(  Yii::t('common/ticket', 'Create') ,['class' =>  'btn btn-primary']) ?>
diff --git a/common/components/GD.php b/common/components/GD.php
new file mode 100644
index 0000000..9bafe16
--- /dev/null
+++ b/common/components/GD.php
@@ -0,0 +1,164 @@
+<?php
+namespace common\components;
+
+class GD
+{
+    private $_image;
+    private $_mime;
+    private $_width;
+    private $_height;
+
+    public function __construct($file)
+    {
+        if (file_exists($file)) {
+            $imageData = getimagesize($file);
+            $this->_mime = image_type_to_mime_type($imageData[2]);
+            $this->_width = $imageData[0];
+            $this->_height = $imageData[1];
+
+            switch ($this->_mime) {
+                case 'image/jpeg':
+                    $this->_image = imagecreatefromjpeg($file);
+                    break;
+                case 'image/png':
+                    $this->_image = imagecreatefrompng($file);
+                    break;
+                case 'image/gif':
+                    $this->_image = imagecreatefromgif($file);
+                    break;
+            }
+        }
+    }
+
+    public function resize($width = null, $height = null)
+    {
+        if(!$this->_image || (!$width && !$height)){
+            return false;
+        }
+
+        if(!$width)
+        {
+            if ($this->_height > $height) {
+                $ratio = $this->_height / $height;
+                $newWidth = round($this->_width / $ratio);
+                $newHeight = $height;
+            } else {
+                $newWidth = $this->_width;
+                $newHeight = $this->_height;
+            }
+        }
+        elseif(!$height)
+        {
+            if ($this->_width > $width) {
+                $ratio = $this->_width / $width;
+                $newWidth = $width;
+                $newHeight = round($this->_height / $ratio);
+            } else {
+                $newWidth = $this->_width;
+                $newHeight = $this->_height;
+            }
+        }
+        else
+        {
+            $newWidth = $width;
+            $newHeight = $height;
+        }
+
+        $resizedImage = imagecreatetruecolor($newWidth, $newHeight);
+        imagealphablending($resizedImage, false);
+
+        imagecopyresampled(
+            $resizedImage,
+            $this->_image,
+            0,
+            0,
+            0,
+            0,
+            $newWidth,
+            $newHeight,
+            $this->_width,
+            $this->_height
+        );
+
+        $this->_image = $resizedImage;
+    }
+
+    public function cropThumbnail($width, $height)
+    {
+        if(!$this->_image || !$width || !$height){
+            return false;
+        }
+
+        $sourceRatio = $this->_width / $this->_height;
+        $thumbRatio = $width / $height;
+
+        $newWidth = $this->_width;
+        $newHeight = $this->_height;
+
+        if($sourceRatio !== $thumbRatio)
+        {
+            if($this->_width >= $this->_height){
+                if($thumbRatio > 1){
+                    $newHeight = $this->_width / $thumbRatio;
+                    if($newHeight > $this->_height){
+                        $newWidth = $this->_height * $thumbRatio;
+                        $newHeight = $this->_height;
+                    }
+                } elseif($thumbRatio == 1) {
+                    $newWidth = $this->_height;
+                    $newHeight = $this->_height;
+                } else {
+                    $newWidth = $this->_height * $thumbRatio;
+                }
+            } else {
+                if($thumbRatio > 1){
+                    $newHeight = $this->_width / $thumbRatio;
+                } elseif($thumbRatio == 1) {
+                    $newWidth = $this->_width;
+                    $newHeight = $this->_width;
+                } else {
+                    $newHeight = $this->_width / $thumbRatio;
+                    if($newHeight > $this->_height){
+                        $newHeight = $this->_height;
+                        $newWidth = $this->_height * $thumbRatio;
+                    }
+                }
+            }
+        }
+
+        $resizedImage = imagecreatetruecolor($width, $height);
+        imagealphablending($resizedImage, false);
+
+        imagecopyresampled(
+            $resizedImage,
+            $this->_image,
+            0,
+            0,
+            round(($this->_width - $newWidth) / 2),
+            round(($this->_height - $newHeight) / 2),
+            $width,
+            $height,
+            $newWidth,
+            $newHeight
+        );
+
+        $this->_image = $resizedImage;
+    }
+
+    public function save($file, $quality = 90)
+    {
+        switch($this->_mime) {
+            case 'image/jpeg':
+                return imagejpeg($this->_image, $file, $quality);
+                break;
+            case 'image/png':
+                imagesavealpha($this->_image, true);
+                return imagepng($this->_image, $file);
+                break;
+            case 'image/gif':
+                return imagegif($this->_image, $file);
+                break;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/common/components/Image.php b/common/components/Image.php
new file mode 100644
index 0000000..cb333ca
--- /dev/null
+++ b/common/components/Image.php
@@ -0,0 +1,99 @@
+<?php
+namespace common\components;
+
+use Yii;
+use yii\web\UploadedFile;
+use yii\web\HttpException;
+use yii\helpers\FileHelper;
+use common\components\GD;
+
+class Image
+{
+	
+	/**
+	 * @param UploadedFile $fileInstance
+	 * @param string $dir relative dir from upload dir
+	 * @param unknown $resizeWidth
+	 * @param unknown $resizeHeight
+	 * @param bool $resizeCrop
+	 * @throws HttpException*/
+    public static function upload(UploadedFile $fileInstance, $dir = '', $resizeWidth = null, $resizeHeight = null, $resizeCrop = false)
+    {
+        $fileName = Upload::getUploadPath($dir) . DIRECTORY_SEPARATOR . Upload::getFileName($fileInstance);
+
+        $uploaded = $resizeWidth
+            ? self::copyResizedImage($fileInstance->tempName, $fileName, $resizeWidth, $resizeHeight, $resizeCrop)
+            : $fileInstance->saveAs($fileName);
+
+        if(!$uploaded){
+            throw new HttpException(500, 'Cannot upload file "'.$fileName.'". Please check write permissions.');
+        }
+
+        return Upload::getLink($fileName);
+    }
+
+    /**
+     * 
+     * @param unknown $filename
+     * @param unknown $width
+     * @param unknown $height
+     * @param string $crop
+     * @return string
+     */
+    static function thumb($filename, $width = null, $height = null, $crop = true)
+    {
+        if($filename && file_exists(($filename = Yii::getAlias('@frontend/web') . $filename)))
+        {
+            $info = pathinfo($filename);
+            $thumbName = $info['filename'] . '-' . md5( filemtime($filename) . (int)$width . (int)$height . (int)$crop ) . '.' . $info['extension'];
+            $thumbFile = Yii::getAlias('@frontend/web') . DIRECTORY_SEPARATOR . Upload::$UPLOADS_DIR . DIRECTORY_SEPARATOR . 'thumbs' . DIRECTORY_SEPARATOR . $thumbName;
+            $thumbWebFile = '/' . Upload::$UPLOADS_DIR . '/thumbs/' . $thumbName;
+            if(file_exists($thumbFile)){
+                return $thumbWebFile;
+            }
+            elseif(FileHelper::createDirectory(dirname($thumbFile), 0777) && self::copyResizedImage($filename, $thumbFile, $width, $height, $crop)){
+                return $thumbWebFile;
+            }
+        }
+        return '';
+    }
+
+    static function copyResizedImage($inputFile, $outputFile, $width, $height = null, $crop = true)
+    {
+        if (extension_loaded('gd'))
+        {
+            $image = new GD($inputFile);
+
+            if($height) {
+                if($width && $crop){
+                    $image->cropThumbnail($width, $height);
+                } else {
+                    $image->resize($width, $height);
+                }
+            } else {
+                $image->resize($width);
+            }
+            return $image->save($outputFile);
+        }
+        elseif(extension_loaded('imagick'))
+        {
+            $image = new \Imagick($inputFile);
+
+            if($height && !$crop) {
+                $image->resizeImage($width, $height, \Imagick::FILTER_LANCZOS, 1, true);
+            }
+            else{
+                $image->resizeImage($width, null, \Imagick::FILTER_LANCZOS, 1);
+            }
+
+            if($height && $crop){
+                $image->cropThumbnailImage($width, $height);
+            }
+
+            return $image->writeImage($outputFile);
+        }
+        else {
+            throw new HttpException(500, 'Please install GD or Imagick extension');
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/components/Upload.php b/common/components/Upload.php
new file mode 100644
index 0000000..fd51eba
--- /dev/null
+++ b/common/components/Upload.php
@@ -0,0 +1,50 @@
+<?php
+namespace common\components;
+
+use Yii;
+use yii\web\UploadedFile;
+use \yii\web\HttpException;
+use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
+use yii\helpers\FileHelper;
+
+class Upload
+{
+    public static $UPLOADS_DIR = 'uploads';
+
+    public static function file(UploadedFile $fileInstance, $dir = '', $namePostfix = true)
+    {
+        $fileName = Upload::getUploadPath($dir) . DIRECTORY_SEPARATOR . Upload::getFileName($fileInstance, $namePostfix);
+
+        if(!$fileInstance->saveAs($fileName)){
+            throw new HttpException(500, 'Cannot upload file "'.$fileName.'". Please check write permissions.');
+        }
+        return Upload::getLink($fileName);
+    }
+
+    static function getUploadPath($dir)
+    {
+        $uploadPath = $dir = Yii::getAlias('@frontend/web').DIRECTORY_SEPARATOR.self::$UPLOADS_DIR.($dir ? DIRECTORY_SEPARATOR.$dir : '');
+        if(!FileHelper::createDirectory($uploadPath)){
+            throw new HttpException(500, 'Cannot create "'.$uploadPath.'". Please check write permissions.');
+        }
+        return $uploadPath;
+    }
+
+    static function getLink($fileName)
+    {
+        return str_replace('\\', '/', str_replace(Yii::getAlias('@frontend/web'), '', $fileName));
+    }
+
+    static function getFileName($fileInstanse, $namePostfix = true)
+    {
+        $baseName = str_ireplace('.'.$fileInstanse->extension, '', $fileInstanse->name);
+        $fileName =  StringHelper::truncate(Inflector::slug($baseName), 32, '');
+        if($namePostfix || !$fileName) {
+            $fileName .= ($fileName ? '-' : '') . substr(uniqid(md5(rand()), true), 0, 10);
+        }
+        $fileName .= '.' . $fileInstanse->extension;
+
+        return $fileName;
+    }
+}
\ No newline at end of file
diff --git a/common/models/Image.php b/common/models/Image.php
new file mode 100644
index 0000000..8ae7821
--- /dev/null
+++ b/common/models/Image.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "image".
+ *
+ * @property integer $id_image
+ * @property string $path
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Image extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'image';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['path'], 'string', 'max' => 255]
+        ];
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+    	return [
+    			[	'class' => TimestampBehavior::className(),
+    					'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			]
+    			];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_image' => Yii::t('common/image', 'Id Image'),
+            'path' => Yii::t('common/image', 'Path'),
+            'created_at' => Yii::t('common/image', 'Created At'),
+            'updated_at' => Yii::t('common/image', 'Updated At'),
+        ];
+    }
+}
diff --git a/console/migrations/m151127_152631_add__table__image.php b/console/migrations/m151127_152631_add__table__image.php
new file mode 100644
index 0000000..98f5d04
--- /dev/null
+++ b/console/migrations/m151127_152631_add__table__image.php
@@ -0,0 +1,43 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151127_152631_add__table__image extends Migration
+{
+public function up()
+    {
+
+    	$tableOptions = null;
+    	if ($this->db->driverName === 'mysql') {
+    		// http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+    		$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+    	}
+    	
+    	$this->createTable('{{%image}}', [
+    			'id_image' => $this->primaryKey(),
+    			'path' => $this->string(255),
+    			'created_at' => $this->dateTime()->notNull(),
+    			'updated_at' =>  $this->dateTime()->notNull(),
+    	], $tableOptions);
+    	
+    }
+
+    public function down()
+    {
+        echo "m151127_152631_add__table__image cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151127_214503_alter__table__customer__add__column__id_image.php b/console/migrations/m151127_214503_alter__table__customer__add__column__id_image.php
new file mode 100644
index 0000000..9dff562
--- /dev/null
+++ b/console/migrations/m151127_214503_alter__table__customer__add__column__id_image.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151127_214503_alter__table__customer__add__column__id_image extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn("customer", "id_image", "int");
+    }
+
+    public function down()
+    {
+        echo "m151127_214503_alter__table__customer__add__column__id_image cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From 17a339badfa82048dad038e448bd888372d25264 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 11:08:04 +0100
Subject: [PATCH 086/100] change backand request csrf settings

---
 backend/config/main.php  | 13 ++++++++++++-
 common/config/params.php |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/backend/config/main.php b/backend/config/main.php
index fbb4bd2..70d7514 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -14,17 +14,28 @@ return [
     'bootstrap' => ['log'],
     'modules' => [],
     'components' => [
+    		'request' => [
+    				'csrfParam' => '_backendCSRF',
+    				'csrfCookie' => [
+    						'httpOnly' => true,
+    						'path' => '/backend/web',
+    				],
+    		],
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
         	'identityCookie' => [
         			'name' => '_backendUser', // unique for backend
-       				'path'=>'/backend/web'  // correct path for the backend app.
+       				'path'=>'/backend/web',  // correct path for the backend app.
+        			'httpOnly' => true,
        		]
         ],
     	'session' => [
     			'name' => '_backendSessionId', // unique for backend
    				'savePath' => __DIR__ . '/../runtime', // a temporary folder on backend
+    			'cookieParams' => [
+    					'path' => '/backend/web',
+    			],
    		],
         'log' => [
             'traceLevel' => YII_DEBUG ? 3 : 0,
diff --git a/common/config/params.php b/common/config/params.php
index f8d2974..359c9f8 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.4'
+	'version' => 'v0.0.5'
 ];

From 5a1d2ff632b605ea7afed77e9143777251ec249a Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 11:13:06 +0100
Subject: [PATCH 087/100] edit change log vor version 0.0.5

---
 changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 920719a..d2b26d5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,5 @@
+-0.0.5
+	a backend csrf config változtatása
 -0.0.4
 	új admin theme : admin lte
 	recepció/tranzakciók menü ki/bekapcsolható

From d7c08ec60beaedc21a56ad712685a3b515458ee4 Mon Sep 17 00:00:00 2001
From: rocho <en@rocho02.ddns.net>
Date: Sun, 29 Nov 2015 12:07:21 +0100
Subject: [PATCH 088/100] add key crud

---
 backend/components/AdminMenuStructure.php     |   3 +-
 backend/controllers/KeyController.php         | 122 +++++++++++++
 backend/models/KeySearch.php                  |  70 ++++++++
 backend/views/key/_form.php                   |  31 ++++
 backend/views/key/_search.php                 |  37 ++++
 backend/views/key/create.php                  |  21 +++
 backend/views/key/index.php                   |  39 +++++
 backend/views/key/update.php                  |  23 +++
 backend/views/key/view.php                    |  40 +++++
 common/models/Key.php                         |  54 ++++++
 composer_kiement1.txt                         | 162 ++++++++++++++++++
 .../m151129_101441_add_table_key.php          |  44 +++++
 tests/codeception/bin/yii                     |   0
 13 files changed, 645 insertions(+), 1 deletion(-)
 create mode 100644 backend/controllers/KeyController.php
 create mode 100644 backend/models/KeySearch.php
 create mode 100644 backend/views/key/_form.php
 create mode 100644 backend/views/key/_search.php
 create mode 100644 backend/views/key/create.php
 create mode 100644 backend/views/key/index.php
 create mode 100644 backend/views/key/update.php
 create mode 100644 backend/views/key/view.php
 create mode 100644 common/models/Key.php
 create mode 100644 composer_kiement1.txt
 create mode 100644 console/migrations/m151129_101441_add_table_key.php
 mode change 100644 => 100755 tests/codeception/bin/yii

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 5976176..20e37cc 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -58,6 +58,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
+			$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
 			$this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl,
 			'items' =>  $items
@@ -119,4 +120,4 @@ class AdminMenuStructure{
 	}
 	
 	
-}
\ No newline at end of file
+}
diff --git a/backend/controllers/KeyController.php b/backend/controllers/KeyController.php
new file mode 100644
index 0000000..c07709c
--- /dev/null
+++ b/backend/controllers/KeyController.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Key;
+use backend\models\KeySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * KeyController implements the CRUD actions for Key model.
+ */
+class KeyController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Key models.
+     * @return mixed
+     */
+    //http://localhost/fitness-web/backend/web/index.php?r=key/index  erre ezt hívja meg elsőzör
+    public function actionIndex()
+    {
+        $searchModel = new KeySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+		// backend/views/kex/index.php
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Key model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Key model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Key();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_key]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Key model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_key]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Key model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Key model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Key the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Key::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
diff --git a/backend/models/KeySearch.php b/backend/models/KeySearch.php
new file mode 100644
index 0000000..79eeb5b
--- /dev/null
+++ b/backend/models/KeySearch.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Key;
+
+/**
+ * KeySearch represents the model behind the search form about `common\models\Key`.
+ */
+class KeySearch extends Key
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id_key', 'status', 'type'], 'integer'],
+            [['number', 'created_at', 'updated_at'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Key::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'id_key' => $this->id_key,
+            'status' => $this->status,
+            'type' => $this->type,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ]);
+
+        $query->andFilterWhere(['like', 'number', $this->number]);
+
+        return $dataProvider;
+    }
+}
diff --git a/backend/views/key/_form.php b/backend/views/key/_form.php
new file mode 100644
index 0000000..0f26488
--- /dev/null
+++ b/backend/views/key/_form.php
@@ -0,0 +1,31 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Key */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="key-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'status')->textInput() ?>
+
+    <?= $form->field($model, 'type')->textInput() ?>
+
+    <?= $form->field($model, 'created_at')->textInput() ?>
+
+    <?= $form->field($model, 'updated_at')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create') : Yii::t('backend/key', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/key/_search.php b/backend/views/key/_search.php
new file mode 100644
index 0000000..6610f21
--- /dev/null
+++ b/backend/views/key/_search.php
@@ -0,0 +1,37 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\KeySearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="key-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id_key') ?>
+
+    <?= $form->field($model, 'number') ?>
+
+    <?= $form->field($model, 'status') ?>
+
+    <?= $form->field($model, 'type') ?>
+
+    <?= $form->field($model, 'created_at') ?>
+
+    <?php // echo $form->field($model, 'updated_at') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('backend/key', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/key/create.php b/backend/views/key/create.php
new file mode 100644
index 0000000..19177f7
--- /dev/null
+++ b/backend/views/key/create.php
@@ -0,0 +1,21 @@
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Key */
+
+$this->title = Yii::t('backend/key', 'Create Key');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/key', 'Keys'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="key-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/key/index.php b/backend/views/key/index.php
new file mode 100644
index 0000000..c8ab4cc
--- /dev/null
+++ b/backend/views/key/index.php
@@ -0,0 +1,39 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\KeySearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('backend/key', 'Keys');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="key-index">
+asdf
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('backend/key', 'Create Key'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'id_key',
+            'number',
+            'status',
+            'type',
+            'created_at',
+            // 'updated_at',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
diff --git a/backend/views/key/update.php b/backend/views/key/update.php
new file mode 100644
index 0000000..e3b223b
--- /dev/null
+++ b/backend/views/key/update.php
@@ -0,0 +1,23 @@
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Key */
+
+$this->title = Yii::t('backend/key', 'Update {modelClass}: ', [
+    'modelClass' => 'Key',
+]) . ' ' . $model->id_key;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/key', 'Keys'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id_key, 'url' => ['view', 'id' => $model->id_key]];
+$this->params['breadcrumbs'][] = Yii::t('backend/key', 'Update');
+?>
+<div class="key-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
diff --git a/backend/views/key/view.php b/backend/views/key/view.php
new file mode 100644
index 0000000..48f5760
--- /dev/null
+++ b/backend/views/key/view.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Key */
+
+$this->title = $model->id_key;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('backend/key', 'Keys'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="key-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('backend/key', 'Update'), ['update', 'id' => $model->id_key], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('backend/key', 'Delete'), ['delete', 'id' => $model->id_key], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('backend/key', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id_key',
+            'number',
+            'status',
+            'type',
+            'created_at',
+            'updated_at',
+        ],
+    ]) ?>
+
+</div>
diff --git a/common/models/Key.php b/common/models/Key.php
new file mode 100644
index 0000000..985a764
--- /dev/null
+++ b/common/models/Key.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "key".
+ *
+ * @property integer $id_key
+ * @property string $number
+ * @property integer $status
+ * @property integer $type
+ * @property string $created_at
+ * @property string $updated_at
+ */
+class Key extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'key';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['status', 'type'], 'integer'],
+            [['created_at', 'updated_at'], 'required'],
+            [['created_at', 'updated_at'], 'safe'],
+            [['number'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id_key' => Yii::t('common/key', 'Id Key'),
+            'number' => Yii::t('common/key', 'Number'),
+            'status' => Yii::t('common/key', 'Status'),
+            'type' => Yii::t('common/key', 'Type'),
+            'created_at' => Yii::t('common/key', 'Created At'),
+            'updated_at' => Yii::t('common/key', 'Updated At'),
+        ];
+    }
+}
diff --git a/composer_kiement1.txt b/composer_kiement1.txt
new file mode 100644
index 0000000..6274c95
--- /dev/null
+++ b/composer_kiement1.txt
@@ -0,0 +1,162 @@
+sanya@sanyigep ~/public_html/fitness-web $ php composer.phar install
+Loading composer repositories with package information
+Installing dependencies (including require-dev) from lock file
+  - Installing yiisoft/yii2-composer (2.0.3)
+    Loading from cache
+
+  - Installing bower-asset/accounting (v0.3.2)
+    Loading from cache
+
+  - Installing bower-asset/jquery (2.1.4)
+    Loading from cache
+
+  - Installing bower-asset/jquery.inputmask (3.1.63)
+    Loading from cache
+
+  - Installing bower-asset/moment (2.10.6)
+    Loading from cache
+
+  - Installing bower-asset/punycode (v1.3.2)
+    Loading from cache
+
+  - Installing bower-asset/bootstrap (v3.3.5)
+    Loading from cache
+
+  - Installing bower-asset/remarkable-bootstrap-notify (3.1.3)
+    Loading from cache
+
+  - Installing bower-asset/yii2-pjax (v2.0.4)
+    Loading from cache
+
+  - Installing cebe/markdown (1.1.0)
+    Loading from cache
+
+  - Installing ezyang/htmlpurifier (v4.6.0)
+    Loading from cache
+
+  - Installing yiisoft/yii2 (2.0.6)
+    Loading from cache
+
+  - Installing yiisoft/yii2-bootstrap (2.0.5)
+    Loading from cache
+
+  - Installing bower-asset/fontawesome (v4.4.0)
+    Loading from cache
+
+  - Installing rmrevin/yii2-fontawesome (2.12.2)
+    Loading from cache
+
+  - Installing cebe/yii2-gravatar (1.1)
+    Loading from cache
+
+  - Installing almasaeed2010/adminlte (v2.3.2)
+    Loading from cache
+
+  - Installing dmstr/yii2-adminlte-asset (2.2.4)
+    Loading from cache
+
+  - Installing kartik-v/bootstrap-fileinput (v4.2.7)
+    Loading from cache
+
+  - Installing kartik-v/bootstrap-star-rating (v3.5.4)
+    Loading from cache
+
+  - Installing kartik-v/dependent-dropdown (v1.4.3)
+    Loading from cache
+
+  - Installing kartik-v/yii2-krajee-base (v1.7.7)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-typeahead (v1.0.1)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-touchspin (v1.2.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-timepicker (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-switchinput (v1.3.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-spinner (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-sidenav (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-select2 (v2.0.3)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-rating (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-rangeinput (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-growl (v1.1.1)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-fileinput (v1.0.3)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-depdrop (v1.0.2)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-datetimepicker (v1.4.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-datepicker (v1.3.3)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-colorinput (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-alert (v1.1.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-affix (v1.0.0)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widget-activeform (v1.4.5)
+    Loading from cache
+
+  - Installing kartik-v/yii2-widgets (v3.4.0)
+    Loading from cache
+
+  - Installing bower-asset/jquery-ui (1.11.4)
+    Loading from cache
+
+  - Installing yiisoft/yii2-jui (2.0.4)
+    Loading from cache
+
+  - Installing swiftmailer/swiftmailer (v5.4.1)
+    Loading from cache
+
+  - Installing yiisoft/yii2-swiftmailer (2.0.4)
+    Loading from cache
+
+  - Installing yiisoft/yii2-codeception (2.0.4)
+    Loading from cache
+
+  - Installing yiisoft/yii2-debug (2.0.5)
+    Loading from cache
+
+  - Installing fzaninotto/faker (v1.5.0)
+    Loading from cache
+
+  - Installing yiisoft/yii2-faker (2.0.3)
+    Loading from cache
+
+  - Installing phpspec/php-diff (v1.0.2)
+    Loading from cache
+
+  - Installing bower-asset/typeahead.js (v0.10.5)
+    Loading from cache
+
+  - Installing yiisoft/yii2-gii (2.0.4)
+    Loading from cache
+
+fzaninotto/faker suggests installing ext-intl (*)
+Generating autoload files
+
diff --git a/console/migrations/m151129_101441_add_table_key.php b/console/migrations/m151129_101441_add_table_key.php
new file mode 100644
index 0000000..4df3a0b
--- /dev/null
+++ b/console/migrations/m151129_101441_add_table_key.php
@@ -0,0 +1,44 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151129_101441_add_table_key extends Migration
+{
+    public function up()
+    {
+		$tableOptions = null;
+		if ($this->db->driverName === 'mysql') {
+			  // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
+			$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
+		}
+			 
+	    $this->createTable('{{%key}}', [
+			   'id_key' => $this->primaryKey(),
+			   'number' => $this->string(255),
+			   'status' => $this->smallInteger(),
+			   'type' => $this->smallInteger(),
+			   'created_at' => $this->dateTime()->notNull(),
+			   'updated_at' =>  $this->dateTime()->notNull(),
+		], $tableOptions);
+
+    }
+
+    public function down()
+    {
+        echo "m151129_101441_add_table_key cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/tests/codeception/bin/yii b/tests/codeception/bin/yii
old mode 100644
new mode 100755

From 09cd4660b8ab72b6a6ed3dfd2bb41d75696a0c16 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 15:04:09 +0100
Subject: [PATCH 089/100] add csrf , product and account_state changes

csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes

add csrf , product and account_state changes

csrf - previous settings were not working on dev1
product - allow sale  , if count > stock
prodcut - admin - allow search by name
account_state - auto sum up money from notes
---
 backend/components/AdminMenuStructure.php |  2 +-
 backend/config/main.php                   |  4 +---
 backend/models/ProductSearch.php          |  5 +++--
 backend/views/product/_search.php         |  9 ++++----
 common/config/params.php                  |  2 +-
 frontend/models/ProductSaleForm.php       |  2 +-
 frontend/web/js/accountstate.js           | 26 ++++++++++++++++++++---
 7 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 20e37cc..d4cf24a 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -58,7 +58,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
-			$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
+// 			$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
 			$this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl,
 			'items' =>  $items
diff --git a/backend/config/main.php b/backend/config/main.php
index 70d7514..af688c7 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -17,7 +17,6 @@ return [
     		'request' => [
     				'csrfParam' => '_backendCSRF',
     				'csrfCookie' => [
-    						'httpOnly' => true,
     						'path' => '/backend/web',
     				],
     		],
@@ -26,8 +25,7 @@ return [
             'enableAutoLogin' => true,
         	'identityCookie' => [
         			'name' => '_backendUser', // unique for backend
-       				'path'=>'/backend/web',  // correct path for the backend app.
-        			'httpOnly' => true,
+//         			'path' => '/backend/web',
        		]
         ],
     	'session' => [
diff --git a/backend/models/ProductSearch.php b/backend/models/ProductSearch.php
index 44319eb..f49d2f6 100644
--- a/backend/models/ProductSearch.php
+++ b/backend/models/ProductSearch.php
@@ -20,7 +20,7 @@ class ProductSearch extends Product
     {
         return [
             [[  'id_product_category', 'id_account',   'status'], 'integer'],
-            [['product_number', 'barcode' ], 'safe'],
+            [['product_number', 'barcode' ,'name'], 'safe'],
         ];
     }
 
@@ -68,7 +68,8 @@ class ProductSearch extends Product
         ]);
 
         $query->andFilterWhere(['like', 'product_number', $this->product_number])
-            ->andFilterWhere(['like', 'barcode', $this->barcode]);
+            ->andFilterWhere(['like', 'barcode', $this->barcode])
+         ->andFilterWhere(['like', 'name', $this->name]);
 
         return $dataProvider;
     }
diff --git a/backend/views/product/_search.php b/backend/views/product/_search.php
index 5186a56..51364ad 100644
--- a/backend/views/product/_search.php
+++ b/backend/views/product/_search.php
@@ -19,11 +19,11 @@ function mkOptions($options){
 	return $o;
 }
 
-$statusOptions = mkOptions( Product::statuses() );
+$statusOptions = ['' => "Mind"] +  ( Product::statuses() );
 
-$productCategories =  mkOptions(  ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') );
+$productCategories =  ['' => "Mind"] +    ArrayHelper::map( ProductCategory::read(null) ,'id_product_category','name') ;
 
-$accounts =  mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','name'));
+$accounts =  ['' => "Mind"] +  ( ArrayHelper::map( Account::read(null) ,'id_account','name'));
 
 ?>
 <div class="product-search">
@@ -44,12 +44,13 @@ $accounts =  mkOptions( ArrayHelper::map( Account::read(null) ,'id_account','nam
     <?php  echo $form->field($model, 'status')->dropDownList($statusOptions) ?>
 	</div>
 	<div class="col-md-4">
-    <?= $form->field($model, 'product_number') ?>
+		<?= $form->field($model, 'name') ?>
 	</div>
 	<div class="col-md-4">
     <?= $form->field($model, 'barcode') ?>
 	</div>
 	<div class="col-md-4">
+    <?= $form->field($model, 'product_number') ?>
 	</div>
 	</div>
 
diff --git a/common/config/params.php b/common/config/params.php
index 359c9f8..c134840 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.5'
+	'version' => 'v0.0.6'
 ];
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 4516c38..800f4e0 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -87,7 +87,7 @@ class ProductSaleForm extends Model
             [['comment'], 'string' ,'max' => 255],
             [['cart'], 'string' ,'max' => 20],
             [['id_product' ], 'validateProduct'],
-            [['count' ], 'validateCount'],
+//             [['count' ], 'validateCount'],
             [['id_currency' ], 'validateCurrency'],
             [['id_account' ], 'validateAccount'],
             [['id_discount' ], 'validateDiscount'],
diff --git a/frontend/web/js/accountstate.js b/frontend/web/js/accountstate.js
index 6ed70ee..e973eae 100644
--- a/frontend/web/js/accountstate.js
+++ b/frontend/web/js/accountstate.js
@@ -28,7 +28,7 @@ function AccountState(o){
 		$.extend(app.defaults, o );
 		notes = $(app.defaults.notes);
 		moneyInput = $(app.defaults.selector_money);
-		notes.change(run);
+		notes.change(runNote);
 		moneyInput.change(run);
 		if ( app.defaults.open ){
 			ddAccount = $(app.defaults.selector_dd_account);
@@ -40,8 +40,17 @@ function AccountState(o){
 	
 	
 	
-	function run(){
+	  function runNote(){
+		run("note");
+	}
+	
+	function run(what ){
 		calcTotal();
+		if ( what == 'note' ){
+			setMoneyAsTotal();
+		}else{
+			readMoney();
+		}
 		calcDiff();
 		calcAccount();
 		calcLastDiff();
@@ -51,6 +60,7 @@ function AccountState(o){
 		updateLastMoney();
 		updateLastDiff();
 		updatePrevState();
+		
 	}
 	
 	function calcAccount(){
@@ -68,12 +78,21 @@ function AccountState(o){
 		app.diff = Math.abs(app.last_money - app.money );
 		
 	}
-	function calcDiff(){
+	
+	function setMoneyAsTotal(){
+		app.money = app.total;
+	}
+	
+	function readMoney(){
 		app.money = 0;
 		app.money = +moneyInput.val();
 		if ( isNaN(money)){
 			app.money = 0;
 		}
+	}
+	
+	function calcDiff(){
+		
 		app.diff = Math.abs(app.total - app.money );
 		
 	}
@@ -103,6 +122,7 @@ function AccountState(o){
 		var money;
 		money = accounting.formatNumber(app.money, 0, " "); // 9 876 543.210
 		$('.money').html(money);
+		$('#accountstate-money').val(money);
 	}
 	
 	function updateLastMoney(){		

From 5f460eaca9e8ecdfe2ac071bd2bed3fa396f06d8 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 15:13:26 +0100
Subject: [PATCH 090/100] edit changelog

---
 changelog.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index d2b26d5..0f02b13 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+-0.0.6
+	csrf fixing
+	product - allow sale when count > stock
+	product - admin - allow search by name
+	account_state - auto sum up
 -0.0.5
 	a backend csrf config változtatása
 -0.0.4

From 4935aaa4a2ea08f184181775c966802ac686ca52 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 15:41:29 +0100
Subject: [PATCH 091/100] add again admin key menu

---
 backend/components/AdminMenuStructure.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index d4cf24a..20e37cc 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -58,7 +58,7 @@ class AdminMenuStructure{
 			$items[] = ['label' => 'Kedvezmények', 'url' => ['/discount/index'] ];
 			$items[] = ['label' => 'Termék kategóriák', 'url' => ['/product-category/index'] ];
 			$items[] = ['label' => 'Bérlet típusok', 'url' => ['/ticket-type/index'] ];
-// 			$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
+			$items[] = ['label' => 'Kulcsok', 'url' =>['/key/index']];
 // 			$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
 			$this->menuItems[] = ['label' => 'Törszadatok', 'url' =>$this->emptyUrl,
 			'items' =>  $items

From 9962a350593b018b80add619cef2cdd98b9c3744 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Sun, 29 Nov 2015 20:19:34 +0100
Subject: [PATCH 092/100] disable csrf fix, fix account state javascript

	disable csrf in frontend and backend
	reception account_state javascript fix
---
 backend/config/main.php         | 9 +++++----
 changelog.txt                   | 3 +++
 common/config/params.php        | 2 +-
 frontend/config/main.php        | 3 +++
 frontend/web/js/accountstate.js | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/config/main.php b/backend/config/main.php
index af688c7..92646c9 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -15,10 +15,11 @@ return [
     'modules' => [],
     'components' => [
     		'request' => [
-    				'csrfParam' => '_backendCSRF',
-    				'csrfCookie' => [
-    						'path' => '/backend/web',
-    				],
+    				'enableCsrfValidation'=>false,
+//     				'csrfParam' => '_backendCSRF',
+//     				'csrfCookie' => [
+//     						'path' => '/backend/web',
+//     				],
     		],
         'user' => [
             'identityClass' => 'common\models\User',
diff --git a/changelog.txt b/changelog.txt
index 0f02b13..4d0e2e4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+-0.0.7
+	disable csrf in frontend and backend
+	reception account_state javascript fix
 -0.0.6
 	csrf fixing
 	product - allow sale when count > stock
diff --git a/common/config/params.php b/common/config/params.php
index c134840..20a3a2c 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.6'
+	'version' => 'v0.0.7'
 ];
diff --git a/frontend/config/main.php b/frontend/config/main.php
index 1169f65..505b6ba 100644
--- a/frontend/config/main.php
+++ b/frontend/config/main.php
@@ -13,6 +13,9 @@ return [
     'bootstrap' => ['log'],
     'controllerNamespace' => 'frontend\controllers',
     'components' => [
+    	'request' => [
+    		'enableCsrfValidation'=>false,
+    	],
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
diff --git a/frontend/web/js/accountstate.js b/frontend/web/js/accountstate.js
index e973eae..9e5fffd 100644
--- a/frontend/web/js/accountstate.js
+++ b/frontend/web/js/accountstate.js
@@ -122,7 +122,7 @@ function AccountState(o){
 		var money;
 		money = accounting.formatNumber(app.money, 0, " "); // 9 876 543.210
 		$('.money').html(money);
-		$('#accountstate-money').val(money);
+		$('#accountstate-money').val(app.money +"");
 	}
 	
 	function updateLastMoney(){		

From 4872abbb2090f3a1828016d360a6581ca2b0d50c Mon Sep 17 00:00:00 2001
From: rocho <en@rocho02.ddns.net>
Date: Mon, 30 Nov 2015 19:21:27 +0100
Subject: [PATCH 093/100] =?UTF-8?q?<leir=C3=A1s>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/config/main.php               |  4 ++--
 backend/controllers/KeyController.php |  2 +-
 backend/models/KeySearch.php          |  1 +
 backend/views/key/_form.php           |  7 +++---
 backend/views/key/_search.php         | 14 ++++++------
 backend/views/key/create.php          |  2 +-
 backend/views/key/index.php           | 27 ++++++++++++++++-------
 common/messages/hu/backend/key.php    |  8 +++++++
 common/messages/hu/common/key.php     | 11 ++++++++++
 common/models/Key.php                 | 31 ++++++++++++++++++++++-----
 10 files changed, 81 insertions(+), 26 deletions(-)
 create mode 100644 common/messages/hu/backend/key.php
 create mode 100644 common/messages/hu/common/key.php

diff --git a/backend/config/main.php b/backend/config/main.php
index af688c7..d88d098 100644
--- a/backend/config/main.php
+++ b/backend/config/main.php
@@ -14,12 +14,12 @@ return [
     'bootstrap' => ['log'],
     'modules' => [],
     'components' => [
-    		'request' => [
+    		/*'request' => [
     				'csrfParam' => '_backendCSRF',
     				'csrfCookie' => [
     						'path' => '/backend/web',
     				],
-    		],
+    		],*/
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
diff --git a/backend/controllers/KeyController.php b/backend/controllers/KeyController.php
index c07709c..9d2efb7 100644
--- a/backend/controllers/KeyController.php
+++ b/backend/controllers/KeyController.php
@@ -38,7 +38,7 @@ class KeyController extends Controller
 		// backend/views/kex/index.php
         return $this->render('index', [
             'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
+            'dataProvider' => $dataProvider, //csomagoló osztály a queryhez
         ]);
     }
 
diff --git a/backend/models/KeySearch.php b/backend/models/KeySearch.php
index 79eeb5b..72f9773 100644
--- a/backend/models/KeySearch.php
+++ b/backend/models/KeySearch.php
@@ -57,6 +57,7 @@ class KeySearch extends Key
 
         $query->andFilterWhere([
             'id_key' => $this->id_key,
+            'number' => $this->number,
             'status' => $this->status,
             'type' => $this->type,
             'created_at' => $this->created_at,
diff --git a/backend/views/key/_form.php b/backend/views/key/_form.php
index 0f26488..3f4d051 100644
--- a/backend/views/key/_form.php
+++ b/backend/views/key/_form.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use common\models\Key;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Key */
@@ -14,13 +15,13 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'status')->textInput() ?>
+    <?= $form->field($model, 'status')->dropDownList(  Key::statuses()  ) /*->textInput()*/ ?>
 
     <?= $form->field($model, 'type')->textInput() ?>
 
-    <?= $form->field($model, 'created_at')->textInput() ?>
+    <?php //echo $form->field($model, 'created_at')->textInput() ?>
 
-    <?= $form->field($model, 'updated_at')->textInput() ?>
+    <?php //echo $form->field($model, 'updated_at')->textInput() ?>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create') : Yii::t('backend/key', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/backend/views/key/_search.php b/backend/views/key/_search.php
index 6610f21..06395b2 100644
--- a/backend/views/key/_search.php
+++ b/backend/views/key/_search.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use common\models\Key;
 
 /* @var $this yii\web\View */
 /* @var $model backend\models\KeySearch */
@@ -15,21 +16,22 @@ use yii\widgets\ActiveForm;
         'method' => 'get',
     ]); ?>
 
-    <?= $form->field($model, 'id_key') ?>
+    <?php //echo $form->field($model, 'id_key') ?>
 
-    <?= $form->field($model, 'number') ?>
+    <?php echo $form->field($model, 'number') ?>
+    <?php //$form->field($model, 'status')->dropDownList(  Key::statuses()  ) /*->textInput()*/ ?>
 
-    <?= $form->field($model, 'status') ?>
+    <?php //echo $form->field($model, 'status') ?>
 
-    <?= $form->field($model, 'type') ?>
+    <?php //echo $form->field($model, 'type') ?>
 
-    <?= $form->field($model, 'created_at') ?>
+    <?php //echo $form->field($model, 'created_at') ?>
 
     <?php // echo $form->field($model, 'updated_at') ?>
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('backend/key', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']) ?>
+        <?php echo Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']); /* Reset gomb */ ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/key/create.php b/backend/views/key/create.php
index 19177f7..47bc7c7 100644
--- a/backend/views/key/create.php
+++ b/backend/views/key/create.php
@@ -12,7 +12,7 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="key-create">
 
-    <h1><?= Html::encode($this->title) ?></h1>
+    <h1>Új kulcs létrehozás <?php /*echo Html::encode($this->title)*/ ?></h1>
 
     <?= $this->render('_form', [
         'model' => $model,
diff --git a/backend/views/key/index.php b/backend/views/key/index.php
index c8ab4cc..7f9479c 100644
--- a/backend/views/key/index.php
+++ b/backend/views/key/index.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\grid\GridView;
+use common\models\Key;
 
 /* @var $this yii\web\View */
 /* @var $searchModel backend\models\KeySearch */
@@ -11,23 +12,33 @@ $this->title = Yii::t('backend/key', 'Keys');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="key-index">
-asdf
+
     <h1><?= Html::encode($this->title) ?></h1>
-    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+    <?php echo $this->render('_search', ['model' => $searchModel]); /* ezt megcsinálni hogy csak numberre lehessen     itt a fitness-web/backend/views/key/_search.php töltődik be    */?>
 
     <p>
-        <?= Html::a(Yii::t('backend/key', 'Create Key'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?php 
+           // Új kulcs gomb kigenerálása a Yii::t('backend/key'  a fitness-web/common/messages/hu/backend/key.php-ba lesz (miután létrehoztam)
+           echo Html::a(Yii::t('backend/key', 'Create Key'), ['create'], ['class' => 'btn btn-success']);
+         ?>
     </p>
 
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
+        //'filterModel' => $searchModel, // ezt nem szeretjük
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
-
-            'id_key',
+           // ['class' => 'yii\grid\SerialColumn'],
+           // 'id_key',
             'number',
-            'status',
+            [
+				  'attribute' => 'status',
+				  'value' => function ($model, $key, $index, $column){
+					$statuszok = Key::statuses();
+					$result = $statuszok[$model->status];
+					return $result;
+				}
+			  ],
+            //'status',
             'type',
             'created_at',
             // 'updated_at',
diff --git a/common/messages/hu/backend/key.php b/common/messages/hu/backend/key.php
new file mode 100644
index 0000000..a57a6b4
--- /dev/null
+++ b/common/messages/hu/backend/key.php
@@ -0,0 +1,8 @@
+<?php
+return [
+	'Keys' => 'Kulcsok',
+	'Create Key' => 'Új kulcs',
+	'Search' => 'Keresés',
+	'Reset' => 'Mégsem'
+];
+?>
diff --git a/common/messages/hu/common/key.php b/common/messages/hu/common/key.php
new file mode 100644
index 0000000..4ca4bc0
--- /dev/null
+++ b/common/messages/hu/common/key.php
@@ -0,0 +1,11 @@
+<?php
+return [
+	'Active' => 'Aktív',
+	'Inactive' => 'Inaktív',
+	'Number' => 'Név, szám',
+	'Status' => 'Státusz',
+	'Search' => 'Keresés',
+	'Type' => 'Típus',
+	'Created At' => 'Létrehozva',
+];
+?>
diff --git a/common/models/Key.php b/common/models/Key.php
index 985a764..de7cb24 100644
--- a/common/models/Key.php
+++ b/common/models/Key.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\behaviors\TimestampBehavior;
 
 /**
  * This is the model class for table "key".
@@ -16,6 +17,8 @@ use Yii;
  */
 class Key extends \yii\db\ActiveRecord
 {
+	const STATUS_DELETED = 0;
+	const STATUS_ACTIVE = 10;
     /**
      * @inheritdoc
      */
@@ -30,15 +33,26 @@ class Key extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['status', 'type'], 'integer'],
-            [['created_at', 'updated_at'], 'required'],
-            [['created_at', 'updated_at'], 'safe'],
-            [['number'], 'string', 'max' => 255]
+            [['status', 'type'], 'integer'], //csak szám
+            //[['created_at', 'updated_at'], 'required'],//kötelezőek
+            //[['created_at', 'updated_at'], 'safe'], //bármi lehet
+            [['number'], 'string', 'max' => 255],
+            [['number' ], 'unique'],
         ];
     }
+    
+    
+    public function behaviors()
+    {
+     return [
+		   [ 'class' => TimestampBehavior::className(), //mentés előtt kitölti a save methódus meghívása előtt kitölti a created... mezőket
+			 'value' => function(){ return date('Y-m-d H:i:s' ); }
+		   ]
+       ];
+    }
 
     /**
-     * @inheritdoc
+     * @inheritdoc   Minden modelnak van egy Attribut labels függvénye ami modelhez tartalmazza a fordítások
      */
     public function attributeLabels()
     {
@@ -51,4 +65,11 @@ class Key extends \yii\db\ActiveRecord
             'updated_at' => Yii::t('common/key', 'Updated At'),
         ];
     }
+    
+    static function statuses() {
+		return [
+			self::STATUS_ACTIVE => Yii::t('common/key', 'Active'),	// t - translate  a key a kategoria common/messages/hu/common/key.php mappa   (létre kell hozni a fájlt)
+			self::STATUS_DELETED => Yii::t('common/key', 'Inactive'),	
+		];	
+    }
 }

From 783d889ec7b8aae110792a2ce31aa9a293613686 Mon Sep 17 00:00:00 2001
From: rocho <en@rocho02.ddns.net>
Date: Tue, 1 Dec 2015 17:55:28 +0100
Subject: [PATCH 094/100] =?UTF-8?q?kulcsok=20=C3=BAj=20=C3=A9s=20szerkeszt?=
 =?UTF-8?q?=C3=A9si=20n=C3=A9zetek=20ford=C3=ADt=C3=A1sa,=20leg=C3=B6rd?=
 =?UTF-8?q?=C3=BCl=C5=91=20lista=20alkalmaz=C3=A1sa=20type-ra?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/models/KeySearch.php       |  5 +++--
 backend/views/key/_form.php        |  4 ++--
 backend/views/key/_search.php      | 11 ++++++++---
 backend/views/key/create.php       |  2 +-
 backend/views/key/index.php        |  7 +++++--
 backend/views/key/update.php       |  1 +
 common/messages/hu/backend/key.php |  8 +++++++-
 common/models/Key.php              |  9 +++++++++
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/backend/models/KeySearch.php b/backend/models/KeySearch.php
index 72f9773..a35af44 100644
--- a/backend/models/KeySearch.php
+++ b/backend/models/KeySearch.php
@@ -18,8 +18,9 @@ class KeySearch extends Key
     public function rules()
     {
         return [
-            [['id_key', 'status', 'type'], 'integer'],
-            [['number', 'created_at', 'updated_at'], 'safe'],
+            /*[['id_key', 'status', 'type'], 'integer'],
+            [['number', 'created_at', 'updated_at'], 'safe'],*/
+            [['number'], 'safe']
         ];
     }
 
diff --git a/backend/views/key/_form.php b/backend/views/key/_form.php
index 3f4d051..bd62298 100644
--- a/backend/views/key/_form.php
+++ b/backend/views/key/_form.php
@@ -17,14 +17,14 @@ use common\models\Key;
 
     <?= $form->field($model, 'status')->dropDownList(  Key::statuses()  ) /*->textInput()*/ ?>
 
-    <?= $form->field($model, 'type')->textInput() ?>
+    <?= $form->field($model, 'type')->dropDownList(  Key::types() /* array(10=>"kulcs") // <--ez így ok */ )     /* $form->field($model, 'type')->textInput() */ ?>
 
     <?php //echo $form->field($model, 'created_at')->textInput() ?>
 
     <?php //echo $form->field($model, 'updated_at')->textInput() ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create') : Yii::t('backend/key', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('backend/key', 'Create Save') : Yii::t('backend/key', 'Update Save'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>
diff --git a/backend/views/key/_search.php b/backend/views/key/_search.php
index 06395b2..a69436c 100644
--- a/backend/views/key/_search.php
+++ b/backend/views/key/_search.php
@@ -10,7 +10,10 @@ use common\models\Key;
 ?>
 
 <div class="key-search">
-
+	
+	<div class="row">
+	<div class="col-md-4">
+	
     <?php $form = ActiveForm::begin([
         'action' => ['index'],
         'method' => 'get',
@@ -31,9 +34,11 @@ use common\models\Key;
 
     <div class="form-group">
         <?= Html::submitButton(Yii::t('backend/key', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?php echo Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']); /* Reset gomb */ ?>
+        <?php //echo Html::resetButton(Yii::t('backend/key', 'Reset'), ['class' => 'btn btn-default']); /* Reset gomb */ ?>
     </div>
 
     <?php ActiveForm::end(); ?>
-
+	
+	</div><!-- col-md-4 END -->
+	</div><!-- row END -->
 </div>
diff --git a/backend/views/key/create.php b/backend/views/key/create.php
index 47bc7c7..39bcb99 100644
--- a/backend/views/key/create.php
+++ b/backend/views/key/create.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\helpers\Html;
-
+use common\models\Key;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Key */
diff --git a/backend/views/key/index.php b/backend/views/key/index.php
index 7f9479c..53f9430 100644
--- a/backend/views/key/index.php
+++ b/backend/views/key/index.php
@@ -11,7 +11,7 @@ use common\models\Key;
 $this->title = Yii::t('backend/key', 'Keys');
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-<div class="key-index">
+<div class="key-index">	
 
     <h1><?= Html::encode($this->title) ?></h1>
     <?php echo $this->render('_search', ['model' => $searchModel]); /* ezt megcsinálni hogy csak numberre lehessen     itt a fitness-web/backend/views/key/_search.php töltődik be    */?>
@@ -43,7 +43,10 @@ $this->params['breadcrumbs'][] = $this->title;
             'created_at',
             // 'updated_at',
 
-            ['class' => 'yii\grid\ActionColumn'],
+            [
+				'class' => 'yii\grid\ActionColumn',
+				'template' => '{view} {update}',
+			],
         ],
     ]); ?>
 
diff --git a/backend/views/key/update.php b/backend/views/key/update.php
index e3b223b..10fab8e 100644
--- a/backend/views/key/update.php
+++ b/backend/views/key/update.php
@@ -1,6 +1,7 @@
 <?php
 
 use yii\helpers\Html;
+use common\models\Key;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Key */
diff --git a/common/messages/hu/backend/key.php b/common/messages/hu/backend/key.php
index a57a6b4..a883fe9 100644
--- a/common/messages/hu/backend/key.php
+++ b/common/messages/hu/backend/key.php
@@ -1,8 +1,14 @@
 <?php
 return [
 	'Keys' => 'Kulcsok',
+	'Key' => 'Kulcs',
 	'Create Key' => 'Új kulcs',
 	'Search' => 'Keresés',
-	'Reset' => 'Mégsem'
+	'Reset' => 'Mégsem',
+	'Update {modelClass}: ' => 'Szerkesztés {modelClass}: ',
+	'Update' => 'Szerkesztés',
+	'Update Save' => 'Mentés',
+	'Create Save' => 'Mentés',
+	
 ];
 ?>
diff --git a/common/models/Key.php b/common/models/Key.php
index de7cb24..f4e8b77 100644
--- a/common/models/Key.php
+++ b/common/models/Key.php
@@ -19,6 +19,8 @@ class Key extends \yii\db\ActiveRecord
 {
 	const STATUS_DELETED = 0;
 	const STATUS_ACTIVE = 10;
+	const TYPE_NORMAL = 10;
+	const TYPE_DEFAULT = self::TYPE_NORMAL;
     /**
      * @inheritdoc
      */
@@ -72,4 +74,11 @@ class Key extends \yii\db\ActiveRecord
 			self::STATUS_DELETED => Yii::t('common/key', 'Inactive'),	
 		];	
     }
+    
+    public static function types(){
+		return [
+			self::TYPE_NORMAL => Yii::t('common/key', 'Key'),	
+		];
+	}
+    
 }

From 78e36664ab0ab59d66b62a43fc556912be980350 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Tue, 8 Dec 2015 22:28:16 +0100
Subject: [PATCH 095/100] add migration add column id_key to customer

---
 ...ter__table__customer__add__column__key.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 console/migrations/m151208_212339_alter__table__customer__add__column__key.php

diff --git a/console/migrations/m151208_212339_alter__table__customer__add__column__key.php b/console/migrations/m151208_212339_alter__table__customer__add__column__key.php
new file mode 100644
index 0000000..2a4cca8
--- /dev/null
+++ b/console/migrations/m151208_212339_alter__table__customer__add__column__key.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151208_212339_alter__table__customer__add__column__key extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn("customer", "id_key", "int");
+    }
+
+    public function down()
+    {
+        echo "m151208_212339_alter__table__customer__add__column__key cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}

From b42e6f78e6b7860be28b859ba0c96e0537ec7e91 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Fri, 11 Dec 2015 23:15:53 +0100
Subject: [PATCH 096/100] add card type 'old', fix frontend notes

---
 common/messages/hu/common/card.php      | 1 +
 common/models/Card.php                  | 2 ++
 frontend/views/account-state/_notes.php | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/messages/hu/common/card.php b/common/messages/hu/common/card.php
index 1e3d4b7..e4dfa5a 100644
--- a/common/messages/hu/common/card.php
+++ b/common/messages/hu/common/card.php
@@ -37,4 +37,5 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítása:',
     'Updated At' => 'Módosítás ideje',
+	'OLD' => 'Régi Rendszer'
 ];
diff --git a/common/models/Card.php b/common/models/Card.php
index 6468ed1..28e8af6 100644
--- a/common/models/Card.php
+++ b/common/models/Card.php
@@ -23,6 +23,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
 	const TYPE_RFID = 10;
 	const TYPE_QRCODE = 20;
 	const TYPE_BARCODE = 30;
+	const TYPE_OLD = 40;
 	
     /**
      * @inheritdoc
@@ -82,6 +83,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
     			self::TYPE_RFID => Yii::t('common/card', 'RFID'),
     			self::TYPE_QRCODE => Yii::t('common/card', 'QRCODE'),
     			self::TYPE_BARCODE => Yii::t('common/card', 'BARCODE'),
+    			self::TYPE_OLD => Yii::t('common/card', 'OLD'),
     	];
     }
     
diff --git a/frontend/views/account-state/_notes.php b/frontend/views/account-state/_notes.php
index fa614dd..a93f7f4 100644
--- a/frontend/views/account-state/_notes.php
+++ b/frontend/views/account-state/_notes.php
@@ -6,9 +6,9 @@
 		
 		    <?= $form->field($model, 'banknote_10_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '10']) ?>
 		
-		    <?= $form->field($model, 'banknote_20_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '15']) ?>
+		    <?= $form->field($model, 'banknote_20_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20']) ?>
 		
-		    <?= $form->field($model, 'banknote_50_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '20']) ?>
+		    <?= $form->field($model, 'banknote_50_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '50']) ?>
 		</div>
 		<div class='col-md-4'>
 		    <?= $form->field($model, 'banknote_100_ft')->textInput([ 'class' => 'form-control note-input text-right', 'data-value' => '100']) ?>

From fd1cf65334b4723dd76479b02f6d5b5be2795422 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Fri, 11 Dec 2015 23:34:21 +0100
Subject: [PATCH 097/100] add version changes and edit change log

---
 changelog.txt            | 4 ++++
 common/config/params.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 4d0e2e4..6913da3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+-0.0.8
+	fix account state on reception
+	add keys
+	new card type: old
 -0.0.7
 	disable csrf in frontend and backend
 	reception account_state javascript fix
diff --git a/common/config/params.php b/common/config/params.php
index 20a3a2c..84a02bc 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.7'
+	'version' => 'v0.0.8'
 ];

From 3b2f19b90946300f8b0ffcde759b71ce8718e303 Mon Sep 17 00:00:00 2001
From: Roland Schneider <rocho02@gmail.com>
Date: Mon, 28 Dec 2015 21:03:52 +0100
Subject: [PATCH 098/100] add rfid_key to card and key

---
 backend/models/CardSearch.php                 |  3 +-
 backend/models/KeySearch.php                  |  4 ++-
 backend/views/card/_form.php                  |  1 +
 backend/views/card/_search.php                |  3 ++
 backend/views/card/index.php                  |  4 +++
 backend/views/card/view.php                   |  1 +
 backend/views/key/_form.php                   |  1 +
 backend/views/key/_search.php                 | 12 ++++----
 backend/views/key/index.php                   |  7 ++++-
 backend/views/key/view.php                    |  1 +
 common/messages/hu/common/card.php            |  3 +-
 common/messages/hu/common/key.php             |  2 ++
 common/models/Card.php                        |  2 ++
 common/models/Key.php                         | 11 +++++++
 ...ter__table__customer__add__column__key.php |  2 +-
 ..._table__key__add__column__rfid__number.php | 30 +++++++++++++++++++
 ...table__card__add__column__rfid__number.php | 30 +++++++++++++++++++
 frontend/models/ReceptionForm.php             |  2 +-
 18 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 console/migrations/m151228_162443_alter__table__key__add__column__rfid__number.php
 create mode 100644 console/migrations/m151228_172909_alter__table__card__add__column__rfid__number.php

diff --git a/backend/models/CardSearch.php b/backend/models/CardSearch.php
index 3ae466e..5ddcbbd 100644
--- a/backend/models/CardSearch.php
+++ b/backend/models/CardSearch.php
@@ -23,7 +23,7 @@ class CardSearch extends Card
     {
         return [
             [['id_card', 'status', 'type'], 'integer'],
-            [[ 'searchCustomerName', 'number', 'created_at', 'updated_at'], 'safe'],
+            [[ 'searchCustomerName', 'number','rfid_key', 'created_at', 'updated_at'], 'safe'],
         ];
     }
 
@@ -72,6 +72,7 @@ class CardSearch extends Card
         ]);
 
         $query->andFilterWhere(['like', 'card.number', $this->number]);
+        $query->andFilterWhere(['like', 'card.rfid_key', $this->rfid_key]);
         $query->andFilterWhere(['like', 'customer.name', $this->searchCustomerName]);
 
         return $dataProvider;
diff --git a/backend/models/KeySearch.php b/backend/models/KeySearch.php
index a35af44..9a004d9 100644
--- a/backend/models/KeySearch.php
+++ b/backend/models/KeySearch.php
@@ -20,7 +20,8 @@ class KeySearch extends Key
         return [
             /*[['id_key', 'status', 'type'], 'integer'],
             [['number', 'created_at', 'updated_at'], 'safe'],*/
-            [['number'], 'safe']
+            [['number'], 'safe'],
+            [['rfid_key'], 'safe']
         ];
     }
 
@@ -59,6 +60,7 @@ class KeySearch extends Key
         $query->andFilterWhere([
             'id_key' => $this->id_key,
             'number' => $this->number,
+            'rfid_key' => $this->rfid_key,
             'status' => $this->status,
             'type' => $this->type,
             'created_at' => $this->created_at,
diff --git a/backend/views/card/_form.php b/backend/views/card/_form.php
index dfa41b0..3cd9972 100644
--- a/backend/views/card/_form.php
+++ b/backend/views/card/_form.php
@@ -14,6 +14,7 @@ use common\models\Card;
     <?php $form = ActiveForm::begin(); ?>
 
     <?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'rfid_key')->textInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'status')->dropDownList(Card::statuses()) ?>
 
diff --git a/backend/views/card/_search.php b/backend/views/card/_search.php
index cf109b4..36ab2e0 100644
--- a/backend/views/card/_search.php
+++ b/backend/views/card/_search.php
@@ -46,6 +46,9 @@ $statusOptions = mkOptions(Card::statuses());
 		<div class='col-md-3'>
 		    <?= $form->field($model, 'searchCustomerName')->textInput() ?>
 		</div>
+		<div class='col-md-3'>
+		    <?= $form->field($model, 'rfid_key')->textInput() ?>
+		</div>
 	</div>	
 	
 
diff --git a/backend/views/card/index.php b/backend/views/card/index.php
index 94d6086..32802f2 100644
--- a/backend/views/card/index.php
+++ b/backend/views/card/index.php
@@ -28,6 +28,10 @@ $this->params['breadcrumbs'][] = $this->title;
             		'attribute' => 'number',
             		'value' => 'number'	
     		],
+            [ 
+            		'attribute' => 'rfid_key',
+            		'value' => 'rfid_key'	
+    		],
             [ 
             		'attribute' => 'status',
             		'value' => 'statusHuman'	
diff --git a/backend/views/card/view.php b/backend/views/card/view.php
index 4ab4efd..a6977f2 100644
--- a/backend/views/card/view.php
+++ b/backend/views/card/view.php
@@ -22,6 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
         'model' => $model,
         'attributes' => [
             'number',
+            'rfid_key',
             ['attribute' => 'status', 'value' => $model->statusHuman],
             ['attribute' => 'type', 'value' => $model->typeHuman],
             'created_at:datetime',
diff --git a/backend/views/key/_form.php b/backend/views/key/_form.php
index bd62298..48c046c 100644
--- a/backend/views/key/_form.php
+++ b/backend/views/key/_form.php
@@ -14,6 +14,7 @@ use common\models\Key;
     <?php $form = ActiveForm::begin(); ?>
 
     <?= $form->field($model, 'number')->textInput(['maxlength' => true]) ?>
+    <?= $form->field($model, 'rfid_key')->textInput(['maxlength' => true]) ?>
 
     <?= $form->field($model, 'status')->dropDownList(  Key::statuses()  ) /*->textInput()*/ ?>
 
diff --git a/backend/views/key/_search.php b/backend/views/key/_search.php
index a69436c..509bab5 100644
--- a/backend/views/key/_search.php
+++ b/backend/views/key/_search.php
@@ -11,8 +11,6 @@ use common\models\Key;
 
 <div class="key-search">
 	
-	<div class="row">
-	<div class="col-md-4">
 	
     <?php $form = ActiveForm::begin([
         'action' => ['index'],
@@ -20,8 +18,14 @@ use common\models\Key;
     ]); ?>
 
     <?php //echo $form->field($model, 'id_key') ?>
-
+	<div class="row">
+	<div class="col-md-4">
     <?php echo $form->field($model, 'number') ?>
+	</div><!-- col-md-4 END -->
+	<div class="col-md-4">
+    <?php echo $form->field($model, 'rfid_key') ?>
+	</div><!-- col-md-4 END -->
+	</div><!-- row END -->
     <?php //$form->field($model, 'status')->dropDownList(  Key::statuses()  ) /*->textInput()*/ ?>
 
     <?php //echo $form->field($model, 'status') ?>
@@ -39,6 +43,4 @@ use common\models\Key;
 
     <?php ActiveForm::end(); ?>
 	
-	</div><!-- col-md-4 END -->
-	</div><!-- row END -->
 </div>
diff --git a/backend/views/key/index.php b/backend/views/key/index.php
index 53f9430..f44ccd1 100644
--- a/backend/views/key/index.php
+++ b/backend/views/key/index.php
@@ -30,6 +30,7 @@ $this->params['breadcrumbs'][] = $this->title;
            // ['class' => 'yii\grid\SerialColumn'],
            // 'id_key',
             'number',
+            'rfid_key',
             [
 				  'attribute' => 'status',
 				  'value' => function ($model, $key, $index, $column){
@@ -39,7 +40,11 @@ $this->params['breadcrumbs'][] = $this->title;
 				}
 			  ],
             //'status',
-            'type',
+            [
+            		'attribute' =>'type',
+            		'value' =>'humanType'
+            		
+			 ],
             'created_at',
             // 'updated_at',
 
diff --git a/backend/views/key/view.php b/backend/views/key/view.php
index 48f5760..6488b8a 100644
--- a/backend/views/key/view.php
+++ b/backend/views/key/view.php
@@ -30,6 +30,7 @@ $this->params['breadcrumbs'][] = $this->title;
         'attributes' => [
             'id_key',
             'number',
+            'rfid_key',
             'status',
             'type',
             'created_at',
diff --git a/common/messages/hu/common/card.php b/common/messages/hu/common/card.php
index e4dfa5a..02fca45 100644
--- a/common/messages/hu/common/card.php
+++ b/common/messages/hu/common/card.php
@@ -37,5 +37,6 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítása:',
     'Updated At' => 'Módosítás ideje',
-	'OLD' => 'Régi Rendszer'
+	'OLD' => 'Régi Rendszer',
+	'RFID key' => 'RFID szám'
 ];
diff --git a/common/messages/hu/common/key.php b/common/messages/hu/common/key.php
index 4ca4bc0..bf3a8d2 100644
--- a/common/messages/hu/common/key.php
+++ b/common/messages/hu/common/key.php
@@ -6,6 +6,8 @@ return [
 	'Status' => 'Státusz',
 	'Search' => 'Keresés',
 	'Type' => 'Típus',
+	'Key' => 'Kulcs',
 	'Created At' => 'Létrehozva',
+	'RFID key' => 'RFID szám',
 ];
 ?>
diff --git a/common/models/Card.php b/common/models/Card.php
index 28e8af6..09e1af7 100644
--- a/common/models/Card.php
+++ b/common/models/Card.php
@@ -42,6 +42,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
             [['number', 'type','status'], 'required'],
             [['status', 'type'], 'integer'],
             [['number'], 'string', 'max' => 20],
+            [['rfid_key'], 'string', 'max' => 25],
             [['number'], 'unique' ]
         ];
     }
@@ -54,6 +55,7 @@ class Card extends \common\models\BaseFitnessActiveRecord
         return [
             'id_card' => Yii::t('common/card', 'Id Card'),
             'number' => Yii::t('common/card', 'Number'),
+            'rfid_key' => Yii::t('common/card', 'RFID key'),
             'status' => Yii::t('common/card', 'Status'),
             'type' => Yii::t('common/card', 'Type'),
             'created_at' => Yii::t('common/card', 'Created At'),
diff --git a/common/models/Key.php b/common/models/Key.php
index f4e8b77..b9a3feb 100644
--- a/common/models/Key.php
+++ b/common/models/Key.php
@@ -39,6 +39,7 @@ class Key extends \yii\db\ActiveRecord
             //[['created_at', 'updated_at'], 'required'],//kötelezőek
             //[['created_at', 'updated_at'], 'safe'], //bármi lehet
             [['number'], 'string', 'max' => 255],
+            [['rfid_key'], 'string', 'max' => 25],
             [['number' ], 'unique'],
         ];
     }
@@ -61,6 +62,7 @@ class Key extends \yii\db\ActiveRecord
         return [
             'id_key' => Yii::t('common/key', 'Id Key'),
             'number' => Yii::t('common/key', 'Number'),
+            'rfid_key' => Yii::t('common/key', 'RFID key'),
             'status' => Yii::t('common/key', 'Status'),
             'type' => Yii::t('common/key', 'Type'),
             'created_at' => Yii::t('common/key', 'Created At'),
@@ -80,5 +82,14 @@ class Key extends \yii\db\ActiveRecord
 			self::TYPE_NORMAL => Yii::t('common/key', 'Key'),	
 		];
 	}
+	
+	public function getHumanType(){
+		$result = "";
+		$types = self::types();
+		if ( array_key_exists($this->type, $types) ){
+			$result = $types[$this->type];
+		}
+		return $result;
+	}
     
 }
diff --git a/console/migrations/m151208_212339_alter__table__customer__add__column__key.php b/console/migrations/m151208_212339_alter__table__customer__add__column__key.php
index 2a4cca8..7091c04 100644
--- a/console/migrations/m151208_212339_alter__table__customer__add__column__key.php
+++ b/console/migrations/m151208_212339_alter__table__customer__add__column__key.php
@@ -7,7 +7,7 @@ class m151208_212339_alter__table__customer__add__column__key extends Migration
 {
     public function up()
     {
-    	$this->addColumn("customer", "id_key", "int");
+    	$this->addColumn("key", "id_key", "int");
     }
 
     public function down()
diff --git a/console/migrations/m151228_162443_alter__table__key__add__column__rfid__number.php b/console/migrations/m151228_162443_alter__table__key__add__column__rfid__number.php
new file mode 100644
index 0000000..0c469ef
--- /dev/null
+++ b/console/migrations/m151228_162443_alter__table__key__add__column__rfid__number.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151228_162443_alter__table__key__add__column__rfid__number extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn("key", "rfid_key",  "varchar(25)");
+    }
+
+    public function down()
+    {
+        echo "m151228_162443_alter__table__key__add__column__rfid__number cannot be reverted.\n";
+
+//         return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/console/migrations/m151228_172909_alter__table__card__add__column__rfid__number.php b/console/migrations/m151228_172909_alter__table__card__add__column__rfid__number.php
new file mode 100644
index 0000000..ba28cd7
--- /dev/null
+++ b/console/migrations/m151228_172909_alter__table__card__add__column__rfid__number.php
@@ -0,0 +1,30 @@
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m151228_172909_alter__table__card__add__column__rfid__number extends Migration
+{
+    public function up()
+    {
+    	$this->addColumn("card", "rfid_key",  "varchar(25)");
+    }
+
+    public function down()
+    {
+        echo "m151228_172909_alter__table__card__add__column__rfid__number cannot be reverted.\n";
+
+        return false;
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php
index 83be5df..618d275 100644
--- a/frontend/models/ReceptionForm.php
+++ b/frontend/models/ReceptionForm.php
@@ -42,7 +42,7 @@ class ReceptionForm extends Model
     
     public function readCard(){
     	
-    	$this->card = Card::findOne(['number' => $this->number]);
+    	$this->card = Card::find()->andWhere(['or',[ 'in','number' , [$this->number]],['in','rfid_key' ,[ $this->number]]])->one();
     	if ( $this->card != null ){
     		$this->customer = $this->card->customer;
     		$this->readValidTickets();

From 6eb0e69b1b3b79b2f5c53fb092d9f75c84c3efcb Mon Sep 17 00:00:00 2001
From: Schneider Roland <rocho02@gmail.com>
Date: Tue, 29 Dec 2015 22:22:11 +0100
Subject: [PATCH 099/100] add transaction/summary, fix transaction/index, add
 reception product typeahead

---
 backend/components/AdminMenuStructure.php  |   1 +
 backend/controllers/TransferController.php |  26 ++-
 backend/models/TransferSearch.php          |   3 +-
 backend/models/TransferSummarySearch.php   | 180 +++++++++++++++++++++
 backend/views/transfer/_search_summary.php |  58 +++++++
 backend/views/transfer/index.php           |   5 +
 backend/views/transfer/summary.php         |  73 +++++++++
 backend/views/transfer/view.php            |   1 +
 common/assets/TypeAheadAsset.php           |  27 ++++
 common/messages/hu/frontend/transfer.php   |   1 +
 common/models/Product.php                  |  14 ++
 composer.json                              |   3 +-
 composer.lock                              |  40 ++++-
 frontend/assets/ProductSellAsset.php       |   2 +
 frontend/controllers/ProductController.php |  24 ++-
 frontend/models/ProductLookupForm.php      |   4 +
 frontend/models/ProductSaleForm.php        |   2 +
 frontend/views/product/_sale_form.php      |   2 +
 frontend/views/product/sale.php            |   2 +
 frontend/web/js/product.sell.js            |  75 ++++++++-
 20 files changed, 535 insertions(+), 8 deletions(-)
 create mode 100644 backend/models/TransferSummarySearch.php
 create mode 100644 backend/views/transfer/_search_summary.php
 create mode 100644 backend/views/transfer/summary.php
 create mode 100644 common/assets/TypeAheadAsset.php

diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php
index 20e37cc..fc27946 100644
--- a/backend/components/AdminMenuStructure.php
+++ b/backend/components/AdminMenuStructure.php
@@ -89,6 +89,7 @@ class AdminMenuStructure{
 			/////////////////////////////
 			$items = [];
 			$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
+			$items[] = ['label' => 'Bevétel', 'url' => ['/transfer/summary' , 'TransferSummarySearch[start]' =>$today,'TransferSummarySearch[end]' => $tomorrow ] ];
 			$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
 			$items[] = ['label' => 'Zárások', 'url' => ['/collection/index' , 'CollectionSearch[start]' =>$todayDatetime,'CollectionSearch[end]' => $tomorrowDatetime ] ];
 			$this->menuItems[] = ['label' => 'Pénzügy', 'url' =>  $this->emptyUrl,
diff --git a/backend/controllers/TransferController.php b/backend/controllers/TransferController.php
index 17327b5..b7f7217 100644
--- a/backend/controllers/TransferController.php
+++ b/backend/controllers/TransferController.php
@@ -9,6 +9,7 @@ use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use common\models\Account;
 use common\models\User;
+use backend\models\TransferSummarySearch;
 
 /**
  * TransferController implements the CRUD actions for Transfer model.
@@ -23,7 +24,7 @@ class TransferController extends \backend\controllers\BackendController
 	        				'rules' => [
 	        						// allow authenticated users
 	        						[
-	        								'actions' => [ 'index','view' ],
+	        								'actions' => [ 'index','view','summary' ],
 	        								'allow' => true,
 	        								'roles' => ['admin','employee','reception'],
 	        						],
@@ -57,6 +58,29 @@ class TransferController extends \backend\controllers\BackendController
         ]);
     }
 
+    
+    
+    /**
+     * Lists all Transfer models.
+     * @return mixed
+     */
+    public function actionSummary()
+    {
+    	$searchModel = new TransferSummarySearch();
+    	$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+    
+    	$accounts = Account::read();
+    
+    	$users = User::read();
+    
+    	return $this->render('summary', [
+    			'searchModel' => $searchModel,
+    			'dataProvider' => $dataProvider,
+    			'accounts' => $accounts,
+    			'users' => $users,
+    	]);
+    }
+    
     /**
      * Displays a single Transfer model.
      * @param integer $id
diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php
index c76bc00..e2bd2a3 100644
--- a/backend/models/TransferSearch.php
+++ b/backend/models/TransferSearch.php
@@ -114,8 +114,9 @@ class TransferSearch extends Transfer
     	 
     	$accounts =  Account::read();
     	$accountMap = ArrayHelper::map( $accounts ,'id_account','name' );
-    	$idUser = Yii::$app->user->id;
+    	$idUser = $this->id_user;
     	 
+    	
     	$this->totals = Transfer::mkTotals($this->timestampStart, $this->timestampEnd, $idUser, $this->types, $this->id_account, $accounts, $accountMap);
     	 
     
diff --git a/backend/models/TransferSummarySearch.php b/backend/models/TransferSummarySearch.php
new file mode 100644
index 0000000..5570ea2
--- /dev/null
+++ b/backend/models/TransferSummarySearch.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Transfer;
+use yii\db\Expression;
+use yii\base\Object;
+use yii\db\Query;
+use yii\helpers\ArrayHelper;
+use common\models\Account;
+use common\components\Helper;
+use common\components\RoleDefinition;
+
+/**
+ * TransferSearch represents the model behind the search form about `common\models\Transfer`.
+ */
+class TransferSummarySearch extends Transfer
+{
+	public $searchObjectName;
+	public $searchTypeName;
+	public $searchUserName;
+	public $start;
+	public $end;
+	
+	public $timestampStart;
+	public $timestampEnd;
+	
+	
+	public $types;
+	
+	/**
+	 * all money gained with ticket sell
+	 * */
+	public $ticketMoney;
+	/**
+	 * all money gained with product sell grouped by category
+	 * */
+	public $productMoneies;
+	/**
+	 * all money lost by money movement 
+	 * */
+	public $moneyMovementMoneis;
+	/**
+	 * total gained money
+	 * */
+	public $total;
+	
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [[  'id_account','id_user', 'type'], 'integer'],
+//             [[ 'searchObjectName' ], 'string'],
+        	[[ 'start', ], 'date'  , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd'  ],
+        	[[ 'end' , ], 'date'    , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
+        	['types', 'each', 'rule' => ['integer']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+
+        
+        
+        $this->load($params);
+
+        if (!$this->validate()) {
+//             $query->where('0=1');
+//             return $dataProvider;
+        }
+
+        
+        $this->readTicketMoney();
+        $this->readProductsByCategory();
+        $this->readMoneyMovements();
+        $this->calcTotal();
+    }
+    
+    protected function calcTotal(){
+    	$this->total = 0;
+    	$this->total += $this->ticketMoney;
+    	$this->total -= $this->moneyMovementMoneis['money_movement_money'];
+    	foreach ($this->productMoneies as $pm ){
+    		$this->total += $pm['product_money'];
+    	}
+    }
+    
+    
+    protected function addQueryFilters($query){
+    	if ( !RoleDefinition::isAdmin() ){
+    		$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
+    		$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
+    	}
+
+    	$query->andFilterWhere([
+    			'transfer.id_account' => $this->id_account,
+    			'transfer.type' => $this->type,
+    			'transfer.id_user' => $this->id_user,
+    	]);
+    	
+    	$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ]  ];
+    	$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ]  ];
+    	
+    	
+    	$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
+    	
+    	$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
+    	
+    }
+    
+    
+    protected function readTicketMoney(){
+    	
+    	$query = (new \yii\db\Query());
+    	$query->select([' coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
+    	$query->from('transfer');
+    	$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
+    	$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
+    	$this->addQueryFilters($query);
+    	
+//     	$query = Transfer::find();
+//     	$query->andWhere(['type' => Transfer::TYPE_TICKET]);
+//     	$this->addQueryFilters($query);
+    	$this->ticketMoney = $query->scalar();
+		print_r($this->ticketMoney);
+    }
+    
+    protected function readProductsByCategory(){
+
+    	
+    	$query = (new \yii\db\Query());
+    	$query->select(['coalesce(sum(transfer.money),0) AS product_money', 'product_category.name as category_name']);
+    	$query->from('transfer');
+    	$query->groupBy(['product_category.id_product_category','product_category.name']);
+    	$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
+    	$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
+    	$query->innerJoin("product", "sale.id_product = product.id_product");
+    	$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
+    	$this->addQueryFilters($query);
+    	
+    	$this->productMoneies  = $query->all();
+    	
+    }
+    
+    
+    protected function readMoneyMovements(){
+    	$query = (new \yii\db\Query());
+    	$query->select([' coalesce(sum(abs(transfer.money)),0) AS money_movement_money']);
+    	$query->from('transfer');
+    	$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
+    	$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
+    	$this->addQueryFilters($query);
+    	 
+    	$this->moneyMovementMoneis  = $query->one();
+    }
+    
+    
+    
+}
diff --git a/backend/views/transfer/_search_summary.php b/backend/views/transfer/_search_summary.php
new file mode 100644
index 0000000..86b965a
--- /dev/null
+++ b/backend/views/transfer/_search_summary.php
@@ -0,0 +1,58 @@
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use frontend\components\HtmlHelper;
+use yii\helpers\ArrayHelper;
+use common\models\Transfer;
+use kartik\widgets\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\TransferSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+<?php 
+
+?>
+<div class="transfer-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['summary'],
+        'method' => 'get',
+    ]); ?>
+    
+    <div class='row'>
+		<div class='col-md-4'>
+	    	<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +HtmlHelper::mkAccountOptions($accounts) ) ?>
+		</div>
+		<div class='col-md-4'>
+	    	<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')]  +ArrayHelper::map($users,'id' , 'username') ) ?> 
+		</div>
+	</div>
+    
+    <div class="row">
+		<div class="col-md-4">
+		    <?= $form->field($model, 'start')->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+		<div class="col-md-4">
+		    <?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
+    			 'pluginOptions' => [
+				        'autoclose'=>true,
+				        'format' => 'yyyy.mm.dd'
+				    ]
+				])  ?>
+		</div>
+	</div>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php
index 8ddc5f9..02ad157 100644
--- a/backend/views/transfer/index.php
+++ b/backend/views/transfer/index.php
@@ -43,6 +43,10 @@ $this->params['breadcrumbs'][] = $this->title;
         'dataProvider' => $dataProvider,
         'columns' => [
 
+        		[
+        		'attribute' => 'id_transfer',
+        		'value' => 'id_transfer'
+        		],
         		[
         		'attribute' => 'type',
         		'value' => 'transferTypeName'
@@ -72,6 +76,7 @@ $this->params['breadcrumbs'][] = $this->title;
         			'value' => 'signedMoney'	
     			],
             'created_at:datetime',
+            'paid_at:datetime',
 
             ['class' => 'yii\grid\ActionColumn',
             'template' => '{view}'
diff --git a/backend/views/transfer/summary.php b/backend/views/transfer/summary.php
new file mode 100644
index 0000000..2f27a6e
--- /dev/null
+++ b/backend/views/transfer/summary.php
@@ -0,0 +1,73 @@
+<?php
+
+use yii\helpers\Html;
+ 
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\TransferSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('frontend/transfer', 'Transfers Summary');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<style>
+	.table-summary th
+	{
+		width: 200px;
+	}
+</style>
+
+<div class="transfer-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php  echo $this->render('_search_summary', ['model' => $searchModel, 'accounts' => $accounts,'users' => $users,]); ?>
+
+ 
+	
+	<h2>Bérletek összesen</h2>
+    <table class="table-bordered table-striped table-summary">
+    	<tbody>
+    	<tr>
+    		<th >Bérletek</th>
+    		<td><?php echo $searchModel->ticketMoney?> FT</td>
+    	</tr>
+    	</tbody>
+    </table>
+    <h2>Termékek összesen</h2>
+    <table class="table-bordered table-striped table-summary">
+    	<thead>
+    		<tr>
+    			<th>Termék kategória</th>
+    			<th>Összeg</th>
+    		</tr>
+    	</thead>
+    	<tbody>
+    	<tr>
+    		<?php
+    		foreach ($searchModel->productMoneies as $pm ){
+    		?>
+    		<th ><?php echo $pm['category_name'] ?></th>
+    		<td><?php echo $pm['product_money']?> FT</td>
+    		<?php } ?>
+    	</tr>
+    	</tbody>
+    </table>
+    <h2>Pénzmozgások összesen</h2>
+    <table class="table-bordered table-striped table-summary">
+    	<tbody>
+    	<tr>
+    		<th >Pénzmozgások</th>
+    		<td><?php echo $searchModel->moneyMovementMoneis['money_movement_money']?> FT</td>
+    	</tr>
+    	</tbody>
+    </table>
+    <h2>Bevétel összesen</h2>
+    <table class="table-bordered table-striped table-summary">
+    	<tbody>
+    	<tr>
+    		<th >Bérletek</th>
+    		<td><span style='border-bottom: 1px solid black'><?php echo $searchModel->total?> FT</span></td>
+    	</tr>
+    	</tbody>
+    </table>
+</div>
diff --git a/backend/views/transfer/view.php b/backend/views/transfer/view.php
index 7e648a4..d2f58e3 100644
--- a/backend/views/transfer/view.php
+++ b/backend/views/transfer/view.php
@@ -41,6 +41,7 @@ $this->params['breadcrumbs'][] = $this->title;
             'money',
             'comment',
             'created_at',
+        	'paid_at',
         ],
     ]) ?>
 
diff --git a/common/assets/TypeAheadAsset.php b/common/assets/TypeAheadAsset.php
new file mode 100644
index 0000000..7794e34
--- /dev/null
+++ b/common/assets/TypeAheadAsset.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+* @copyright Copyright (c) 2008 Yii Software LLC
+* @license http://www.yiiframework.com/license/
+*/
+
+namespace common\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class TypeAheadAsset extends AssetBundle
+{
+	public $sourcePath = '@vendor/bassjobsen/bootstrap-3-typeahead';
+	public $js = [
+			'bootstrap3-typeahead.min.js',
+	];
+	public $depends = [
+// 			'yii\bootstrap\BootstrapAsset',
+// 			'yii\bootstrap\BootstrapPluginAsset',
+	];
+}
diff --git a/common/messages/hu/frontend/transfer.php b/common/messages/hu/frontend/transfer.php
index f8379da..816b973 100644
--- a/common/messages/hu/frontend/transfer.php
+++ b/common/messages/hu/frontend/transfer.php
@@ -28,4 +28,5 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítás: ',
     'pieces' => 'db',
+	'Transfers Summary' => 'Bevétel'
 ];
diff --git a/common/models/Product.php b/common/models/Product.php
index 30544e8..94c04f7 100644
--- a/common/models/Product.php
+++ b/common/models/Product.php
@@ -168,6 +168,20 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	]);
     }
     
+    public static function modelToMapIdName($product,$default = null){
+    	 
+    	if ( $product == null ){
+    		return $default;
+    	}
+    	 
+    	return ArrayHelper::toArray($product, [
+    			'common\models\Product' => [
+    					'id_product',
+    					'name',    				 
+    					],
+    					]);
+    }
+    
     public static function sellProduct($product,$count){
     	$product->stock = $product->stock - $count;
     }
diff --git a/composer.json b/composer.json
index 3f207c2..43d682f 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,8 @@
         "yiisoft/yii2-jui": "^2.0",
         "bower-asset/moment": "^2.10",
         "bower-asset/accounting": "^0.3.2",
-        "dmstr/yii2-adminlte-asset": "2.*"
+        "dmstr/yii2-adminlte-asset": "2.*",
+        "bassjobsen/bootstrap-3-typeahead": "^4.0"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
diff --git a/composer.lock b/composer.lock
index ef0da64..f0c982d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "48dcd434e58d6b2167477f208c700dc3",
-    "content-hash": "2678695117e871d59f193589465751cf",
+    "hash": "acfc873fb659d08adc23d325138a56b2",
+    "content-hash": "28e2bce30da929c84bd2ac7cffd90f3f",
     "packages": [
         {
             "name": "almasaeed2010/adminlte",
@@ -47,6 +47,42 @@
             ],
             "time": "2015-10-23 14:50:49"
         },
+        {
+            "name": "bassjobsen/bootstrap-3-typeahead",
+            "version": "v4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bassjobsen/Bootstrap-3-Typeahead.git",
+                "reference": "516d96962e1d7fc7c3972c9bbba3b0a133ae9aae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bassjobsen/Bootstrap-3-Typeahead/zipball/516d96962e1d7fc7c3972c9bbba3b0a133ae9aae",
+                "reference": "516d96962e1d7fc7c3972c9bbba3b0a133ae9aae",
+                "shasum": ""
+            },
+            "type": "component",
+            "extra": {
+                "component": {
+                    "files": [
+                        "bootstrap3-typeahead.js",
+                        "bootstrap3-typeahead.min.js"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Bass Jobsen",
+                    "email": "bass@w3masters.nl"
+                }
+            ],
+            "description": "Bootstrap 3 Typeahead",
+            "time": "2015-11-14 22:02:27"
+        },
         {
             "name": "bower-asset/accounting",
             "version": "v0.3.2",
diff --git a/frontend/assets/ProductSellAsset.php b/frontend/assets/ProductSellAsset.php
index 30bed56..e7a4430 100644
--- a/frontend/assets/ProductSellAsset.php
+++ b/frontend/assets/ProductSellAsset.php
@@ -26,5 +26,7 @@ class ProductSellAsset extends AssetBundle
     public $depends = [
         'frontend\assets\AppAsset',
         'yii\jui\JuiAsset',
+    	'common\assets\TypeAheadAsset',
+    		
     ];
 }
diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php
index abb7a33..866a2dc 100644
--- a/frontend/controllers/ProductController.php
+++ b/frontend/controllers/ProductController.php
@@ -42,7 +42,7 @@ class ProductController extends Controller
             ],
         		'access' => [
         				'class' => \yii\filters\AccessControl::className(),
-        				'only' => [   'sale','payout-customer-cart','payout-user-cart', 'lookup'],
+        				'only' => [   'sale','payout-customer-cart','payout-user-cart', 'lookup','find'],
         				'rules' => [
         						// allow authenticated users
         						[
@@ -82,6 +82,11 @@ class ProductController extends Controller
     	$model->customer = $this->customer;
     	$model->card = $this->card;
     	
+    	$products = Product::read();
+    	$products = Product::modelToMapIdName($products);
+    	
+    	$model->products = $products;
+    	
     	if (Yii::$app->request->isAjax) {
     		
     		\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
@@ -203,6 +208,23 @@ class ProductController extends Controller
     	
     	
     	
+    	return $result;
+    }
+    
+    /**
+     */
+    public function actionFind($id=null)
+    {
+    	$result = [];
+    	$product = Product::findOne($id);
+    	$product = Product::modelToArray($product);
+    
+    	$result['product'] = $product;
+    	 
+    	\Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+    	 
+    	 
+    	 
     	return $result;
     }
 
diff --git a/frontend/models/ProductLookupForm.php b/frontend/models/ProductLookupForm.php
index 5486ec2..3da4082 100644
--- a/frontend/models/ProductLookupForm.php
+++ b/frontend/models/ProductLookupForm.php
@@ -14,6 +14,9 @@ class ProductLookupForm extends Model
 {
 	
 	public $filter_text;
+	public $product_search;
+	
+	
 	
 	
     /**
@@ -33,6 +36,7 @@ class ProductLookupForm extends Model
     {
         return [
             'filter_text' => Yii::t('frontend/product','Barcode or product code') ,
+        		'product_search' => Yii::t("frontend/product", "Name"),
         ];
     }
     
diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php
index 800f4e0..bc9f298 100644
--- a/frontend/models/ProductSaleForm.php
+++ b/frontend/models/ProductSaleForm.php
@@ -76,6 +76,8 @@ class ProductSaleForm extends Model
 	
 	public $customerCart;
 	
+	public $products;
+	
     /**
      * @inheritdoc
      */
diff --git a/frontend/views/product/_sale_form.php b/frontend/views/product/_sale_form.php
index ad3bcf5..9dea5f8 100644
--- a/frontend/views/product/_sale_form.php
+++ b/frontend/views/product/_sale_form.php
@@ -47,6 +47,8 @@ $discountOptions = mkOptions( ArrayHelper::map($discounts, 'id_discount', 'name'
 		    ],
 		]	)?>
 	<div class='col-md-12'>
+<!-- 		<input type='text' name='product_search' id="product_search" > -->
+		<?php  echo $form->field($lookupModel,'product_search')->textInput(['id'=>'product_search']); ?>
 		<?php  echo $form->field($lookupModel,'filter_text')->textInput(['id'=>'filter_text']); ?>
 	</div>
 	<?php    ActiveForm::end()?>
diff --git a/frontend/views/product/sale.php b/frontend/views/product/sale.php
index d07db23..82ebfd8 100644
--- a/frontend/views/product/sale.php
+++ b/frontend/views/product/sale.php
@@ -16,8 +16,10 @@ ProductSellAsset::register($this);
 $options = [];
 
 $options['lookup_product_url'] = Url::toRoute(['product/lookup']);
+$options['find_product_url'] = Url::toRoute(['product/find']);
 $options['url_pay_user_cart'] = Url::toRoute(['product/payout-user-cart']);
 $options['user_cart'] = $userTransfers;
+$options['products'] = $model->products;
 if ( isset($model->card) ){
 	$options['url_pay_customer_card'] = Url::toRoute(['product/payout-customer-cart','number' => $model->card->number]);
 	$options['customer_cart'] = $model->customerCart;
diff --git a/frontend/web/js/product.sell.js b/frontend/web/js/product.sell.js
index 0fb5a37..dcdff21 100644
--- a/frontend/web/js/product.sell.js
+++ b/frontend/web/js/product.sell.js
@@ -18,6 +18,7 @@ function ProductSell(o){
 		url_pay_user_cart: '',
 		/** ajax url for lookup service*/
 		lookup_product_url: '',
+		find_product_url: '',
 		/**the id of form*/
 	    selector_form: '#product_form',
 	    /**form contains error text*/
@@ -28,6 +29,7 @@ function ProductSell(o){
 	    discounts: [],
 	    customer_cart: [],
 	    id_account: null,
+	    products : [],
 	    
 	};
 	
@@ -51,6 +53,8 @@ function ProductSell(o){
 		
 		productChanged();
 		addDocumentKeypressedListener();
+		
+		initAutocomplete();
 	}
 	
 	/**
@@ -117,7 +121,7 @@ function ProductSell(o){
 			var word;
 			word = data.word;
 			if ( word.length > 0){
-				if ( word.length >= 6 && word.length <= 8 ){
+				if ( word.length >= 6 && word.length <= 9 ){
 					//lookupuser
 				}else{
 					$("#filter_text").val(data.word);
@@ -175,11 +179,20 @@ function ProductSell(o){
 		$(   app.defaults.selector_filter_text ).keypress(function( event ) {
 			  if ( event.which == 13 ) {
 				  event.preventDefault();
+				  $('#product_search').val('');
+				  $(this).val( fixBarcode($(this).val()));
 				  lookupProduct();
 			  }
 		});	
 	}
 	
+	function fixBarcode(s){
+		var result;
+		result = s;
+		result = result.replace(/ö/g, "0");
+		return result;
+	}
+	
 	/**listen for enter key pressed on #productsaleform-count*/
 	function addBehaviorCountEnterPressedListener(){
 		$(   '#productsaleform-count' ).keypress(function( event ) {
@@ -249,6 +262,22 @@ function ProductSell(o){
 		});
 	}
 	
+	function _findProduct(id){
+		var data, url;
+		
+		url = app.defaults.find_product_url;
+		data = {
+				'id' : 	id,
+		};
+		
+		$.ajax({
+			dataType: "json",
+			url: url,
+			data: data,
+			success: onLookupProductReady
+		});
+	}
+	
 	/**succes event handler after lookup product event*/
 	function onLookupProductReady(  data  ){
 		app.product = data.product;
@@ -278,6 +307,7 @@ function ProductSell(o){
 		$('#productsaleform-id_product').val('');
 		$('#productsaleform-id_account').val( app.defaults.id_account ?  app.defaults.id_account  : '');
 		$("#productsaleform-count").val(1);
+//		
 	}
 	
 	function applyProduct(product){
@@ -374,6 +404,7 @@ function ProductSell(o){
 			        		  clearForm();
 			        		  refreshCalculatedValues();
 			        		  $("#filter_text").val('');
+			        		  $("#product_search").val('');
 			        		  setFocus();
 			        		  app.defaults.user_cart = response.transfers; 
 			        		  app.defaults.customer_cart = response.customer_cart;
@@ -486,7 +517,7 @@ function ProductSell(o){
 	
 	function normalizePrice( price ){
 		var result;
-		result = hufRound(price);
+//		result = hufRound(price);
 		return result;
 	}
 	
@@ -499,4 +530,44 @@ function ProductSell(o){
         }
     }
 	
+	
+	function initAutocomplete(){
+//		var colors = ["red", "blue", "green", "yellow", "brown", "black"];
+//		$('#product_search').typeahead( {source: colors } );
+		
+		var $input = $('#product_search');
+		$input.typeahead({source: app.defaults.products, 
+		            autoSelect: true,
+		            items: 12,
+		            minLength: 3,
+//		            displayText: function (item){
+//		            	return item.
+//		            }
+		            
+		}); 
+		$input.change(function() {
+		    var current = $input.typeahead("getActive");
+		    $("#filter_text").val('');
+		    if (current) {
+		        // Some item from your model is active!
+		        if (current.name == $input.val()) {
+		            // This means the exact match is found. Use toLowerCase() if you want case insensitive match.
+		        	console.info(current);
+		        	_findProduct(current.id_product);
+		        } else {
+		            // This means it is only a partial match, you can either add a new item 
+		            // or take the active if you don't want new items
+		        	console.info('partial');
+		        	app.product = null;
+		        	productChanged();
+		        }
+		    } else {
+		        // Nothing is active so it is a new value (or maybe empty value)
+		    	console.info('incactive');
+		    	app.product = null;
+		    	productChanged();
+		    }
+		});
+	}
+	
 }

From 135d64e4c8ae2efca9cbc5fd73f4d2e3141b654b Mon Sep 17 00:00:00 2001
From: Schneider Roland <rocho02@gmail.com>
Date: Tue, 29 Dec 2015 22:34:39 +0100
Subject: [PATCH 100/100] change version to 0.0.9

---
 changelog.txt            | 5 +++++
 common/config/params.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 6913da3..decdb0b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+-0.0.9
+	add rfid_key to card and key
+	add typeahead to reception product/sale
+	add admin transaction/summary
+	fix admin transaction/index	 
 -0.0.8
 	fix account state on reception
 	add keys
diff --git a/common/config/params.php b/common/config/params.php
index 84a02bc..afd5a75 100644
--- a/common/config/params.php
+++ b/common/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail' => 'rocho02@gmail.com',
     'supportEmail' => 'rocho02@gmail.com',
     'user.passwordResetTokenExpire' => 3600,
-	'version' => 'v0.0.8'
+	'version' => 'v0.0.9'
 ];