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,
];
}

2
public/plugins/vue/tt-components/tt-checkbox.js
View File

@@ -3,7 +3,7 @@ Vue.component('tt-checkbox', {
label: String,
required: Boolean,
row: Boolean,
value: [String, Number],
value: [String, Number, Boolean],
hint: String,
additionalProps: Object,
sm: { type: Boolean, default: false },

5
public/plugins/vue/tt-components/tt-position-manager.js
View File

@@ -211,9 +211,10 @@ Vue.component('tt-positions-manager',
async editEntry(index) {
this.selectedIndex = index;
for (const [key, field] of Object.entries(this.config.fields)) {
if (field.type === 'autocomplete' && field.emitDisplayValue && this.$refs['autocomplete-' + key][0]) {
if (field.type === 'autocomplete' && field.emitDisplayValue) {
await this.$nextTick();
if (this.positions[index][key + '_text']) {
if (this.positions[index][key + '_text'] && this.$refs['autocomplete-' + key][0]) {
console.log('inhere');
this.$refs['autocomplete-' + key][0].displayValue = this.positions[index][key + '_text'];
this.$set(this.formData, key, this.positions[index][key]);
}