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

Merge branch 'spidev' into 'master'

Browse Source 
Kalender Bugfix

See merge request fronk/thetool!997
This commit is contained in:
Daniel Spitzer
2025-02-05 19:51:00 +00:00
parent 95c69a5e23 f8d0264d6b
commit 7d040ebc98
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Calendar/CalendarModel.php
View File

@@ -694,7 +694,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
if (($r->customer_info_type_text)) {
$customer_info_type_text = $r->customer_info_type_text;
}
if ($r->customer_info_reminder_check) {
if ($r->customer_info_reminder_check || $r->customer_info_reminder_check == 0) {
$updateArray['customer_info_reminder'] = $r->customer_info_reminder_check;
}
$customerJson = array('customer_info_type' => $customer_info_type, 'customer_info_text' => $customer_info_text, 'customer_info_type_text' => $customer_info_type_text);

6
public/js/pages/Calendar/View.js
View File

@@ -409,7 +409,11 @@ document.addEventListener('DOMContentLoaded', function () {
$('#customer').html('<option></option>');
}
if (data.data.customer_info_reminder.customer_info_reminder) {
$('#customer-info-reminder-check').prop('checked', true);
if (data.data.customer_info_reminder.customer_info_reminder == 1) {
$('#customer-info-reminder-check').prop('checked', true);
} else {
$('#customer-info-reminder-check').prop('checked', false);
}
}
$('#customer').select2({
placeholder: "Kunden Suche",