From 4c1813a8118e2c41dae40c245c84d67cb0626d81 Mon Sep 17 00:00:00 2001
From: GitHub Copilot <copilot@example.com>
Date: Sun, 16 Aug 2026 12:00:29 +0200
Subject: [PATCH] =?UTF-8?q?mover=20campos=20de=20compra=20colectiva=20a=20?=
 =?UTF-8?q?su=20p=C3=A1gina=20propia=20dentro=20del=20notebook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/css/components/product-card.css       | 25 +++++++++++++++++++
 .../views/sale_order_views.xml                |  9 ++++---
 .../views/website_templates.xml               | 13 ++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/website_sale_aplicoop/static/src/css/components/product-card.css b/website_sale_aplicoop/static/src/css/components/product-card.css
index ca0ff82..852270b 100644
--- a/website_sale_aplicoop/static/src/css/components/product-card.css
+++ b/website_sale_aplicoop/static/src/css/components/product-card.css
@@ -104,8 +104,13 @@
 .product-tags {
     display: flex;
     flex-wrap: wrap;
+    align-content: center;
     gap: var(--ac-space-3xs);
     justify-content: center;
+    /* Reserved even when a product has no tags (rendered empty, aria-hidden —
+       see eskaera_shop_products), so the supplier/origin/price rows below line
+       up across every card in the grid row. Matches one row of .badge-km. */
+    min-height: calc(var(--ac-text-2xs) * var(--ac-leading-tight) + 2 * var(--ac-space-3xs) + 2px);
     margin: 0;
     padding: 0;
 }
@@ -126,15 +131,35 @@
 
 /* ---------- Supplier & origin ---------- */
 
+/* Both rows are reserved even when empty (rendered aria-hidden — see
+   eskaera_shop_products) and clamped to a fixed line count, so the price row
+   below lines up across every card in the grid row regardless of which
+   products actually have a supplier name or an origin. */
 .product-card .product-supplier,
 .product-card .product-origin {
     margin: 0;
+    overflow: hidden;
     font-size: var(--ac-text-xs);
     font-weight: var(--ac-weight-normal);
     text-align: center;
     color: var(--ac-text-secondary);
 }
 
+.product-card .product-supplier {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    min-height: calc(2em * var(--ac-leading-tight));
+    overflow-wrap: break-word;
+}
+
+.product-card .product-origin {
+    min-height: calc(1em * var(--ac-leading-tight));
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
 .product-card .product-origin .fa {
     margin-right: var(--ac-space-3xs);
 }
diff --git a/website_sale_aplicoop/views/sale_order_views.xml b/website_sale_aplicoop/views/sale_order_views.xml
index 50b5616..1998e65 100644
--- a/website_sale_aplicoop/views/sale_order_views.xml
+++ b/website_sale_aplicoop/views/sale_order_views.xml
@@ -8,16 +8,17 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
-                <!-- Add group purchase fields in the general information section -->
-                <xpath expr="//field[@name='note']" position="before">
-                    <group string="Group Purchase Information" groups="base.group_user">
+                <xpath expr="//notebook" position="inside">
+                    <page string="Group Purchase Information" groups="base.group_user">
+                      <group string="Group Purchase Information" groups="base.group_user">
                         <field name="group_order_id" readonly="True" />
                         <field name="consumer_group_id" readonly="True" />
                         <field name="pickup_slot_label" readonly="True" />
                         <field name="pickup_day" readonly="True" />
                         <field name="pickup_date" readonly="True" />
                         <field name="home_delivery" readonly="True" />
-                    </group>
+                      </group>
+                    </page>
                 </xpath>
             </field>
         </record>
diff --git a/website_sale_aplicoop/views/website_templates.xml b/website_sale_aplicoop/views/website_templates.xml
index 274a896..a4f4e39 100644
--- a/website_sale_aplicoop/views/website_templates.xml
+++ b/website_sale_aplicoop/views/website_templates.xml
@@ -658,6 +658,10 @@
                         </t>
                         <div class="card-body d-flex flex-column">
                             <h6 class="card-title" t-esc="product.name" />
+                            <!-- Tags/supplier/origin always occupy their slot (empty and
+                                 aria-hidden when the product has no value) so that the price
+                                 row below lines up across every card in the grid row,
+                                 regardless of which optional fields a given product has. -->
                             <t t-if="product.product_tag_ids">
                                 <div class="product-tags">
                                     <t t-foreach="filtered_product_tags.get(product.id, {}).get('published_tags', product.product_tag_ids)" t-as="tag">
@@ -672,6 +676,9 @@
                                     </t>
                                 </div>
                             </t>
+                            <t t-else="">
+                                <div class="product-tags" aria-hidden="true" />
+                            </t>
                             <t t-if="product_supplier_info.get(product.id)">
                                 <p class="product-supplier">
                                     <small>
@@ -679,6 +686,9 @@
                                     </small>
                                 </p>
                             </t>
+                            <t t-else="">
+                                <p class="product-supplier" aria-hidden="true" />
+                            </t>
                             <t t-if="product.origin_text">
                                 <p class="product-origin">
                                     <small>
@@ -687,6 +697,9 @@
                                     </small>
                                 </p>
                             </t>
+                            <t t-else="">
+                                <p class="product-origin" aria-hidden="true" />
+                            </t>
                             <t t-set="price_info" t-value="product_price_info.get(product.id, {})" />
                             <t t-set="display_price" t-value="product_display_info.get(product.id, {}).get('display_price', 0.0)" />
                             <t t-set="base_price" t-value="price_info.get('list_price', product.list_price)" />