From e4a05a18121e05613729b78674ee2efe05a50b3f Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 12 Oct 2021 15:09:34 +0200
Subject: [PATCH] Address: order address in back-end

---
 .../Controller/AddressReferenceAPIController.php     | 12 +++++++++++-
 .../components/AddAddress/AddressSelection.vue       |  4 +---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
index cbe0ea0a5..3ec690677 100644
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -20,8 +21,17 @@ class AddressReferenceAPIController extends ApiController
 
             $qb->where('e.postcode = :postal_code')
                ->setParameter('postal_code', $request->query->get('postal_code'));
-
+            
         }
+ 
+    }
+
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        $query->addOrderBy('e.street', 'ASC');
+        $query->addOrderBy('e.streetNumber', 'ASC');
+
+        return $query;
     }
 
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 489dac800..50a1bd8c1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -70,9 +70,7 @@ export default {
          return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
       },
       addresses() {
-         return this.entity.loaded.addresses.sort(
-               (a, b) => a.street > b.street || Number(a.streetNumber) - Number(b.streetNumber)
-            )      
+         return this.entity.loaded.addresses;
       },
       street: {
          set(value) {