display comment in transfers/index

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

View File

@ -391,6 +391,7 @@ class TransferController extends \backend\controllers\BackendController
->setCellValue('N'.$row, $model['transfer_paid_at'])
->setCellValue('O'.$row, $model['ticket_start'])
->setCellValue('P'.$row, $model['ticket_end'])
->setCellValue('Q'.$row, $model['all_comment'])
;
}

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'],
])
]
];

View File

@ -134,14 +134,26 @@ $this->params['breadcrumbs'][] = $this->title;
'label' => "Érv. tól",
'format' => 'date'
],
[
[
'attribute' => 'ticket_end',
'label' => "Érv. ig",
'format' => 'date'
],[
'attribute' => 'all_comment',
'label' => "Komment",
'format' => 'raw'
],
['class' => 'yii\grid\ActionColumn',
'template' => '{view}'
'template' => '{view}',
'urlCreator' => function ($action, $model, $key, $index)
{
if ( $action == 'view'){
return \yii\helpers\Url::toRoute(['transfer/view','id' => $model['transfer_id_transfer']]);
}
return "";
}
],
],
]); ?>
@ -209,6 +221,7 @@ $this->params['breadcrumbs'][] = $this->title;
'value' => 'paymentMethodName',
'label' => "Fizetési mód"
],
'created_at:datetime',
'paid_at:datetime',