diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php index d5a0d9eaf..592826bf8 100644 --- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php +++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php @@ -240,8 +240,15 @@ class WarehouseShippingNoteController extends TTCrud { $hoursEntries = json_decode($shippingNote->hoursEntries, true); foreach ($hoursEntries as $hoursEntry) { // die(json_encode($hoursEntry)); + $articleTitle = "Arbeitsstunden"; + if (isset($hoursEntry['priceType']) && $hoursEntry['priceType'] == 50) { + $articleTitle = "Arbeitsstunden (50% Zuschlag)"; + } elseif (isset($hoursEntry['priceType']) && $hoursEntry['priceType'] == 100) { + $articleTitle = "Arbeitsstunden (100% Zuschlag)"; + } + $positions[] = [ - 'articleTitle' => "Arbeitsstunden", + 'articleTitle' => $articleTitle, 'articleDescription' => "Datum: ". date("d.m.Y", strtotime($hoursEntry['date'])) . " | Mitarbeiter: " . UserModel::getOne($hoursEntry['userId'])->name, 'articleUnit' => 'Std.', 'amount' => $hoursEntry['hourCount'], diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css index c4baf9c04..5efd6858e 100644 --- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css +++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNote.css @@ -36,10 +36,19 @@ grid-gap: 10px; } - .warehouse-shipping-note-modal-positions-entry-actions, .warehouse-shipping-note-modal-hours-entry-actions { + .warehouse-shipping-note-modal-positions-entry-actions { grid-column: 2; } + .warehouse-shipping-note-modal-hours-entry-actions { + grid-column: 1 / span 2; + margin-bottom: 8px; + } + + .modal .table.table-striped.table-sm button{ + margin-bottom: 4px; + } + .signModal > div { margin: 0; width: 100vw; diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js index ebc20857c..81cd0a585 100644 --- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js +++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js @@ -47,6 +47,7 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { hourCount: '', kilometerCount: '', hourlyPrice: '', + priceType: 'normal', } }, //language=Vue @@ -55,6 +56,7 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { + @@ -74,6 +76,7 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { userId: this.userId, date: this.date, hourCount: this.hourCount, + priceType: this.priceType, hourlyPrice: this.hourlyPrice || null, carId: this.carId ? this.carId : null, kilometerCount: this.carId ? this.kilometerCount : null @@ -103,7 +106,7 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { if (!this.userId || this.carId) return; const response = await axios.get(window.TT_CONFIG["BASE_PATH"] + '/WarehouseShippingNote/timerecordingCarForUser?userId=' + this.userId); if (response.data.status === 'USER_NO_CAR') { - this.window.notify('info', 'Kein zugewiesenes Fahrzeug gefunden'); + // this.window.notify('info', 'Kein zugewiesenes Fahrzeug gefunden'); this.carId = ''; return; } diff --git a/public/plugins/notification/notify.js b/public/plugins/notification/notify.js index 7fee5da5f..b20771cc6 100644 --- a/public/plugins/notification/notify.js +++ b/public/plugins/notification/notify.js @@ -6,7 +6,7 @@ document.addEventListener('DOMContentLoaded', () => { // @formatter:on const notyf = new Notyf({ - duration: 10000, position: { + duration: 6000, position: { x: 'right', y: 'bottom', }, ripple: true, dismissible: true, fontSize: '32px', types: [{ diff --git a/public/plugins/vue/tt-components/tt-modal.js b/public/plugins/vue/tt-components/tt-modal.js index 35ca21eac..1b64e2814 100644 --- a/public/plugins/vue/tt-components/tt-modal.js +++ b/public/plugins/vue/tt-components/tt-modal.js @@ -44,14 +44,18 @@ Vue.component('tt-modal', { this.$emit('submit') } } - }, //language=Vue + }, + data() { + return {window: window, isMobile: navigator.userAgent.match(/(iPad)|(iPhone)|(iPod)|(android)|(webOS)/i) !== null} + }, + //language=Vue template: `