Merge branch 'develop' into gli-2941

2026-08-24 16:30:37 +05:30
parent 4def31481b ce543f3688
commit da2f563bc2
40 changed files with 510 additions and 380 deletions
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -455,7 +455,7 @@ class AdminNormalProductsControllerCore extends AdminController
            'tooltip_items' => $options,
        ));

-        $tooltip = $this->context->smarty->fetch('helpers/tooltip.tpl');
+        $tooltip = $this->context->smarty->fetch('controllers/normal_products/_price_calculation_method_options.tpl');

        return count($options) . ' ' . $this->l('Selected') . ' ' . $tooltip;
    }