display comment in transfers/index
This commit is contained in:
parent
fdbd39b059
commit
d2d44e51d9
@ -391,6 +391,7 @@ class TransferController extends \backend\controllers\BackendController
|
|||||||
->setCellValue('N'.$row, $model['transfer_paid_at'])
|
->setCellValue('N'.$row, $model['transfer_paid_at'])
|
||||||
->setCellValue('O'.$row, $model['ticket_start'])
|
->setCellValue('O'.$row, $model['ticket_start'])
|
||||||
->setCellValue('P'.$row, $model['ticket_end'])
|
->setCellValue('P'.$row, $model['ticket_end'])
|
||||||
|
->setCellValue('Q'.$row, $model['all_comment'])
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -128,7 +128,11 @@ class TransferSearch extends Transfer
|
|||||||
'transfer.created_at as transfer_created_at',
|
'transfer.created_at as transfer_created_at',
|
||||||
'transfer.paid_at as transfer_paid_at',
|
'transfer.paid_at as transfer_paid_at',
|
||||||
'ticket.start as ticket_start',
|
'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'){
|
}else if ( $mode == 'total'){
|
||||||
$query->select([
|
$query->select([
|
||||||
@ -236,6 +240,7 @@ class TransferSearch extends Transfer
|
|||||||
['transfer_paid_at'],
|
['transfer_paid_at'],
|
||||||
['ticket_start'],
|
['ticket_start'],
|
||||||
['ticket_end'],
|
['ticket_end'],
|
||||||
|
['all_comment'],
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
|
|||||||
@ -134,14 +134,26 @@ $this->params['breadcrumbs'][] = $this->title;
|
|||||||
'label' => "Érv. tól",
|
'label' => "Érv. tól",
|
||||||
'format' => 'date'
|
'format' => 'date'
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'attribute' => 'ticket_end',
|
'attribute' => 'ticket_end',
|
||||||
'label' => "Érv. ig",
|
'label' => "Érv. ig",
|
||||||
'format' => 'date'
|
'format' => 'date'
|
||||||
|
],[
|
||||||
|
'attribute' => 'all_comment',
|
||||||
|
'label' => "Komment",
|
||||||
|
'format' => 'raw'
|
||||||
],
|
],
|
||||||
|
|
||||||
['class' => 'yii\grid\ActionColumn',
|
['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',
|
'value' => 'paymentMethodName',
|
||||||
'label' => "Fizetési mód"
|
'label' => "Fizetési mód"
|
||||||
],
|
],
|
||||||
|
|
||||||
'created_at:datetime',
|
'created_at:datetime',
|
||||||
'paid_at:datetime',
|
'paid_at:datetime',
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user