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

add reception account state view and pdf export

Browse Source
This commit is contained in:
Roland Schneider
2016-01-08 14:06:55 +01:00
parent da29702a79
commit e8df61f123
30 changed files with 1190 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/models/AccountState.php
View File

@@ -36,6 +36,8 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
const TYPE_OPEN = 10;
const TYPE_CLOSE = 20;
public $start_date;
/**
* @inheritdoc
*/
@@ -94,6 +96,13 @@ class AccountState extends \common\models\BaseFitnessActiveRecord
}
public function isTypeOpen(){
return $this->type == AccountState::TYPE_OPEN;
}
public function isTypeClose(){
return $this->type == AccountState::TYPE_CLOSE;
}
public static function banknoteValues()
{
return [

2
common/models/Transfer.php
View File

@@ -712,6 +712,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$query = (new \yii\db\Query());
$query->select(['coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end ),0) AS transfer_money']);
$query->from('transfer');
$query->innerJoin("account","account.id_account = transfer.id_account");
$query->andWhere(['transfer.id_user' => $idUser ]);
$created_condition = ['and',[ '>=', 'transfer.created_at', $start ] ,[ '<', 'transfer.created_at', $end ] ];
@@ -719,6 +720,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
$query->andWhere(['account.type' => Account::TYPE_ALL]);
return $query->scalar();
}