add changes feature/33

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']

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,

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.');
+        }
+    }
+}

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;
+    }
+}

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>

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>

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>

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>

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>

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>

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;
+    }
+    
+    
+    
 }

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;
+    }
+    
+}

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];
 		}

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": "*",