diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index 7804f781f..a83afd4fc 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -604,8 +604,8 @@ abstract class ControllerCore * @see https://www.php.net/manual/en/language.operators.errorcontrol.php */ if (!(error_reporting() & $errno)) { + return false; } - return false; switch ($errno) { case E_USER_ERROR: diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 2b94f6e92..132f84b21 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -7190,9 +7190,9 @@ class AdminOrdersControllerCore extends AdminController } if ($serviceProducts) { - if (isset($additionalServices[$idHtlBookingDetail]) && $additionalServices[$idHtlBookingDetail]) { - foreach ($serviceProducts as $key => $servProduct) { - $serviceProducts[$key]['price_tax_exc'] = $servProduct['price']; + foreach ($serviceProducts as $key => $servProduct) { + $serviceProducts[$key]['price_tax_exc'] = $servProduct['price']; + if (isset($additionalServices[$idHtlBookingDetail]) && $additionalServices[$idHtlBookingDetail]) { if (in_array($servProduct['id_product'], array_column($additionalServices[$idHtlBookingDetail]['additional_services'], 'id_product'))) { unset($serviceProducts[$key]); }