From 1d3c47647673efc789eb9976ceaf55613e165029 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Mon, 7 Mar 2016 20:54:32 +0100 Subject: [PATCH 1/3] work on inventory --- backend/assets/InventoryItemCreateAsset.php | 31 ++ backend/components/AdminMenuStructure.php | 1 + backend/controllers/InventoryController.php | 122 ++++++++ .../controllers/InventoryItemController.php | 126 ++++++++ backend/models/InventoryItemForm.php | 268 ++++++++++++++++++ backend/models/InventoryItemSearch.php | 75 +++++ backend/models/InventorySearch.php | 67 +++++ backend/views/inventory-item/_form.php | 27 ++ backend/views/inventory-item/_search.php | 49 ++++ backend/views/inventory-item/create.php | 33 +++ backend/views/inventory-item/index.php | 45 +++ backend/views/inventory-item/update.php | 23 ++ backend/views/inventory-item/view.php | 46 +++ backend/views/inventory/_form.php | 22 ++ backend/views/inventory/_search.php | 33 +++ backend/views/inventory/create.php | 21 ++ backend/views/inventory/index.php | 36 +++ backend/views/inventory/update.php | 23 ++ backend/views/inventory/view.php | 36 +++ backend/web/js/inventory.item.create.js | 59 ++++ common/models/Inventory.php | 60 ++++ common/models/InventoryItem.php | 65 +++++ .../m160306_130115_add_inventory_item.php | 58 ++++ ...__column_id_inventory_prev__count_prev.php | 31 ++ 24 files changed, 1357 insertions(+) create mode 100644 backend/assets/InventoryItemCreateAsset.php create mode 100644 backend/controllers/InventoryController.php create mode 100644 backend/controllers/InventoryItemController.php create mode 100644 backend/models/InventoryItemForm.php create mode 100644 backend/models/InventoryItemSearch.php create mode 100644 backend/models/InventorySearch.php create mode 100644 backend/views/inventory-item/_form.php create mode 100644 backend/views/inventory-item/_search.php create mode 100644 backend/views/inventory-item/create.php create mode 100644 backend/views/inventory-item/index.php create mode 100644 backend/views/inventory-item/update.php create mode 100644 backend/views/inventory-item/view.php create mode 100644 backend/views/inventory/_form.php create mode 100644 backend/views/inventory/_search.php create mode 100644 backend/views/inventory/create.php create mode 100644 backend/views/inventory/index.php create mode 100644 backend/views/inventory/update.php create mode 100644 backend/views/inventory/view.php create mode 100644 backend/web/js/inventory.item.create.js create mode 100644 common/models/Inventory.php create mode 100644 common/models/InventoryItem.php create mode 100644 console/migrations/m160306_130115_add_inventory_item.php create mode 100644 console/migrations/m160307_174038_alter__tablle__inventory_item__add__column_id_inventory_prev__count_prev.php diff --git a/backend/assets/InventoryItemCreateAsset.php b/backend/assets/InventoryItemCreateAsset.php new file mode 100644 index 0000000..7390ed1 --- /dev/null +++ b/backend/assets/InventoryItemCreateAsset.php @@ -0,0 +1,31 @@ + + * @since 2.0 + */ +class InventoryItemCreateAsset extends AssetBundle +{ + public $basePath = '@webroot'; + public $baseUrl = '@web'; + public $css = [ + ]; + public $js = [ + 'js/app.js', + 'js/inventory.item.create.js', + ]; + public $depends = [ + 'backend\assets\AppAsset', + 'yii\jui\JuiAsset', + 'common\assets\TypeAheadAsset', + ]; +} diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php index 87910b8..bf08e95 100644 --- a/backend/components/AdminMenuStructure.php +++ b/backend/components/AdminMenuStructure.php @@ -91,6 +91,7 @@ class AdminMenuStructure{ $items[] = ['label' => 'Termékek', 'url' => ['/product/index'] ]; $items[] = ['label' => 'Beszerzések', 'url' => ['/procurement/index'] ]; $items[] = ['label' => 'Leltár csoport', 'url' => ['/inventory-group/index'] ]; + $items[] = ['label' => 'Leltár', 'url' => ['/inventory/index'] ]; $items[] = ['label' => 'Részletes eladások', 'url' => ['/transfer/sale' ,'TransferSaleSearch[start]' =>$todayDatetime,'TransferSaleSearch[end]' => $tomorrowDatetime ] ]; $items[] = ['label' => 'Termék összesítő', 'url' => ['/product/statistics' ,'ProductStatisticsSearch[start]' =>$todayDatetime,'ProductStatisticsSearch[end]' => $tomorrowDatetime ] ]; $this->menuItems[] = ['label' => 'Termékek', 'url' => $this->emptyUrl, diff --git a/backend/controllers/InventoryController.php b/backend/controllers/InventoryController.php new file mode 100644 index 0000000..6a11a94 --- /dev/null +++ b/backend/controllers/InventoryController.php @@ -0,0 +1,122 @@ + [ + '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) + { + return $this->render('view', [ + 'model' => $this->findModel($id), + ]); + } + + /** + * 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.'); + } + } +} diff --git a/backend/controllers/InventoryItemController.php b/backend/controllers/InventoryItemController.php new file mode 100644 index 0000000..bf679c0 --- /dev/null +++ b/backend/controllers/InventoryItemController.php @@ -0,0 +1,126 @@ + [ + 'class' => VerbFilter::className(), + 'actions' => [ + 'delete' => ['post'], + ], + ], + ]; + } + + /** + * Lists all InventoryItem models. + * @return mixed + */ + public function actionIndex() + { + $searchModel = new InventoryItemSearch(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + + return $this->render('index', [ + '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(['view', 'id' => $model->id_inventory_item]); + } 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) + { + $this->findModel($id)->delete(); + + return $this->redirect(['index']); + } + + /** + * 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.'); + } + } +} diff --git a/backend/models/InventoryItemForm.php b/backend/models/InventoryItemForm.php new file mode 100644 index 0000000..87372d6 --- /dev/null +++ b/backend/models/InventoryItemForm.php @@ -0,0 +1,268 @@ + false, 'skipOnError' => false], + ['id_product','validateId','skipOnEmpty' => false, 'skipOnError' => false] + + ]; + } + + public function validateType($attribute,$params){ + if ( array_search($this->type, ['product','group']) === false ){ + \Yii::error("Típus nem megfelelő: " . $this->type); + $this->addError("name","Nincs termék vagy termék csoport kiválasztva"); + } + } + + public function validateId($attribute,$params){ + if ( !$this->hasErrors('type')){ + if ( $this->type == 'group'){ + $this->inventoryGroup = InventoryGroup::findOne($this->id_product); + if ( !isset($this->inventoryGroup)){ + \Yii::error("Termék csoport nem található"); + $this->addError("name","Nincs termék vagy termék csoport kiválasztva"); + } + }else{ + $this->product = Product::findOne($this->id_product); + if ( !isset($this->product )){ + \Yii::error("Termék nem található"); + $this->addError("name","Nincs termék vagy termék csoport kiválasztva"); + } + } + } + } + + public function save(){ + if ( $this->validate()) { + + $this->loadLastInventoryItem(); + $this->loadProductIn(); + $this->loadProductSold(); + $this->loadProductStock(); + + $item = new InventoryItem(); + $item->count_in = $this->product_in; + $item->count_sold = $this->product_out; + $item->count = $this->product_stock; + + if ( isset( $this->lastInventoryItem ) ){ + $item->id_inventory_item_prev = $this->lastInventoryItem->id_inventory_item; + $item->count_prev = $this->lastInventoryItem->count; + }else{ + $item->count_prev = 0; + } + + $item->id_user = \Yii::$app->user->id; + + if ( $this->type == 'product'){ + $item->id_product = $this->product->id_product; + }else{ + $item->id_inventory_group = $this->inventoryGroup->id_inventory_group; + } + + if ( !$item->save() ){ + throw new \Exception("Nem sikerült a leltár végrehajtása"); + } + + + } + return false; + } + + protected function loadProductIn(){ + $query = new Query(); + $query->select(['sum(procurement.count) as total_in']); + $query->from(Procurement::tableName()); + $query->innerJoin(Product::tableName(),"product.id_product = procurement.id_product"); + + if ( isset($this->lastInventoryItem ) ){ + $query->andWhere([ '>', 'procurement.created_at' ,$this->lastInventoryItem->created_at]); + } + + if ( $this->type == 'product') { + $query->andWhere(['product.id_product' => $this->product->id_product]); + }else{ + $query->andWhere(['product.id_inventory_group' => $this->inventoryGroup->id_inventory_group]); + } + + $this->product_in = $query->scalar(); + + } + + protected function loadProductSold(){ + + $query = new Query(); + $query->select(['sum(transfer.count) as total_sold']); + $query->from(Transfer::tableName()); + $query->innerJoin(Product::tableName(),"product.id_product = transfer.id_object and transfer.type = " .Transfer::TYPE_PRODUCT); + $query->andWhere(['in', 'transfer.status' ,[Transfer::STATUS_PAID ,Transfer::STATUS_NOT_PAID ] ]); + $query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]); + + if ( $this->type == 'product') { + $query->andWhere(['product.id_product' => $this->product->id_product]); + }else{ + $query->andWhere(['product.id_inventory_group' => $this->inventoryGroup->id_inventory_group]); + } + + $this->product_out = $query->scalar(); + } + + protected function loadProductStock(){ + + $query = new Query(); + $query->select(['sum(product.stock) as total_stock']); + $query->from(Product::tableName()); + + if ( $this->type == 'product') { + $query->andWhere(['product.id_product' => $this->product->id_product]); + }else{ + $query->andWhere(['product.id_inventory_group' => $this->inventoryGroup->id_inventory_group]); + } + + $this->product_stock = $query->scalar(); + } + + + + + public function addProductItem(){ + + } + + public function addGroupItem(){ + + } + + /** + * Load previous inventory item, if exists + * */ + protected function loadLastInventoryItem( ){ + if ( isset( $this->lastInventory ) ){ + $query = InventoryItem::find(); + $query->andWhere(['id_inventory' => $this->lastInventory->id_inventory]); + + if ( $this->type == 'product'){ + $query->andWhere(['id_product' => $this->product->id_product]); + }else{ + $query->andWhere(['id_inventory_group' => $this->inventoryGroup->id_inventory_group]); + } + + $this->lastInventoryItem = $query->one(); + } + } + + public function read(){ + $this->loadInventory(); + $this->loadLastInventory(); + + $this->loadProducts(); + $this->loadInventoryGroups(); + + $this->buildProductList(); + + } + + public function loadInventory(){ + $this->inventory = Inventory::findOne($this->id_inventory); + if ( !isset( $this->inventory) ){ + throw new Exception("Nem található a leltár objektum"); + } + } + public function loadLastInventory(){ + $query = Inventory::find(); + $query->andWhere('<', 'inventory.created_at' , $this->inventory->created_at); + $query->orderBy(['created_at' => SORT_DESC ]); + //$this->lastInventory = + $query->limit(1)->all(); + } + + public function loadProducts(){ + $query = Product::find(); + $query->andWhere("id_inventory_group is null"); + $query->andWhere(['status' => Product::STATUS_ACTIVE]); + $this->products = $query->all(); + } + + public function loadInventoryGroups(){ + $query = InventoryGroup::find(); + $query->andWhere(['status' => Product::STATUS_ACTIVE]); + $this->inventoryGroups = $query->all(); + } + + public function buildProductList(){ + $this->productOptions = []; + + foreach ($this->products as $product ){ + $this->productOptions[]= [ 'type' =>'product', 'id' => $product->id_product ,'name' => $product->name . " (Termék/" .$product->productCategoryName ."/" . $product->accountName .")" ]; + + } + + foreach ($this->inventoryGroups as $inventoryGroup ){ + $this->productOptions[] = ['type' =>'group', 'id' =>$inventoryGroup->id_inventory_group ,'name' =>$inventoryGroup->name ."/Termékcsoport" ]; + + } + + } + + public function attributeLabels() + { + return [ + 'count' => 'Mennyiség' + ]; + } + + +} \ No newline at end of file diff --git a/backend/models/InventoryItemSearch.php b/backend/models/InventoryItemSearch.php new file mode 100644 index 0000000..ba44f59 --- /dev/null +++ b/backend/models/InventoryItemSearch.php @@ -0,0 +1,75 @@ + $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_inventory_item' => $this->id_inventory_item, + 'id_inventory' => $this->id_inventory, + 'count_in' => $this->count_in, + 'count_sold' => $this->count_sold, + 'count' => $this->count, + 'type' => $this->type, + 'id_product' => $this->id_product, + 'id_inventory_group' => $this->id_inventory_group, + 'id_user' => $this->id_user, + 'last_inventroy_at' => $this->last_inventroy_at, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]); + + return $dataProvider; + } +} diff --git a/backend/models/InventorySearch.php b/backend/models/InventorySearch.php new file mode 100644 index 0000000..81ff763 --- /dev/null +++ b/backend/models/InventorySearch.php @@ -0,0 +1,67 @@ + $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_inventory' => $this->id_inventory, + 'id_user' => $this->id_user, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]); + + return $dataProvider; + } +} diff --git a/backend/views/inventory-item/_form.php b/backend/views/inventory-item/_form.php new file mode 100644 index 0000000..0343c8d --- /dev/null +++ b/backend/views/inventory-item/_form.php @@ -0,0 +1,27 @@ + + +
+ + + + field($model, 'name')->textInput(['autocomplete' => 'off']) ?> + field($model, 'id_product')->hiddenInput()->label(false) ?> + field($model, 'type')->hiddenInput()->label(false) ?> + field($model, 'count')->textInput() ?> + + +
+ 'btn btn-success' ]) ?> +
+ + + +
diff --git a/backend/views/inventory-item/_search.php b/backend/views/inventory-item/_search.php new file mode 100644 index 0000000..6b31263 --- /dev/null +++ b/backend/views/inventory-item/_search.php @@ -0,0 +1,49 @@ + + +
+ + ['index'], + 'method' => 'get', + ]); ?> + + field($model, 'id_inventory_item') ?> + + field($model, 'id_inventory') ?> + + field($model, 'count_in') ?> + + field($model, 'count_sold') ?> + + field($model, 'count') ?> + + field($model, 'type') ?> + + field($model, 'id_product') ?> + + field($model, 'id_inventory_group') ?> + + field($model, 'id_user') ?> + + field($model, 'last_inventroy_at') ?> + + field($model, 'created_at') ?> + + field($model, 'updated_at') ?> + +
+ 'btn btn-primary']) ?> + 'btn btn-default']) ?> +
+ + + +
diff --git a/backend/views/inventory-item/create.php b/backend/views/inventory-item/create.php new file mode 100644 index 0000000..16056d1 --- /dev/null +++ b/backend/views/inventory-item/create.php @@ -0,0 +1,33 @@ +title = Yii::t('common/inventory-item', 'Új leltár elem'); +$this->params['breadcrumbs'][] = ['label' => 'Leltár' , 'url' => ['inventory/view', 'id' => $model->inventory->id_inventory]]; +$this->params['breadcrumbs'][] = $this->title; + +InventoryItemCreateAsset::register($this); + + +$options = []; +$options['products'] = $model->productOptions; +$options['url_product_find'] = Url::toRoute(['product/find']); + +$this->registerJs('inventoryItemCreate.init( '. json_encode($options) .' );'); + +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/inventory-item/index.php b/backend/views/inventory-item/index.php new file mode 100644 index 0000000..fb55dad --- /dev/null +++ b/backend/views/inventory-item/index.php @@ -0,0 +1,45 @@ +title = Yii::t('common/inventory-item', 'Inventory Items'); +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ render('_search', ['model' => $searchModel]); ?> + +

