diff --git a/packages/server/resources/views/modules/credit-note-standard.pug b/packages/server/resources/views/modules/credit-note-standard.pug index 193e46251..bb1fc86f3 100644 --- a/packages/server/resources/views/modules/credit-note-standard.pug +++ b/packages/server/resources/views/modules/credit-note-standard.pug @@ -108,7 +108,14 @@ block head .#{prefix}-table__cell--right { text-align: right; } - + .#{prefix}-table__cell--item .item { + display: flex; + flex-direction: column; + gap: 2px; + } + .#{prefix}-table__cell--item .item .item__description{ + color: #5f6b7c; + } .#{prefix}-totals { display: flex; flex-direction: column; @@ -184,16 +191,19 @@ block content thead tr th(class=`${prefix}-table__header`) #{'Item'} - th(class=`${prefix}-table__header`) #{'Description'} - th(class=`${prefix}-table__header`) #{'Rate'} - th(class=`${prefix}-table__header`) #{'Total'} + 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'} tbody each line in lines tr(class=`${prefix}-table__row`) - td(class=`${prefix}-table__cell`) #{line.item} - td(class=`${prefix}-table__cell`) #{line.description} - td(class=`${prefix}-table__cell--right`) #{line.rate} - td(class=`${prefix}-table__cell--right`) #{line.total} + td(class=`${prefix}-table__cell ${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} 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 f086f29df..92eab0b9d 100644 --- a/packages/server/resources/views/modules/estimate-regular.pug +++ b/packages/server/resources/views/modules/estimate-regular.pug @@ -109,6 +109,14 @@ block head .#{prefix}-table__cell:last-of-type { padding-right: 0; } + .#{prefix}-table__cell--item .item { + display: flex; + flex-direction: column; + gap: 2px; + } + .#{prefix}-table__cell--item .item .item__description{ + color: #5f6b7c; + } .#{prefix}-totals { display: flex; flex-direction: column; @@ -193,14 +201,17 @@ block content thead tr th(class=`${prefix}-table__header`) Item - th(class=`${prefix}-table__header`) Description + 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 tbody each line in lines tr - td(class=`${prefix}-table__cell`) #{line.item} - td(class=`${prefix}-table__cell`) #{line.description} + td(class=`${prefix}-table__cell ${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} diff --git a/packages/server/resources/views/modules/invoice-standard.pug b/packages/server/resources/views/modules/invoice-standard.pug index b24af4e5e..ad4f0881c 100644 --- a/packages/server/resources/views/modules/invoice-standard.pug +++ b/packages/server/resources/views/modules/invoice-standard.pug @@ -115,6 +115,14 @@ block head .#{prefix}-table__cell--right { text-align: right; } + .#{prefix}-table__cell--item .item { + display: flex; + flex-direction: column; + gap: 2px; + } + .#{prefix}-table__cell--item .item__description { + color: #5f6b7c; + } .#{prefix}-totals { display: flex; flex-direction: column; @@ -200,14 +208,17 @@ block content thead tr th(class=`${prefix}-table__header`) #{lineItemLabel} - th(class=`${prefix}-table__header`) #{lineDescriptionLabel} + 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} tbody each line in lines tr - td(class=`${prefix}-table__cell`) #{line.item} - td(class=`${prefix}-table__cell`) #{line.description} + td(class=`${prefix}-table__cell ${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} diff --git a/packages/server/resources/views/modules/receipt-regular.pug b/packages/server/resources/views/modules/receipt-regular.pug index 11351c2da..cd6432a59 100644 --- a/packages/server/resources/views/modules/receipt-regular.pug +++ b/packages/server/resources/views/modules/receipt-regular.pug @@ -105,6 +105,14 @@ block head .#{prefix}-table__cell--right { text-align: right; } + .#{prefix}-table__cell--item .item { + display: flex; + flex-direction: column; + gap: 2px; + } + .#{prefix}-table__cell--item .item .item__description{ + color: #5f6b7c; + } .#{prefix}-totals { display: flex; flex-direction: column; @@ -179,16 +187,19 @@ block content thead(class=`${prefix}-table__header`) tr th(class=`${prefix}-table__header`) Item - th(class=`${prefix}-table__header`) Description + 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 tbody each line in lines tr(class=`${prefix}-table__row`) - td(class=`${prefix}-table__cell`)= line.item - td(class=`${prefix}-table__cell`)= line.description - 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--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} //- Totals Section div(class=`${prefix}-totals`) diff --git a/packages/server/src/services/Sales/Invoices/constants.ts b/packages/server/src/services/Sales/Invoices/constants.ts index becd1ebcf..4a67b6780 100644 --- a/packages/server/src/services/Sales/Invoices/constants.ts +++ b/packages/server/src/services/Sales/Invoices/constants.ts @@ -194,7 +194,7 @@ export const defaultInvoicePdfTemplateAttributes = { // Entries lineItemLabel: 'Item', - lineDescriptionLabel: 'Description', + lineQuantityLabel: 'Qty', lineRateLabel: 'Rate', lineTotalLabel: 'Total',