add payment method colum and money total to backend/transfer/index
This commit is contained in:
parent
055fc541ea
commit
11abfc54f4
@ -100,7 +100,7 @@ class AdminMenuStructure{
|
||||
// Pénzügy
|
||||
/////////////////////////////
|
||||
$items = [];
|
||||
$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$today,'TransferSearch[end]' => $tomorrow ] ];
|
||||
$items[] = ['label' => 'Tranzakciók', 'url' => ['/transfer/index' , 'TransferSearch[start]' =>$todayDatetime,'TransferSearch[end]' => $tomorrowDatetime ] ];
|
||||
// $items[] = ['label' => 'Bevétel', 'url' => ['/transfer/summary' , 'TransferSummarySearch[start]' =>$today,'TransferSummarySearch[end]' => $tomorrow ] ];
|
||||
$items[] = ['label' => 'Napi bevételek', 'url' => ['/transfer/list', 'TransferListSearch[start]' =>$todayDatetime,'TransferListSearch[end]' => $tomorrowDatetime ] ];
|
||||
$items[] = ['label' => 'Kassza müveletek', 'url' => ['/account-state/index'] ];
|
||||
|
||||
@ -40,10 +40,12 @@ class TransferSearch extends Transfer
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
[[ 'id_account','id_user', 'type','status'], 'integer'],
|
||||
[[ 'id_account','id_user', 'type','status','payment_method'], 'integer'],
|
||||
// [[ 'searchObjectName' ], 'string'],
|
||||
[[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
|
||||
[[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
|
||||
// [[ 'start', ], 'date' , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
|
||||
// [[ 'end' , ], 'date' , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd' ],
|
||||
[[ 'start', ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
|
||||
[[ 'end' , ], 'date' ,'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
|
||||
['types', 'each', 'rule' => ['integer']],
|
||||
];
|
||||
}
|
||||
@ -86,6 +88,9 @@ class TransferSearch extends Transfer
|
||||
$dataProvider = new ActiveDataProvider([
|
||||
'query' => $query,
|
||||
'sort' =>[
|
||||
'defaultOrder' =>[
|
||||
'created_at' => SORT_DESC
|
||||
],
|
||||
'attributes' =>[
|
||||
'paid_at' =>[
|
||||
'asc' => ['transfer.paid_at' => SORT_ASC ],
|
||||
@ -144,7 +149,8 @@ class TransferSearch extends Transfer
|
||||
'transfer.id_account' => $this->id_account,
|
||||
'transfer.type' => $this->type,
|
||||
'transfer.id_user' => $this->id_user,
|
||||
'transfer.status' => $this->status
|
||||
'transfer.status' => $this->status,
|
||||
'transfer.payment_method' => $this->payment_method,
|
||||
]);
|
||||
|
||||
$query->andFilterWhere(['in' ,'transfer.type', $this->types]);
|
||||
@ -155,7 +161,7 @@ class TransferSearch extends Transfer
|
||||
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
|
||||
|
||||
if (!RoleDefinition::isAdmin()){
|
||||
Helper::restrictIfNotAdminTheStartDate($query, $this->timestampStart,['transfer.created_at','transfer.paid_at'],'date');
|
||||
Helper::restrictIfNotAdminTheStartDate($query, $this->timestampStart,['transfer.created_at','transfer.paid_at']);
|
||||
}
|
||||
|
||||
return $dataProvider;
|
||||
|
||||
@ -6,6 +6,7 @@ use frontend\components\HtmlHelper;
|
||||
use yii\helpers\ArrayHelper;
|
||||
use common\models\Transfer;
|
||||
use kartik\widgets\DatePicker;
|
||||
use kartik\widgets\DateTimePicker;
|
||||
|
||||
/* @var $this yii\web\View */
|
||||
/* @var $model backend\models\TransferSearch */
|
||||
@ -37,22 +38,25 @@ use kartik\widgets\DatePicker;
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<?= $form->field($model, 'start')->widget(DatePicker::classname(), [
|
||||
<div class="col-md-3">
|
||||
<?= $form->field($model, 'start')->widget(DateTimePicker::classname(), [
|
||||
'pluginOptions' => [
|
||||
'autoclose'=>true,
|
||||
'format' => 'yyyy.mm.dd'
|
||||
'format' => 'yyyy.mm.dd hh:ii'
|
||||
]
|
||||
]) ?>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<?= $form->field($model, 'end') ->widget(DatePicker::classname(), [
|
||||
<div class="col-md-3">
|
||||
<?= $form->field($model, 'end') ->widget(DateTimePicker::classname(), [
|
||||
'pluginOptions' => [
|
||||
'autoclose'=>true,
|
||||
'format' => 'yyyy.mm.dd'
|
||||
'format' => 'yyyy.mm.dd hh:ii'
|
||||
]
|
||||
]) ?>
|
||||
</div>
|
||||
<div class='col-md-3'>
|
||||
<?= $form->field($model, 'payment_method')->dropDownList( ['' => "Mind"] + Transfer::paymentMethods() ) ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
|
||||
@ -7,6 +7,7 @@ use yii\base\Widget;
|
||||
use yii\base\Object;
|
||||
use yii\data\ArrayDataProvider;
|
||||
use common\components\AccountStatisticWidget;
|
||||
use common\components\DataProviderTotal;
|
||||
|
||||
/* @var $this yii\web\View */
|
||||
/* @var $searchModel backend\models\TransferSearch */
|
||||
@ -41,11 +42,14 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
<?= GridView::widget([
|
||||
'tableOptions' => ['class' => 'table table-striped table-bordered table-transfer'],
|
||||
'dataProvider' => $dataProvider,
|
||||
'showFooter'=>TRUE,
|
||||
|
||||
'columns' => [
|
||||
|
||||
[
|
||||
'attribute' => 'id_transfer',
|
||||
'value' => 'id_transfer'
|
||||
'value' => 'id_transfer',
|
||||
'footer' => 'Összesen *'
|
||||
],
|
||||
[
|
||||
'attribute' => 'type',
|
||||
@ -83,13 +87,20 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
],
|
||||
[
|
||||
'contentOptions' =>[ 'class' => 'money' ],
|
||||
'footerOptions' =>[ 'class' => 'money' ],
|
||||
'attribute' => 'money',
|
||||
'value' => 'signedMoney'
|
||||
'value' => 'signedMoney' ,
|
||||
'footer'=>DataProviderTotal::pageTotal($dataProvider->models,'signedMoney'),
|
||||
],
|
||||
[
|
||||
'attribute' => 'status',
|
||||
'value' => 'statusName'
|
||||
],
|
||||
[
|
||||
'attribute' => 'payment_method',
|
||||
'value' => 'paymentMethodName',
|
||||
'label' => "Fizetési mód"
|
||||
],
|
||||
'created_at:datetime',
|
||||
'paid_at:datetime',
|
||||
|
||||
@ -99,4 +110,8 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||
],
|
||||
]); ?>
|
||||
|
||||
<p>
|
||||
* A láblécben szereplő összesítések csak a táblázat aktuális oldalára vonatkoznak!
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
-0.0.48
|
||||
- add payment method display to backend/transfer/index
|
||||
- add footer money display to backend/transfer/index
|
||||
-0.0.47
|
||||
- add backend transfer/index customerName column
|
||||
-0.0.46
|
||||
|
||||
19
common/components/DataProviderTotal.php
Normal file
19
common/components/DataProviderTotal.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
namespace common\components;
|
||||
|
||||
|
||||
class DataProviderTotal{
|
||||
|
||||
|
||||
|
||||
public static function pageTotal($provider, $fieldName)
|
||||
{
|
||||
$total=0;
|
||||
foreach($provider as $item){
|
||||
$total+=$item[$fieldName];
|
||||
}
|
||||
return $total;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -4,7 +4,7 @@ return [
|
||||
'supportEmail' => 'rocho02@gmail.com',
|
||||
'infoEmail' => 'info@rocho-net.hu',
|
||||
'user.passwordResetTokenExpire' => 3600,
|
||||
'version' => 'v0.0.47',
|
||||
'version' => 'v0.0.48',
|
||||
'company' => 'movar',//gyor
|
||||
'company_name' => "Freimann Kft.",
|
||||
'product_visiblity' => 'account',// on reception which products to display. account or global
|
||||
|
||||
Loading…
Reference in New Issue
Block a user