+ 'btn btn-success']) ?> +

+ + $dataProvider, + 'filterModel' => $searchModel, + 'columns' => [ + ['class' => 'yii\grid\SerialColumn'], + + 'id_inventory_item', + 'id_inventory', + 'count_in', + 'count_sold', + 'count', + // 'type', + // 'id_product', + // 'id_inventory_group', + // 'id_user', + // 'last_inventroy_at', + // 'created_at', + // 'updated_at', + + ['class' => 'yii\grid\ActionColumn'], + ], + ]); ?> + +
diff --git a/backend/views/inventory-item/update.php b/backend/views/inventory-item/update.php new file mode 100644 index 0000000..cba8142 --- /dev/null +++ b/backend/views/inventory-item/update.php @@ -0,0 +1,23 @@ +title = Yii::t('common/inventory-item', 'Update {modelClass}: ', [ + 'modelClass' => 'Inventory Item', +]) . ' ' . $model->id_inventory_item; +$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory-item', 'Inventory Items'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->id_inventory_item, 'url' => ['view', 'id' => $model->id_inventory_item]]; +$this->params['breadcrumbs'][] = Yii::t('common/inventory-item', 'Update'); +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/inventory-item/view.php b/backend/views/inventory-item/view.php new file mode 100644 index 0000000..917f066 --- /dev/null +++ b/backend/views/inventory-item/view.php @@ -0,0 +1,46 @@ +title = $model->id_inventory_item; +$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory-item', 'Inventory Items'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ +

+ $model->id_inventory_item], ['class' => 'btn btn-primary']) ?> + $model->id_inventory_item], [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => Yii::t('common/inventory-item', 'Are you sure you want to delete this item?'), + 'method' => 'post', + ], + ]) ?> +

