Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2023-05-21 17:34:34 +02:00
parent 70ce504e8b 5e4edac94d
commit fe9521b6b2
21 changed files with 154 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/core/class/html.formticket.class.php
View File

@@ -1371,30 +1371,36 @@ class FormTicket
}
jQuery(".email_line").hide();
}
';
jQuery("#send_msg_email").click(function() {
if(jQuery(this).is(":checked")) {
if (jQuery("#private_message").is(":checked")) {
jQuery("#private_message").prop("checked", false).trigger("change");
// If constant set, allow to send private messages as email
if (empty($conf->global->TICKET_SEND_PRIVATE_EMAIL)) {
print 'jQuery("#send_msg_email").click(function() {
if(jQuery(this).is(":checked")) {
if (jQuery("#private_message").is(":checked")) {
jQuery("#private_message").prop("checked", false).trigger("change");
}
jQuery(".email_line").show();
}
jQuery(".email_line").show();
}
else {
jQuery(".email_line").hide();
}
});
else {
jQuery(".email_line").hide();
}
});
jQuery("#private_message").click(function() {
if (jQuery(this).is(":checked")) {
if (jQuery("#send_msg_email").is(":checked")) {
jQuery("#send_msg_email").prop("checked", false).trigger("change");
jQuery("#private_message").click(function() {
if (jQuery(this).is(":checked")) {
if (jQuery("#send_msg_email").is(":checked")) {
jQuery("#send_msg_email").prop("checked", false).trigger("change");
}
jQuery(".email_line").hide();
}
jQuery(".email_line").hide();
}
});';
});';
}
print '});
</script>';
print '<form method="post" name="ticket" id="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="'.$this->action.'">';