@@ -71,11 +71,11 @@ |
||
71 | 71 | ->add('user.fullname', null, ['label' => 'Имя пользователя']) |
72 | 72 | ->add('mail.title', null, ['label' => 'Название']) |
73 | 73 | ->add('_action', 'actions', [ |
74 | - 'label' => 'Действие', |
|
75 | - 'actions' => [ |
|
76 | - 'edit' => [], |
|
77 | - 'delete' => [], |
|
78 | - ], |
|
74 | + 'label' => 'Действие', |
|
75 | + 'actions' => [ |
|
76 | + 'edit' => [], |
|
77 | + 'delete' => [], |
|
78 | + ], |
|
79 | 79 | ]); |
80 | 80 | } |
81 | 81 |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | $qb = $this->createQueryBuilder('t'); |
32 | 32 | |
33 | 33 | return $qb->join('t.event', 'e') |
34 | - ->where($qb->expr()->eq('e.active', ':active')) |
|
35 | - ->andWhere($qb->expr()->eq('t.user', ':user')) |
|
36 | - ->setParameters(['user' => $user, 'active' => true]) |
|
37 | - ->orderBy('e.date', 'ASC') |
|
38 | - ->getQuery() |
|
39 | - ->getResult(); |
|
34 | + ->where($qb->expr()->eq('e.active', ':active')) |
|
35 | + ->andWhere($qb->expr()->eq('t.user', ':user')) |
|
36 | + ->setParameters(['user' => $user, 'active' => true]) |
|
37 | + ->orderBy('e.date', 'ASC') |
|
38 | + ->getQuery() |
|
39 | + ->getResult(); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
@@ -340,20 +340,20 @@ discard block |
||
340 | 340 | |
341 | 341 | $qb = $this->createQueryBuilder('t'); |
342 | 342 | $qb->select('MONTH(p.updatedAt) as paymentMonth, DAY(p.updatedAt) as paymentDay, COUNT(t.id) as ticketsCount') |
343 | - ->join('t.payment', 'p') |
|
344 | - ->where($qb->expr()->gte('p.updatedAt', ':monthAgo')) |
|
345 | - ->andWhere($qb->expr()->lte('p.updatedAt', ':now')) |
|
346 | - ->andWhere($qb->expr()->eq('p.status', ':status')) |
|
347 | - ->setParameters([ |
|
348 | - 'monthAgo' => $monthAgo, |
|
349 | - 'now' => $now, |
|
350 | - 'status' => Payment::STATUS_PAID, |
|
351 | - ]) |
|
343 | + ->join('t.payment', 'p') |
|
344 | + ->where($qb->expr()->gte('p.updatedAt', ':monthAgo')) |
|
345 | + ->andWhere($qb->expr()->lte('p.updatedAt', ':now')) |
|
346 | + ->andWhere($qb->expr()->eq('p.status', ':status')) |
|
347 | + ->setParameters([ |
|
348 | + 'monthAgo' => $monthAgo, |
|
349 | + 'now' => $now, |
|
350 | + 'status' => Payment::STATUS_PAID, |
|
351 | + ]) |
|
352 | 352 | ; |
353 | 353 | |
354 | 354 | if ($event instanceof Event) { |
355 | 355 | $qb->andWhere($qb->expr()->eq('t.event', ':event')) |
356 | - ->setParameter('event', $event); |
|
356 | + ->setParameter('event', $event); |
|
357 | 357 | } |
358 | 358 | |
359 | 359 | $results = $qb |
@@ -26,7 +26,7 @@ |
||
26 | 26 | 'листопада' => ['листопад', 'осінь'], |
27 | 27 | 'грудня' => ['грудень', 'зима'], |
28 | 28 | ], |
29 | - 'en' => |
|
29 | + 'en' => |
|
30 | 30 | [ |
31 | 31 | 'January' => ['January', 'Winter'], |
32 | 32 | 'February' => ['February', 'Winter'], |
@@ -36,10 +36,10 @@ |
||
36 | 36 | |
37 | 37 | $fileConstraint = new Collection( |
38 | 38 | [ |
39 | - 'file' => [ |
|
40 | - new NotBlank(), |
|
41 | - new Image(), |
|
42 | - ], |
|
39 | + 'file' => [ |
|
40 | + new NotBlank(), |
|
41 | + new Image(), |
|
42 | + ], |
|
43 | 43 | ] |
44 | 44 | ); |
45 | 45 |