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

add ticket original end and original price

Browse Source 
add helper links to related object in admin
This commit is contained in:
Roland Schneider
2017-09-06 12:14:12 +02:00
parent bacfc36487
commit 90d19d17b6
19 changed files with 481 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
backend/models/TicketSearch.php
View File

@@ -41,6 +41,8 @@ class TicketSearch extends Ticket
public $customer_name;
public $card_number;
public $modified;
/**
* @inheritdoc
@@ -48,13 +50,13 @@ class TicketSearch extends Ticket
public function rules()
{
return [
[['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'status', 'id_customer'], 'integer'],
[['id_ticket', 'id_user', 'id_ticket_type', 'id_account', 'status', 'id_customer', 'modified'], 'integer'],
// [[ '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'],
[['valid_in_interval', 'created_in_interval', 'expire_in_interval', 'paid_in_interval'], 'boolean'],
[['output', 'customer_name','card_number'], 'safe']
[['output', 'customer_name', 'card_number'], 'safe']
];
}
@@ -77,6 +79,7 @@ class TicketSearch extends Ticket
'created_in_interval' => Yii::t('backend/ticket', 'Created in interval'),
'expire_in_interval' => Yii::t('backend/ticket', 'Expire in interval'),
'paid_in_interval' => "Fizetve az időszakban",
'modified' => "Módosított",
]);
}
@@ -192,6 +195,19 @@ class TicketSearch extends Ticket
'card.number' => $this->card_number
]);
if ($this->modified == 1) {
$query->andWhere(
[
'or',
['and', ['not', ['ticket.original_price' => null]], ['<>', 'ticket.original_price', 'ticket.price_brutto']],
['and', ['not', ['ticket.original_end' => null]], ['<>', 'ticket.original_end', 'ticket.end']],
]
);
// $query->andWhere('ticket.original_price is not null and ticket.original_price <> ticket.price_brutto');
// $query->andWhere('ticket.original_end is not null and ticket.original_end <> ticket.end');
}
$query->andFilterWhere(['like', new Expression('LOWER(customer.name)'), strtolower($this->customer_name)]);
$all = (!($this->valid_in_interval) && !($this->expire_in_interval) && !($this->created_in_interval) && !($this->paid_in_interval))
@@ -232,7 +248,8 @@ class TicketSearch extends Ticket
}
public function isAllDateConditionOn(){
public function isAllDateConditionOn()
{
$all = (!($this->valid_in_interval) && !($this->expire_in_interval) && !($this->created_in_interval) && !($this->paid_in_interval))
||
($this->valid_in_interval == true && $this->expire_in_interval == true && $this->created_in_interval && $this->paid_in_interval);