rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add money movement type 'in', add daily transfers

Browse Source
This commit is contained in:
Schneider Roland
2015-12-31 00:19:38 +01:00
parent 1bcc435ab6
commit 72fc139674
13 changed files with 896 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/models/Product.php
View File

@@ -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;