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

add changes to backend transfers2

Browse Source
This commit is contained in:
rocho
2015-10-20 09:02:57 +02:00
parent 71384b6453
commit 1a1477b26b
14 changed files with 174 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/components/AdminMenuStructure.php
View File

@@ -30,6 +30,9 @@ class AdminMenuStructure{
$userMainMenu = null;
$items = [];
//$today = \Yii::$app->formatter->asDate( time() );
$today = \Yii::$app->formatter->asDate( strtotime('today UTC') );
$tomorrow = \Yii::$app->formatter->asDate( ( 60 *60 *24 + time()));
// if ( $this->can('backend.user.index')){
$items[] = ['label' => 'Felhasználók', 'url' =>['/user/index']];
@@ -45,7 +48,11 @@ class AdminMenuStructure{
$items[] = ['label' => 'Vendégek', 'url' => ['/customer/index'] ];
$items[] = ['label' => 'Bérletkártyák', 'url' => ['/card/index'] ];
$items[] = ['label' => 'Pénznem', 'url' => ['/currency/index'] ];
$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index'] ];
$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
if ( count($items) > 0 ){

45
backend/models/TransferSearch.php
View File

@@ -36,7 +36,7 @@ class TransferSearch extends Transfer
{
return [
[[ 'id_account','id_user', 'type'], 'integer'],
[[ 'searchObjectName' ], 'string'],
// [[ 'searchObjectName' ], 'string'],
[[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
[[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
];
@@ -66,14 +66,17 @@ class TransferSearch extends Transfer
'query' => $query,
]);
// $query->distinct();
$selectObjectName = "";
$selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT ." then product.name else ticket_type.name end as object_name";
// $selectObjectName = "";
// $selectObjectName .= " case when transfer.type = " .self::TYPE_PRODUCT ." then product.name ";
// $selectObjectName .= " when transfer.type = " .self::TYPE_TICKET ." then ticket_type.name ";
// $selectObjectName .= " when transfer.type = " .self::TYPE_MONEY_MOVEMENT_OUT ." then 'Pénzmozgás' ";
// $selectObjectName .= " else '' ";
// $selectObjectName .= " end as object_name";
$query->addSelect( ['*', new Expression($selectObjectName) ]);
$query->joinWith('ticket');
$query->joinWith('ticketType');
$query->joinWith('product');
$query->addSelect( ['*' ]);
// $query->joinWith('ticket');
// $query->joinWith('ticketType');
// $query->joinWith('product');
$this->load($params);
@@ -92,14 +95,22 @@ class TransferSearch extends Transfer
$query->andFilterWhere([ '>=', 'transfer.created_at', $this->timestampStart ] );
$query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ] );
if ( isset($this->searchObjectName))
$query->andWhere( new Expression(" case when transfer.type = " .self::TYPE_PRODUCT ." then product.name else ticket_type.name end like '%" . $this->searchObjectName ."%'"));
// if ( isset($this->searchObjectName))
// $query->andWhere( new Expression(" case when transfer.type = " .self::TYPE_PRODUCT ." then product.name else ticket_type.name end like '%" . $this->searchObjectName ."%'"));
return $dataProvider;
}
public function search2(){
$query = new Query() ;
$query->select('*');
}
public function totals($params){
$query = new Query();
@@ -111,11 +122,11 @@ class TransferSearch extends Transfer
'money' => 0
];
$query->addSelect( [ new Expression( 'transfer.id_account as account'), new Expression( ' COALESCE(sum( transfer.money ),0) as money' )]);
$query->addSelect( [ new Expression( 'transfer.id_account as account'), new Expression( ' COALESCE(sum( ( case when direction = '.Transfer::DIRECTION_OUT.' then -1 else 1 end )* transfer.money ),0) as money' )]);
$query->from('transfer');
$query->leftJoin('ticket', 'transfer.type = ' .self::TYPE_TICKET .' and transfer.id_object = ticket.id_ticket ' );
$query->leftJoin('ticket_type', 'ticket.id_ticket_type = ticket_type.id_ticket_type ' );
$query->leftJoin('product', 'product.id_product = ' .self::TYPE_TICKET .' and transfer.id_object = ticket.id_ticket ' );
// $query->leftJoin('ticket', 'transfer.type = ' .self::TYPE_TICKET .' and transfer.id_object = ticket.id_ticket ' );
// $query->leftJoin('ticket_type', 'ticket.id_ticket_type = ticket_type.id_ticket_type ' );
// $query->leftJoin('product', 'product.id_product = ' .self::TYPE_TICKET .' and transfer.id_object = ticket.id_ticket ' );
$this->load($params);
@@ -133,9 +144,9 @@ class TransferSearch extends Transfer
$query->andFilterWhere([ '<', 'transfer.created_at', $this->timestampEnd ] );
if ( isset($this->searchObjectName) && !empty($this->searchObjectName)){
$query->andWhere( new Expression(" case when transfer.type = " .self::TYPE_PRODUCT ." then product.name else ticket_type.name end like '%" . $this->searchObjectName ."%'"));
}
// if ( isset($this->searchObjectName) && !empty($this->searchObjectName)){
// $query->andWhere( new Expression(" case when transfer.type = " .self::TYPE_PRODUCT ." then product.name else ticket_type.name end like '%" . $this->searchObjectName ."%'"));
// }
$query->groupBy('transfer.id_account');

28
backend/views/transfer/_search.php
View File

@@ -22,27 +22,18 @@ use kartik\widgets\DatePicker;
]); ?>
<div class='row'>
<div class='col-md-4'>
<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')] +HtmlHelper::mkAccountOptions($accounts) ) ?>
<div class='col-md-4'>
<?= $form->field($model, 'id_account')->dropDownList( ['' => Yii::t('common/transfer', 'All')] +HtmlHelper::mkAccountOptions($accounts) ) ?>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')] + Transfer::types() ) ?>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')] +ArrayHelper::map($users,'id' , 'username') ) ?>
</div>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'type')->dropDownList( ['' => Yii::t('common/transfer', 'All')] + Transfer::types() ) ?>
</div>
<div class='col-md-4'>
<?= $form->field($model, 'id_user')->dropDownList( ['' => Yii::t('common/transfer', 'All')] +ArrayHelper::map($users,'id' , 'username') ) ?>
</div>
</div>
<div class="row">
<div class='col-md-4'>
<?php echo $form->field($model, 'searchObjectName') ?>
</div>
<div class="col-md-4">
<?= $form->field($model, 'start')->widget(DatePicker::classname(), [
'pluginOptions' => [
@@ -61,7 +52,6 @@ use kartik\widgets\DatePicker;
</div>
</div>
<div class="form-group">
<?= Html::submitButton(Yii::t('frontend/transfer', 'Search'), ['class' => 'btn btn-primary']) ?>
</div>

29
backend/views/transfer/index.php
View File

@@ -14,6 +14,15 @@ use yii\data\ArrayDataProvider;
$this->title = Yii::t('frontend/transfer', 'Transfers');
$this->params['breadcrumbs'][] = $this->title;
?>
<style>
.table-transfer .money,
.table-transfer .count,
.table-transfer .item-price
{
text-align: right;
}
</style>
<div class="transfer-index">
<h1><?= Html::encode($this->title) ?></h1>
@@ -56,6 +65,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<h2>Pénzmozgások</h2>
<?= GridView::widget([
'tableOptions' => ['class' => 'table table-striped table-bordered table-transfer'],
'dataProvider' => $dataProvider,
'columns' => [
@@ -64,8 +74,7 @@ $this->params['breadcrumbs'][] = $this->title;
'value' => 'transferTypeName'
],
[
'attribute' => 'id_object',
'value' => 'objectName'
'attribute' => 'objectName',
],
[
'attribute' => 'id_user',
@@ -75,9 +84,19 @@ $this->params['breadcrumbs'][] = $this->title;
'attribute' => 'id_account',
'value' => 'accountName'
],
'item_price',
'count',
'money',
[
'contentOptions' =>[ 'class' => 'item-price' ],
'attribute' => 'item_price',
],
[
'contentOptions' =>[ 'class' => 'count' ],
'attribute' => 'count',
],
[
'contentOptions' =>[ 'class' => 'money' ],
'attribute' => 'money',
'value' => 'signedMoney'
],
'created_at:datetime',
['class' => 'yii\grid\ActionColumn',