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

GL-FW-1: add created/payed filter to transfer/index and transfer/list

Browse Source
This commit is contained in:
Roland Schneider
2019-09-20 07:37:02 +02:00
parent 8f07193371
commit 0e96de88df
9 changed files with 213 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/models/Transfer.php
View File

@@ -149,7 +149,9 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
'types' => Yii::t ( 'common/transfer', 'Types' ),
'start' => Yii::t ( 'common/transfer', 'Start' ),
'end' => Yii::t ( 'common/transfer', 'End' ),
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' )
'payment_method' => Yii::t ( 'common/transfer', 'Fizetési mód' ) ,
'bought_in_interval' => Yii::t ( 'common/transfer', 'Kiadva az időszaban' ),
'payed_in_interval' => Yii::t ( 'common/transfer', 'Fizetve az időszaban' )
];
}
public function getUser() {
@@ -713,17 +715,17 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
Transfer::STATUS_STORNO
] );
if ($mode == 'created_at') {
if ($mode === 'created_at') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'paid_at') {
} else if ($mode === 'paid_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'created_at_not_paid') {
} else if ($mode === 'created_at_not_paid') {
self::notPaid ( $query, 'transfer.paid_at', $start, $end );
self::inInterval ( $query, 'transfer.created_at', $start, $end );
} else if ($mode == 'created_at_paid') {
} else if ($mode === 'created_at_paid') {
self::inInterval ( $query, 'transfer.created_at', $start, $end );
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
} else if ($mode == 'paid_at_not_created_at') {
} else if ($mode === 'paid_at_not_created_at') {
self::inInterval ( $query, 'transfer.paid_at', $start, $end );
self::notInInterval ( $query, 'transfer.created_at', $start, $end );
}

198
common/models/TransferListSearch.php
View File

