From a2227016e5189d5fc34ce964476604e53ee2598a Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sat, 19 Oct 2024 10:59:46 +0200 Subject: [PATCH] feat: Pre-line invoice statements --- .../views/modules/credit-note-standard.pug | 18 +++++++++--------- .../views/modules/estimate-regular.pug | 18 +++++++++++------- .../views/modules/invoice-standard.pug | 13 ++++++++----- .../views/modules/receipt-regular.pug | 15 ++++++++++----- 4 files changed, 38 insertions(+), 26 deletions(-) diff --git a/packages/server/resources/views/modules/credit-note-standard.pug b/packages/server/resources/views/modules/credit-note-standard.pug index bb1fc86f3..9f00a874c 100644 --- a/packages/server/resources/views/modules/credit-note-standard.pug +++ b/packages/server/resources/views/modules/credit-note-standard.pug @@ -150,7 +150,7 @@ block head color: #666; } .#{prefix}-statement__value { - /* Styles for statement value */ + white-space: pre-line; } block content @@ -190,20 +190,20 @@ block content table(class=`${prefix}-table`) thead tr - th(class=`${prefix}-table__header`) #{'Item'} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{'Quantity'} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{'Rate'} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{'Total'} + th(class=`${prefix}-table__header ${prefix}-table__header--item`) #{'Item'} + th(class=`${prefix}-table__header ${prefix}-table__header--quantity ${prefix}-table__header--right`) #{'Quantity'} + th(class=`${prefix}-table__header ${prefix}-table__header--rate ${prefix}-table__header--right`) #{'Rate'} + th(class=`${prefix}-table__header ${prefix}-table__header--total ${prefix}-table__header--right`) #{'Total'} tbody each line in lines tr(class=`${prefix}-table__row`) - td(class=`${prefix}-table__cell ${prefix}-table__cell--item`) + td(class=`${prefix}-table__cell ${prefix}-table__cell--item ${prefix}-table__cell--item`) div.item div.item__label #{line.item} div.item__description #{line.description} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.quantity} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.rate} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.total} + td(class=`${prefix}-table__cell ${prefix}-table__cell--quantity ${prefix}-table__cell--right`) #{line.quantity} + td(class=`${prefix}-table__cell ${prefix}-table__cell--rate ${prefix}-table__cell--right`) #{line.rate} + td(class=`${prefix}-table__cell ${prefix}-table__cell--total ${prefix}-table__cell--right`) #{line.total} div(class=`${prefix}-totals`) if showSubtotal diff --git a/packages/server/resources/views/modules/estimate-regular.pug b/packages/server/resources/views/modules/estimate-regular.pug index 92eab0b9d..b2f9364ef 100644 --- a/packages/server/resources/views/modules/estimate-regular.pug +++ b/packages/server/resources/views/modules/estimate-regular.pug @@ -96,6 +96,9 @@ block head .#{prefix}-table__header--right { text-align: right; } + .#{prefix}-table__header--item{ + width: 50%; + } .#{prefix}-table__cell { border-bottom: 1px solid #F6F6F6; padding: 12px 10px; @@ -151,6 +154,7 @@ block head color: #666; } .#{prefix}-statement__value { + white-space: pre-line; } block content @@ -200,10 +204,10 @@ block content table(class=`${prefix}-table`) thead tr - th(class=`${prefix}-table__header`) Item - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Qty - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Rate - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Total + th(class=`${prefix}-table__header ${prefix}-table__header--item`) Item + th(class=`${prefix}-table__header ${prefix}-table__header--quantity ${prefix}-table__header--right`) Qty + th(class=`${prefix}-table__header ${prefix}-table__header--rate ${prefix}-table__header--right`) Rate + th(class=`${prefix}-table__header ${prefix}-table__header--total ${prefix}-table__header--right`) Total tbody each line in lines tr @@ -211,9 +215,9 @@ block content div.item div.item__label #{line.item} div.item__description #{line.description} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.quantity} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.rate} - td(class=`${prefix}-table__cell ${prefix}-table__cell--right`) #{line.total} + td(class=`${prefix}-table__cell ${prefix}-table__cell--quantity ${prefix}-table__cell--right`) #{line.quantity} + td(class=`${prefix}-table__cell ${prefix}-table__cell--rate ${prefix}-table__cell--right`) #{line.rate} + td(class=`${prefix}-table__cell ${prefix}-table__cell--total ${prefix}-table__cell--right`) #{line.total} //- Totals section div(class=`${prefix}-totals`) diff --git a/packages/server/resources/views/modules/invoice-standard.pug b/packages/server/resources/views/modules/invoice-standard.pug index ad4f0881c..0435d901a 100644 --- a/packages/server/resources/views/modules/invoice-standard.pug +++ b/packages/server/resources/views/modules/invoice-standard.pug @@ -102,6 +102,9 @@ block head .#{prefix}-table__header--right { text-align: right; } + .#{prefix}-table__header--item { + width: 50%; + } .#{prefix}-table__cell { border-bottom: 1px solid #F6F6F6; padding: 12px 10px; @@ -157,7 +160,7 @@ block head color: #666; } .#{prefix}-paragraph__value { - /* Styles for values within the paragraph section */ + white-space: pre-line; } block content //- block head @@ -207,10 +210,10 @@ block content table(class=`${prefix}-table`) thead tr - th(class=`${prefix}-table__header`) #{lineItemLabel} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{lineQuantityLabel} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{lineRateLabel} - th(class=`${prefix}-table__header ${prefix}-table__header--right`) #{lineTotalLabel} + th(class=`${prefix}-table__header ${prefix}-table__header--item`) #{lineItemLabel} + th(class=`${prefix}-table__header ${prefix}-table__header--quantity ${prefix}-table__header--right`) #{lineQuantityLabel} + th(class=`${prefix}-table__header ${prefix}-table__header--rate ${prefix}-table__header--right`) #{lineRateLabel} + th(class=`${prefix}-table__header ${prefix}-table__header--total ${prefix}-table__header--right`) #{lineTotalLabel} tbody each line in lines tr diff --git a/packages/server/resources/views/modules/receipt-regular.pug b/packages/server/resources/views/modules/receipt-regular.pug index cd6432a59..dfce3b5b5 100644 --- a/packages/server/resources/views/modules/receipt-regular.pug +++ b/packages/server/resources/views/modules/receipt-regular.pug @@ -92,6 +92,9 @@ block head .#{prefix}-table__header--right { text-align: right; } + .#{prefix}-table__header--item{ + width: 50%; + } .#{prefix}-table__cell { border-bottom: 1px solid #F6F6F6; padding: 12px 10px; @@ -141,7 +144,9 @@ block head margin-bottom: 20px; } .#{prefix}-statement__label {} - .#{prefix}-statement__value {} + .#{prefix}-statement__value { + white-space: pre-line; + } block content //- block head @@ -186,10 +191,10 @@ block content table(class=`${prefix}-table`) thead(class=`${prefix}-table__header`) tr - th(class=`${prefix}-table__header`) Item - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Qty - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Rate - th(class=`${prefix}-table__header ${prefix}-table__header--right`) Total + th(class=`${prefix}-table__header ${prefix}-table__header--item`) Item + th(class=`${prefix}-table__header ${prefix}-table__header--quantity ${prefix}-table__header--right`) Qty + th(class=`${prefix}-table__header ${prefix}-table__header--rate ${prefix}-table__header--right`) Rate + th(class=`${prefix}-table__header ${prefix}-table__header--total ${prefix}-table__header--right`) Total tbody each line in lines tr(class=`${prefix}-table__row`)