+ + $model, + 'attributes' => [ + 'id_inventory_item', + 'id_inventory', + 'count_in', + 'count_sold', + 'count', + 'type', + 'id_product', + 'id_inventory_group', + 'id_user', + 'last_inventroy_at', + 'created_at', + 'updated_at', + ], + ]) ?> + +
diff --git a/backend/views/inventory/_form.php b/backend/views/inventory/_form.php new file mode 100644 index 0000000..0b494ff --- /dev/null +++ b/backend/views/inventory/_form.php @@ -0,0 +1,22 @@ + + +
+ + + + +
+ isNewRecord ? Yii::t('common/inventory', 'Létrehoz') : Yii::t('common/inventory', 'Módosít'), [ 'name'=>'Inventory[submit]' ,'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> +
+ + + +
diff --git a/backend/views/inventory/_search.php b/backend/views/inventory/_search.php new file mode 100644 index 0000000..48ba4bc --- /dev/null +++ b/backend/views/inventory/_search.php @@ -0,0 +1,33 @@ + + +
+ + ['index'], + 'method' => 'get', + ]); ?> + + field($model, 'id_inventory') ?> + + field($model, 'id_user') ?> + + field($model, 'created_at') ?> + + field($model, 'updated_at') ?> + +
+ 'btn btn-primary']) ?> + 'btn btn-default']) ?> +
+ + + +
diff --git a/backend/views/inventory/create.php b/backend/views/inventory/create.php new file mode 100644 index 0000000..0bb57b8 --- /dev/null +++ b/backend/views/inventory/create.php @@ -0,0 +1,21 @@ +title = Yii::t('common/inventory', 'Új leltár'); +$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Leltár lista'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/inventory/index.php b/backend/views/inventory/index.php new file mode 100644 index 0000000..497e02b --- /dev/null +++ b/backend/views/inventory/index.php @@ -0,0 +1,36 @@ +title = Yii::t('common/inventory', 'Leltár lista'); +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ render('_search', ['model' => $searchModel]); ?> + +

+ 'btn btn-success']) ?> +

+ + $dataProvider, + 'columns' => [ + + 'id_inventory', + 'id_user', + 'created_at:datetime', + + ['class' => 'yii\grid\ActionColumn', + 'template' => '{view}' + ], + ], + ]); ?> + +
diff --git a/backend/views/inventory/update.php b/backend/views/inventory/update.php new file mode 100644 index 0000000..218789b --- /dev/null +++ b/backend/views/inventory/update.php @@ -0,0 +1,23 @@ +title = Yii::t('common/inventory', 'Update {modelClass}: ', [ + 'modelClass' => 'Inventory', +]) . ' ' . $model->id_inventory; +$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Inventories'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->id_inventory, 'url' => ['view', 'id' => $model->id_inventory]]; +$this->params['breadcrumbs'][] = Yii::t('common/inventory', 'Update'); +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/inventory/view.php b/backend/views/inventory/view.php new file mode 100644 index 0000000..aa005bf --- /dev/null +++ b/backend/views/inventory/view.php @@ -0,0 +1,36 @@ +title = $model->id_inventory; +$this->params['breadcrumbs'][] = ['label' => Yii::t('common/inventory', 'Leltár lista'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = "Leltár"; +?> +
+ +

+ + + $model, + 'attributes' => [ + 'id_inventory', + ['attribute'=>'id_user', + 'value'=>$model->userName + ], + 'created_at:datetime', + ], + ]) ?> + + + +
+ +

