From 20c9c362c9c6b852bbc2484afc5f89c8f2bcc38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alo=C3=AFs=20Guillop=C3=A9?= <alois.guillope@gmail.com>
Date: Tue, 24 Dec 2024 15:27:01 +0100
Subject: [PATCH 1/2] clean: improve order table display for lastmile/local
 commerce orders

---
 templates/_partials/delivery/list.html.twig   | 28 +-----------------
 .../_partials/delivery/summary.html.twig      | 27 +++++++++++++++++
 templates/_partials/order/customer.html.twig  |  4 +--
 templates/_partials/order/list.html.twig      | 29 ++++++++++++-------
 templates/_partials/order/summary.html.twig   | 14 ++++-----
 5 files changed, 54 insertions(+), 48 deletions(-)
 create mode 100644 templates/_partials/delivery/summary.html.twig

diff --git a/templates/_partials/delivery/list.html.twig b/templates/_partials/delivery/list.html.twig
index 3276305983..fc89241ed9 100644
--- a/templates/_partials/delivery/list.html.twig
+++ b/templates/_partials/delivery/list.html.twig
@@ -45,33 +45,7 @@
       </td>
       {% endif %}
       <td width="40%">
-        <ul class="list-unstyled">
-          {% for task in delivery.getTasks() %}
-          <li>
-            <small>
-              <span class="mr-1">{% include "_partials/task/type_icon.html.twig" with { task: task } %}</span>
-              {% if task.address.name is not empty %}
-                <span><b>{{ task.address.name }}, </b></span>
-              {% endif %}
-              <span>
-                {% if task.isCancelled() %}<del>{% endif %}
-                  {{ task.address.streetAddress }}
-                {% if task.isCancelled() %}</del>{% endif %}
-              </span>
-            </small>
-          </li>
-          {% endfor %}
-        </ul>
-        {% set details = [ delivery.distance|meters_to_kilometers ] %}
-        {% if delivery.weight is not empty %}
-          {% set details = details|merge([ delivery.weight|grams_to_kilos ]) %}
-        {% endif %}
-        {% if delivery.hasPackages() %}
-          {% for package_quantity in delivery.packages %}
-            {% set details = details|merge([ package_quantity.quantity ~ ' × ' ~ package_quantity.package.name ]) %}
-          {% endfor %}
-        {% endif %}
-        <small>{{ details|join(' - ') }}</small>
+        {% include '_partials/delivery/summary.html.twig' with { delivery: delivery } %}
       </td>
       {% set deliveryState = delivery.computeState() %}
       <td>
diff --git a/templates/_partials/delivery/summary.html.twig b/templates/_partials/delivery/summary.html.twig
new file mode 100644
index 0000000000..4ca38deced
--- /dev/null
+++ b/templates/_partials/delivery/summary.html.twig
@@ -0,0 +1,27 @@
+<ul class="list-unstyled">
+    {% for task in delivery.getTasks() %}
+    <li>
+    <small>
+        <span class="mr-1">{% include "_partials/task/type_icon.html.twig" with { task: task } %}</span>
+        {% if task.isCancelled() %}<del>{% endif %}
+        {% if task.address.name is not empty %}
+            <span><b>{{ task.address.name }}</b></span>
+        {% else %}
+            {{ task.address.streetAddress }}
+        {% endif %}
+        {% if task.isCancelled() %}</del>{% endif %}
+        </span>
+    </small>
+    </li>
+    {% endfor %}
+</ul>
+{% set details = [ delivery.distance|meters_to_kilometers ] %}
+{% if delivery.weight is not empty %}
+    {% set details = details|merge([ delivery.weight|grams_to_kilos ]) %}
+{% endif %}
+{% if delivery.hasPackages() %}
+    {% for package_quantity in delivery.packages %}
+    {% set details = details|merge([ package_quantity.quantity ~ ' × ' ~ package_quantity.package.name ]) %}
+    {% endfor %}
+{% endif %}
+<small>{{ details|join(' - ') }}</small>
\ No newline at end of file
diff --git a/templates/_partials/order/customer.html.twig b/templates/_partials/order/customer.html.twig
index 30fc2b64c8..da09ea57d8 100644
--- a/templates/_partials/order/customer.html.twig
+++ b/templates/_partials/order/customer.html.twig
@@ -1,6 +1,6 @@
 {% if customer.hasUser() %}
   <a href="{{ path('admin_user_details', { username: customer.username }) }}"
-    class="d-inline-block text-truncate" style="max-width: 120px;"
+    class="d-block text-truncate" style="max-width: 120px;"
     title="{{ customer.user.username|e('html_attr') }}">
     <i class="fa fa-user mr-1"></i>
     <span>{{ customer.user.username }}</span>
@@ -14,7 +14,7 @@
   </a>
 {% else %}
   <span
-    class="d-inline-block text-truncate" style="max-width: 120px;"
+    class="d-block text-truncate" style="max-width: 120px;"
     title="{{ customer.emailCanonical|e('html_attr') }}">
     <i class="fa fa-user mr-1"></i>
     <span>{{ customer.emailCanonical }}</span>
