Skip to content
Code-Schnipsel Gruppen Projekte
Commit b04d4613 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

Merge branch 'next-1.x' into '1.x'

fix: make it only with quiqqer v1 compatible

See merge request !19
Übergeordnete da344e79 c48af218
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
1 Merge Request!19fix: make it only with quiqqer v1 compatible
Pipeline-Nr. 10746 mit Warnungen bestanden
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
}, },
"require": { "require": {
"php": ">=7.4", "php": ">=7.4",
"quiqqer\/quiqqer": "1.*",
"quiqqer\/order": "*" "quiqqer\/order": "*"
}, },
"autoload": { "autoload": {
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<event on="onQuiqqerOrderProcessingStart" fire="\QUI\ERP\Order\Guest\EventHandler::onQuiqqerOrderProcessSend"/> <event on="onQuiqqerOrderProcessingStart" fire="\QUI\ERP\Order\Guest\EventHandler::onQuiqqerOrderProcessSend"/>
<event on="onQuiqqerOrderCreated" fire="\QUI\ERP\Order\Guest\EventHandler::onQuiqqerOrderCreated"/> <event on="onQuiqqerOrderCreated" fire="\QUI\ERP\Order\Guest\EventHandler::onQuiqqerOrderCreated"/>
<event on="onQuiqqer::order::orderProcess::nobody::end" fire="\QUI\ERP\Order\Guest\EventHandler::extendOrder"/>
<event on="onQuiqqer::order::orderProcessCheckoutEnd" fire="\QUI\ERP\Order\Guest\EventHandler::extendCheckout"/> <event on="onQuiqqer::order::orderProcessCheckoutEnd" fire="\QUI\ERP\Order\Guest\EventHandler::extendCheckout"/>
<event on="onQuiqqer::order::mail::orderConfirmation::end" fire="\QUI\ERP\Order\Guest\EventHandler::extendMail"/> <event on="onQuiqqer::order::mail::orderConfirmation::end" fire="\QUI\ERP\Order\Guest\EventHandler::extendMail"/>
</events> </events>
\ No newline at end of file
...@@ -299,8 +299,8 @@ ...@@ -299,8 +299,8 @@
<en><![CDATA[Order as guest]]></en> <en><![CDATA[Order as guest]]></en>
</locale> </locale>
<locale name="control.guestOrderButton.button"> <locale name="control.guestOrderButton.button">
<de><![CDATA[Ich möchte die Bestellung als Gast durchführen.]]></de> <de><![CDATA[Als Gast bestellen]]></de>
<en><![CDATA[I would like to place the order as a guest.]]></en> <en><![CDATA[Order as a guest]]></en>
</locale> </locale>
<locale name="control.guestOrderButton.next"> <locale name="control.guestOrderButton.next">
<de><![CDATA[Weiter]]></de> <de><![CDATA[Weiter]]></de>
......
.guest-order-login { .guest-order-login h2:first-child {
padding: 3rem 2rem 2rem 2rem;
width: 33%;
}
.guest-order-login h2:first-child {
position: relative; position: relative;
text-align: center; text-align: center;
} }
......
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