Skip to content
Code-Schnipsel Gruppen Projekte
Commit b211d07a erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

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

Next 2.x

See merge request !113
Übergeordnete 4c5e13ae d1bba8a0
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!117Update 'next-3.x' with latest changes from 'main',!113Next 2.x
Pipeline-Nr. 10882 mit Warnungen bestanden
......@@ -255,11 +255,6 @@ parameters:
count: 2
path: src/QUI/ERP/Order/EventHandling.php
-
message: "#^Call to method getGlobalProcessId\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Invoice\\.$#"
count: 1
path: src/QUI/ERP/Order/EventHandling.php
-
message: "#^Call to method getShipping\\(\\) on an unknown class QUI\\\\ERP\\\\SalesOrders\\\\SalesOrder\\.$#"
count: 2
......@@ -270,11 +265,6 @@ parameters:
count: 2
path: src/QUI/ERP/Order/EventHandling.php
-
message: "#^Call to method getUUID\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Invoice\\.$#"
count: 1
path: src/QUI/ERP/Order/EventHandling.php
-
message: "#^Call to static method getInstance\\(\\) on an unknown class QUI\\\\ERP\\\\Accounting\\\\Invoice\\\\Handler\\.$#"
count: 1
......
......@@ -17,6 +17,7 @@
use function array_flip;
use function array_keys;
use function class_exists;
use function count;
use function defined;
use function explode;
......@@ -279,6 +280,10 @@ public static function onQuiqqerInvoiceTemporaryInvoicePostEnd(
QUI\ERP\Accounting\Invoice\InvoiceTemporary $InvoiceTemporary,
QUI\ERP\Accounting\Invoice\Invoice $Invoice
): void {
if (!class_exists('QUI\ERP\Accounting\Invoice\Invoice')) {
return;
}
try {
$Process = new QUI\ERP\Process($Invoice->getGlobalProcessId());
$Order = $Process->getOrder();
......
......@@ -501,7 +501,12 @@ public function getBody(): string
$nobodyIntroDesc = '';
$Site = $this->getSite();
if ($guestOrderInstalled && QUI\ERP\Order\Guest\GuestOrder::isActive()) {
if (
class_exists('QUI\ERP\Order\Guest\GuestOrder')
&& class_exists('QUI\ERP\Order\Guest\Controls\GuestOrderButton')
&& $guestOrderInstalled
&& QUI\ERP\Order\Guest\GuestOrder::isActive()
) {
$GuestOrder = new QUI\ERP\Order\Guest\Controls\GuestOrderButton();
if ($Site->getAttribute('quiqqer.order.nobody.intro.title')) {
......@@ -522,7 +527,12 @@ public function getBody(): string
default => 'login'
};
if ($guestOrderInstalled && str_contains($url, '?open=guest') && QUI\ERP\Order\Guest\GuestOrder::isActive()) {
if (
$guestOrderInstalled
&& class_exists('QUI\ERP\Order\Guest\GuestOrder')
&& str_contains($url, '?open=guest')
&& QUI\ERP\Order\Guest\GuestOrder::isActive()
) {
$activeEntry = 'guest';
}
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren