Merge remote-tracking branch 'normal/10.3' into 11.x

# Conflicts: # dump/data-1-settings_store.sql # src/Controller/ProductController.php
pimcore · Jan 18, 2023 · 8122f11 · 8122f11 · kingjia90 · Jan 18, 2023
2 parents f922638 + ce3356e
commit 8122f11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Controller/ProductController.php b/src/Controller/ProductController.php
@@ -220,7 +220,9 @@ public function productTeaserAction(Request $request, Factory $ecommerceFactory)
         if ($request->attributes->get('type') === 'object') {
             AbstractObject::setGetInheritedValues(true);
             $product = AbstractProduct::getById($request->attributes->getInt('id'));
-
+            if ($product instanceof Car && $product->getObjectType() === Car::OBJECT_TYPE_VIRTUAL_CAR) {
+                throw new \Exception('Virtual products are not allowed in product teasers.');
+            }
             $paramsBag['product'] = $product;
 
             //track product impression

diff --git a/templates/areas/product-teaser/view.html.twig b/templates/areas/product-teaser/view.html.twig
@@ -10,6 +10,7 @@
                             editmode: editmode,
                             controller: 'App\\Controller\\ProductController::productTeaserAction',
                             title: 'Drag a product here',
+                            className: 'Car',
                             height : 'auto',
                             width: '100%'
                         })