add money movement type 'in', add daily transfers

common/messages/hu/frontend/transfer.php

@@ -28,5 +28,6 @@ return [
     'Update' => 'Módosítás',
     'Update {modelClass}: ' => '{modelClass} módosítás: ',
     'pieces' => 'db',
-	'Transfers Summary' => 'Bevétel'
+	'Transfers Summary' => 'Bevétel',
+	'Daily transfers' => 'Napi bevételek'
 ];

common/models/MoneyMovement.php

@@ -27,6 +27,7 @@ class MoneyMovement extends \yii\db\ActiveRecord
 {
 
 	const TYPE_OUT = 10;
+	const TYPE_IN  = 20;
 	
 	public $_account;
 	
@@ -47,7 +48,7 @@ class MoneyMovement extends \yii\db\ActiveRecord
     	return ArrayHelper::merge(  [
     			[
     			'class' => TimestampBehavior::className(),
-    			'value' => function(){ return date('Y-m-d H:i:s' ); }
+    			'value' => function(){ return date('Y-m-d H:i:s' , time()); }
     			],
     			[
     			'class' => AccountAwareBehavior::className(),
@@ -65,10 +66,11 @@ class MoneyMovement extends \yii\db\ActiveRecord
     {
         return [
             [['id_account',   'name',   'money'], 'required'],
-            [['id_account' ,  'money'], 'integer'],
+            [['id_account' ,  'money'], 'integer' , 'min' => 0],
             [['name'], 'string', 'max' => 64],
             [['comment'], 'string', 'max' => 255],
             [['id_account'], 'validateAccount'],
+        	[['type'] , 'in','range' => array_keys(MoneyMovement::types())],
         ];
     }
 
@@ -91,6 +93,7 @@ class MoneyMovement extends \yii\db\ActiveRecord
             'id_user' => Yii::t('common/money-movement', 'Id User'),
             'name' => Yii::t('common/money-movement', 'Name'),
             'type' => Yii::t('common/money-movement', 'Type'),
+            'humanType' => 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'),
@@ -100,6 +103,7 @@ class MoneyMovement extends \yii\db\ActiveRecord
         ];
     }
     
+    
     public function afterSave($insert, $changedAttributes){
     	parent::afterSave($insert, $changedAttributes);
     	if ( $insert) {
@@ -114,4 +118,26 @@ class MoneyMovement extends \yii\db\ActiveRecord
     	$transfer->save();
     }
     
+    public static function types(){
+    	return [
+    			self::TYPE_IN => "Betét",
+    			self::TYPE_OUT => "Kivét",
+    			
+    	];
+    }
+    
+    public static function typeName($type){
+    	$types = MoneyMovement::types();
+    	$result = "";
+    	if ( array_key_exists($type, $types)){
+    		$result =  $types[$type];
+    	}
+    	return $result;
+    }
+    
+    
+    public function getHumanType(){
+    	return self::typeName($this->type);
+    }
+    
 }

common/models/Product.php

@@ -118,9 +118,9 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	$warehouses = null;
     
     	if ( $forceIncludeObjectWithId  == null){
-    		$warehouses = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->all();
+    		$warehouses = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC])->all();
     	}else{
-    		$warehouses = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' =>  $forceIncludeObjectWithId ] ])->all();
+    		$warehouses = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' =>  $forceIncludeObjectWithId ] ])->orderBy(['product.name' => SORT_ASC])->all();
     	}
     
     	return $warehouses;

common/models/Transfer.php

@@ -247,6 +247,19 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	return $result;
     	
     }
+    
+    public static function  toSignedMoney($dir,$money){
+    	$m = 1;
+    	$result = $money;
+    	if ( $dir == Transfer::DIRECTION_OUT ){
+    		$m = -1;
+    	}
+    	 
+    	$result = $result * $m;
+    	 
+    	return $result;
+    	 
+    }
 	
     public function toProductSoldString(){
     	$s = "";
@@ -315,7 +328,11 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
     	
     	$transfer->type = Transfer::TYPE_MONEY_MOVEMENT_OUT;
     	$transfer->status = Transfer::STATUS_PAID;
-    	$transfer->direction = Transfer::DIRECTION_OUT;
+    	if ( $moneyMovement->type == MoneyMovement::TYPE_OUT){
+    		$transfer->direction = Transfer::DIRECTION_OUT;
+    	}else if ( $moneyMovement->type == MoneyMovement::TYPE_IN ){
+    		$transfer->direction = Transfer::DIRECTION_IN;
+    	}
     	$transfer->count = null;
     	
     	$transfer->id_object = $moneyMovement->id_money_movement;