diff --git a/backend/components/AdminMenuStructure.php b/backend/components/AdminMenuStructure.php index 43ce4d0..87910b8 100644 --- a/backend/components/AdminMenuStructure.php +++ b/backend/components/AdminMenuStructure.php @@ -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'] ]; diff --git a/backend/models/TransferSearch.php b/backend/models/TransferSearch.php index 7206050..b4e7bd7 100644 --- a/backend/models/TransferSearch.php +++ b/backend/models/TransferSearch.php @@ -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; diff --git a/backend/views/transfer/_search.php b/backend/views/transfer/_search.php index 301cbf8..b229135 100644 --- a/backend/views/transfer/_search.php +++ b/backend/views/transfer/_search.php @@ -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;
-
- field($model, 'start')->widget(DatePicker::classname(), [ +
+ field($model, 'start')->widget(DateTimePicker::classname(), [ 'pluginOptions' => [ 'autoclose'=>true, - 'format' => 'yyyy.mm.dd' + 'format' => 'yyyy.mm.dd hh:ii' ] ]) ?>
-
- field($model, 'end') ->widget(DatePicker::classname(), [ +
+ field($model, 'end') ->widget(DateTimePicker::classname(), [ 'pluginOptions' => [ 'autoclose'=>true, - 'format' => 'yyyy.mm.dd' + 'format' => 'yyyy.mm.dd hh:ii' ] ]) ?>
+
+ field($model, 'payment_method')->dropDownList( ['' => "Mind"] + Transfer::paymentMethods() ) ?> +
diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php index 29a10ef..5dd6223 100644 --- a/backend/views/transfer/index.php +++ b/backend/views/transfer/index.php @@ -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; ['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; ], ]); ?> +

+ * A láblécben szereplő összesítések csak a táblázat aktuális oldalára vonatkoznak! +

+
diff --git a/changelog.txt b/changelog.txt index 56e480b..9dee88a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 diff --git a/common/components/DataProviderTotal.php b/common/components/DataProviderTotal.php new file mode 100644 index 0000000..d884f54 --- /dev/null +++ b/common/components/DataProviderTotal.php @@ -0,0 +1,19 @@ + '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