@@ -405,7 +405,7 @@ |
||
| 405 | 405 | $this->addRequirement( |
| 406 | 406 | is_dir(__DIR__.'/../vendor/composer'), |
| 407 | 407 | 'Vendor libraries must be installed', |
| 408 | - 'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' . |
|
| 408 | + 'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. '. |
|
| 409 | 409 | 'Then run "<strong>php composer.phar install</strong>" to install them.' |
| 410 | 410 | ); |
| 411 | 411 | |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | $version = ''; |
| 49 | 49 | |
| 50 | 50 | if (defined('INTL_ICU_VERSION')) { |
| 51 | - $version = INTL_ICU_VERSION; |
|
| 51 | + $version = INTL_ICU_VERSION; |
|
| 52 | 52 | } else { |
| 53 | 53 | $reflector = new \ReflectionExtension('intl'); |
| 54 | 54 | |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | $statament = $this->connection->prepare('SELECT * FROM payments'); |
| 24 | 24 | $statament->execute(); |
| 25 | 25 | while ($row = $statament->fetch()) { |
| 26 | - $this->addSql('UPDATE event__tickets SET amount = ' . $row['amount'] . |
|
| 27 | - ', amount_without_discount = ' . $row['amount_without_discount'] . |
|
| 28 | - ', has_discount = ' . $row['has_discount'] . |
|
| 29 | - ' WHERE payment_id = ' . $row['id']); |
|
| 26 | + $this->addSql('UPDATE event__tickets SET amount = '.$row['amount']. |
|
| 27 | + ', amount_without_discount = '.$row['amount_without_discount']. |
|
| 28 | + ', has_discount = '.$row['has_discount']. |
|
| 29 | + ' WHERE payment_id = '.$row['id']); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | $this->addSql("ALTER TABLE payments DROP has_discount, DROP amount_without_discount"); |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | $position = 1; |
| 28 | 28 | foreach ($event->getBlocks() as $block) { |
| 29 | 29 | $block->setPosition($position); |
| 30 | - $position ++; |
|
| 30 | + $position++; |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
@@ -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 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | ->with('Участвует в событиях', ['class' => 'col-md-4']) |
| 79 | 79 | ->add('events', 'entity', [ |
| 80 | 80 | 'class' => 'Stfalcon\Bundle\EventBundle\Entity\Event', |
| 81 | - 'query_builder' => function (\Doctrine\ORM\EntityRepository $repository) { |
|
| 81 | + 'query_builder' => function(\Doctrine\ORM\EntityRepository $repository) { |
|
| 82 | 82 | $qb = $repository->createQueryBuilder('e'); |
| 83 | 83 | $repository = $qb->orderBy('e.id', 'DESC'); |
| 84 | 84 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | ->with('Кандидат на события', ['class' => 'col-md-4']) |
| 93 | 93 | ->add('candidateEvents', 'entity', [ |
| 94 | 94 | 'class' => 'Stfalcon\Bundle\EventBundle\Entity\Event', |
| 95 | - 'query_builder' => function (\Doctrine\ORM\EntityRepository $repository) { |
|
| 95 | + 'query_builder' => function(\Doctrine\ORM\EntityRepository $repository) { |
|
| 96 | 96 | $qb = $repository->createQueryBuilder('e'); |
| 97 | 97 | $repository = $qb->orderBy('e.id', 'DESC'); |
| 98 | 98 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | ->with('Программный комитет', ['class' => 'col-md-4']) |
| 107 | 107 | ->add('committeeEvents', 'entity', [ |
| 108 | 108 | 'class' => 'Stfalcon\Bundle\EventBundle\Entity\Event', |
| 109 | - 'query_builder' => function (\Doctrine\ORM\EntityRepository $repository) { |
|
| 109 | + 'query_builder' => function(\Doctrine\ORM\EntityRepository $repository) { |
|
| 110 | 110 | $qb = $repository->createQueryBuilder('e'); |
| 111 | 111 | $repository = $qb->orderBy('e.id', 'DESC'); |
| 112 | 112 | |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | 'doctrine_orm_callback', |
| 101 | 101 | [ |
| 102 | 102 | 'label' => 'Событие', |
| 103 | - 'callback' => function ($queryBuilder, $alias, $field, $value) { |
|
| 103 | + 'callback' => function($queryBuilder, $alias, $field, $value) { |
|
| 104 | 104 | $eventsId = []; |
| 105 | 105 | /** @var $event \Stfalcon\Bundle\EventBundle\Entity\Event */ |
| 106 | 106 | foreach ($value['value'] as $event) { |
@@ -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'], |