+ $model->id_inventory], ['class' => 'btn btn-success']) ?> +

+ diff --git a/backend/web/js/inventory.item.create.js b/backend/web/js/inventory.item.create.js new file mode 100644 index 0000000..3565db0 --- /dev/null +++ b/backend/web/js/inventory.item.create.js @@ -0,0 +1,59 @@ + + +var inventoryItemCreate = { + + defaults : { + products: [], + selector_type : '#inventoryitemform-type', + selector_name : '#inventoryitemform-name', + selector_id : '#inventoryitemform-id_product', + }, + product: null, + init: function(o){ + this.defaults = $.extend( this.defaults, o ); + console.info(this.defaults.products); + this.initAutocomplete(); + + }, + + initAutocomplete : function (){ + var self = this; + + var $input = $(self.defaults.selector_name); + $input.typeahead({source : self.defaults.products, + autoSelect: true, + items: 20, + minLength: 3, + }); + $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()) { + self.product = current; + } else { + self.product = null; + } + } else { + self.product = null; + } + self.productChange(); + }); + }, + productChange: function( ){ + this.clearProductData(); + this.setProductData(); + }, + clearProductData: function(){ + $(this.defaults.selector_type).val(''); + $(this.defaults.selector_id).val(''); + }, + setProductData: function(){ + if ( this.product ){ + $(this.defaults.selector_type).val( this.product.type); + $(this.defaults.selector_id).val( this.product.id); + } + + } +} \ No newline at end of file diff --git a/common/models/Inventory.php b/common/models/Inventory.php new file mode 100644 index 0000000..aaf14a0 --- /dev/null +++ b/common/models/Inventory.php @@ -0,0 +1,60 @@ + Yii::t('common/inventory', 'Leltár azonosító'), + 'id_user' => Yii::t('common/inventory', 'Felhasználó'), + 'created_at' => Yii::t('common/inventory', 'Létrehozás'), + 'updated_at' => Yii::t('common/inventory', 'Módosítás'), + ]; + } + + /** + * @inheritdoc + */ + public function behaviors() + { + return ArrayHelper::merge( [ + [ + 'class' => UserAwareBehavior::className(), + ] + ], parent::behaviors()); + } +} diff --git a/common/models/InventoryItem.php b/common/models/InventoryItem.php new file mode 100644 index 0000000..ab1ab53 --- /dev/null +++ b/common/models/InventoryItem.php @@ -0,0 +1,65 @@ + Yii::t('common/inventory_item', 'Id Inventory Item'), + 'id_inventory' => Yii::t('common/inventory_item', 'Id Inventory'), + 'count_in' => Yii::t('common/inventory_item', 'Count In'), + 'count_sold' => Yii::t('common/inventory_item', 'Count Sold'), + 'count' => Yii::t('common/inventory_item', 'Count'), + 'type' => Yii::t('common/inventory_item', 'Type'), + 'id_product' => Yii::t('common/inventory_item', 'Id Product'), + 'id_inventory_group' => Yii::t('common/inventory_item', 'Id Inventory Group'), + 'id_user' => Yii::t('common/inventory_item', 'Id User'), + 'last_inventroy_at' => Yii::t('common/inventory_item', 'Last Inventroy At'), + 'created_at' => Yii::t('common/inventory_item', 'Created At'), + 'updated_at' => Yii::t('common/inventory_item', 'Updated At'), + ]; + } + +} diff --git a/console/migrations/m160306_130115_add_inventory_item.php b/console/migrations/m160306_130115_add_inventory_item.php new file mode 100644 index 0000000..a37a2eb --- /dev/null +++ b/console/migrations/m160306_130115_add_inventory_item.php @@ -0,0 +1,58 @@ +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('{{%inventory}}', [ + 'id_inventory' => $this->primaryKey(), + 'id_user' => $this->integer(11), + 'created_at' => $this->dateTime()->notNull(), + 'updated_at' => $this->dateTime()->notNull(), + ], $tableOptions); + + $this->createTable('{{%inventory_item}}', [ + 'id_inventory_item' => $this->primaryKey(), + 'id_inventory' => $this->integer(11), + 'count_in' => $this->integer(11), + 'count_sold' => $this->integer(11), + 'count' => $this->integer(11), + 'type' => $this->integer(11), + 'id_product' => $this->integer(11), + 'id_inventory_group' => $this->integer(11), + 'id_user' => $this->integer(11), + 'last_inventroy_at' => $this->dateTime(), + 'created_at' => $this->dateTime()->notNull(), + 'updated_at' => $this->dateTime()->notNull(), + ], $tableOptions); + + } + + public function down() + { + echo "m160306_130115_add_inventory_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/console/migrations/m160307_174038_alter__tablle__inventory_item__add__column_id_inventory_prev__count_prev.php b/console/migrations/m160307_174038_alter__tablle__inventory_item__add__column_id_inventory_prev__count_prev.php new file mode 100644 index 0000000..bb5dbe5 --- /dev/null +++ b/console/migrations/m160307_174038_alter__tablle__inventory_item__add__column_id_inventory_prev__count_prev.php @@ -0,0 +1,31 @@ +addColumn("inventory_item", "id_inventory_item_prev", "int"); + $this->addColumn("inventory_item", "count_prev", "int"); + $this->dropColumn("inventory_item", 'last_inventroy_at'); + } + + public function down() + { + echo "m160307_174038_alter__tablle__inventory_item__add__column_id_inventory_prev__count_prev cannot be reverted.\n"; + + return false; + } + + /* + // Use safeUp/safeDown to run migration code within a transaction + public function safeUp() + { + } + + public function safeDown() + { + } + */ +} From 42c326f4076f8b37a6cfd9b403f5094802073b69 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Wed, 9 Mar 2016 20:16:19 +0100 Subject: [PATCH 2/3] add card.flag implementation --- backend/controllers/CardController.php | 21 +++- backend/controllers/InventoryController.php | 20 +++- .../controllers/InventoryItemController.php | 20 +++- backend/models/DoorLogSearch.php | 7 +- backend/models/InventoryItemForm.php | 33 +++--- backend/models/InventoryItemSearch.php | 55 +++++++-- backend/views/card/recalculate.php | 15 +++ backend/views/door-log/index.php | 7 ++ backend/views/inventory-item/_search.php | 1 - backend/views/inventory-item/index.php | 108 ++++++++++++++---- backend/views/inventory-item/view.php | 1 - backend/views/inventory/index.php | 9 +- backend/views/inventory/view.php | 52 +++++++++ common/models/Card.php | 6 + common/models/DoorLog.php | 9 ++ common/models/InventoryItem.php | 72 +++++++++++- common/models/Ticket.php | 23 ++++ common/models/Transfer.php | 1 + console/config/main.php | 2 +- console/controllers/TicketController.php | 21 ++++ .../m160308_201451_add_door_flag.php | 31 +++++ cutler_daily.sh | 2 + frontend/models/ReceptionForm.php | 2 + frontend/models/TicketCreate.php | 6 + frontend/views/common/_reception_ticket.php | 53 +++++---- 25 files changed, 497 insertions(+), 80 deletions(-) create mode 100644 backend/views/card/recalculate.php create mode 100644 console/controllers/TicketController.php create mode 100644 console/migrations/m160308_201451_add_door_flag.php create mode 100644 cutler_daily.sh diff --git a/backend/controllers/CardController.php b/backend/controllers/CardController.php index f1bb0cf..401c718 100644 --- a/backend/controllers/CardController.php +++ b/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"); + } + + } diff --git a/backend/controllers/InventoryController.php b/backend/controllers/InventoryController.php index 6a11a94..e9e2077 100644 --- a/backend/controllers/InventoryController.php +++ b/backend/controllers/InventoryController.php @@ -8,6 +8,15 @@ 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. @@ -48,8 +57,17 @@ class InventoryController extends Controller */ 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' => $this->findModel($id), + 'model' => $inventory, + 'dataProvider' => $dataProvider ]); } diff --git a/backend/controllers/InventoryItemController.php b/backend/controllers/InventoryItemController.php index bf679c0..f5d1fb0 100644 --- a/backend/controllers/InventoryItemController.php +++ b/backend/controllers/InventoryItemController.php @@ -9,6 +9,7 @@ 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. @@ -31,12 +32,19 @@ class InventoryItemController extends Controller * Lists all InventoryItem models. * @return mixed */ - public function actionIndex() + public function actionIndex($id) { - $searchModel = new InventoryItemSearch(); + $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, ]); @@ -68,7 +76,7 @@ class InventoryItemController extends Controller $model->read(); if ($model->load(Yii::$app->request->post()) && $model->save()) { - return $this->redirect(['view', 'id' => $model->id_inventory_item]); + return $this->redirect(['inventory-item/index', 'id' => $model->inventory->id_inventory]); } else { return $this->render('create', [ 'model' => $model, @@ -103,9 +111,11 @@ class InventoryItemController extends Controller */ public function actionDelete($id) { - $this->findModel($id)->delete(); + $item = $this->findModel($id); + $id_inventory = $item->id_inventory; + $item->delete(); - return $this->redirect(['index']); + return $this->redirect(['index', 'id' => $id_inventory]); } /** diff --git a/backend/models/DoorLogSearch.php b/backend/models/DoorLogSearch.php index 07d00e7..26d38b3 100644 --- a/backend/models/DoorLogSearch.php +++ b/backend/models/DoorLogSearch.php @@ -82,7 +82,8 @@ class DoorLogSearch extends DoorLog 'door_log.direction as door_log_direction', 'door_log.created_at as door_log_created_at', 'door_log.source_app as door_log_source_app', - 'account.name as account_name' + 'account.name as account_name', + 'door_log.card_flag as door_log_card_flag', ]); $query->from('door_log'); $query->innerJoin('card','card.id_card = door_log.id_card'); @@ -131,6 +132,10 @@ class DoorLogSearch extends DoorLog 'account_name' =>[ 'asc' => ['account.name' => SORT_ASC ], 'desc' => ['account.name' => SORT_DESC], + ], + 'door_log_card_flag' =>[ + 'asc' => ['door_log_card_flag' => SORT_ASC ], + 'desc' => ['door_log_card_flag' => SORT_DESC], ] ], ] diff --git a/backend/models/InventoryItemForm.php b/backend/models/InventoryItemForm.php index 87372d6..f92cbfd 100644 --- a/backend/models/InventoryItemForm.php +++ b/backend/models/InventoryItemForm.php @@ -17,6 +17,7 @@ use common\models\InventoryItem; use yii\db\Query; use common\models\Procurement; use common\models\Transfer; +use common\models\Sale; /** * ContactForm is the model behind the contact form. @@ -32,7 +33,7 @@ class InventoryItemForm extends Model{ /**common data*/ public $inventory; - public $lastInventory; + public $last_inventory; public $id_inventory; public $products; public $inventoryGroups; @@ -48,6 +49,8 @@ class InventoryItemForm extends Model{ public $product_in; public $product_out; public $product_stock; + public $last_inventory_item; + public $inventory_item; public function rules(){ return [ @@ -98,9 +101,9 @@ class InventoryItemForm extends Model{ $item->count_sold = $this->product_out; $item->count = $this->product_stock; - if ( isset( $this->lastInventoryItem ) ){ - $item->id_inventory_item_prev = $this->lastInventoryItem->id_inventory_item; - $item->count_prev = $this->lastInventoryItem->count; + if ( isset( $this->last_inventory_item ) ){ + $item->id_inventory_item_prev = $this->last_inventory_item->id_inventory_item; + $item->count_prev = $this->last_inventory_item->count; }else{ $item->count_prev = 0; } @@ -112,11 +115,13 @@ class InventoryItemForm extends Model{ }else{ $item->id_inventory_group = $this->inventoryGroup->id_inventory_group; } + $item->id_inventory = $this->inventory->id_inventory; if ( !$item->save() ){ throw new \Exception("Nem sikerült a leltár végrehajtása"); } - + $this->inventory_item = $item; + return true; } return false; @@ -128,8 +133,8 @@ class InventoryItemForm extends Model{ $query->from(Procurement::tableName()); $query->innerJoin(Product::tableName(),"product.id_product = procurement.id_product"); - if ( isset($this->lastInventoryItem ) ){ - $query->andWhere([ '>', 'procurement.created_at' ,$this->lastInventoryItem->created_at]); + if ( isset($this->last_inventory_item ) ){ + $query->andWhere([ '>', 'procurement.created_at' ,$this->last_inventory_item->created_at]); } if ( $this->type == 'product') { @@ -147,7 +152,8 @@ class InventoryItemForm extends Model{ $query = new Query(); $query->select(['sum(transfer.count) as total_sold']); $query->from(Transfer::tableName()); - $query->innerJoin(Product::tableName(),"product.id_product = transfer.id_object and transfer.type = " .Transfer::TYPE_PRODUCT); + $query->innerJoin(Sale::tableName(),"sale.id_sale = transfer.id_object and transfer.type = " .Transfer::TYPE_PRODUCT); + $query->innerJoin(Product::tableName(),"product.id_product = sale.id_product "); $query->andWhere(['in', 'transfer.status' ,[Transfer::STATUS_PAID ,Transfer::STATUS_NOT_PAID ] ]); $query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]); @@ -190,9 +196,9 @@ class InventoryItemForm extends Model{ * Load previous inventory item, if exists * */ protected function loadLastInventoryItem( ){ - if ( isset( $this->lastInventory ) ){ + if ( isset( $this->last_inventory ) ){ $query = InventoryItem::find(); - $query->andWhere(['id_inventory' => $this->lastInventory->id_inventory]); + $query->andWhere(['id_inventory' => $this->last_inventory->id_inventory]); if ( $this->type == 'product'){ $query->andWhere(['id_product' => $this->product->id_product]); @@ -200,7 +206,7 @@ class InventoryItemForm extends Model{ $query->andWhere(['id_inventory_group' => $this->inventoryGroup->id_inventory_group]); } - $this->lastInventoryItem = $query->one(); + $this->last_inventory_item = $query->one(); } } @@ -223,10 +229,9 @@ class InventoryItemForm extends Model{ } public function loadLastInventory(){ $query = Inventory::find(); - $query->andWhere('<', 'inventory.created_at' , $this->inventory->created_at); + $query->andWhere(['<', 'inventory.created_at' , $this->inventory->created_at]); $query->orderBy(['created_at' => SORT_DESC ]); - //$this->lastInventory = - $query->limit(1)->all(); + $this->last_inventory =$query->limit(1)->one(); } public function loadProducts(){ diff --git a/backend/models/InventoryItemSearch.php b/backend/models/InventoryItemSearch.php index ba44f59..58b1983 100644 --- a/backend/models/InventoryItemSearch.php +++ b/backend/models/InventoryItemSearch.php @@ -6,12 +6,20 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\InventoryItem; +use yii\db\Query; +use yii\db\Expression; +use common\models\User; +use common\models\Product; +use common\models\InventoryGroup; +use common\components\Helper; /** * InventoryItemSearch represents the model behind the search form about `common\models\InventoryItem`. */ class InventoryItemSearch extends InventoryItem { + public $inventory; + /** * @inheritdoc */ @@ -19,7 +27,6 @@ class InventoryItemSearch extends InventoryItem { return [ [['id_inventory_item', 'id_inventory', 'count_in', 'count_sold', 'count', 'type', 'id_product', 'id_inventory_group', 'id_user'], 'integer'], - [['last_inventroy_at', 'created_at', 'updated_at'], 'safe'], ]; } @@ -41,12 +48,45 @@ class InventoryItemSearch extends InventoryItem */ public function search($params) { - $query = InventoryItem::find(); - - $dataProvider = new ActiveDataProvider([ - 'query' => $query, - ]); - + $query = new Query(); + $query->select([ + 'inventory_item.id_inventory_item as item_id_inventory_item', + 'inventory_item.created_at as item_created_at', + new Expression('case when inventory_item.id_product is null then inventory_group.name else product.name end as item_name'), + 'user.username as user_username', + 'coalesce(inventory_item.count_prev ,0)as item_count_prev', + 'coalesce(inventory_item.count_in,0) as item_count_in', + 'coalesce(inventory_item.count_sold,0) as item_count_sold', + 'coalesce(inventory_item.count,0) as item_count', + new Expression('(inventory_item.count - ( inventory_item.count_prev + inventory_item.count_in - inventory_item.count_sold )) as item_difference'), + ]); + $query->from(InventoryItem::tableName()); + + + $query->innerJoin(User::tableName(), "user.id = inventory_item.id_user"); + $query->leftJoin(Product::tableName(), "product.id_product = inventory_item.id_product"); + $query->leftJoin(InventoryGroup::tableName(), "inventory_group.id_inventory_group = inventory_item.id_inventory_group"); + + $query->andWhere( ['id_inventory' => $this->inventory->id_inventory] ); + + $dataProvider = new ActiveDataProvider( + ['query' => $query , + 'sort' => [ + 'attributes' => Helper::mkYiiSortItems([ + ['item_created_at', 'item_created_at'], + ['item_name', 'item_name'], + ['user_username', 'user_username'], + ['item_count_prev', 'item_count_prev'], + ['item_count_sold', 'item_count_sold'], + ['item_count_in', 'item_count_in'], + ['item_count', 'item_count'], + ['item_count', 'item_count'], + ['item_difference', 'item_difference'], + ]) + , + ] + ] + ); $this->load($params); if (!$this->validate()) { @@ -65,7 +105,6 @@ class InventoryItemSearch extends InventoryItem 'id_product' => $this->id_product, 'id_inventory_group' => $this->id_inventory_group, 'id_user' => $this->id_user, - 'last_inventroy_at' => $this->last_inventroy_at, 'created_at' => $this->created_at, 'updated_at' => $this->updated_at, ]); diff --git a/backend/views/card/recalculate.php b/backend/views/card/recalculate.php new file mode 100644 index 0000000..aa4557e --- /dev/null +++ b/backend/views/card/recalculate.php @@ -0,0 +1,15 @@ + +

