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

Responsive

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-07 18:28:59 +01:00
parent f5edd25f6d
commit 142e9473c5
2 changed files with 109 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
htdocs/admin/barcode.php
View File

@ -176,6 +176,71 @@ foreach ($dirbarcode as $reldir) {
} }
} }
// Select barcode numbering module
if ($conf->product->enabled) {
print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', '');
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Example").'</td>';
print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
print '<td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
print "</tr>\n";
$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
foreach ($dirbarcodenum as $dirroot) {
$dir = dol_buildpath($dirroot, 0);
$handle = @opendir($dir);
if (is_resource($handle)) {
while (($file = readdir($handle)) !== false) {
if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
$file = substr($file, 0, dol_strlen($file) - 4);
try {
dol_include_once($dirroot.$file.'.php');
} catch (Exception $e) {
dol_syslog($e->getMessage(), LOG_ERR);
}
$modBarCode = new $file();
print '<tr class="oddeven">';
print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
print $modBarCode->info($langs);
print '</td>';
print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM) && $conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&token='.newToken().'&amp;value='.urlencode($file).'">';
print img_picto($langs->trans("Activated"), 'switch_on');
print '</a></td>';
} else {
print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&token='.newToken().'&amp;value='.urlencode($file).'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a></td>';
}
print '<td class="center">';
$s = $modBarCode->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print '</td>';
print "</tr>\n";
}
}
closedir($handle);
}
}
print "</table>\n";
print '</div>';
}
/* /*
* CHOIX ENCODAGE * CHOIX ENCODAGE
*/ */
@ -189,6 +254,7 @@ if (empty($conf->use_javascript_ajax)) {
print '<input type="hidden" name="action" value="updateengine">'; print '<input type="hidden" name="action" value="updateengine">';
} }
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Name").'</td>';
@ -211,8 +277,9 @@ if ($resql) {
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print '<tr class="oddeven"><td width="100">'; print '<tr class="oddeven">';
print $obj->label; print '<td width="100">';
print dol_escape_htmltag($obj->label);
print "</td><td>\n"; print "</td><td>\n";
print $langs->trans('BarcodeDesc'.$obj->encoding); print $langs->trans('BarcodeDesc'.$obj->encoding);
//print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle.<br>"; //print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle.<br>";
@ -270,6 +337,7 @@ if ($resql) {
} }
} }
print "</table>\n"; print "</table>\n";
print '</div>';
if (empty($conf->use_javascript_ajax)) { if (empty($conf->use_javascript_ajax)) {
print $form->buttonsSaveCancel("Save", ''); print $form->buttonsSaveCancel("Save", '');
@ -287,6 +355,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
print '<input type="hidden" name="token" value="'.newToken().'">'; print '<input type="hidden" name="token" value="'.newToken().'">';
print "<input type=\"hidden\" name=\"action\" value=\"update\">"; print "<input type=\"hidden\" name=\"action\" value=\"update\">";
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>'; print '<td>'.$langs->trans("Parameter").'</td>';
@ -304,7 +373,9 @@ if (!isset($_SERVER['WINDIR'])) {
$langs->load("errors"); $langs->load("errors");
print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</span>'; print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</span>';
} }
print '</td></tr>'; print '</td>';
print '<td>&nbsp;</td>';
print '</tr>';
} }
// Module products // Module products
@ -313,7 +384,9 @@ if (!empty($conf->product->enabled)) {
print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>'; print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
print '<td width="60" class="right">'; print '<td width="60" class="right">';
print $formbarcode->selectBarcodeType($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE, "PRODUIT_DEFAULT_BARCODE_TYPE", 1); print $formbarcode->selectBarcodeType($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE, "PRODUIT_DEFAULT_BARCODE_TYPE", 1);
print '</td></tr>'; print '</td>';
print '<td>&nbsp;</td>';
print '</tr>';
} }
// Module thirdparty // Module thirdparty
@ -322,10 +395,14 @@ if (!empty($conf->societe->enabled)) {
print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>'; print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
print '<td width="60" class="right">'; print '<td width="60" class="right">';
print $formbarcode->selectBarcodeType($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY, "GENBARCODE_BARCODETYPE_THIRDPARTY", 1); print $formbarcode->selectBarcodeType($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY, "GENBARCODE_BARCODETYPE_THIRDPARTY", 1);
print '</td></tr>'; print '</td>';
print '<td>&nbsp;</td>';
print '</tr>';
} }
print "</table>\n"; print "</table>\n";
print '</div>';
print '<div class="tabsAction">'; print '<div class="tabsAction">';
print '<input type="submit" class="button" name="submit_GENBARCODE_BARCODETYPE_THIRDPARTY" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button" name="submit_GENBARCODE_BARCODETYPE_THIRDPARTY" value="'.$langs->trans("Modify").'">';
print "</div>"; print "</div>";
@ -334,71 +411,6 @@ print '</form>';
print '<br>'; print '<br>';
// Select barcode numbering module
if ($conf->product->enabled) {
print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', '');
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Example").'</td>';
print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
print '<td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
print "</tr>\n";
$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
foreach ($dirbarcodenum as $dirroot) {
$dir = dol_buildpath($dirroot, 0);
$handle = @opendir($dir);
if (is_resource($handle)) {
while (($file = readdir($handle)) !== false) {
if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
$file = substr($file, 0, dol_strlen($file) - 4);
try {
dol_include_once($dirroot.$file.'.php');
} catch (Exception $e) {
dol_syslog($e->getMessage(), LOG_ERR);
}
$modBarCode = new $file();
print '<tr class="oddeven">';
print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
print $modBarCode->info($langs);
print '</td>';
print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM) && $conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&token='.newToken().'&amp;value='.urlencode($file).'">';
print img_picto($langs->trans("Activated"), 'switch_on');
print '</a></td>';
} else {
print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&token='.newToken().'&amp;value='.urlencode($file).'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a></td>';
}
print '<td class="center">';
$s = $modBarCode->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print '</td>';
print "</tr>\n";
}
}
closedir($handle);
}
}
print "</table>\n";
}
//print '</form>';
print "<br>";
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();

