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

refactor(phpstan): improve order handling and cleanup code

Changes include:
- Updated `AbstractOrderingStep.php` to handle null case in `getOrder` method and modified return
type.
- Refactored `Order.php` to remove unnecessary checks and improve readability.
- Ensured safety against calling non-existent `save()` method in `Checkout.php`.
- Simplified address getting logic in `CustomerData.php`.
- Removed unnecessary check in isUserB2B function.

Related: #172
Übergeordneter 56156df7
No related branches found
No related tags found
2 Merge Requests!146fix: update `getCustomerFiles` method signature in `AbstractOrder`,!145Update 'next-3.x' with latest changes from 'main'
Pipeline #15530 fehlgeschlagen mit Phase
in 2 Minuten und 22 Sekunden
......@@ -7,6 +7,7 @@
namespace QUI\ERP\Order\Controls;
use QUI;
use QUI\ERP\Order\AbstractOrder;
use QUI\Locale;
use ReflectionClass;
......@@ -48,11 +49,15 @@ public function getIcon(): string
/**
* Return the current order
*
* @return QUI\ERP\Order\AbstractOrder
* @return AbstractOrder|null
*/
public function getOrder(): QUI\ERP\Order\AbstractOrder
public function getOrder(): ?QUI\ERP\Order\AbstractOrder
{
return $this->getAttribute('Order');
if ($this->getAttribute('Order') instanceof QUI\ERP\Order\AbstractOrder) {
return $this->getAttribute('Order');
}
return null;
}
/**
......
......@@ -21,7 +21,7 @@ class Order extends QUI\Control
/**
* @var null|QUI\ERP\Order\AbstractOrder
*/
protected QUI\ERP\Order\AbstractOrder|null $Order = null;
protected QUI\ERP\Order\AbstractOrder | null $Order = null;
/**
* Order constructor.
......@@ -83,16 +83,12 @@ public function getBody(): string
if ($Order->hasInvoice()) {
$Invoice = $Order->getInvoice();
}
if ($Invoice instanceof QUI\ERP\Accounting\Invoice\InvoiceTemporary) {
$View->setAttribute('downloadLink', false);
}
} catch (QUI\Exception $Exception) {
QUI\System\Log::writeDebugException($Exception);
}
if ($Invoice instanceof QUI\ERP\Accounting\Invoice\InvoiceTemporary) {
$View->setAttribute('downloadLink', false);
}
if ($Invoice instanceof QUI\ERP\Accounting\Invoice\InvoiceTemporary) {
$View->setAttribute('downloadLink', false);
}
switch ($this->getAttribute('template')) {
......
......@@ -254,7 +254,9 @@ public function forceSave(): void
$Order->setData('orderedWithCosts', 1);
$Order->setData('orderedWithCostsPayment', $Payment->getId());
$Order->save();
if (method_exists($Order, 'save')) {
$Order->save();
}
}
/**
......
......@@ -64,14 +64,7 @@ public function getBody(): string
}
if (!$Address) {
try {
/* @var $User User */
$Address = $User->getStandardAddress();
} catch (QUI\Exception) {
// user has no address
// create a new standard address
$Address = $User->addAddress();
}
$Address = $User->getStandardAddress();
}
try {
......@@ -83,10 +76,6 @@ public function getBody(): string
$isUserB2B = function () use ($User) {
if (!$User) {
return '';
}
if ($User->getAttribute('quiqqer.erp.isNettoUser') === QUI\ERP\Utils\User::IS_NETTO_USER) {
return ' selected="selected"';
}
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren