From de55a6c1144302afe984f61e464f3ff5e294e503 Mon Sep 17 00:00:00 2001
From: Michael Danielczok <michael@pcsg.de>
Date: Wed, 12 Feb 2025 12:14:26 +0100
Subject: [PATCH 1/2] fix: remove unintended character in HTML
---
.../ERP/Order/SimpleCheckout/Steps/CheckoutBillingAddress.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutBillingAddress.html b/src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutBillingAddress.html
index 72d5a1c..17ed431 100644
--- a/src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutBillingAddress.html
+++ b/src/QUI/ERP/Order/SimpleCheckout/Steps/CheckoutBillingAddress.html
@@ -2,7 +2,7 @@
<input type="radio" name="billing_address" value="same_as_shipping" checked/>
<span>
{locale group="quiqqer/order-simple-checkout" var="ordering.step.title.Billing.same"}
- </span>s
+ </span>
</label>
<label class="quiqqer-simple-checkout-billing__entry">
<input type="radio" name="billing_address" value="different"/>
--
GitLab
From ff12540384d46236e7b5e26858f13bbc40bb5b7e Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Thu, 27 Feb 2025 13:03:23 +0100
Subject: [PATCH 2/2] fix: update formatting and DOM manipulation in
SimpleCheckout.js
This commit implements minor refactoring changes in the SimpleCheckout.js file.
- Updated formatting to include space before function parameters across multiple method
declarations for improved readability.
- Modified DOM manipulation logic to use data-name attribute instead of class name for element
selection, enhancing selection accuracy.
- Added data-name attribute set command to retain DOM element specific data when replacing HTML.
- Improvements in 'require' callbacks to use fat arrow function notation.
- Minor adjustments in formatting in methods dealing with Events and DOM manipulations.
Related: quiqqer/coupons#19
---
bin/frontend/controls/SimpleCheckout.js | 52 ++++++++++++-------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/bin/frontend/controls/SimpleCheckout.js b/bin/frontend/controls/SimpleCheckout.js
index bcd08e6..4ae917e 100644
--- a/bin/frontend/controls/SimpleCheckout.js
+++ b/bin/frontend/controls/SimpleCheckout.js
@@ -13,7 +13,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
'Locale',
'Ajax'
-], function(QUI, QUIControl, QUILoader, QUIFormUtils, QUILocale, QUIAjax) {
+], function (QUI, QUIControl, QUILoader, QUIFormUtils, QUILocale, QUIAjax) {
'use strict';
const lg = 'quiqqer/order-simple-checkout';
@@ -41,7 +41,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
disableProductLinks: 'default'
},
- initialize: function(options) {
+ initialize: function (options) {
this.parent(options);
this.$Form = null;
@@ -71,7 +71,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
}
},
- $onImport: function() {
+ $onImport: function () {
const Elm = this.getElm();
this.Loader = new QUILoader().inject(Elm);
@@ -194,7 +194,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $onInject: function() {
+ $onInject: function () {
this.$loadProducts().then(() => {
return this.$loadCheckout();
}).catch((err) => {
@@ -220,7 +220,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $loadOrder: function() {
+ $loadOrder: function () {
if (this.getAttribute('orderHash')) {
return new Promise((resolve, reject) => {
QUIAjax.post('package_quiqqer_order-simple-checkout_ajax_frontend_getOrder', resolve, {
@@ -257,7 +257,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $loadGUI: function() {
+ $loadGUI: function () {
let SetCurrency = Promise.resolve();
if (typeof window.DEFAULT_USER_CURRENCY !== 'undefined' &&
@@ -351,7 +351,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $loadPayment: function() {
+ $loadPayment: function () {
return new Promise((resolve, reject) => {
QUIAjax.post(
'package_quiqqer_order-simple-checkout_ajax_frontend_getPaymentStep',
@@ -399,7 +399,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $loadProducts: function() {
+ $loadProducts: function () {
const urlParams = new URLSearchParams(window.location.search);
const product = urlParams.get('product');
@@ -434,7 +434,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
return Promise.resolve();
},
- $loadCheckout: function() {
+ $loadCheckout: function () {
this.$setAnchor();
return new Promise((resolve) => {
@@ -443,14 +443,14 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
html: html
});
- const Checkout = Ghost.getElement('.quiqqer-simple-checkout');
+ const Checkout = Ghost.getElement('[data-name="quiqqer-simple-checkout"]');
this.getElm().addClass(Checkout.className);
this.getElm().set('data-qui', Checkout.get('data-qui'));
+ this.getElm().set('data-name', 'quiqqer-simple-checkout');
this.getElm().set('html', Checkout.get('html'));
Ghost.getElements('style').inject(this.getElm());
-
QUI.parse(this.getElm()).then(() => {
this.fireEvent('loaded', [this]);
this.$onImport();
@@ -465,7 +465,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- setCurrency: function(currency) {
+ setCurrency: function (currency) {
return new Promise((resolve, reject) => {
QUIAjax.post('package_quiqqer_order-simple-checkout_ajax_frontend_setCurrency', resolve, {
'package': 'quiqqer/order-simple-checkout',
@@ -488,7 +488,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
/**
* @return {Promise<void>}
*/
- orderWithCosts: function() {
+ orderWithCosts: function () {
this.Loader.show();
return this.update().then(() => {
@@ -561,7 +561,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
// trigger js stuff
- Ghost.getElements('script').forEach(function(Script) {
+ Ghost.getElements('script').forEach(function (Script) {
const New = new Element('script');
if (Script.get('html')) {
@@ -631,7 +631,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $getControl: function(Node) {
+ $getControl: function (Node) {
return new Promise((resolve) => {
if (!Node || !Node.get('data-qui')) {
return resolve(null);
@@ -656,7 +656,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $setAnchor: function() {
+ $setAnchor: function () {
if (!this.getAttribute('loadHashFromUrl')) {
return;
}
@@ -668,9 +668,9 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
window.location.hash = this.getAttribute('orderHash');
},
- $parseTermsAndConditions: function() {
+ $parseTermsAndConditions: function () {
// Terms of Service
- this.getElm().getElements('a[data-project]').addEvent('click', function(e) {
+ this.getElm().getElements('a[data-project]').addEvent('click', function (e) {
let Target = e.target;
if (Target.nodeName !== 'A') {
@@ -683,7 +683,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
e.stop();
- require(['package/quiqqer/controls/bin/site/Window'], function(Win) {
+ require(['package/quiqqer/controls/bin/site/Window'], function (Win) {
new Win({
showTitle: true,
project: Target.get('data-project'),
@@ -694,7 +694,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $refreshBasket: function() {
+ $refreshBasket: function () {
//this.Loader.show();
this.$BasketLoader.style.display = '';
@@ -752,7 +752,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
});
},
- $showError: function(message) {
+ $showError: function (message) {
// @todo michael -> schönere error message
QUI.getMessageHandler().then((MH) => {
MH.addError(message);
@@ -761,7 +761,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
console.error(message);
},
- update: function() {
+ update: function () {
this.$BasketLoader.style.display = '';
return new Promise((resolve) => {
@@ -854,7 +854,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
*
* @param event
*/
- toggleAllProducts: function(event) {
+ toggleAllProducts: function (event) {
event.stop();
const Elm = this.getElm();
@@ -887,7 +887,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
* @param ListNode
* @param InnerNode
*/
- showHiddenArticles: function(ListNode, InnerNode) {
+ showHiddenArticles: function (ListNode, InnerNode) {
moofx(ListNode).animate({
height: InnerNode.offsetHeight,
opacity: 1
@@ -903,7 +903,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
*
* @param ListNode
*/
- hideHiddenArticles: function(ListNode) {
+ hideHiddenArticles: function (ListNode) {
moofx(ListNode).animate({
height: 0,
opacity: 0
@@ -916,7 +916,7 @@ define('package/quiqqer/order-simple-checkout/bin/frontend/controls/SimpleChecko
*
* @param event
*/
- scrollToPayment: function(event) {
+ scrollToPayment: function (event) {
event.stop();
const Elm = this.getElm();
--
GitLab