diff --git a/api/app/static/js/dashboard.js b/api/app/static/js/dashboard.js index 0ff385d..b3267ce 100644 --- a/api/app/static/js/dashboard.js +++ b/api/app/static/js/dashboard.js @@ -464,9 +464,14 @@ function renderClientCell(order) { const display = (order.customer_name || order.shipping_name || '').trim(); const billing = (order.billing_name || '').trim(); const shipping = (order.shipping_name || '').trim(); - const isDiff = display !== shipping && shipping; - if (isDiff) { - return `${escHtml(display)} `; + // PJ: invoice party (company = display) differs from shipping person + // PF ramburs: invoice party = shipping, but billing person differs from shipping + const isPJDiff = display && shipping && display !== shipping; + const isPFDiff = !isPJDiff && billing && shipping && billing !== shipping; + if (isPJDiff || isPFDiff) { + const facturat = isPJDiff ? display : billing; + const tip = `Facturat: ${escHtml(facturat)} ยท Livrare: ${escHtml(shipping)}`; + return `${escHtml(display)} `; } return `${escHtml(display || billing || '\u2014')}`; } diff --git a/api/app/templates/dashboard.html b/api/app/templates/dashboard.html index 9ecb865..b1b1e61 100644 --- a/api/app/templates/dashboard.html +++ b/api/app/templates/dashboard.html @@ -115,5 +115,5 @@ {% endblock %} {% block scripts %} - + {% endblock %}