detsta processing -> move to cart if not successfull, transfer/paymentLater changes
This commit is contained in:
@@ -94,9 +94,11 @@ class TicketInstallmentRequestSearch extends TicketInstallmentRequest
|
||||
'ticket.end as ticket_end',//ticket_send
|
||||
'ticket.id_ticket as ticket_id_ticket',//id_ticket
|
||||
'ugiro_request_assignment.id_ugiro as ugiro_id_ugiro' ,//köteg azonosító
|
||||
'card.number as card_number'
|
||||
]);
|
||||
$query->from("ticket_installment_request");
|
||||
$query->innerJoin("customer","customer.id_customer = ticket_installment_request.id_customer");
|
||||
$query->leftJoin("card","card.id_card = customer.id_customer_card");
|
||||
$query->leftJoin("ticket","ticket.id_ticket = ticket_installment_request.id_ticket");
|
||||
$query->leftJoin("ticket_type","ticket.id_ticket_type = ticket_type.id_ticket_type");
|
||||
$query->leftJoin("ugiro_request_assignment","ticket_installment_request.id_ticket_installment_request = ugiro_request_assignment.id_request");
|
||||
|
||||
@@ -10,9 +10,7 @@ use yii\db\Expression;
|
||||
use yii\base\Object;
|
||||
use yii\db\Query;
|
||||
use yii\helpers\ArrayHelper;
|
||||
use common\models\Account;
|
||||
use common\components\Helper;
|
||||
use common\components\RoleDefinition;
|
||||
|
||||
/**
|
||||
* TransferSearch represents the model behind the search form about `common\models\Transfer`.
|
||||
@@ -24,7 +22,13 @@ class TransferLaterSearch extends Transfer
|
||||
|
||||
public $timestampStart;
|
||||
public $timestampEnd;
|
||||
|
||||
|
||||
public $enterStart;
|
||||
public $enterEnd;
|
||||
|
||||
public $timestampEnterStart;
|
||||
public $timestampEnterEnd;
|
||||
|
||||
public $id_ticket_type;
|
||||
|
||||
|
||||
@@ -45,6 +49,8 @@ class TransferLaterSearch extends Transfer
|
||||
[[ 'id_ticket_type','id_user'], 'integer'],
|
||||
[[ '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' ],
|
||||
[[ 'enterStart', ], 'date', 'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnterStart' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
|
||||
[[ 'enterEnd' , ], 'date' ,'format' =>Yii::$app->formatter->datetimeFormat , 'timestampAttribute' => 'timestampEnterEnd' ,'timestampAttributeFormat' => 'yyyy-MM-dd HH:mm' ,'timeZone' => 'UTC' ],
|
||||
['selected', 'each', 'rule' => ['integer']],
|
||||
];
|
||||
}
|
||||
@@ -58,7 +64,7 @@ class TransferLaterSearch extends Transfer
|
||||
return Model::scenarios();
|
||||
}
|
||||
|
||||
/**
|
||||
/**1
|
||||
* Creates data provider instance with search query applied
|
||||
*
|
||||
* @param array $params
|
||||
@@ -68,6 +74,9 @@ class TransferLaterSearch extends Transfer
|
||||
public function search($params)
|
||||
{
|
||||
$query = new Query();
|
||||
$this->load($params);
|
||||
|
||||
$valid = $this->validate();
|
||||
|
||||
$query->select([
|
||||
'transfer.id_transfer as transfer_id_transfer',
|
||||
@@ -83,26 +92,49 @@ class TransferLaterSearch extends Transfer
|
||||
'ticket.start as ticket_start',
|
||||
'ticket.end as ticket_end',
|
||||
'ticket.comment as ticket_comment',
|
||||
'card.number as card_number',
|
||||
new Expression('count(door_log.id_door_log) as enter'),
|
||||
]);
|
||||
$query->from("transfer");
|
||||
$query->innerJoin('user', " user.id = transfer.id_user");
|
||||
$query->leftJoin('customer', " transfer.id_customer = customer.id_customer");
|
||||
$query->leftJoin('card', " customer.id_customer_card = card.id_card");
|
||||
$query->leftJoin('ticket', " transfer.type = ".Transfer::TYPE_TICKET." and transfer.id_object = ticket.id_ticket");
|
||||
$query->leftJoin('ticket_type', " ticket.id_ticket_type = ticket_type.id_ticket_type");
|
||||
$query->leftJoin('sale', " transfer.type = ".Transfer::TYPE_PRODUCT." and transfer.id_object = sale.id_sale");
|
||||
$query->leftJoin('product', " product.id_product = sale.id_product");
|
||||
|
||||
$query->leftJoin('door_log',
|
||||
"door_log.id_customer = transfer.id_customer and door_log.direction in (3,7)
|
||||
and door_log.created_at >= :start and door_log.created_at < :end ",
|
||||
[':start' => $this->timestampEnterStart,
|
||||
':end' => $this->timestampEnterEnd]);
|
||||
$query->groupBy(
|
||||
[
|
||||
'transfer.id_transfer',
|
||||
'transfer.created_at',
|
||||
'transfer.money',
|
||||
'transfer.status',
|
||||
'user.username',
|
||||
'customer.id_customer',
|
||||
'customer.name',
|
||||
'customer.description',
|
||||
'ticket_type.name',
|
||||
'product.name',
|
||||
'ticket.start',
|
||||
'ticket.end',
|
||||
'ticket.comment',
|
||||
'card.number'
|
||||
]
|
||||
);
|
||||
|
||||
$query->andWhere(["transfer.payment_method" => Transfer::PAYMENT_METHOD_TRANSFER_LATER ]);
|
||||
|
||||
$query->andWhere(['transfer.status' => Transfer::STATUS_NOT_PAID]);
|
||||
|
||||
$this->load($params);
|
||||
|
||||
$valid = $this->validate();
|
||||
|
||||
$dataProvider = new ActiveDataProvider([
|
||||
'query' => $query,
|
||||
'pagination' => $this->output == 'pdf' ? false : [],
|
||||
'pagination' => ( $this->output == 'pdf' || $this->output == 'xls' ) ? false : [],
|
||||
'sort' => [
|
||||
'defaultOrder' =>[
|
||||
'transfer_created_at' => SORT_DESC
|
||||
@@ -119,6 +151,8 @@ class TransferLaterSearch extends Transfer
|
||||
['ticket_end'],
|
||||
['ticket_comment'],
|
||||
['customer_description'],
|
||||
['enter'],
|
||||
['card_number']
|
||||
])
|
||||
|
||||
]
|
||||
@@ -149,8 +183,42 @@ class TransferLaterSearch extends Transfer
|
||||
|
||||
return $dataProvider;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* TODO: DASAP
|
||||
* @param $start
|
||||
* @param $end
|
||||
* @param $idCustomer
|
||||
*/
|
||||
protected function getEnterCount($start,$end,$idCustomer){
|
||||
$query = new Query();
|
||||
$query->select([
|
||||
'card.number as card_number',
|
||||
'card.id_card as card_id_card',
|
||||
'count(*) as enter',
|
||||
new Expression('EXTRACT( YEAR_MONTH FROM door_log.created_at) as ym'),
|
||||
new Expression('EXTRACT( YEAR FROM door_log.created_at ) as year'),
|
||||
new Expression('EXTRACT( MONTH FROM door_log.created_at ) as month ')
|
||||
|
||||
]);
|
||||
$query->from('door_log');
|
||||
$query->innerJoin('card','card.id_card = door_log.id_card');
|
||||
$query->andWhere(['in','door_log.direction',[3,7]]);
|
||||
$query->groupBy([
|
||||
'card.number',
|
||||
'card.id_card',
|
||||
'ym',
|
||||
'year',
|
||||
'month'
|
||||
]);
|
||||
$query->andWhere(['door_log.id_customer' => $idCustomer]);
|
||||
$query->andWhere([ '>=','door_log.created_at',$start]);
|
||||
$query->andWhere([ '<','door_log.created_at',$end]);
|
||||
$query->all();
|
||||
}
|
||||
|
||||
|
||||
public function totalsTransfers( ){
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user