Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'WarehouseShippingNote/fix-km-count' into 'master'

Browse Source 
-

See merge request fronk/thetool!1289
This commit is contained in:
Luca Haid
2025-05-05 10:20:56 +00:00
parent 45d0279490 4c4dc1b00c
commit 8a8e4ad064
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/WarehouseShippingNote/WarehouseShippingNoteController.php
View File

@@ -254,7 +254,7 @@ class WarehouseShippingNoteController extends TTCrud {
'articleTitle' => "Fahrkostenpauschale (hin und retour)",
'articleDescription' => "Datum: ". date("d.m.Y", strtotime($hoursEntry['date'])) . " | Fahrzeug: " . TimerecordingCarModel::getOne($hoursEntry['carId'])->number_plate,
'articleUnit' => 'km',
'amount' => $hoursEntry['kilometerCount'] * 2,
'amount' => $hoursEntry['kilometerCount'],
'price' => 2 * $hoursEntry['kilometerCount'] ?? 0,
];
} else if (!empty($hoursEntry['carId_text']) && $hoursEntry['kilometerCount'] > 0) {
@@ -262,7 +262,7 @@ class WarehouseShippingNoteController extends TTCrud {
'articleTitle' => "Fahrkostenpauschale (hin und retour)",
'articleDescription' => "Datum: ". date("d.m.Y", strtotime($hoursEntry['date'])) . " | Fahrzeug: " . $hoursEntry['carId_text'],
'articleUnit' => 'km',
'amount' => $hoursEntry['kilometerCount'] * 2,
'amount' => $hoursEntry['kilometerCount'],
'price' => 2 * $hoursEntry['kilometerCount'] ?? 0,
];
}