Merge branch 'feature/shipping-note-refinements' into 'master'

Feature/shipping note refinements

See merge request fronk/thetool!727
This commit is contained in:
Luca Haid
2024-11-13 12:28:46 +00:00

View File

@@ -244,7 +244,7 @@ class WarehouseShippingNoteController extends TTCrud {
foreach ($hoursEntries as $hoursEntry) {
$positions[] = [
'articleTitle' => "Arbeitsstunden",
'articleDescription' => $hoursEntry['note'],
'articleDescription' => "Mitarbeiter: " . UserModel::getOne($hoursEntry['userId'])->name,
'articleUnit' => 'Std.',
'amount' => $hoursEntry['hourCount'],
'price' => $hoursEntry['hourlyPrice'] * $hoursEntry['hourCount'] ?? 0,