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

Next 2.x

See merge request !40

bin/frontend/controls/SimpleCheckout.js

@@ -455,7 +455,23 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
             this.Loader.show();
 
             return this.update().then(() => {
+                // check country, because input country is not focusable
+                if (typeof this.$Form.elements.country !== 'undefined') {
+                    const Countries = QUI.Controls.getById(this.$Form.elements.country.get('data-quiid'));
+
+                    if (this.$Form.elements.country.value === '') {
+                        this.$Form.elements.country.value = Countries.getValue();
+                    }
+
+                    if (this.$Form.elements.country.value === '') {
+                        Countries.focus();
+                        this.Loader.hide();
+                        return;
+                    }
+                }
+
                 if (!this.$Form.reportValidity()) {
+                    this.Loader.hide();
                     return;
                 }
 

phpstan-baseline.neon

@@ -5,17 +5,7 @@ parameters:
 			count: 1
 			path: ajax/frontend/update.php
 
-		-
-			message: "#^Parameter \\#1 \\$PermissionUser of method QUI\\\\ERP\\\\Order\\\\Order\\:\\:save\\(\\) expects null, QUI\\\\Users\\\\SystemUser given\\.$#"
-			count: 1
-			path: src/QUI/ERP/Order/SimpleCheckout/Checkout.php
-
 		-
 			message: "#^Instantiated class QUI\\\\ERP\\\\Shipping\\\\Order\\\\Shipping not found\\.$#"
 			count: 1
 			path: src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutShipping.php
-
-		-
-			message: "#^Class QUI\\\\Database\\\\Exception referenced with incorrect case\\: QUI\\\\DataBase\\\\Exception\\.$#"
-			count: 1
-			path: types/simpleCheckout.php

types/simpleCheckout.php

@@ -19,7 +19,7 @@
     $Engine->assign([
         'Checkout' => $Checkout
     ]);
-} catch (QUI\DataBase\Exception $Exception) {
+} catch (QUI\Database\Exception $Exception) {
     $ExceptionReplacement = new QUI\Exception(['quiqqer/quiqqer', 'exception.error']);
 
     QUI\System\Log::writeException($Exception);