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

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

Update 'next-3.x' with latest changes from 'main'

See merge request !52
Übergeordnete e15f63b0 14991b34
No related branches found
No related tags found
1 Merge Request!52Update 'next-3.x' with latest changes from 'main'
Pipeline #14827 bestanden mit Phase
in 2 Minuten und 13 Sekunden
...@@ -170,12 +170,24 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko ...@@ -170,12 +170,24 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
return this.$loadGUI(); return this.$loadGUI();
}).then(() => { }).then(() => {
if (this.getElm().getElement('.quiqqer-order-step-processing')) {
// processing step
if (this.getElm().getElement('.quiqqer-simple-checkout-orderDetails')) {
this.getElm().getElement('.quiqqer-simple-checkout-orderDetails').setStyle('display', 'none');
}
if (this.getElm().getElement('.quiqqer-simple-checkout__scrollToPaymentContainer')) {
this.getElm().getElement('.quiqqer-simple-checkout__scrollToPaymentContainer').setStyle('display', 'none');
}
}
this.$parseTermsAndConditions(); this.$parseTermsAndConditions();
this.Loader.hide(); this.Loader.hide();
moofx([ moofx([
this.getElm().getElements('form'), this.getElm().getElements('form'),
this.getElm().getElements('.quiqqer-simple-checkout-orderDetails') this.getElm().getElements('.quiqqer-simple-checkout-orderDetails'),
this.getElm().getElements('.quiqqer-simple-checkout__scrollToPaymentContainer'),
]).animate({ ]).animate({
opacity: 1 opacity: 1
}); });
...@@ -534,6 +546,14 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko ...@@ -534,6 +546,14 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
this.getElm().getElement('form').set('data-products-count', result.productCount); this.getElm().getElement('form').set('data-products-count', result.productCount);
} }
if (this.getElm().getElement('.quiqqer-simple-checkout-orderDetails')) {
this.getElm().getElement('.quiqqer-simple-checkout-orderDetails').setStyle('display', 'none');
}
if (this.getElm().getElement('.quiqqer-simple-checkout__scrollToPaymentContainer')) {
this.getElm().getElement('.quiqqer-simple-checkout__scrollToPaymentContainer').setStyle('display', 'none');
}
this.fireEvent('orderSuccessful', [this]); this.fireEvent('orderSuccessful', [this]);
const scripts = []; const scripts = [];
const Ghost = new Element('div', { const Ghost = new Element('div', {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{$BasketForHeader->create()} {$BasketForHeader->create()}
</div> </div>
<div class="hide-on-desktop quiqqer-simple-checkout__scrollToPaymentContainer"> <div class="hide-on-desktop quiqqer-simple-checkout__scrollToPaymentContainer" style="opacity: 0;">
<button class="quiqqer-simple-checkout__scrollToPaymentBtn btn btn-primary" type="button"> <button class="quiqqer-simple-checkout__scrollToPaymentBtn btn btn-primary" type="button">
{locale group="quiqqer/order-simple-checkout" var="ordering.btn.continueWithPurchase"} {locale group="quiqqer/order-simple-checkout" var="ordering.btn.continueWithPurchase"}
</button> </button>
......
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