From f33c79f8301a5c44715cfeabc5f23a28d3c46743 Mon Sep 17 00:00:00 2001
From: Antoine Prieels <anp@odoo.com>
Date: Fri, 11 Sep 2020 12:52:45 +0000
Subject: [PATCH] [FIX] point_of_sale: Customer display without order

The customer display could not be loaded when no order was set.
(e.g. While showing the floor plan in pos_restaurant)

closes odoo/odoo#57531

Signed-off-by: Quentin Lejeune (qle) <qle@odoo.com>
---
 .../CustomerFacingDisplayOrder.xml            | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/point_of_sale/static/src/xml/CustomerFacingDisplay/CustomerFacingDisplayOrder.xml b/addons/point_of_sale/static/src/xml/CustomerFacingDisplay/CustomerFacingDisplayOrder.xml
index ffc336d1825..c312bea2fdc 100644
--- a/addons/point_of_sale/static/src/xml/CustomerFacingDisplay/CustomerFacingDisplayOrder.xml
+++ b/addons/point_of_sale/static/src/xml/CustomerFacingDisplay/CustomerFacingDisplayOrder.xml
@@ -33,7 +33,7 @@
                             <span class="total-amount-formatting">TOTAL</span>
                         </div>
                         <div>
-                            <span class="pos_total-amount" t-esc="pos.format_currency(order.get_total_with_tax())"/>
+                            <span class="pos_total-amount" t-esc="pos.format_currency(order and order.get_total_with_tax() || 0)"/>
                         </div>
                     </div>
 
@@ -56,32 +56,36 @@
                 <div>Price</div>
             </div>
             <div class="pos_orderlines_list">
-                <div t-foreach="order.get_orderlines()" t-as="orderline" class="pos_orderlines_item">
-                    <div><div t-attf-style="background-image:url(#{orderline.product.image_base64})"/></div>
-                    <div t-esc="orderline.get_full_product_name()"/>
-                    <div t-esc="orderline.get_quantity_str()"/>
-                    <div t-esc="pos.format_currency(orderline.get_display_price())"/>
-                </div>
+                <t t-if="order">
+                    <div t-foreach="order.get_orderlines()" t-as="orderline" class="pos_orderlines_item">
+                        <div><div t-attf-style="background-image:url(#{orderline.product.image_base64})"/></div>
+                        <div t-esc="orderline.get_full_product_name()"/>
+                        <div t-esc="orderline.get_quantity_str()"/>
+                        <div t-esc="pos.format_currency(orderline.get_display_price())"/>
+                    </div>
+                </t>
             </div>
         </div>
     </t>
 
     <t t-name="CustomerFacingDisplayPaymentLines">
         <div class="pos-paymentlines">
-            <t t-foreach="order.get_paymentlines()" t-as="paymentline">
-                <div>
-                    <span><t t-esc="paymentline.name"/>:</span>
-                </div>
-                <div>
-                    <span t-esc="pos.format_currency(paymentline.get_amount())"/>
-                </div>
+            <t t-if="order">
+                <t t-foreach="order.get_paymentlines()" t-as="paymentline">
+                    <div>
+                        <span><t t-esc="paymentline.name"/>:</span>
+                    </div>
+                    <div>
+                        <span t-esc="pos.format_currency(paymentline.get_amount())"/>
+                    </div>
+                </t>
             </t>
 
             <div>
                 <span class="pos-change_title">Change</span>
             </div>
             <div>
-                <span class="pos-change_amount" t-esc="pos.format_currency(order.get_change())"/>
+                <span class="pos-change_amount" t-esc="pos.format_currency(order and order.get_change() || 0)"/>
             </div>
         </div>
     </t>