diff --git a/templates/_partials/order/list.html.twig b/templates/_partials/order/list.html.twig
index 4af7afe55f..2430c81ad0 100644
--- a/templates/_partials/order/list.html.twig
+++ b/templates/_partials/order/list.html.twig
@@ -2,13 +2,13 @@
   <thead>
     <th>#</th>
     {% if is_granted('ROLE_ADMIN') and (with_extras ?? true) %}
-    <th>{% trans %}order.list.customer{% endtrans %}</th>
+      <th>{% trans %}order.list.state{% endtrans %}</th>
+      <th>{% trans %}delivery.table.heading.owner{% endtrans %}</th>
     {% endif %}
-    <th>{% trans %}order.list.state{% endtrans %}</th>
     <th>{% trans %}order.list.summary{% endtrans %}</th>
     {% if is_granted('ROLE_ADMIN') and (with_extras ?? true) %}
-    <th class="text-right">{% trans %}order.total_excluding_tax{% endtrans %}</th>
-    <th class="text-right">{% trans %}basics.platform_fees{% endtrans %}</th>
+      <th class="text-right">{% trans %}order.total_excluding_tax{% endtrans %}</th>
+      <th class="text-right">{% trans %}basics.platform_fees{% endtrans %}</th>
     {% endif %}
     <th class="text-right">{% trans %}order.total_including_tax{% endtrans %}</th>
     {% if with_receipt ?? true %}
@@ -42,21 +42,28 @@
       </a>
     </td>
     {% if is_granted('ROLE_ADMIN') and (with_extras ?? true) %}
-    <td width="10%">
+    <td width="5%">{% include '_partials/order/state.html.twig' %}</td>
+    <td>
+      {% if order.hasVendor() and not order.isMultiVendor() %}
+        {{ order.vendor.name }}
+      {% elseif order.delivery and order.delivery.store %}
+        {{ order.delivery.store.name }}
+      {% endif %}
+    </td>
+    {% endif %}
+    <td>
       {% if order.customer is not null %}
         {% include '_partials/order/customer.html.twig' with { customer: order.customer } %}
       {% endif %}
+      {% include '_partials/order/summary.html.twig' %}
     </td>
-    {% endif %}
-    <td width="5%">{% include '_partials/order/state.html.twig' %}</td>
-    <td>{% include '_partials/order/summary.html.twig' %}</td>
     {% if is_granted('ROLE_ADMIN') and (with_extras ?? true) %}
-    <td class="text-right">
+    <td width="8%" class="text-right">
       <span>{{ (order.itemsTotal - order.itemsTaxTotal)|price_format }}</span>
     </td>
-    <td class="text-right">{{ order.getFeeTotal()|price_format }}</td>
+    <td width="8%" class="text-right">{{ order.getFeeTotal()|price_format }}</td>
     {% endif %}
-    <td class="text-right">
+    <td width="8%" class="text-right">
       <span>{{ order.total|price_format }}</span>
     </td>
     {% if with_receipt ?? true %}
diff --git a/templates/_partials/order/summary.html.twig b/templates/_partials/order/summary.html.twig
index bc39d4e53f..51a5435891 100644
--- a/templates/_partials/order/summary.html.twig
+++ b/templates/_partials/order/summary.html.twig
@@ -1,10 +1,10 @@
-{% if order.fulfillmentMethod is not empty and order.fulfillmentMethod == 'collection' %}
-  <i class="fa fa-cube mr-2"></i>
-{% else %}
-  <i class="fa fa-bicycle mr-2"></i>
-{% endif %}
 <span>
 {% if order.hasVendor() %}
+  {% if order.fulfillmentMethod is not empty and order.fulfillmentMethod == 'collection' %}
+    <i class="fa fa-cube mr-2"></i>
+  {% else %}
+    <i class="fa fa-bicycle mr-2"></i>
+  {% endif %}
   {% if order.isMultiVendor() %}
     {% trans with {
         '%name%': order.vendor.name
@@ -25,8 +25,6 @@
     {% endif %}
   {% endif %}
 {% else %}
-  {% for item in order.items %}
-    {{ item.variant.name }}
-  {% endfor %}
+    {% include '_partials/delivery/summary.html.twig' with { delivery: order.delivery } %}
 {% endif %}
 </span>

From c5f057f076c2d232cf28113524aee2aea1e01342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alo=C3=AFs=20Guillop=C3=A9?= <alois.guillope@gmail.com>
Date: Mon, 13 Jan 2025 16:58:34 +0100
Subject: [PATCH 2/2] feat: add streetAddress on list view

---
 templates/_partials/delivery/summary.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/_partials/delivery/summary.html.twig b/templates/_partials/delivery/summary.html.twig
index 4ca38deced..4c5bdf6ddf 100644
--- a/templates/_partials/delivery/summary.html.twig
+++ b/templates/_partials/delivery/summary.html.twig
@@ -5,7 +5,7 @@
         <span class="mr-1">{% include "_partials/task/type_icon.html.twig" with { task: task } %}</span>
         {% if task.isCancelled() %}<del>{% endif %}
         {% if task.address.name is not empty %}
-            <span><b>{{ task.address.name }}</b></span>
+            <span><b>{{ task.address.name }}</b> - {{ task.address.streetAddress }}</span>
         {% else %}
             {{ task.address.streetAddress }}
         {% endif %}