+ Bérletek kapu flag -jének újraszámolása +

+ 'btn btn-danger', + 'data' => [ + 'method' => 'post', + ], +]) ?> \ No newline at end of file diff --git a/backend/views/door-log/index.php b/backend/views/door-log/index.php index 50ed7d0..b39d33b 100644 --- a/backend/views/door-log/index.php +++ b/backend/views/door-log/index.php @@ -61,6 +61,13 @@ $this->params['breadcrumbs'][] = $this->title; 'value' => function ($model, $key, $index, $column){ return Helper::getArrayValue(DoorLog::getDirectionTypes(), $model['door_log_direction'],"-" ); } + ], + [ + 'attribute' => 'door_log_card_flag', + 'label' => 'Info', + 'value' => function ($model, $key, $index, $column){ + return Helper::getArrayValue(DoorLog::getCardFlagTexts(), $model['door_log_card_flag'],"-" ); + } ], [ 'attribute' => 'door_log_source_app', diff --git a/backend/views/inventory-item/_search.php b/backend/views/inventory-item/_search.php index 6b31263..1491d16 100644 --- a/backend/views/inventory-item/_search.php +++ b/backend/views/inventory-item/_search.php @@ -33,7 +33,6 @@ use yii\widgets\ActiveForm; field($model, 'id_user') ?> - field($model, 'last_inventroy_at') ?> field($model, 'created_at') ?> diff --git a/backend/views/inventory-item/index.php b/backend/views/inventory-item/index.php index fb55dad..02f25ae 100644 --- a/backend/views/inventory-item/index.php +++ b/backend/views/inventory-item/index.php @@ -2,44 +2,102 @@ use yii\helpers\Html; use yii\grid\GridView; +use yii\widgets\DetailView; +use yii\helpers\Url; /* @var $this yii\web\View */ /* @var $searchModel backend\models\InventoryItemSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ -$this->title = Yii::t('common/inventory-item', 'Inventory Items'); +$this->title = Yii::t('common/inventory-item', 'Leltár részletei'); $this->params['breadcrumbs'][] = $this->title; ?>

title) ?>

+ + $model, + 'attributes' => [ + 'id_inventory', + ['attribute'=>'id_user', + 'value'=>$model->userName + ], + 'created_at:datetime', + ], + ]) ?> + render('_search', ['model' => $searchModel]); ?> -

- 'btn btn-success']) ?> -

- $dataProvider, - 'filterModel' => $searchModel, - 'columns' => [ - ['class' => 'yii\grid\SerialColumn'], +

+ $model->id_inventory], ['class' => 'btn btn-success']) ?> +

- 'id_inventory_item', - 'id_inventory', - 'count_in', - 'count_sold', - 'count', - // 'type', - // 'id_product', - // 'id_inventory_group', - // 'id_user', - // 'last_inventroy_at', - // 'created_at', - // 'updated_at', - - ['class' => 'yii\grid\ActionColumn'], - ], - ]); ?> + $dataProvider, + 'columns' =>[ + [ + 'attribute' => 'item_created_at', + 'label' => 'Létrehozva', + 'format' => 'datetime' + ], + [ + 'attribute' => 'item_name', + 'label' => 'Név', + + ], + [ + 'attribute' => 'user_username', + 'label' => 'Felhasználó', + + ], + [ + 'attribute' => 'item_count_prev', + 'label' => 'Előzö leltár (db)' + + ], + [ + 'attribute' => 'item_count_in', + 'label' => 'Beszerzett mennyiség (db)' + + ], + [ + 'attribute' => 'item_count_sold', + 'label' => 'Eladott mennyiség (db)', + + ], + [ + 'attribute' => 'item_count', + 'label' => 'Leltározott mennyiség (db)', + + ], + [ + 'attribute' => 'item_difference', + 'label' => 'Különbség (db)', + + ], + ['class' => 'yii\grid\ActionColumn', + 'template' => '{delete}', + 'urlCreator' => function ($action, $model, $key, $index){ + return Url::to(['inventory-item/delete', 'id' => $model['item_id_inventory_item' ] ]) ; + }, + 'buttons' =>[ + 'delete' =>function ($url, $model, $key) { + return Html::a('Törlés', $url,['class' => 'btn btn-xs btn-danger', + 'data' => [ + 'confirm' => Yii::t('common/inventory-item', 'Biztosan törlöd ezt az elemet?'), + 'method' => 'post', + ], + ]) ; + } + ] + + ] + ] + + ]); + ?>
diff --git a/backend/views/inventory-item/view.php b/backend/views/inventory-item/view.php index 917f066..094f06c 100644 --- a/backend/views/inventory-item/view.php +++ b/backend/views/inventory-item/view.php @@ -37,7 +37,6 @@ $this->params['breadcrumbs'][] = $this->title; 'id_product', 'id_inventory_group', 'id_user', - 'last_inventroy_at', 'created_at', 'updated_at', ], diff --git a/backend/views/inventory/index.php b/backend/views/inventory/index.php index 497e02b..e9f0c3f 100644 --- a/backend/views/inventory/index.php +++ b/backend/views/inventory/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\InventorySearch */ @@ -28,7 +29,13 @@ $this->params['breadcrumbs'][] = $this->title; 'created_at:datetime', ['class' => 'yii\grid\ActionColumn', - 'template' => '{view}' + 'template' => '{view}', + 'urlCreator' => function( $action, $model, $key, $index ){ + if ( $action == 'view' ){ + return Url::to(['inventory-item/index' , 'id'=> $model->id_inventory]); + } + } + ], ], ]); ?> diff --git a/backend/views/inventory/view.php b/backend/views/inventory/view.php index aa005bf..580a5d5 100644 --- a/backend/views/inventory/view.php +++ b/backend/views/inventory/view.php @@ -2,6 +2,8 @@ use yii\helpers\Html; use yii\widgets\DetailView; +use yii\grid\GridView; +use yii\base\Widget; /* @var $this yii\web\View */ /* @var $model common\models\Inventory */ @@ -33,4 +35,54 @@ $this->params['breadcrumbs'][] = "Leltár";

