Skip to content

Commit 355eeb5

Browse files
committed
Paginate recurrence rules.
1 parent 08a44e3 commit 355eeb5

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

src/Controller/Utils/StoreTrait.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,8 @@ public function storeSavedOrdersAction($id, Request $request,
755755
public function storeRecurrenceRulesAction($id, Request $request,
756756
EntityManagerInterface $entityManager,
757757
DeliveryManager $deliveryManager,
758-
PricingManager $pricingManager
758+
PricingManager $pricingManager,
759+
PaginatorInterface $paginator
759760
)
760761
{
761762
$store = $entityManager
@@ -768,9 +769,19 @@ public function storeRecurrenceRulesAction($id, Request $request,
768769

769770
$data = [];
770771
$this->entityManager->getFilters()->enable('soft_deleteable');
771-
$recurrenceRules = $this->entityManager->getRepository(RecurrenceRule::class)->findBy(
772-
array('store' => $store),
773-
array('createdAt' => 'DESC')
772+
773+
$qb = $this->entityManager->getRepository(RecurrenceRule::class)->createQueryBuilder('o');
774+
$qb->andWhere('o.store = :store');
775+
$qb->addOrderBy('o.createdAt', 'DESC');
776+
$qb->setParameter('store', $store);
777+
778+
$recurrenceRules = $paginator->paginate(
779+
$qb,
780+
$request->query->getInt('page', 1),
781+
10,
782+
[
783+
PaginatorInterface::DISTINCT => false,
784+
]
774785
);
775786

776787
// The date is not relevant while viewing/editing the recurrence rules (only the time is),
@@ -807,6 +818,7 @@ public function storeRecurrenceRulesAction($id, Request $request,
807818
'layout' => $request->attributes->get('layout'),
808819
'store' => $store,
809820
'recurrence_rules' => $data,
821+
'pagination' => $recurrenceRules,
810822
'routes' => [
811823
'view' => $routes['store_recurrence_rule'],
812824
],

templates/store/recurrence_rules.html.twig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@
1313

1414
{% include '_partials/recurrence_rule/list.html.twig' with { items: recurrence_rules, empty_message: 'stores.recurrence_rules.empty_message' } %}
1515

16+
<div class="text-center">
17+
{{ knp_pagination_render(pagination, '@KnpPaginator/Pagination/twitter_bootstrap_v3_pagination.html.twig') }}
18+
</div>
19+
1620
{% endblock %}

0 commit comments

Comments
 (0)