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

display comment in transfers/index

Browse Source
This commit is contained in:
Roland Schneider
2016-07-29 07:59:52 +02:00
parent fdbd39b059
commit d2d44e51d9
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/models/TransferSearch.php
View File

@@ -128,8 +128,12 @@ class TransferSearch extends Transfer
'transfer.created_at as transfer_created_at',
'transfer.paid_at as transfer_paid_at',
'ticket.start as ticket_start',
'ticket.end as ticket_end'
]);
'ticket.end as ticket_end',
new Expression('case
when transfer.type = ' . Transfer::TYPE_TICKET . ' then ticket.comment
when transfer.type = ' . Transfer::TYPE_PRODUCT . ' then sale.comment
when transfer.type = ' . Transfer::TYPE_MONEY_MOVEMENT_OUT . ' then money_movement.comment end as all_comment'),
]);
}else if ( $mode == 'total'){
$query->select([
new Expression('coalesce(sum(transfer.count),0) as total_count'),
@@ -236,6 +240,7 @@ class TransferSearch extends Transfer
['transfer_paid_at'],
['ticket_start'],
['ticket_end'],
['all_comment'],
])
]
];