$model->id_inventory], ['class' => 'btn btn-success']) ?>

+ + $dataProvider, + 'columns' =>[ + [ + 'attribute' => 'item_created_at', + 'label' => 'Létrehozva', + 'format' => 'datetime' + ], + [ + 'attribute' => 'item_name', + 'label' => 'Név', + + ], + [ + 'attribute' => 'user_username', + 'label' => 'Felhasználó', + + ], + [ + 'attribute' => 'item_count_prev', + 'label' => 'Előzö leltár (db)' + + ], + [ + 'attribute' => 'item_count_in', + 'label' => 'Beszerzett mennyiség (db)' + + ], + [ + 'attribute' => 'item_count_sold', + 'label' => 'Eladott mennyiség (db)', + + ], + [ + 'attribute' => 'item_count', + 'label' => 'Leltározott mennyiség (db)', + + ], + [ + 'attribute' => 'item_difference', + 'label' => 'Különbség (db)', + + ], + ] + + ]); + ?> diff --git a/common/models/Card.php b/common/models/Card.php index 8d28da9..6aa549b 100644 --- a/common/models/Card.php +++ b/common/models/Card.php @@ -166,4 +166,10 @@ class Card extends \common\models\BaseFitnessActiveRecord ]); } + public static function updateCardFlagTicket($id){ + $db = \Yii::$app->db; + $command = $db->createCommand(Ticket::$SQL_UPDATE_CARD,[':id' => $id]); + $command->execute(); + } + } diff --git a/common/models/DoorLog.php b/common/models/DoorLog.php index ab88b0a..63f1fd2 100644 --- a/common/models/DoorLog.php +++ b/common/models/DoorLog.php @@ -140,4 +140,13 @@ class DoorLog extends \yii\db\ActiveRecord 19 => "Bérlet érvényességi időn kívüli BE olvastatás (nem enged)", ]; } + + public static function getCardFlagTexts( ){ + return [ + 0 => "Kártya ok", + 1 => "Nincs érvényes bérlet", + + ]; + } + } diff --git a/common/models/InventoryItem.php b/common/models/InventoryItem.php index ab1ab53..665d1ad 100644 --- a/common/models/InventoryItem.php +++ b/common/models/InventoryItem.php @@ -3,6 +3,9 @@ namespace common\models; use Yii; +use yii\helpers\ArrayHelper; +use common\components\UserAwareBehavior; +use common\components\Helper; /** * This is the model class for table "inventory_item". @@ -24,6 +27,9 @@ use Yii; */ class InventoryItem extends BaseFitnessActiveRecord { + + public static $TYPE_PRODUCT = 10; + public static $TYPE_INVENTORY_GROUP = 20; /** * @inheritdoc */ @@ -56,10 +62,74 @@ class InventoryItem extends BaseFitnessActiveRecord 'id_product' => Yii::t('common/inventory_item', 'Id Product'), 'id_inventory_group' => Yii::t('common/inventory_item', 'Id Inventory Group'), 'id_user' => Yii::t('common/inventory_item', 'Id User'), - 'last_inventroy_at' => Yii::t('common/inventory_item', 'Last Inventroy At'), 'created_at' => Yii::t('common/inventory_item', 'Created At'), 'updated_at' => Yii::t('common/inventory_item', 'Updated At'), ]; } + public function behaviors() + { + return ArrayHelper::merge( [ + [ + 'class' => UserAwareBehavior::className(), + ] + ], parent::behaviors()); + } + + public static function creqteQueryInventoryItems($id_inventory ) { + $query = InventoryItem::find(); + + $query->andWhere(['inventory_item.id_inventory' => $id_inventory]); + return $query; + } + + public function getProduct(){ + return $this->hasOne( Product::className() , [ 'id_product' => 'id_product' ]); + } + + public function getInventoryGroup(){ + return $this->hasOne( Product::className() , [ 'id_inventory_group' => 'id_inventory_group' ]); + } + + public function getProductName(){ + $result = ""; + + $product = $this->product; + + if ( isset($product)){ + $result = $product->name; + } + + return $result; + } + public function getInventoryGroupName(){ + $result = ""; + + $product = $this->inventoryGroup; + + if ( isset($product)){ + $result = $product->name; + } + + return $result; + } + + public function getName(){ + $name = ""; + + if ( isset($this->id_product )){ + $name = $this->getProductName(); + }else{ + $name = $this->getInventoryGroupName(); + } + + return $name; + } + + + public function getDifference(){ + $diff = $this->count - ( $this->count_prev + $this->count_in - $this->count_sold ); + return $diff; + + } } diff --git a/common/models/Ticket.php b/common/models/Ticket.php index e15eaf7..913f5e0 100644 --- a/common/models/Ticket.php +++ b/common/models/Ticket.php @@ -36,6 +36,20 @@ class Ticket extends \common\models\BaseFitnessActiveRecord const STATUS_ACTIVE = 10; const STATUS_INACTIVE = 20; + public static $SQL_UPDATE = "UPDATE card as c1 + left JOIN ( select distinct ticket.id_card as id_card from ticket + where ticket.start <= CURDATE() and ticket.end >= curdate() and ticket.status = 10 ) as t + on t.id_card = c1.id_card + SET c1.flag = case when t.id_card is null then ( c1.flag | 1 << 0 ) else ( c1.flag & ~(1 << 0) ) end"; + + public static $SQL_UPDATE_CARD = "UPDATE card as c1 + left JOIN ( select distinct ticket.id_card as id_card from ticket + where ticket.start <= CURDATE() and ticket.end >= curdate() and ticket.status = 10 ) as t + on t.id_card = c1.id_card + SET c1.flag = case when t.id_card is null then ( c1.flag | 1 << 0 ) else ( c1.flag & ~(1 << 0) ) end + WHERE c1.id_card = :id"; + + /** * @inheritdoc */ @@ -312,4 +326,13 @@ class Ticket extends \common\models\BaseFitnessActiveRecord } } } + + public function afterSave($insert, $changedAttributes) { + Card::updateCardFlagTicket($this->id_card);; + } + + public function afterDelete(){ + Card::updateCardFlagTicket($this->id_card);; + } + } diff --git a/common/models/Transfer.php b/common/models/Transfer.php index a842ab1..88e2b2c 100644 --- a/common/models/Transfer.php +++ b/common/models/Transfer.php @@ -927,6 +927,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord { ] ); } + // storno contract } else if ($this->type == Transfer::TYPE_PRODUCT) { diff --git a/console/config/main.php b/console/config/main.php index 2c7d7d4..ff6975c 100644 --- a/console/config/main.php +++ b/console/config/main.php @@ -16,7 +16,7 @@ return [ 'targets' => [ [ 'class' => 'yii\log\FileTarget', - 'levels' => ['error', 'warning'], + 'levels' => ['error', 'warning','info'], ], ], ], diff --git a/console/controllers/TicketController.php b/console/controllers/TicketController.php new file mode 100644 index 0000000..21e4dac --- /dev/null +++ b/console/controllers/TicketController.php @@ -0,0 +1,21 @@ +db; + $command = $connection->createCommand( Ticket::$SQL_UPDATE ); + $result = $command->execute(); + \Yii::info("Tickets updated: " . $result ); + echo "Tickets updated: " . $result ; + } + +} \ No newline at end of file diff --git a/console/migrations/m160308_201451_add_door_flag.php b/console/migrations/m160308_201451_add_door_flag.php new file mode 100644 index 0000000..ebe3d22 --- /dev/null +++ b/console/migrations/m160308_201451_add_door_flag.php @@ -0,0 +1,31 @@ +addColumn("door_log", "card_flag", "int default 0"); + $this->addColumn("card", "flag", "int default 0"); + } + + public function down() + { + echo "m160308_201451_add_door_flag 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/cutler_daily.sh b/cutler_daily.sh new file mode 100644 index 0000000..e5f5bfe --- /dev/null +++ b/cutler_daily.sh @@ -0,0 +1,2 @@ + +php yii ticket/index \ No newline at end of file diff --git a/frontend/models/ReceptionForm.php b/frontend/models/ReceptionForm.php index 5b03262..1aa7549 100644 --- a/frontend/models/ReceptionForm.php +++ b/frontend/models/ReceptionForm.php @@ -115,6 +115,8 @@ class ReceptionForm extends Model $dlog->id_account = Account::readDefault(); + $dlog->card_flag = $this->card->flag; + $dlog->created_at = date('Y-m-d H:i:s'); $dlog->save(false); } diff --git a/frontend/models/TicketCreate.php b/frontend/models/TicketCreate.php index 6d9cce2..5b9c117 100644 --- a/frontend/models/TicketCreate.php +++ b/frontend/models/TicketCreate.php @@ -12,6 +12,7 @@ use yii\base\Object; use common\models\TicketInstallmentRequest; use common\models\Contract; use common\components\Helper; +use common\models\Card; /** * @property $cart string name of cart, into we put the ticket @@ -158,9 +159,14 @@ class TicketCreate extends Ticket{ $this->appendToUserCart(); $this->appendToCustomerCart(); $this->addContract($insert); + $this->updateCardFlag(); } + protected function updateCardFlag(){ + Card::updateCardFlagTicket($this->id_card); + } + public function addContract($insert){ if ($insert){ $ticketType = TicketType::findOne($this->id_ticket_type); diff --git a/frontend/views/common/_reception_ticket.php b/frontend/views/common/_reception_ticket.php index 816f0a6..4084565 100644 --- a/frontend/views/common/_reception_ticket.php +++ b/frontend/views/common/_reception_ticket.php @@ -5,6 +5,9 @@ use frontend\model\ReceptionForm; use yii\helpers\Html; use yii\helpers\Url; use common\models\Contract; +use common\components\Helper; +use common\models\Card; +use common\models\DoorLog; /* @var $this yii\web\View */ /* @var $model frontend\model\ReceptionForm */ @@ -19,28 +22,38 @@ if ( count($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 " - "; - echo Yii::$app->formatter->asDate($ticket->end); - echo Html::endTag("div"); - }else{ + if ( $model->card->flag == 0 ){ + 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 " - "; + 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-danger", "role"=>"alert"]); + echo "Kártya korlátozás:"; + echo "
"; echo Html::beginTag("strong",[ ]); - echo "Bérlet lejárt vagy nem érvényes!"; + echo Helper::getArrayValue(DoorLog::getCardFlagTexts(), $model->card->flag, "Ismeretlen ok") ; echo Html::endTag("strong"); echo Html::endTag("div"); } From b51028ab1dea9f4ab93afd0f046cb7d6d3f100c8 Mon Sep 17 00:00:00 2001 From: Roland Schneider Date: Wed, 9 Mar 2016 20:22:44 +0100 Subject: [PATCH 3/3] change version to v.0.0.50 --- changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.txt b/changelog.txt index fdaae47..b62ed95 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +-0.0.50 + - card flag + - inventory item -0.0.49 - contract - add started_at - receptions/account-state/mixed