Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 05c251e0 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: consider empty invoice address + added new orderprocess step event api

Übergeordneter feeac893
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!22feat: new order events + form data at the order process send routine,!21feat: new order events + form data at the order process send routine
......@@ -16,6 +16,7 @@ Order=$Order
</div>
{if $InvoiceAddress}
<div class="quiqqer-order-step-checkout-invoiceAddress">
<h2>{locale group="quiqqer/order" var="ordering.step.checkout.billing.address"}</h2>
{$InvoiceAddress->render(['tel' => false, 'mail' => false])}
......@@ -32,6 +33,7 @@ Order=$Order
{$DeliveryAddress->render(['tel' => false, 'mail' => false])}
</div>
{/if}
{/if}
{if $comment}
<div class="quiqqer-order-step-checkout-customerData-comment">
......
......@@ -124,9 +124,24 @@ public function getBody(): string
$comment = trim($comment);
// invoice address
$InvoiceAddress = $Order->getInvoiceAddress();
if (
$InvoiceAddress->getName() === ''
&& $InvoiceAddress->getPhone() === ''
&& $InvoiceAddress->getAttribute('street_no') === false
&& $InvoiceAddress->getAttribute('zip') === false
&& $InvoiceAddress->getAttribute('city') === false
&& $InvoiceAddress->getAttribute('country') === false
) {
$InvoiceAddress = null;
}
$Engine->assign([
'User' => $Order->getCustomer(),
'InvoiceAddress' => $Order->getInvoiceAddress(),
'InvoiceAddress' => $InvoiceAddress,
'DeliveryAddress' => $Order->getDeliveryAddress(),
'Payment' => $Order->getPayment(),
'Shipping' => $Order->getShipping(),
......
......@@ -1400,6 +1400,8 @@ protected function parseSteps(): OrderProcessSteps
$Order = $this->getOrder();
$Basket = $this->Basket;
QUI::getEvents()->fireEvent('onQuiqqerOrderProcessStepsBegin', [$this, $Order, $Steps]);
if (QUI::getUsers()->isNobodyUser(QUI::getUserBySession())) {
$Steps->append(
new Controls\OrderProcess\Registration([
......@@ -1409,6 +1411,8 @@ protected function parseSteps(): OrderProcessSteps
])
);
QUI::getEvents()->fireEvent('onQuiqqerOrderProcessStepsEnd', [$this, $Order, $Steps]);
return $Steps;
}
......@@ -1424,14 +1428,18 @@ protected function parseSteps(): OrderProcessSteps
$Steps->append($Finish);
QUI::getEvents()->fireEvent('onQuiqqerOrderProcessStepsEnd', [$this, $Order, $Steps]);
return $Steps;
}
/*
$Registration = new Controls\OrderProcess\Registration([
'Basket' => $Basket,
'Order' => $Order,
'priority' => 1
]);
*/
$Basket = new Controls\OrderProcess\Basket([
'Basket' => $Basket,
......@@ -1475,6 +1483,9 @@ protected function parseSteps(): OrderProcessSteps
$this->sortSteps($Steps);
QUI::getEvents()->fireEvent('onQuiqqerOrderProcessStepsEnd', [$this, $Order, $Steps]);
return $Steps;
}
......
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