40
htdocs/variants/combinations.php
View File

@ -194,14 +194,11 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
$bulkaction = $massaction; $bulkaction = $massaction;
$error = 0; $error = 0;
$db->begin(); $db->begin();
foreach ($toselect as $prodid) { foreach ($toselect as $prodid) {
// need create new of Product to prevent rename dir behavior // need create new of Product to prevent rename dir behavior
$prodstatic = new Product($db); $prodstatic = new Product($db);
if ($prodstatic->fetch($prodid) < 0) { if ($prodstatic->fetch($prodid) < 0) {
continue; continue;
} }
@ -209,33 +206,50 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
if ($bulkaction == 'on_sell') { if ($bulkaction == 'on_sell') {
$prodstatic->status = 1; $prodstatic->status = 1;
$res = $prodstatic->update($prodstatic->id, $user); $res = $prodstatic->update($prodstatic->id, $user);
if ($res <= 0) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
$error++;
break;
}
} elseif ($bulkaction == 'on_buy') { } elseif ($bulkaction == 'on_buy') {
$prodstatic->status_buy = 1; $prodstatic->status_buy = 1;
$res = $prodstatic->update($prodstatic->id, $user); $res = $prodstatic->update($prodstatic->id, $user);
if ($res <= 0) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
$error++;
break;
}
} elseif ($bulkaction == 'not_sell') { } elseif ($bulkaction == 'not_sell') {
$prodstatic->status = 0; $prodstatic->status = 0;
$res = $prodstatic->update($prodstatic->id, $user); $res = $prodstatic->update($prodstatic->id, $user);
if ($res <= 0) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
$error++;
break;
}
} elseif ($bulkaction == 'not_buy') { } elseif ($bulkaction == 'not_buy') {
$prodstatic->status_buy = 0; $prodstatic->status_buy = 0;
$res = $prodstatic->update($prodstatic->id, $user); $res = $prodstatic->update($prodstatic->id, $user);
if ($res <= 0) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
$error++;
break;
}
} elseif ($bulkaction == 'delete') { } elseif ($bulkaction == 'delete') {
$res = $prodstatic->delete($user, $prodstatic->id); $res = $prodstatic->delete($user, $prodstatic->id);
if ($res <= 0) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
$error++;
break;
}
} else { } else {
break; break;
} }
if ($res <= 0) {
$error++;
break;
}
} }
if ($error) { if ($error) {
$db->rollback(); $db->rollback();
if (empty($prodstatic->error)) {
if ($prodstatic->error) {
setEventMessages($prodstatic->error, $prodstatic->errors, 'errors');
} else {
setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');
} }
} else { } else {
@ -834,7 +848,7 @@ if (!empty($id) || !empty($ref)) {
$aaa .= ' <option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>'; $aaa .= ' <option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
$aaa .= ' <option value="delete">'.$langs->trans('Delete').'</option>'; $aaa .= ' <option value="delete">'.$langs->trans('Delete').'</option>';
$aaa .= '</select>'; $aaa .= '</select>';
$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">'; $aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button small">';
} }
$massactionbutton = $aaa; $massactionbutton = $aaa;