diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 122e80b2e69..eca254eb93e 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -283,7 +283,11 @@ if (empty($reshook)) $object->weight_units = GETPOST('weight_units'); $object->length = GETPOST('size'); $object->length_units = GETPOST('size_units'); - $object->surface = GETPOST('surface'); + $object->width = GETPOST('sizewidth'); + $object->width_units = GETPOST('sizewidth_units'); + $object->height = GETPOST('sizeheight'); + $object->height_units = GETPOST('sizeheight_units'); + $object->surface = GETPOST('surface'); $object->surface_units = GETPOST('surface_units'); $object->volume = GETPOST('volume'); $object->volume_units = GETPOST('volume_units'); @@ -380,6 +384,11 @@ if (empty($reshook)) $object->weight_units = GETPOST('weight_units'); $object->length = GETPOST('size'); $object->length_units = GETPOST('size_units'); + $object->width = GETPOST('sizewidth'); + $object->width_units = GETPOST('sizewidth_units'); + $object->height = GETPOST('sizeheight'); + $object->height_units = GETPOST('sizeheight_units'); + $object->surface = GETPOST('surface'); $object->surface_units = GETPOST('surface_units'); $object->volume = GETPOST('volume'); @@ -1010,12 +1019,23 @@ else print $formproduct->select_measuring_units("weight_units","weight"); print ''; // Length - if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) + if (empty($conf->global->PRODUCT_DISABLE_SIZE)) { print ''.$langs->trans("Length").''; print ''; print $formproduct->select_measuring_units("size_units","size"); print ''; + + print ''.$langs->trans("Width").''; + print ''; + print $formproduct->select_measuring_units("sizewidth_units","size"); + print ''; + + print ''.$langs->trans("Height").''; + print ''; + print $formproduct->select_measuring_units("sizeheight_units","size"); + print ''; + } if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) { @@ -1324,13 +1344,23 @@ else print ' '; print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units); print ''; - if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) + if (empty($conf->global->PRODUCT_DISABLE_SIZE)) { - // Length - print ''.$langs->trans("Length").''; - print ' '; - print $formproduct->select_measuring_units("size_units", "size", $object->length_units); - print ''; + // Length + print ''.$langs->trans("Length").''; + print ' '; + print $formproduct->select_measuring_units("size_units", "size", $object->length_units); + print ''; + + print ''.$langs->trans("Width").''; + print ' '; + print $formproduct->select_measuring_units("sizewidth_units","size", $object->width_units); + print ''; + + print ''.$langs->trans("Height").''; + print ' '; + print $formproduct->select_measuring_units("sizeheight_units","size", $object->height_units); + print ''; } if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) { @@ -1634,7 +1664,7 @@ else print ' '; } print "\n"; - if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) + if (empty($conf->global->PRODUCT_DISABLE_SIZE)) { // Length print ''.$langs->trans("Length").''; @@ -1647,6 +1677,22 @@ else print ' '; } print "\n"; + + print ''.$langs->trans("Width").''; + if ($object->width != '') { + print $object->width." ".measuring_units_string($object->width_units,"size"); + } + else + print ' '; + print "\n"; + + print ''.$langs->trans("Height").''; + if ($object->height != '') { + print $object->height." ".measuring_units_string($object->height_units,"size"); + } + else + print ' '; + print "\n"; } if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {