From 0dc1848870d84049cf8a256ebaf038fb5a91fcf0 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 22 Mar 2022 15:13:34 +0100 Subject: [PATCH] feat(print_deliveryNote): add withoutPrices type --- .../ticket/front/descriptor-menu/index.html | 9 +++++-- modules/ticket/front/descriptor-menu/index.js | 3 ++- .../front/descriptor-menu/locale/es.yml | 1 + .../reports/delivery-note/delivery-note.html | 24 +++++++++---------- .../reports/delivery-note/delivery-note.js | 4 ++++ 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html index d613fb5de..03a23c780 100644 --- a/modules/ticket/front/descriptor-menu/index.html +++ b/modules/ticket/front/descriptor-menu/index.html @@ -21,7 +21,7 @@ as PDF @@ -32,6 +32,12 @@ translate> as PDF + + as PDF without prices + @@ -44,7 +50,6 @@ vn-click-stop="sendDeliveryNoteMenu.show($event, 'left')" translate> Send Delivery Note... -
-

{{$t('title')}}

+

{{$t(type)}}

@@ -23,7 +23,7 @@ - + @@ -77,10 +77,10 @@ - - - - + + + + @@ -88,10 +88,10 @@ - - - - + + + + - +
{{client.id}}
{{$t('ticketId')}}{{$t(type)}} {{ticket.id}}
{{$t('reference')}} {{$t('quantity')}} {{$t('concept')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}{{$t('price')}}{{$t('discount')}}{{$t('vat')}}{{$t('amount')}}
{{sale.itemFk | zerofill('000000')}} {{sale.quantity}} {{sale.concept}}{{sale.price | currency('EUR', $i18n.locale)}}{{(sale.discount / 100) | percentage}}{{sale.vatType}}{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}{{sale.price | currency('EUR', $i18n.locale)}}{{(sale.discount / 100) | percentage}}{{sale.vatType}}{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}
@@ -107,7 +107,7 @@
{{$t('subtotal')}} @@ -181,7 +181,7 @@ -
+
diff --git a/print/templates/reports/delivery-note/delivery-note.js b/print/templates/reports/delivery-note/delivery-note.js index 0ee7c8c91..7f9ca7d0f 100755 --- a/print/templates/reports/delivery-note/delivery-note.js +++ b/print/templates/reports/delivery-note/delivery-note.js @@ -119,6 +119,10 @@ module.exports = { ticketId: { type: [Number, String], required: true + }, + type: { + type: String, + required: true } } };