From 2514c4d0d009a9faa581bc3c716b4ff7c1c820e6 Mon Sep 17 00:00:00 2001
From: Edie Lemoine <edie@myparcel.nl>
Date: Mon, 25 Nov 2019 10:32:17 +0100
Subject: [PATCH] fix(layout): move carrier logo in pickup location details
 under the header

---
 src/components/Pickup/PickupDetails.vue | 39 +++++++++++++++++--------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/Pickup/PickupDetails.vue b/src/components/Pickup/PickupDetails.vue
index de6dd3b1..5c899f7b 100644
--- a/src/components/Pickup/PickupDetails.vue
+++ b/src/components/Pickup/PickupDetails.vue
@@ -2,9 +2,20 @@
   <div :class="`${$classBase}__pickup-details`">
     <table :class="`${$classBase}__table`">
       <tr>
-        <td :colspan="$configBus.isMultiCarrier ? 1 : 2">
+        <td colspan="2">
           <h3 v-text="data.location.location_name" />
         </td>
+      </tr>
+      <tr>
+        <td :colspan="$configBus.isMultiCarrier ? 1 : 2">
+          <span v-text="data.address.street + ' ' + data.address.number" /><br>
+          <span v-text="data.address.postal_code + ' ' + data.address.city" />
+
+          <template v-if="!!data.location.phone_number">
+            <br>
+            <span v-text="data.location.phone_number" /><br>
+          </template>
+        </td>
 
         <td v-if="$configBus.isMultiCarrier">
           <img
@@ -17,17 +28,6 @@
             :alt="data.carrier.human">
         </td>
       </tr>
-      <tr>
-        <td colspan="2">
-          <span v-text="data.address.street + ' ' + data.address.number" /><br>
-          <span v-text="data.address.postal_code + ' ' + data.address.city" />
-
-          <template v-if="!!data.location.phone_number">
-            <br>
-            <span v-text="data.location.phone_number" /><br>
-          </template>
-        </td>
-      </tr>
     </table>
     <table :class="`${$classBase}__table`">
       <tr>
@@ -48,6 +48,21 @@
         </td>
       </tr>
     </table>
+    <table :class="`${$classBase}__table`">
+      <tr>
+        <td>
+          <h3 v-text="strings.options" />
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <recursive-form
+            v-for="(option, index) in data.options"
+            :key="'pickup_' + index"
+            :option="option" />
+        </td>
+      </tr>
+    </table>
   </div>
 </template>