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

Next 2.x

See merge request !133

bin/frontend/Basket.js

@@ -155,6 +155,16 @@ define('package/quiqqer/order/bin/frontend/Basket', [
                 return;
             }
 
+            if (QUI.getAttribute('QUIQQER_ORDER_BASKET_MERGE')) {
+                GlobalBasket.setAttribute(
+                    'mergeLocalStorage',
+                    QUI.getAttribute('QUIQQER_ORDER_BASKET_MERGE')
+                );
+
+                GlobalBasket.load();
+                return;
+            }
+
             GlobalBasket.showMergeWindow();
         });
     } else {

phpstan-baseline.neon

@@ -355,11 +355,6 @@ parameters:
 			count: 1
 			path: src/QUI/ERP/Order/Mail.php
 
-		-
-			message: "#^Parameter \\#1 \\$id of method QUI\\\\Projects\\\\Media\\:\\:get\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/QUI/ERP/Order/Mail.php
-
 		-
 			message: "#^Call to method getId\\(\\) on an unknown class QUI\\\\ERP\\\\Shipping\\\\Types\\\\ShippingEntry\\.$#"
 			count: 1

src/QUI/ERP/Order/Mail.php

@@ -469,7 +469,7 @@ protected static function addOrderMailAttachments(
 
             foreach ($attachments as $attachment) {
                 try {
-                    $Item = $Media->get($attachment);
+                    $Item = $Media->get((int)$attachment);
                     $Mail->addAttachment($Item->getFullPath());
                 } catch (\Exception $Exception) {
                     QUI\System\Log::addAlert('Order mail attachment file error :: ' . $Exception->getMessage());