Merge pull request 'make short new transaction url even shorter' (!66) from feature/change-short-new-transaction-url into master

Reviewed-on: #66

src/Repository/EventRepository.php

@@ -102,7 +102,11 @@ class EventRepository
     {
         $select->where(function (Select $select) use ($from, $days) {
             $select->where('start', '<', (clone $from)->add(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
-            $select->orWhere('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+            $select->where('end', '>', $from->format('Y-m-d H:i:s'));
+        });
+        $select->orWhere(function (Select $select) use ($from, $days) {
+            $select->where('end', '>', (clone $from)->sub(DateInterval::createFromDateString("$days days"))->format('Y-m-d H:i:s'));
+            $select->where('start', '<', $from->format('Y-m-d H:i:s'));
         });
     }
 }

web.php

@@ -65,7 +65,7 @@ Container::$routeCollection->group('account', function (RouteCollection $routeCo
 Container::$routeCollection->get('searchUser', 'searchUser', [UserSearchController::class, 'searchUser']);
 Container::$routeCollection->group('now', function (RouteCollection $routeCollection) {
     $routeCollection->get('now.event', '', [EventRedirectController::class, 'getEvent']);
-    $routeCollection->get('now.transactions.new', 'transactions/new', [EventRedirectController::class, 'getEventNewTransaction']);
+    $routeCollection->get('now.transactions.new', 'transaction', [EventRedirectController::class, 'getEventNewTransaction']);
 });
 Container::$routeCollection->group('communities', function (RouteCollection $routeCollection) {
     $routeCollection->get('community.new', 'new', [CommunityController::class, 'getCommunityNew']);