Update card.php

This commit is contained in:
wdammak 2022-04-14 16:19:55 +01:00 committed by GitHub
parent db96173189
commit fb2243dacd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1293,16 +1293,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>'; print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
//print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">'; //print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
//print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300'); //print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
//print $form->select_company(0, 'name', '(s.client = 1 OR s.client = 3) AND status=1', ' '); print '<select class="name" name="name" id="name" style="min-width:500px"></select>';
//print "<script> $(document).ready(function () { $('#name').select2({ tags: true}); });</script>"; print "\n".'<script type="text/javascript">';
print '<select class="name" name="name" id="name" style="min-width:400px"></select>'; print '$(document).ready(function () {
?> $("#name").select2({
<script>
$(document).ready(function () {
$('#name').select2({
ajax: { ajax: {
url: '<?php print DOL_URL_ROOT; ?>/core/ajax/ajaxcompanies.php', url: "' . DOL_URL_ROOT . '/core/ajax/ajaxcompanies.php",
dataType: 'json', dataType: "json",
delay: 250, delay: 250,
data: function (params) { data: function (params) {
return { return {
@ -1317,65 +1314,63 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
cache: true cache: true
}, },
placeholder: 'In the meantime we check if this 3rd already exists...', placeholder: "' . $langs->trans('Name of the new third party. In the meantime we check if it already exists...') . '",
allowClear: true,
minimumInputLength: 3, minimumInputLength: 3,
width: 'resolve', /* off or resolve */
language: select2arrayoflanguage, language: select2arrayoflanguage,
containerCssClass: ':all:', containerCssClass: ":all:",
selectionCssClass: ':all:', selectionCssClass: ":all:",
tags: true, tags: true,
templateResult: formatCustomer, templateResult: formatCustomer,
templateSelection: formatCustomerSelection templateSelection: formatCustomerSelection
}); });
function formatCustomer (Customer) { function formatCustomer (Customer) {
if(Customer.label === undefined) { if(Customer.label === undefined) {
return Customer.text; return Customer.text;
} }
var logo = ''; if(Customer.logo !== null ) {
if(Customer.logo !== undefined) { logo = \'<img src="\';
logo = "<img src='"; logo += \'' . DOL_URL_ROOT . '/viewimage.php?modulepart=societe&amp;entity=1&amp;file=\' + Customer.key + "%2Flogos%2Fthumbs%2F" + Customer.logo.replace(".", "_mini.") + "&amp;cache=0";
logo += "<?php print DOL_URL_ROOT; ?>/viewimage.php?modulepart=societe&amp;entity=1&amp;file=" + Customer.key + "%2Flogos%2Fthumbs%2F" + Customer.logo.replace('.', '_mini.') + "&amp;cache=0"; logo += \'" /></div>\';
logo += "' /></div>";
} else { } else {
logo = '<div class="floatleft inline-block valigntop photowithmargin" style="padding:0 10px"><div class="photosociete photoref" alt="No photo" "=""><span class="fas fa-building" style=" color: #6c6aa8;"></span></div></div>'; logo = \'<div class="floatleft inline-block valigntop photowithmargin" style="padding:0 10px"><div class="photosociete photoref" alt="No photo"><span class="fas fa-building" style="color: #6c6aa8;"></span></div></div>\';
} }
var $container = $("<div class='select2-result-repository clearfix'>" + var $container = $("<div class=\'select2-result-repository clearfix\'>" +
"<div class='select2-result-repository__avatar floatleft inline-block valigntop'>" + logo + "<div class=\'select2-result-repository__avatar floatleft inline-block valigntop\'>" + logo +
"<div class='select2-result-repository__meta floatleft inline-block valigntop'>" + "<div class=\'select2-result-repository__meta floatleft inline-block valigntop\'>" +
"<div class='select2-result-repository__title'></div>" + "<div class=\'select2-result-repository__title\'></div>" +
"<div class='select2-result-repository__name_alias'></div>" + "<div class=\'select2-result-repository__name_alias\'></div>" +
"<div class='select2-result-repository__code_client'></div>" + "<div class=\'select2-result-repository__code_client\'></div>" +
"<div class='select2-result-repository__code_fournisseur'></div>" + "<div class=\'select2-result-repository__code_fournisseur\'></div>" +
"<div class='select2-result-repository__companies_info'>" + "<div class=\'select2-result-repository__companies_info\'>" +
"<div class='select2-result-repository__email'><i class='fa fa-at'></i> </div>" + "<div class=\'select2-result-repository__email\'><i class=\'fa fa-at\'></i> </div>" +
"<div class='select2-result-repository__address'><i class='fa fa-home'></i> </div>" + "<div class=\'select2-result-repository__address\'><i class=\'fa fa-flag\'></i> </div>" +
"<div class='select2-result-repository__country'><i class='fa fa-flag'></i> </div>" + "<div class=\'select2-result-repository__zip\'><i class=\'fa fa-circle-o\'></i> </div>" +
"<div class='select2-result-repository__departement'><i class='fa fa-circle-o'></i> </div>" + "<div class=\'select2-result-repository__country\'><i class=\'fa fa-globe-americas\'></i> </div>" +
"<div class='select2-result-repository__zip'><i class='fa fa-circle-o'></i> </div>" + "<div class=\'select2-result-repository__departement\'><i class=\'fa fa-circle-o\'></i> </div>" +
"<div class='select2-result-repository__town'><i class='fa fa-circle-o'></i> </div>" + "<div class=\'select2-result-repository__town\'><i class=\'fa fa-circle-o\'></i> </div>" +
"<div class='select2-result-repository__siren'><i class='fa fa-circle-o'></i> </div>" + "<div class=\'select2-result-repository__siren\'><i class=\'fa fa-circle-o\'></i> </div>" +
"<div class='select2-result-repository__datec'><i class='fa fa-calendar'></i> </div>" + "<div class=\'select2-result-repository__datec\'><i class=\'fa fa-calendar\'></i> </div>" +
"</div>" + "</div>" +
"</div>" + "</div>" +
"</div>" "</div>"
); );
$container.find('.select2-result-repository__title').text(Customer.label); $container.find(".select2-result-repository__title").text(Customer.label);
$container.find('.select2-result-repository__name_alias').text(Customer.name_alias ? Customer.name_alias : ''); $container.find(".select2-result-repository__name_alias").text(Customer.name_alias ? Customer.name_alias : "");
$container.find('.select2-result-repository__code_client').text(Customer.code_client ? Customer.code_client : ''); $container.find(".select2-result-repository__code_client").text(Customer.code_client ? Customer.code_client : "");
$container.find('.select2-result-repository__code_fournisseur').text((Customer.code_fournisseur!==null) ? Customer.code_fournisseur : ''); $container.find(".select2-result-repository__code_fournisseur").text((Customer.code_fournisseur!==null) ? Customer.code_fournisseur : "");
$container.find('.select2-result-repository__email').append('Mail: ' + (Customer.email !== null ? Customer.email : '')); $container.find(".select2-result-repository__email").append("' . $langs->trans('EMail') . ': " + (Customer.email !== null ? Customer.email : ""));
$container.find('.select2-result-repository__address').append('Address: ' + (Customer.address !== null ? Customer.address : '')); $container.find(".select2-result-repository__address").append("' . $langs->trans('Address') . ': " + (Customer.address !== null ? Customer.address : ""));
$container.find('.select2-result-repository__country').append('Country: ' + (Customer.country !== null ? Customer.country : '')); $container.find(".select2-result-repository__country").append("' . $langs->trans('Country') . ': " + (Customer.country !== null ? Customer.country : ""));
$container.find('.select2-result-repository__departement').append('Departement: ' + (Customer.departement !== null ? Customer.departement : '')); $container.find(".select2-result-repository__departement").append("' . $langs->trans('Region-State') . ': " + (Customer.departement !== null ? Customer.departement : ""));
$container.find('.select2-result-repository__zip').append('Zip: ' + (Customer.zip !== null ? Customer.zip : '')); $container.find(".select2-result-repository__zip").append("' . $langs->trans('Zip') . ': " + (Customer.zip !== null ? Customer.zip : ""));
$container.find('.select2-result-repository__town').append('Town: ' + (Customer.town !== null ? Customer.town : '')); $container.find(".select2-result-repository__town").append("' . $langs->trans('Town') . ': " + (Customer.town !== null ? Customer.town : ""));
$container.find('.select2-result-repository__siren').append('Siren: ' + (Customer.siren !== null ? Customer.siren : '')); $container.find(".select2-result-repository__siren").append("' . $langs->trans('Siren') . ': " + (Customer.siren !== null ? Customer.siren : ""));
$container.find('.select2-result-repository__datec').append('Created: ' + (Customer.datec !== null ? Customer.datec : '')); $container.find(".select2-result-repository__datec").append("' . $langs->trans('Created') . ': " + (Customer.datec !== null ? Customer.datec : ""));
return $container; return $container;
} }
@ -1385,7 +1380,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
}); });
</script> </script>
<?php ';
print '</td>'; print '</td>';
if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>'; print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';