lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

css

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-25 02:43:37 +01:00
parent 9110b1d03f
commit c90fa255fd
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/comm/mailing/cibles.php
View File

@ -310,22 +310,15 @@ if ($object->fetch($id) >= 0) {
if ($allowaddtarget && $user->rights->mailing->creer) { if ($allowaddtarget && $user->rights->mailing->creer) {
print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic'); print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
//print '<table class="noborder centpercent">';
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">'; print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
//print '<tr class="liste_titre">';
print '<div class="tagtr liste_titre">'; print '<div class="tagtr liste_titre">';
//print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>'; print '<div class="tagtd"></div>';
print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>'; print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>';
//print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>'; print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>';
//print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
print '<div class="tagtd left">'.$langs->trans("Filter").'</div>'; print '<div class="tagtd left">'.$langs->trans("Filter").'</div>';
//print '<td class="liste_titre" align="center">&nbsp;</td>';
print '<div class="tagtd">&nbsp;</div>'; print '<div class="tagtd">&nbsp;</div>';
//print "</tr>\n";
print '</div>'; // End tr print '</div>'; // End tr
clearstatcache(); clearstatcache();
@ -390,12 +383,13 @@ if ($object->fetch($id) >= 0) {
print '<div '.$bctag[$var].'>'; print '<div '.$bctag[$var].'>';
} }
print '<div class="tagtd">'; print '<div class="tagtd paddingleftimp marginleftonly paddingrightimp marginrightonly valignmiddle center">';
if (empty($obj->picto)) { if (empty($obj->picto)) {
$obj->picto = 'generic'; $obj->picto = 'generic';
} }
print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle pictomodule pictofixedwidth"'); print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
print ' '; print '</div>';
print '<div class="tagtd valignmiddle">'; // style="height: 4em"
print $obj->getDesc(); print $obj->getDesc();
print '</div>'; print '</div>';
@ -405,7 +399,7 @@ if ($object->fetch($id) >= 0) {
dol_syslog($e->getMessage(), LOG_ERR); dol_syslog($e->getMessage(), LOG_ERR);
} }
print '<div class="tagtd center">'; print '<div class="tagtd center valignmiddle">';
if ($nbofrecipient === '' || $nbofrecipient >= 0) { if ($nbofrecipient === '' || $nbofrecipient >= 0) {
print $nbofrecipient; print $nbofrecipient;
} else { } else {
@ -413,7 +407,7 @@ if ($object->fetch($id) >= 0) {
} }
print '</div>'; print '</div>';
print '<div class="tagtd left">'; print '<div class="tagtd left valignmiddle">';
if ($allowaddtarget) { if ($allowaddtarget) {
try { try {
$filter = $obj->formFilter(); $filter = $obj->formFilter();
@ -428,7 +422,7 @@ if ($object->fetch($id) >= 0) {
} }
print '</div>'; print '</div>';
print '<div class="tagtd right">'; print '<div class="tagtd right valignmiddle">';
if ($allowaddtarget) { if ($allowaddtarget) {
print '<input type="submit" class="button button-add small reposition" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">'; print '<input type="submit" class="button button-add small reposition" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
} else { } else {

36
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -89,6 +89,30 @@ class mailing_thirdparties extends MailingTargets
$addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties"); $addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties");
} }
} }
if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") <> '-1') {
$addFilter .= " AND s.fournisseur = ".((int) GETPOST("filter_supplier_thirdparties", 'int'));
$addDescription = $langs->trans('Supplier')."=";
if (GETPOST("filter_supplier_thirdparties") == 0) {
$addDescription .= $langs->trans('No');
} elseif (GETPOST("filter_supplier_thirdparties") == 1) {
$addDescription .= $langs->trans('Yes');
} else {
$addDescription .= "Unknown status ".GETPOST("filter_supplier_thirdparties");
}
}
if (GETPOSTISSET("filter_status")) {
if (strlen($addDescription) > 0) {
$addDescription .= ";";
}
$addDescription .= $langs->trans("Status")."=";
if (GETPOST("filter_status") == '1') {
$addFilter .= " AND s.status=1";
$addDescription .= $langs->trans("Enabled");
} elseif (GETPOST("filter_status") == '0') {
$addFilter .= " AND s.status=0";
$addDescription .= $langs->trans("Disabled");
}
}
if (GETPOSTISSET("filter_status")) { if (GETPOSTISSET("filter_status")) {
if (strlen($addDescription) > 0) { if (strlen($addDescription) > 0) {
$addDescription .= ";"; $addDescription .= ";";
@ -295,7 +319,7 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select> '; $s .= '</select> ';
// filter_client_thirdparties // filter_client_thirdparties
$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat">'; $s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat minwidth100">';
$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>'; $s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) { if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
$s .= '<option value="2">'.$langs->trans('Prospect').'</option>'; $s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
@ -311,7 +335,15 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select> '; $s .= '</select> ';
$s .= ajax_combobox("filter_client_thirdparties"); $s .= ajax_combobox("filter_client_thirdparties");
// filter_status // filter_supplier_thirdparties
$s .= ' <select id="filter_supplier_thirdparties" name="filter_supplier_thirdparties" class="flat minwidth100">';
$s .= '<option value="-1">'.$langs->trans("Supplier").'</option>';
$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
$s .= '<option value="0">'.$langs->trans("No").'</option>';
$s .= '</select>';
$s .= ajax_combobox("filter_supplier_thirdparties");
// filter_status_thirdparties
$s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">'; $s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">';
$s .= '<option value="-1">'.$langs->trans("Status").'</option>'; $s .= '<option value="-1">'.$langs->trans("Status").'</option>';
$s .= '<option value="1">'.$langs->trans("Enabled").'</option>'; $s .= '<option value="1">'.$langs->trans("Enabled").'</option>';