From 498393f82ed9bad3c913b95676953a085f34ae48 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sat, 2 Nov 2024 15:10:00 +0100 Subject: [PATCH] wip --- dashboard/templates.php | 2 +- functions/product.php | 2 +- functions/tools.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboard/templates.php b/dashboard/templates.php index 16771c31..ae6ab204 100644 --- a/dashboard/templates.php +++ b/dashboard/templates.php @@ -1151,7 +1151,7 @@ function dolicart_display($content) { print ""; } elseif ( defined("DOLIBUG") ) { print dolibug((isset($object->error)?$object->error->message:null)); -} elseif ( !doliCheckModules('commande', esc_attr(isset($_GET["refresh"]) ? $_GET["refresh"] : null)) ) { +} elseif ( !doliCheckModules('commande') ) { print "
"; print dolibug(__( "Oops, Order's module is not available", "doliconnect")); diff --git a/functions/product.php b/functions/product.php index 97c8d6b0..3e721d27 100644 --- a/functions/product.php +++ b/functions/product.php @@ -450,7 +450,7 @@ function doliProductCart($product, $line = null, $refresh = null, $wishlist = tr $button .= ''; } elseif ( $mstock['stock'] <= 0 || $mstock['m2'] < $mstock['step'] ) { $button .= ''; - } elseif (doliCheckModules('adherent', $refresh) && $product->id == doliconst("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS")) { + } elseif (doliCheckModules('adherent') && $product->id == doliconst("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS")) { $button .= '
'; if (!empty($mstock['qty'])) { $button .= ""; diff --git a/functions/tools.php b/functions/tools.php index 69567f08..1f89c807 100644 --- a/functions/tools.php +++ b/functions/tools.php @@ -1765,7 +1765,7 @@ function doliline($object, $refresh = false, $refreshstock = false, $wishlist = $dates = " (Du $start au $end)"; } $doliline .= '
'; - if ( doliCheckModules('fraisdeport', $refresh) && doliconst('FRAIS_DE_PORT_ID_SERVICE_TO_USE', $refresh) == $line->fk_product ) { + if ( doliCheckModules('fraisdeport') && doliconst('FRAIS_DE_PORT_ID_SERVICE_TO_USE', $refresh) == $line->fk_product ) { $doliline .= ''; } else { $doliline .= doliconnect_image('product', $line->fk_product, array('limit'=>1, 'size'=>'50x50'), $refresh); @@ -1798,7 +1798,7 @@ function doliline($object, $refresh = false, $refreshstock = false, $wishlist = } } $doliline .= '
'.doliprice($line, (empty(get_option('dolibarr_b2bmode'))?'total_ttc':'total_ht'), isset($line->multicurrency_code) ? $line->multicurrency_code : null).'
'; - if (!empty($line->fk_parent_line) || (doliCheckModules('fraisdeport', $refresh) && empty($line->fk_parent_line) && doliconst('FRAIS_DE_PORT_ID_SERVICE_TO_USE') == $line->fk_product)) { + if (!empty($line->fk_parent_line) || (doliCheckModules('fraisdeport') && empty($line->fk_parent_line) && doliconst('FRAIS_DE_PORT_ID_SERVICE_TO_USE') == $line->fk_product)) { $doliline .= '
x'.$line->qty.'
'; } elseif ( isset($object->statut) && empty($object->statut) && !is_page(doliconnectid('doliaccount')) ) { $doliline .= doliProductCart($product, $line, $refresh, $wishlist);