Merge branch 'main' into 'next-3.x'

Update 'next-3.x' with latest changes from 'main'

See merge request !154

bin/frontend/controls/OrderProcess.js

@@ -1684,7 +1684,7 @@ define('package/quiqqer/order/bin/frontend/controls/OrderProcess', [
                     const products = basket.products;
 
                     // if there are no products yet, merge without query
-                    if (!products.length) {
+                    if (!products || !products.length) {
                         GlobalBasket.setAttribute('mergeLocalStorage', 1);
                         GlobalBasket.load().then(function() {
                             window.location.reload();