fix merge conflicts

backend/controllers/CardController.php

@@ -13,6 +13,7 @@ use backend\models\CardImportRfidForm;
 use yii\web\UploadedFile;
 use common\components\Helper;
 use backend\models\CardInsertForm;
+use common\models\Ticket;
 
 /**
  * CardController implements the CRUD actions for Card model.
@@ -32,7 +33,8 @@ class CardController extends \backend\controllers\BackendController {
 												'update',
 												'list' ,
 												'import-rfid',
-												'insert'
+												'insert',
+												'recalculate',
 										],
 										'allow' => true,
 										'roles' => [ 
@@ -349,4 +351,21 @@ class CardController extends \backend\controllers\BackendController {
 	}
 	
 	
+	public function actionRecalculate(){
+		
+		if (Yii::$app->request->isPost) {
+			$connection = \Yii::$app->db;
+			$command = $connection->createCommand( Ticket::$SQL_UPDATE );
+			$result = $command->execute();
+			\Yii::info("Tickets updated: " . $result );
+			
+			
+			\Yii::$app->session->setFlash('success', 'Módosított bérletek száma: ' . $result);
+			
+		}
+		
+		return $this->render("recalculate");
+	}
+	
+	
 }

backend/controllers/InventoryController.php

@@ -0,0 +1,140 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\Inventory;
+use backend\models\InventorySearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use common\models\InventoryItem;
+use yii\data\ActiveDataProvider;
+use common\components\Helper;
+use common\models\User;
+use common\models\Product;
+use common\models\InventoryGroup;
+use yii\db\Expression;
+use yii\db\Query;
+use backend\models\InventoryItemSearch;
+
+/**
+ * InventoryController implements the CRUD actions for Inventory model.
+ */
+class InventoryController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Inventory models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new InventorySearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Inventory model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+    	$inventory = $this->findModel($id);
+    	
+    	$searchModel = new InventoryItemSearch(['inventory' => $inventory]);
+    	$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+    	 
+    	
+    	$query =  new Query(); 	
+    	
+        return $this->render('view', [
+            'model' => $inventory,
+        	'dataProvider' => $dataProvider
+        ]);
+    }
+
+    /**
+     * Creates a new Inventory model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Inventory();
+
+        $model->id_user = \Yii::$app->user->id;
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->id_inventory]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Inventory 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_inventory]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Inventory 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 Inventory model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Inventory the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Inventory::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}

backend/controllers/InventoryItemController.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use common\models\InventoryItem;
+use backend\models\InventoryItemSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+use backend\models\InventoryItemForm;
+use common\models\Inventory;
+
+/**
+ * InventoryItemController implements the CRUD actions for InventoryItem model.
+ */
+class InventoryItemController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all InventoryItem models.
+     * @return mixed
+     */
+    public function actionIndex($id)
+    {
+    	$inventory = Inventory::findOne($id);
+    	
+    	if ( !isset($inventory)){
+    		throw new NotFoundHttpException("Leltár nem található");
+    	}
+    	
+        $searchModel = new InventoryItemSearch(['inventory' => $inventory]);
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+        	'model' => $inventory,
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single InventoryItem model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new InventoryItem model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate($id)
+    {
+        $model = new InventoryItemForm([
+        		'id_inventory' => $id
+        ]);
+
+        $model->read();
+        
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['inventory-item/index', 'id' => $model->inventory->id_inventory]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing InventoryItem 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_inventory_item]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing InventoryItem model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $item = $this->findModel($id);
+        $id_inventory = $item->id_inventory;
+        $item->delete();
+
+        return $this->redirect(['index', 'id' => $id_inventory]);
+    }
+
+    /**
+     * Finds the InventoryItem model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return InventoryItem the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = InventoryItem::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}