Skip to content
Snippets Groups Projects
Commit 4f0b3587 authored by Laurent Destailleur's avatar Laurent Destailleur Committed by GitHub
Browse files

Merge pull request #7216 from atm-florian/fix_7213 

FIX : #7213
parents b0adc9cc f5718106
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/variants/class/ProductCombination.class.php
+ 4
− 3
View file @ 4f0b3587
...@@ -186,7 +186,7 @@ class ProductCombination ...@@ -186,7 +186,7 @@ class ProductCombination
{ {
$nb = 0; $nb = 0;
$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")"; $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
...@@ -195,7 +195,7 @@ class ProductCombination ...@@ -195,7 +195,7 @@ class ProductCombination
return $nb; return $nb;
} }
/** /**
* Creates a product attribute combination * Creates a product attribute combination
* *
...@@ -249,9 +249,10 @@ class ProductCombination ...@@ -249,9 +249,10 @@ class ProductCombination
/** /**
* Deletes a product combination * Deletes a product combination
* *
* @param User $user
* @return int <0 KO >0 OK * @return int <0 KO >0 OK
*/ */
public function delete() public function delete(User $user)
{ {
$this->db->begin(); $this->db->begin();
......
htdocs/variants/combinations.php
+ 52
− 52
View file @ 4f0b3587
...@@ -101,8 +101,8 @@ if ($_POST) { ...@@ -101,8 +101,8 @@ if ($_POST) {
if (!$features) { if (!$features) {
setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors'); setEventMessage($langs->trans('ErrorFieldsRequired'), 'errors');
} }
else else
{ {
$weight_impact = price2num($weight_impact); $weight_impact = price2num($weight_impact);
$price_impact = price2num($price_impact); $price_impact = price2num($price_impact);
...@@ -149,8 +149,8 @@ if ($_POST) { ...@@ -149,8 +149,8 @@ if ($_POST) {
$db->rollback(); $db->rollback();
} }
} }
elseif (! empty($massaction)) elseif (! empty($massaction))
{ {
$bulkaction = $massaction; $bulkaction = $massaction;
$error = 0; $error = 0;
...@@ -203,7 +203,7 @@ if ($_POST) { ...@@ -203,7 +203,7 @@ if ($_POST) {
setEventMessage($langs->trans('RecordSaved')); setEventMessage($langs->trans('RecordSaved'));
} }
} }
elseif ($valueid > 0) { elseif ($valueid > 0) {
if ($prodcomb->fetch($valueid) < 0) { if ($prodcomb->fetch($valueid) < 0) {
...@@ -234,7 +234,7 @@ if ($action === 'confirm_deletecombination') { ...@@ -234,7 +234,7 @@ if ($action === 'confirm_deletecombination') {
$db->begin(); $db->begin();
if ($prodcomb->delete() > 0 && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete() > 0) { if ($prodcomb->delete($user) > 0 && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete($user) > 0) {
$db->commit(); $db->commit();
setEventMessage($langs->trans('RecordSaved')); setEventMessage($langs->trans('RecordSaved'));
header('Location: '.dol_buildpath('/variants/combinations.php?id='.$object->id, 2)); header('Location: '.dol_buildpath('/variants/combinations.php?id='.$object->id, 2));
...@@ -288,26 +288,26 @@ if ($action === 'confirm_deletecombination') { ...@@ -288,26 +288,26 @@ if ($action === 'confirm_deletecombination') {
$form = new Form($db); $form = new Form($db);
if (! empty($id) || ! empty($ref)) if (! empty($id) || ! empty($ref))
{ {
llxHeader("", "", $langs->trans("CardProduct".$object->type)); llxHeader("", "", $langs->trans("CardProduct".$object->type));
$showbarcode=empty($conf->barcode->enabled)?0:1; $showbarcode=empty($conf->barcode->enabled)?0:1;
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0; if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
$head=product_prepare_head($object); $head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type); $titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product'); $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
dol_fiche_head($head, 'combinations', $titre, 0, $picto); dol_fiche_head($head, 'combinations', $titre, 0, $picto);
$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>'; $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
$object->next_prev_filter=" fk_product_type = ".$object->type; $object->next_prev_filter=" fk_product_type = ".$object->type;
dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1); dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref', '', '', '', 0, '', '', 1);
dol_fiche_end(); dol_fiche_end();
// Create or edit a varian // Create or edit a varian
if ($action == 'add' || ($action == 'edit')) { if ($action == 'add' || ($action == 'edit')) {
...@@ -343,7 +343,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -343,7 +343,7 @@ if (! empty($id) || ! empty($ref))
info: [] info: []
}; };
<?php <?php
foreach ($productCombination2ValuePairs1 as $pc2v) { foreach ($productCombination2ValuePairs1 as $pc2v) {
$prodattr_val->fetch($pc2v->fk_prod_attr_val); $prodattr_val->fetch($pc2v->fk_prod_attr_val);
?> ?>
...@@ -355,8 +355,8 @@ if (! empty($id) || ! empty($ref)) ...@@ -355,8 +355,8 @@ if (! empty($id) || ! empty($ref))
label: '<?php echo $prodattr_val->value ?>' label: '<?php echo $prodattr_val->value ?>'
} }
}; };
<?php <?php
} }
?> ?>
restoreAttributes = function() { restoreAttributes = function() {
...@@ -369,7 +369,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -369,7 +369,7 @@ if (! empty($id) || ! empty($ref))
}); });
}; };
jQuery(document).ready(function() { jQuery(document).ready(function() {
jQuery("select#attribute").change(function () { jQuery("select#attribute").change(function () {
console.log("Change of field variant attribute"); console.log("Change of field variant attribute");
...@@ -404,18 +404,18 @@ if (! empty($id) || ! empty($ref)) ...@@ -404,18 +404,18 @@ if (! empty($id) || ! empty($ref))
}); });
}); });
</script> </script>
<?php <?php
} }
print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"].'#parttoaddvariant">'."\n"; print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"].'#parttoaddvariant">'."\n";
print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n"; print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
print '<input type="hidden" name="action" value="add">'."\n"; print '<input type="hidden" name="action" value="add">'."\n";
print dol_fiche_head(); print dol_fiche_head();
?> ?>
<table class="border" style="width: 100%"> <table class="border" style="width: 100%">
<?php if ($action == 'add') { ?> <?php if ($action == 'add') { ?>
<!-- Variant --> <!-- Variant -->
...@@ -445,7 +445,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -445,7 +445,7 @@ if (! empty($id) || ! empty($ref))
</tr> </tr>
</table> </table>
<hr> <hr>
<?php } <?php }
?> ?>
<table class="border" style="width: 100%"> <table class="border" style="width: 100%">
<tr> <tr>
...@@ -495,12 +495,12 @@ if (! empty($id) || ! empty($ref)) ...@@ -495,12 +495,12 @@ if (! empty($id) || ! empty($ref))
&nbsp; &nbsp;
<input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel'); ?>" class="button"> <input type="submit" name="cancel" value="<?php echo $langs->trans('Cancel'); ?>" class="button">
</div> </div>
<?php <?php
print '</form>'; print '</form>';
} }
else else
{ {
if ($action === 'delete') { if ($action === 'delete') {
...@@ -538,7 +538,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -538,7 +538,7 @@ if (! empty($id) || ! empty($ref))
$comb2val = new ProductCombination2ValuePair($db); $comb2val = new ProductCombination2ValuePair($db);
if ($productCombinations) if ($productCombinations)
{ {
?> ?>
...@@ -563,36 +563,36 @@ if (! empty($id) || ! empty($ref)) ...@@ -563,36 +563,36 @@ if (! empty($id) || ! empty($ref))
}); });
</script> </script>
<?php } <?php }
// Buttons // Buttons
print '<div class="tabsAction">'; print '<div class="tabsAction">';
print ' <div class="inline-block divButAction">'; print ' <div class="inline-block divButAction">';
if ($productCombinations) { if ($productCombinations) {
print '<a href="combinations.php?id='.$object->id.'&action=copy" class="butAction">'.$langs->trans('PropagateVariant').'</a>'; print '<a href="combinations.php?id='.$object->id.'&action=copy" class="butAction">'.$langs->trans('PropagateVariant').'</a>';
} }
print '<a href="combinations.php?id='.$object->id.'&action=add#parttoaddvariant" class="butAction">'.$langs->trans('NewProductCombination').'</a>'; // NewVariant print '<a href="combinations.php?id='.$object->id.'&action=add#parttoaddvariant" class="butAction">'.$langs->trans('NewProductCombination').'</a>'; // NewVariant
// Too much bugged page. // Too much bugged page.
/* /*
print '<a href="generator.php?id='.$object->id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>'; print '<a href="generator.php?id='.$object->id.'" class="butAction">'.$langs->trans('ProductCombinationGenerator').'</a>';
*/ */
print ' </div>'; print ' </div>';
print '</div>'; print '</div>';
$arrayofselected=is_array($toselect)?$toselect:array(); $arrayofselected=is_array($toselect)?$toselect:array();
// List of variants // List of variants
print '<form method="POST" action="#parttoaddvariant">'; print '<form method="POST" action="#parttoaddvariant">';
// List of mass actions available // List of mass actions available
/* /*
$arrayofmassactions = array( $arrayofmassactions = array(
...@@ -603,7 +603,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -603,7 +603,7 @@ if (! empty($id) || ! empty($ref))
if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array(); if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions); $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
*/ */
$aaa=''; $aaa='';
if (count($productCombinations)) if (count($productCombinations))
{ {
...@@ -620,11 +620,11 @@ if (! empty($id) || ! empty($ref)) ...@@ -620,11 +620,11 @@ if (! empty($id) || ! empty($ref))
$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">';
} }
$massactionbutton = $aaa; $massactionbutton = $aaa;
$title = $langs->trans("ProductCombinations"); $title = $langs->trans("ProductCombinations");
print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $aaa, 0); print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $aaa, 0);
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
?> ?>
<table class="liste"> <table class="liste">
...@@ -636,7 +636,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -636,7 +636,7 @@ if (! empty($id) || ! empty($ref))
<td class="liste_titre center"><?php echo $langs->trans('OnSell') ?></td> <td class="liste_titre center"><?php echo $langs->trans('OnSell') ?></td>
<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td> <td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
<td class="liste_titre"></td> <td class="liste_titre"></td>
<?php <?php
print '<td class="liste_titre" align="middle">'; print '<td class="liste_titre" align="middle">';
$searchpicto=$form->showCheckAddButtons('checkforselect', 1); $searchpicto=$form->showCheckAddButtons('checkforselect', 1);
print $searchpicto; print $searchpicto;
...@@ -644,23 +644,23 @@ if (! empty($id) || ! empty($ref)) ...@@ -644,23 +644,23 @@ if (! empty($id) || ! empty($ref))
?> ?>
</tr> </tr>
<?php <?php
if (count($productCombinations)) if (count($productCombinations))
{ {
foreach ($productCombinations as $currcomb) { foreach ($productCombinations as $currcomb) {
$prodstatic->fetch($currcomb->fk_product_child); $prodstatic->fetch($currcomb->fk_product_child);
?> ?>
<tr class="oddeven"> <tr class="oddeven">
<td><?php echo $prodstatic->getNomUrl(1) ?></td> <td><?php echo $prodstatic->getNomUrl(1) ?></td>
<td> <td>
<?php <?php
$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id); $productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
$iMax = count($productCombination2ValuePairs); $iMax = count($productCombination2ValuePairs);
for ($i = 0; $i < $iMax; $i++) { for ($i = 0; $i < $iMax; $i++) {
echo dol_htmlentities($productCombination2ValuePairs[$i]); echo dol_htmlentities($productCombination2ValuePairs[$i]);
if ($i !== ($iMax - 1)) { if ($i !== ($iMax - 1)) {
echo ', '; echo ', ';
} }
...@@ -674,7 +674,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -674,7 +674,7 @@ if (! empty($id) || ! empty($ref))
<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a> <a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=edit&valueid='.$currcomb->id, 2) ?>"><?php echo img_edit() ?></a>
<a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a> <a class="paddingleft paddingright" href="<?php echo dol_buildpath('/variants/combinations.php?id='.$id.'&action=delete&valueid='.$currcomb->id, 2) ?>"><?php echo img_delete() ?></a>
</td> </td>
<?php <?php
print '<td class="nowrap" align="center">'; print '<td class="nowrap" align="center">';
if ($productCombinations || $massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined if ($productCombinations || $massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{ {
...@@ -690,7 +690,7 @@ if (! empty($id) || ! empty($ref)) ...@@ -690,7 +690,7 @@ if (! empty($id) || ! empty($ref))
} }
else else
{ {
print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>'; print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
} }
?> ?>
</table> </table>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment