diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css index 4be936e76..f89d7ac8f 100644 --- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css +++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css @@ -4,6 +4,10 @@ grid-gap: 10px; } +.warehouse-shipping-note-modal-positions-entry-container.hidePrice { + grid-template-columns: 2fr 1fr 1fr; +} + .warehouse-shipping-note-modal-positions-entry-actions, .warehouse-shipping-note-modal-hours-entry-actions { display: flex; flex-direction: column; diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js index 9e8f164b1..126e0624d 100644 --- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js +++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js @@ -257,6 +257,7 @@ Vue.component('warehouse-shipping-note-modal-positions-entry', { data() { return { window: window, + isAdmin: false, articleApiUrl: window.TT_CONFIG['BASE_PATH'] + '/WarehouseArticle/autoComplete', articlePacketApiUrl: window.TT_CONFIG['BASE_PATH'] + '/WarehouseArticlePacket/autoComplete', articleId: '', @@ -267,11 +268,11 @@ Vue.component('warehouse-shipping-note-modal-positions-entry', { }, //language=Vue template: ` -
+
- +
@@ -285,6 +286,7 @@ Vue.component('warehouse-shipping-note-modal-positions-entry', { amount: this.amount, price: parseFloat(this.price) ?? '' } + if (isNaN(data.price)) data.price = ''; if (!this.articleId && this.$refs.article.displayValue) { data.articleText = this.$refs.article.displayValue; } else if (this.articleId) { @@ -320,6 +322,7 @@ Vue.component('warehouse-shipping-note-modal-positions-view', { data() { return { window: window, + isAdmin: false, articleNames: {}, articlePacketNames: {}, } @@ -332,7 +335,7 @@ Vue.component('warehouse-shipping-note-modal-positions-view', { Artikel Menge - Preis + Preis Aktionen @@ -345,7 +348,7 @@ Vue.component('warehouse-shipping-note-modal-positions-view', { position.articleText }} {{ position.amount }} - {{ (position.price?.toFixed(2)) }} € + {{ (position.price?.toFixed(2)) }} €