fix account_state ( collection_money ), display product/ticket on reception only for selected account, add daily transfers (reception/admin)

common/models/Product.php

@@ -126,7 +126,33 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     	return $warehouses;
     }
     
-    public static  function findProduct($query){
+    /**
+     * $param int $forceIncludeAccount id warehouse, that should be included in list, even if it is inactive
+     * */
+    public static  function readForDefaultAccount($forceIncludeObjectWithId = null){
+    	$result = null;
+    	
+    	$account = Account::readDefault();
+    
+    	if ( $forceIncludeObjectWithId  == null){
+    		$query = Product::find()->andWhere(['status' => Product::STATUS_ACTIVE])->orderBy(['product.name' => SORT_ASC]);
+    		if ( $account )
+    			$query->andWhere(["product.id_account"  => $account]);
+    		
+    			$result = $query->all();
+    	}else{
+    		$query = Product::find()->andWhere( ['or', ['status' => Product::STATUS_ACTIVE], ['id_product' =>  $forceIncludeObjectWithId ] ])->orderBy(['product.name' => SORT_ASC]);
+    		if ( $account )
+    			$query->andWhere(["product.id_account"  => $account]);
+    		
+    		$result = $query->all();
+    		
+    	}
+    
+    	return $result;
+    }
+    
+    public static  function findProduct($query, $account = null){
     	$result = [];
     	$product = null;
     
@@ -137,6 +163,7 @@ class Product extends \common\models\BaseFitnessActiveRecord {
     			['barcode' => $query ],
     			]
     	)->andWhere(['status' =>Product::STATUS_ACTIVE])
+    	->andFilterWhere(['product.id_account' => $account])
     	->all();