@@ -3,25 +3,18 @@
namespace common\models;
use Yii;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use common\models\Transfer;
use yii\base\Object;
use yii\db\Query;
use yii\db\Expression;
use common\models\Account;
use yii\helpers\ArrayHelper;
use common\models\MoneyMovement;
use common\components\RoleDefinition;
use common\components\Helper;
use yii\db\Query;
/**
* TransferListSearch represents the model behind the search form about `common\models\Transfer`.
*/
class TransferListSearch extends Transfer
{
public $mode = "reception";//reception or admin
public $mode = 'reception';//reception or admin
/**start date string*/
public $start;
@@ -100,6 +93,9 @@ class TransferListSearch extends Transfer
public $output;
public $outputView;
public $bought_in_interval = false;
public $payed_in_interval = true;
/**
@@ -117,29 +113,37 @@ class TransferListSearch extends Transfer
['types', 'each', 'rule' => ['integer']],
['output', 'safe' ],
['outputView', 'safe' ],
[['bought_in_interval','payed_in_interval'],'boolean'] ,
// ['start', 'validateStart']
];
}
public function validateStart($attribute,$param){
public function validateStart($attribute,$param = null){
if ( $this->isStartDateToEarly() ){
$this->addError($attribute,"Érvénytelen kezdő dátum");
$this->addError($attribute, 'Érvénytelen kezdő dátum');
}
}
protected function calcStartDaysSinceToday(){
$start = $this->timestampStart;
$now = time();
$now = new \DateTime();
$d = \DateTime::createFromFormat("Y-m-d H:i", $start)->getTimeStamp();
$days_between = ceil(abs($now - $d) / 86400);
return $days_between;
$dt = \DateTime::createFromFormat('Y-m-d H:i', $start);
return $now->diff($dt)->days;
// $d = $dt->getTimeStamp();
// $days_between = ceil(abs($now->getTimestamp() - $d) / 86400);
// echo $days_between . " vs " . $diff->days;
//
// return $days_between;
}
protected function isStartDateToEarly(){
@@ -150,26 +154,28 @@ class TransferListSearch extends Transfer
public function isModeAdmin(){
return $this->mode == 'admin';
return $this->mode === 'admin';
}
public function isModeReception(){
return $this->mode == 'reception';
return $this->mode === 'reception';
}
/**
* Creates data provider instance with search query applied
*
* @param array $params
*
* @return ActiveDataProvider
* @return void
* @throws \yii\base\InvalidConfigException
*/
public function search($params)
{
$query = Transfer::find();
// ini_set("memory_limit","128");
// $query = Transfer::find();
$dataProvider = new ActiveDataProvider([
'query' => $query,
]);
// $dataProvider = new ActiveDataProvider([
// 'query' => $query,
// ]);
@@ -177,6 +183,7 @@ class TransferListSearch extends Transfer
if (!$this->validate()) {
// TODO: FIX
}
@@ -243,11 +250,15 @@ class TransferListSearch extends Transfer
$this->totalNetto += $this->productMoneyNetto;
$this->totalNetto += $this->moneyMovementMoneis;
}
/**
* @param Query $query
*/
protected function addAccountConstraint($query){
if (!$this->isModeAdmin() || !RoleDefinition::isAdmin() ){
$query->innerJoin("user_account_assignment",'transfer.id_account = user_account_assignment.id_account' );
$query->innerJoin('user_account_assignment','transfer.id_account = user_account_assignment.id_account' );
$query->andWhere(['user_account_assignment.id_user' => Yii::$app->user->id ]);
if ( RoleDefinition::isReception() || !$this->isModeAdmin()){
@@ -259,13 +270,14 @@ class TransferListSearch extends Transfer
}
}
/**
* add common transfer conditions.
* mode and role will be used to build to correct condition
* */
* @param Query $query
*/
protected function addQueryFilters($query){
$query->innerJoin("account", "transfer.id_account = account.id_account");
$query->innerJoin('account', 'transfer.id_account = account.id_account');
$this->addAccountConstraint($query);
@@ -274,19 +286,35 @@ class TransferListSearch extends Transfer
'transfer.type' => $this->type,
'transfer.paid_by' => $this->id_user,
]);
$all = ($this->bought_in_interval && $this->payed_in_interval)
|| ( !$this->bought_in_interval && !$this->payed_in_interval);
$orConditions = [];
if ( $all || $this->bought_in_interval){
$created_condition = ['and',[ '>=', 'transfer.created_at', $this->timestampStart ] ,[ '<', 'transfer.created_at', $this->timestampEnd ] ];
$orConditions[] = $created_condition;
}
if ( $all || $this->payed_in_interval ){
$paid_condition = ['and',[ '>=', 'transfer.paid_at', $this->timestampStart ] ,[ '<', 'transfer.paid_at', $this->timestampEnd ] ];
$query->andFilterWhere(['or' , $created_condition , $paid_condition]);
$orConditions[] = $paid_condition;
}
if ( count($orConditions) === 2){
$query->andFilterWhere(['or', $orConditions[0], $orConditions[1]]);
}else if ( count($orConditions) === 1 ){
$query->andFilterWhere($orConditions[0]);
}
$query->andWhere(['transfer.status' => Transfer::STATUS_PAID]);
if ( !$this->isModeAdmin()){
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
}
@@ -300,7 +328,7 @@ class TransferListSearch extends Transfer
if ( $this->isStartDateToEarly() ){
$days = Helper::getReceptionVisibilityDays();
$time = date( "Y-m-d H:i:s", strtotime("today -$days day") );
$time = date( 'Y-m-d H:i:s', strtotime("today -$days day") );
$start_date_condition = ['or',[ '>=', 'transfer.created_at', $time ] ,[ '>=', 'transfer.paid_at', $time] ];
@@ -315,12 +343,12 @@ class TransferListSearch extends Transfer
protected function readTicketStas(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['ticket_type.name as ticket_type_name' , 'coalesce(sum(abs(transfer.count)),0) AS ticket_count', 'coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->innerJoin('ticket', 'ticket.id_ticket = transfer.id_object');
$query->innerJoin('ticket_type', 'ticket.id_ticket_type = ticket_type.id_ticket_type');
$query->groupBy(['ticket_type.id_ticket_type','ticket_type.name']);
$query->orderBy(['ticket_type.name' => SORT_ASC]);
@@ -333,11 +361,11 @@ class TransferListSearch extends Transfer
protected function readTicketMoney(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([' coalesce(sum(abs(transfer.money)),0) AS ticket_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin('ticket', 'ticket.id_ticket = transfer.id_object');
$this->addQueryFilters($query);
$this->ticketMoney = $query->scalar();
}
@@ -345,14 +373,14 @@ class TransferListSearch extends Transfer
protected function readProductsByCategory(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as category_count', 'product_category.name as category_name']);
$query->from('transfer');
$query->groupBy(['product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$query->innerJoin('product', 'sale.id_product = product.id_product');
$query->innerJoin('product_category', 'product.id_product_category = product_category.id_product_category');
$this->addQueryFilters($query);
$this->productMoneies = $query->all();
@@ -370,14 +398,14 @@ class TransferListSearch extends Transfer
$category = null;
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['product_category.id_product_category as product_category_id','product_category.name as product_category_name', 'product.name as product_name' ,'coalesce(sum(transfer.money),0) AS product_money', 'coalesce(sum(transfer.count),0) as product_count']);
$query->from('transfer');
$query->groupBy(['product.id_product','product.name','product_category.id_product_category','product_category.name']);
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$query->innerJoin('product', 'sale.id_product = product.id_product');
$query->innerJoin('product_category', 'product.id_product_category = product_category.id_product_category');
$query->orderBy(['product_category.name' => SORT_ASC,'product.name' => SORT_ASC]);
$this->addQueryFilters($query);
@@ -417,11 +445,11 @@ class TransferListSearch extends Transfer
protected function readProductsMoney(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['coalesce(sum(transfer.money),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$this->addQueryFilters($query);
$this->productMoney = $query->scalar();
@@ -430,13 +458,13 @@ class TransferListSearch extends Transfer
protected function readProductsMoneyNetto(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select(['coalesce(sum(transfer.count * GREATEST(( product.sale_price - coalesce(product.purchase_price,0)),0)),0) AS product_money' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->andWhere(['transfer.payment_method' => Transfer::PAYMENT_METHOD_CASH]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$query->innerJoin('product', 'sale.id_product = product.id_product');
$this->addQueryFilters($query);
$this->productMoneyNetto = $query->scalar();
@@ -445,46 +473,47 @@ class TransferListSearch extends Transfer
protected function readMoneyMovementMoney(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([' coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end ),0) AS money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->innerJoin('money_movement', 'money_movement.id_money_movement = transfer.id_object');
$this->addQueryFilters($query);
$this->moneyMovementMoneis = $query->scalar();
}
protected function readMoneyMovementsStats(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([ 'money_movement.type as money_movement_type', ' coalesce(count(transfer.id_transfer),0) AS money_movement_count', 'coalesce(sum( case when transfer.direction = ' . Transfer::DIRECTION_IN. ' then transfer.money else -1 * transfer.money end ),0) AS money_movement_money']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->innerJoin('money_movement', 'money_movement.id_money_movement = transfer.id_object');
$query->groupBy(['money_movement.type']);
$this->addQueryFilters($query);
$this->moneyMovementsByType = $query->all();
for ($i = 0; $i < count($this->moneyMovementsByType) ;$i++ ){
$count = count($this->moneyMovementsByType);
for ($i = 0; $i < $count ;$i++ ){
$this->moneyMovementsByType[$i]['name'] = MoneyMovement::typeName($this->moneyMovementsByType[$i]['money_movement_type']);
}
}
protected function readTickets(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([ 'customer.name as customer_name', 'user.username as user_name', 'account.name as account_name','ticket_type.name as ticket_type_name' , 'transfer.count AS ticket_count', 'transfer.money AS ticket_money','transfer.item_price AS ticket_item_price', 'transfer.created_at as ticket_created_at','transfer.paid_at as ticket_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_TICKET]);
$query->innerJoin("ticket", "ticket.id_ticket = transfer.id_object");
$query->innerJoin("customer","customer.id_customer = transfer.id_customer");
$query->innerJoin("ticket_type", "ticket.id_ticket_type = ticket_type.id_ticket_type");
$query->innerJoin("user", "transfer.paid_by = user.id");
$query->innerJoin('ticket', 'ticket.id_ticket = transfer.id_object');
$query->innerJoin('customer', 'customer.id_customer = transfer.id_customer');
$query->innerJoin('ticket_type', 'ticket.id_ticket_type = ticket_type.id_ticket_type');
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->tickets = $query->all();
for ($i = 0; $i < count($this->tickets) ;$i++ ){
$count = count($this->tickets);
for ($i = 0; $i < $count ;$i++ ){
$this->tickets[$i]['ticket_created_at'] = Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->tickets[$i]['ticket_paid_at'] = empty($this->tickets[$i]['ticket_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->tickets[$i]['ticket_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
@@ -493,40 +522,45 @@ class TransferListSearch extends Transfer
protected function readProducts(){
$query = (new \yii\db\Query());
$query = (new Query());
$query->select([ 'user.username as user_name','account.name as account_name' , 'product_category.name as product_category_name', 'product.name as product_name', 'transfer.money AS product_money', 'transfer.count AS product_count', 'transfer.money AS product_money','transfer.item_price AS product_item_price', 'transfer.created_at as product_created_at','transfer.paid_at as product_paid_at']);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_PRODUCT]);
$query->innerJoin("sale", "sale.id_sale = transfer.id_object");
$query->innerJoin("product", "sale.id_product = product.id_product");
$query->innerJoin("product_category", "product.id_product_category = product_category.id_product_category");
$query->innerJoin('sale', 'sale.id_sale = transfer.id_object');
$query->innerJoin('product', 'sale.id_product = product.id_product');
$query->innerJoin('product_category', 'product.id_product_category = product_category.id_product_category');
$query->innerJoin("user", "transfer.paid_by = user.id");
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->products = $query->all();
for ($i = 0; $i < count($this->products) ;$i++ ){
$count = count($this->products);
for ($i = 0; $i < $count ;$i++ ){
$this->products[$i]['product_created_at'] = Yii::$app->formatter->asDatetime($this->products[$i]['product_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->products[$i]['product_paid_at'] = empty($this->products[$i]['product_paid_at'] ) ? '-' : Yii::$app->formatter->asDatetime($this->products[$i]['product_paid_at'], 'yyyy.MM.dd HH:mm:ss');
}
}
/**
* @throws \yii\base\InvalidConfigException
*/
protected function readMoneyMovements(){
$query = (new \yii\db\Query());
$query = new Query();
$query->select([ 'user.username as user_name','account.name as account_name', 'transfer.direction as transfer_direction' ,'money_movement.type as money_movement_type', 'transfer.money AS money_movement_money', 'money_movement.name as money_movement_name','transfer.created_at as money_movement_created_at', 'money_movement.comment as money_movement_comment' ]);
$query->from('transfer');
$query->andWhere(['transfer.type' => Transfer::TYPE_MONEY_MOVEMENT_OUT]);
$query->innerJoin("money_movement", "money_movement.id_money_movement = transfer.id_object");
$query->innerJoin("user", "transfer.paid_by = user.id");
$query->innerJoin('money_movement', 'money_movement.id_money_movement = transfer.id_object');
$query->innerJoin('user', 'transfer.paid_by = user.id');
$query->orderBy(['transfer.created_at' => SORT_ASC]);
$this->addQueryFilters($query);
$this->moneyMovements = $query->all();
for ($i = 0; $i < count($this->moneyMovements) ;$i++ ){
$count = count($this->moneyMovements);
for ($i = 0; $i < $count ;$i++ ){
$this->moneyMovements[$i]['money_movement_type_name'] = MoneyMovement::typeName($this->moneyMovements[$i]['money_movement_type']);
$this->moneyMovements[$i]['money_movement_created_at'] = Yii::$app->formatter->asDatetime($this->moneyMovements[$i]['money_movement_created_at'], 'yyyy.MM.dd HH:mm:ss');
$this->moneyMovements[$i]['signed_money'] = Transfer::toSignedMoney($this->moneyMovements[$i]['transfer_direction'],$this->moneyMovements[$i]['money_movement_money']);