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', {