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

GL-FW-1: add created/payed filter to transfer/index and transfer/list

Browse Source
This commit is contained in:
Roland Schneider
2019-09-20 07:37:02 +02:00
parent 8f07193371
commit 0e96de88df
9 changed files with 213 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/models/Transfer.php
View File

@@ -149,7 +149,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
'types' => Yii::t ( 'common/transfer', 'Types' ),
'start' => Yii::t ( 'common/transfer', 'Start' ),
'end' => Yii::t ( 'common/transfer', 'End' ),
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' )
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' ) ,
'bought_in_interval' => Yii::t ( 'common/transfer', 'Kiadva az időszaban' ),
'payed_in_interval' => Yii::t ( 'common/transfer', 'Fizetve az időszaban' )
];
}
public function getUser() {
@@ -713,17 +715,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
Transfer::STATUS_STORNO
] );
if ($mode == 'created_at') {
if ($mode === 'created_at') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'paid_at') {
} else if ($mode === 'paid_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'created_at_not_paid') {
} else if ($mode === 'created_at_not_paid') {
self::notPaid ( $query, 'transfer.paid_at', $start, $end );
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'created_at_paid') {
} else if ($mode === 'created_at_paid') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'paid_at_not_created_at') {
} else if ($mode === 'paid_at_not_created_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
self::notInInterval ( $query, 'transfer.created_at', $start, $end );
}