From 2a6009096dcdcce018ffb01c93c34883b450925b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 22 Feb 2016 13:11:46 +0100 Subject: [PATCH] Add hidden option PRODUCT_DISABLE_LENGTH and PRODUCT_DISABLE_SURFACE --- htdocs/product/card.php | 92 ++++++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 37 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 46e91e9f120..987754a36ae 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -975,15 +975,21 @@ else print $formproduct->select_measuring_units("weight_units","weight"); print ''; // Length - print ''.$langs->trans("Length").''; - print ''; - print $formproduct->select_measuring_units("size_units","size"); - print ''; - // Surface - print ''.$langs->trans("Surface").''; - print ''; - print $formproduct->select_measuring_units("surface_units","surface"); - print ''; + if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) + { + print ''.$langs->trans("Length").''; + print ''; + print $formproduct->select_measuring_units("size_units","size"); + print ''; + } + if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) + { + // Surface + print ''.$langs->trans("Surface").''; + print ''; + print $formproduct->select_measuring_units("surface_units","surface"); + print ''; + } // Volume print ''.$langs->trans("Volume").''; print ''; @@ -1275,16 +1281,22 @@ else print ' '; print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units); print ''; - // Length - print ''.$langs->trans("Length").''; - print ' '; - print $formproduct->select_measuring_units("size_units", "size", $object->length_units); - print ''; - // Surface - print ''.$langs->trans("Surface").''; - print ' '; - print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units); - print ''; + if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) + { + // Length + print ''.$langs->trans("Length").''; + print ' '; + print $formproduct->select_measuring_units("size_units", "size", $object->length_units); + print ''; + } + if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) + { + // Surface + print ''.$langs->trans("Surface").''; + print ' '; + print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units); + print ''; + } // Volume print ''.$langs->trans("Volume").''; print ' '; @@ -1565,28 +1577,34 @@ else print ' '; } print "\n"; - // Length - print ''.$langs->trans("Length").''; - if ($object->length != '') + if (empty($conf->global->PRODUCT_DISABLE_LENGTH)) { - print $object->length." ".measuring_units_string($object->length_units,"size"); + // Length + print ''.$langs->trans("Length").''; + if ($object->length != '') + { + print $object->length." ".measuring_units_string($object->length_units,"size"); + } + else + { + print ' '; + } + print "\n"; } - else + if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) { - print ' '; + // Surface + print ''.$langs->trans("Surface").''; + if ($object->surface != '') + { + print $object->surface." ".measuring_units_string($object->surface_units,"surface"); + } + else + { + print ' '; + } + print "\n"; } - print "\n"; - // Surface - print ''.$langs->trans("Surface").''; - if ($object->surface != '') - { - print $object->surface." ".measuring_units_string($object->surface_units,"surface"); - } - else - { - print ' '; - } - print "\n"; // Volume print ''.$langs->trans("Volume").''; if ($object->volume != '')