From f0d9916216b983a780ca4b6e447478c6f39a14d8 Mon Sep 17 00:00:00 2001
From: Sara <49147098+saralb9@users.noreply.github.com>
Date: Wed, 28 Apr 2021 10:30:53 +0200
Subject: [PATCH] [FIX] Fix group reservations by folio (#87)

---
 pms/controllers/pms_portal.py              | 18 +++---
 pms/views/reservation_portal_templates.xml | 66 ++++++++++++----------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/pms/controllers/pms_portal.py b/pms/controllers/pms_portal.py
index 89b8b2c4b..3eeffcd74 100644
--- a/pms/controllers/pms_portal.py
+++ b/pms/controllers/pms_portal.py
@@ -158,15 +158,6 @@ class PortalReservation(CustomerPortal):
         domain = [
             ("partner_id", "child_of", partner.id),
         ]
-        # searchbar_sortings = {
-        #     "date": {"label": _("Order Date"), "reservation": "date_order desc"},
-        #     "name": {"label": _("Reference"), "reservation": "name"},
-        #     "stage": {"label": _("Stage"), "reservation": "state"},
-        # }
-        # if not sortby:
-        #     sortby = "date"
-        # sort_order = searchbar_sortings[sortby]["reservation"]
-
         if date_begin and date_end:
             domain += [
                 ("create_date", ">", date_begin),
@@ -183,6 +174,11 @@ class PortalReservation(CustomerPortal):
         reservations = Reservation.search(
             domain, limit=self._items_per_page, offset=pager["offset"]
         )
+        folios_dict = {}
+        for reservation in reservations:
+            folio = reservation.folio_id
+            folios_dict[folio] = ""
+
         request.session["my_reservations_history"] = reservations.ids[:100]
         values.update(
             {
@@ -191,8 +187,8 @@ class PortalReservation(CustomerPortal):
                 "page_name": "reservations",
                 "pager": pager,
                 "default_url": "/my/reservations",
-                # "searchbar_sortings": searchbar_sortings,
-                # "sortby": sortby,
+                "folios_dict": folios_dict,
+                "partner": partner,
             }
         )
         return request.render("pms.portal_my_reservation", values)
diff --git a/pms/views/reservation_portal_templates.xml b/pms/views/reservation_portal_templates.xml
index e567b6900..72d4e2719 100644
--- a/pms/views/reservation_portal_templates.xml
+++ b/pms/views/reservation_portal_templates.xml
@@ -55,38 +55,42 @@
                 </tr>
             </thead>
             <tbody>
-                <t t-foreach="reservations" t-as="reservation">
-                    <t t-set="folio" t-value="reservation.folio_id" />
-                    <!-- Sacar folio-->
-                    <t t-if="reservation == folio.reservation_ids[0]">
-                        <tr class="bg-light">
-                            <td colspan="4"><em
-                                        class="font-weight-normal text-muted"
-                                    ><span /> Reservations by folio: </em>
-                            <a
-                                        t-att-href="folio.get_portal_url()"
-                                        t-att-title="folio.name"
-                                    >
-                                <t t-esc="folio.name" />
-                            </a>
-                        </td>
-                        </tr>
+                <t t-set="folio_old" t-value="" />
+                <t t-foreach="folios_dict" t-as="folio">
+                    <t t-foreach="folio.reservation_ids" t-as="reservation">
+                        <t t-if="reservation.partner_id == partner">
+                            <t t-if="folio != folio_old">
+                                <tr class="bg-light">
+                                    <td colspan="4"><em
+                                                class="font-weight-normal text-muted"
+                                            ><span /> Reservations by folio: </em>
+                                    <a
+                                                t-att-href="folio.get_portal_url()"
+                                                t-att-title="folio.name"
+                                            >
+                                        <t t-esc="folio.name" />
+                                    </a>
+                                    </td>
+                                </tr>
+                            </t>
+                            <t t-set="folio_old" t-value="folio" />
+                            <tr>
+                                <td>
+                                    <a
+                                            t-att-href="reservation.get_portal_url()"
+                                            t-att-title="reservation.name"
+                                        >
+                                        <t t-esc="reservation.name" />
+                                    </a>
+                                </td>
+                                <td><span t-field="reservation.checkin" /></td>
+                                <td><span t-field="reservation.checkout" /></td>
+                                <td class="text-right"><span
+                                            t-field="reservation.price_room_services_set"
+                                        /></td>
+                            </tr>
+                        </t>
                     </t>
-                    <tr>
-                        <td>
-                            <a
-                                    t-att-href="reservation.get_portal_url()"
-                                    t-att-title="reservation.name"
-                                >
-                                <t t-esc="reservation.name" />
-                            </a>
-                        </td>
-                        <td><span t-field="reservation.checkin" /></td>
-                        <td><span t-field="reservation.checkout" /></td>
-                        <td class="text-right"><span
-                                    t-field="reservation.price_room_services_set"
-                                /></td>
-                    </tr>
                 </t>
             </tbody>
         </t>