+ {% block payone_notification_target_detail_base_basic_info_card %}
+
+
+
+
-
-
- {% endblock %}
-
- {% endblock %}
+
+
- {% block payone_notification_target_detail_base_info_field_url %}
-
-
- {% endblock %}
+ {% block payone_notification_target_detail_base_info_field_url %}
+
+
+ {% endblock %}
- {% block payone_notification_target_detail_base_info_field_is_basic_auth %}
-
-
- {% endblock %}
+ {% block payone_notification_target_detail_base_info_field_is_basic_auth %}
+
+
+ {% endblock %}
- {% block payone_notification_target_detail_base_info_field_is_basic_auth_fields %}
-
-
+ {% block payone_notification_target_detail_base_info_field_is_basic_auth_fields %}
+
+
-
-
- {% endblock %}
+
+
+ {% endblock %}
- {% block payone_notification_target_detail_base_info_field_txactions %}
-
-
- {% endblock %}
+ {% block payone_notification_target_detail_base_info_field_txactions %}
+
+
+ {% endblock %}
-
-
@@ -33,7 +33,7 @@
{% endblock %}
{% block payone_notification_target_list_content %}
-
+
{% block payone_notification_target_list_content_list %}
+
{% block payone_notification_target_list_sidebar_refresh %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/index.js b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/index.js
index 22d081c85..12f10480d 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/index.js
@@ -2,5 +2,11 @@ import template from './payone-payment-plugin-icon.html.twig';
import './payone-payment-plugin-icon.scss';
export default {
- template
+ template,
+
+ computed: {
+ assetFilter() {
+ return Shopware.Filter.getByName('asset');
+ }
+ }
};
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/payone-payment-plugin-icon.html.twig b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/payone-payment-plugin-icon.html.twig
index dde7b6c68..ec0b314d4 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/payone-payment-plugin-icon.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-plugin-icon/payone-payment-plugin-icon.html.twig
@@ -1,3 +1,3 @@
{% block payone_payment_plugin_icon %}
- ![]()
+ ![]()
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-settings/index.js b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-settings/index.js
new file mode 100644
index 000000000..629a0c465
--- /dev/null
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-payment-settings/index.js
@@ -0,0 +1,145 @@
+const {Component, Utils} = Shopware;
+
+Component.extend('payone-payment-settings', 'sw-system-config', {
+
+ inject: ['PayonePaymentSettingsService'],
+
+ methods: {
+
+ _getShowPaymentStatusFieldsFieldName(cardName) {
+ return `PayonePayment.settings.${cardName}_show_status_mapping`;
+ },
+
+ async readConfig() {
+ this.stateMaschineOptions = await this.PayonePaymentSettingsService.getStateMachineTransitionActions()
+ .then((result) => {
+ return result.data.map((element) => {
+ let translationKey = `payone-payment.transitionActionNames.${element.label}`;
+ let translationValue = this.$t(translationKey);
+
+ if (translationValue === translationKey) {
+ translationValue = element.label;
+ }
+
+ return {
+ id: element.value,
+ name: translationValue,
+ }
+ });
+ });
+
+ await this.$super('readConfig');
+
+ this.config.forEach(card => {
+ const cardNameMatches = card.name.match(/^payment_(.*)$/);
+ const paymentMethodName = cardNameMatches ? cardNameMatches[1] : null;
+
+ if (paymentMethodName) {
+ this.addApiConfigurationFieldsToPaymentSettingCard(card, paymentMethodName);
+ this.addPaymentStatusFieldsToPaymentSettingCard(card, paymentMethodName);
+ }
+
+ if (card.name.startsWith('payment_') || card.name === 'status_mapping') {
+ card.setShowFields = (isVisible) => {
+ card.showFields = isVisible;
+ card.elements.forEach(element => {
+ element.hidden = !isVisible;
+ });
+ this.showPaymentStatusFieldsBasedOnToggle(card);
+ };
+ card.setShowFields(false);
+ }
+ });
+ },
+
+ addApiConfigurationFieldsToPaymentSettingCard(card, paymentMethodName) {
+ const allowedFieldKeys = ['merchantId', 'accountId', 'portalId', 'portalKey'];
+
+ const cardWithStatus = this.config.find(card => card.name === 'basic_configuration');
+
+ const newElements = [];
+ cardWithStatus.elements.forEach((element => {
+ const matches = element.name.match(/\.([^.]+)$/);
+ const fieldKey = matches ? matches[1] : null;
+ if (!fieldKey || !allowedFieldKeys.includes(fieldKey)) {
+ return;
+ }
+
+ const newElement = Utils.object.cloneDeep(element);
+ newElement.name = element.name.replace('.' + fieldKey, '.' + paymentMethodName + (fieldKey[0].toUpperCase() + fieldKey.slice(1)));
+ newElement.config.helpText = {
+ "en-GB": "The basic configuration value is used, if nothing is entered here.",
+ "de-DE": "Es wird der Wert aus der Grundeinstellung verwendet, wenn hier kein Wert eingetragen ist.",
+ }
+
+ newElements.push(newElement);
+ }));
+
+ card.elements = newElements.concat(card.elements); // prepend the fields
+ },
+
+ addPaymentStatusFieldsToPaymentSettingCard(card, paymentMethodName) {
+ // add toggle
+ card.elements.push({
+ config: {
+ componentName: 'sw-switch-field',
+ label: {
+ "en-GB": "Display state mapping configuration",
+ "de-DE": "Statusmappingkonfiguration einblenden",
+ },
+ helpText: {
+ "en-GB": "If not configured the general status mapping config will be applied.",
+ "de-DE": "Sie können für jede Zahlungsart ein spezifisches Statusmapping konfigurieren. Existiert eine solche Konfiguration nicht, wird auf die allgemeine Konfiguration zurückgegriffen.",
+ }
+ },
+ name: this._getShowPaymentStatusFieldsFieldName(card.name)
+ });
+
+ // copy all fields from card `status_mapping`
+ const cardWithStatus = this.config.find(card => card.name === 'status_mapping');
+ cardWithStatus.elements.forEach((element => {
+ const newElement = Utils.object.cloneDeep(element);
+ newElement.name = element.name.replace('.paymentStatus', `.${paymentMethodName}PaymentStatus`)
+ card.elements.push(newElement);
+ }));
+ },
+
+ getElementBind(element, mapInheritance) {
+ const rtn = this.$super('getElementBind', element, mapInheritance);
+
+ if (element.name.includes('PaymentStatus') || element.name.includes('.paymentStatus')) {
+ rtn.config.options = this.stateMaschineOptions;
+ }
+
+ return rtn;
+ },
+
+ getInheritWrapperBind(element) {
+ const rtn = this.$super('getInheritWrapperBind', element);
+
+ rtn.hidden = element.hidden;
+
+ return rtn;
+ },
+
+ showPaymentStatusFieldsBasedOnToggle(card) {
+ const config = this.actualConfigData[this.currentSalesChannelId];
+ if (!config) {
+ return;
+ }
+ const isVisible = config[this._getShowPaymentStatusFieldsFieldName(card.name)];
+
+ card.elements.forEach(element => {
+ if (element.name.includes('PaymentStatus')) {
+ element.hidden = !isVisible;
+ }
+ });
+ },
+
+ emitConfig() {
+ this.config.forEach(card => this.showPaymentStatusFieldsBasedOnToggle(card));
+
+ this.$super('emitConfig');
+ }
+ }
+});
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.html.twig b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.html.twig
index 206427526..f06b2914c 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.html.twig
@@ -1,28 +1,36 @@
{% block payone_ratepay_profile_configurations %}
-
- {{ $tc('payone-payment.general.headlines.ratepayProfileConfigurations') }}
+
+
+ {{ $tc('payone-payment.general.headlines.ratepayProfileConfigurations') }}
-
- {{ $tc('payone-payment.general.label.shopId') }}: {{ profileConfiguration.shopId }}
+
+
+ {{ $tc('payone-payment.general.label.shopId') }}: {{ profileConfiguration.shopId }}
- {% block payone_ratepay_configuration_grid %}
-
- {{ $tc('payone-payment.general.label.currency') }}
- {{ profileConfiguration.shopCurrency }}
+ {% block payone_ratepay_configuration_grid %}
+
+ {{ $tc('payone-payment.general.label.currency') }}
+ {{ profileConfiguration.shopCurrency }}
- {{ $tc('payone-payment.general.label.invoiceCountry') }}
- {{ profileConfiguration.invoiceCountry }}
+ {{ $tc('payone-payment.general.label.invoiceCountry') }}
+ {{ profileConfiguration.invoiceCountry }}
- {{ $tc('payone-payment.general.label.shippingCountry') }}
- {{ profileConfiguration.shippingCountry }}
+ {{ $tc('payone-payment.general.label.shippingCountry') }}
+ {{ profileConfiguration.shippingCountry }}
- {{ $tc('payone-payment.general.label.minBasket') }}
- {{ profileConfiguration.minBasket }}
+ {{ $tc('payone-payment.general.label.minBasket') }}
+ {{ profileConfiguration.minBasket }}
- {{ $tc('payone-payment.general.label.maxBasket') }}
- {{ profileConfiguration.maxBasket }}
-
- {% endblock %}
+ {{ $tc('payone-payment.general.label.maxBasket') }}
+ {{ profileConfiguration.maxBasket }}
+
+ {% endblock %}
+
+
+
+
+
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
index 3ccde2b3c..241a1ff76 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
@@ -1,15 +1,17 @@
-.payone-ratepay-profile-configurations {
+.payone-ratepay-profile-configuration {
margin-top: 20px;
- @media screen and (min-width: 768px) {
- width: 50%;
- }
-
- .payone-ratepay-profile-configuration--headline {
+ &--headline {
font-weight: 600;
margin-top: 20px;
}
+ &--items {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
+ gap: 1rem;
+ }
+
.sw-description-list {
dt {
text-align: right;
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
index b7f693628..a49c76096 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
@@ -60,8 +60,9 @@ export default {
watch: {
profiles(profiles) {
- this.$emit('input', profiles);
- this.$emit('change', profiles);
+ this.$emit('update:value', profiles);
+ this.$emit('input', profiles); // required for SW 6.5.x compatibility
+ this.$emit('change', profiles); // required for SW 6.5.x compatibility
},
},
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
index f932c6370..dcb1e987b 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
@@ -52,7 +52,7 @@
{% endblock %}
{% block payone_ratepay_shop_ids_bulk_actions %}
-
+
{% block sw_settings_units_content_grid_column_menu_delete %}
{{ $tc('global.default.delete') }}
diff --git a/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js b/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
index da4f02216..936a7a82f 100644
--- a/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
+++ b/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
@@ -1,16 +1,11 @@
const { Filter } = Shopware;
-const { currency } = Shopware.Utils.format;
-Filter.register('payone_currency', (value, format, decimalPrecision, decimalPlaces) => {
+Filter.register('payone_currency', (value, format, decimalPlaces) => {
if (value === null) {
return '-';
}
- if (!decimalPrecision) {
- decimalPrecision = 0;
- }
-
- value /= (10 ** decimalPrecision);
+ value /= 100;
- return currency(value, format, decimalPlaces);
+ return Filter.getByName('currency')(value, format, decimalPlaces);
});
diff --git a/src/Resources/app/administration/src/module/payone-payment/index.js b/src/Resources/app/administration/src/module/payone-payment/index.js
index 8ac68e42b..2d533a5cf 100644
--- a/src/Resources/app/administration/src/module/payone-payment/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/index.js
@@ -1,6 +1,7 @@
import deDE from './snippet/de_DE.json';
import enGB from './snippet/en_GB.json';
import './filter/payone_currency.filter';
+import './component/payone-payment-settings';
Shopware.Component.register('payone-payment-plugin-icon', () => import('./component/payone-payment-plugin-icon'));
Shopware.Component.register('payone-ratepay-profile-configurations', () => import('./component/payone-ratepay-profile-configurations'));
@@ -14,7 +15,7 @@ Shopware.Module.register('payone-payment', {
description: 'payone-payment.general.descriptionTextModule',
version: '1.0.0',
targetVersion: '1.0.0',
- icon: 'default-action-settings',
+ icon: 'regular-cog',
snippets: {
'de-DE': deDE,
diff --git a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
index 80d72aea0..312d640f0 100644
--- a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
@@ -1,8 +1,7 @@
import template from './payone-settings.html.twig';
import './style.scss';
-const { Mixin } = Shopware;
-const { object, types } = Shopware.Utils;
+const {Mixin} = Shopware;
export default {
template,
@@ -12,7 +11,7 @@ export default {
Mixin.getByName('sw-inline-snippet')
],
- inject: [ 'PayonePaymentSettingsService' ],
+ inject: ['PayonePaymentSettingsService'],
data() {
return {
@@ -21,51 +20,9 @@ export default {
isSaveSuccessful: false,
isTestSuccessful: false,
isApplePayCertConfigured: true,
- config: {},
- merchantIdFilled: false,
- accountIdFilled: false,
- portalIdFilled: false,
- portalKeyFilled: false,
- showValidationErrors: false,
isSupportModalOpen: false,
stateMachineTransitionActions: [],
displayStatusMapping: {},
- collapsibleState: {
- 'status_mapping': true,
- 'payment_credit_card': true,
- 'payment_paypal': true,
- 'payment_paypal_express': true,
- 'payment_debit': true,
- 'payment_sofort': true,
- 'payment_payolution_installment': true,
- 'payment_payolution_invoicing': true,
- 'payment_payolution_debit': true,
- 'payment_eps': true,
- 'payment_ideal': true,
- 'payment_paydirekt': true,
- 'payment_prepayment': true,
- 'payment_trustly': true,
- 'payment_secure_invoice': true,
- 'payment_open_invoice': true,
- 'payment_apple_pay': true,
- 'payment_bancontact': true,
- 'payment_ratepay_debit': true,
- 'payment_ratepay_installment': true,
- 'payment_ratepay_invoicing': true,
- 'payment_klarna_invoice': true,
- 'payment_klarna_direct_debit': true,
- 'payment_klarna_installment': true,
- 'payment_przelewy24': true,
- 'payment_we_chat_pay': true,
- 'payment_postfinanceCard': true,
- 'payment_postfinanceWallet': true,
- 'payment_alipay': true,
- 'payment_secured_invoice': true,
- 'payment_secured_installment': true,
- 'payment_secured_direct_debit': true,
- 'payment_amazon_pay': true,
- 'payment_amazon_pay_express': true,
- },
};
},
@@ -73,12 +30,6 @@ export default {
this.createdComponent();
},
- computed: {
- credentialsMissing: function() {
- return !this.merchantIdFilled || !this.accountIdFilled || !this.portalIdFilled || !this.portalKeyFilled;
- }
- },
-
metaInfo() {
return {
title: this.$createTitle()
@@ -87,97 +38,12 @@ export default {
methods: {
createdComponent() {
- let me = this;
-
- this.PayonePaymentSettingsService.getStateMachineTransitionActions()
- .then((result) => {
- result.data.forEach((element) => {
- let translationKey = 'payone-payment.transitionActionNames.' + element.label;
- let translationValue = me.$t(translationKey);
-
- if (translationValue === translationKey) {
- translationValue = element.label;
- }
-
- me.stateMachineTransitionActions.push({
- "label": translationValue,
- "value": element.value,
- })
- });
- });
-
this.PayonePaymentSettingsService.hasApplePayCert()
.then((result) => {
this.isApplePayCertConfigured = result;
});
},
- paymentMethodPrefixes() {
- return [
- 'creditCard',
- 'debit',
- 'paypal',
- 'paypalExpress',
- 'payolutionInvoicing',
- 'payolutionInstallment',
- 'payolutionDebit',
- 'sofort',
- 'eps',
- 'iDeal',
- 'paydirekt',
- 'prepayment',
- 'trustly',
- 'secureInvoice',
- 'openInvoice',
- 'applePay',
- 'bancontact',
- 'ratepayDebit',
- 'ratepayInstallment',
- 'ratepayInvoicing',
- 'klarnaInvoice',
- 'klarnaDirectDebit',
- 'klarnaInstallment',
- 'przelewy24',
- 'weChatPay',
- 'postfinanceCard',
- 'postfinanceWallet',
- 'alipay',
- 'securedInvoice',
- 'securedInstallment',
- 'securedDirectDebit',
- 'amazonPay',
- 'amazonPayExpress',
- ];
- },
-
- isVisiblePaymentMethodCard(card) {
- return card.name.startsWith('payment') && !this.isCollapsed(card);
- },
-
- isCollapsible(card) {
- return card.name in this.collapsibleState;
- },
-
- displayField(element, config, card) {
- if (!(card.name in this.collapsibleState)) {
- return true;
- }
-
- return !this.collapsibleState[card.name];
- },
-
- isCollapsed(card) {
- return this.collapsibleState[card.name];
- },
-
- toggleCollapsible(card) {
- if (!(card.name in this.collapsibleState)) {
- return;
- }
-
- this.collapsibleState[card.name] = !this.collapsibleState[card.name];
- },
-
saveFinish() {
this.isSaveSuccessful = false;
},
@@ -186,30 +52,17 @@ export default {
this.isTestSuccessful = false;
},
- onConfigChange(config) {
- this.config = config;
-
- this.checkCredentialsFilled();
-
- this.showValidationErrors = false;
- },
-
- checkCredentialsFilled() {
- this.merchantIdFilled = !!this.getConfigValue('merchantId');
- this.accountIdFilled = !!this.getConfigValue('accountId');
- this.portalIdFilled = !!this.getConfigValue('portalId');
- this.portalKeyFilled = !!this.getConfigValue('portalKey');
- },
-
getConfigValue(field) {
- const defaultConfig = this.$refs.systemConfig.actualConfigData.null;
+ const actualConfig = this.$refs.systemConfig.actualConfigData;
+ const defaultConfig = actualConfig.null;
const salesChannelId = this.$refs.systemConfig.currentSalesChannelId;
if (salesChannelId === null) {
- return this.config[`PayonePayment.settings.${field}`];
+ return actualConfig.null[`PayonePayment.settings.${field}`];
}
- return this.config[`PayonePayment.settings.${field}`]
- || defaultConfig[`PayonePayment.settings.${field}`];
+
+ return actualConfig[salesChannelId][`PayonePayment.settings.${field}`]
+ || defaultConfig[`PayonePayment.settings.${field}`];
},
getPaymentConfigValue(field, prefix) {
@@ -220,19 +73,12 @@ export default {
},
onSave() {
- if (this.credentialsMissing) {
- this.showValidationErrors = true;
- return;
- }
-
this.isSaveSuccessful = false;
this.isLoading = true;
this.$refs.systemConfig.saveAll().then((response) => {
this.handleRatepayProfileUpdates(response);
-
- this.isLoading = false;
this.isSaveSuccessful = true;
- }).catch(() => {
+ }).finally(() => {
this.isLoading = false;
});
},
@@ -242,12 +88,18 @@ export default {
this.isTestSuccessful = false;
let credentials = {};
- this.paymentMethodPrefixes().forEach((prefix) => {
- credentials[prefix] = {
- merchantId: this.getPaymentConfigValue('merchantId', prefix),
- accountId: this.getPaymentConfigValue('accountId', prefix),
- portalId: this.getPaymentConfigValue('portalId', prefix),
- portalKey: this.getPaymentConfigValue('portalKey', prefix)
+ this.$refs.systemConfig.config.forEach((cards) => {
+ const match = cards.name.match(/^payment_(.+)$/);
+ const paymentMethodKey = match ? match[1] : null
+ if (!paymentMethodKey) {
+ return;
+ }
+
+ credentials[paymentMethodKey] = {
+ merchantId: this.getPaymentConfigValue('merchantId', paymentMethodKey),
+ accountId: this.getPaymentConfigValue('accountId', paymentMethodKey),
+ portalId: this.getPaymentConfigValue('portalId', paymentMethodKey),
+ portalKey: this.getPaymentConfigValue('portalKey', paymentMethodKey)
};
});
@@ -265,8 +117,8 @@ export default {
});
this.isTestSuccessful = true;
} else {
- for(let key in errors) {
- if(errors.hasOwnProperty(key)) {
+ for (let key in errors) {
+ if (errors.hasOwnProperty(key)) {
this.createNotificationError({
title: this.$tc('payone-payment.settingsForm.titleError'),
message: this.$tc('payone-payment.settingsForm.messageTestError.' + key)
@@ -281,8 +133,7 @@ export default {
}
}
}
- this.isTesting = false;
- }).catch((errorResponse) => {
+ }).finally((errorResponse) => {
this.createNotificationError({
title: this.$tc('payone-payment.settingsForm.titleError'),
message: this.$tc('payone-payment.settingsForm.messageTestError.general')
@@ -291,86 +142,6 @@ export default {
});
},
- getBind(element, config) {
- let originalElement;
-
- if (config !== this.config) {
- this.config = config;
- }
-
- if (this.showValidationErrors) {
- if (element.name === 'PayonePayment.settings.merchantId' && !this.merchantIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.accountId' && !this.accountIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.portalId' && !this.portalIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.portalKey' && !this.portalKeyFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- }
-
- this.$refs.systemConfig.config.forEach((configElement) => {
- configElement.elements.forEach((child) => {
- if (child.name === element.name) {
- originalElement = child;
- return;
- }
- });
- });
-
- return originalElement || element;
- },
-
- getElementBind(element) {
- const bind = object.deepCopyObject(element);
-
- // Add inherited values
- if (this.currentSalesChannelId !== null
- && this.inherit
- && this.actualConfigData.hasOwnProperty('null')
- && this.actualConfigData.null[bind.name] !== null) {
- if (bind.type === 'single-select' || bind.config.componentName === 'sw-entity-single-select') {
- // Add inherited placeholder option
- bind.placeholder = this.$tc('sw-settings.system-config.inherited');
- } else if (bind.type === 'bool') {
- // Add inheritedValue for checkbox fields to restore the inherited state
- bind.config.inheritedValue = this.actualConfigData.null[bind.name] || false;
- } else if (bind.type === 'password') {
- // Add inherited placeholder and mark placeholder as password so the rendering element
- // can choose to hide it
- bind.placeholderIsPassword = true;
- bind.placeholder = `${this.actualConfigData.null[bind.name]}`;
- } else if (bind.type !== 'multi-select' && !types.isUndefined(this.actualConfigData.null[bind.name])) {
- // Add inherited placeholder
- bind.placeholder = `${this.actualConfigData.null[bind.name]}`;
- }
- }
-
- // Add select properties
- if (['single-select', 'multi-select'].includes(bind.type)) {
- bind.config.labelProperty = 'name';
- bind.config.valueProperty = 'id';
- }
-
- return bind;
- },
-
handleRatepayProfileUpdates(response) {
const salesChannelId = this.$refs.systemConfig.currentSalesChannelId;
@@ -378,8 +149,8 @@ export default {
const resultBySalesChannel = response.payoneRatepayProfilesUpdateResult[salesChannelId];
this.$root.$emit(
- 'payone-ratepay-profiles-update-result',
- resultBySalesChannel
+ 'payone-ratepay-profiles-update-result',
+ resultBySalesChannel
);
if (!Array.isArray(resultBySalesChannel.errors)) {
diff --git a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
index 0343e6ff1..f8b46a829 100644
--- a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
@@ -40,7 +40,7 @@
+ :disabled="isLoading">
{{ $tc('payone-payment.settingsForm.test') }}
{% endblock %}
@@ -148,77 +148,27 @@
-
-
-
-
-
-
-
- {{ $tc('payone-payment.general.label.reloadConfigInfo') }}
-
-
-
-
-
-
+
+
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json b/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
index 6598f3214..28510df58 100644
--- a/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
+++ b/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
@@ -6,7 +6,7 @@
"descriptionTextModule": "Einstellungen für PAYONE",
"headlines": {
"ratepayProfiles": "Profile",
- "ratepayProfileConfigurations": "Profil-Konfigurationen"
+ "ratepayProfileConfigurations": "Profile Konfigurationen"
},
"label": {
"shopId": "Shop-ID",
@@ -16,8 +16,7 @@
"shippingCountry": "Lieferland",
"minBasket": "Min. Warenkorb",
"maxBasket": "Max. Warenkorb",
- "reloadConfigBtn": "Profil-Konfiguration neu laden",
- "reloadConfigInfo": "(Änderungen an der Plugin-Konfiguration werden dabei zuerst gespeichert)"
+ "reloadConfigInfo": "Profile-Konfigurationen werden beim Speichern der Plugin-Einstellungen automatisch aktualisiert."
},
"actions": {
"addShop": "Shop-ID hinzufügen"
diff --git a/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json b/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
index baaf276e3..9d76a9217 100644
--- a/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
+++ b/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
@@ -6,7 +6,7 @@
"descriptionTextModule": "Settings for PAYONE",
"headlines": {
"ratepayProfiles": "Profile",
- "ratepayProfileConfigurations": "Profil-Konfigurationen"
+ "ratepayProfileConfigurations": "Profile configuration"
},
"label": {
"shopId": "Shop-ID",
@@ -16,8 +16,7 @@
"shippingCountry": "Shipping Country",
"minBasket": "Min. Basket",
"maxBasket": "Max. Basket",
- "reloadConfigBtn": "Reload Profile Configuration",
- "reloadConfigInfo": "(Plugin Configuration Changes will be saved first)"
+ "reloadConfigInfo": "Profile-Configuration got automatically updated during saving the plugin configuration"
},
"actions": {
"addShop": "Add Shop-ID"
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
index 07645b67e..e94f003e6 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
@@ -1,7 +1,7 @@
import template from './payone-capture-button.html.twig';
import './payone-capture-button.scss';
-const { Mixin } = Shopware;
+const {Mixin, Filter} = Shopware;
export default {
template,
@@ -10,7 +10,7 @@ export default {
Mixin.getByName('notification')
],
- inject: ['PayonePaymentService', 'repositoryFactory'],
+ inject: ['PayonePaymentService'],
props: {
order: {
@@ -23,7 +23,31 @@ export default {
}
},
+ data() {
+ return {
+ isLoading: false,
+ hasError: false,
+ showCaptureModal: false,
+ isCaptureSuccessful: false,
+ captureAmount: 0.0,
+ includeShippingCosts: false,
+ items: [],
+ };
+ },
+
computed: {
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
+
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderTotalPrice() {
+ return this.transaction.amount.totalPrice;
+ },
+
decimalPrecision() {
if (!this.order || !this.order.currency) {
return 2;
@@ -36,47 +60,24 @@ export default {
}
},
- totalTransactionAmount() {
- return Math.round(this.transaction.amount.totalPrice * (10 ** this.decimalPrecision), 0);
- },
-
capturedAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount) {
- return 0;
- }
-
- return this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount;
+ return this.toFixedPrecision((this.transaction?.extensions?.payonePaymentOrderTransactionData?.capturedAmount ?? 0) / 100);
},
remainingAmount() {
- return this.totalTransactionAmount - this.capturedAmount;
- },
-
- maxCaptureAmount() {
- return this.remainingAmount / (10 ** this.decimalPrecision);
+ return this.toFixedPrecision(this.orderTotalPrice - this.capturedAmount);
},
buttonEnabled() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData) {
+ if (!this.transaction?.extensions?.payonePaymentOrderTransactionData) {
return false;
}
- return (this.remainingAmount > 0 && this.capturedAmount > 0) || this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture;
+ return this.remainingAmount > 0 || this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture;
},
- isItemSelected() {
- let returnValue = false;
-
- this.selection.forEach((selection) => {
- if (selection.selected) {
- returnValue = true;
- }
- });
-
- return returnValue;
+ selectedItems() {
+ return this.items.filter(item => item.selected && item.quantity > 0);
},
hasRemainingShippingCosts() {
@@ -84,58 +85,57 @@ export default {
return false;
}
- const shippingCosts = this.order.shippingCosts.totalPrice * (10 ** this.decimalPrecision);
-
- let capturedPositionAmount = 0;
-
- this.order.lineItems.forEach((order_item) => {
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- capturedPositionAmount += order_item.customFields.payone_captured_quantity * order_item.unitPrice * (10 ** this.decimalPrecision);
- }
- });
-
- if (this.capturedAmount - Math.round(capturedPositionAmount) >= shippingCosts) {
- return false;
- }
-
- return true;
+ return this.toFixedPrecision(this.capturedAmount + this.order.shippingCosts.totalPrice) <= this.orderTotalPrice;
}
},
- data() {
- return {
- isLoading: false,
- hasError: false,
- showCaptureModal: false,
- isCaptureSuccessful: false,
- selection: [],
- captureAmount: 0.0,
- includeShippingCosts: false
- };
- },
-
methods: {
- calculateCaptureAmount() {
+ toFixedPrecision(value) {
+ return Math.round(value * (10 ** this.decimalPrecision)) / (10 ** this.decimalPrecision);
+ },
+
+ calculateActionAmount() {
let amount = 0;
- this.selection.forEach((selection) => {
- if (selection.selected) {
- amount += selection.unit_price * selection.quantity;
- }
+ this.selectedItems.forEach((selection) => {
+ amount += selection.unit_price * selection.quantity;
});
- if (amount > this.remainingAmount) {
- amount = this.remainingAmount;
- }
-
- this.captureAmount = amount;
+ this.captureAmount = this.toFixedPrecision(amount > this.remainingAmount ? this.remainingAmount : amount);
},
openCaptureModal() {
this.showCaptureModal = true;
this.isCaptureSuccessful = false;
- this.selection = [];
+ this.initItems();
+ },
+
+ initItems() {
+ this.items = this.order.lineItems.map((orderItem) => {
+ const qty = orderItem.quantity - (orderItem.customFields?.payone_captured_quantity ?? 0);
+
+ return {
+ id: orderItem.id,
+ quantity: qty,
+ maxQuantity: qty,
+ unit_price: orderItem.unitPrice,
+ selected: false,
+ product: orderItem.label,
+ disabled: qty <= 0,
+ };
+ });
+
+ if (this.order.shippingCosts.totalPrice > 0) {
+ this.items.push({
+ id: 'shipping',
+ quantity: 1,
+ maxQuantity: 1,
+ unit_price: this.order.shippingCosts.totalPrice,
+ selected: false,
+ disabled: false,
+ product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
+ });
+ }
},
closeCaptureModal() {
@@ -159,27 +159,25 @@ export default {
this.isLoading = true;
- this.selection.forEach((selection) => {
- this.order.lineItems.forEach((order_item) => {
- if (order_item.id === selection.id && selection.selected && 0 < selection.quantity) {
- const copy = { ...order_item },
- taxRate = copy.tax_rate / (10 ** request.decimalPrecision);
+ this.selectedItems.forEach((selection) => {
+ if (selection.id === 'shipping') {
+ request.includeShippingCosts = true;
+ } else {
+ const orderLineItem = this.order.lineItems.find(lineItem => lineItem.id === selection.id);
+ if (orderLineItem) {
+ const copy = {...orderLineItem};
- copy.quantity = selection.quantity;
- copy.total_amount = copy.unit_price * copy.quantity;
- copy.total_tax_amount = Math.round(copy.total_amount / (100 + taxRate) * taxRate);
+ copy.quantity = selection.quantity;
+ copy.total_amount = copy.unit_price * copy.quantity;
+ copy.total_tax_amount = copy.total_amount - (copy.total_amount / (1 + (copy.tax_rate / 100)));
request.orderLines.push(copy);
}
- });
-
- if (selection.id === 'shipping' && selection.selected && 0 < selection.quantity) {
- request.includeShippingCosts = true;
}
});
- if (this.remainingAmount < (request.amount * (10 ** this.decimalPrecision))) {
- request.amount = this.remainingAmount / (10 ** this.decimalPrecision);
+ if (this.remainingAmount < request.amount) {
+ request.amount = this.remainingAmount;
}
this.executeCapture(request)
@@ -190,7 +188,7 @@ export default {
orderTransactionId: this.transaction.id,
payone_order_id: this.transaction.extensions.payonePaymentOrderTransactionData.transactionId,
salesChannel: this.order.salesChannel,
- amount: this.remainingAmount / (10 ** this.decimalPrecision),
+ amount: this.remainingAmount,
orderLines: [],
complete: true,
includeShippingCosts: this.hasRemainingShippingCosts
@@ -198,20 +196,13 @@ export default {
this.isLoading = true;
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
-
- request.orderLines.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
+ request.orderLines = this.order.lineItems.map((orderItem) => {
+ return {
+ id: orderItem.id,
+ quantity: orderItem.quantity - (orderItem.customFields?.payone_captured_quantity ?? 0),
+ unit_price: orderItem.unitPrice,
selected: false
- });
+ };
});
this.executeCapture(request);
@@ -241,60 +232,13 @@ export default {
});
});
},
-
- onSelectItem(id, selected) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.selected = selected;
- }
- });
-
- this.calculateCaptureAmount();
- },
-
- onChangeQuantity(id, quantity) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.quantity = quantity;
- }
- });
-
- this.calculateCaptureAmount();
- },
-
- _populateSelectionProperty() {
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
-
- this.selection.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
- selected: false
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- this.selection.push({
- id: 'shipping',
- quantity: 1,
- unit_price: this.order.shippingCosts.totalPrice,
- selected: false
- });
- }
+ },
+ watch: {
+ items: {
+ handler() {
+ this.calculateActionAmount();
+ },
+ deep: true,
}
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
index 4df0a1170..7af0918ea 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
@@ -7,36 +7,30 @@
-
-
+
-
+
-
+
{{ $tc('sw-order.payone-payment.modal.close') }}
-
+
{{ $tc('sw-order.payone-payment.modal.capture.submit') }}
-
+
{{ $tc('sw-order.payone-payment.modal.capture.fullSubmit') }}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js
deleted file mode 100644
index 667b65bcb..000000000
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import template from './payone-data-grid.html.twig';
-
-export default {
- template: template
-};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig
deleted file mode 100644
index 83b37d703..000000000
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{% block sw_data_grid_select_item_checkbox %}
-
-
-
-
-
-{% endblock %}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
index dc1eb62d9..8e485b613 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
@@ -1,80 +1,24 @@
import template from './payone-order-items.html.twig';
import './payone-order-items.scss';
+const {Filter} = Shopware;
+
export default {
template,
props: {
+ items: {
+ type: Array,
+ required: true
+ },
order: {
type: Object,
required: true
- },
-
- mode: {
- type: String,
- required: false
}
},
computed: {
- orderItems() {
- const data = [];
-
- this.order.lineItems.forEach((order_item) => {
- const price = this.$options.filters.currency(
- order_item.totalPrice,
- this.order.currency.shortName,
- this.order.decimal_precision
- );
-
- let disabled = false;
- let quantity = order_item.quantity;
-
- if(order_item.customFields) {
- if ('refund' === this.mode) {
- if(order_item.customFields.payone_captured_quantity &&
- 0 > order_item.customFields.payone_captured_quantity) {
- quantity = order_item.customFields.payone_captured_quantity;
- }
-
- if(order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
- } else if ('capture' === this.mode && order_item.customFields.payone_captured_quantity &&
- 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
- }
-
- if (1 > quantity) {
- disabled = true;
- }
-
- data.push({
- id: order_item.id,
- product: order_item.label,
- quantity: quantity,
- disabled: disabled,
- selected: false,
- price: price,
- orderItem: order_item
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- data.push({
- id: 'shipping',
- product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
- quantity: 1,
- disabled: false,
- selected: false,
- price: this.$options.filters.currency(this.order.shippingCosts.totalPrice, this.order.currency.shortName, this.order.decimal_precision),
- orderItem: {}
- });
- }
-
- return data;
- },
+ currencyFilter: () => Filter.getByName('currency'),
orderItemColumns() {
return [
@@ -98,12 +42,11 @@ export default {
},
methods: {
- onSelectItem(selection, item, selected) {
- this.$emit('select-item', item.id, selected);
+ updateSelection(selection) {
+ const selectionIds = Object.keys(selection);
+ this.items.forEach(item => {
+ item.selected = selectionIds.includes(item.id);
+ });
},
-
- onChangeQuantity(value, id) {
- this.$emit('change-quantity', id, value);
- }
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
index 1158c3160..cddb4721a 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
@@ -1,33 +1,30 @@
{% block payone_payment_details %}
-
-
-
- {{ item.product }}
-
-
-
- {{ item.price }}
+
+
+
-
+
+ {{ currencyFilter(item.unit_price, order.currency.shortName) }}
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
index d19f2c2d5..d89abc7ed 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
@@ -1,133 +1,146 @@
import template from './payone-payment-management.html.twig';
import './payone-payment-management.scss';
-const { Mixin } = Shopware;
-const { Criteria } = Shopware.Data;
+const {Mixin, Filter} = Shopware;
+const {Criteria} = Shopware.Data;
export default {
- template,
+ template,
- inject: ['acl', 'PayonePaymentService', 'repositoryFactory'],
+ inject: ['acl', 'PayonePaymentService', 'repositoryFactory'],
- mixins: [
- Mixin.getByName('notification'),
- ],
+ mixins: [
+ Mixin.getByName('notification'),
+ ],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- notificationForwards: null
- };
- },
-
- computed: {
- payoneTransactions: function () {
- return this.order.transactions.filter(transaction => this.isPayoneTransaction(transaction)).sort((a, b) => { // newest transaction first
- if (a.createdAt < b.createdAt) {
- return 1;
- } else if (a.createdAt > b.createdAt) {
- return -1;
- } else {
- return 0;
- }
- });
- },
- notificationForwardRepository() {
- return this.repositoryFactory.create('payone_payment_notification_forward');
- },
- notificationTargetColumns() {
- return [{
- property: 'txaction',
- type: 'text',
- width: '100px'
- },{
- property: 'notificationTarget.url',
- type: 'text',
- }, {
- property: 'response',
- width: '100px'
- }, {
- property: 'updatedAt',
- align: 'right',
- type: 'date'
- }];
+
+ data() {
+ return {
+ notificationForwards: null
+ };
},
- },
- methods: {
- isPayoneTransaction(transaction) {
- if (!transaction.extensions || !transaction.extensions.payonePaymentOrderTransactionData || !transaction.extensions.payonePaymentOrderTransactionData.transactionId) {
- return false;
- }
+ computed: {
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- return transaction.extensions.payonePaymentOrderTransactionData.transactionId;
- },
- isActiveTransaction(transaction) {
- return transaction.stateMachineState.technicalName !== 'cancelled';
- },
- hasNotificationForwards(transaction) {
- if (this.notificationForwards === null) {
- this.getNotificationForwards(transaction);
- return false;
- }
+ payoneTransactions: function () {
+ return this.order.transactions.filter(transaction => this.isPayoneTransaction(transaction)).sort((a, b) => { // newest transaction first
+ if (a.createdAt < b.createdAt) {
+ return 1;
+ } else if (a.createdAt > b.createdAt) {
+ return -1;
+ } else {
+ return 0;
+ }
+ });
+ },
- return this.notificationForwards.length > 0;
- },
- getNotificationForwards(transaction) {
- const criteria = new Criteria();
- criteria.addAssociation('notificationTarget');
- criteria.addSorting(Criteria.sort('updatedAt', 'DESC', true));
- criteria.addFilter(Criteria.equals('transactionId', transaction.id));
- criteria.setLimit(500);
-
- return this.notificationForwardRepository.search(criteria, Shopware.Context.api)
- .then((searchResult) => {
- this.notificationForwards = searchResult;
- });
- },
- requeue(notificationForward, transaction) {
- const request = {
- notificationForwardId: notificationForward.id
- };
-
- this.PayonePaymentService.requeueNotificationForward(request).then(() => {
- this.createNotificationSuccess({
- title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
- message: this.$tc('payonePayment.notificationTarget.messages.success')
- });
-
- this.getNotificationForwards(transaction);
- }).catch((error) => {
- this.createNotificationError({
- title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
- message: error.message
- });
- }).finally(() => {
- this.$nextTick().then(() => {
- this.$emit('reload')
- });
- });
- },
- can(permission) {
- try {
- return this.acl.can(permission);
- } catch(e) {
- return true;
- }
- },
- reloadEntityData() {
- this.$emit('reload-entity-data');
- },
- getPayoneCardType(transaction) {
- let cardType = transaction.extensions.payonePaymentOrderTransactionData?.additionalData?.card_type;
+ notificationForwardRepository() {
+ return this.repositoryFactory.create('payone_payment_notification_forward');
+ },
- return cardType ? this.$tc('sw-order.payone-payment.creditCard.cardTypes.' + cardType) : null;
+ notificationTargetColumns() {
+ return [{
+ property: 'txaction',
+ type: 'text',
+ width: '100px'
+ }, {
+ property: 'notificationTarget.url',
+ type: 'text',
+ }, {
+ property: 'response',
+ width: '100px'
+ }, {
+ property: 'updatedAt',
+ align: 'right',
+ type: 'date'
+ }];
+ },
},
- }
+
+ methods: {
+ isPayoneTransaction(transaction) {
+ if (!transaction.extensions || !transaction.extensions.payonePaymentOrderTransactionData || !transaction.extensions.payonePaymentOrderTransactionData.transactionId) {
+ return false;
+ }
+
+ return transaction.extensions.payonePaymentOrderTransactionData.transactionId;
+ },
+
+ isActiveTransaction(transaction) {
+ return transaction.stateMachineState.technicalName !== 'cancelled';
+ },
+
+ hasNotificationForwards(transaction) {
+ if (this.notificationForwards === null) {
+ this.getNotificationForwards(transaction);
+ return false;
+ }
+
+ return this.notificationForwards.length > 0;
+ },
+
+ getNotificationForwards(transaction) {
+ const criteria = new Criteria();
+ criteria.addAssociation('notificationTarget');
+ criteria.addSorting(Criteria.sort('updatedAt', 'DESC', true));
+ criteria.addFilter(Criteria.equals('transactionId', transaction.id));
+ criteria.setLimit(500);
+
+ return this.notificationForwardRepository.search(criteria, Shopware.Context.api)
+ .then((searchResult) => {
+ this.notificationForwards = searchResult;
+ });
+ },
+
+ requeue(notificationForward, transaction) {
+ const request = {
+ notificationForwardId: notificationForward.id
+ };
+
+ this.PayonePaymentService.requeueNotificationForward(request).then(() => {
+ this.createNotificationSuccess({
+ title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
+ message: this.$tc('payonePayment.notificationTarget.messages.success')
+ });
+
+ this.getNotificationForwards(transaction);
+ }).catch((error) => {
+ this.createNotificationError({
+ title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
+ message: error.message
+ });
+ }).finally(() => {
+ this.$nextTick().then(() => {
+ this.$emit('reload')
+ });
+ });
+ },
+
+ can(permission) {
+ try {
+ return this.acl.can(permission);
+ } catch (e) {
+ return true;
+ }
+ },
+
+ reloadEntityData() {
+ this.$emit('reload-entity-data');
+ },
+
+ getPayoneCardType(transaction) {
+ let cardType = transaction.extensions.payonePaymentOrderTransactionData?.additionalData?.card_type;
+
+ return cardType ? this.$tc('sw-order.payone-payment.creditCard.cardTypes.' + cardType) : null;
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
index 454eee43e..a048a91f9 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
@@ -55,7 +55,7 @@
table>
- {{ item.updatedAt| date({ hour: '2-digit', minute: '2-digit' }) }}
+ {{ dateFilter(item.updatedAt, { hour: '2-digit', minute: '2-digit' }) }}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
index 1cfc3dd80..0bb381ae8 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
@@ -1,100 +1,142 @@
import template from './payone-payment-order-action-log.html.twig';
-const { Criteria } = Shopware.Data;
+const {Criteria} = Shopware.Data;
+const { Filter } = Shopware;
export default {
- template,
+ template,
- inject: ['repositoryFactory'],
+ inject: ['repositoryFactory'],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- orderActionLogs: [],
- isLoading: false,
- showRequestDetails: null,
- showResponseDetails: null,
- };
- },
-
- computed: {
- orderActionLogRepository() {
- return this.repositoryFactory.create('payone_payment_order_action_log');
- },
- orderActionLogColumns() {
- return [
- { property: 'transactionId', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleTransactionId') },
- { property: 'request', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequest') },
- { property: 'response', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleResponse') },
- { property: 'amount', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleAmount') },
- { property: 'requestDateTime', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime') },
- ];
- },
- keyValueColumns() {
- return [
- { property: 'key', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleKey') },
- { property: 'value', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleValue') },
- ];
+
+ data() {
+ return {
+ orderActionLogs: [],
+ isLoading: false,
+ showRequestDetails: null,
+ showResponseDetails: null,
+ };
},
- },
- created() {
- this.createdComponent();
- },
+ computed: {
+ orderActionLogRepository() {
+ return this.repositoryFactory.create('payone_payment_order_action_log');
+ },
- methods: {
- createdComponent() {
- this.getOrderActionLogs();
- },
- reloadActionLogs() {
- this.getOrderActionLogs();
- },
- getOrderActionLogs() {
- const criteria = new Criteria();
- criteria.addFilter(Criteria.equals('orderId', this.order.id));
- criteria.addSorting(Criteria.sort('requestDateTime', 'ASC', true));
-
- this.isLoading = true;
- return this.orderActionLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
- this.orderActionLogs = searchResult;
- this.isLoading = false;
- });
- },
- openRequest(orderActionLog) {
- this.showRequestDetails = orderActionLog.requestDetails;
- },
- openResponse(orderActionLog) {
- this.showResponseDetails = orderActionLog.responseDetails;
- },
- onCloseRequestModal() {
- this.showRequestDetails = null;
- },
- onCloseResponseModal() {
- this.showResponseDetails = null;
- },
- toKeyValueSource(object) {
- const data = [];
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- for (const key in object) {
- data.push({key, value: object[key]});
- }
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
- data.sort((a, b) => a.key.localeCompare(b.key));
+ assetFilter() {
+ return Filter.getByName('asset');
+ },
- return data;
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderActionLogColumns() {
+ return [
+ {
+ property: 'transactionId',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleTransactionId')
+ },
+ {
+ property: 'request',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequest')
+ },
+ {
+ property: 'response',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleResponse')
+ },
+ {
+ property: 'amount',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleAmount')
+ },
+ {
+ property: 'requestDateTime',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime')
+ },
+ ];
+ },
+
+ keyValueColumns() {
+ return [
+ {property: 'key', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleKey')},
+ {property: 'value', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleValue')},
+ ];
+ },
},
- downloadAsTxt(object, objectType, id) {
- const link = document.createElement('a');
- link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
- link.download = `PAYONE-${objectType}-${id}.txt`;
- link.dispatchEvent(new MouseEvent('click'));
- link.remove();
+
+ created() {
+ this.createdComponent();
},
- }
+
+ methods: {
+ createdComponent() {
+ this.getOrderActionLogs();
+ },
+
+ reloadActionLogs() {
+ this.getOrderActionLogs();
+ },
+
+ getOrderActionLogs() {
+ const criteria = new Criteria();
+ criteria.addFilter(Criteria.equals('orderId', this.order.id));
+ criteria.addSorting(Criteria.sort('requestDateTime', 'ASC', true));
+
+ this.isLoading = true;
+ return this.orderActionLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
+ this.orderActionLogs = searchResult;
+ this.isLoading = false;
+ });
+ },
+
+ openRequest(orderActionLog) {
+ this.showRequestDetails = orderActionLog.requestDetails;
+ },
+
+ openResponse(orderActionLog) {
+ this.showResponseDetails = orderActionLog.responseDetails;
+ },
+
+ onCloseRequestModal() {
+ this.showRequestDetails = null;
+ },
+
+ onCloseResponseModal() {
+ this.showResponseDetails = null;
+ },
+
+ toKeyValueSource(object) {
+ const data = [];
+
+ for (const key in object) {
+ data.push({key, value: object[key]});
+ }
+
+ data.sort((a, b) => a.key.localeCompare(b.key));
+
+ return data;
+ },
+
+ downloadAsTxt(object, objectType, id) {
+ const link = document.createElement('a');
+ link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
+ link.download = `PAYONE-${objectType}-${id}.txt`;
+ link.dispatchEvent(new MouseEvent('click'));
+ link.remove();
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
index 5c35b3c35..a6cf40438 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
@@ -12,11 +12,11 @@
:isLoading="isLoading"
>
- {{ (item.amount / 100) | currency(order.currency.isoCode) }}
+ {{ currencyFilter(item.amount / 100, order.currency.isoCode) }}
- {{ item.requestDateTime | date }}
+ {{ dateFilter(item.requestDateTime, { hour: '2-digit', minute: '2-digit' }) }}
@@ -76,7 +76,7 @@
>
![]()
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
index 9e0cc1e33..86241b10a 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
@@ -1,93 +1,125 @@
import template from './payone-payment-webhook-log.html.twig';
-const { Criteria } = Shopware.Data;
+const {Criteria} = Shopware.Data;
+const { Filter } = Shopware;
export default {
- template,
+ template,
- inject: ['repositoryFactory'],
+ inject: ['repositoryFactory'],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- webhookLogs: [],
- isLoading: false,
- showWebhookDetails: null,
- };
- },
-
- computed: {
- webhookLogRepository() {
- return this.repositoryFactory.create('payone_payment_webhook_log');
- },
- webhookLogColumns() {
- return [
- { property: 'transactionId', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionId') },
- { property: 'transactionState', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionState') },
- { property: 'sequenceNumber', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleSequenceNumber') },
- { property: 'clearingType', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleClearingType') },
- { property: 'webhookDateTime', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime') },
- ];
- },
- keyValueColumns() {
- return [
- { property: 'key', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleKey') },
- { property: 'value', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleValue') },
- ];
+
+ data() {
+ return {
+ webhookLogs: [],
+ isLoading: false,
+ showWebhookDetails: null,
+ };
},
- },
- created() {
- this.createdComponent();
- },
+ computed: {
+ webhookLogRepository() {
+ return this.repositoryFactory.create('payone_payment_webhook_log');
+ },
- methods: {
- createdComponent() {
- this.getWebhookLogs();
- },
- reloadWebhookLogs() {
- this.getWebhookLogs();
- },
- getWebhookLogs() {
- const criteria = new Criteria();
- criteria.addFilter(Criteria.equals('orderId', this.order.id));
- criteria.addSorting(Criteria.sort('webhookDateTime', 'ASC', true));
-
- this.isLoading = true;
- return this.webhookLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
- this.webhookLogs = searchResult;
- this.isLoading = false;
- });
- },
- openDetails(webhookLog) {
- this.showWebhookDetails = webhookLog.webhookDetails;
- },
- onCloseWebhookModal() {
- this.showWebhookDetails = null;
- },
- toKeyValueSource(object) {
- const data = [];
+ assetFilter() {
+ return Filter.getByName('asset');
+ },
- for (const key in object) {
- data.push({key, value: object[key]});
- }
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- data.sort((a, b) => a.key.localeCompare(b.key));
+ webhookLogColumns() {
+ return [
+ {
+ property: 'transactionId',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionId')
+ },
+ {
+ property: 'transactionState',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionState')
+ },
+ {
+ property: 'sequenceNumber',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleSequenceNumber')
+ },
+ {
+ property: 'clearingType',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleClearingType')
+ },
+ {
+ property: 'webhookDateTime',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime')
+ },
+ ];
+ },
- return data;
+ keyValueColumns() {
+ return [
+ {property: 'key', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleKey')},
+ {property: 'value', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleValue')},
+ ];
+ },
},
- downloadAsTxt(object, objectType, id) {
- const link = document.createElement('a');
- link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
- link.download = `PAYONE-${objectType}-${id}.txt`;
- link.dispatchEvent(new MouseEvent('click'));
- link.remove();
+
+ created() {
+ this.createdComponent();
},
- }
+
+ methods: {
+ createdComponent() {
+ this.getWebhookLogs();
+ },
+
+ reloadWebhookLogs() {
+ this.getWebhookLogs();
+ },
+
+ getWebhookLogs() {
+ const criteria = new Criteria();
+ criteria.addFilter(Criteria.equals('orderId', this.order.id));
+ criteria.addSorting(Criteria.sort('webhookDateTime', 'ASC', true));
+
+ this.isLoading = true;
+ return this.webhookLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
+ this.webhookLogs = searchResult;
+ this.isLoading = false;
+ });
+ },
+
+ openDetails(webhookLog) {
+ this.showWebhookDetails = webhookLog.webhookDetails;
+ },
+
+ onCloseWebhookModal() {
+ this.showWebhookDetails = null;
+ },
+
+ toKeyValueSource(object) {
+ const data = [];
+
+ for (const key in object) {
+ data.push({key, value: object[key]});
+ }
+
+ data.sort((a, b) => a.key.localeCompare(b.key));
+
+ return data;
+ },
+
+ downloadAsTxt(object, objectType, id) {
+ const link = document.createElement('a');
+ link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
+ link.download = `PAYONE-${objectType}-${id}.txt`;
+ link.dispatchEvent(new MouseEvent('click'));
+ link.remove();
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
index aee3c5d47..39618ef2d 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
@@ -12,7 +12,7 @@
:isLoading="isLoading"
>
- {{ item.webhookDateTime | date({ hour: '2-digit', minute: '2-digit' }) }}
+ {{ dateFilter(item.webhookDateTime, { hour: '2-digit', minute: '2-digit' }) }}
@@ -51,7 +51,7 @@
>
![]()
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
index 5f34e1581..f6c51a4c9 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
@@ -1,7 +1,7 @@
import template from './payone-refund-button.html.twig';
import './payone-refund-button.scss';
-const { Mixin } = Shopware;
+const {Mixin, Filter} = Shopware;
export default {
template,
@@ -29,13 +29,25 @@ export default {
hasError: false,
showRefundModal: false,
isRefundSuccessful: false,
- selection: [],
refundAmount: 0.0,
- includeShippingCosts: false
+ includeShippingCosts: false,
+ items: [],
};
},
computed: {
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
+
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderTotalPrice() {
+ return this.transaction.amount.totalPrice;
+ },
+
decimalPrecision() {
if (!this.order || !this.order.currency) {
return 2;
@@ -48,37 +60,36 @@ export default {
}
},
- remainingAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount) {
- return 0;
- }
-
- return this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount - this.refundedAmount;
+ transactionData() {
+ return this.transaction?.extensions?.payonePaymentOrderTransactionData ?? {
+ capturedAmount: 0,
+ refundedAmount: 0,
+ allowRefund: false
+ };
},
- refundedAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount) {
- return 0;
- }
+ capturedAmount() {
+ return this.toFixedPrecision((this.transaction?.extensions?.payonePaymentOrderTransactionData?.capturedAmount ?? 0) / 100);
+ },
- return this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount;
+ remainingAmount() {
+ return (this.transactionData.capturedAmount ?? 0) - (this.transactionData.refundedAmount ?? 0);
},
- maxRefundAmount() {
- return this.remainingAmount / (10 ** this.decimalPrecision);
+ refundedAmount() {
+ return this.transactionData.refundedAmount ?? 0;
},
buttonEnabled() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData) {
+ if (!this.transaction?.extensions?.payonePaymentOrderTransactionData) {
return false;
}
- return (this.remainingAmount > 0 && this.refundedAmount > 0) || this.transaction.extensions.payonePaymentOrderTransactionData.allowRefund;
+ return this.remainingAmount > 0 || this.transactionData.allowRefund;
+ },
+
+ selectedItems() {
+ return this.items.filter(item => item.selected && item.quantity > 0);
},
hasRemainingRefundableShippingCosts() {
@@ -86,46 +97,59 @@ export default {
return false;
}
- const shippingCosts = this.order.shippingCosts.totalPrice * (10 ** this.decimalPrecision);
-
- let refundedPositionAmount = 0;
-
- this.order.lineItems.forEach((order_item) => {
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- refundedPositionAmount += order_item.customFields.payone_refunded_quantity * order_item.unitPrice * (10 ** this.decimalPrecision);
- }
- });
-
- if (this.refundedAmount - Math.round(refundedPositionAmount) >= shippingCosts) {
- return false;
- }
-
- return true;
+ return this.toFixedPrecision(this.refundedAmount + this.order.shippingCosts.totalPrice) <= this.capturedAmount;
}
},
methods: {
- calculateRefundAmount() {
+ toFixedPrecision(value) {
+ return Math.round(value * (10 ** this.decimalPrecision)) / (10 ** this.decimalPrecision);
+ },
+
+ calculateActionAmount() {
let amount = 0;
- this.selection.forEach((selection) => {
- if (selection.selected) {
- amount += selection.unit_price * selection.quantity;
- }
+ this.selectedItems.forEach((selection) => {
+ amount += selection.unit_price * selection.quantity;
});
- if (Math.round(amount * (10 ** this.decimalPrecision) > this.remainingAmount)) {
- amount = this.remainingAmount / (10 ** this.decimalPrecision)
- }
-
- this.refundAmount = amount;
+ this.refundAmount = this.toFixedPrecision(amount > this.remainingAmount ? this.remainingAmount : amount);
},
openRefundModal() {
this.showRefundModal = true;
this.isRefundSuccessful = false;
- this.selection = [];
+ this.initItems();
+ },
+
+ initItems() {
+ this.items = this.order.lineItems.map((orderItem) => {
+ // note: if the order got captured during the payment (direct authorize instead of pre-authorize), the field `payone_captured_quantity` will be empty.
+ // in this case we are using the ordered quantity
+ const qty = this.getRefundableQuantityOfItem(orderItem);
+
+ return {
+ id: orderItem.id,
+ quantity: qty,
+ maxQuantity: qty,
+ unit_price: orderItem.unitPrice,
+ selected: false,
+ product: orderItem.label,
+ disabled: qty <= 0,
+ };
+ });
+
+ if (this.order.shippingCosts.totalPrice > 0) {
+ this.items.push({
+ id: 'shipping',
+ quantity: 1,
+ maxQuantity: 1,
+ unit_price: this.order.shippingCosts.totalPrice,
+ selected: false,
+ disabled: false,
+ product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
+ });
+ }
},
closeRefundModal() {
@@ -146,49 +170,35 @@ export default {
complete: this.refundAmount === this.maxRefundAmount,
includeShippingCosts: false
};
+
this.isLoading = true;
- this.selection.forEach((selection) => {
- this.order.lineItems.forEach((order_item) => {
- if (order_item.id === selection.id && selection.selected && 0 < selection.quantity) {
- const copy = { ...order_item },
- taxRate = copy.tax_rate / (10 ** this.decimalPrecision);
+ this.selectedItems.forEach((selection) => {
+ if (selection.id === 'shipping') {
+ request.includeShippingCosts = true;
+ } else {
+ const orderLineItem = this.order.lineItems.find(lineItem => lineItem.id === selection.id);
+ if (orderLineItem) {
+ const copy = {...orderLineItem};
- copy.quantity = selection.quantity;
- copy.total_amount = copy.unit_price * copy.quantity;
- copy.total_tax_amount = Math.round(copy.total_amount / (100 + taxRate) * taxRate);
+ copy.quantity = selection.quantity;
+ copy.total_amount = copy.unit_price * copy.quantity;
+ copy.total_tax_amount = copy.total_amount - (copy.total_amount / (1 + (copy.tax_rate / 100)));
request.orderLines.push(copy);
}
- });
-
- if (selection.id === 'shipping' && selection.selected && 0 < selection.quantity) {
- request.includeShippingCosts = true;
}
});
- this.PayonePaymentService.refundPayment(request).then(() => {
- this.createNotificationSuccess({
- title: this.$tc('sw-order.payone-payment.refund.successTitle'),
- message: this.$tc('sw-order.payone-payment.refund.successMessage')
- });
-
- this.isRefundSuccessful = true;
- }).catch((error) => {
- this.createNotificationError({
- title: this.$tc('sw-order.payone-payment.refund.errorTitle'),
- message: error.message
- });
+ if (this.remainingAmount < request.amount) {
+ request.amount = this.remainingAmount;
+ }
- this.isRefundSuccessful = false;
- }).finally(() => {
- this.isLoading = false;
- this.closeRefundModal();
+ this.executeRefund(request);
+ },
- this.$nextTick().then(() => {
- this.$emit('reload')
- });
- });
+ getRefundableQuantityOfItem(orderItem) {
+ return (orderItem.customFields?.payone_captured_quantity ?? orderItem.quantity) - (orderItem.customFields?.payone_refunded_quantity ?? 0);
},
refundFullOrder() {
@@ -204,22 +214,19 @@ export default {
this.isLoading = true;
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
-
- request.orderLines.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
+ request.orderLines = this.order.lineItems.map((orderItem) => {
+ return {
+ id: orderItem.id,
+ quantity: this.getRefundableQuantityOfItem(orderItem),
+ unit_price: orderItem.unitPrice,
selected: false
- });
+ };
});
+ this.executeRefund(request);
+ },
+
+ executeRefund(request) {
this.PayonePaymentService.refundPayment(request).then(() => {
this.createNotificationSuccess({
title: this.$tc('sw-order.payone-payment.refund.successTitle'),
@@ -243,60 +250,13 @@ export default {
});
});
},
-
- onSelectItem(id, selected) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.selected = selected;
- }
- });
-
- this.calculateRefundAmount();
- },
-
- onChangeQuantity(id, quantity) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.quantity = quantity;
- }
- });
-
- this.calculateRefundAmount();
- },
-
- _populateSelectionProperty() {
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
-
- this.selection.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
- selected: false
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- this.selection.push({
- id: 'shipping',
- quantity: 1,
- unit_price: this.order.shippingCosts.totalPrice,
- selected: false
- });
- }
+ },
+ watch: {
+ items: {
+ handler() {
+ this.calculateActionAmount();
+ },
+ deep: true,
}
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
index e2a48b8cf..3d7b640c4 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
@@ -7,27 +7,21 @@
-
-
+
-
+
-
+
{{ $tc('sw-order.payone-payment.modal.close') }}
diff --git a/src/Resources/app/administration/src/module/sw-order/index.js b/src/Resources/app/administration/src/module/sw-order/index.js
index 795b30aa2..f3a78b1d0 100644
--- a/src/Resources/app/administration/src/module/sw-order/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/index.js
@@ -7,7 +7,6 @@ Shopware.Component.register('payone-refund-button', () => import('./component/pa
Shopware.Component.register('sw-order-detail-payone', () => import('./view/sw-order-detail-payone'));
Shopware.Component.override('sw-order-detail', () => import('./page/sw-order-detail'));
-Shopware.Component.extend('payone-data-grid', 'sw-data-grid', () => import('./component/payone-data-grid'));
Shopware.Module.register('sw-order-detail-tab-payone', {
routeMiddleware(next, currentRoute) {
diff --git a/src/Resources/app/administration/src/package-lock.json b/src/Resources/app/administration/src/package-lock.json
new file mode 100644
index 000000000..6108d470d
--- /dev/null
+++ b/src/Resources/app/administration/src/package-lock.json
@@ -0,0 +1,13 @@
+{
+ "name": "payonepayment",
+ "version": "1.0.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "payonepayment",
+ "version": "1.0.0",
+ "license": "MIT"
+ }
+ }
+}
diff --git a/src/Resources/app/storefront/.gitignore b/src/Resources/app/storefront/.gitignore
new file mode 100644
index 000000000..aeaadcb14
--- /dev/null
+++ b/src/Resources/app/storefront/.gitignore
@@ -0,0 +1,3 @@
+/cypress.config.js
+/cypress/screenshots/
+/node_modules/
diff --git a/src/Resources/app/storefront/cypress.config.js.dist b/src/Resources/app/storefront/cypress.config.js.dist
new file mode 100644
index 000000000..ff183e123
--- /dev/null
+++ b/src/Resources/app/storefront/cypress.config.js.dist
@@ -0,0 +1,31 @@
+const {defineConfig} = require('cypress')
+const tasks= require('./cypress/support/tasks') ;
+
+module.exports = defineConfig({
+ chromeWebSecurity: false,
+ experimentalModifyObstructiveThirdPartyCode: true,
+ e2e: {
+ baseUrl: 'https://localhost:8080',
+ experimentalRunAllSpecs: true,
+ setupNodeEvents(on, config) {
+ on('task', tasks)
+ },
+ },
+ env: {
+ username: 'admin',
+ password: 'admin123',
+ apiPath: "api",
+ admin: "/admin",
+ locale: "en-GB",
+ salesChannelName: "Storefront",
+
+ paypalMail: 'test-buyer@localhost.local',
+ paypalPassword: '123456',
+
+ paymentMethodSecuredPortalId: '12345456',
+ paymentMethodSecuredPortalKey: 'abcdefgh',
+
+ paymentMethodAmazonPayMerchantId: 'AIJXXXXXX',
+ }
+})
+
diff --git a/src/Resources/app/storefront/cypress/commands/checkout.js b/src/Resources/app/storefront/cypress/commands/checkout.js
new file mode 100644
index 000000000..53b60ba3c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/checkout.js
@@ -0,0 +1,67 @@
+Cypress.Commands.add('preparePaymentCheckout', (paymentMethodId, userData = {}, context = {}) => {
+ return cy.addProductToCart()
+ .then(() => cy.checkoutRegister(userData))
+ .then(() => cy.allowCurrencyForSalesChannel(context.currencyIso ?? 'EUR'))
+ .then(() => cy.selectPaymentMethod(paymentMethodId));
+});
+
+Cypress.Commands.add('selectPaymentMethod', (paymentMethodUuid) => {
+ cy.allowPaymentMethod(paymentMethodUuid).then(() => {
+ // navigate to checkout-confirm and select payment method
+ cy.visit('/checkout/confirm');
+ cy.get('[type="radio"][name="paymentMethodId"]').check(paymentMethodUuid, {
+ force: true, // we will force selecting the value, because shopware may hide the option behind "show more"
+ });
+ });
+});
+
+function testFinishPage(asyncProcess) {
+ if (typeof asyncProcess === 'function') {
+ return asyncProcess().then(() => {
+ cy.url({
+ timeout: 20000 // higher timeout is for a few payment methods which does have longer background tasks
+ }).should('contain', '/checkout/finish')
+ })
+ }
+ cy.url().should('contain', '/checkout/finish');
+}
+
+Cypress.Commands.add('checkoutConfirmAndComplete', (fillDataTests, asyncProcess) => {
+ cy.url().should('match', /((checkout\/(confirm|order))|account\/order)/); // account/order is only a fal
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+
+ return testFinishPage(asyncProcess);
+});
+
+Cypress.Commands.add('checkoutConfirmAfterCancelAndComplete', (fillDataTests, asyncProcess) => {
+ cy.url().should('contain', 'account/order/edit');
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#confirmOrderForm button[type=submit]').click();
+
+ return testFinishPage(asyncProcess);
+});
+
+Cypress.Commands.add('checkoutConfirmAndCancel', (fillDataTests, asyncProcess) => {
+ cy.url().should('contain', '/checkout/confirm');
+ cy.get('#tos').check();
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#confirmFormSubmit').click();
+
+ return asyncProcess().then(() => {
+ cy.url().should('contain', '/account/order/edit')
+ });
+});
+
+Cypress.Commands.add('checkoutConfirmFailValidation', (fillDataTests, testForErrors) => {
+ cy.url().should('contain', 'checkout/confirm');
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+
+ cy.url().should('match', /checkout\/(confirm|order)/);
+ cy.get('.alert-danger[role=alert]').get('.alert-content').should('not.contain.text', 'error.VIOLATION::');
+
+ typeof testForErrors === 'function' ? testForErrors() : null;
+});
diff --git a/src/Resources/app/storefront/cypress/commands/customer.js b/src/Resources/app/storefront/cypress/commands/customer.js
new file mode 100644
index 000000000..535617b6d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/customer.js
@@ -0,0 +1,42 @@
+Cypress.Commands.add('checkoutRegister', (customerData = {}, inCheckout = true) => {
+ customerData.countryIso ??= 'DE';
+ customerData.guest ??= true;
+
+ if (!inCheckout) {
+ customerData.guest = false;
+ }
+
+ return cy.allowCountryForSalesChannel(customerData.countryIso).then((countryId) => {
+ if (inCheckout) {
+ cy.visit('/checkout/register');
+ } else {
+ cy.visit('/account/login');
+ }
+ cy.get('#personalSalutation').select(1);
+
+ cy.get('#personalFirstName').type(customerData.firstName ?? 'Payone');
+ cy.get('#personalLastName').type(customerData.lastName ?? 'Testbuyer');
+
+ const mail = customerData.mail ?? 'demo+' + (new Date()).getTime() + '@payone.demo';
+ cy.get('#personalMail').type(mail);
+
+ cy.get('#billingAddressAddressStreet').type(customerData.street ?? 'Demostreet 12');
+ cy.get('#billingAddressAddressZipcode').type(customerData.zipcode ?? '12345');
+ cy.get('#billingAddressAddressCity').type(customerData.city ?? 'Democity');
+
+ cy.get('#billingAddressAddressCountry').select(countryId);
+
+ cy.get('#personalPassword').then((el) => {
+ const isPasswordVisible = el?.is(':visible');
+ if ((customerData.guest && isPasswordVisible) || !customerData.guest && !isPasswordVisible) {
+ cy.get('#personalGuest').click()
+ }
+ });
+
+ if (!customerData.guest) {
+ cy.get('#personalPassword').type(mail);
+ }
+
+ cy.get('.register-submit > button').click()
+ })
+});
diff --git a/src/Resources/app/storefront/cypress/commands/override-shopware.js b/src/Resources/app/storefront/cypress/commands/override-shopware.js
new file mode 100644
index 000000000..5436f0dcd
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/override-shopware.js
@@ -0,0 +1,59 @@
+
+function getAuthCookieValue() {
+ return cy.getCookie('bearerAuth', {log: false}).then((cookie) => {
+ return cookie ? JSON.parse(decodeURIComponent(cookie.value)) : null;
+ });
+}
+
+Cypress.Commands.overwrite('getBearerAuth', () => {
+ return validateAdminAuthenticationCookie().then((res) => {
+ return !res ? cy.authenticate() : getAuthCookieValue();
+ })
+});
+
+Cypress.Commands.overwrite('authenticate', () => {
+ return cy.request(
+ 'POST',
+ '/api/oauth/token',
+ {
+ grant_type: Cypress.env('grant') ? Cypress.env('grant') : 'password',
+ client_id: Cypress.env('client_id') ? Cypress.env('client_id') : 'administration',
+ scopes: Cypress.env('scope') ? Cypress.env('scope') : 'write',
+ username: Cypress.env('username') || Cypress.env('user') || 'admin',
+ password: Cypress.env('password') || Cypress.env('pass') || 'shopware'
+ }
+ ).then((responseData) => {
+ let result = responseData.body;
+ result.access = result.access_token;
+ result.refresh = result.refresh_token;
+ result.expiry = Math.round(+new Date() / 1000) + result.expires_in;
+
+ return cy.setCookie(
+ 'bearerAuth',
+ JSON.stringify(result),
+ {
+ path: Cypress.env('admin'),
+ sameSite: "strict",
+ log: false
+ }
+ ).then(() => getAuthCookieValue());
+ });
+});
+
+function validateAdminAuthenticationCookie() {
+ return getAuthCookieValue().then(cookieValue => {
+ if (!cookieValue || cookieValue.expiry <= ((new Date().getTime()) / 1000)) {
+ cy.clearCookie('bearerAuth');
+ return false;
+ }
+
+ return cy.request({
+ method: 'GET',
+ url: '/api/_info/version',
+ failOnStatusCode: true,
+ headers: {
+ Authorization: `Bearer ${cookieValue.access}`
+ },
+ }).then(() => true);
+ });
+}
diff --git a/src/Resources/app/storefront/cypress/commands/product.js b/src/Resources/app/storefront/cypress/commands/product.js
new file mode 100644
index 000000000..b7053bd24
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/product.js
@@ -0,0 +1,78 @@
+const {v4: uuid} = require('uuid');
+
+Cypress.Commands.add('getDefaultProductId', () => {
+ return cy.task('getFromGlobalStore', 'productId').then(productId => {
+ if (productId) {
+ return productId
+ }
+
+ productId = uuid().replace(/-/g, '');
+
+ const productNumber = 'payone-cypress-storefront-test';
+
+ cy.searchViaAdminApi({
+ endpoint: 'product',
+ data: {
+ field: 'productNumber',
+ value: productNumber
+ }
+ }).then((product) => {
+ if (product?.id) {
+ return product.id;
+ }
+
+ return cy.searchViaAdminApi({
+ endpoint: 'currency',
+ data: {
+ field: 'isoCode',
+ value: 'EUR'
+ }
+ }).then(currency => {
+ return cy.searchViaAdminApi({
+ endpoint: 'tax',
+ data: {field: 'name', value: 'Standard rate'}
+ }).then(taxData => [currency.id, taxData.id]);
+ }).then(([currencyId, taxId]) => {
+ return cy.getSalesChannel()
+ .then((salesChannelData) => [currencyId, taxId, salesChannelData.id])
+ }).then(([currencyId, taxId, salesChannelId]) => {
+ return cy.createViaAdminApi({
+ endpoint: 'product',
+ data: {
+ id: productId,
+ name: productNumber,
+ productNumber: productNumber,
+ stock: 10,
+ taxId: taxId,
+ price: [{
+ currencyId: currencyId,
+ gross: 300,
+ net: 300 / 1.19,
+ linked: false
+ }],
+ visibilities: [{
+ salesChannelId: salesChannelId,
+ visibility: 30
+ }]
+ }
+ });
+ })
+ }).then((productId) => {
+ return cy.task('addToGlobalStore', {key: 'productId', value: productId});
+ });
+ });
+});
+
+Cypress.Commands.add('addProductToCart', () => {
+ return cy.getDefaultProductId().then(productId => {
+ cy.visit('/detail/' + productId);
+
+ cy.intercept({method: 'POST', url: '*checkout/line-item/add*'}).as('addProduct');
+ cy.intercept({method: 'GET', url: '*widgets/checkout/info*'}).as('ajaxCart');
+
+ cy.get('.btn.btn-primary.btn-buy').click();
+ cy.wait('@addProduct');
+ cy.wait('@ajaxCart');
+ cy.visit('/checkout/cart/');
+ });
+});
diff --git a/src/Resources/app/storefront/cypress/commands/sales-channel.js b/src/Resources/app/storefront/cypress/commands/sales-channel.js
new file mode 100644
index 000000000..1fb3abc8b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/sales-channel.js
@@ -0,0 +1,117 @@
+Cypress.Commands.add('getSalesChannel', () => {
+ const salesChannel = window.localStorage.getItem('salesChannel');
+ if (salesChannel) {
+ return JSON.parse(salesChannel);
+ }
+
+ return cy.searchViaAdminApi({
+ data: {
+ field: 'name',
+ value: Cypress.env('salesChannelName')
+ },
+ endpoint: 'sales-channel'
+ }).then((salesChannel) => {
+ window.localStorage.setItem('salesChannel', JSON.stringify(salesChannel));
+ return salesChannel;
+ });
+});
+
+Cypress.Commands.add('allowCountryForSalesChannel', (isoCode) => {
+ return cy.task('getAllowedCountryId', isoCode).then((countryId) => {
+ if (countryId) {
+ return countryId;
+ }
+
+ return cy.getSalesChannel().then((salesChannel) => {
+ cy.searchViaAdminApi({
+ endpoint: 'country',
+ data: {
+ field: 'iso',
+ value: isoCode
+ }
+ }).then((country) => {
+ return cy.updateViaAdminApi('sales-channel', salesChannel.id, {
+ data: {
+ countries: [{
+ id: country.id
+ }]
+ }
+ }).then(() => {
+ return cy.task('addAllowedCountry', {isoCode: isoCode, id: country.id})
+ }).then(() => country.id)
+ })
+ })
+ })
+});
+
+Cypress.Commands.add('allowCurrencyForSalesChannel', (isoCode) => {
+ return cy.task('getAllowedCurrencyId', isoCode).then((currencyId) => {
+ if (currencyId) {
+ return currencyId;
+ }
+
+ const allowedCurrencies = JSON.parse(window.localStorage.getItem('allowedCurrencies') ?? '{}');
+ if (allowedCurrencies[isoCode] ?? false) {
+ return allowedCurrencies[isoCode];
+ }
+
+ return cy.getSalesChannel().then((salesChannel) => {
+ cy.searchViaAdminApi({
+ endpoint: 'currency',
+ data: {
+ field: 'isoCode',
+ value: isoCode
+ }
+ }).then((currency) => {
+ return cy.updateViaAdminApi('sales-channel', salesChannel.id, {
+ data: {
+ currencies: [{
+ id: currency.id
+ }]
+ }
+
+ }).then(() => {
+ return cy.task('addAllowedCurrency', {isoCode: isoCode, id: currency.id})
+ })
+ })
+ })
+ }).then(() => {
+ cy.visit('/'); // navigate to home, to make sure dropdown is visible
+ cy.get('body').then($body => {
+ if ($body.find('.top-bar .currencies-menu').length) {
+ cy.get('.top-bar .currencies-menu > .dropdown-toggle').click();
+ cy.get('.top-bar .currencies-menu [title="' + isoCode + '"]').click();
+ }
+ });
+ })
+});
+
+Cypress.Commands.add('allowPaymentMethod', (paymentMethodUuid) => {
+ return cy.task('isPaymentMethodAllowed', paymentMethodUuid).then(isAllowed => {
+ if (isAllowed) {
+ return;
+ }
+
+ return cy.getSalesChannel().then(salesChannelData => {
+ // make sure that payment method is enabled in sales-channel
+ return cy.updateViaAdminApi('sales-channel', salesChannelData.id, {
+ data: {
+ id: salesChannelData.id,
+ paymentMethods: [{
+ id: paymentMethodUuid
+ }]
+ }
+ });
+ }).then(() => {
+ // make sure that payment method is enabled
+ return cy.updateViaAdminApi('payment-method', paymentMethodUuid, {
+ data: {
+ id: paymentMethodUuid,
+ active: true
+ }
+ });
+ }).then(() => cy.task('addAllowedPaymentMethod', paymentMethodUuid))
+ })
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/commands/shopware-configuration.js b/src/Resources/app/storefront/cypress/commands/shopware-configuration.js
new file mode 100644
index 000000000..44af4a2f5
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/shopware-configuration.js
@@ -0,0 +1,7 @@
+Cypress.Commands.add('setShopwareConfig', (config) => {
+ return cy.requestAdminApi('POST', 'api/_action/system-config/batch', {
+ data: {
+ 'null': config
+ }
+ })
+});
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js
new file mode 100644
index 000000000..5c2a79215
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js
@@ -0,0 +1,30 @@
+describe('Alipay', () => {
+ const PAYMENT_METHOD_ID = 'fef3c750f8e94a6abb7d0a8061ac9faf';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ // .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled. Payment method is not available
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js
new file mode 100644
index 000000000..852606b4b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js
@@ -0,0 +1,61 @@
+import {registerCommands} from '../../helper/amazon';
+
+describe('Amazon Pay Express', () => {
+ const PAYMENT_METHOD_ID = 'd310a86cdaf14dd6b69bcf2b98f23268';
+
+ before(registerCommands);
+
+ beforeEach(() => {
+ cy.viewport(1400, 1400); // amazon pay button is not clickable if it is not visible
+ cy.setShopwareConfig({
+ 'PayonePayment.settings.amazonPayExpressAmazonMerchantId': Cypress.env('paymentMethodAmazonPayMerchantId'),
+ });
+
+ cy.checkoutRegister({}, false);// only required to get a valid context
+
+ cy.allowPaymentMethod(PAYMENT_METHOD_ID);
+ cy.addProductToCart();
+ cy.allowCurrencyForSalesChannel('EUR');
+ });
+
+ it('complete payment', () => {
+ cy.visit('/checkout/cart');
+ cy.get('#AmazonPayExpressButton-cart').click();
+ processPayment();
+ });
+
+ it('complete payment in cart-offcanvas', () => {
+ cy.visit('/');
+ cy.get('.header-cart-btn').click();
+ cy.wait(500) // wait a few seconds to make sure that button is loaded
+ cy.get('#AmazonPayExpressButton-offcanvas').click();
+ processPayment();
+ });
+
+ function processPayment() {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+
+ cy.origin('payments.amazon.de', () => {
+ cy.waitForAmazonLogin();
+ cy.wait(1000);
+ cy.get('#change-address-button').click();
+ cy.get('#change-buyer-details [data-country="DE"]').first().should('be.visible').click();
+ cy.get('[data-action="update-address"] [type="submit"]').click();
+ cy.get('[data-action="continue-checkout"] [type="submit"]').click();
+ });
+
+ cy.window().then(() => {
+ cy.wait(2000);
+ cy.checkoutConfirmAndComplete(() => {
+ // validate if only amazon pay express is visible
+ cy.get('#changePaymentForm .payment-methods .payment-method').should('have.length', 1);
+ cy.get('#changePaymentForm [name="paymentMethodId"]').invoke('val').should('equal', PAYMENT_METHOD_ID);
+ cy.get('a[href*="payone/delete-checkout-data"]').should('be.visible');
+ });
+ });
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js
new file mode 100644
index 000000000..2b4b345ee
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js
@@ -0,0 +1,44 @@
+import {registerCommands, processCheckout} from '../../helper/amazon';
+
+describe('Amazon Pay', () => {
+ const PAYMENT_METHOD_ID = 'ae2b29f0b99d4ba9852063d84d198180';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.amazonPayAmazonMerchantId': Cypress.env('paymentMethodAmazonPayMerchantId'),
+ 'PayonePayment.settings.amazonPayStoreName': 'Test GmbH'
+ }));
+
+ before(registerCommands)
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(fillValidData, processCheckout)));
+
+ it('cancel payment & complete after cancel', (done) => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ fillValidData,
+ () => {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+ cy.origin('payments.amazon.de', () => {
+ cy.get('#return_back_to_merchant_link').click();
+ })
+
+ return Promise.resolve();
+ }
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(fillValidData, done));
+ // it seems that there are problems, if the simulated browser reopen amazon again. Amazon throws an error, that jquery is already registered.
+ // so we will not complete the order, just check if the user is redirected to the amazon pay again, and then we will stop the test
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function fillValidData() {
+ cy.get('#payonePhone').type('0123456789');
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js
new file mode 100644
index 000000000..841d06d8c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js
@@ -0,0 +1,30 @@
+describe('Bancontact', () => {
+ const PAYMENT_METHOD_ID = '32ecec740c7142c9bf51d00ea894ffad';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ // .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled. Payment method is not available
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {countryIso: 'BE'});
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js
new file mode 100644
index 000000000..5e0f1638a
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js
@@ -0,0 +1,72 @@
+describe('Credit Card', () => {
+ const PAYMENT_METHOD_ID = '37f90a48d9194762977c9e6db36334e0';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => cy.checkoutConfirmAndComplete(
+ () => {
+ fillIframe();
+ cy.get('#saveCreditCard').should('not.exist'); // user is a guest user, so the user should not able to save the credit-card
+ }));
+ });
+
+ it('fails with invalid credit card number', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ cy.get('#tos').check();
+ fillIframe('invalid-cc-number')
+ cy.get('#confirmFormSubmit').click();
+ cy.get('#errorOutput');
+ });
+ });
+
+ it('save credit card and reuse it', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ guest: false
+ }).then(() => cy.checkoutConfirmAndComplete(
+ () => {
+ fillIframe();
+ cy.get('#saveCreditCard').check();
+ }));
+
+ cy.visit('account/card/overview');
+ cy.get('.account-payone-card table tbody tr').should('have.length', 1)
+ cy.get('.account-payone-card table tbody tr td:first-child').should('contain.text', '411111');
+ cy.get('.account-payone-card table tbody tr td:last-child a').then($el => {
+ const matches = $el.prop('href').match(/\?pseudoCardPan=(\d+)$/);
+ cy.wrap(matches).should('have.length', 2);
+ cy.wrap(matches[1]).as('creditCardPan');
+ });
+
+ cy.addProductToCart().then(() => cy.selectPaymentMethod(PAYMENT_METHOD_ID));
+
+ cy.checkoutConfirmAndComplete(
+ () => {
+ cy.get('@creditCardPan').then((storedPan) => {
+ cy.get('#savedpseudocardpan').select(storedPan)
+ cy.get('.credit-card-input').should('not.be.visible');
+ })
+ });
+ });
+
+ function fillIframe(iban = '4111111111111111') {
+ setIframeValue('cardpan', 'input', iban);
+ setIframeValue('cardcvc2', 'input', '123');
+ setIframeValue('cardexpiremonth', 'select', 5);
+ setIframeValue('cardexpireyear', 'select', 5);
+ }
+
+ function setIframeValue(id, type, value) {
+ const selector = '#' + id + ' > iframe';
+
+ return cy.frameLoaded(selector, {url: 'https://secure.pay1.de/'})
+ .then(() => cy.enter(selector))
+ .then(getBody => {
+ if (type === 'input') {
+ return getBody().find('#' + id).type(value, {force: true})
+ } else if (type === 'select') {
+ return getBody().find('#' + id).select(value, {force: true})
+ } else {
+ throw new Error('unknown input type ' + type)
+ }
+ })
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js
new file mode 100644
index 000000000..9914a2aae
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js
@@ -0,0 +1,32 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '1b017bef157b4222b734659361d996fd';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid iban', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+ cy.get('#errorOutput');
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#iban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#accountOwner').type('Max Mustermann');
+ }, () => {
+ cy.wait(4000); // wait for register new event listeners TODO verify why this takes so long.
+ cy.get('#accept-mandate').check();
+ cy.get('#mandateSubmit').click();
+ return Promise.resolve();
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js
new file mode 100644
index 000000000..d03bb5438
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js
@@ -0,0 +1,40 @@
+describe('EPS', () => {
+ const PAYMENT_METHOD_ID = '6004c8b082234ba5b2834da9874c5ec7';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'AT',
+ zipcode: 1234
+ }).then(() => epsCheckout);
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'AT',
+ zipcode: 1234
+ }).then(() => {
+ return cy.checkoutConfirmAndCancel(
+ () => cy.get('#epsBankGroup').select('ARZ_HTB'),
+ () => cy.origin('www.banking.co.at', () => {
+ cy.get('[name="cancelSoTransaction"]').click();
+ cy.get('[name="back2Shop"]').click();
+ })
+ ).then(() => epsCheckout);
+ });
+ });
+
+ function epsCheckout() {
+ return cy.checkoutConfirmAndComplete(
+ () => cy.get('#epsBankGroup').select('ARZ_HTB'),
+ () =>
+ cy.origin('www.banking.co.at', () => {
+ cy.get('#verfNr').clear().type(123456);
+ cy.get('#verfPIN').clear().type(12345);
+ cy.get('#sbtnLogin').click();
+ cy.get('#sbtnSign').click();
+ cy.get('[name="zVerf"]').check('MTAN');
+ cy.get('#sbtnSignCollect').click();
+ })
+ );
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js
new file mode 100644
index 000000000..19c40e247
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js
@@ -0,0 +1,14 @@
+describe('iDEAL', () => {
+ const PAYMENT_METHOD_ID = '3f567ad46f1947e3960b66ed3af537aa';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'NL',
+ }).then(() => {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#idealBankGroup').select(3);
+ });
+ });
+ });
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js
new file mode 100644
index 000000000..40da99616
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js
@@ -0,0 +1,13 @@
+import {executeKlarnaCheckout, executeKlarnaCheckoutCancel, customerData} from "../../helper/klarna";
+
+describe('Klarna Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '31af2cbeda5242bfbfe4531e203f8a42';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js
new file mode 100644
index 000000000..cf2521267
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js
@@ -0,0 +1,14 @@
+import {customerData, executeKlarnaCheckout, executeKlarnaCheckoutCancel} from "../../helper/klarna";
+
+describe('Klarna Installment', () => {
+ const PAYMENT_METHOD_ID = 'a18ffddd4baf4948b8c9f9d3d8abd2d4';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js
new file mode 100644
index 000000000..c816abf5a
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js
@@ -0,0 +1,13 @@
+import {executeKlarnaCheckout, executeKlarnaCheckoutCancel, customerData} from "../../helper/klarna";
+
+describe('Klarna Invoice', () => {
+ const PAYMENT_METHOD_ID = 'c4cd059611cc4d049187d8d955ec1f91';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js
new file mode 100644
index 000000000..a1cc3f535
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js
@@ -0,0 +1,9 @@
+describe('Secure Invoice', () => {
+ const PAYMENT_METHOD_ID = '9024aa5a502b4544a745b6b64b486e21';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete();
+ });
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js
new file mode 100644
index 000000000..cc48d7231
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js
@@ -0,0 +1,50 @@
+describe('Paydirekt', () => {
+ const PAYMENT_METHOD_ID = 'b5b52a27e6b14a37bbb4087ec821b0f4';
+
+ before(() => {
+ cy.origin('sandbox.paydirekt.de', () => {
+ Cypress.Commands.add('waitForGiropayWelcomeScreen', () => {
+ cy.get('co\\.welcome-screen', {timeout: 10000}).should('be.visible');
+ cy.get('co\\.welcome-screen', {timeout: 10000}).should('not.exist');
+ cy.get('body').then(($body) => {
+ $body.find('.rds-cookies-overlay__allow-essential-cookies-btn button')?.click();
+ });
+ });
+ });
+ })
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, paydirektCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () => {
+ return cy.origin('sandbox.paydirekt.de', () => {
+ cy.waitForGiropayWelcomeScreen();
+ cy.get('[name="cancelPayment"]', {timeout: 6000}).click();
+ cy.get('[name="abortionButton"]').click();
+ })
+ }).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, paydirektCheckout);
+ });
+ });
+ });
+
+ function paydirektCheckout() {
+ return cy.origin('sandbox.paydirekt.de', () => {
+ cy.waitForGiropayWelcomeScreen();
+
+ cy.get('[name="selectedPaymentOptionType"]').check('paydirekt');
+ cy.get('button[name="paymentButton"][type="submit"]').click();
+ cy.get('#username', {timeout: 6000}).type('PAYONE-1');
+ cy.get('#password').type('Payone!-1');
+ cy.get('[name="loginBtn"]').click();
+ cy.get('[name="confirmPaymentButton"]', {timeout: 6000}).click();
+ cy.get('success-with-redirect').should('be.visible');
+ cy.get('[name="redirectImmediatelyButton"]').click();
+ })
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js
new file mode 100644
index 000000000..1ccd9b507
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js
@@ -0,0 +1,46 @@
+import {processPayment} from '../../helper/paypal';
+
+describe('PayPal Express', () => {
+ const PAYMENT_METHOD_ID = '5ddf648859a84396a98c97a1a92c107f';
+
+ beforeEach(() => {
+ cy.viewport(1400, 1400); // amazon pay button is not clickable if it is not visible
+ // cy.checkoutRegister({}, false);// only required to get a valid context
+
+ cy.allowPaymentMethod(PAYMENT_METHOD_ID);
+ cy.addProductToCart();
+ cy.allowCurrencyForSalesChannel('EUR');
+ });
+
+ it('complete payment', () => {
+ cy.visit('/checkout/cart');
+ _processPayment();
+
+
+ });
+
+ it('complete payment in cart-offcanvas', () => {
+ cy.visit('/');
+ cy.get('.header-cart-btn').click();
+ cy.wait(500) // wait a few seconds to make sure that button is loaded
+ _processPayment();
+ });
+
+ function _processPayment() {
+ cy.get('a[href*="/payone/express-checkout/redirect/"]').click();
+ processPayment(null);
+
+ cy.window().then(() => {
+ cy.wait(2000);
+ cy.checkoutConfirmAndComplete(() => {
+ // validate if only paypal pay express is visible
+ cy.get('#changePaymentForm .payment-methods .payment-method').should('have.length', 1);
+ cy.get('#changePaymentForm [name="paymentMethodId"]').invoke('val').should('equal', PAYMENT_METHOD_ID);
+ cy.get('a[href*="payone/delete-checkout-data"]').should('be.visible');
+ });
+ });
+ }
+
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js
new file mode 100644
index 000000000..440b7be5d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js
@@ -0,0 +1,23 @@
+import {processPayment} from "../../helper/paypal";
+
+describe('PayPal', () => {
+ const PAYMENT_METHOD_ID = '21e157163fdb4aa4862a2109abcd7522'
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, processPayment);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () => {
+ return cy.origin('www.sandbox.paypal.com', () => {
+ cy.get('#cancelLink').click();
+ })
+ }).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, processPayment);
+ });
+ });
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js
new file mode 100644
index 000000000..e96115e33
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js
@@ -0,0 +1,36 @@
+describe('Postfinance Card', () => {
+ const PAYMENT_METHOD_ID = '8b4503f88a7746069a670e1689908832';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () =>
+ cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Cancel');
+ cy.get('[type=submit]').click();
+ })
+ ).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+ });
+
+ function postFinanceCheckout() {
+ return cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Success');
+ cy.get('[type=submit]').click();
+ })
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js
new file mode 100644
index 000000000..4d8142401
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js
@@ -0,0 +1,36 @@
+describe('Postfinance Wallet', () => {
+ const PAYMENT_METHOD_ID = 'cd65c7f9c0cc4e0886799f7cc7407494';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () =>
+ cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Cancel');
+ cy.get('[type=submit]').click();
+ })
+ ).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+ });
+
+ function postFinanceCheckout() {
+ return cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Success');
+ cy.get('[type=submit]').click();
+ })
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js
new file mode 100644
index 000000000..10e5fb5db
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js
@@ -0,0 +1,7 @@
+describe('Prepayment: Default success checkout', () => {
+ it('passes', () => {
+ cy.preparePaymentCheckout('267699739afd4cdd9663cac0bd269da6').then(() => {
+ return cy.checkoutConfirmAndComplete();
+ });
+ })
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js
new file mode 100644
index 000000000..a3135f68d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js
@@ -0,0 +1,34 @@
+describe('Przelewy24', () => {
+ const PAYMENT_METHOD_ID = '6068e01cef8b4c9698956c6cca648d50';
+
+ it('complete payment', () => init().then(() => processCheckout));
+
+ it('cancel payment & complete after cancel', () => {
+ init().then(() =>
+ cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ )).then(() => processCheckout);
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'PL',
+ }, {currencyIso: 'PLN'});
+ }
+
+ function processCheckout() {
+ return cy.checkoutConfirmAndComplete(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ );
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js
new file mode 100644
index 000000000..790709d8d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js
@@ -0,0 +1,51 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Ratepay Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '48f2034b3c62480a8554781cf9cac574';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayDebitProfiles': [{ shopId: '88880103', 'currency': 'EUR'}]
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment();
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type(IBAN.random(CountryCode.DE).toString());
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type('invalid-iban');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('#ratepayIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js
new file mode 100644
index 000000000..130d06922
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js
@@ -0,0 +1,103 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Ratepay Installment', () => {
+ const PAYMENT_METHOD_ID = '0af0f201fd164ca9ae72313c70201d18';
+
+ beforeEach(() => {
+ cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayInstallmentProfiles': [{shopId: '88880103', 'currency': 'EUR'}]
+ })
+ });
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type(IBAN.random(CountryCode.DE).toString());
+ }
+ ).then(processPayment);
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type('invalid-iban');
+ }
+ ).then(processPayment);
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('#ratepayIban').clear().type(IBAN.random(CountryCode.DE).toString());
+
+ testPlanChanges(
+ () => cy.get('#ratepayRuntime').select(2),
+ () => cy.get('#ratepayRuntime').select(5),
+ 1
+ );
+
+ const changeRate = () => cy.get('#payone-ratepay-calculate-installment-btn').click();
+ testPlanChanges(
+ () => cy.get('#ratepayRate').clear().type("1").then(changeRate), // use a very small value to take the lowest rate
+ () => cy.get('#ratepayRate').clear().type("5000").then(changeRate), // use a very high value to take the highest rate
+ 2
+ );
+ });
+ }
+
+ function testPlanChanges(initialValueChange, newValueChange, run) {
+ // set default value to compare it later
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest1' + run)
+ initialValueChange();
+ cy.wait('@calcRequest1' + run);
+
+ getPlanInfo().then((initialCalculatedPlan) => {
+ // set new runtime value
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest2' + run)
+ newValueChange();
+ cy.wait('@calcRequest2' + run);
+ getPlanInfo().should('not.equal', initialCalculatedPlan);
+
+ // set runtime back to initial value
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest3' + run)
+ initialValueChange();
+ cy.wait('@calcRequest3' + run);
+ getPlanInfo().should('equal', initialCalculatedPlan);
+ });
+
+ cy.get('#ratepayIbanCollapseTrigger').then(($el) => {
+ if ($el.find('.payone-ratepay-open-text:visible')) {
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ } else {
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ }
+ })
+ }
+
+ function getPlanInfo() {
+ return cy.get('#ratepayInstallmentTable tr:first-child td:first-child p:first-child')
+ .invoke('text')
+ .then((t) => t.replaceAll(/\s*\n*(([^ ]+ \w+)+)\s*\n*$/g, '$1'));
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js
new file mode 100644
index 000000000..9e692718b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js
@@ -0,0 +1,33 @@
+describe('Ratepay Invoice', () => {
+ const PAYMENT_METHOD_ID = '240dcc8bf5fc409c9dcf840698c082aa';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayInvoicingProfiles': [{ shopId: '88880103', 'currency': 'EUR'}]
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01')
+ cy.get('#payonePhone').type('012345789')
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789')
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js
new file mode 100644
index 000000000..ec1b7d05c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js
@@ -0,0 +1,28 @@
+describe('Secure Invoice', () => {
+ const PAYMENT_METHOD_ID = '4e8a9d3d3c6e428887573856b38c9003';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01')
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js
new file mode 100644
index 000000000..a7d56845b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js
@@ -0,0 +1,55 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Secured Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '72c4c88b918441848e20081de67a16c4';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedDirectDebitPortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedDirectDebitPortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedDirectDebitIban').type('invalid-iban');
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedDirectDebitIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ // we won't test invalid phone number, because PAYONE (module) does not validate the phone number.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#securedDirectDebitIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js
new file mode 100644
index 000000000..d22f765f5
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js
@@ -0,0 +1,50 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Secured Installment', () => {
+ const PAYMENT_METHOD_ID = '9c4d04f6ad4b4a2787e3812c56b6153b';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedInstallmentPortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedInstallmentPortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedInstallmentIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').clear().type('2025-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ }
+ ).then(processPayment);
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedInstallmentIban').clear().type('test-test');
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ }
+ ).then(processPayment);
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#securedInstallmentIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js
new file mode 100644
index 000000000..03d1991c0
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js
@@ -0,0 +1,34 @@
+describe('Secured Invoice', () => {
+ const PAYMENT_METHOD_ID = '4ca01ac1471c4da5b76faeaa42524cc3';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedInvoicePortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedInvoicePortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01')
+ cy.get('#payonePhone').type('012345789')
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js
new file mode 100644
index 000000000..e3d3b0c68
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js
@@ -0,0 +1,77 @@
+// info: we use `force` for actions on sofort.com to ignore the cookie-modal, which pop up on a very late stage.
+
+describe('Sofort Banking', () => {
+ const PAYMENT_METHOD_ID = '9022c4733d14411e84a78707088487aa';
+
+ beforeEach(() => {
+ // make sure that klarna does not store any cookies in the session
+ cy.clearAllCookies();
+ cy.clearAllSessionStorage();
+ cy.clearAllLocalStorage();
+ })
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => klarnaLogin().then(() =>
+ cy.origin('www.sofort.com', () => {
+ cy.get('.cancel-transaction').click({force: true});
+
+ // sometimes the user is asked for the reason why he cancelled the payment.
+ cy.wait(400);
+ cy.get('.wait-box').should($el => $el.length === 0 || !$el.is('visible'));
+ cy.window().then(window => {
+ if (window.origin.includes('www.sofort.com')) {
+ window.document.querySelector('#CancelTransaction').click();
+ }
+ })
+ })
+ )
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled, so the payment method is not available after cancel
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function klarnaLogin() {
+ return cy.wait(1500).then(() =>
+ cy.window().then(window => {
+ if (window.origin.includes('login.nonprod.klarna.net')) {
+ return cy.origin('login.nonprod.klarna.net', () => {
+ cy.get('#phone').type('+4901761428434');
+ cy.get('#onContinue').click();
+ cy.get('#otp_field').type('123456')
+ });
+ }
+ })
+ );
+ }
+
+ function processCheckout() {
+ return klarnaLogin().then(() =>
+ cy.origin('www.sofort.com', () => {
+ cy.get('label[for="account-88888888"]').click({force: true}); // demo-bank
+
+ cy.get('#BackendFormLOGINNAMEUSERID').type('12345678', {force: true})
+ cy.get('#BackendFormUSERPIN').type('12345678', {force: true});
+ cy.get('.button-right.primary').click({force: true});
+
+ cy.get('body').then($body => {
+ if ($body.find('.account-selector').length) {
+ cy.get('.button-right.primary').click({force: true});
+ }
+ });
+
+ cy.get('#BackendFormTan').type('12345', {force: true})
+ cy.get('.button-right.primary').click({force: true});
+ })
+ );
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js
new file mode 100644
index 000000000..e59b83bb4
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js
@@ -0,0 +1,46 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Trustly', () => {
+ const PAYMENT_METHOD_ID = '741f1deec67d4012bd3ccce265b2e15e';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(initValidData, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ () => {
+ cy.get('#iban').type(IBAN.random(CountryCode.DE).toString());
+ },
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(initValidData, processCheckout))
+ });
+
+ it('fails with invalid iban', () => {
+ init().then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => cy.get('#iban').type('invalid-iban')
+ ).then(() => cy.checkoutConfirmAndComplete(initValidData, processCheckout));
+ });
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function initValidData() {
+ cy.get('#iban').clear().type(IBAN.random(CountryCode.DE).toString());
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js
new file mode 100644
index 000000000..d3de81e95
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js
@@ -0,0 +1,29 @@
+import {BIC, CountryCode, IBAN} from "ibankit";
+
+describe('Unzer Debit', () => {
+ const PAYMENT_METHOD_ID = '700954775fad4a8f92463b3d629c8ad5';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionDebitCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ // TODO: missing validation in frontend. Nothing happens if the validation fails.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payolutionAccountHolder').type('Max Mustermann');
+ cy.get('#payolutionIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payolutionBic').type('DEUTDEFF500');
+
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ cy.get('#payolutionMandate').check();
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js
new file mode 100644
index 000000000..09d0638f0
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js
@@ -0,0 +1,59 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Unzer Installment', () => {
+ const PAYMENT_METHOD_ID = '569b46970ad2458ca8f17f1ebb754137';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionInstallmentCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('test empty fields & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ fillCheckoutWithCorrectData();
+ cy.get('#tos').check();
+
+ const fieldIds = ['payolutionAccountOwner', 'payolutionIban', 'payolutionBic'];
+ fieldIds.forEach((fieldId) => {
+ cy.get('#' + fieldId).invoke('val').then(prevVal => {
+ cy.get('#' + fieldId).clear();
+ cy.get('#confirmFormSubmit').click();
+ cy.wait(2000);
+ cy.url().should('not.contain', '/checkout/finish');
+
+ // set value back to initial value to make sure we can check out at the end.
+ cy.get('#' + fieldId).invoke('val', prevVal);
+ });
+ });
+ });
+ cy.checkoutConfirmAndComplete();
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ fillCheckoutWithCorrectData();
+
+ cy.get('#payolutionInstallmentDuration').children().each(($option) => {
+ cy.get('#payolutionInstallmentDuration').select($option.val()).invoke('val').then(selectedValue => {
+ cy.get('.installmentDetail[data-duration=' + selectedValue + ']').should('have.length', 2).should('be.visible');
+ cy.get('.installmentDetail:not([data-duration=' + selectedValue + '])').should('not.be.visible');
+ });
+ })
+ });
+ }
+
+ function fillCheckoutWithCorrectData() {
+ cy.intercept('payone/installment/calculation').as('calcRequest');
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ cy.get('#checkInstallmentButton').click();
+ cy.wait('@calcRequest');
+
+ cy.get('#payolutionAccountOwner').type('Max Mustermann');
+ cy.get('#payolutionIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payolutionBic').type('DEUTDEFF500');
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js
new file mode 100644
index 000000000..dd6fb9aee
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js
@@ -0,0 +1,22 @@
+describe('Unzer Invoice', () => {
+ const PAYMENT_METHOD_ID = '0407fd0a5c4b4d2bafc88379efe8cf8d';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionInvoicingCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ // TODO: missing validation in frontend. Nothing happens if the validation fails.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js
new file mode 100644
index 000000000..d634f03de
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js
@@ -0,0 +1,30 @@
+describe('WeChat', () => {
+ const PAYMENT_METHOD_ID = 'e9647d765b284cea9c4c0d68005665b7';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ //.then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled, so the payment method is not available after cancel
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/helper/amazon.js b/src/Resources/app/storefront/cypress/helper/amazon.js
new file mode 100644
index 000000000..0075d152b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/amazon.js
@@ -0,0 +1,31 @@
+export function registerCommands() {
+ cy.origin('payments.amazon.de', () => {
+ Cypress.Commands.add('waitForAmazonSpinner', (spinnerSelector) => {
+ cy.get(spinnerSelector, {timeout: 10000}).should('be.visible');
+ cy.get(spinnerSelector, {timeout: 10000}).should(($el) => $el.length === 0 || !$el.is('visible'));
+ });
+ Cypress.Commands.add('waitForAmazonLogin', () => {
+ cy.waitForAmazonSpinner('.a-spinner-wrapper');
+ cy.wait(2000);
+ });
+ });
+ cy.origin('www.amazon.de', () => {
+ Cypress.Commands.add('amazonLogin', () => {
+ cy.get('[name="email"]').type('frederik.rommel+testbestellung@webidea24.de');
+ cy.get('[name="password"]').type('frederik.rommel+testbestellung@webidea24.de');
+ cy.get('#signInSubmit').click();
+ });
+ });
+}
+export function processCheckout() {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+ cy.origin('payments.amazon.de', () => {
+ cy.waitForAmazonLogin();
+ cy.get('[data-action="continue-checkout"] [type="submit"]').click();
+ cy.waitForAmazonSpinner('.a-spinner');
+ });
+
+ return Promise.resolve();
+}
diff --git a/src/Resources/app/storefront/cypress/helper/klarna.js b/src/Resources/app/storefront/cypress/helper/klarna.js
new file mode 100644
index 000000000..823215b4f
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/klarna.js
@@ -0,0 +1,37 @@
+export const customerData = {
+ firstName: 'Mock',
+ lastName: 'Mock',
+ street: 'Neue Schönhauser Str. 2',
+ zipcode: 10178,
+ city: 'Berlin',
+ mail: 'customer@email.de'
+}
+
+export function executeKlarnaCheckout(doneCallback) {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.window().then((window) => {
+ cy.stub(window, 'open').as('winOpen')
+ });
+
+ return cy.get('#payone-payment--klarna__container iframe').then(($el) => $el.contents().get('#root'));
+ }, () => {
+ return cy.get('@winOpen').should('be.called').then(() => doneCallback());
+ });
+}
+
+export function executeKlarnaCheckoutCancel(doneCallback) {
+ cy.get('#tos').check();
+ cy.get('#payone-payment--klarna__container iframe').then(($el) => $el.contents().get('#root'));
+
+ cy.window().then((window) => {
+ cy.stub(window, 'open').as('winOpen')
+ });
+
+ cy.get('#confirmFormSubmit').click();
+
+ cy.get('@winOpen').should('be.called');
+ cy.visit('checkout/confirm');
+ cy.get('#tos').check();
+
+ return executeKlarnaCheckout(doneCallback);
+}
diff --git a/src/Resources/app/storefront/cypress/helper/paypal.js b/src/Resources/app/storefront/cypress/helper/paypal.js
new file mode 100644
index 000000000..7460bf544
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/paypal.js
@@ -0,0 +1,11 @@
+export function processPayment() {
+ return cy.origin('www.sandbox.paypal.com', () => {
+ cy.wait(1200)
+ cy.get('#email').clear().type(Cypress.env('paypalMail'));
+ cy.get('#email').type('{enter}');
+ cy.get('#password').type(Cypress.env('paypalPassword'), {force: true});
+ cy.get('#btnLogin').click({force: true});
+ cy.wait(3000)
+ cy.get('#payment-submit-btn').click();
+ })
+}
diff --git a/src/Resources/app/storefront/cypress/support/commands.js b/src/Resources/app/storefront/cypress/support/commands.js
new file mode 100644
index 000000000..4ec0d8e41
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/commands.js
@@ -0,0 +1,10 @@
+import 'cypress-iframe';
+import '@shopware-ag/e2e-testsuite-platform/cypress/support';
+
+import '../commands/checkout';
+import '../commands/product';
+import '../commands/customer';
+import '../commands/sales-channel';
+import '../commands/shopware-configuration';
+import '../commands/override-shopware';
+
diff --git a/src/Resources/app/storefront/cypress/support/e2e.js b/src/Resources/app/storefront/cypress/support/e2e.js
new file mode 100644
index 000000000..43c03b759
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/e2e.js
@@ -0,0 +1 @@
+import './commands'
diff --git a/src/Resources/app/storefront/cypress/support/tasks.js b/src/Resources/app/storefront/cypress/support/tasks.js
new file mode 100644
index 000000000..4bd12e407
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/tasks.js
@@ -0,0 +1,32 @@
+const global = {
+ allowedPaymentMethods: [],
+ allowedCountries: {},
+ allowedCurrencies: {},
+};
+
+module.exports = {
+ addAllowedPaymentMethod(id) {
+ global.allowedPaymentMethods.push(id);
+
+ return id;
+ },
+ addAllowedCurrency({isoCode, id}) {
+ global.allowedCurrencies[isoCode] = id;
+
+ return null;
+ },
+ addAllowedCountry({isoCode, id}) {
+ global.allowedCountries[isoCode] = id;
+
+ return null;
+ },
+ isPaymentMethodAllowed: id => global.allowedPaymentMethods.includes(id),
+ getAllowedCurrencyId: isoCode => global.allowedCurrencies[isoCode] ?? null,
+ getAllowedCountryId: isoCode => global.allowedCountries[isoCode] ?? null,
+ addToGlobalStore({key, value}) {
+ global[key] = value;
+
+ return value;
+ },
+ getFromGlobalStore: key => global[key] ?? null
+};
diff --git a/src/Resources/app/storefront/dist/storefront/js/payone-payment.js b/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
index bee17bf1f..b799a2949 100644
--- a/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
+++ b/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([["payone-payment"],{7450:(e,t,n)=>{var a,r,i,o=n(6285),s=n(1110);class l extends o.Z{init(){this.iframe=null,this.iframeFieldCheckerStarted=!1,this.orderFormDisabled=!0;const e=document.getElementById("payone-request"),t=e.getAttribute("data-payone-language"),n=JSON.parse(e.innerHTML);this._createScript((()=>{const e=this.getClientConfig(t);this.iframe=new window.Payone.ClientApi.HostedIFrames(e,n);const a=document.getElementById("savedpseudocardpan"),r=document.getElementById("confirmOrderForm");a&&a.addEventListener("change",this._handleChangeSavedCard.bind(this)),r&&r.addEventListener("submit",this._handleOrderSubmit.bind(this))}))}getSelectStyle(){return["width: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: 3px"]}getFieldStyle(){return["width: 100%","height: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: .1875rem"]}getClientConfig(e){return{fields:{cardpan:{selector:"cardpan",type:"text",style:this.getFieldStyle().join("; ")},cardcvc2:{selector:"cardcvc2",type:"password",size:"4",maxlength:"4",length:{V:3,M:3,A:4,D:3,J:0,O:3,P:3,U:3},style:this.getFieldStyle().join("; ")},cardexpiremonth:{selector:"cardexpiremonth",type:"select",size:"2",maxlength:"2",style:this.getSelectStyle().join("; ")},cardexpireyear:{selector:"cardexpireyear",type:"select",style:this.getSelectStyle().join("; ")}},language:window.Payone.ClientApi.Language[e],defaultStyle:{iframe:{height:"100%",width:"100%"}},autoCardtypeDetection:{supportedCardtypes:l.options.supportedCardtypes,callback:this._cardDetectionCallback}}}_cardDetectionCallback(e){if("-"===e||"?"===e)return;const t="https://cdn.pay1.de/cc/"+e.toLowerCase()+"/xl/default.png",n=document.getElementById("errorOutput"),a=document.getElementById("card-logo");a.setAttribute("src",t),n.style.display="none",a.style.display="block"}_createScript(e){const t=document.createElement("script");t.type="text/javascript",t.src="https://secure.pay1.de/client-api/js/v1/payone_hosted.js",t.addEventListener("load",e.bind(this),!1),document.head.appendChild(t)}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none";const t=document.getElementById("savedpseudocardpan");if(t&&t.value.length>0)return!0;if(!this.iframe.isComplete()){const t=document.getElementById("iframeErrorOutput");return this.iframeFieldCheckerStarted||setInterval((()=>{this.iframe.isComplete()?t.style.display="none":t.style.display="block"}),250),this.iframeFieldCheckerStarted=!0,this._handleOrderFormError(e),!1}return this.orderFormDisabled?(window.payoneCreditCardCheckCallback=this._payoneCheckCallback.bind(this),this.iframe.creditCardCheck("payoneCreditCardCheckCallback"),this._handleOrderFormError(e),!1):void 0}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_handleChangeSavedCard(){const e=document.getElementById("savedpseudocardpan");e.options[e.selectedIndex].value?[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.add("hide")})):[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.remove("hide")}))}_payoneCheckCallback(e){if("VALID"===e.status)document.getElementById("pseudocardpan").value=e.pseudocardpan,document.getElementById("truncatedcardpan").value=e.truncatedcardpan,document.getElementById("cardexpiredate").value=e.cardexpiredate,document.getElementById("cardtype").value=e.cardtype,this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit();else{const t=document.getElementById("confirmFormSubmit"),n=document.getElementById("errorOutput");t.removeAttribute("disabled"),n.innerHTML=e.errormessage,n.style.display="block"}}}a=l,i={supportedCardtypes:["#","V","A","M","D","J","O","U","P"]},(r=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(r="options"))in a?Object.defineProperty(a,r,{value:i,enumerable:!0,configurable:!0,writable:!0}):a[r]=i;var d=n(378),c=n(5659),u=n(8254);class m extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,document.getElementById("confirmOrderForm").addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none",this.orderFormDisabled&&(this._handleOrderFormError(e),this._getModal(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getModal(e){e.preventDefault(),c.Z.create();const t=this._getRequestData();this._client.abort(),this._client.post(this._getManageMandateUrl(),JSON.stringify(t),(e=>this._openModal(e)))}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_openModal(e){if((e=JSON.parse(e)).error){const t=document.getElementById("errorOutput");return t.innerHTML=e.error,t.style.display="block",void c.Z.remove()}if("active"===e.mandate.Status)return void this._submitForm();const t=new d.Z(e.modal_content);t.open(this._onOpen.bind(this,t))}_onOpen(e){e.getModal().classList.add("payone-debit-mandate-modal"),window.PluginManager.initializePlugins(),this._registerEvents(),c.Z.remove()}_getRequestData(){return{iban:document.getElementById("iban").value}}_getManageMandateUrl(){return document.getElementById("payone-configuration").getAttribute("data-manage-mandate-url")}_registerEvents(){document.getElementById("mandateSubmit").addEventListener("click",this._onMandateSubmit.bind(this))}_onMandateSubmit(){document.getElementById("accept-mandate").checked&&this._submitForm()}}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(m,"options",{editorModalClass:"payone-debit-modal"});class h extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){this._hideErrorBox(),this.orderFormDisabled&&(this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),e.defaultPrevented||(this._validatePaymentAcceptance(),e.preventDefault()))}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validatePaymentAcceptance(){const e=JSON.stringify(this._getRequestData());c.Z.create(),this._client.abort(),this._client.post(this._getValidateUrl(),e,(e=>this._handleValidateResponse(e)))}_handleValidateResponse(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)this._showErrorBox();else{const t=document.getElementById("payoneWorkOrder");t&&(t.value=e.workorderid),this._submitForm()}}_getValidateUrl(){return document.getElementById("payone-configuration").getAttribute("data-validate-url")}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_getRequestData(){return{payolutionBirthday:document.getElementById("payolutionBirthday").value}}}class p extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._disableSubmitButton(),this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm"),t=document.getElementById("checkInstallmentButton");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this)),t&&t.addEventListener("click",this._handleCalculationButtonClick.bind(this))}_handleCalculationButtonClick(e){if(this._hideErrorBox(),this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),e.defaultPrevented)return;c.Z.create();const t=JSON.stringify(this._getRequestData());this._client.abort(),this._client.post(this._getCalculationUrl(),t,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)return void this._showErrorBox();const t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");t.value=e.workorderid,n.value=e.carthash,this._displayInstallmentSelection(e),this._displayCalculationOverview(e),this._registerSelectionEventListeners(),this._enableSecondStep(),this._activateSubmitButton(),this._hideCheckInstallmentButton()}_hideCheckInstallmentButton(){const e=document.getElementById("checkInstallmentButton");e&&e.classList.add("hidden")}_registerSelectionEventListeners(){document.getElementById("payolutionInstallmentDuration").addEventListener("change",(function(e){const t=e.target.value;document.querySelectorAll(".installmentDetail").forEach((function(e){e.dataset.duration===t?e.hidden=!1:e.hidden="hidden"}))}))}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_enableSecondStep(){document.querySelectorAll(".payolution-installment .hidden").forEach((function(e){e.classList.remove("hidden")}))}_displayInstallmentSelection(e){const t=document.getElementById("installmentSelection");t&&(t.innerHTML=e.installmentSelection)}_displayCalculationOverview(e){const t=document.getElementById("calculationOverview");t&&(t.innerHTML=e.calculationOverview)}_handleOrderSubmit(e){this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),this._validateInput(e,"payolutionAccountOwner"),this._validateInput(e,"payolutionIban"),this._validateInput(e,"payolutionBic"),this._validateInput(e,"payolutionInstallmentDuration")}_disableSubmitButton(){this.orderFormDisabled=!0;const e=document.getElementById("confirmFormSubmit");e&&e.setAttribute("disabled","disabled")}_activateSubmitButton(){this.orderFormDisabled=!1;const e=document.getElementById("confirmFormSubmit");e&&e.removeAttribute("disabled")}_getCalculationUrl(){return document.getElementById("payone-configuration").getAttribute("data-calculation-url")}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getRequestData(){const e=document.getElementById("payolutionBirthday"),t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");return{payolutionBirthday:e.value,workorder:t.value,carthash:n.value}}}var y=n(3206);function b(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class v extends o.Z{init(){null===this.options.supportedNetworks&&(this.options.supportedNetworks=[]),this._httpClient=new u.Z,this.validateMerchantUrl=this.el.dataset.validateMerchantUrl,this.processPaymentUrl=this.el.dataset.processPaymentUrl,this.orderForm=y.Z.querySelector(document,"#confirmOrderForm"),this._registerEventHandler()}createSession(){try{this.session=new ApplePaySession(3,this.options)}catch(e){return void this.handleErrorOnPayment()}this.session.addEventListener("validatemerchant",this.validateMerchant.bind(this)),this.session.addEventListener("paymentauthorized",this.authorizePayment.bind(this))}performPayment(){this.session.begin()}validateMerchant(e){const t=e.validationURL;this._httpClient.abort(),this._httpClient.post(this.validateMerchantUrl,JSON.stringify({validationUrl:t}),(e=>{let t=null;try{t=JSON.parse(e)}catch(e){return void this.handleErrorOnPayment()}t&&t.merchantSessionIdentifier&&t.signature?this.session.completeMerchantValidation(t):this.handleErrorOnPayment()}))}handleErrorOnPayment(){const e=y.Z.querySelector(document,"#payone-apple-pay-error");e.style.display="block",e.scrollIntoView({block:"start"})}authorizePayment(e){let t=y.Z.querySelector(this.orderForm,"input[name='orderId']").value;this._httpClient.abort(),this._httpClient.post(this.processPaymentUrl,JSON.stringify({token:e.payment.token,orderId:t}),(e=>{this.completePayment(e),this.orderForm.submit()}))}completePayment(e){let t="",n="",a="";try{let r=JSON.parse(e);n=r.status,t=r.txid,a=r.userid}catch(e){this.orderForm.submit()}this.updateFormData(n,t,a,e),"APPROVED"!==n&&"PENDING"!==n||this.session.completePayment({status:ApplePaySession.STATUS_SUCCESS,errors:[]}),this.orderForm.submit()}updateFormData(e,t,n,a){y.Z.querySelector(this.orderForm,"input[name='status']").value=e,y.Z.querySelector(this.orderForm,"input[name='txid']").value=t,y.Z.querySelector(this.orderForm,"input[name='userid']").value=n,y.Z.querySelector(this.orderForm,"input[name='response']").value=a}_handleApplePayButtonClick(){this.orderForm.reportValidity()&&(this.createSession(),this.performPayment())}_registerEventHandler(){this.el.addEventListener("click",this._handleApplePayButtonClick.bind(this))}}b(v,"options",{countryCode:"",currencyCode:"",supportedNetworks:[],merchantCapabilities:["supports3DS","supportsDebit","supportsCredit"],total:{label:"",type:"final",amount:"0.01"}}),b(v,"session",void 0),b(v,"client",void 0),b(v,"validateMerchantUrl",void 0),b(v,"processPaymentUrl",void 0),b(v,"orderForm",void 0);class g extends o.Z{init(){this._client=new u.Z,this.ratepayRateInput=y.Z.querySelector(document,this.options.ratepayRateInputSelector),this.calculateInstallmentBtn=y.Z.querySelector(document,this.options.calculateInstallmentBtnSelector),this.ratepayRuntimeInput=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector),this.ratepayIbanContainer=y.Z.querySelector(document,this.options.ratepayIbanContainerSelector),this.ratepayIbanInput=y.Z.querySelector(document,this.options.ratepayIbanInputSelector),this._registerEventListeners(),this._handleInstallmentRuntimeChange()}_registerEventListeners(){this.calculateInstallmentBtn&&this.calculateInstallmentBtn.addEventListener("click",this._handleCalculateInstallmentButtonClick.bind(this)),this.ratepayRuntimeInput&&this.ratepayRuntimeInput.addEventListener("change",this._handleInstallmentRuntimeChange.bind(this)),$(this.options.ratepayIbanContainerSelector).on("shown.bs.collapse",this._handleOpenedIbanContainer.bind(this)),$(this.options.ratepayIbanContainerSelector).on("hidden.bs.collapse",this._handleClosedIbanContainer.bind(this))}_handleCalculateInstallmentButtonClick(){const e=this.ratepayRateInput.value;this._sendRequest("rate",e)}_handleInstallmentRuntimeChange(){const e=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector).value;this._sendRequest("time",e)}_sendRequest(e,t){let n={ratepayInstallmentType:e,ratepayInstallmentValue:t};const a=JSON.stringify(n);this._client.abort(),this._client.post("/payone/ratepay/installment/calculation",a,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){this._replaceCalculationContent(e)}_replaceCalculationContent(e){y.Z.querySelector(document,this.options.ratepayInstallmentPlanContainerSelector).innerHTML=e,this.ratepayInstallmentTable=y.Z.querySelector(document,this.options.ratepayInstallmentTableSelector),this.ratepayRuntimeInput.value=this.ratepayInstallmentTable.dataset.ratepayNumberOfRates,this.ratepayRateInput.value=this.ratepayInstallmentTable.dataset.ratepayRate}_handleOpenedIbanContainer(){this.ratepayIbanInput.required=!0}_handleClosedIbanContainer(){this.ratepayIbanInput.required=!1}}function _(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(g,"options",{ratepayRateInputSelector:"#ratepayRate",ratepayRuntimeInputSelector:"#ratepayRuntime",calculateInstallmentBtnSelector:"#payone-ratepay-calculate-installment-btn",ratepayInstallmentPlanContainerSelector:"#payone-ratepay-installment-plan",ratepayIbanContainerSelector:"#ratepayIbanContainer",ratepayIbanInputSelector:"#ratepayIban",ratepayInstallmentTableSelector:"#ratepayInstallmentTable"});class f extends o.Z{init(){window.klarnaAsyncCallback=this._initKlarnaWidget.bind(this);const e=document.createElement("script");e.src="https://x.klarnacdn.net/kp/lib/v1/api.js",document.body.appendChild(e),this.orderForm=document.getElementById(this.options.selectorFormId),this._registerEventListeners()}_initKlarnaWidget(){Klarna.Payments.init({client_token:this.options.clientToken}),Klarna.Payments.load({container:this.options.selectorContainer,payment_method_category:this.options.paymentMethodIdentifier},(e=>{this.confirmFormSubmit.disabled=!1,ElementLoadingIndicatorUtil.remove(this.el)}))}_registerEventListeners(){this.orderForm&&this.orderForm.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){e.preventDefault(),Klarna.Payments.authorize({payment_method_category:this.options.paymentMethodIdentifier},{},(e=>{e.approved&&e.authorization_token?(document.querySelector(this.options.selectorTokenInput).value=e.authorization_token,this.orderForm.submit()):e.show_form?new ButtonLoadingIndicator(this.confirmFormSubmit).remove():e.show_form||(window.location.href=window.location.href)}))}}_(f,"options",{clientToken:null,paymentMethodIdentifier:null,selectorContainer:null,selectorTokenInput:'input[name="payoneKlarnaAuthorizationToken"]',selectorFormId:"confirmOrderForm"}),_(f,"orderForm",null),_(f,"confirmFormSubmit",null);class I extends o.Z{init(){if("amazon"in window)this.onLoad();else{var e=document.createElement("script");e.type="text/javascript",e.src="https://static-eu.payments-amazon.com/checkout.js",e.onload=this.onLoad.bind(this),document.head.appendChild(e)}}onLoad(){}}class E extends I{onLoad(){window.amazon.Pay.renderButton("#"+this.el.id,this.options)}}var S=n(4690);PluginManager.register("PayonePaymentAmazonPayExpressButton",E,"[data-payone-payment-amazon-pay-express-button]"),PluginManager.register("PayonePaymentAmazonPayRedirect",class extends E{init(){S.Z.create(document.querySelector(".content-main")),super.init()}onLoad(){super.onLoad(),document.querySelector("#"+this.el.id).dispatchEvent(new CustomEvent("click"))}},"[data-payone-payment-amazon-pay-redirect]");const C=window.PluginManager;C.register("PayonePaymentCreditCard",l,"[data-is-payone-credit-card]"),C.register("PayonePaymentDebitCard",m,"[data-is-payone-debit-card]"),C.register("PayonePaymentPayolutionInvoicing",h,"[data-is-payone-payolution-invoicing]"),C.register("PayonePaymentPayolutionInstallment",p,"[data-is-payone-payolution-installment]"),C.register("PayonePaymentApplePay",v,"[data-payone-payment-apple-pay-options]"),C.register("PayonePaymentRatepayInstallment",g,"[data-is-payone-ratepay-installment]"),C.register("PayonePaymentKlarna",f,"[data-payone-payment-klarna]")}},e=>{e.O(0,["vendor-node","vendor-shared"],(()=>{return t=7450,e(e.s=t);var t}));e.O()}]);
\ No newline at end of file
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([["payone-payment"],{898:(e,t,n)=>{var r,a,i,o=n(6285),s=n(1110);class l extends o.Z{init(){this.iframe=null,this.iframeFieldCheckerStarted=!1,this.orderFormDisabled=!0;const e=document.getElementById("payone-request"),t=e.getAttribute("data-payone-language"),n=JSON.parse(e.innerHTML);this._createScript((()=>{const e=this.getClientConfig(t);this.iframe=new window.Payone.ClientApi.HostedIFrames(e,n);const r=document.getElementById("savedpseudocardpan"),a=document.getElementById("confirmOrderForm");r&&r.addEventListener("change",this._handleChangeSavedCard.bind(this)),a&&a.addEventListener("submit",this._handleOrderSubmit.bind(this))}))}getSelectStyle(){return["width: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: 3px"]}getFieldStyle(){return["width: 100%","height: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: .1875rem"]}getClientConfig(e){return{fields:{cardpan:{selector:"cardpan",type:"text",style:this.getFieldStyle().join("; ")},cardcvc2:{selector:"cardcvc2",type:"password",size:"4",maxlength:"4",length:{V:3,M:3,A:4,D:3,J:0,O:3,P:3,U:3},style:this.getFieldStyle().join("; ")},cardexpiremonth:{selector:"cardexpiremonth",type:"select",size:"2",maxlength:"2",style:this.getSelectStyle().join("; ")},cardexpireyear:{selector:"cardexpireyear",type:"select",style:this.getSelectStyle().join("; ")}},language:window.Payone.ClientApi.Language[e],defaultStyle:{iframe:{height:"100%",width:"100%"}},autoCardtypeDetection:{supportedCardtypes:l.options.supportedCardtypes,callback:this._cardDetectionCallback}}}_cardDetectionCallback(e){if("-"===e||"?"===e)return;const t="https://cdn.pay1.de/cc/"+e.toLowerCase()+"/xl/default.png",n=document.getElementById("errorOutput"),r=document.getElementById("card-logo");r.setAttribute("src",t),n.style.display="none",r.style.display="block"}_createScript(e){const t=document.createElement("script");t.type="text/javascript",t.src="https://secure.pay1.de/client-api/js/v1/payone_hosted.js",t.addEventListener("load",e.bind(this),!1),document.head.appendChild(t)}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none";const t=document.getElementById("savedpseudocardpan");if(t&&t.value.length>0)return!0;if(!this.iframe.isComplete()){const t=document.getElementById("iframeErrorOutput");return this.iframeFieldCheckerStarted||setInterval((()=>{this.iframe.isComplete()?t.style.display="none":t.style.display="block"}),250),this.iframeFieldCheckerStarted=!0,this._handleOrderFormError(e),!1}return this.orderFormDisabled?(window.payoneCreditCardCheckCallback=this._payoneCheckCallback.bind(this),this.iframe.creditCardCheck("payoneCreditCardCheckCallback"),this._handleOrderFormError(e),!1):void 0}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_handleChangeSavedCard(){const e=document.getElementById("savedpseudocardpan");e.options[e.selectedIndex].value?[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.add("hide")})):[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.remove("hide")}))}_payoneCheckCallback(e){if("VALID"===e.status)document.getElementById("pseudocardpan").value=e.pseudocardpan,document.getElementById("truncatedcardpan").value=e.truncatedcardpan,document.getElementById("cardexpiredate").value=e.cardexpiredate,document.getElementById("cardtype").value=e.cardtype,this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit();else{const t=document.getElementById("confirmFormSubmit"),n=document.getElementById("errorOutput");t.removeAttribute("disabled"),n.innerHTML=e.errormessage,n.style.display="block"}}}r=l,i={supportedCardtypes:["#","V","A","M","D","J","O","U","P"]},(a=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(a="options"))in r?Object.defineProperty(r,a,{value:i,enumerable:!0,configurable:!0,writable:!0}):r[a]=i;var d=n(378),c=n(5659),u=n(8254);class m extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,document.getElementById("confirmOrderForm").addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none",this.orderFormDisabled&&(this._handleOrderFormError(e),this._getModal(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getModal(e){e.preventDefault(),c.Z.create();const t=this._getRequestData();this._client.abort(),this._client.post(this._getManageMandateUrl(),JSON.stringify(t),(e=>this._openModal(e)))}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_openModal(e){if((e=JSON.parse(e)).error){const t=document.getElementById("errorOutput");return t.innerHTML=e.error,t.style.display="block",void c.Z.remove()}if("active"===e.mandate.Status)return void this._submitForm();const t=new d.Z(e.modal_content);t.open(this._onOpen.bind(this,t))}_onOpen(e){e.getModal().classList.add("payone-debit-mandate-modal"),window.PluginManager.initializePlugins(),this._registerEvents(),c.Z.remove()}_getRequestData(){return{iban:document.getElementById("iban").value}}_getManageMandateUrl(){return document.getElementById("payone-configuration").getAttribute("data-manage-mandate-url")}_registerEvents(){document.getElementById("mandateSubmit").addEventListener("click",this._onMandateSubmit.bind(this))}_onMandateSubmit(){document.getElementById("accept-mandate").checked&&this._submitForm()}}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(m,"options",{editorModalClass:"payone-debit-modal"});class h extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){this._hideErrorBox(),this.orderFormDisabled&&(this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),e.defaultPrevented||(this._validatePaymentAcceptance(),e.preventDefault()))}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validatePaymentAcceptance(){const e=JSON.stringify(this._getRequestData());c.Z.create(),this._client.abort(),this._client.post(this._getValidateUrl(),e,(e=>this._handleValidateResponse(e)))}_handleValidateResponse(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)this._showErrorBox();else{const t=document.getElementById("payoneWorkOrder");t&&(t.value=e.workorderid),this._submitForm()}}_getValidateUrl(){return document.getElementById("payone-configuration").getAttribute("data-validate-url")}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_getRequestData(){return{payoneBirthday:document.getElementById("payoneBirthday").value}}}class p extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._disableSubmitButton(),this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm"),t=document.getElementById("checkInstallmentButton");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this)),t&&t.addEventListener("click",this._handleCalculationButtonClick.bind(this))}_handleCalculationButtonClick(e){if(this._hideErrorBox(),this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),e.defaultPrevented)return;c.Z.create();const t=JSON.stringify(this._getRequestData());this._client.abort(),this._client.post(this._getCalculationUrl(),t,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)return void this._showErrorBox();const t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");t.value=e.workorderid,n.value=e.carthash,this._displayInstallmentSelection(e),this._displayCalculationOverview(e),this._registerSelectionEventListeners(),this._enableSecondStep(),this._activateSubmitButton(),this._hideCheckInstallmentButton()}_hideCheckInstallmentButton(){const e=document.getElementById("checkInstallmentButton");e&&e.classList.add("hidden")}_registerSelectionEventListeners(){document.getElementById("payolutionInstallmentDuration").addEventListener("change",(function(e){const t=e.target.value;document.querySelectorAll(".installmentDetail").forEach((function(e){e.dataset.duration===t?e.hidden=!1:e.hidden="hidden"}))}))}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_enableSecondStep(){document.querySelectorAll(".payolution-installment .hidden").forEach((function(e){e.classList.remove("hidden")}))}_displayInstallmentSelection(e){const t=document.getElementById("installmentSelection");t&&(t.innerHTML=e.installmentSelection)}_displayCalculationOverview(e){const t=document.getElementById("calculationOverview");t&&(t.innerHTML=e.calculationOverview)}_handleOrderSubmit(e){this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),this._validateInput(e,"payolutionAccountOwner"),this._validateInput(e,"payolutionIban"),this._validateInput(e,"payolutionBic"),this._validateInput(e,"payolutionInstallmentDuration")}_disableSubmitButton(){this.orderFormDisabled=!0;const e=document.getElementById("confirmFormSubmit");e&&e.setAttribute("disabled","disabled")}_activateSubmitButton(){this.orderFormDisabled=!1;const e=document.getElementById("confirmFormSubmit");e&&e.removeAttribute("disabled")}_getCalculationUrl(){return document.getElementById("payone-configuration").getAttribute("data-calculation-url")}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getRequestData(){const e=document.getElementById("payoneBirthday"),t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");return{payoneBirthday:e.value,workorder:t.value,carthash:n.value}}}var y=n(3206);function v(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class b extends o.Z{init(){null===this.options.supportedNetworks&&(this.options.supportedNetworks=[]),this._httpClient=new u.Z,this.validateMerchantUrl=this.el.dataset.validateMerchantUrl,this.processPaymentUrl=this.el.dataset.processPaymentUrl,this.orderForm=y.Z.querySelector(document,"#confirmOrderForm"),this._registerEventHandler()}createSession(){try{this.session=new ApplePaySession(3,this.options)}catch(e){return void this.handleErrorOnPayment()}this.session.addEventListener("validatemerchant",this.validateMerchant.bind(this)),this.session.addEventListener("paymentauthorized",this.authorizePayment.bind(this))}performPayment(){this.session.begin()}validateMerchant(e){const t=e.validationURL;this._httpClient.abort(),this._httpClient.post(this.validateMerchantUrl,JSON.stringify({validationUrl:t}),(e=>{let t=null;try{t=JSON.parse(e)}catch(e){return void this.handleErrorOnPayment()}t&&t.merchantSessionIdentifier&&t.signature?this.session.completeMerchantValidation(t):this.handleErrorOnPayment()}))}handleErrorOnPayment(){const e=y.Z.querySelector(document,"#payone-apple-pay-error");e.style.display="block",e.scrollIntoView({block:"start"})}authorizePayment(e){let t=y.Z.querySelector(this.orderForm,"input[name='orderId']").value;this._httpClient.abort(),this._httpClient.post(this.processPaymentUrl,JSON.stringify({token:e.payment.token,orderId:t}),(e=>{this.completePayment(e),this.orderForm.submit()}))}completePayment(e){let t="",n="",r="";try{let a=JSON.parse(e);n=a.status,t=a.txid,r=a.userid}catch(e){this.orderForm.submit()}this.updateFormData(n,t,r,e),"APPROVED"!==n&&"PENDING"!==n||this.session.completePayment({status:ApplePaySession.STATUS_SUCCESS,errors:[]}),this.orderForm.submit()}updateFormData(e,t,n,r){y.Z.querySelector(this.orderForm,"input[name='status']").value=e,y.Z.querySelector(this.orderForm,"input[name='txid']").value=t,y.Z.querySelector(this.orderForm,"input[name='userid']").value=n,y.Z.querySelector(this.orderForm,"input[name='response']").value=r}_handleApplePayButtonClick(){this.orderForm.reportValidity()&&(this.createSession(),this.performPayment())}_registerEventHandler(){this.el.addEventListener("click",this._handleApplePayButtonClick.bind(this))}}v(b,"options",{countryCode:"",currencyCode:"",supportedNetworks:[],merchantCapabilities:["supports3DS","supportsDebit","supportsCredit"],total:{label:"",type:"final",amount:"0.01"}}),v(b,"session",void 0),v(b,"client",void 0),v(b,"validateMerchantUrl",void 0),v(b,"processPaymentUrl",void 0),v(b,"orderForm",void 0);class g extends o.Z{init(){this._client=new u.Z,this.ratepayRateInput=y.Z.querySelector(document,this.options.ratepayRateInputSelector),this.calculateInstallmentBtn=y.Z.querySelector(document,this.options.calculateInstallmentBtnSelector),this.ratepayRuntimeInput=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector),this.ratepayIbanContainer=y.Z.querySelector(document,this.options.ratepayIbanContainerSelector),this.ratepayIbanInput=y.Z.querySelector(document,this.options.ratepayIbanInputSelector),this._registerEventListeners(),this._handleInstallmentRuntimeChange()}_registerEventListeners(){this.calculateInstallmentBtn&&this.calculateInstallmentBtn.addEventListener("click",this._handleCalculateInstallmentButtonClick.bind(this)),this.ratepayRuntimeInput&&this.ratepayRuntimeInput.addEventListener("change",this._handleInstallmentRuntimeChange.bind(this)),document.querySelector(this.options.ratepayIbanContainerSelector).addEventListener("shown.bs.collapse",(()=>this.ratepayIbanInput.required=!0)),document.querySelector(this.options.ratepayIbanContainerSelector).addEventListener("hidden.bs.collapse",(()=>this.ratepayIbanInput.required=!1))}_handleCalculateInstallmentButtonClick(){const e=this.ratepayRateInput.value;this._sendRequest("rate",e)}_handleInstallmentRuntimeChange(){const e=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector).value;this._sendRequest("time",e)}_sendRequest(e,t){let n={ratepayInstallmentType:e,ratepayInstallmentValue:t};const r=JSON.stringify(n);this._client.abort(),this._client.post("/payone/ratepay/installment/calculation",r,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){this._replaceCalculationContent(e)}_replaceCalculationContent(e){y.Z.querySelector(document,this.options.ratepayInstallmentPlanContainerSelector).innerHTML=e,this.ratepayInstallmentTable=y.Z.querySelector(document,this.options.ratepayInstallmentTableSelector),this.ratepayRuntimeInput.value=this.ratepayInstallmentTable.dataset.ratepayNumberOfRates,this.ratepayRateInput.value=this.ratepayInstallmentTable.dataset.ratepayRate}}function f(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(g,"options",{ratepayRateInputSelector:"#ratepayRate",ratepayRuntimeInputSelector:"#ratepayRuntime",calculateInstallmentBtnSelector:"#payone-ratepay-calculate-installment-btn",ratepayInstallmentPlanContainerSelector:"#payone-ratepay-installment-plan",ratepayIbanContainerSelector:"#ratepayIbanContainer",ratepayIbanInputSelector:"#ratepayIban",ratepayInstallmentTableSelector:"#ratepayInstallmentTable"});class _ extends o.Z{init(){window.klarnaAsyncCallback=this._initKlarnaWidget.bind(this);const e=document.createElement("script");e.src="https://x.klarnacdn.net/kp/lib/v1/api.js",document.body.appendChild(e),this.orderForm=document.getElementById(this.options.selectorFormId),this.confirmFormSubmit=this.orderForm.querySelector("button[type=submit]"),this._registerEventListeners()}_initKlarnaWidget(){Klarna.Payments.init({client_token:this.options.clientToken}),Klarna.Payments.load({container:this.options.selectorContainer,payment_method_category:this.options.paymentMethodIdentifier},(e=>{new s.Z(this.confirmFormSubmit).remove()}))}_registerEventListeners(){this.orderForm&&this.orderForm.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){e.preventDefault(),Klarna.Payments.authorize({payment_method_category:this.options.paymentMethodIdentifier},{},(e=>{e.approved&&e.authorization_token?(document.querySelector(this.options.selectorTokenInput).value=e.authorization_token,this.orderForm.submit()):e.show_form?new s.Z(this.confirmFormSubmit).remove():e.show_form||(window.location.href=window.location.href)}))}}f(_,"options",{clientToken:null,paymentMethodIdentifier:null,selectorContainer:null,selectorTokenInput:'input[name="payoneKlarnaAuthorizationToken"]',selectorFormId:"confirmOrderForm"}),f(_,"orderForm",null),f(_,"confirmFormSubmit",null);class I extends o.Z{init(){if("amazon"in window)this.onLoad();else{var e=document.createElement("script");e.type="text/javascript",e.src="https://static-eu.payments-amazon.com/checkout.js",e.onload=this.onLoad.bind(this),document.head.appendChild(e)}}onLoad(){}}class S extends I{onLoad(){window.amazon.Pay.renderButton("#"+this.el.id,this.options)}}var E=n(4690);PluginManager.register("PayonePaymentAmazonPayExpressButton",S,"[data-payone-payment-amazon-pay-express-button]"),PluginManager.register("PayonePaymentAmazonPayRedirect",class extends S{init(){E.Z.create(document.querySelector(".content-main")),super.init()}onLoad(){super.onLoad(),document.querySelector("#"+this.el.id).dispatchEvent(new CustomEvent("click"))}},"[data-payone-payment-amazon-pay-redirect]");const C=window.PluginManager;C.register("PayonePaymentCreditCard",l,"[data-is-payone-credit-card]"),C.register("PayonePaymentDebitCard",m,"[data-is-payone-debit-card]"),C.register("PayonePaymentPayolutionInvoicing",h,"[data-is-payone-payolution-invoicing]"),C.register("PayonePaymentPayolutionInstallment",p,"[data-is-payone-payolution-installment]"),C.register("PayonePaymentApplePay",b,"[data-payone-payment-apple-pay-options]"),C.register("PayonePaymentRatepayInstallment",g,"[data-is-payone-ratepay-installment]"),C.register("PayonePaymentKlarna",_,"[data-payone-payment-klarna]")}},e=>{e.O(0,["vendor-node","vendor-shared"],(()=>{return t=898,e(e.s=t);var t}));e.O()}]);
\ No newline at end of file
diff --git a/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js b/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js
new file mode 100644
index 000000000..9151d0238
--- /dev/null
+++ b/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js
@@ -0,0 +1 @@
+(()=>{"use strict";var e={857:e=>{var t=function(e){var t;return!!e&&"object"==typeof e&&"[object RegExp]"!==(t=Object.prototype.toString.call(e))&&"[object Date]"!==t&&e.$$typeof!==n},n="function"==typeof Symbol&&Symbol.for?Symbol.for("react.element"):60103;function r(e,t){return!1!==t.clone&&t.isMergeableObject(e)?s(Array.isArray(e)?[]:{},e,t):e}function a(e,t,n){return e.concat(t).map(function(e){return r(e,n)})}function i(e){return Object.keys(e).concat(Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(e).filter(function(t){return Object.propertyIsEnumerable.call(e,t)}):[])}function o(e,t){try{return t in e}catch(e){return!1}}function s(e,n,l){(l=l||{}).arrayMerge=l.arrayMerge||a,l.isMergeableObject=l.isMergeableObject||t,l.cloneUnlessOtherwiseSpecified=r;var d,c,u=Array.isArray(n);return u!==Array.isArray(e)?r(n,l):u?l.arrayMerge(e,n,l):(c={},(d=l).isMergeableObject(e)&&i(e).forEach(function(t){c[t]=r(e[t],d)}),i(n).forEach(function(t){(!o(e,t)||Object.hasOwnProperty.call(e,t)&&Object.propertyIsEnumerable.call(e,t))&&(o(e,t)&&d.isMergeableObject(n[t])?c[t]=(function(e,t){if(!t.customMerge)return s;var n=t.customMerge(e);return"function"==typeof n?n:s})(t,d)(e[t],n[t],d):c[t]=r(n[t],d))}),c)}s.all=function(e,t){if(!Array.isArray(e))throw Error("first argument should be an array");return e.reduce(function(e,n){return s(e,n,t)},{})},e.exports=s}},t={};function n(r){var a=t[r];if(void 0!==a)return a.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}(()=>{n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t}})(),(()=>{n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})}})(),(()=>{n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t)})(),(()=>{var e=n(857),t=n.n(e);class r{static ucFirst(e){return e.charAt(0).toUpperCase()+e.slice(1)}static lcFirst(e){return e.charAt(0).toLowerCase()+e.slice(1)}static toDashCase(e){return e.replace(/([A-Z])/g,"-$1").replace(/^-/,"").toLowerCase()}static toLowerCamelCase(e,t){let n=r.toUpperCamelCase(e,t);return r.lcFirst(n)}static toUpperCamelCase(e,t){return t?e.split(t).map(e=>r.ucFirst(e.toLowerCase())).join(""):r.ucFirst(e.toLowerCase())}static parsePrimitive(e){try{return/^\d+(.|,)\d+$/.test(e)&&(e=e.replace(",",".")),JSON.parse(e)}catch(t){return e.toString()}}}class a{static isNode(e){return"object"==typeof e&&null!==e&&(e===document||e===window||e instanceof Node)}static hasAttribute(e,t){if(!a.isNode(e))throw Error("The element must be a valid HTML Node!");return"function"==typeof e.hasAttribute&&e.hasAttribute(t)}static getAttribute(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!1===a.hasAttribute(e,t))throw Error('The required property "'.concat(t,'" does not exist!'));if("function"!=typeof e.getAttribute){if(n)throw Error("This node doesn't support the getAttribute function!");return}return e.getAttribute(t)}static getDataAttribute(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2],i=t.replace(/^data(|-)/,""),o=r.toLowerCamelCase(i,"-");if(!a.isNode(e)){if(n)throw Error("The passed node is not a valid HTML Node!");return}if(void 0===e.dataset){if(n)throw Error("This node doesn't support the dataset attribute!");return}let s=e.dataset[o];if(void 0===s){if(n)throw Error('The required data attribute "'.concat(t,'" does not exist on ').concat(e,"!"));return s}return r.parsePrimitive(s)}static querySelector(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!a.isNode(e))throw Error("The parent node is not a valid HTML Node!");let r=e.querySelector(t)||!1;if(n&&!1===r)throw Error('The required element "'.concat(t,'" does not exist in parent node!'));return r}static querySelectorAll(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!a.isNode(e))throw Error("The parent node is not a valid HTML Node!");let r=e.querySelectorAll(t);if(0===r.length&&(r=!1),n&&!1===r)throw Error('At least one item of "'.concat(t,'" must exist in parent node!'));return r}}class i{publish(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=new CustomEvent(e,{detail:t,cancelable:n});return this.el.dispatchEvent(r),r}subscribe(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=this,a=e.split("."),i=n.scope?t.bind(n.scope):t;if(n.once&&!0===n.once){let t=i;i=function(n){r.unsubscribe(e),t(n)}}return this.el.addEventListener(a[0],i),this.listeners.push({splitEventName:a,opts:n,cb:i}),!0}unsubscribe(e){let t=e.split(".");return this.listeners=this.listeners.reduce((e,n)=>([...n.splitEventName].sort().toString()===t.sort().toString()?this.el.removeEventListener(n.splitEventName[0],n.cb):e.push(n),e),[]),!0}reset(){return this.listeners.forEach(e=>{this.el.removeEventListener(e.splitEventName[0],e.cb)}),this.listeners=[],!0}get el(){return this._el}set el(e){this._el=e}get listeners(){return this._listeners}set listeners(e){this._listeners=e}constructor(e=document){this._el=e,e.$emitter=this,this._listeners=[]}}class o{init(){throw Error('The "init" method for the plugin "'.concat(this._pluginName,'" is not defined.'))}update(){}_init(){this._initialized||(this.init(),this._initialized=!0)}_update(){this._initialized&&this.update()}_mergeOptions(e){let n=r.toDashCase(this._pluginName),i=a.getDataAttribute(this.el,"data-".concat(n,"-config"),!1),o=a.getAttribute(this.el,"data-".concat(n,"-options"),!1),s=[this.constructor.options,this.options,e];i&&s.push(window.PluginConfigManager.get(this._pluginName,i));try{o&&s.push(JSON.parse(o))}catch(e){throw console.error(this.el),Error('The data attribute "data-'.concat(n,'-options" could not be parsed to json: ').concat(e.message))}return t().all(s.filter(e=>e instanceof Object&&!(e instanceof Array)).map(e=>e||{}))}_registerInstance(){window.PluginManager.getPluginInstancesFromElement(this.el).set(this._pluginName,this),window.PluginManager.getPlugin(this._pluginName,!1).get("instances").push(this)}_getPluginName(e){return e||(e=this.constructor.name),e}constructor(e,t={},n=!1){if(!a.isNode(e))throw Error("There is no valid element given.");this.el=e,this.$emitter=new i(this.el),this._pluginName=this._getPluginName(n),this.options=this._mergeOptions(t),this._initialized=!1,this._registerInstance(),this._init()}}class s{static iterate(e,t){if(e instanceof Map||Array.isArray(e))return e.forEach(t);if(e instanceof FormData){for(var n of e.entries())t(n[1],n[0]);return}if(e instanceof NodeList)return e.forEach(t);if(e instanceof HTMLCollection)return Array.from(e).forEach(t);if(e instanceof Object)return Object.keys(e).forEach(n=>{t(e[n],n)});throw Error("The element type ".concat(typeof e," is not iterable!"))}}let l="loader",d={BEFORE:"before",INNER:"inner"};class c{create(){if(!this.exists()){if(this.position===d.INNER){this.parent.innerHTML=c.getTemplate();return}this.parent.insertAdjacentHTML(this._getPosition(),c.getTemplate())}}remove(){let e=this.parent.querySelectorAll(".".concat(l));s.iterate(e,e=>e.remove())}exists(){return this.parent.querySelectorAll(".".concat(l)).length>0}_getPosition(){return this.position===d.BEFORE?"afterbegin":"beforeend"}static getTemplate(){return'\n Loading...\n ')}static SELECTOR_CLASS(){return l}constructor(e,t=d.BEFORE){this.parent=e instanceof Element?e:document.body.querySelector(e),this.position=t}}class u extends c{create(){super.create(),this.parent.disabled=!0}remove(){super.remove(),this.parent.disabled=!1}_isButtonElement(){return"button"===this.parent.tagName.toLowerCase()}constructor(e,t="before"){if(super(e,t),!1===this._isButtonElement())throw Error("Parent element is not of type \n \n \n {{ $tc(\'sw-order.payone-payment.orderActionLog.responseDetailsModal.downloadButton\') }}\n \n \n \n \n \n \n\n \n \n \n \n \n \n{% endblock %}\n',inject:["repositoryFactory"],props:{order:{type:Object,required:!0}},data:function(){return{orderActionLogs:[],isLoading:!1,showRequestDetails:null,showResponseDetails:null}},computed:{orderActionLogRepository:function(){return this.repositoryFactory.create("payone_payment_order_action_log")},orderActionLogColumns:function(){return[{property:"transactionId",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleTransactionId")},{property:"request",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleRequest")},{property:"response",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleResponse")},{property:"amount",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleAmount")},{property:"requestDateTime",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime")}]},keyValueColumns:function(){return[{property:"key",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleKey")},{property:"value",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleValue")}]}},created:function(){this.createdComponent()},methods:{createdComponent:function(){this.getOrderActionLogs()},reloadActionLogs:function(){this.getOrderActionLogs()},getOrderActionLogs:function(){var e=this,t=new n;return t.addFilter(n.equals("orderId",this.order.id)),t.addSorting(n.sort("requestDateTime","ASC",!0)),this.isLoading=!0,this.orderActionLogRepository.search(t,Shopware.Context.api).then((function(t){e.orderActionLogs=t,e.isLoading=!1}))},openRequest:function(e){this.showRequestDetails=e.requestDetails},openResponse:function(e){this.showResponseDetails=e.responseDetails},onCloseRequestModal:function(){this.showRequestDetails=null},onCloseResponseModal:function(){this.showResponseDetails=null},toKeyValueSource:function(e){var t=[];for(var o in e)t.push({key:o,value:e[o]});return t.sort((function(e,t){return e.key.localeCompare(t.key)})),t},downloadAsTxt:function(e,t,o){var n=document.createElement("a");n.href="data:text/plain;charset=utf-8,"+encodeURIComponent(JSON.stringify(e,null,4)),n.download="PAYONE-".concat(t,"-").concat(o,".txt"),n.dispatchEvent(new MouseEvent("click")),n.remove()}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/12.js b/src/Resources/public/static/js/12.js
deleted file mode 100644
index b4303bf27..000000000
--- a/src/Resources/public/static/js/12.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[12],{BCCO:function(e,o,t){"use strict";t.r(o);var n=Shopware.Data.Criteria;o.default={template:'{% block payone_payment_webhook_log %}\n \n \n \n {{ item.webhookDateTime | date({ hour: \'2-digit\', minute: \'2-digit\' }) }}\n \n\n \n \n {{ $tc(\'sw-order.payone-payment.webhookLog.contextMenu.openWebhookDetails\') }}\n \n \n\n \n \n \n {{ $tc(\'sw-order.payone-payment.webhookLog.webhookDetailsModal.downloadButton\') }}\n \n \n \n \n \n \n\n \n \n \n \n \n \n{% endblock %}\n',inject:["repositoryFactory"],props:{order:{type:Object,required:!0}},data:function(){return{webhookLogs:[],isLoading:!1,showWebhookDetails:null}},computed:{webhookLogRepository:function(){return this.repositoryFactory.create("payone_payment_webhook_log")},webhookLogColumns:function(){return[{property:"transactionId",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleTransactionId")},{property:"transactionState",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleTransactionState")},{property:"sequenceNumber",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleSequenceNumber")},{property:"clearingType",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleClearingType")},{property:"webhookDateTime",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime")}]},keyValueColumns:function(){return[{property:"key",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleKey")},{property:"value",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleValue")}]}},created:function(){this.createdComponent()},methods:{createdComponent:function(){this.getWebhookLogs()},reloadWebhookLogs:function(){this.getWebhookLogs()},getWebhookLogs:function(){var e=this,o=new n;return o.addFilter(n.equals("orderId",this.order.id)),o.addSorting(n.sort("webhookDateTime","ASC",!0)),this.isLoading=!0,this.webhookLogRepository.search(o,Shopware.Context.api).then((function(o){e.webhookLogs=o,e.isLoading=!1}))},openDetails:function(e){this.showWebhookDetails=e.webhookDetails},onCloseWebhookModal:function(){this.showWebhookDetails=null},toKeyValueSource:function(e){var o=[];for(var t in e)o.push({key:t,value:e[t]});return o.sort((function(e,o){return e.key.localeCompare(o.key)})),o},downloadAsTxt:function(e,o,t){var n=document.createElement("a");n.href="data:text/plain;charset=utf-8,"+encodeURIComponent(JSON.stringify(e,null,4)),n.download="PAYONE-".concat(o,"-").concat(t,".txt"),n.dispatchEvent(new MouseEvent("click")),n.remove()}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/13.js b/src/Resources/public/static/js/13.js
deleted file mode 100644
index 90c1e3e41..000000000
--- a/src/Resources/public/static/js/13.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[13],{oIyD:function(n,a,t){"use strict";t.r(a);a.default={template:'{% block sw_order_detail_content_tabs_extension %}\n {% parent %}\n\n {% block sw_order_detail_content_tabs_payone %}\n \n {{ $tc(\'sw-order.detail.payone\') }}\n \n {% endblock %}\n\n{% endblock %}',methods:{hasPayoneTransaction:function(n){var a=this,t=!1;return!!n.transactions&&(n.transactions.map((function(n){a.isPayoneTransaction(n)&&a.isActiveTransaction(n)&&(t=!0)})),t)},isPayoneTransaction:function(n){return!!(n.extensions&&n.extensions.payonePaymentOrderTransactionData&&n.extensions.payonePaymentOrderTransactionData.transactionId)&&n.extensions.payonePaymentOrderTransactionData.transactionId},isActiveTransaction:function(n){return"cancelled"!==n.stateMachineState.technicalName}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/14.js b/src/Resources/public/static/js/14.js
deleted file mode 100644
index c2e5d16f6..000000000
--- a/src/Resources/public/static/js/14.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[14],{"5hNW":function(e,t,r){"use strict";r.r(t);function o(e){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function n(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,o)}return r}function a(e,t,r){return(t=function(e){var t=function(e,t){if("object"!==o(e)||null===e)return e;var r=e[Symbol.toPrimitive];if(void 0!==r){var n=r.call(e,t||"default");if("object"!==o(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"===o(t)?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i=Shopware.Component.getComponentHelper().mapState;t.default={template:'{% block sw_order_detail_payone %}\n \n {% block sw_order_detail_payone_general %}\n n.parts.length&&(r.parts.length=n.parts.length)}else{var a=[];for(i=0;i=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,l=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return s=e.done,e},e:function(e){l=!0,a=e},f:function(){try{s||null==n.return||n.return()}finally{if(l)throw a}}}}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n\n {% block payone_ratepay_shop_ids %}\n {{ $tc(\'payone-payment.general.headlines.ratepayProfiles\') }}
\n \n\n {% block payone_ratepay_shop_ids_actions %}\n \n\n {% block payone_ratepay_shop_ids_create_actions %}\n \n \n {{ $tc(\'payone-payment.general.actions.addShop\') }}\n \n \n {% endblock %}\n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_grid %}\n \n {% block payone_ratepay_shop_ids_grid_columns %}\n {% block payone_ratepay_shop_ids_grid_column_status %}\n \n \n \n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_bulk_actions %}\n \n {% block sw_settings_units_content_grid_column_menu_delete %}\n \n {{ $tc(\'global.default.delete\') }}\n \n {% endblock %}\n \n {% endblock %}\n {% endblock %}\n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_error %}\n \n {{ $tc(\'payone-payment.general.errors.existingShopId\') }}\n \n\n \n {{ $tc(\'payone-payment.general.errors.emptyInputs\') }}\n \n {% endblock %}\n \n {% endblock %}\n \n{% endblock %}\n',props:{value:{type:Array,required:!1,default:function(){return[]}},name:{type:String,required:!0}},data:function(){return{selectedItems:{},newItem:null,showDuplicateAlert:!1,showEmptyAlert:!1,profiles:this.value}},computed:{getLineItemColumns:function(){return[{property:"shopId",dataIndex:"shopId",label:this.$tc("payone-payment.general.label.shopId"),allowResize:!1,inlineEdit:"string",width:"200px",primary:!0},{property:"currency",dataIndex:"currency",label:this.$tc("payone-payment.general.label.currency"),allowResize:!1,inlineEdit:"string",width:"200px",primary:!0},{property:"error",label:this.$tc("payone-payment.general.label.error"),allowResize:!1,width:"100px",primary:!0}]}},watch:{profiles:function(e){this.$emit("input",e),this.$emit("change",e)}},created:function(){this.createdComponent()},destroyed:function(){this.destroyedComponent()},methods:{createdComponent:function(){this.$root.$on("payone-ratepay-profiles-update-result",this.onProfilesUpdateResult)},destroyedComponent:function(){this.$root.$off("payone-ratepay-profiles-update-result")},onProfilesUpdateResult:function(e){if(e.updates[this.name]&&(this.profiles=e.updates[this.name]),e.errors[this.name]){var t,n=r(e.errors[this.name]);try{for(n.s();!(t=n.n()).done;){var i=t.value;this.profiles.push(i)}}catch(e){n.e(e)}finally{n.f()}}},onInlineEditCancel:function(e){""===e.shopId&&""===e.currency&&this.profiles.forEach((function(t,n,r){t.id===e.id&&r.splice(n,1)})),this.$emit("item-cancel")},onInlineEditSave:function(e){var t=this;if(""!==e.shopId&&""!==e.currency){this.showEmptyAlert=!1;var n=!1;this.profiles.forEach((function(t){t.id!==e.id&&t.shopId===e.shopId&&(n=!0)})),n?(this.showDuplicateAlert=!0,this.$nextTick((function(){t.$refs.shopIdsDataGrid.currentInlineEditId=e.id,t.$refs.shopIdsDataGrid.enableInlineEdit()}))):this.showDuplicateAlert=!1}else this.showEmptyAlert=!0,this.$nextTick((function(){t.$refs.shopIdsDataGrid.currentInlineEditId=e.id,t.$refs.shopIdsDataGrid.enableInlineEdit()}));this.$emit("update-list",this.profiles)},createNewLineItem:function(){(0===this.profiles.length||""!==this.profiles[this.profiles.length-1].shopId)&&this.createLine()},createLine:function(){var e=this,t=o.createId();this.profiles.push({id:t,shopId:"",currency:""}),this.$nextTick((function(){e.$refs.shopIdsDataGrid.currentInlineEditId=t,e.$refs.shopIdsDataGrid.enableInlineEdit()}))},onDeleteSelectedItem:function(e){this.profiles=this.profiles.filter((function(t){return t.shopId!==e.shopId})),this.$emit("deleted",this.profiles)}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/3.js b/src/Resources/public/static/js/3.js
deleted file mode 100644
index ff4996f00..000000000
--- a/src/Resources/public/static/js/3.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[3],{"9Noe":function(e,n,t){},BNRB:function(e,n,t){var a=t("9Noe");a.__esModule&&(a=a.default),"string"==typeof a&&(a=[[e.i,a,""]]),a.locals&&(e.exports=a.locals);(0,t("P8hj").default)("ac5b0c1e",a,!0,{})},G7iR:function(e,n,t){"use strict";t.r(n);t("BNRB");var a=Shopware.Mixin,i=Shopware.Utils,s=i.object,o=i.types;n.default={template:'{% block payone_payment %}\n\n {% block payone_payment_header %}\n \n \n {{ $tc(\'sw-settings.index.title\') }}\n
\n \n {% endblock %}\n\n {% block payone_payment_actions %}\n \n {% block payone_payment_settings_actions_feedback %}\n \n {{ $tc(\'payone-payment.supportModal.menuButton\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_notification_forward_target %}\n \n {{ $tc(\'payonePayment.notificationTarget.module.buttonTitle\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_test %}\n \n {{ $tc(\'payone-payment.settingsForm.test\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_save %}\n \n {{ $tc(\'payone-payment.settingsForm.save\') }}\n \n {% endblock %}\n \n {% endblock %}\n\n {% block payone_payment_settings_content %}\n \n \n \n \n \n \n \n {{ $tc(\'payone-payment.supportModal.documentation.description\') }}\n
\n \n \n {{ $tc(\'payone-payment.supportModal.documentation.button\') }}\n \n \n \n \n \n \n {{ $tc(\'payone-payment.supportModal.support.description\') }}\n
\n \n \n {{ $tc(\'payone-payment.supportModal.support.button\') }}\n \n \n \n \n \n \n {{ $tc(\'payone-payment.supportModal.repository.description\') }}\n
\n \n \n {{ $tc(\'payone-payment.supportModal.repository.button\') }}\n \n \n \n \n \n \n {{ $tc(\'payone-payment.supportModal.testdata.description\') }}\n
\n \n \n {{ $tc(\'payone-payment.supportModal.testdata.button\') }}\n \n \n \n \n\n \n \n\n \n \n \n \n \n \n\n {{ $tc(\'payone-payment.general.label.reloadConfigInfo\') }}
\n \n\n \n \n\n \n \n \n \n {% endblock %}\n\n{% endblock %}\n',mixins:[a.getByName("notification"),a.getByName("sw-inline-snippet")],inject:["PayonePaymentSettingsService"],data:function(){return{isLoading:!1,isTesting:!1,isSaveSuccessful:!1,isTestSuccessful:!1,isApplePayCertConfigured:!0,config:{},merchantIdFilled:!1,accountIdFilled:!1,portalIdFilled:!1,portalKeyFilled:!1,showValidationErrors:!1,isSupportModalOpen:!1,stateMachineTransitionActions:[],displayStatusMapping:{},collapsibleState:{status_mapping:!0,payment_credit_card:!0,payment_paypal:!0,payment_paypal_express:!0,payment_debit:!0,payment_sofort:!0,payment_payolution_installment:!0,payment_payolution_invoicing:!0,payment_payolution_debit:!0,payment_eps:!0,payment_ideal:!0,payment_paydirekt:!0,payment_prepayment:!0,payment_trustly:!0,payment_secure_invoice:!0,payment_open_invoice:!0,payment_apple_pay:!0,payment_bancontact:!0,payment_ratepay_debit:!0,payment_ratepay_installment:!0,payment_ratepay_invoicing:!0,payment_klarna_invoice:!0,payment_klarna_direct_debit:!0,payment_klarna_installment:!0,payment_przelewy24:!0,payment_we_chat_pay:!0,payment_postfinanceCard:!0,payment_postfinanceWallet:!0,payment_alipay:!0,payment_secured_invoice:!0,payment_secured_installment:!0,payment_secured_direct_debit:!0,payment_amazon_pay:!0,payment_amazon_pay_express:!0}}},created:function(){this.createdComponent()},computed:{credentialsMissing:function(){return!(this.merchantIdFilled&&this.accountIdFilled&&this.portalIdFilled&&this.portalKeyFilled)}},metaInfo:function(){return{title:this.$createTitle()}},methods:{createdComponent:function(){var e=this,n=this;this.PayonePaymentSettingsService.getStateMachineTransitionActions().then((function(e){e.data.forEach((function(e){var t="payone-payment.transitionActionNames."+e.label,a=n.$t(t);a===t&&(a=e.label),n.stateMachineTransitionActions.push({label:a,value:e.value})}))})),this.PayonePaymentSettingsService.hasApplePayCert().then((function(n){e.isApplePayCertConfigured=n}))},paymentMethodPrefixes:function(){return["creditCard","debit","paypal","paypalExpress","payolutionInvoicing","payolutionInstallment","payolutionDebit","sofort","eps","iDeal","paydirekt","prepayment","trustly","secureInvoice","openInvoice","applePay","bancontact","ratepayDebit","ratepayInstallment","ratepayInvoicing","klarnaInvoice","klarnaDirectDebit","klarnaInstallment","przelewy24","weChatPay","postfinanceCard","postfinanceWallet","alipay","securedInvoice","securedInstallment","securedDirectDebit","amazonPay","amazonPayExpress"]},isVisiblePaymentMethodCard:function(e){return e.name.startsWith("payment")&&!this.isCollapsed(e)},isCollapsible:function(e){return e.name in this.collapsibleState},displayField:function(e,n,t){return!(t.name in this.collapsibleState)||!this.collapsibleState[t.name]},isCollapsed:function(e){return this.collapsibleState[e.name]},toggleCollapsible:function(e){e.name in this.collapsibleState&&(this.collapsibleState[e.name]=!this.collapsibleState[e.name])},saveFinish:function(){this.isSaveSuccessful=!1},testFinish:function(){this.isTestSuccessful=!1},onConfigChange:function(e){this.config=e,this.checkCredentialsFilled(),this.showValidationErrors=!1},checkCredentialsFilled:function(){this.merchantIdFilled=!!this.getConfigValue("merchantId"),this.accountIdFilled=!!this.getConfigValue("accountId"),this.portalIdFilled=!!this.getConfigValue("portalId"),this.portalKeyFilled=!!this.getConfigValue("portalKey")},getConfigValue:function(e){var n=this.$refs.systemConfig.actualConfigData.null;return null===this.$refs.systemConfig.currentSalesChannelId?this.config["PayonePayment.settings.".concat(e)]:this.config["PayonePayment.settings.".concat(e)]||n["PayonePayment.settings.".concat(e)]},getPaymentConfigValue:function(e,n){var t=e.charAt(0).toUpperCase()+e.slice(1);return this.getConfigValue(n+t)||this.getConfigValue(e)},onSave:function(){var e=this;this.credentialsMissing?this.showValidationErrors=!0:(this.isSaveSuccessful=!1,this.isLoading=!0,this.$refs.systemConfig.saveAll().then((function(n){e.handleRatepayProfileUpdates(n),e.isLoading=!1,e.isSaveSuccessful=!0})).catch((function(){e.isLoading=!1})))},onTest:function(){var e=this;this.isTesting=!0,this.isTestSuccessful=!1;var n={};this.paymentMethodPrefixes().forEach((function(t){n[t]={merchantId:e.getPaymentConfigValue("merchantId",t),accountId:e.getPaymentConfigValue("accountId",t),portalId:e.getPaymentConfigValue("portalId",t),portalKey:e.getPaymentConfigValue("portalKey",t)}})),this.PayonePaymentSettingsService.validateApiCredentials(n).then((function(n){var t=n.testCount,a=n.credentialsValid,i=n.errors;if(a)e.createNotificationSuccess({title:e.$tc("payone-payment.settingsForm.titleSuccess"),message:t>0?e.$tc("payone-payment.settingsForm.messageTestSuccess"):e.$tc("payone-payment.settingsForm.messageTestNoTestedPayments")}),e.isTestSuccessful=!0;else for(var s in i)if(i.hasOwnProperty(s)){e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:e.$tc("payone-payment.settingsForm.messageTestError."+s)});var o=i[s];"string"==typeof o&&e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:o})}e.isTesting=!1})).catch((function(n){e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:e.$tc("payone-payment.settingsForm.messageTestError.general")}),e.isTesting=!1}))},getBind:function(e,n){var t;return n!==this.config&&(this.config=n),this.showValidationErrors&&("PayonePayment.settings.merchantId"!==e.name||this.merchantIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.accountId"!==e.name||this.accountIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.portalId"!==e.name||this.portalIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.portalKey"!==e.name||this.portalKeyFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")})),this.$refs.systemConfig.config.forEach((function(n){n.elements.forEach((function(n){n.name!==e.name||(t=n)}))})),t||e},getElementBind:function(e){var n=s.deepCopyObject(e);return null!==this.currentSalesChannelId&&this.inherit&&this.actualConfigData.hasOwnProperty("null")&&null!==this.actualConfigData.null[n.name]&&("single-select"===n.type||"sw-entity-single-select"===n.config.componentName?n.placeholder=this.$tc("sw-settings.system-config.inherited"):"bool"===n.type?n.config.inheritedValue=this.actualConfigData.null[n.name]||!1:"password"===n.type?(n.placeholderIsPassword=!0,n.placeholder="".concat(this.actualConfigData.null[n.name])):"multi-select"===n.type||o.isUndefined(this.actualConfigData.null[n.name])||(n.placeholder="".concat(this.actualConfigData.null[n.name]))),["single-select","multi-select"].includes(n.type)&&(n.config.labelProperty="name",n.config.valueProperty="id"),n},handleRatepayProfileUpdates:function(e){var n=this.$refs.systemConfig.currentSalesChannelId;if(e.payoneRatepayProfilesUpdateResult&&e.payoneRatepayProfilesUpdateResult[n]){var t=e.payoneRatepayProfilesUpdateResult[n];this.$root.$emit("payone-ratepay-profiles-update-result",t),Array.isArray(t.errors)||this.createNotificationError({title:this.$tc("payone-payment.settingsForm.titleError"),message:this.$tc("payone-payment.settingsForm.messageSaveError.ratepayProfilesUpdateFailed")})}}}}},P8hj:function(e,n,t){"use strict";function a(e,n){for(var t=[],a={},i=0;it.parts.length&&(a.parts.length=t.parts.length)}else{var o=[];for(i=0;i\n \n \n {{ $tc(\'sw-order.payone-payment.capture.buttonTitle\') }}\n \n \n\n \n \n \n\n \n \n \n \n\n \n \n {{ $tc(\'sw-order.payone-payment.modal.close\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.capture.submit\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.capture.fullSubmit\') }}\n \n \n \n \n{% endblock %}\n',mixins:[o.getByName("notification")],inject:["PayonePaymentService","repositoryFactory"],props:{order:{type:Object,required:!0},transaction:{type:Object,required:!0}},computed:{decimalPrecision:function(){return this.order&&this.order.currency?this.order.currency.decimalPrecision?this.order.currency.decimalPrecision:this.order.currency.itemRounding?this.order.currency.itemRounding.decimals:void 0:2},totalTransactionAmount:function(){return Math.round(this.transaction.amount.totalPrice*Math.pow(10,this.decimalPrecision),0)},capturedAmount:function(){return this.transaction.extensions&&this.transaction.extensions.payonePaymentOrderTransactionData&&this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount?this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount:0},remainingAmount:function(){return this.totalTransactionAmount-this.capturedAmount},maxCaptureAmount:function(){return this.remainingAmount/Math.pow(10,this.decimalPrecision)},buttonEnabled:function(){return!(!this.transaction.extensions||!this.transaction.extensions.payonePaymentOrderTransactionData)&&(this.remainingAmount>0&&this.capturedAmount>0||this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture)},isItemSelected:function(){var e=!1;return this.selection.forEach((function(t){t.selected&&(e=!0)})),e},hasRemainingShippingCosts:function(){var e=this;if(this.order.shippingCosts.totalPrice<=0)return!1;var t=this.order.shippingCosts.totalPrice*Math.pow(10,this.decimalPrecision),n=0;return this.order.lineItems.forEach((function(t){t.customFields&&t.customFields.payone_captured_quantity&&0=t)}},data:function(){return{isLoading:!1,hasError:!1,showCaptureModal:!1,isCaptureSuccessful:!1,selection:[],captureAmount:0,includeShippingCosts:!1}},methods:{calculateCaptureAmount:function(){var e=0;this.selection.forEach((function(t){t.selected&&(e+=t.unit_price*t.quantity)})),e>this.remainingAmount&&(e=this.remainingAmount),this.captureAmount=e},openCaptureModal:function(){this.showCaptureModal=!0,this.isCaptureSuccessful=!1,this.selection=[]},closeCaptureModal:function(){this.showCaptureModal=!1},onCaptureFinished:function(){this.isCaptureSuccessful=!1},captureOrder:function(){var e=this,t={orderTransactionId:this.transaction.id,payone_order_id:this.transaction.extensions.payonePaymentOrderTransactionData.transactionId,salesChannel:this.order.salesChannel,amount:this.captureAmount,orderLines:[],complete:this.captureAmount===this.remainingAmount,includeShippingCosts:!1};this.isLoading=!0,this.selection.forEach((function(n){e.order.lineItems.forEach((function(e){if(e.id===n.id&&n.selected&&00&&this.selection.push({id:"shipping",quantity:1,unit_price:this.order.shippingCosts.totalPrice,selected:!1})}}}},HFKe:function(e,t,n){},P8hj:function(e,t,n){"use strict";function i(e,t){for(var n=[],i={},r=0;rn.parts.length&&(i.parts.length=n.parts.length)}else{var o=[];for(r=0;r\n \n\n \n {{ item.product }}\n \n\n \n {{ item.price }}\n \n\n \n \n \n \n \n \n{% endblock %}\n',props:{order:{type:Object,required:!0},mode:{type:String,required:!1}},computed:{orderItems:function(){var e=this,t=[];return this.order.lineItems.forEach((function(n){var r=e.$options.filters.currency(n.totalPrice,e.order.currency.shortName,e.order.decimal_precision),i=!1,o=n.quantity;n.customFields&&("refund"===e.mode?(n.customFields.payone_captured_quantity&&0>n.customFields.payone_captured_quantity&&(o=n.customFields.payone_captured_quantity),n.customFields.payone_refunded_quantity&&(o-=n.customFields.payone_refunded_quantity)):"capture"===e.mode&&n.customFields.payone_captured_quantity&&0o&&(i=!0),t.push({id:n.id,product:n.label,quantity:o,disabled:i,selected:!1,price:r,orderItem:n})})),this.order.shippingCosts.totalPrice>0&&t.push({id:"shipping",product:this.$tc("sw-order.payone-payment.modal.shippingCosts"),quantity:1,disabled:!1,selected:!1,price:this.$options.filters.currency(this.order.shippingCosts.totalPrice,this.order.currency.shortName,this.order.decimal_precision),orderItem:{}}),t},orderItemColumns:function(){return[{property:"product",label:this.$tc("sw-order.payone-payment.modal.columns.product"),rawData:!0},{property:"quantity",label:this.$tc("sw-order.payone-payment.modal.columns.quantity"),rawData:!0},{property:"price",label:this.$tc("sw-order.payone-payment.modal.columns.price"),rawData:!0}]}},methods:{onSelectItem:function(e,t,n){this.$emit("select-item",t.id,n)},onChangeQuantity:function(e,t){this.$emit("change-quantity",t,e)}}}},P8hj:function(e,t,n){"use strict";function r(e,t){for(var n=[],r={},i=0;in.parts.length&&(r.parts.length=n.parts.length)}else{var s=[];for(i=0;it.parts.length&&(a.parts.length=t.parts.length)}else{var i=[];for(r=0;r\n \n \n \n \n \n {{ $tc(\'sw-order.payone-payment.paymentMethod\') }} \n {{ transaction.paymentMethod.translated.distinguishableName }} \n\n \n {{ $tc(\'sw-order.payone-payment.creditCard.cardTypeLabel\') }} \n {{ getPayoneCardType(transaction) }} \n \n\n {{ $tc(\'sw-order.payone-payment.txid\') }} \n {{ transaction.extensions.payonePaymentOrderTransactionData.transactionId }} \n\n {{ $tc(\'sw-order.payone-payment.sequenceNumber.label\') }} \n \n \n {{ $tc(\'sw-order.payone-payment.sequenceNumber.empty\') }}\n \n \n {{ transaction.extensions.payonePaymentOrderTransactionData.sequenceNumber }}\n \n \n\n {{ $tc(\'sw-order.payone-payment.transactionState\') }} \n {{ transaction.extensions.payonePaymentOrderTransactionData.transactionState }} \n {{ $tc(\'sw-order.payone-payment.transactionCancelled\') }} \n \n \n\n \n \n \n\n \n {{ $tc(\'payonePayment.notificationTarget.list.title\') }}\n\n \n\n \n {{ item.updatedAt| date({ hour: \'2-digit\', minute: \'2-digit\' }) }}\n \n\n \n \n {{ $tc(\'payonePayment.notificationTarget.actions.requeue\') }}\n \n \n\n \n \n \n \n \n{% endblock %}\n',inject:["acl","PayonePaymentService","repositoryFactory"],mixins:[a.getByName("notification")],props:{order:{type:Object,required:!0}},data:function(){return{notificationForwards:null}},computed:{payoneTransactions:function(){var e=this;return this.order.transactions.filter((function(n){return e.isPayoneTransaction(n)})).sort((function(e,n){return e.createdAtn.createdAt?-1:0}))},notificationForwardRepository:function(){return this.repositoryFactory.create("payone_payment_notification_forward")},notificationTargetColumns:function(){return[{property:"txaction",type:"text",width:"100px"},{property:"notificationTarget.url",type:"text"},{property:"response",width:"100px"},{property:"updatedAt",align:"right",type:"date"}]}},methods:{isPayoneTransaction:function(e){return!!(e.extensions&&e.extensions.payonePaymentOrderTransactionData&&e.extensions.payonePaymentOrderTransactionData.transactionId)&&e.extensions.payonePaymentOrderTransactionData.transactionId},isActiveTransaction:function(e){return"cancelled"!==e.stateMachineState.technicalName},hasNotificationForwards:function(e){return null===this.notificationForwards?(this.getNotificationForwards(e),!1):this.notificationForwards.length>0},getNotificationForwards:function(e){var n=this,t=new r;return t.addAssociation("notificationTarget"),t.addSorting(r.sort("updatedAt","DESC",!0)),t.addFilter(r.equals("transactionId",e.id)),t.setLimit(500),this.notificationForwardRepository.search(t,Shopware.Context.api).then((function(e){n.notificationForwards=e}))},requeue:function(e,n){var t=this,a={notificationForwardId:e.id};this.PayonePaymentService.requeueNotificationForward(a).then((function(){t.createNotificationSuccess({title:t.$tc("payonePayment.notificationTarget.actions.requeue"),message:t.$tc("payonePayment.notificationTarget.messages.success")}),t.getNotificationForwards(n)})).catch((function(e){t.createNotificationError({title:t.$tc("payonePayment.notificationTarget.actions.requeue"),message:e.message})})).finally((function(){t.$nextTick().then((function(){t.$emit("reload")}))}))},can:function(e){try{return this.acl.can(e)}catch(e){return!0}},reloadEntityData:function(){this.$emit("reload-entity-data")},getPayoneCardType:function(e){var n,t,a=null===(n=e.extensions.payonePaymentOrderTransactionData)||void 0===n||null===(t=n.additionalData)||void 0===t?void 0:t.card_type;return a?this.$tc("sw-order.payone-payment.creditCard.cardTypes."+a):null}}}},rDSL:function(e,n,t){}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/7.js b/src/Resources/public/static/js/7.js
deleted file mode 100644
index f5068eacd..000000000
--- a/src/Resources/public/static/js/7.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[7],{P8hj:function(e,n,t){"use strict";function i(e,n){for(var t=[],i={},r=0;rt.parts.length&&(i.parts.length=t.parts.length)}else{var s=[];for(r=0;r\n \n \n {{ $tc(\'sw-order.payone-payment.refund.buttonTitle\') }}\n \n \n\n \n \n \n\n \n \n \n \n\n \n \n {{ $tc(\'sw-order.payone-payment.modal.close\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.refund.submit\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.refund.fullSubmit\') }}\n \n \n \n \n{% endblock %}\n',mixins:[s.getByName("notification")],inject:["PayonePaymentService"],props:{order:{type:Object,required:!0},transaction:{type:Object,required:!0}},data:function(){return{isLoading:!1,hasError:!1,showRefundModal:!1,isRefundSuccessful:!1,selection:[],refundAmount:0,includeShippingCosts:!1}},computed:{decimalPrecision:function(){return this.order&&this.order.currency?this.order.currency.decimalPrecision?this.order.currency.decimalPrecision:this.order.currency.itemRounding?this.order.currency.itemRounding.decimals:void 0:2},remainingAmount:function(){return this.transaction.extensions&&this.transaction.extensions.payonePaymentOrderTransactionData&&this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount?this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount-this.refundedAmount:0},refundedAmount:function(){return this.transaction.extensions&&this.transaction.extensions.payonePaymentOrderTransactionData&&this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount?this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount:0},maxRefundAmount:function(){return this.remainingAmount/Math.pow(10,this.decimalPrecision)},buttonEnabled:function(){return!(!this.transaction.extensions||!this.transaction.extensions.payonePaymentOrderTransactionData)&&(this.remainingAmount>0&&this.refundedAmount>0||this.transaction.extensions.payonePaymentOrderTransactionData.allowRefund)},hasRemainingRefundableShippingCosts:function(){var e=this;if(this.order.shippingCosts.totalPrice<=0)return!1;var n=this.order.shippingCosts.totalPrice*Math.pow(10,this.decimalPrecision),t=0;return this.order.lineItems.forEach((function(n){n.customFields&&n.customFields.payone_refunded_quantity&&0=n)}},methods:{calculateRefundAmount:function(){var e=0;this.selection.forEach((function(n){n.selected&&(e+=n.unit_price*n.quantity)})),Math.round(e*Math.pow(10,this.decimalPrecision)>this.remainingAmount)&&(e=this.remainingAmount/Math.pow(10,this.decimalPrecision)),this.refundAmount=e},openRefundModal:function(){this.showRefundModal=!0,this.isRefundSuccessful=!1,this.selection=[]},closeRefundModal:function(){this.showRefundModal=!1},onRefundFinished:function(){this.isRefundSuccessful=!1},refundOrder:function(){var e=this,n={orderTransactionId:this.transaction.id,payone_order_id:this.transaction.extensions.payonePaymentOrderTransactionData.transactionId,salesChannel:this.order.salesChannel,amount:this.refundAmount,orderLines:[],complete:this.refundAmount===this.maxRefundAmount,includeShippingCosts:!1};this.isLoading=!0,this.selection.forEach((function(t){e.order.lineItems.forEach((function(i){if(i.id===t.id&&t.selected&&00&&this.selection.push({id:"shipping",quantity:1,unit_price:this.order.shippingCosts.totalPrice,selected:!1})}}}},gGSi:function(e,n,t){var i=t("XLtl");i.__esModule&&(i=i.default),"string"==typeof i&&(i=[[e.i,i,""]]),i.locals&&(e.exports=i.locals);(0,t("P8hj").default)("a57efdc2",i,!0,{})}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/8.js b/src/Resources/public/static/js/8.js
deleted file mode 100644
index 9c8393515..000000000
--- a/src/Resources/public/static/js/8.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[8],{hgH7:function(t,n,i){"use strict";i.r(n);var a=Shopware.Mixin;n.default={template:'{% block payone_notification_target_detail %}\n \n\n {% block payone_notification_target_detail_header %}\n \n {{ $tc(\'payonePayment.notificationTarget.detail.headline\') }}
\n \n {% endblock %}\n\n {% block payone_notification_target_detail_actions %}\n \n\n {% block payone_notification_target_detail_actions_abort %}\n \n {{ $tc(\'payonePayment.notificationTarget.detail.label.buttonCancel\') }}\n \n {% endblock %}\n\n {% block payone_notification_target_detail_actions_save %}\n \n {{ $tc(\'payonePayment.notificationTarget.detail.label.buttonSave\') }}\n \n {% endblock %}\n\n \n {% endblock %}\n\n {% block payone_notification_target_detail_content %}\n \n\n {% block payone_notification_target_detail_base_basic_info_card %}\n \n \n \n \n\n {% block payone_notification_target_detail_base_info_field_url %}\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_is_basic_auth %}\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_is_basic_auth_fields %}\n \n \n\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_txactions %}\n \n \n {% endblock %}\n\n \n \n \n \n {% endblock %}\n \n {% endblock %}\n\n \n{% endblock %}\n',inject:["repositoryFactory"],mixins:[a.getByName("notification")],shortcuts:{"SYSTEMKEY+S":"onSave",ESCAPE:"onCancel"},props:{notificationTargetId:{type:String,required:!1,default:null}},data:function(){return{notificationTarget:null,isLoading:!1,isSaveSuccessful:!1}},metaInfo:function(){return{title:this.$createTitle(this.identifier)}},computed:{notificationTargetIsLoading:function(){return this.isLoading||null==this.notificationTarget},notificationTargetRepository:function(){return this.repositoryFactory.create("payone_payment_notification_target")}},watch:{notificationTargetId:function(){this.createdComponent()}},created:function(){this.createdComponent()},methods:{updateSelection:function(t){this.notificationTarget.txactions=t},createdComponent:function(){this.notificationTargetId?this.loadEntityData():(Shopware.State.commit("context/resetLanguageToDefault"),this.notificationTarget=this.notificationTargetRepository.create(Shopware.Context.api))},loadEntityData:function(){var t=this;this.isLoading=!0,this.notificationTargetRepository.get(this.notificationTargetId,Shopware.Context.api).then((function(n){t.isLoading=!1,t.notificationTarget=n,null!==n.txactions&&(n.txactions.length||(t.notificationTarget.txactions=null))}))},isInvalid:function(){return!0===this.notificationTarget.isBasicAuth&&((!this.notificationTarget.username||!this.notificationTarget.password)&&(this.createNotificationError({message:this.$tc("global.notification.notificationSaveErrorMessageRequiredFieldsInvalid")}),!0))},onSave:function(){var t=this;this.isInvalid()||(this.isLoading=!0,this.notificationTargetRepository.save(this.notificationTarget,Shopware.Context.api).then((function(){t.isLoading=!1,t.isSaveSuccessful=!0,null!==t.notificationTargetId?t.loadEntityData():t.$router.push({name:"payone.notification.target.detail",params:{id:t.notificationTarget.id}})})).catch((function(n){throw t.isLoading=!1,t.createNotificationError({message:t.$tc("global.notification.notificationSaveErrorMessageRequiredFieldsInvalid")}),n})))},onCancel:function(){this.$router.push({name:"payone.notification.target.list"})}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/9.js b/src/Resources/public/static/js/9.js
deleted file mode 100644
index 832794894..000000000
--- a/src/Resources/public/static/js/9.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[9],{BnAH:function(t,n,e){"use strict";e.r(n);function i(t){return(i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function o(t,n){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);n&&(i=i.filter((function(n){return Object.getOwnPropertyDescriptor(t,n).enumerable}))),e.push.apply(e,i)}return e}function a(t){for(var n=1;n\n\n {% block payone_notification_target_list_smart_bar_header %}\n \n {% block payone_notification_target_list_smart_bar_header_title %}\n \n\n {% block payone_notification_target_list_smart_bar_header_title_text %}\n {{ $tc(\'payonePayment.notificationTarget.list.title\') }}\n {% endblock %}\n\n {% block payone_notification_target_list_smart_bar_header_amount %}\n \n {% endblock %}\n
\n {% endblock %}\n \n {% endblock %}\n\n {% block payone_notification_target_list_actions %}\n \n {% block payone_notification_target_list_smart_bar_actions %}\n \n {{ $tc(\'payonePayment.notificationTarget.list.buttonCreate\') }}\n \n {% endblock %}\n \n {% endblock %}\n\n {% block payone_notification_target_list_content %}\n \n\n {% block payone_notification_target_list_content_list %}\n \n\n {% block payone_notification_target_list_grid_columns %}\n {% block payone_notification_target_list_grid_columns_url %}\n \n \n {{ item.url }}\n \n \n {% endblock %}\n\n {% block payone_notification_target_list_grid_columns_is_basic_auth %}\n \n \n {% endblock %}\n\n {% block payone_notification_target_list_empty_state %}\n \n \n {% endblock %}\n \n {% endblock %}\n\n {% block payone_notification_target_list_sidebar %}\n \n \n\n {% block payone_notification_target_list_sidebar_refresh %}\n \n \n {% endblock %}\n \n \n {% endblock %}\n
-
{{ $tc('global.default.delete') }}
diff --git a/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js b/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
index da4f02216..936a7a82f 100644
--- a/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
+++ b/src/Resources/app/administration/src/module/payone-payment/filter/payone_currency.filter.js
@@ -1,16 +1,11 @@
const { Filter } = Shopware;
-const { currency } = Shopware.Utils.format;
-Filter.register('payone_currency', (value, format, decimalPrecision, decimalPlaces) => {
+Filter.register('payone_currency', (value, format, decimalPlaces) => {
if (value === null) {
return '-';
}
- if (!decimalPrecision) {
- decimalPrecision = 0;
- }
-
- value /= (10 ** decimalPrecision);
+ value /= 100;
- return currency(value, format, decimalPlaces);
+ return Filter.getByName('currency')(value, format, decimalPlaces);
});
diff --git a/src/Resources/app/administration/src/module/payone-payment/index.js b/src/Resources/app/administration/src/module/payone-payment/index.js
index 8ac68e42b..2d533a5cf 100644
--- a/src/Resources/app/administration/src/module/payone-payment/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/index.js
@@ -1,6 +1,7 @@
import deDE from './snippet/de_DE.json';
import enGB from './snippet/en_GB.json';
import './filter/payone_currency.filter';
+import './component/payone-payment-settings';
Shopware.Component.register('payone-payment-plugin-icon', () => import('./component/payone-payment-plugin-icon'));
Shopware.Component.register('payone-ratepay-profile-configurations', () => import('./component/payone-ratepay-profile-configurations'));
@@ -14,7 +15,7 @@ Shopware.Module.register('payone-payment', {
description: 'payone-payment.general.descriptionTextModule',
version: '1.0.0',
targetVersion: '1.0.0',
- icon: 'default-action-settings',
+ icon: 'regular-cog',
snippets: {
'de-DE': deDE,
diff --git a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
index 80d72aea0..312d640f0 100644
--- a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/index.js
@@ -1,8 +1,7 @@
import template from './payone-settings.html.twig';
import './style.scss';
-const { Mixin } = Shopware;
-const { object, types } = Shopware.Utils;
+const {Mixin} = Shopware;
export default {
template,
@@ -12,7 +11,7 @@ export default {
Mixin.getByName('sw-inline-snippet')
],
- inject: [ 'PayonePaymentSettingsService' ],
+ inject: ['PayonePaymentSettingsService'],
data() {
return {
@@ -21,51 +20,9 @@ export default {
isSaveSuccessful: false,
isTestSuccessful: false,
isApplePayCertConfigured: true,
- config: {},
- merchantIdFilled: false,
- accountIdFilled: false,
- portalIdFilled: false,
- portalKeyFilled: false,
- showValidationErrors: false,
isSupportModalOpen: false,
stateMachineTransitionActions: [],
displayStatusMapping: {},
- collapsibleState: {
- 'status_mapping': true,
- 'payment_credit_card': true,
- 'payment_paypal': true,
- 'payment_paypal_express': true,
- 'payment_debit': true,
- 'payment_sofort': true,
- 'payment_payolution_installment': true,
- 'payment_payolution_invoicing': true,
- 'payment_payolution_debit': true,
- 'payment_eps': true,
- 'payment_ideal': true,
- 'payment_paydirekt': true,
- 'payment_prepayment': true,
- 'payment_trustly': true,
- 'payment_secure_invoice': true,
- 'payment_open_invoice': true,
- 'payment_apple_pay': true,
- 'payment_bancontact': true,
- 'payment_ratepay_debit': true,
- 'payment_ratepay_installment': true,
- 'payment_ratepay_invoicing': true,
- 'payment_klarna_invoice': true,
- 'payment_klarna_direct_debit': true,
- 'payment_klarna_installment': true,
- 'payment_przelewy24': true,
- 'payment_we_chat_pay': true,
- 'payment_postfinanceCard': true,
- 'payment_postfinanceWallet': true,
- 'payment_alipay': true,
- 'payment_secured_invoice': true,
- 'payment_secured_installment': true,
- 'payment_secured_direct_debit': true,
- 'payment_amazon_pay': true,
- 'payment_amazon_pay_express': true,
- },
};
},
@@ -73,12 +30,6 @@ export default {
this.createdComponent();
},
- computed: {
- credentialsMissing: function() {
- return !this.merchantIdFilled || !this.accountIdFilled || !this.portalIdFilled || !this.portalKeyFilled;
- }
- },
-
metaInfo() {
return {
title: this.$createTitle()
@@ -87,97 +38,12 @@ export default {
methods: {
createdComponent() {
- let me = this;
-
- this.PayonePaymentSettingsService.getStateMachineTransitionActions()
- .then((result) => {
- result.data.forEach((element) => {
- let translationKey = 'payone-payment.transitionActionNames.' + element.label;
- let translationValue = me.$t(translationKey);
-
- if (translationValue === translationKey) {
- translationValue = element.label;
- }
-
- me.stateMachineTransitionActions.push({
- "label": translationValue,
- "value": element.value,
- })
- });
- });
-
this.PayonePaymentSettingsService.hasApplePayCert()
.then((result) => {
this.isApplePayCertConfigured = result;
});
},
- paymentMethodPrefixes() {
- return [
- 'creditCard',
- 'debit',
- 'paypal',
- 'paypalExpress',
- 'payolutionInvoicing',
- 'payolutionInstallment',
- 'payolutionDebit',
- 'sofort',
- 'eps',
- 'iDeal',
- 'paydirekt',
- 'prepayment',
- 'trustly',
- 'secureInvoice',
- 'openInvoice',
- 'applePay',
- 'bancontact',
- 'ratepayDebit',
- 'ratepayInstallment',
- 'ratepayInvoicing',
- 'klarnaInvoice',
- 'klarnaDirectDebit',
- 'klarnaInstallment',
- 'przelewy24',
- 'weChatPay',
- 'postfinanceCard',
- 'postfinanceWallet',
- 'alipay',
- 'securedInvoice',
- 'securedInstallment',
- 'securedDirectDebit',
- 'amazonPay',
- 'amazonPayExpress',
- ];
- },
-
- isVisiblePaymentMethodCard(card) {
- return card.name.startsWith('payment') && !this.isCollapsed(card);
- },
-
- isCollapsible(card) {
- return card.name in this.collapsibleState;
- },
-
- displayField(element, config, card) {
- if (!(card.name in this.collapsibleState)) {
- return true;
- }
-
- return !this.collapsibleState[card.name];
- },
-
- isCollapsed(card) {
- return this.collapsibleState[card.name];
- },
-
- toggleCollapsible(card) {
- if (!(card.name in this.collapsibleState)) {
- return;
- }
-
- this.collapsibleState[card.name] = !this.collapsibleState[card.name];
- },
-
saveFinish() {
this.isSaveSuccessful = false;
},
@@ -186,30 +52,17 @@ export default {
this.isTestSuccessful = false;
},
- onConfigChange(config) {
- this.config = config;
-
- this.checkCredentialsFilled();
-
- this.showValidationErrors = false;
- },
-
- checkCredentialsFilled() {
- this.merchantIdFilled = !!this.getConfigValue('merchantId');
- this.accountIdFilled = !!this.getConfigValue('accountId');
- this.portalIdFilled = !!this.getConfigValue('portalId');
- this.portalKeyFilled = !!this.getConfigValue('portalKey');
- },
-
getConfigValue(field) {
- const defaultConfig = this.$refs.systemConfig.actualConfigData.null;
+ const actualConfig = this.$refs.systemConfig.actualConfigData;
+ const defaultConfig = actualConfig.null;
const salesChannelId = this.$refs.systemConfig.currentSalesChannelId;
if (salesChannelId === null) {
- return this.config[`PayonePayment.settings.${field}`];
+ return actualConfig.null[`PayonePayment.settings.${field}`];
}
- return this.config[`PayonePayment.settings.${field}`]
- || defaultConfig[`PayonePayment.settings.${field}`];
+
+ return actualConfig[salesChannelId][`PayonePayment.settings.${field}`]
+ || defaultConfig[`PayonePayment.settings.${field}`];
},
getPaymentConfigValue(field, prefix) {
@@ -220,19 +73,12 @@ export default {
},
onSave() {
- if (this.credentialsMissing) {
- this.showValidationErrors = true;
- return;
- }
-
this.isSaveSuccessful = false;
this.isLoading = true;
this.$refs.systemConfig.saveAll().then((response) => {
this.handleRatepayProfileUpdates(response);
-
- this.isLoading = false;
this.isSaveSuccessful = true;
- }).catch(() => {
+ }).finally(() => {
this.isLoading = false;
});
},
@@ -242,12 +88,18 @@ export default {
this.isTestSuccessful = false;
let credentials = {};
- this.paymentMethodPrefixes().forEach((prefix) => {
- credentials[prefix] = {
- merchantId: this.getPaymentConfigValue('merchantId', prefix),
- accountId: this.getPaymentConfigValue('accountId', prefix),
- portalId: this.getPaymentConfigValue('portalId', prefix),
- portalKey: this.getPaymentConfigValue('portalKey', prefix)
+ this.$refs.systemConfig.config.forEach((cards) => {
+ const match = cards.name.match(/^payment_(.+)$/);
+ const paymentMethodKey = match ? match[1] : null
+ if (!paymentMethodKey) {
+ return;
+ }
+
+ credentials[paymentMethodKey] = {
+ merchantId: this.getPaymentConfigValue('merchantId', paymentMethodKey),
+ accountId: this.getPaymentConfigValue('accountId', paymentMethodKey),
+ portalId: this.getPaymentConfigValue('portalId', paymentMethodKey),
+ portalKey: this.getPaymentConfigValue('portalKey', paymentMethodKey)
};
});
@@ -265,8 +117,8 @@ export default {
});
this.isTestSuccessful = true;
} else {
- for(let key in errors) {
- if(errors.hasOwnProperty(key)) {
+ for (let key in errors) {
+ if (errors.hasOwnProperty(key)) {
this.createNotificationError({
title: this.$tc('payone-payment.settingsForm.titleError'),
message: this.$tc('payone-payment.settingsForm.messageTestError.' + key)
@@ -281,8 +133,7 @@ export default {
}
}
}
- this.isTesting = false;
- }).catch((errorResponse) => {
+ }).finally((errorResponse) => {
this.createNotificationError({
title: this.$tc('payone-payment.settingsForm.titleError'),
message: this.$tc('payone-payment.settingsForm.messageTestError.general')
@@ -291,86 +142,6 @@ export default {
});
},
- getBind(element, config) {
- let originalElement;
-
- if (config !== this.config) {
- this.config = config;
- }
-
- if (this.showValidationErrors) {
- if (element.name === 'PayonePayment.settings.merchantId' && !this.merchantIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.accountId' && !this.accountIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.portalId' && !this.portalIdFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- if (element.name === 'PayonePayment.settings.portalKey' && !this.portalKeyFilled) {
- element.config.error = {
- code: 1,
- detail: this.$tc('payone-payment.messageNotBlank')
- };
- }
- }
-
- this.$refs.systemConfig.config.forEach((configElement) => {
- configElement.elements.forEach((child) => {
- if (child.name === element.name) {
- originalElement = child;
- return;
- }
- });
- });
-
- return originalElement || element;
- },
-
- getElementBind(element) {
- const bind = object.deepCopyObject(element);
-
- // Add inherited values
- if (this.currentSalesChannelId !== null
- && this.inherit
- && this.actualConfigData.hasOwnProperty('null')
- && this.actualConfigData.null[bind.name] !== null) {
- if (bind.type === 'single-select' || bind.config.componentName === 'sw-entity-single-select') {
- // Add inherited placeholder option
- bind.placeholder = this.$tc('sw-settings.system-config.inherited');
- } else if (bind.type === 'bool') {
- // Add inheritedValue for checkbox fields to restore the inherited state
- bind.config.inheritedValue = this.actualConfigData.null[bind.name] || false;
- } else if (bind.type === 'password') {
- // Add inherited placeholder and mark placeholder as password so the rendering element
- // can choose to hide it
- bind.placeholderIsPassword = true;
- bind.placeholder = `${this.actualConfigData.null[bind.name]}`;
- } else if (bind.type !== 'multi-select' && !types.isUndefined(this.actualConfigData.null[bind.name])) {
- // Add inherited placeholder
- bind.placeholder = `${this.actualConfigData.null[bind.name]}`;
- }
- }
-
- // Add select properties
- if (['single-select', 'multi-select'].includes(bind.type)) {
- bind.config.labelProperty = 'name';
- bind.config.valueProperty = 'id';
- }
-
- return bind;
- },
-
handleRatepayProfileUpdates(response) {
const salesChannelId = this.$refs.systemConfig.currentSalesChannelId;
@@ -378,8 +149,8 @@ export default {
const resultBySalesChannel = response.payoneRatepayProfilesUpdateResult[salesChannelId];
this.$root.$emit(
- 'payone-ratepay-profiles-update-result',
- resultBySalesChannel
+ 'payone-ratepay-profiles-update-result',
+ resultBySalesChannel
);
if (!Array.isArray(resultBySalesChannel.errors)) {
diff --git a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
index 0343e6ff1..f8b46a829 100644
--- a/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/page/payone-settings/payone-settings.html.twig
@@ -40,7 +40,7 @@
+ :disabled="isLoading">
{{ $tc('payone-payment.settingsForm.test') }}
{% endblock %}
@@ -148,77 +148,27 @@
-
- \n {% block payone_payment_header %}\n \n \n {{ $tc(\'sw-settings.index.title\') }}\n
\n \n {% endblock %}\n\n {% block payone_payment_actions %}\n \n {% block payone_payment_settings_actions_feedback %}\n \n {{ $tc(\'payone-payment.supportModal.menuButton\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_notification_forward_target %}\n \n {{ $tc(\'payonePayment.notificationTarget.module.buttonTitle\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_test %}\n \n {{ $tc(\'payone-payment.settingsForm.test\') }}\n \n {% endblock %}\n\n {% block payone_payment_settings_actions_save %}\n \n {{ $tc(\'payone-payment.settingsForm.save\') }}\n \n {% endblock %}\n \n {% endblock %}\n\n {% block payone_payment_settings_content %}\n \n \n \n \n \n\n \n \n\n \n \n \n \n {% endblock %}\n\n{% endblock %}\n',mixins:[a.getByName("notification"),a.getByName("sw-inline-snippet")],inject:["PayonePaymentSettingsService"],data:function(){return{isLoading:!1,isTesting:!1,isSaveSuccessful:!1,isTestSuccessful:!1,isApplePayCertConfigured:!0,config:{},merchantIdFilled:!1,accountIdFilled:!1,portalIdFilled:!1,portalKeyFilled:!1,showValidationErrors:!1,isSupportModalOpen:!1,stateMachineTransitionActions:[],displayStatusMapping:{},collapsibleState:{status_mapping:!0,payment_credit_card:!0,payment_paypal:!0,payment_paypal_express:!0,payment_debit:!0,payment_sofort:!0,payment_payolution_installment:!0,payment_payolution_invoicing:!0,payment_payolution_debit:!0,payment_eps:!0,payment_ideal:!0,payment_paydirekt:!0,payment_prepayment:!0,payment_trustly:!0,payment_secure_invoice:!0,payment_open_invoice:!0,payment_apple_pay:!0,payment_bancontact:!0,payment_ratepay_debit:!0,payment_ratepay_installment:!0,payment_ratepay_invoicing:!0,payment_klarna_invoice:!0,payment_klarna_direct_debit:!0,payment_klarna_installment:!0,payment_przelewy24:!0,payment_we_chat_pay:!0,payment_postfinanceCard:!0,payment_postfinanceWallet:!0,payment_alipay:!0,payment_secured_invoice:!0,payment_secured_installment:!0,payment_secured_direct_debit:!0,payment_amazon_pay:!0,payment_amazon_pay_express:!0}}},created:function(){this.createdComponent()},computed:{credentialsMissing:function(){return!(this.merchantIdFilled&&this.accountIdFilled&&this.portalIdFilled&&this.portalKeyFilled)}},metaInfo:function(){return{title:this.$createTitle()}},methods:{createdComponent:function(){var e=this,n=this;this.PayonePaymentSettingsService.getStateMachineTransitionActions().then((function(e){e.data.forEach((function(e){var t="payone-payment.transitionActionNames."+e.label,a=n.$t(t);a===t&&(a=e.label),n.stateMachineTransitionActions.push({label:a,value:e.value})}))})),this.PayonePaymentSettingsService.hasApplePayCert().then((function(n){e.isApplePayCertConfigured=n}))},paymentMethodPrefixes:function(){return["creditCard","debit","paypal","paypalExpress","payolutionInvoicing","payolutionInstallment","payolutionDebit","sofort","eps","iDeal","paydirekt","prepayment","trustly","secureInvoice","openInvoice","applePay","bancontact","ratepayDebit","ratepayInstallment","ratepayInvoicing","klarnaInvoice","klarnaDirectDebit","klarnaInstallment","przelewy24","weChatPay","postfinanceCard","postfinanceWallet","alipay","securedInvoice","securedInstallment","securedDirectDebit","amazonPay","amazonPayExpress"]},isVisiblePaymentMethodCard:function(e){return e.name.startsWith("payment")&&!this.isCollapsed(e)},isCollapsible:function(e){return e.name in this.collapsibleState},displayField:function(e,n,t){return!(t.name in this.collapsibleState)||!this.collapsibleState[t.name]},isCollapsed:function(e){return this.collapsibleState[e.name]},toggleCollapsible:function(e){e.name in this.collapsibleState&&(this.collapsibleState[e.name]=!this.collapsibleState[e.name])},saveFinish:function(){this.isSaveSuccessful=!1},testFinish:function(){this.isTestSuccessful=!1},onConfigChange:function(e){this.config=e,this.checkCredentialsFilled(),this.showValidationErrors=!1},checkCredentialsFilled:function(){this.merchantIdFilled=!!this.getConfigValue("merchantId"),this.accountIdFilled=!!this.getConfigValue("accountId"),this.portalIdFilled=!!this.getConfigValue("portalId"),this.portalKeyFilled=!!this.getConfigValue("portalKey")},getConfigValue:function(e){var n=this.$refs.systemConfig.actualConfigData.null;return null===this.$refs.systemConfig.currentSalesChannelId?this.config["PayonePayment.settings.".concat(e)]:this.config["PayonePayment.settings.".concat(e)]||n["PayonePayment.settings.".concat(e)]},getPaymentConfigValue:function(e,n){var t=e.charAt(0).toUpperCase()+e.slice(1);return this.getConfigValue(n+t)||this.getConfigValue(e)},onSave:function(){var e=this;this.credentialsMissing?this.showValidationErrors=!0:(this.isSaveSuccessful=!1,this.isLoading=!0,this.$refs.systemConfig.saveAll().then((function(n){e.handleRatepayProfileUpdates(n),e.isLoading=!1,e.isSaveSuccessful=!0})).catch((function(){e.isLoading=!1})))},onTest:function(){var e=this;this.isTesting=!0,this.isTestSuccessful=!1;var n={};this.paymentMethodPrefixes().forEach((function(t){n[t]={merchantId:e.getPaymentConfigValue("merchantId",t),accountId:e.getPaymentConfigValue("accountId",t),portalId:e.getPaymentConfigValue("portalId",t),portalKey:e.getPaymentConfigValue("portalKey",t)}})),this.PayonePaymentSettingsService.validateApiCredentials(n).then((function(n){var t=n.testCount,a=n.credentialsValid,i=n.errors;if(a)e.createNotificationSuccess({title:e.$tc("payone-payment.settingsForm.titleSuccess"),message:t>0?e.$tc("payone-payment.settingsForm.messageTestSuccess"):e.$tc("payone-payment.settingsForm.messageTestNoTestedPayments")}),e.isTestSuccessful=!0;else for(var s in i)if(i.hasOwnProperty(s)){e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:e.$tc("payone-payment.settingsForm.messageTestError."+s)});var o=i[s];"string"==typeof o&&e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:o})}e.isTesting=!1})).catch((function(n){e.createNotificationError({title:e.$tc("payone-payment.settingsForm.titleError"),message:e.$tc("payone-payment.settingsForm.messageTestError.general")}),e.isTesting=!1}))},getBind:function(e,n){var t;return n!==this.config&&(this.config=n),this.showValidationErrors&&("PayonePayment.settings.merchantId"!==e.name||this.merchantIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.accountId"!==e.name||this.accountIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.portalId"!==e.name||this.portalIdFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")}),"PayonePayment.settings.portalKey"!==e.name||this.portalKeyFilled||(e.config.error={code:1,detail:this.$tc("payone-payment.messageNotBlank")})),this.$refs.systemConfig.config.forEach((function(n){n.elements.forEach((function(n){n.name!==e.name||(t=n)}))})),t||e},getElementBind:function(e){var n=s.deepCopyObject(e);return null!==this.currentSalesChannelId&&this.inherit&&this.actualConfigData.hasOwnProperty("null")&&null!==this.actualConfigData.null[n.name]&&("single-select"===n.type||"sw-entity-single-select"===n.config.componentName?n.placeholder=this.$tc("sw-settings.system-config.inherited"):"bool"===n.type?n.config.inheritedValue=this.actualConfigData.null[n.name]||!1:"password"===n.type?(n.placeholderIsPassword=!0,n.placeholder="".concat(this.actualConfigData.null[n.name])):"multi-select"===n.type||o.isUndefined(this.actualConfigData.null[n.name])||(n.placeholder="".concat(this.actualConfigData.null[n.name]))),["single-select","multi-select"].includes(n.type)&&(n.config.labelProperty="name",n.config.valueProperty="id"),n},handleRatepayProfileUpdates:function(e){var n=this.$refs.systemConfig.currentSalesChannelId;if(e.payoneRatepayProfilesUpdateResult&&e.payoneRatepayProfilesUpdateResult[n]){var t=e.payoneRatepayProfilesUpdateResult[n];this.$root.$emit("payone-ratepay-profiles-update-result",t),Array.isArray(t.errors)||this.createNotificationError({title:this.$tc("payone-payment.settingsForm.titleError"),message:this.$tc("payone-payment.settingsForm.messageSaveError.ratepayProfilesUpdateFailed")})}}}}},P8hj:function(e,n,t){"use strict";function a(e,n){for(var t=[],a={},i=0;it.parts.length&&(a.parts.length=t.parts.length)}else{var o=[];for(i=0;i\n \n \n {{ $tc(\'sw-order.payone-payment.capture.buttonTitle\') }}\n \n \n\n \n \n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.close\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.capture.submit\') }}\n \n\n \n {{ $tc(\'sw-order.payone-payment.modal.capture.fullSubmit\') }}\n \n \n \n
\n{% endblock %}\n',mixins:[o.getByName("notification")],inject:["PayonePaymentService","repositoryFactory"],props:{order:{type:Object,required:!0},transaction:{type:Object,required:!0}},computed:{decimalPrecision:function(){return this.order&&this.order.currency?this.order.currency.decimalPrecision?this.order.currency.decimalPrecision:this.order.currency.itemRounding?this.order.currency.itemRounding.decimals:void 0:2},totalTransactionAmount:function(){return Math.round(this.transaction.amount.totalPrice*Math.pow(10,this.decimalPrecision),0)},capturedAmount:function(){return this.transaction.extensions&&this.transaction.extensions.payonePaymentOrderTransactionData&&this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount?this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount:0},remainingAmount:function(){return this.totalTransactionAmount-this.capturedAmount},maxCaptureAmount:function(){return this.remainingAmount/Math.pow(10,this.decimalPrecision)},buttonEnabled:function(){return!(!this.transaction.extensions||!this.transaction.extensions.payonePaymentOrderTransactionData)&&(this.remainingAmount>0&&this.capturedAmount>0||this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture)},isItemSelected:function(){var e=!1;return this.selection.forEach((function(t){t.selected&&(e=!0)})),e},hasRemainingShippingCosts:function(){var e=this;if(this.order.shippingCosts.totalPrice<=0)return!1;var t=this.order.shippingCosts.totalPrice*Math.pow(10,this.decimalPrecision),n=0;return this.order.lineItems.forEach((function(t){t.customFields&&t.customFields.payone_captured_quantity&&0{{ $tc('payone-payment.general.headlines.ratepayProfileConfigurations') }}
+
+
+
+
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
index 3ccde2b3c..241a1ff76 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profile-configurations/payone-ratepay-profile-configurations.scss
@@ -1,15 +1,17 @@
-.payone-ratepay-profile-configurations {
+.payone-ratepay-profile-configuration {
margin-top: 20px;
- @media screen and (min-width: 768px) {
- width: 50%;
- }
-
- .payone-ratepay-profile-configuration--headline {
+ &--headline {
font-weight: 600;
margin-top: 20px;
}
+ &--items {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
+ gap: 1rem;
+ }
+
.sw-description-list {
dt {
text-align: right;
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
index b7f693628..a49c76096 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/index.js
@@ -60,8 +60,9 @@ export default {
watch: {
profiles(profiles) {
- this.$emit('input', profiles);
- this.$emit('change', profiles);
+ this.$emit('update:value', profiles);
+ this.$emit('input', profiles); // required for SW 6.5.x compatibility
+ this.$emit('change', profiles); // required for SW 6.5.x compatibility
},
},
diff --git a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
index f932c6370..dcb1e987b 100644
--- a/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
+++ b/src/Resources/app/administration/src/module/payone-payment/component/payone-ratepay-profiles/payone-ratepay-profiles.html.twig
@@ -52,7 +52,7 @@
{% endblock %}
{% block payone_ratepay_shop_ids_bulk_actions %}
-
+
{% block sw_settings_units_content_grid_column_menu_delete %}
{{ $tc('payone-payment.general.headlines.ratepayProfileConfigurations') }}
- -{{ $tc('payone-payment.general.label.shopId') }}: {{ profileConfiguration.shopId }}
+
+
+
+
+
- {{ $tc('payone-payment.general.label.currency') }}
- {{ profileConfiguration.shopCurrency }}
+ {% block payone_ratepay_configuration_grid %}
+
+ {{ $tc('payone-payment.general.label.currency') }}
+ {{ profileConfiguration.shopCurrency }}
- {{ $tc('payone-payment.general.label.invoiceCountry') }}
- {{ profileConfiguration.invoiceCountry }}
+ {{ $tc('payone-payment.general.label.invoiceCountry') }}
+ {{ profileConfiguration.invoiceCountry }}
- {{ $tc('payone-payment.general.label.shippingCountry') }}
- {{ profileConfiguration.shippingCountry }}
+ {{ $tc('payone-payment.general.label.shippingCountry') }}
+ {{ profileConfiguration.shippingCountry }}
- {{ $tc('payone-payment.general.label.minBasket') }}
- {{ profileConfiguration.minBasket }}
+ {{ $tc('payone-payment.general.label.minBasket') }}
+ {{ profileConfiguration.minBasket }}
- {{ $tc('payone-payment.general.label.maxBasket') }}
- {{ profileConfiguration.maxBasket }}
-
- {% endblock %}
+ {{ $tc('payone-payment.general.label.maxBasket') }}
+ {{ profileConfiguration.maxBasket }}
+
+ {% endblock %}
+
+ {{ $tc('payone-payment.general.label.shopId') }}: {{ profileConfiguration.shopId }}
- {% block payone_ratepay_configuration_grid %} -
-
-
+
+
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json b/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
index 6598f3214..28510df58 100644
--- a/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
+++ b/src/Resources/app/administration/src/module/payone-payment/snippet/de_DE.json
@@ -6,7 +6,7 @@
"descriptionTextModule": "Einstellungen für PAYONE",
"headlines": {
"ratepayProfiles": "Profile",
- "ratepayProfileConfigurations": "Profil-Konfigurationen"
+ "ratepayProfileConfigurations": "Profile Konfigurationen"
},
"label": {
"shopId": "Shop-ID",
@@ -16,8 +16,7 @@
"shippingCountry": "Lieferland",
"minBasket": "Min. Warenkorb",
"maxBasket": "Max. Warenkorb",
- "reloadConfigBtn": "Profil-Konfiguration neu laden",
- "reloadConfigInfo": "(Änderungen an der Plugin-Konfiguration werden dabei zuerst gespeichert)"
+ "reloadConfigInfo": "Profile-Konfigurationen werden beim Speichern der Plugin-Einstellungen automatisch aktualisiert."
},
"actions": {
"addShop": "Shop-ID hinzufügen"
diff --git a/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json b/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
index baaf276e3..9d76a9217 100644
--- a/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
+++ b/src/Resources/app/administration/src/module/payone-payment/snippet/en_GB.json
@@ -6,7 +6,7 @@
"descriptionTextModule": "Settings for PAYONE",
"headlines": {
"ratepayProfiles": "Profile",
- "ratepayProfileConfigurations": "Profil-Konfigurationen"
+ "ratepayProfileConfigurations": "Profile configuration"
},
"label": {
"shopId": "Shop-ID",
@@ -16,8 +16,7 @@
"shippingCountry": "Shipping Country",
"minBasket": "Min. Basket",
"maxBasket": "Max. Basket",
- "reloadConfigBtn": "Reload Profile Configuration",
- "reloadConfigInfo": "(Plugin Configuration Changes will be saved first)"
+ "reloadConfigInfo": "Profile-Configuration got automatically updated during saving the plugin configuration"
},
"actions": {
"addShop": "Add Shop-ID"
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
index 07645b67e..e94f003e6 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/index.js
@@ -1,7 +1,7 @@
import template from './payone-capture-button.html.twig';
import './payone-capture-button.scss';
-const { Mixin } = Shopware;
+const {Mixin, Filter} = Shopware;
export default {
template,
@@ -10,7 +10,7 @@ export default {
Mixin.getByName('notification')
],
- inject: ['PayonePaymentService', 'repositoryFactory'],
+ inject: ['PayonePaymentService'],
props: {
order: {
@@ -23,7 +23,31 @@ export default {
}
},
+ data() {
+ return {
+ isLoading: false,
+ hasError: false,
+ showCaptureModal: false,
+ isCaptureSuccessful: false,
+ captureAmount: 0.0,
+ includeShippingCosts: false,
+ items: [],
+ };
+ },
+
computed: {
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
+
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderTotalPrice() {
+ return this.transaction.amount.totalPrice;
+ },
+
decimalPrecision() {
if (!this.order || !this.order.currency) {
return 2;
@@ -36,47 +60,24 @@ export default {
}
},
- totalTransactionAmount() {
- return Math.round(this.transaction.amount.totalPrice * (10 ** this.decimalPrecision), 0);
- },
-
capturedAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount) {
- return 0;
- }
-
- return this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount;
+ return this.toFixedPrecision((this.transaction?.extensions?.payonePaymentOrderTransactionData?.capturedAmount ?? 0) / 100);
},
remainingAmount() {
- return this.totalTransactionAmount - this.capturedAmount;
- },
-
- maxCaptureAmount() {
- return this.remainingAmount / (10 ** this.decimalPrecision);
+ return this.toFixedPrecision(this.orderTotalPrice - this.capturedAmount);
},
buttonEnabled() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData) {
+ if (!this.transaction?.extensions?.payonePaymentOrderTransactionData) {
return false;
}
- return (this.remainingAmount > 0 && this.capturedAmount > 0) || this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture;
+ return this.remainingAmount > 0 || this.transaction.extensions.payonePaymentOrderTransactionData.allowCapture;
},
- isItemSelected() {
- let returnValue = false;
-
- this.selection.forEach((selection) => {
- if (selection.selected) {
- returnValue = true;
- }
- });
-
- return returnValue;
+ selectedItems() {
+ return this.items.filter(item => item.selected && item.quantity > 0);
},
hasRemainingShippingCosts() {
@@ -84,58 +85,57 @@ export default {
return false;
}
- const shippingCosts = this.order.shippingCosts.totalPrice * (10 ** this.decimalPrecision);
-
- let capturedPositionAmount = 0;
-
- this.order.lineItems.forEach((order_item) => {
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- capturedPositionAmount += order_item.customFields.payone_captured_quantity * order_item.unitPrice * (10 ** this.decimalPrecision);
- }
- });
-
- if (this.capturedAmount - Math.round(capturedPositionAmount) >= shippingCosts) {
- return false;
- }
-
- return true;
+ return this.toFixedPrecision(this.capturedAmount + this.order.shippingCosts.totalPrice) <= this.orderTotalPrice;
}
},
- data() {
- return {
- isLoading: false,
- hasError: false,
- showCaptureModal: false,
- isCaptureSuccessful: false,
- selection: [],
- captureAmount: 0.0,
- includeShippingCosts: false
- };
- },
-
methods: {
- calculateCaptureAmount() {
+ toFixedPrecision(value) {
+ return Math.round(value * (10 ** this.decimalPrecision)) / (10 ** this.decimalPrecision);
+ },
+
+ calculateActionAmount() {
let amount = 0;
- this.selection.forEach((selection) => {
- if (selection.selected) {
- amount += selection.unit_price * selection.quantity;
- }
+ this.selectedItems.forEach((selection) => {
+ amount += selection.unit_price * selection.quantity;
});
- if (amount > this.remainingAmount) {
- amount = this.remainingAmount;
- }
-
- this.captureAmount = amount;
+ this.captureAmount = this.toFixedPrecision(amount > this.remainingAmount ? this.remainingAmount : amount);
},
openCaptureModal() {
this.showCaptureModal = true;
this.isCaptureSuccessful = false;
- this.selection = [];
+ this.initItems();
+ },
+
+ initItems() {
+ this.items = this.order.lineItems.map((orderItem) => {
+ const qty = orderItem.quantity - (orderItem.customFields?.payone_captured_quantity ?? 0);
+
+ return {
+ id: orderItem.id,
+ quantity: qty,
+ maxQuantity: qty,
+ unit_price: orderItem.unitPrice,
+ selected: false,
+ product: orderItem.label,
+ disabled: qty <= 0,
+ };
+ });
+
+ if (this.order.shippingCosts.totalPrice > 0) {
+ this.items.push({
+ id: 'shipping',
+ quantity: 1,
+ maxQuantity: 1,
+ unit_price: this.order.shippingCosts.totalPrice,
+ selected: false,
+ disabled: false,
+ product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
+ });
+ }
},
closeCaptureModal() {
@@ -159,27 +159,25 @@ export default {
this.isLoading = true;
- this.selection.forEach((selection) => {
- this.order.lineItems.forEach((order_item) => {
- if (order_item.id === selection.id && selection.selected && 0 < selection.quantity) {
- const copy = { ...order_item },
- taxRate = copy.tax_rate / (10 ** request.decimalPrecision);
+ this.selectedItems.forEach((selection) => {
+ if (selection.id === 'shipping') {
+ request.includeShippingCosts = true;
+ } else {
+ const orderLineItem = this.order.lineItems.find(lineItem => lineItem.id === selection.id);
+ if (orderLineItem) {
+ const copy = {...orderLineItem};
- copy.quantity = selection.quantity;
- copy.total_amount = copy.unit_price * copy.quantity;
- copy.total_tax_amount = Math.round(copy.total_amount / (100 + taxRate) * taxRate);
+ copy.quantity = selection.quantity;
+ copy.total_amount = copy.unit_price * copy.quantity;
+ copy.total_tax_amount = copy.total_amount - (copy.total_amount / (1 + (copy.tax_rate / 100)));
request.orderLines.push(copy);
}
- });
-
- if (selection.id === 'shipping' && selection.selected && 0 < selection.quantity) {
- request.includeShippingCosts = true;
}
});
- if (this.remainingAmount < (request.amount * (10 ** this.decimalPrecision))) {
- request.amount = this.remainingAmount / (10 ** this.decimalPrecision);
+ if (this.remainingAmount < request.amount) {
+ request.amount = this.remainingAmount;
}
this.executeCapture(request)
@@ -190,7 +188,7 @@ export default {
orderTransactionId: this.transaction.id,
payone_order_id: this.transaction.extensions.payonePaymentOrderTransactionData.transactionId,
salesChannel: this.order.salesChannel,
- amount: this.remainingAmount / (10 ** this.decimalPrecision),
+ amount: this.remainingAmount,
orderLines: [],
complete: true,
includeShippingCosts: this.hasRemainingShippingCosts
@@ -198,20 +196,13 @@ export default {
this.isLoading = true;
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
-
- request.orderLines.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
+ request.orderLines = this.order.lineItems.map((orderItem) => {
+ return {
+ id: orderItem.id,
+ quantity: orderItem.quantity - (orderItem.customFields?.payone_captured_quantity ?? 0),
+ unit_price: orderItem.unitPrice,
selected: false
- });
+ };
});
this.executeCapture(request);
@@ -241,60 +232,13 @@ export default {
});
});
},
-
- onSelectItem(id, selected) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.selected = selected;
- }
- });
-
- this.calculateCaptureAmount();
- },
-
- onChangeQuantity(id, quantity) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.quantity = quantity;
- }
- });
-
- this.calculateCaptureAmount();
- },
-
- _populateSelectionProperty() {
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_captured_quantity
- && 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
-
- this.selection.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
- selected: false
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- this.selection.push({
- id: 'shipping',
- quantity: 1,
- unit_price: this.order.shippingCosts.totalPrice,
- selected: false
- });
- }
+ },
+ watch: {
+ items: {
+ handler() {
+ this.calculateActionAmount();
+ },
+ deep: true,
}
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
index 4df0a1170..7af0918ea 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-capture-button/payone-capture-button.html.twig
@@ -7,36 +7,30 @@
-
-
+
-
+
-
+
{{ $tc('sw-order.payone-payment.modal.close') }}
-
+
{{ $tc('sw-order.payone-payment.modal.capture.submit') }}
-
+
{{ $tc('sw-order.payone-payment.modal.capture.fullSubmit') }}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js
deleted file mode 100644
index 667b65bcb..000000000
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import template from './payone-data-grid.html.twig';
-
-export default {
- template: template
-};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig
deleted file mode 100644
index 83b37d703..000000000
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-data-grid/payone-data-grid.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{% block sw_data_grid_select_item_checkbox %}
-
-
-
-
-
-{% endblock %}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
index dc1eb62d9..8e485b613 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/index.js
@@ -1,80 +1,24 @@
import template from './payone-order-items.html.twig';
import './payone-order-items.scss';
+const {Filter} = Shopware;
+
export default {
template,
props: {
+ items: {
+ type: Array,
+ required: true
+ },
order: {
type: Object,
required: true
- },
-
- mode: {
- type: String,
- required: false
}
},
computed: {
- orderItems() {
- const data = [];
-
- this.order.lineItems.forEach((order_item) => {
- const price = this.$options.filters.currency(
- order_item.totalPrice,
- this.order.currency.shortName,
- this.order.decimal_precision
- );
-
- let disabled = false;
- let quantity = order_item.quantity;
-
- if(order_item.customFields) {
- if ('refund' === this.mode) {
- if(order_item.customFields.payone_captured_quantity &&
- 0 > order_item.customFields.payone_captured_quantity) {
- quantity = order_item.customFields.payone_captured_quantity;
- }
-
- if(order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
- } else if ('capture' === this.mode && order_item.customFields.payone_captured_quantity &&
- 0 < order_item.customFields.payone_captured_quantity) {
- quantity -= order_item.customFields.payone_captured_quantity;
- }
- }
-
- if (1 > quantity) {
- disabled = true;
- }
-
- data.push({
- id: order_item.id,
- product: order_item.label,
- quantity: quantity,
- disabled: disabled,
- selected: false,
- price: price,
- orderItem: order_item
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- data.push({
- id: 'shipping',
- product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
- quantity: 1,
- disabled: false,
- selected: false,
- price: this.$options.filters.currency(this.order.shippingCosts.totalPrice, this.order.currency.shortName, this.order.decimal_precision),
- orderItem: {}
- });
- }
-
- return data;
- },
+ currencyFilter: () => Filter.getByName('currency'),
orderItemColumns() {
return [
@@ -98,12 +42,11 @@ export default {
},
methods: {
- onSelectItem(selection, item, selected) {
- this.$emit('select-item', item.id, selected);
+ updateSelection(selection) {
+ const selectionIds = Object.keys(selection);
+ this.items.forEach(item => {
+ item.selected = selectionIds.includes(item.id);
+ });
},
-
- onChangeQuantity(value, id) {
- this.$emit('change-quantity', id, value);
- }
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
index 1158c3160..cddb4721a 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-order-items/payone-order-items.html.twig
@@ -1,33 +1,30 @@
{% block payone_payment_details %}
![]()
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
index 9e0cc1e33..86241b10a 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/index.js
@@ -1,93 +1,125 @@
import template from './payone-payment-webhook-log.html.twig';
-const { Criteria } = Shopware.Data;
+const {Criteria} = Shopware.Data;
+const { Filter } = Shopware;
export default {
- template,
+ template,
- inject: ['repositoryFactory'],
+ inject: ['repositoryFactory'],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- webhookLogs: [],
- isLoading: false,
- showWebhookDetails: null,
- };
- },
-
- computed: {
- webhookLogRepository() {
- return this.repositoryFactory.create('payone_payment_webhook_log');
- },
- webhookLogColumns() {
- return [
- { property: 'transactionId', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionId') },
- { property: 'transactionState', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionState') },
- { property: 'sequenceNumber', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleSequenceNumber') },
- { property: 'clearingType', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleClearingType') },
- { property: 'webhookDateTime', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime') },
- ];
- },
- keyValueColumns() {
- return [
- { property: 'key', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleKey') },
- { property: 'value', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleValue') },
- ];
+
+ data() {
+ return {
+ webhookLogs: [],
+ isLoading: false,
+ showWebhookDetails: null,
+ };
},
- },
- created() {
- this.createdComponent();
- },
+ computed: {
+ webhookLogRepository() {
+ return this.repositoryFactory.create('payone_payment_webhook_log');
+ },
- methods: {
- createdComponent() {
- this.getWebhookLogs();
- },
- reloadWebhookLogs() {
- this.getWebhookLogs();
- },
- getWebhookLogs() {
- const criteria = new Criteria();
- criteria.addFilter(Criteria.equals('orderId', this.order.id));
- criteria.addSorting(Criteria.sort('webhookDateTime', 'ASC', true));
-
- this.isLoading = true;
- return this.webhookLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
- this.webhookLogs = searchResult;
- this.isLoading = false;
- });
- },
- openDetails(webhookLog) {
- this.showWebhookDetails = webhookLog.webhookDetails;
- },
- onCloseWebhookModal() {
- this.showWebhookDetails = null;
- },
- toKeyValueSource(object) {
- const data = [];
+ assetFilter() {
+ return Filter.getByName('asset');
+ },
- for (const key in object) {
- data.push({key, value: object[key]});
- }
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- data.sort((a, b) => a.key.localeCompare(b.key));
+ webhookLogColumns() {
+ return [
+ {
+ property: 'transactionId',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionId')
+ },
+ {
+ property: 'transactionState',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleTransactionState')
+ },
+ {
+ property: 'sequenceNumber',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleSequenceNumber')
+ },
+ {
+ property: 'clearingType',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleClearingType')
+ },
+ {
+ property: 'webhookDateTime',
+ label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime')
+ },
+ ];
+ },
- return data;
+ keyValueColumns() {
+ return [
+ {property: 'key', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleKey')},
+ {property: 'value', label: this.$tc('sw-order.payone-payment.webhookLog.columnTitleValue')},
+ ];
+ },
},
- downloadAsTxt(object, objectType, id) {
- const link = document.createElement('a');
- link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
- link.download = `PAYONE-${objectType}-${id}.txt`;
- link.dispatchEvent(new MouseEvent('click'));
- link.remove();
+
+ created() {
+ this.createdComponent();
},
- }
+
+ methods: {
+ createdComponent() {
+ this.getWebhookLogs();
+ },
+
+ reloadWebhookLogs() {
+ this.getWebhookLogs();
+ },
+
+ getWebhookLogs() {
+ const criteria = new Criteria();
+ criteria.addFilter(Criteria.equals('orderId', this.order.id));
+ criteria.addSorting(Criteria.sort('webhookDateTime', 'ASC', true));
+
+ this.isLoading = true;
+ return this.webhookLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
+ this.webhookLogs = searchResult;
+ this.isLoading = false;
+ });
+ },
+
+ openDetails(webhookLog) {
+ this.showWebhookDetails = webhookLog.webhookDetails;
+ },
+
+ onCloseWebhookModal() {
+ this.showWebhookDetails = null;
+ },
+
+ toKeyValueSource(object) {
+ const data = [];
+
+ for (const key in object) {
+ data.push({key, value: object[key]});
+ }
+
+ data.sort((a, b) => a.key.localeCompare(b.key));
+
+ return data;
+ },
+
+ downloadAsTxt(object, objectType, id) {
+ const link = document.createElement('a');
+ link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
+ link.download = `PAYONE-${objectType}-${id}.txt`;
+ link.dispatchEvent(new MouseEvent('click'));
+ link.remove();
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
index aee3c5d47..39618ef2d 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-webhook-log/payone-payment-webhook-log.html.twig
@@ -12,7 +12,7 @@
:isLoading="isLoading"
>
- {{ item.webhookDateTime | date({ hour: '2-digit', minute: '2-digit' }) }}
+ {{ dateFilter(item.webhookDateTime, { hour: '2-digit', minute: '2-digit' }) }}
@@ -51,7 +51,7 @@
>
![]()
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
index 5f34e1581..f6c51a4c9 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/index.js
@@ -1,7 +1,7 @@
import template from './payone-refund-button.html.twig';
import './payone-refund-button.scss';
-const { Mixin } = Shopware;
+const {Mixin, Filter} = Shopware;
export default {
template,
@@ -29,13 +29,25 @@ export default {
hasError: false,
showRefundModal: false,
isRefundSuccessful: false,
- selection: [],
refundAmount: 0.0,
- includeShippingCosts: false
+ includeShippingCosts: false,
+ items: [],
};
},
computed: {
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
+
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderTotalPrice() {
+ return this.transaction.amount.totalPrice;
+ },
+
decimalPrecision() {
if (!this.order || !this.order.currency) {
return 2;
@@ -48,37 +60,36 @@ export default {
}
},
- remainingAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount) {
- return 0;
- }
-
- return this.transaction.extensions.payonePaymentOrderTransactionData.capturedAmount - this.refundedAmount;
+ transactionData() {
+ return this.transaction?.extensions?.payonePaymentOrderTransactionData ?? {
+ capturedAmount: 0,
+ refundedAmount: 0,
+ allowRefund: false
+ };
},
- refundedAmount() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData
- || !this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount) {
- return 0;
- }
+ capturedAmount() {
+ return this.toFixedPrecision((this.transaction?.extensions?.payonePaymentOrderTransactionData?.capturedAmount ?? 0) / 100);
+ },
- return this.transaction.extensions.payonePaymentOrderTransactionData.refundedAmount;
+ remainingAmount() {
+ return (this.transactionData.capturedAmount ?? 0) - (this.transactionData.refundedAmount ?? 0);
},
- maxRefundAmount() {
- return this.remainingAmount / (10 ** this.decimalPrecision);
+ refundedAmount() {
+ return this.transactionData.refundedAmount ?? 0;
},
buttonEnabled() {
- if (!this.transaction.extensions
- || !this.transaction.extensions.payonePaymentOrderTransactionData) {
+ if (!this.transaction?.extensions?.payonePaymentOrderTransactionData) {
return false;
}
- return (this.remainingAmount > 0 && this.refundedAmount > 0) || this.transaction.extensions.payonePaymentOrderTransactionData.allowRefund;
+ return this.remainingAmount > 0 || this.transactionData.allowRefund;
+ },
+
+ selectedItems() {
+ return this.items.filter(item => item.selected && item.quantity > 0);
},
hasRemainingRefundableShippingCosts() {
@@ -86,46 +97,59 @@ export default {
return false;
}
- const shippingCosts = this.order.shippingCosts.totalPrice * (10 ** this.decimalPrecision);
-
- let refundedPositionAmount = 0;
-
- this.order.lineItems.forEach((order_item) => {
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- refundedPositionAmount += order_item.customFields.payone_refunded_quantity * order_item.unitPrice * (10 ** this.decimalPrecision);
- }
- });
-
- if (this.refundedAmount - Math.round(refundedPositionAmount) >= shippingCosts) {
- return false;
- }
-
- return true;
+ return this.toFixedPrecision(this.refundedAmount + this.order.shippingCosts.totalPrice) <= this.capturedAmount;
}
},
methods: {
- calculateRefundAmount() {
+ toFixedPrecision(value) {
+ return Math.round(value * (10 ** this.decimalPrecision)) / (10 ** this.decimalPrecision);
+ },
+
+ calculateActionAmount() {
let amount = 0;
- this.selection.forEach((selection) => {
- if (selection.selected) {
- amount += selection.unit_price * selection.quantity;
- }
+ this.selectedItems.forEach((selection) => {
+ amount += selection.unit_price * selection.quantity;
});
- if (Math.round(amount * (10 ** this.decimalPrecision) > this.remainingAmount)) {
- amount = this.remainingAmount / (10 ** this.decimalPrecision)
- }
-
- this.refundAmount = amount;
+ this.refundAmount = this.toFixedPrecision(amount > this.remainingAmount ? this.remainingAmount : amount);
},
openRefundModal() {
this.showRefundModal = true;
this.isRefundSuccessful = false;
- this.selection = [];
+ this.initItems();
+ },
+
+ initItems() {
+ this.items = this.order.lineItems.map((orderItem) => {
+ // note: if the order got captured during the payment (direct authorize instead of pre-authorize), the field `payone_captured_quantity` will be empty.
+ // in this case we are using the ordered quantity
+ const qty = this.getRefundableQuantityOfItem(orderItem);
+
+ return {
+ id: orderItem.id,
+ quantity: qty,
+ maxQuantity: qty,
+ unit_price: orderItem.unitPrice,
+ selected: false,
+ product: orderItem.label,
+ disabled: qty <= 0,
+ };
+ });
+
+ if (this.order.shippingCosts.totalPrice > 0) {
+ this.items.push({
+ id: 'shipping',
+ quantity: 1,
+ maxQuantity: 1,
+ unit_price: this.order.shippingCosts.totalPrice,
+ selected: false,
+ disabled: false,
+ product: this.$tc('sw-order.payone-payment.modal.shippingCosts'),
+ });
+ }
},
closeRefundModal() {
@@ -146,49 +170,35 @@ export default {
complete: this.refundAmount === this.maxRefundAmount,
includeShippingCosts: false
};
+
this.isLoading = true;
- this.selection.forEach((selection) => {
- this.order.lineItems.forEach((order_item) => {
- if (order_item.id === selection.id && selection.selected && 0 < selection.quantity) {
- const copy = { ...order_item },
- taxRate = copy.tax_rate / (10 ** this.decimalPrecision);
+ this.selectedItems.forEach((selection) => {
+ if (selection.id === 'shipping') {
+ request.includeShippingCosts = true;
+ } else {
+ const orderLineItem = this.order.lineItems.find(lineItem => lineItem.id === selection.id);
+ if (orderLineItem) {
+ const copy = {...orderLineItem};
- copy.quantity = selection.quantity;
- copy.total_amount = copy.unit_price * copy.quantity;
- copy.total_tax_amount = Math.round(copy.total_amount / (100 + taxRate) * taxRate);
+ copy.quantity = selection.quantity;
+ copy.total_amount = copy.unit_price * copy.quantity;
+ copy.total_tax_amount = copy.total_amount - (copy.total_amount / (1 + (copy.tax_rate / 100)));
request.orderLines.push(copy);
}
- });
-
- if (selection.id === 'shipping' && selection.selected && 0 < selection.quantity) {
- request.includeShippingCosts = true;
}
});
- this.PayonePaymentService.refundPayment(request).then(() => {
- this.createNotificationSuccess({
- title: this.$tc('sw-order.payone-payment.refund.successTitle'),
- message: this.$tc('sw-order.payone-payment.refund.successMessage')
- });
-
- this.isRefundSuccessful = true;
- }).catch((error) => {
- this.createNotificationError({
- title: this.$tc('sw-order.payone-payment.refund.errorTitle'),
- message: error.message
- });
+ if (this.remainingAmount < request.amount) {
+ request.amount = this.remainingAmount;
+ }
- this.isRefundSuccessful = false;
- }).finally(() => {
- this.isLoading = false;
- this.closeRefundModal();
+ this.executeRefund(request);
+ },
- this.$nextTick().then(() => {
- this.$emit('reload')
- });
- });
+ getRefundableQuantityOfItem(orderItem) {
+ return (orderItem.customFields?.payone_captured_quantity ?? orderItem.quantity) - (orderItem.customFields?.payone_refunded_quantity ?? 0);
},
refundFullOrder() {
@@ -204,22 +214,19 @@ export default {
this.isLoading = true;
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
-
- request.orderLines.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
+ request.orderLines = this.order.lineItems.map((orderItem) => {
+ return {
+ id: orderItem.id,
+ quantity: this.getRefundableQuantityOfItem(orderItem),
+ unit_price: orderItem.unitPrice,
selected: false
- });
+ };
});
+ this.executeRefund(request);
+ },
+
+ executeRefund(request) {
this.PayonePaymentService.refundPayment(request).then(() => {
this.createNotificationSuccess({
title: this.$tc('sw-order.payone-payment.refund.successTitle'),
@@ -243,60 +250,13 @@ export default {
});
});
},
-
- onSelectItem(id, selected) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.selected = selected;
- }
- });
-
- this.calculateRefundAmount();
- },
-
- onChangeQuantity(id, quantity) {
- if (this.selection.length === 0) {
- this._populateSelectionProperty();
- }
-
- this.selection.forEach((selection) => {
- if (selection.id === id) {
- selection.quantity = quantity;
- }
- });
-
- this.calculateRefundAmount();
- },
-
- _populateSelectionProperty() {
- this.order.lineItems.forEach((order_item) => {
- let quantity = order_item.quantity;
-
- if (order_item.customFields && order_item.customFields.payone_refunded_quantity
- && 0 < order_item.customFields.payone_refunded_quantity) {
- quantity -= order_item.customFields.payone_refunded_quantity;
- }
-
- this.selection.push({
- id: order_item.id,
- quantity: quantity,
- unit_price: order_item.unitPrice,
- selected: false
- });
- });
-
- if (this.order.shippingCosts.totalPrice > 0) {
- this.selection.push({
- id: 'shipping',
- quantity: 1,
- unit_price: this.order.shippingCosts.totalPrice,
- selected: false
- });
- }
+ },
+ watch: {
+ items: {
+ handler() {
+ this.calculateActionAmount();
+ },
+ deep: true,
}
}
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
index e2a48b8cf..3d7b640c4 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-refund-button/payone-refund-button.html.twig
@@ -7,27 +7,21 @@
-
-
+
-
+
-
+
{{ $tc('sw-order.payone-payment.modal.close') }}
diff --git a/src/Resources/app/administration/src/module/sw-order/index.js b/src/Resources/app/administration/src/module/sw-order/index.js
index 795b30aa2..f3a78b1d0 100644
--- a/src/Resources/app/administration/src/module/sw-order/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/index.js
@@ -7,7 +7,6 @@ Shopware.Component.register('payone-refund-button', () => import('./component/pa
Shopware.Component.register('sw-order-detail-payone', () => import('./view/sw-order-detail-payone'));
Shopware.Component.override('sw-order-detail', () => import('./page/sw-order-detail'));
-Shopware.Component.extend('payone-data-grid', 'sw-data-grid', () => import('./component/payone-data-grid'));
Shopware.Module.register('sw-order-detail-tab-payone', {
routeMiddleware(next, currentRoute) {
diff --git a/src/Resources/app/administration/src/package-lock.json b/src/Resources/app/administration/src/package-lock.json
new file mode 100644
index 000000000..6108d470d
--- /dev/null
+++ b/src/Resources/app/administration/src/package-lock.json
@@ -0,0 +1,13 @@
+{
+ "name": "payonepayment",
+ "version": "1.0.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "payonepayment",
+ "version": "1.0.0",
+ "license": "MIT"
+ }
+ }
+}
diff --git a/src/Resources/app/storefront/.gitignore b/src/Resources/app/storefront/.gitignore
new file mode 100644
index 000000000..aeaadcb14
--- /dev/null
+++ b/src/Resources/app/storefront/.gitignore
@@ -0,0 +1,3 @@
+/cypress.config.js
+/cypress/screenshots/
+/node_modules/
diff --git a/src/Resources/app/storefront/cypress.config.js.dist b/src/Resources/app/storefront/cypress.config.js.dist
new file mode 100644
index 000000000..ff183e123
--- /dev/null
+++ b/src/Resources/app/storefront/cypress.config.js.dist
@@ -0,0 +1,31 @@
+const {defineConfig} = require('cypress')
+const tasks= require('./cypress/support/tasks') ;
+
+module.exports = defineConfig({
+ chromeWebSecurity: false,
+ experimentalModifyObstructiveThirdPartyCode: true,
+ e2e: {
+ baseUrl: 'https://localhost:8080',
+ experimentalRunAllSpecs: true,
+ setupNodeEvents(on, config) {
+ on('task', tasks)
+ },
+ },
+ env: {
+ username: 'admin',
+ password: 'admin123',
+ apiPath: "api",
+ admin: "/admin",
+ locale: "en-GB",
+ salesChannelName: "Storefront",
+
+ paypalMail: 'test-buyer@localhost.local',
+ paypalPassword: '123456',
+
+ paymentMethodSecuredPortalId: '12345456',
+ paymentMethodSecuredPortalKey: 'abcdefgh',
+
+ paymentMethodAmazonPayMerchantId: 'AIJXXXXXX',
+ }
+})
+
diff --git a/src/Resources/app/storefront/cypress/commands/checkout.js b/src/Resources/app/storefront/cypress/commands/checkout.js
new file mode 100644
index 000000000..53b60ba3c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/checkout.js
@@ -0,0 +1,67 @@
+Cypress.Commands.add('preparePaymentCheckout', (paymentMethodId, userData = {}, context = {}) => {
+ return cy.addProductToCart()
+ .then(() => cy.checkoutRegister(userData))
+ .then(() => cy.allowCurrencyForSalesChannel(context.currencyIso ?? 'EUR'))
+ .then(() => cy.selectPaymentMethod(paymentMethodId));
+});
+
+Cypress.Commands.add('selectPaymentMethod', (paymentMethodUuid) => {
+ cy.allowPaymentMethod(paymentMethodUuid).then(() => {
+ // navigate to checkout-confirm and select payment method
+ cy.visit('/checkout/confirm');
+ cy.get('[type="radio"][name="paymentMethodId"]').check(paymentMethodUuid, {
+ force: true, // we will force selecting the value, because shopware may hide the option behind "show more"
+ });
+ });
+});
+
+function testFinishPage(asyncProcess) {
+ if (typeof asyncProcess === 'function') {
+ return asyncProcess().then(() => {
+ cy.url({
+ timeout: 20000 // higher timeout is for a few payment methods which does have longer background tasks
+ }).should('contain', '/checkout/finish')
+ })
+ }
+ cy.url().should('contain', '/checkout/finish');
+}
+
+Cypress.Commands.add('checkoutConfirmAndComplete', (fillDataTests, asyncProcess) => {
+ cy.url().should('match', /((checkout\/(confirm|order))|account\/order)/); // account/order is only a fal
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+
+ return testFinishPage(asyncProcess);
+});
+
+Cypress.Commands.add('checkoutConfirmAfterCancelAndComplete', (fillDataTests, asyncProcess) => {
+ cy.url().should('contain', 'account/order/edit');
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#confirmOrderForm button[type=submit]').click();
+
+ return testFinishPage(asyncProcess);
+});
+
+Cypress.Commands.add('checkoutConfirmAndCancel', (fillDataTests, asyncProcess) => {
+ cy.url().should('contain', '/checkout/confirm');
+ cy.get('#tos').check();
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#confirmFormSubmit').click();
+
+ return asyncProcess().then(() => {
+ cy.url().should('contain', '/account/order/edit')
+ });
+});
+
+Cypress.Commands.add('checkoutConfirmFailValidation', (fillDataTests, testForErrors) => {
+ cy.url().should('contain', 'checkout/confirm');
+ typeof fillDataTests === 'function' ? fillDataTests() : null;
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+
+ cy.url().should('match', /checkout\/(confirm|order)/);
+ cy.get('.alert-danger[role=alert]').get('.alert-content').should('not.contain.text', 'error.VIOLATION::');
+
+ typeof testForErrors === 'function' ? testForErrors() : null;
+});
diff --git a/src/Resources/app/storefront/cypress/commands/customer.js b/src/Resources/app/storefront/cypress/commands/customer.js
new file mode 100644
index 000000000..535617b6d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/customer.js
@@ -0,0 +1,42 @@
+Cypress.Commands.add('checkoutRegister', (customerData = {}, inCheckout = true) => {
+ customerData.countryIso ??= 'DE';
+ customerData.guest ??= true;
+
+ if (!inCheckout) {
+ customerData.guest = false;
+ }
+
+ return cy.allowCountryForSalesChannel(customerData.countryIso).then((countryId) => {
+ if (inCheckout) {
+ cy.visit('/checkout/register');
+ } else {
+ cy.visit('/account/login');
+ }
+ cy.get('#personalSalutation').select(1);
+
+ cy.get('#personalFirstName').type(customerData.firstName ?? 'Payone');
+ cy.get('#personalLastName').type(customerData.lastName ?? 'Testbuyer');
+
+ const mail = customerData.mail ?? 'demo+' + (new Date()).getTime() + '@payone.demo';
+ cy.get('#personalMail').type(mail);
+
+ cy.get('#billingAddressAddressStreet').type(customerData.street ?? 'Demostreet 12');
+ cy.get('#billingAddressAddressZipcode').type(customerData.zipcode ?? '12345');
+ cy.get('#billingAddressAddressCity').type(customerData.city ?? 'Democity');
+
+ cy.get('#billingAddressAddressCountry').select(countryId);
+
+ cy.get('#personalPassword').then((el) => {
+ const isPasswordVisible = el?.is(':visible');
+ if ((customerData.guest && isPasswordVisible) || !customerData.guest && !isPasswordVisible) {
+ cy.get('#personalGuest').click()
+ }
+ });
+
+ if (!customerData.guest) {
+ cy.get('#personalPassword').type(mail);
+ }
+
+ cy.get('.register-submit > button').click()
+ })
+});
diff --git a/src/Resources/app/storefront/cypress/commands/override-shopware.js b/src/Resources/app/storefront/cypress/commands/override-shopware.js
new file mode 100644
index 000000000..5436f0dcd
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/override-shopware.js
@@ -0,0 +1,59 @@
+
+function getAuthCookieValue() {
+ return cy.getCookie('bearerAuth', {log: false}).then((cookie) => {
+ return cookie ? JSON.parse(decodeURIComponent(cookie.value)) : null;
+ });
+}
+
+Cypress.Commands.overwrite('getBearerAuth', () => {
+ return validateAdminAuthenticationCookie().then((res) => {
+ return !res ? cy.authenticate() : getAuthCookieValue();
+ })
+});
+
+Cypress.Commands.overwrite('authenticate', () => {
+ return cy.request(
+ 'POST',
+ '/api/oauth/token',
+ {
+ grant_type: Cypress.env('grant') ? Cypress.env('grant') : 'password',
+ client_id: Cypress.env('client_id') ? Cypress.env('client_id') : 'administration',
+ scopes: Cypress.env('scope') ? Cypress.env('scope') : 'write',
+ username: Cypress.env('username') || Cypress.env('user') || 'admin',
+ password: Cypress.env('password') || Cypress.env('pass') || 'shopware'
+ }
+ ).then((responseData) => {
+ let result = responseData.body;
+ result.access = result.access_token;
+ result.refresh = result.refresh_token;
+ result.expiry = Math.round(+new Date() / 1000) + result.expires_in;
+
+ return cy.setCookie(
+ 'bearerAuth',
+ JSON.stringify(result),
+ {
+ path: Cypress.env('admin'),
+ sameSite: "strict",
+ log: false
+ }
+ ).then(() => getAuthCookieValue());
+ });
+});
+
+function validateAdminAuthenticationCookie() {
+ return getAuthCookieValue().then(cookieValue => {
+ if (!cookieValue || cookieValue.expiry <= ((new Date().getTime()) / 1000)) {
+ cy.clearCookie('bearerAuth');
+ return false;
+ }
+
+ return cy.request({
+ method: 'GET',
+ url: '/api/_info/version',
+ failOnStatusCode: true,
+ headers: {
+ Authorization: `Bearer ${cookieValue.access}`
+ },
+ }).then(() => true);
+ });
+}
diff --git a/src/Resources/app/storefront/cypress/commands/product.js b/src/Resources/app/storefront/cypress/commands/product.js
new file mode 100644
index 000000000..b7053bd24
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/product.js
@@ -0,0 +1,78 @@
+const {v4: uuid} = require('uuid');
+
+Cypress.Commands.add('getDefaultProductId', () => {
+ return cy.task('getFromGlobalStore', 'productId').then(productId => {
+ if (productId) {
+ return productId
+ }
+
+ productId = uuid().replace(/-/g, '');
+
+ const productNumber = 'payone-cypress-storefront-test';
+
+ cy.searchViaAdminApi({
+ endpoint: 'product',
+ data: {
+ field: 'productNumber',
+ value: productNumber
+ }
+ }).then((product) => {
+ if (product?.id) {
+ return product.id;
+ }
+
+ return cy.searchViaAdminApi({
+ endpoint: 'currency',
+ data: {
+ field: 'isoCode',
+ value: 'EUR'
+ }
+ }).then(currency => {
+ return cy.searchViaAdminApi({
+ endpoint: 'tax',
+ data: {field: 'name', value: 'Standard rate'}
+ }).then(taxData => [currency.id, taxData.id]);
+ }).then(([currencyId, taxId]) => {
+ return cy.getSalesChannel()
+ .then((salesChannelData) => [currencyId, taxId, salesChannelData.id])
+ }).then(([currencyId, taxId, salesChannelId]) => {
+ return cy.createViaAdminApi({
+ endpoint: 'product',
+ data: {
+ id: productId,
+ name: productNumber,
+ productNumber: productNumber,
+ stock: 10,
+ taxId: taxId,
+ price: [{
+ currencyId: currencyId,
+ gross: 300,
+ net: 300 / 1.19,
+ linked: false
+ }],
+ visibilities: [{
+ salesChannelId: salesChannelId,
+ visibility: 30
+ }]
+ }
+ });
+ })
+ }).then((productId) => {
+ return cy.task('addToGlobalStore', {key: 'productId', value: productId});
+ });
+ });
+});
+
+Cypress.Commands.add('addProductToCart', () => {
+ return cy.getDefaultProductId().then(productId => {
+ cy.visit('/detail/' + productId);
+
+ cy.intercept({method: 'POST', url: '*checkout/line-item/add*'}).as('addProduct');
+ cy.intercept({method: 'GET', url: '*widgets/checkout/info*'}).as('ajaxCart');
+
+ cy.get('.btn.btn-primary.btn-buy').click();
+ cy.wait('@addProduct');
+ cy.wait('@ajaxCart');
+ cy.visit('/checkout/cart/');
+ });
+});
diff --git a/src/Resources/app/storefront/cypress/commands/sales-channel.js b/src/Resources/app/storefront/cypress/commands/sales-channel.js
new file mode 100644
index 000000000..1fb3abc8b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/sales-channel.js
@@ -0,0 +1,117 @@
+Cypress.Commands.add('getSalesChannel', () => {
+ const salesChannel = window.localStorage.getItem('salesChannel');
+ if (salesChannel) {
+ return JSON.parse(salesChannel);
+ }
+
+ return cy.searchViaAdminApi({
+ data: {
+ field: 'name',
+ value: Cypress.env('salesChannelName')
+ },
+ endpoint: 'sales-channel'
+ }).then((salesChannel) => {
+ window.localStorage.setItem('salesChannel', JSON.stringify(salesChannel));
+ return salesChannel;
+ });
+});
+
+Cypress.Commands.add('allowCountryForSalesChannel', (isoCode) => {
+ return cy.task('getAllowedCountryId', isoCode).then((countryId) => {
+ if (countryId) {
+ return countryId;
+ }
+
+ return cy.getSalesChannel().then((salesChannel) => {
+ cy.searchViaAdminApi({
+ endpoint: 'country',
+ data: {
+ field: 'iso',
+ value: isoCode
+ }
+ }).then((country) => {
+ return cy.updateViaAdminApi('sales-channel', salesChannel.id, {
+ data: {
+ countries: [{
+ id: country.id
+ }]
+ }
+ }).then(() => {
+ return cy.task('addAllowedCountry', {isoCode: isoCode, id: country.id})
+ }).then(() => country.id)
+ })
+ })
+ })
+});
+
+Cypress.Commands.add('allowCurrencyForSalesChannel', (isoCode) => {
+ return cy.task('getAllowedCurrencyId', isoCode).then((currencyId) => {
+ if (currencyId) {
+ return currencyId;
+ }
+
+ const allowedCurrencies = JSON.parse(window.localStorage.getItem('allowedCurrencies') ?? '{}');
+ if (allowedCurrencies[isoCode] ?? false) {
+ return allowedCurrencies[isoCode];
+ }
+
+ return cy.getSalesChannel().then((salesChannel) => {
+ cy.searchViaAdminApi({
+ endpoint: 'currency',
+ data: {
+ field: 'isoCode',
+ value: isoCode
+ }
+ }).then((currency) => {
+ return cy.updateViaAdminApi('sales-channel', salesChannel.id, {
+ data: {
+ currencies: [{
+ id: currency.id
+ }]
+ }
+
+ }).then(() => {
+ return cy.task('addAllowedCurrency', {isoCode: isoCode, id: currency.id})
+ })
+ })
+ })
+ }).then(() => {
+ cy.visit('/'); // navigate to home, to make sure dropdown is visible
+ cy.get('body').then($body => {
+ if ($body.find('.top-bar .currencies-menu').length) {
+ cy.get('.top-bar .currencies-menu > .dropdown-toggle').click();
+ cy.get('.top-bar .currencies-menu [title="' + isoCode + '"]').click();
+ }
+ });
+ })
+});
+
+Cypress.Commands.add('allowPaymentMethod', (paymentMethodUuid) => {
+ return cy.task('isPaymentMethodAllowed', paymentMethodUuid).then(isAllowed => {
+ if (isAllowed) {
+ return;
+ }
+
+ return cy.getSalesChannel().then(salesChannelData => {
+ // make sure that payment method is enabled in sales-channel
+ return cy.updateViaAdminApi('sales-channel', salesChannelData.id, {
+ data: {
+ id: salesChannelData.id,
+ paymentMethods: [{
+ id: paymentMethodUuid
+ }]
+ }
+ });
+ }).then(() => {
+ // make sure that payment method is enabled
+ return cy.updateViaAdminApi('payment-method', paymentMethodUuid, {
+ data: {
+ id: paymentMethodUuid,
+ active: true
+ }
+ });
+ }).then(() => cy.task('addAllowedPaymentMethod', paymentMethodUuid))
+ })
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/commands/shopware-configuration.js b/src/Resources/app/storefront/cypress/commands/shopware-configuration.js
new file mode 100644
index 000000000..44af4a2f5
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/commands/shopware-configuration.js
@@ -0,0 +1,7 @@
+Cypress.Commands.add('setShopwareConfig', (config) => {
+ return cy.requestAdminApi('POST', 'api/_action/system-config/batch', {
+ data: {
+ 'null': config
+ }
+ })
+});
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js
new file mode 100644
index 000000000..5c2a79215
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/alipay.cy.js
@@ -0,0 +1,30 @@
+describe('Alipay', () => {
+ const PAYMENT_METHOD_ID = 'fef3c750f8e94a6abb7d0a8061ac9faf';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ // .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled. Payment method is not available
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js
new file mode 100644
index 000000000..852606b4b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay-express.cy.js
@@ -0,0 +1,61 @@
+import {registerCommands} from '../../helper/amazon';
+
+describe('Amazon Pay Express', () => {
+ const PAYMENT_METHOD_ID = 'd310a86cdaf14dd6b69bcf2b98f23268';
+
+ before(registerCommands);
+
+ beforeEach(() => {
+ cy.viewport(1400, 1400); // amazon pay button is not clickable if it is not visible
+ cy.setShopwareConfig({
+ 'PayonePayment.settings.amazonPayExpressAmazonMerchantId': Cypress.env('paymentMethodAmazonPayMerchantId'),
+ });
+
+ cy.checkoutRegister({}, false);// only required to get a valid context
+
+ cy.allowPaymentMethod(PAYMENT_METHOD_ID);
+ cy.addProductToCart();
+ cy.allowCurrencyForSalesChannel('EUR');
+ });
+
+ it('complete payment', () => {
+ cy.visit('/checkout/cart');
+ cy.get('#AmazonPayExpressButton-cart').click();
+ processPayment();
+ });
+
+ it('complete payment in cart-offcanvas', () => {
+ cy.visit('/');
+ cy.get('.header-cart-btn').click();
+ cy.wait(500) // wait a few seconds to make sure that button is loaded
+ cy.get('#AmazonPayExpressButton-offcanvas').click();
+ processPayment();
+ });
+
+ function processPayment() {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+
+ cy.origin('payments.amazon.de', () => {
+ cy.waitForAmazonLogin();
+ cy.wait(1000);
+ cy.get('#change-address-button').click();
+ cy.get('#change-buyer-details [data-country="DE"]').first().should('be.visible').click();
+ cy.get('[data-action="update-address"] [type="submit"]').click();
+ cy.get('[data-action="continue-checkout"] [type="submit"]').click();
+ });
+
+ cy.window().then(() => {
+ cy.wait(2000);
+ cy.checkoutConfirmAndComplete(() => {
+ // validate if only amazon pay express is visible
+ cy.get('#changePaymentForm .payment-methods .payment-method').should('have.length', 1);
+ cy.get('#changePaymentForm [name="paymentMethodId"]').invoke('val').should('equal', PAYMENT_METHOD_ID);
+ cy.get('a[href*="payone/delete-checkout-data"]').should('be.visible');
+ });
+ });
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js
new file mode 100644
index 000000000..2b4b345ee
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/amazon-pay.cy.js
@@ -0,0 +1,44 @@
+import {registerCommands, processCheckout} from '../../helper/amazon';
+
+describe('Amazon Pay', () => {
+ const PAYMENT_METHOD_ID = 'ae2b29f0b99d4ba9852063d84d198180';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.amazonPayAmazonMerchantId': Cypress.env('paymentMethodAmazonPayMerchantId'),
+ 'PayonePayment.settings.amazonPayStoreName': 'Test GmbH'
+ }));
+
+ before(registerCommands)
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(fillValidData, processCheckout)));
+
+ it('cancel payment & complete after cancel', (done) => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ fillValidData,
+ () => {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+ cy.origin('payments.amazon.de', () => {
+ cy.get('#return_back_to_merchant_link').click();
+ })
+
+ return Promise.resolve();
+ }
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(fillValidData, done));
+ // it seems that there are problems, if the simulated browser reopen amazon again. Amazon throws an error, that jquery is already registered.
+ // so we will not complete the order, just check if the user is redirected to the amazon pay again, and then we will stop the test
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function fillValidData() {
+ cy.get('#payonePhone').type('0123456789');
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js
new file mode 100644
index 000000000..841d06d8c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/bancontact.cy.js
@@ -0,0 +1,30 @@
+describe('Bancontact', () => {
+ const PAYMENT_METHOD_ID = '32ecec740c7142c9bf51d00ea894ffad';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ // .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled. Payment method is not available
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {countryIso: 'BE'});
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js
new file mode 100644
index 000000000..5e0f1638a
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/creditcard.cy.js
@@ -0,0 +1,72 @@
+describe('Credit Card', () => {
+ const PAYMENT_METHOD_ID = '37f90a48d9194762977c9e6db36334e0';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => cy.checkoutConfirmAndComplete(
+ () => {
+ fillIframe();
+ cy.get('#saveCreditCard').should('not.exist'); // user is a guest user, so the user should not able to save the credit-card
+ }));
+ });
+
+ it('fails with invalid credit card number', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ cy.get('#tos').check();
+ fillIframe('invalid-cc-number')
+ cy.get('#confirmFormSubmit').click();
+ cy.get('#errorOutput');
+ });
+ });
+
+ it('save credit card and reuse it', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ guest: false
+ }).then(() => cy.checkoutConfirmAndComplete(
+ () => {
+ fillIframe();
+ cy.get('#saveCreditCard').check();
+ }));
+
+ cy.visit('account/card/overview');
+ cy.get('.account-payone-card table tbody tr').should('have.length', 1)
+ cy.get('.account-payone-card table tbody tr td:first-child').should('contain.text', '411111');
+ cy.get('.account-payone-card table tbody tr td:last-child a').then($el => {
+ const matches = $el.prop('href').match(/\?pseudoCardPan=(\d+)$/);
+ cy.wrap(matches).should('have.length', 2);
+ cy.wrap(matches[1]).as('creditCardPan');
+ });
+
+ cy.addProductToCart().then(() => cy.selectPaymentMethod(PAYMENT_METHOD_ID));
+
+ cy.checkoutConfirmAndComplete(
+ () => {
+ cy.get('@creditCardPan').then((storedPan) => {
+ cy.get('#savedpseudocardpan').select(storedPan)
+ cy.get('.credit-card-input').should('not.be.visible');
+ })
+ });
+ });
+
+ function fillIframe(iban = '4111111111111111') {
+ setIframeValue('cardpan', 'input', iban);
+ setIframeValue('cardcvc2', 'input', '123');
+ setIframeValue('cardexpiremonth', 'select', 5);
+ setIframeValue('cardexpireyear', 'select', 5);
+ }
+
+ function setIframeValue(id, type, value) {
+ const selector = '#' + id + ' > iframe';
+
+ return cy.frameLoaded(selector, {url: 'https://secure.pay1.de/'})
+ .then(() => cy.enter(selector))
+ .then(getBody => {
+ if (type === 'input') {
+ return getBody().find('#' + id).type(value, {force: true})
+ } else if (type === 'select') {
+ return getBody().find('#' + id).select(value, {force: true})
+ } else {
+ throw new Error('unknown input type ' + type)
+ }
+ })
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js
new file mode 100644
index 000000000..9914a2aae
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/direct-debit.cy.js
@@ -0,0 +1,32 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '1b017bef157b4222b734659361d996fd';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid iban', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ cy.get('#tos').check();
+ cy.get('#confirmFormSubmit').click();
+ cy.get('#errorOutput');
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#iban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#accountOwner').type('Max Mustermann');
+ }, () => {
+ cy.wait(4000); // wait for register new event listeners TODO verify why this takes so long.
+ cy.get('#accept-mandate').check();
+ cy.get('#mandateSubmit').click();
+ return Promise.resolve();
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js
new file mode 100644
index 000000000..d03bb5438
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/eps.cy.js
@@ -0,0 +1,40 @@
+describe('EPS', () => {
+ const PAYMENT_METHOD_ID = '6004c8b082234ba5b2834da9874c5ec7';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'AT',
+ zipcode: 1234
+ }).then(() => epsCheckout);
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'AT',
+ zipcode: 1234
+ }).then(() => {
+ return cy.checkoutConfirmAndCancel(
+ () => cy.get('#epsBankGroup').select('ARZ_HTB'),
+ () => cy.origin('www.banking.co.at', () => {
+ cy.get('[name="cancelSoTransaction"]').click();
+ cy.get('[name="back2Shop"]').click();
+ })
+ ).then(() => epsCheckout);
+ });
+ });
+
+ function epsCheckout() {
+ return cy.checkoutConfirmAndComplete(
+ () => cy.get('#epsBankGroup').select('ARZ_HTB'),
+ () =>
+ cy.origin('www.banking.co.at', () => {
+ cy.get('#verfNr').clear().type(123456);
+ cy.get('#verfPIN').clear().type(12345);
+ cy.get('#sbtnLogin').click();
+ cy.get('#sbtnSign').click();
+ cy.get('[name="zVerf"]').check('MTAN');
+ cy.get('#sbtnSignCollect').click();
+ })
+ );
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js
new file mode 100644
index 000000000..19c40e247
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ideal.cy.js
@@ -0,0 +1,14 @@
+describe('iDEAL', () => {
+ const PAYMENT_METHOD_ID = '3f567ad46f1947e3960b66ed3af537aa';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'NL',
+ }).then(() => {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#idealBankGroup').select(3);
+ });
+ });
+ });
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js
new file mode 100644
index 000000000..40da99616
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-direct-debit.cy.js
@@ -0,0 +1,13 @@
+import {executeKlarnaCheckout, executeKlarnaCheckoutCancel, customerData} from "../../helper/klarna";
+
+describe('Klarna Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '31af2cbeda5242bfbfe4531e203f8a42';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js
new file mode 100644
index 000000000..cf2521267
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-installment.cy.js
@@ -0,0 +1,14 @@
+import {customerData, executeKlarnaCheckout, executeKlarnaCheckoutCancel} from "../../helper/klarna";
+
+describe('Klarna Installment', () => {
+ const PAYMENT_METHOD_ID = 'a18ffddd4baf4948b8c9f9d3d8abd2d4';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js
new file mode 100644
index 000000000..c816abf5a
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/klarna-invoice.cy.js
@@ -0,0 +1,13 @@
+import {executeKlarnaCheckout, executeKlarnaCheckoutCancel, customerData} from "../../helper/klarna";
+
+describe('Klarna Invoice', () => {
+ const PAYMENT_METHOD_ID = 'c4cd059611cc4d049187d8d955ec1f91';
+
+ it('complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckout(done));
+ });
+
+ it('cancel payment & complete payment', (done) => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, customerData).then(() => executeKlarnaCheckoutCancel(done));
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js
new file mode 100644
index 000000000..a1cc3f535
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/open-invoice.cy.js
@@ -0,0 +1,9 @@
+describe('Secure Invoice', () => {
+ const PAYMENT_METHOD_ID = '9024aa5a502b4544a745b6b64b486e21';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete();
+ });
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js
new file mode 100644
index 000000000..cc48d7231
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paydirekt.cy.js
@@ -0,0 +1,50 @@
+describe('Paydirekt', () => {
+ const PAYMENT_METHOD_ID = 'b5b52a27e6b14a37bbb4087ec821b0f4';
+
+ before(() => {
+ cy.origin('sandbox.paydirekt.de', () => {
+ Cypress.Commands.add('waitForGiropayWelcomeScreen', () => {
+ cy.get('co\\.welcome-screen', {timeout: 10000}).should('be.visible');
+ cy.get('co\\.welcome-screen', {timeout: 10000}).should('not.exist');
+ cy.get('body').then(($body) => {
+ $body.find('.rds-cookies-overlay__allow-essential-cookies-btn button')?.click();
+ });
+ });
+ });
+ })
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, paydirektCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () => {
+ return cy.origin('sandbox.paydirekt.de', () => {
+ cy.waitForGiropayWelcomeScreen();
+ cy.get('[name="cancelPayment"]', {timeout: 6000}).click();
+ cy.get('[name="abortionButton"]').click();
+ })
+ }).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, paydirektCheckout);
+ });
+ });
+ });
+
+ function paydirektCheckout() {
+ return cy.origin('sandbox.paydirekt.de', () => {
+ cy.waitForGiropayWelcomeScreen();
+
+ cy.get('[name="selectedPaymentOptionType"]').check('paydirekt');
+ cy.get('button[name="paymentButton"][type="submit"]').click();
+ cy.get('#username', {timeout: 6000}).type('PAYONE-1');
+ cy.get('#password').type('Payone!-1');
+ cy.get('[name="loginBtn"]').click();
+ cy.get('[name="confirmPaymentButton"]', {timeout: 6000}).click();
+ cy.get('success-with-redirect').should('be.visible');
+ cy.get('[name="redirectImmediatelyButton"]').click();
+ })
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js
new file mode 100644
index 000000000..1ccd9b507
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal-express.cy.js
@@ -0,0 +1,46 @@
+import {processPayment} from '../../helper/paypal';
+
+describe('PayPal Express', () => {
+ const PAYMENT_METHOD_ID = '5ddf648859a84396a98c97a1a92c107f';
+
+ beforeEach(() => {
+ cy.viewport(1400, 1400); // amazon pay button is not clickable if it is not visible
+ // cy.checkoutRegister({}, false);// only required to get a valid context
+
+ cy.allowPaymentMethod(PAYMENT_METHOD_ID);
+ cy.addProductToCart();
+ cy.allowCurrencyForSalesChannel('EUR');
+ });
+
+ it('complete payment', () => {
+ cy.visit('/checkout/cart');
+ _processPayment();
+
+
+ });
+
+ it('complete payment in cart-offcanvas', () => {
+ cy.visit('/');
+ cy.get('.header-cart-btn').click();
+ cy.wait(500) // wait a few seconds to make sure that button is loaded
+ _processPayment();
+ });
+
+ function _processPayment() {
+ cy.get('a[href*="/payone/express-checkout/redirect/"]').click();
+ processPayment(null);
+
+ cy.window().then(() => {
+ cy.wait(2000);
+ cy.checkoutConfirmAndComplete(() => {
+ // validate if only paypal pay express is visible
+ cy.get('#changePaymentForm .payment-methods .payment-method').should('have.length', 1);
+ cy.get('#changePaymentForm [name="paymentMethodId"]').invoke('val').should('equal', PAYMENT_METHOD_ID);
+ cy.get('a[href*="payone/delete-checkout-data"]').should('be.visible');
+ });
+ });
+ }
+
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js
new file mode 100644
index 000000000..440b7be5d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/paypal.cy.js
@@ -0,0 +1,23 @@
+import {processPayment} from "../../helper/paypal";
+
+describe('PayPal', () => {
+ const PAYMENT_METHOD_ID = '21e157163fdb4aa4862a2109abcd7522'
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, processPayment);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () => {
+ return cy.origin('www.sandbox.paypal.com', () => {
+ cy.get('#cancelLink').click();
+ })
+ }).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, processPayment);
+ });
+ });
+ });
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js
new file mode 100644
index 000000000..e96115e33
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-card.cy.js
@@ -0,0 +1,36 @@
+describe('Postfinance Card', () => {
+ const PAYMENT_METHOD_ID = '8b4503f88a7746069a670e1689908832';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () =>
+ cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Cancel');
+ cy.get('[type=submit]').click();
+ })
+ ).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+ });
+
+ function postFinanceCheckout() {
+ return cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Success');
+ cy.get('[type=submit]').click();
+ })
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js
new file mode 100644
index 000000000..4d8142401
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/postfinance-wallet.cy.js
@@ -0,0 +1,36 @@
+describe('Postfinance Wallet', () => {
+ const PAYMENT_METHOD_ID = 'cd65c7f9c0cc4e0886799f7cc7407494';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+
+ it('cancel payment & complete after cancel', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'CH',
+ zipcode: 1234
+ }, {currencyIso: 'CHF'}).then(() => {
+ return cy.checkoutConfirmAndCancel(undefined, () =>
+ cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Cancel');
+ cy.get('[type=submit]').click();
+ })
+ ).then(() => {
+ return cy.checkoutConfirmAfterCancelAndComplete(undefined, postFinanceCheckout);
+ });
+ });
+ });
+
+ function postFinanceCheckout() {
+ return cy.origin('gpc-sys.pay1.de', () => {
+ cy.get('[name="status"]').select('Success');
+ cy.get('[type=submit]').click();
+ })
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js
new file mode 100644
index 000000000..10e5fb5db
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/prepayment.cy.js
@@ -0,0 +1,7 @@
+describe('Prepayment: Default success checkout', () => {
+ it('passes', () => {
+ cy.preparePaymentCheckout('267699739afd4cdd9663cac0bd269da6').then(() => {
+ return cy.checkoutConfirmAndComplete();
+ });
+ })
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js
new file mode 100644
index 000000000..a3135f68d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/przelewy24.cy.js
@@ -0,0 +1,34 @@
+describe('Przelewy24', () => {
+ const PAYMENT_METHOD_ID = '6068e01cef8b4c9698956c6cca648d50';
+
+ it('complete payment', () => init().then(() => processCheckout));
+
+ it('cancel payment & complete after cancel', () => {
+ init().then(() =>
+ cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ )).then(() => processCheckout);
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID, {
+ countryIso: 'PL',
+ }, {currencyIso: 'PLN'});
+ }
+
+ function processCheckout() {
+ return cy.checkoutConfirmAndComplete(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ );
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js
new file mode 100644
index 000000000..790709d8d
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-debit.cy.js
@@ -0,0 +1,51 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Ratepay Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '48f2034b3c62480a8554781cf9cac574';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayDebitProfiles': [{ shopId: '88880103', 'currency': 'EUR'}]
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment();
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type(IBAN.random(CountryCode.DE).toString());
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type('invalid-iban');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('#ratepayIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js
new file mode 100644
index 000000000..130d06922
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-installment.cy.js
@@ -0,0 +1,103 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Ratepay Installment', () => {
+ const PAYMENT_METHOD_ID = '0af0f201fd164ca9ae72313c70201d18';
+
+ beforeEach(() => {
+ cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayInstallmentProfiles': [{shopId: '88880103', 'currency': 'EUR'}]
+ })
+ });
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type(IBAN.random(CountryCode.DE).toString());
+ }
+ ).then(processPayment);
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ cy.get('#ratepayIban').type('invalid-iban');
+ }
+ ).then(processPayment);
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('#ratepayIban').clear().type(IBAN.random(CountryCode.DE).toString());
+
+ testPlanChanges(
+ () => cy.get('#ratepayRuntime').select(2),
+ () => cy.get('#ratepayRuntime').select(5),
+ 1
+ );
+
+ const changeRate = () => cy.get('#payone-ratepay-calculate-installment-btn').click();
+ testPlanChanges(
+ () => cy.get('#ratepayRate').clear().type("1").then(changeRate), // use a very small value to take the lowest rate
+ () => cy.get('#ratepayRate').clear().type("5000").then(changeRate), // use a very high value to take the highest rate
+ 2
+ );
+ });
+ }
+
+ function testPlanChanges(initialValueChange, newValueChange, run) {
+ // set default value to compare it later
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest1' + run)
+ initialValueChange();
+ cy.wait('@calcRequest1' + run);
+
+ getPlanInfo().then((initialCalculatedPlan) => {
+ // set new runtime value
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest2' + run)
+ newValueChange();
+ cy.wait('@calcRequest2' + run);
+ getPlanInfo().should('not.equal', initialCalculatedPlan);
+
+ // set runtime back to initial value
+ cy.intercept('payone/ratepay/installment/calculation').as('calcRequest3' + run)
+ initialValueChange();
+ cy.wait('@calcRequest3' + run);
+ getPlanInfo().should('equal', initialCalculatedPlan);
+ });
+
+ cy.get('#ratepayIbanCollapseTrigger').then(($el) => {
+ if ($el.find('.payone-ratepay-open-text:visible')) {
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ } else {
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('be.visible').should('have.attr', 'required');
+ cy.get('#ratepayIbanCollapseTrigger').click();
+ cy.get('#ratepayIban').should('not.be.visible').should('not.have.attr', 'required');
+ }
+ })
+ }
+
+ function getPlanInfo() {
+ return cy.get('#ratepayInstallmentTable tr:first-child td:first-child p:first-child')
+ .invoke('text')
+ .then((t) => t.replaceAll(/\s*\n*(([^ ]+ \w+)+)\s*\n*$/g, '$1'));
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js
new file mode 100644
index 000000000..9e692718b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/ratepay-invoice.cy.js
@@ -0,0 +1,33 @@
+describe('Ratepay Invoice', () => {
+ const PAYMENT_METHOD_ID = '240dcc8bf5fc409c9dcf840698c082aa';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.ratepayInvoicingProfiles': [{ shopId: '88880103', 'currency': 'EUR'}]
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01')
+ cy.get('#payonePhone').type('012345789')
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789')
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js
new file mode 100644
index 000000000..ec1b7d05c
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secure-invoice.cy.js
@@ -0,0 +1,28 @@
+describe('Secure Invoice', () => {
+ const PAYMENT_METHOD_ID = '4e8a9d3d3c6e428887573856b38c9003';
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01')
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js
new file mode 100644
index 000000000..a7d56845b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-direct-debit.cy.js
@@ -0,0 +1,55 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Secured Direct Debit', () => {
+ const PAYMENT_METHOD_ID = '72c4c88b918441848e20081de67a16c4';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedDirectDebitPortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedDirectDebitPortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedDirectDebitIban').type('invalid-iban');
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedDirectDebitIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').type('2050-01-01');
+ cy.get('#payonePhone').type('012345789');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ // we won't test invalid phone number, because PAYONE (module) does not validate the phone number.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#securedDirectDebitIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payonePhone').type('012345789');
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js
new file mode 100644
index 000000000..d22f765f5
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-installment.cy.js
@@ -0,0 +1,50 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Secured Installment', () => {
+ const PAYMENT_METHOD_ID = '9c4d04f6ad4b4a2787e3812c56b6153b';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedInstallmentPortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedInstallmentPortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedInstallmentIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').clear().type('2025-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ }
+ ).then(processPayment);
+ });
+ });
+
+ it('fails with invalid iban & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#securedInstallmentIban').clear().type('test-test');
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ }
+ ).then(processPayment);
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#securedInstallmentIban').clear().type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payoneBirthday').clear().type('1990-01-01');
+ cy.get('#payonePhone').clear().type('012345789');
+ cy.get('[name=securedInstallmentOptionId]').first().click();
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js
new file mode 100644
index 000000000..03d1991c0
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/secured-invoice.cy.js
@@ -0,0 +1,34 @@
+describe('Secured Invoice', () => {
+ const PAYMENT_METHOD_ID = '4ca01ac1471c4da5b76faeaa42524cc3';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.securedInvoicePortalId': Cypress.env('paymentMethodSecuredPortalId'),
+ 'PayonePayment.settings.securedInvoicePortalKey': Cypress.env('paymentMethodSecuredPortalKey'),
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ it('fails with invalid birthday & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => {
+ cy.get('#payoneBirthday').type('2050-01-01');
+ }
+ ).then(() => {
+ return processPayment();
+ });
+ });
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01')
+ cy.get('#payonePhone').type('012345789')
+ });
+ }
+
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js
new file mode 100644
index 000000000..e3d3b0c68
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/sofort-banking.cy.js
@@ -0,0 +1,77 @@
+// info: we use `force` for actions on sofort.com to ignore the cookie-modal, which pop up on a very late stage.
+
+describe('Sofort Banking', () => {
+ const PAYMENT_METHOD_ID = '9022c4733d14411e84a78707088487aa';
+
+ beforeEach(() => {
+ // make sure that klarna does not store any cookies in the session
+ cy.clearAllCookies();
+ cy.clearAllSessionStorage();
+ cy.clearAllLocalStorage();
+ })
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => klarnaLogin().then(() =>
+ cy.origin('www.sofort.com', () => {
+ cy.get('.cancel-transaction').click({force: true});
+
+ // sometimes the user is asked for the reason why he cancelled the payment.
+ cy.wait(400);
+ cy.get('.wait-box').should($el => $el.length === 0 || !$el.is('visible'));
+ cy.window().then(window => {
+ if (window.origin.includes('www.sofort.com')) {
+ window.document.querySelector('#CancelTransaction').click();
+ }
+ })
+ })
+ )
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled, so the payment method is not available after cancel
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function klarnaLogin() {
+ return cy.wait(1500).then(() =>
+ cy.window().then(window => {
+ if (window.origin.includes('login.nonprod.klarna.net')) {
+ return cy.origin('login.nonprod.klarna.net', () => {
+ cy.get('#phone').type('+4901761428434');
+ cy.get('#onContinue').click();
+ cy.get('#otp_field').type('123456')
+ });
+ }
+ })
+ );
+ }
+
+ function processCheckout() {
+ return klarnaLogin().then(() =>
+ cy.origin('www.sofort.com', () => {
+ cy.get('label[for="account-88888888"]').click({force: true}); // demo-bank
+
+ cy.get('#BackendFormLOGINNAMEUSERID').type('12345678', {force: true})
+ cy.get('#BackendFormUSERPIN').type('12345678', {force: true});
+ cy.get('.button-right.primary').click({force: true});
+
+ cy.get('body').then($body => {
+ if ($body.find('.account-selector').length) {
+ cy.get('.button-right.primary').click({force: true});
+ }
+ });
+
+ cy.get('#BackendFormTan').type('12345', {force: true})
+ cy.get('.button-right.primary').click({force: true});
+ })
+ );
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js
new file mode 100644
index 000000000..e59b83bb4
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/trustly.cy.js
@@ -0,0 +1,46 @@
+import {CountryCode, IBAN} from 'ibankit';
+
+describe('Trustly', () => {
+ const PAYMENT_METHOD_ID = '741f1deec67d4012bd3ccce265b2e15e';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(initValidData, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ () => {
+ cy.get('#iban').type(IBAN.random(CountryCode.DE).toString());
+ },
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ .then(() => cy.checkoutConfirmAfterCancelAndComplete(initValidData, processCheckout))
+ });
+
+ it('fails with invalid iban', () => {
+ init().then(() => {
+ return cy.checkoutConfirmFailValidation(
+ () => cy.get('#iban').type('invalid-iban')
+ ).then(() => cy.checkoutConfirmAndComplete(initValidData, processCheckout));
+ });
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function initValidData() {
+ cy.get('#iban').clear().type(IBAN.random(CountryCode.DE).toString());
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js
new file mode 100644
index 000000000..d3de81e95
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-debit.cy.js
@@ -0,0 +1,29 @@
+import {BIC, CountryCode, IBAN} from "ibankit";
+
+describe('Unzer Debit', () => {
+ const PAYMENT_METHOD_ID = '700954775fad4a8f92463b3d629c8ad5';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionDebitCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ // TODO: missing validation in frontend. Nothing happens if the validation fails.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payolutionAccountHolder').type('Max Mustermann');
+ cy.get('#payolutionIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payolutionBic').type('DEUTDEFF500');
+
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ cy.get('#payolutionMandate').check();
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js
new file mode 100644
index 000000000..09d0638f0
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-installment.cy.js
@@ -0,0 +1,59 @@
+import {CountryCode, IBAN} from "ibankit";
+
+describe('Unzer Installment', () => {
+ const PAYMENT_METHOD_ID = '569b46970ad2458ca8f17f1ebb754137';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionInstallmentCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(processPayment);
+ });
+
+ it('test empty fields & complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ fillCheckoutWithCorrectData();
+ cy.get('#tos').check();
+
+ const fieldIds = ['payolutionAccountOwner', 'payolutionIban', 'payolutionBic'];
+ fieldIds.forEach((fieldId) => {
+ cy.get('#' + fieldId).invoke('val').then(prevVal => {
+ cy.get('#' + fieldId).clear();
+ cy.get('#confirmFormSubmit').click();
+ cy.wait(2000);
+ cy.url().should('not.contain', '/checkout/finish');
+
+ // set value back to initial value to make sure we can check out at the end.
+ cy.get('#' + fieldId).invoke('val', prevVal);
+ });
+ });
+ });
+ cy.checkoutConfirmAndComplete();
+ });
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ fillCheckoutWithCorrectData();
+
+ cy.get('#payolutionInstallmentDuration').children().each(($option) => {
+ cy.get('#payolutionInstallmentDuration').select($option.val()).invoke('val').then(selectedValue => {
+ cy.get('.installmentDetail[data-duration=' + selectedValue + ']').should('have.length', 2).should('be.visible');
+ cy.get('.installmentDetail:not([data-duration=' + selectedValue + '])').should('not.be.visible');
+ });
+ })
+ });
+ }
+
+ function fillCheckoutWithCorrectData() {
+ cy.intercept('payone/installment/calculation').as('calcRequest');
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ cy.get('#checkInstallmentButton').click();
+ cy.wait('@calcRequest');
+
+ cy.get('#payolutionAccountOwner').type('Max Mustermann');
+ cy.get('#payolutionIban').type(IBAN.random(CountryCode.DE).toString());
+ cy.get('#payolutionBic').type('DEUTDEFF500');
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js
new file mode 100644
index 000000000..dd6fb9aee
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/unzer-invoice.cy.js
@@ -0,0 +1,22 @@
+describe('Unzer Invoice', () => {
+ const PAYMENT_METHOD_ID = '0407fd0a5c4b4d2bafc88379efe8cf8d';
+
+ beforeEach(() => cy.setShopwareConfig({
+ 'PayonePayment.settings.payolutionInvoicingCompanyName': 'Test GmbH'
+ }));
+
+ it('complete payment', () => {
+ cy.preparePaymentCheckout(PAYMENT_METHOD_ID).then(() => {
+ return processPayment()
+ });
+ });
+
+ // TODO: missing validation in frontend. Nothing happens if the validation fails.
+
+ function processPayment() {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.get('#payoneBirthday').type('1990-01-01');
+ cy.get('#payolutionConsent').check();
+ });
+ }
+})
diff --git a/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js b/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js
new file mode 100644
index 000000000..d634f03de
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/e2e/payment-method/wechat.cy.js
@@ -0,0 +1,30 @@
+describe('WeChat', () => {
+ const PAYMENT_METHOD_ID = 'e9647d765b284cea9c4c0d68005665b7';
+
+ it('complete payment', () => init().then(() => cy.checkoutConfirmAndComplete(undefined, processCheckout)));
+
+ it('cancel payment & complete after cancel', () => {
+ init()
+ .then(() => cy.checkoutConfirmAndCancel(
+ undefined,
+ () => cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('failed_user_abort');
+ cy.get('#submitbutton').click();
+ })
+ ))
+ //.then(() => cy.checkoutConfirmAfterCancelAndComplete(undefined, processCheckout)) // after-order is not enabled, so the payment method is not available after cancel
+ });
+
+ function init() {
+ return cy.preparePaymentCheckout(PAYMENT_METHOD_ID);
+ }
+
+ function processCheckout() {
+ return cy.origin('r3.girogate.de', () => {
+ cy.get('[name="result"]').select('succeeded');
+ cy.get('#submitbutton').click();
+ })
+ }
+});
+
+
diff --git a/src/Resources/app/storefront/cypress/helper/amazon.js b/src/Resources/app/storefront/cypress/helper/amazon.js
new file mode 100644
index 000000000..0075d152b
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/amazon.js
@@ -0,0 +1,31 @@
+export function registerCommands() {
+ cy.origin('payments.amazon.de', () => {
+ Cypress.Commands.add('waitForAmazonSpinner', (spinnerSelector) => {
+ cy.get(spinnerSelector, {timeout: 10000}).should('be.visible');
+ cy.get(spinnerSelector, {timeout: 10000}).should(($el) => $el.length === 0 || !$el.is('visible'));
+ });
+ Cypress.Commands.add('waitForAmazonLogin', () => {
+ cy.waitForAmazonSpinner('.a-spinner-wrapper');
+ cy.wait(2000);
+ });
+ });
+ cy.origin('www.amazon.de', () => {
+ Cypress.Commands.add('amazonLogin', () => {
+ cy.get('[name="email"]').type('frederik.rommel+testbestellung@webidea24.de');
+ cy.get('[name="password"]').type('frederik.rommel+testbestellung@webidea24.de');
+ cy.get('#signInSubmit').click();
+ });
+ });
+}
+export function processCheckout() {
+ cy.origin('www.amazon.de', () => {
+ cy.amazonLogin();
+ });
+ cy.origin('payments.amazon.de', () => {
+ cy.waitForAmazonLogin();
+ cy.get('[data-action="continue-checkout"] [type="submit"]').click();
+ cy.waitForAmazonSpinner('.a-spinner');
+ });
+
+ return Promise.resolve();
+}
diff --git a/src/Resources/app/storefront/cypress/helper/klarna.js b/src/Resources/app/storefront/cypress/helper/klarna.js
new file mode 100644
index 000000000..823215b4f
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/klarna.js
@@ -0,0 +1,37 @@
+export const customerData = {
+ firstName: 'Mock',
+ lastName: 'Mock',
+ street: 'Neue Schönhauser Str. 2',
+ zipcode: 10178,
+ city: 'Berlin',
+ mail: 'customer@email.de'
+}
+
+export function executeKlarnaCheckout(doneCallback) {
+ return cy.checkoutConfirmAndComplete(() => {
+ cy.window().then((window) => {
+ cy.stub(window, 'open').as('winOpen')
+ });
+
+ return cy.get('#payone-payment--klarna__container iframe').then(($el) => $el.contents().get('#root'));
+ }, () => {
+ return cy.get('@winOpen').should('be.called').then(() => doneCallback());
+ });
+}
+
+export function executeKlarnaCheckoutCancel(doneCallback) {
+ cy.get('#tos').check();
+ cy.get('#payone-payment--klarna__container iframe').then(($el) => $el.contents().get('#root'));
+
+ cy.window().then((window) => {
+ cy.stub(window, 'open').as('winOpen')
+ });
+
+ cy.get('#confirmFormSubmit').click();
+
+ cy.get('@winOpen').should('be.called');
+ cy.visit('checkout/confirm');
+ cy.get('#tos').check();
+
+ return executeKlarnaCheckout(doneCallback);
+}
diff --git a/src/Resources/app/storefront/cypress/helper/paypal.js b/src/Resources/app/storefront/cypress/helper/paypal.js
new file mode 100644
index 000000000..7460bf544
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/helper/paypal.js
@@ -0,0 +1,11 @@
+export function processPayment() {
+ return cy.origin('www.sandbox.paypal.com', () => {
+ cy.wait(1200)
+ cy.get('#email').clear().type(Cypress.env('paypalMail'));
+ cy.get('#email').type('{enter}');
+ cy.get('#password').type(Cypress.env('paypalPassword'), {force: true});
+ cy.get('#btnLogin').click({force: true});
+ cy.wait(3000)
+ cy.get('#payment-submit-btn').click();
+ })
+}
diff --git a/src/Resources/app/storefront/cypress/support/commands.js b/src/Resources/app/storefront/cypress/support/commands.js
new file mode 100644
index 000000000..4ec0d8e41
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/commands.js
@@ -0,0 +1,10 @@
+import 'cypress-iframe';
+import '@shopware-ag/e2e-testsuite-platform/cypress/support';
+
+import '../commands/checkout';
+import '../commands/product';
+import '../commands/customer';
+import '../commands/sales-channel';
+import '../commands/shopware-configuration';
+import '../commands/override-shopware';
+
diff --git a/src/Resources/app/storefront/cypress/support/e2e.js b/src/Resources/app/storefront/cypress/support/e2e.js
new file mode 100644
index 000000000..43c03b759
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/e2e.js
@@ -0,0 +1 @@
+import './commands'
diff --git a/src/Resources/app/storefront/cypress/support/tasks.js b/src/Resources/app/storefront/cypress/support/tasks.js
new file mode 100644
index 000000000..4bd12e407
--- /dev/null
+++ b/src/Resources/app/storefront/cypress/support/tasks.js
@@ -0,0 +1,32 @@
+const global = {
+ allowedPaymentMethods: [],
+ allowedCountries: {},
+ allowedCurrencies: {},
+};
+
+module.exports = {
+ addAllowedPaymentMethod(id) {
+ global.allowedPaymentMethods.push(id);
+
+ return id;
+ },
+ addAllowedCurrency({isoCode, id}) {
+ global.allowedCurrencies[isoCode] = id;
+
+ return null;
+ },
+ addAllowedCountry({isoCode, id}) {
+ global.allowedCountries[isoCode] = id;
+
+ return null;
+ },
+ isPaymentMethodAllowed: id => global.allowedPaymentMethods.includes(id),
+ getAllowedCurrencyId: isoCode => global.allowedCurrencies[isoCode] ?? null,
+ getAllowedCountryId: isoCode => global.allowedCountries[isoCode] ?? null,
+ addToGlobalStore({key, value}) {
+ global[key] = value;
+
+ return value;
+ },
+ getFromGlobalStore: key => global[key] ?? null
+};
diff --git a/src/Resources/app/storefront/dist/storefront/js/payone-payment.js b/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
index bee17bf1f..b799a2949 100644
--- a/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
+++ b/src/Resources/app/storefront/dist/storefront/js/payone-payment.js
@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([["payone-payment"],{7450:(e,t,n)=>{var a,r,i,o=n(6285),s=n(1110);class l extends o.Z{init(){this.iframe=null,this.iframeFieldCheckerStarted=!1,this.orderFormDisabled=!0;const e=document.getElementById("payone-request"),t=e.getAttribute("data-payone-language"),n=JSON.parse(e.innerHTML);this._createScript((()=>{const e=this.getClientConfig(t);this.iframe=new window.Payone.ClientApi.HostedIFrames(e,n);const a=document.getElementById("savedpseudocardpan"),r=document.getElementById("confirmOrderForm");a&&a.addEventListener("change",this._handleChangeSavedCard.bind(this)),r&&r.addEventListener("submit",this._handleOrderSubmit.bind(this))}))}getSelectStyle(){return["width: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: 3px"]}getFieldStyle(){return["width: 100%","height: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: .1875rem"]}getClientConfig(e){return{fields:{cardpan:{selector:"cardpan",type:"text",style:this.getFieldStyle().join("; ")},cardcvc2:{selector:"cardcvc2",type:"password",size:"4",maxlength:"4",length:{V:3,M:3,A:4,D:3,J:0,O:3,P:3,U:3},style:this.getFieldStyle().join("; ")},cardexpiremonth:{selector:"cardexpiremonth",type:"select",size:"2",maxlength:"2",style:this.getSelectStyle().join("; ")},cardexpireyear:{selector:"cardexpireyear",type:"select",style:this.getSelectStyle().join("; ")}},language:window.Payone.ClientApi.Language[e],defaultStyle:{iframe:{height:"100%",width:"100%"}},autoCardtypeDetection:{supportedCardtypes:l.options.supportedCardtypes,callback:this._cardDetectionCallback}}}_cardDetectionCallback(e){if("-"===e||"?"===e)return;const t="https://cdn.pay1.de/cc/"+e.toLowerCase()+"/xl/default.png",n=document.getElementById("errorOutput"),a=document.getElementById("card-logo");a.setAttribute("src",t),n.style.display="none",a.style.display="block"}_createScript(e){const t=document.createElement("script");t.type="text/javascript",t.src="https://secure.pay1.de/client-api/js/v1/payone_hosted.js",t.addEventListener("load",e.bind(this),!1),document.head.appendChild(t)}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none";const t=document.getElementById("savedpseudocardpan");if(t&&t.value.length>0)return!0;if(!this.iframe.isComplete()){const t=document.getElementById("iframeErrorOutput");return this.iframeFieldCheckerStarted||setInterval((()=>{this.iframe.isComplete()?t.style.display="none":t.style.display="block"}),250),this.iframeFieldCheckerStarted=!0,this._handleOrderFormError(e),!1}return this.orderFormDisabled?(window.payoneCreditCardCheckCallback=this._payoneCheckCallback.bind(this),this.iframe.creditCardCheck("payoneCreditCardCheckCallback"),this._handleOrderFormError(e),!1):void 0}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_handleChangeSavedCard(){const e=document.getElementById("savedpseudocardpan");e.options[e.selectedIndex].value?[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.add("hide")})):[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.remove("hide")}))}_payoneCheckCallback(e){if("VALID"===e.status)document.getElementById("pseudocardpan").value=e.pseudocardpan,document.getElementById("truncatedcardpan").value=e.truncatedcardpan,document.getElementById("cardexpiredate").value=e.cardexpiredate,document.getElementById("cardtype").value=e.cardtype,this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit();else{const t=document.getElementById("confirmFormSubmit"),n=document.getElementById("errorOutput");t.removeAttribute("disabled"),n.innerHTML=e.errormessage,n.style.display="block"}}}a=l,i={supportedCardtypes:["#","V","A","M","D","J","O","U","P"]},(r=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(r="options"))in a?Object.defineProperty(a,r,{value:i,enumerable:!0,configurable:!0,writable:!0}):a[r]=i;var d=n(378),c=n(5659),u=n(8254);class m extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,document.getElementById("confirmOrderForm").addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none",this.orderFormDisabled&&(this._handleOrderFormError(e),this._getModal(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getModal(e){e.preventDefault(),c.Z.create();const t=this._getRequestData();this._client.abort(),this._client.post(this._getManageMandateUrl(),JSON.stringify(t),(e=>this._openModal(e)))}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_openModal(e){if((e=JSON.parse(e)).error){const t=document.getElementById("errorOutput");return t.innerHTML=e.error,t.style.display="block",void c.Z.remove()}if("active"===e.mandate.Status)return void this._submitForm();const t=new d.Z(e.modal_content);t.open(this._onOpen.bind(this,t))}_onOpen(e){e.getModal().classList.add("payone-debit-mandate-modal"),window.PluginManager.initializePlugins(),this._registerEvents(),c.Z.remove()}_getRequestData(){return{iban:document.getElementById("iban").value}}_getManageMandateUrl(){return document.getElementById("payone-configuration").getAttribute("data-manage-mandate-url")}_registerEvents(){document.getElementById("mandateSubmit").addEventListener("click",this._onMandateSubmit.bind(this))}_onMandateSubmit(){document.getElementById("accept-mandate").checked&&this._submitForm()}}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(m,"options",{editorModalClass:"payone-debit-modal"});class h extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){this._hideErrorBox(),this.orderFormDisabled&&(this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),e.defaultPrevented||(this._validatePaymentAcceptance(),e.preventDefault()))}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validatePaymentAcceptance(){const e=JSON.stringify(this._getRequestData());c.Z.create(),this._client.abort(),this._client.post(this._getValidateUrl(),e,(e=>this._handleValidateResponse(e)))}_handleValidateResponse(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)this._showErrorBox();else{const t=document.getElementById("payoneWorkOrder");t&&(t.value=e.workorderid),this._submitForm()}}_getValidateUrl(){return document.getElementById("payone-configuration").getAttribute("data-validate-url")}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_getRequestData(){return{payolutionBirthday:document.getElementById("payolutionBirthday").value}}}class p extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._disableSubmitButton(),this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm"),t=document.getElementById("checkInstallmentButton");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this)),t&&t.addEventListener("click",this._handleCalculationButtonClick.bind(this))}_handleCalculationButtonClick(e){if(this._hideErrorBox(),this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),e.defaultPrevented)return;c.Z.create();const t=JSON.stringify(this._getRequestData());this._client.abort(),this._client.post(this._getCalculationUrl(),t,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)return void this._showErrorBox();const t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");t.value=e.workorderid,n.value=e.carthash,this._displayInstallmentSelection(e),this._displayCalculationOverview(e),this._registerSelectionEventListeners(),this._enableSecondStep(),this._activateSubmitButton(),this._hideCheckInstallmentButton()}_hideCheckInstallmentButton(){const e=document.getElementById("checkInstallmentButton");e&&e.classList.add("hidden")}_registerSelectionEventListeners(){document.getElementById("payolutionInstallmentDuration").addEventListener("change",(function(e){const t=e.target.value;document.querySelectorAll(".installmentDetail").forEach((function(e){e.dataset.duration===t?e.hidden=!1:e.hidden="hidden"}))}))}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_enableSecondStep(){document.querySelectorAll(".payolution-installment .hidden").forEach((function(e){e.classList.remove("hidden")}))}_displayInstallmentSelection(e){const t=document.getElementById("installmentSelection");t&&(t.innerHTML=e.installmentSelection)}_displayCalculationOverview(e){const t=document.getElementById("calculationOverview");t&&(t.innerHTML=e.calculationOverview)}_handleOrderSubmit(e){this._validateField(e,"payolutionConsent"),this._validateInput(e,"payolutionBirthday"),this._validateInput(e,"payolutionAccountOwner"),this._validateInput(e,"payolutionIban"),this._validateInput(e,"payolutionBic"),this._validateInput(e,"payolutionInstallmentDuration")}_disableSubmitButton(){this.orderFormDisabled=!0;const e=document.getElementById("confirmFormSubmit");e&&e.setAttribute("disabled","disabled")}_activateSubmitButton(){this.orderFormDisabled=!1;const e=document.getElementById("confirmFormSubmit");e&&e.removeAttribute("disabled")}_getCalculationUrl(){return document.getElementById("payone-configuration").getAttribute("data-calculation-url")}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getRequestData(){const e=document.getElementById("payolutionBirthday"),t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");return{payolutionBirthday:e.value,workorder:t.value,carthash:n.value}}}var y=n(3206);function b(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class v extends o.Z{init(){null===this.options.supportedNetworks&&(this.options.supportedNetworks=[]),this._httpClient=new u.Z,this.validateMerchantUrl=this.el.dataset.validateMerchantUrl,this.processPaymentUrl=this.el.dataset.processPaymentUrl,this.orderForm=y.Z.querySelector(document,"#confirmOrderForm"),this._registerEventHandler()}createSession(){try{this.session=new ApplePaySession(3,this.options)}catch(e){return void this.handleErrorOnPayment()}this.session.addEventListener("validatemerchant",this.validateMerchant.bind(this)),this.session.addEventListener("paymentauthorized",this.authorizePayment.bind(this))}performPayment(){this.session.begin()}validateMerchant(e){const t=e.validationURL;this._httpClient.abort(),this._httpClient.post(this.validateMerchantUrl,JSON.stringify({validationUrl:t}),(e=>{let t=null;try{t=JSON.parse(e)}catch(e){return void this.handleErrorOnPayment()}t&&t.merchantSessionIdentifier&&t.signature?this.session.completeMerchantValidation(t):this.handleErrorOnPayment()}))}handleErrorOnPayment(){const e=y.Z.querySelector(document,"#payone-apple-pay-error");e.style.display="block",e.scrollIntoView({block:"start"})}authorizePayment(e){let t=y.Z.querySelector(this.orderForm,"input[name='orderId']").value;this._httpClient.abort(),this._httpClient.post(this.processPaymentUrl,JSON.stringify({token:e.payment.token,orderId:t}),(e=>{this.completePayment(e),this.orderForm.submit()}))}completePayment(e){let t="",n="",a="";try{let r=JSON.parse(e);n=r.status,t=r.txid,a=r.userid}catch(e){this.orderForm.submit()}this.updateFormData(n,t,a,e),"APPROVED"!==n&&"PENDING"!==n||this.session.completePayment({status:ApplePaySession.STATUS_SUCCESS,errors:[]}),this.orderForm.submit()}updateFormData(e,t,n,a){y.Z.querySelector(this.orderForm,"input[name='status']").value=e,y.Z.querySelector(this.orderForm,"input[name='txid']").value=t,y.Z.querySelector(this.orderForm,"input[name='userid']").value=n,y.Z.querySelector(this.orderForm,"input[name='response']").value=a}_handleApplePayButtonClick(){this.orderForm.reportValidity()&&(this.createSession(),this.performPayment())}_registerEventHandler(){this.el.addEventListener("click",this._handleApplePayButtonClick.bind(this))}}b(v,"options",{countryCode:"",currencyCode:"",supportedNetworks:[],merchantCapabilities:["supports3DS","supportsDebit","supportsCredit"],total:{label:"",type:"final",amount:"0.01"}}),b(v,"session",void 0),b(v,"client",void 0),b(v,"validateMerchantUrl",void 0),b(v,"processPaymentUrl",void 0),b(v,"orderForm",void 0);class g extends o.Z{init(){this._client=new u.Z,this.ratepayRateInput=y.Z.querySelector(document,this.options.ratepayRateInputSelector),this.calculateInstallmentBtn=y.Z.querySelector(document,this.options.calculateInstallmentBtnSelector),this.ratepayRuntimeInput=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector),this.ratepayIbanContainer=y.Z.querySelector(document,this.options.ratepayIbanContainerSelector),this.ratepayIbanInput=y.Z.querySelector(document,this.options.ratepayIbanInputSelector),this._registerEventListeners(),this._handleInstallmentRuntimeChange()}_registerEventListeners(){this.calculateInstallmentBtn&&this.calculateInstallmentBtn.addEventListener("click",this._handleCalculateInstallmentButtonClick.bind(this)),this.ratepayRuntimeInput&&this.ratepayRuntimeInput.addEventListener("change",this._handleInstallmentRuntimeChange.bind(this)),$(this.options.ratepayIbanContainerSelector).on("shown.bs.collapse",this._handleOpenedIbanContainer.bind(this)),$(this.options.ratepayIbanContainerSelector).on("hidden.bs.collapse",this._handleClosedIbanContainer.bind(this))}_handleCalculateInstallmentButtonClick(){const e=this.ratepayRateInput.value;this._sendRequest("rate",e)}_handleInstallmentRuntimeChange(){const e=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector).value;this._sendRequest("time",e)}_sendRequest(e,t){let n={ratepayInstallmentType:e,ratepayInstallmentValue:t};const a=JSON.stringify(n);this._client.abort(),this._client.post("/payone/ratepay/installment/calculation",a,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){this._replaceCalculationContent(e)}_replaceCalculationContent(e){y.Z.querySelector(document,this.options.ratepayInstallmentPlanContainerSelector).innerHTML=e,this.ratepayInstallmentTable=y.Z.querySelector(document,this.options.ratepayInstallmentTableSelector),this.ratepayRuntimeInput.value=this.ratepayInstallmentTable.dataset.ratepayNumberOfRates,this.ratepayRateInput.value=this.ratepayInstallmentTable.dataset.ratepayRate}_handleOpenedIbanContainer(){this.ratepayIbanInput.required=!0}_handleClosedIbanContainer(){this.ratepayIbanInput.required=!1}}function _(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var a=n.call(e,t||"default");if("object"!=typeof a)return a;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(g,"options",{ratepayRateInputSelector:"#ratepayRate",ratepayRuntimeInputSelector:"#ratepayRuntime",calculateInstallmentBtnSelector:"#payone-ratepay-calculate-installment-btn",ratepayInstallmentPlanContainerSelector:"#payone-ratepay-installment-plan",ratepayIbanContainerSelector:"#ratepayIbanContainer",ratepayIbanInputSelector:"#ratepayIban",ratepayInstallmentTableSelector:"#ratepayInstallmentTable"});class f extends o.Z{init(){window.klarnaAsyncCallback=this._initKlarnaWidget.bind(this);const e=document.createElement("script");e.src="https://x.klarnacdn.net/kp/lib/v1/api.js",document.body.appendChild(e),this.orderForm=document.getElementById(this.options.selectorFormId),this._registerEventListeners()}_initKlarnaWidget(){Klarna.Payments.init({client_token:this.options.clientToken}),Klarna.Payments.load({container:this.options.selectorContainer,payment_method_category:this.options.paymentMethodIdentifier},(e=>{this.confirmFormSubmit.disabled=!1,ElementLoadingIndicatorUtil.remove(this.el)}))}_registerEventListeners(){this.orderForm&&this.orderForm.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){e.preventDefault(),Klarna.Payments.authorize({payment_method_category:this.options.paymentMethodIdentifier},{},(e=>{e.approved&&e.authorization_token?(document.querySelector(this.options.selectorTokenInput).value=e.authorization_token,this.orderForm.submit()):e.show_form?new ButtonLoadingIndicator(this.confirmFormSubmit).remove():e.show_form||(window.location.href=window.location.href)}))}}_(f,"options",{clientToken:null,paymentMethodIdentifier:null,selectorContainer:null,selectorTokenInput:'input[name="payoneKlarnaAuthorizationToken"]',selectorFormId:"confirmOrderForm"}),_(f,"orderForm",null),_(f,"confirmFormSubmit",null);class I extends o.Z{init(){if("amazon"in window)this.onLoad();else{var e=document.createElement("script");e.type="text/javascript",e.src="https://static-eu.payments-amazon.com/checkout.js",e.onload=this.onLoad.bind(this),document.head.appendChild(e)}}onLoad(){}}class E extends I{onLoad(){window.amazon.Pay.renderButton("#"+this.el.id,this.options)}}var S=n(4690);PluginManager.register("PayonePaymentAmazonPayExpressButton",E,"[data-payone-payment-amazon-pay-express-button]"),PluginManager.register("PayonePaymentAmazonPayRedirect",class extends E{init(){S.Z.create(document.querySelector(".content-main")),super.init()}onLoad(){super.onLoad(),document.querySelector("#"+this.el.id).dispatchEvent(new CustomEvent("click"))}},"[data-payone-payment-amazon-pay-redirect]");const C=window.PluginManager;C.register("PayonePaymentCreditCard",l,"[data-is-payone-credit-card]"),C.register("PayonePaymentDebitCard",m,"[data-is-payone-debit-card]"),C.register("PayonePaymentPayolutionInvoicing",h,"[data-is-payone-payolution-invoicing]"),C.register("PayonePaymentPayolutionInstallment",p,"[data-is-payone-payolution-installment]"),C.register("PayonePaymentApplePay",v,"[data-payone-payment-apple-pay-options]"),C.register("PayonePaymentRatepayInstallment",g,"[data-is-payone-ratepay-installment]"),C.register("PayonePaymentKlarna",f,"[data-payone-payment-klarna]")}},e=>{e.O(0,["vendor-node","vendor-shared"],(()=>{return t=7450,e(e.s=t);var t}));e.O()}]);
\ No newline at end of file
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([["payone-payment"],{898:(e,t,n)=>{var r,a,i,o=n(6285),s=n(1110);class l extends o.Z{init(){this.iframe=null,this.iframeFieldCheckerStarted=!1,this.orderFormDisabled=!0;const e=document.getElementById("payone-request"),t=e.getAttribute("data-payone-language"),n=JSON.parse(e.innerHTML);this._createScript((()=>{const e=this.getClientConfig(t);this.iframe=new window.Payone.ClientApi.HostedIFrames(e,n);const r=document.getElementById("savedpseudocardpan"),a=document.getElementById("confirmOrderForm");r&&r.addEventListener("change",this._handleChangeSavedCard.bind(this)),a&&a.addEventListener("submit",this._handleOrderSubmit.bind(this))}))}getSelectStyle(){return["width: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: 3px"]}getFieldStyle(){return["width: 100%","height: 100%","padding: .5625rem","color: #8798a9","vertical-align: middle","line-height: 1.5","font-weight: 500","background-color: #fff","border: none","border-radius: .1875rem"]}getClientConfig(e){return{fields:{cardpan:{selector:"cardpan",type:"text",style:this.getFieldStyle().join("; ")},cardcvc2:{selector:"cardcvc2",type:"password",size:"4",maxlength:"4",length:{V:3,M:3,A:4,D:3,J:0,O:3,P:3,U:3},style:this.getFieldStyle().join("; ")},cardexpiremonth:{selector:"cardexpiremonth",type:"select",size:"2",maxlength:"2",style:this.getSelectStyle().join("; ")},cardexpireyear:{selector:"cardexpireyear",type:"select",style:this.getSelectStyle().join("; ")}},language:window.Payone.ClientApi.Language[e],defaultStyle:{iframe:{height:"100%",width:"100%"}},autoCardtypeDetection:{supportedCardtypes:l.options.supportedCardtypes,callback:this._cardDetectionCallback}}}_cardDetectionCallback(e){if("-"===e||"?"===e)return;const t="https://cdn.pay1.de/cc/"+e.toLowerCase()+"/xl/default.png",n=document.getElementById("errorOutput"),r=document.getElementById("card-logo");r.setAttribute("src",t),n.style.display="none",r.style.display="block"}_createScript(e){const t=document.createElement("script");t.type="text/javascript",t.src="https://secure.pay1.de/client-api/js/v1/payone_hosted.js",t.addEventListener("load",e.bind(this),!1),document.head.appendChild(t)}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none";const t=document.getElementById("savedpseudocardpan");if(t&&t.value.length>0)return!0;if(!this.iframe.isComplete()){const t=document.getElementById("iframeErrorOutput");return this.iframeFieldCheckerStarted||setInterval((()=>{this.iframe.isComplete()?t.style.display="none":t.style.display="block"}),250),this.iframeFieldCheckerStarted=!0,this._handleOrderFormError(e),!1}return this.orderFormDisabled?(window.payoneCreditCardCheckCallback=this._payoneCheckCallback.bind(this),this.iframe.creditCardCheck("payoneCreditCardCheckCallback"),this._handleOrderFormError(e),!1):void 0}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_handleChangeSavedCard(){const e=document.getElementById("savedpseudocardpan");e.options[e.selectedIndex].value?[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.add("hide")})):[...document.getElementsByClassName("credit-card-input")].forEach((function(e){e.classList.remove("hide")}))}_payoneCheckCallback(e){if("VALID"===e.status)document.getElementById("pseudocardpan").value=e.pseudocardpan,document.getElementById("truncatedcardpan").value=e.truncatedcardpan,document.getElementById("cardexpiredate").value=e.cardexpiredate,document.getElementById("cardtype").value=e.cardtype,this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit();else{const t=document.getElementById("confirmFormSubmit"),n=document.getElementById("errorOutput");t.removeAttribute("disabled"),n.innerHTML=e.errormessage,n.style.display="block"}}}r=l,i={supportedCardtypes:["#","V","A","M","D","J","O","U","P"]},(a=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(a="options"))in r?Object.defineProperty(r,a,{value:i,enumerable:!0,configurable:!0,writable:!0}):r[a]=i;var d=n(378),c=n(5659),u=n(8254);class m extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,document.getElementById("confirmOrderForm").addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){document.getElementById("errorOutput").style.display="none",this.orderFormDisabled&&(this._handleOrderFormError(e),this._getModal(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getModal(e){e.preventDefault(),c.Z.create();const t=this._getRequestData();this._client.abort(),this._client.post(this._getManageMandateUrl(),JSON.stringify(t),(e=>this._openModal(e)))}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_openModal(e){if((e=JSON.parse(e)).error){const t=document.getElementById("errorOutput");return t.innerHTML=e.error,t.style.display="block",void c.Z.remove()}if("active"===e.mandate.Status)return void this._submitForm();const t=new d.Z(e.modal_content);t.open(this._onOpen.bind(this,t))}_onOpen(e){e.getModal().classList.add("payone-debit-mandate-modal"),window.PluginManager.initializePlugins(),this._registerEvents(),c.Z.remove()}_getRequestData(){return{iban:document.getElementById("iban").value}}_getManageMandateUrl(){return document.getElementById("payone-configuration").getAttribute("data-manage-mandate-url")}_registerEvents(){document.getElementById("mandateSubmit").addEventListener("click",this._onMandateSubmit.bind(this))}_onMandateSubmit(){document.getElementById("accept-mandate").checked&&this._submitForm()}}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(m,"options",{editorModalClass:"payone-debit-modal"});class h extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){this._hideErrorBox(),this.orderFormDisabled&&(this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),e.defaultPrevented||(this._validatePaymentAcceptance(),e.preventDefault()))}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),e.preventDefault())}_validatePaymentAcceptance(){const e=JSON.stringify(this._getRequestData());c.Z.create(),this._client.abort(),this._client.post(this._getValidateUrl(),e,(e=>this._handleValidateResponse(e)))}_handleValidateResponse(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)this._showErrorBox();else{const t=document.getElementById("payoneWorkOrder");t&&(t.value=e.workorderid),this._submitForm()}}_getValidateUrl(){return document.getElementById("payone-configuration").getAttribute("data-validate-url")}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_submitForm(){this.orderFormDisabled=!1,document.getElementById("confirmOrderForm").submit()}_getRequestData(){return{payoneBirthday:document.getElementById("payoneBirthday").value}}}class p extends o.Z{init(){this.orderFormDisabled=!0,this._client=new u.Z,this._disableSubmitButton(),this._registerEventListeners()}_registerEventListeners(){const e=document.getElementById("confirmOrderForm"),t=document.getElementById("checkInstallmentButton");e&&e.addEventListener("submit",this._handleOrderSubmit.bind(this)),t&&t.addEventListener("click",this._handleCalculationButtonClick.bind(this))}_handleCalculationButtonClick(e){if(this._hideErrorBox(),this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),e.defaultPrevented)return;c.Z.create();const t=JSON.stringify(this._getRequestData());this._client.abort(),this._client.post(this._getCalculationUrl(),t,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){if(e=JSON.parse(e),c.Z.remove(),"OK"!==e.status)return void this._showErrorBox();const t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");t.value=e.workorderid,n.value=e.carthash,this._displayInstallmentSelection(e),this._displayCalculationOverview(e),this._registerSelectionEventListeners(),this._enableSecondStep(),this._activateSubmitButton(),this._hideCheckInstallmentButton()}_hideCheckInstallmentButton(){const e=document.getElementById("checkInstallmentButton");e&&e.classList.add("hidden")}_registerSelectionEventListeners(){document.getElementById("payolutionInstallmentDuration").addEventListener("change",(function(e){const t=e.target.value;document.querySelectorAll(".installmentDetail").forEach((function(e){e.dataset.duration===t?e.hidden=!1:e.hidden="hidden"}))}))}_showErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!1)}_hideErrorBox(){const e=document.getElementById("payolutionErrorContainer");e&&(e.hidden=!0)}_enableSecondStep(){document.querySelectorAll(".payolution-installment .hidden").forEach((function(e){e.classList.remove("hidden")}))}_displayInstallmentSelection(e){const t=document.getElementById("installmentSelection");t&&(t.innerHTML=e.installmentSelection)}_displayCalculationOverview(e){const t=document.getElementById("calculationOverview");t&&(t.innerHTML=e.calculationOverview)}_handleOrderSubmit(e){this._validateField(e,"payolutionConsent"),this._validateInput(e,"payoneBirthday"),this._validateInput(e,"payolutionAccountOwner"),this._validateInput(e,"payolutionIban"),this._validateInput(e,"payolutionBic"),this._validateInput(e,"payolutionInstallmentDuration")}_disableSubmitButton(){this.orderFormDisabled=!0;const e=document.getElementById("confirmFormSubmit");e&&e.setAttribute("disabled","disabled")}_activateSubmitButton(){this.orderFormDisabled=!1;const e=document.getElementById("confirmFormSubmit");e&&e.removeAttribute("disabled")}_getCalculationUrl(){return document.getElementById("payone-configuration").getAttribute("data-calculation-url")}_validateField(e,t){const n=document.getElementById(t);n.checked?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_validateInput(e,t){const n=document.getElementById(t);n.value?n.classList.remove("is-invalid"):(n.scrollIntoView({block:"start",behavior:"smooth"}),n.classList.add("is-invalid"),this._handleOrderFormError(e))}_handleOrderFormError(e){const t=document.getElementById("confirmFormSubmit");if(e.preventDefault(),t){const e=new s.Z(t);t.disabled=!1,e.remove()}}_getRequestData(){const e=document.getElementById("payoneBirthday"),t=document.getElementById("payoneWorkOrder"),n=document.getElementById("payoneCartHash");return{payoneBirthday:e.value,workorder:t.value,carthash:n.value}}}var y=n(3206);function v(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}class b extends o.Z{init(){null===this.options.supportedNetworks&&(this.options.supportedNetworks=[]),this._httpClient=new u.Z,this.validateMerchantUrl=this.el.dataset.validateMerchantUrl,this.processPaymentUrl=this.el.dataset.processPaymentUrl,this.orderForm=y.Z.querySelector(document,"#confirmOrderForm"),this._registerEventHandler()}createSession(){try{this.session=new ApplePaySession(3,this.options)}catch(e){return void this.handleErrorOnPayment()}this.session.addEventListener("validatemerchant",this.validateMerchant.bind(this)),this.session.addEventListener("paymentauthorized",this.authorizePayment.bind(this))}performPayment(){this.session.begin()}validateMerchant(e){const t=e.validationURL;this._httpClient.abort(),this._httpClient.post(this.validateMerchantUrl,JSON.stringify({validationUrl:t}),(e=>{let t=null;try{t=JSON.parse(e)}catch(e){return void this.handleErrorOnPayment()}t&&t.merchantSessionIdentifier&&t.signature?this.session.completeMerchantValidation(t):this.handleErrorOnPayment()}))}handleErrorOnPayment(){const e=y.Z.querySelector(document,"#payone-apple-pay-error");e.style.display="block",e.scrollIntoView({block:"start"})}authorizePayment(e){let t=y.Z.querySelector(this.orderForm,"input[name='orderId']").value;this._httpClient.abort(),this._httpClient.post(this.processPaymentUrl,JSON.stringify({token:e.payment.token,orderId:t}),(e=>{this.completePayment(e),this.orderForm.submit()}))}completePayment(e){let t="",n="",r="";try{let a=JSON.parse(e);n=a.status,t=a.txid,r=a.userid}catch(e){this.orderForm.submit()}this.updateFormData(n,t,r,e),"APPROVED"!==n&&"PENDING"!==n||this.session.completePayment({status:ApplePaySession.STATUS_SUCCESS,errors:[]}),this.orderForm.submit()}updateFormData(e,t,n,r){y.Z.querySelector(this.orderForm,"input[name='status']").value=e,y.Z.querySelector(this.orderForm,"input[name='txid']").value=t,y.Z.querySelector(this.orderForm,"input[name='userid']").value=n,y.Z.querySelector(this.orderForm,"input[name='response']").value=r}_handleApplePayButtonClick(){this.orderForm.reportValidity()&&(this.createSession(),this.performPayment())}_registerEventHandler(){this.el.addEventListener("click",this._handleApplePayButtonClick.bind(this))}}v(b,"options",{countryCode:"",currencyCode:"",supportedNetworks:[],merchantCapabilities:["supports3DS","supportsDebit","supportsCredit"],total:{label:"",type:"final",amount:"0.01"}}),v(b,"session",void 0),v(b,"client",void 0),v(b,"validateMerchantUrl",void 0),v(b,"processPaymentUrl",void 0),v(b,"orderForm",void 0);class g extends o.Z{init(){this._client=new u.Z,this.ratepayRateInput=y.Z.querySelector(document,this.options.ratepayRateInputSelector),this.calculateInstallmentBtn=y.Z.querySelector(document,this.options.calculateInstallmentBtnSelector),this.ratepayRuntimeInput=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector),this.ratepayIbanContainer=y.Z.querySelector(document,this.options.ratepayIbanContainerSelector),this.ratepayIbanInput=y.Z.querySelector(document,this.options.ratepayIbanInputSelector),this._registerEventListeners(),this._handleInstallmentRuntimeChange()}_registerEventListeners(){this.calculateInstallmentBtn&&this.calculateInstallmentBtn.addEventListener("click",this._handleCalculateInstallmentButtonClick.bind(this)),this.ratepayRuntimeInput&&this.ratepayRuntimeInput.addEventListener("change",this._handleInstallmentRuntimeChange.bind(this)),document.querySelector(this.options.ratepayIbanContainerSelector).addEventListener("shown.bs.collapse",(()=>this.ratepayIbanInput.required=!0)),document.querySelector(this.options.ratepayIbanContainerSelector).addEventListener("hidden.bs.collapse",(()=>this.ratepayIbanInput.required=!1))}_handleCalculateInstallmentButtonClick(){const e=this.ratepayRateInput.value;this._sendRequest("rate",e)}_handleInstallmentRuntimeChange(){const e=y.Z.querySelector(document,this.options.ratepayRuntimeInputSelector).value;this._sendRequest("time",e)}_sendRequest(e,t){let n={ratepayInstallmentType:e,ratepayInstallmentValue:t};const r=JSON.stringify(n);this._client.abort(),this._client.post("/payone/ratepay/installment/calculation",r,(e=>this._handleCalculationCallback(e)))}_handleCalculationCallback(e){this._replaceCalculationContent(e)}_replaceCalculationContent(e){y.Z.querySelector(document,this.options.ratepayInstallmentPlanContainerSelector).innerHTML=e,this.ratepayInstallmentTable=y.Z.querySelector(document,this.options.ratepayInstallmentTableSelector),this.ratepayRuntimeInput.value=this.ratepayInstallmentTable.dataset.ratepayNumberOfRates,this.ratepayRateInput.value=this.ratepayInstallmentTable.dataset.ratepayRate}}function f(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}!function(e,t,n){(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n}(g,"options",{ratepayRateInputSelector:"#ratepayRate",ratepayRuntimeInputSelector:"#ratepayRuntime",calculateInstallmentBtnSelector:"#payone-ratepay-calculate-installment-btn",ratepayInstallmentPlanContainerSelector:"#payone-ratepay-installment-plan",ratepayIbanContainerSelector:"#ratepayIbanContainer",ratepayIbanInputSelector:"#ratepayIban",ratepayInstallmentTableSelector:"#ratepayInstallmentTable"});class _ extends o.Z{init(){window.klarnaAsyncCallback=this._initKlarnaWidget.bind(this);const e=document.createElement("script");e.src="https://x.klarnacdn.net/kp/lib/v1/api.js",document.body.appendChild(e),this.orderForm=document.getElementById(this.options.selectorFormId),this.confirmFormSubmit=this.orderForm.querySelector("button[type=submit]"),this._registerEventListeners()}_initKlarnaWidget(){Klarna.Payments.init({client_token:this.options.clientToken}),Klarna.Payments.load({container:this.options.selectorContainer,payment_method_category:this.options.paymentMethodIdentifier},(e=>{new s.Z(this.confirmFormSubmit).remove()}))}_registerEventListeners(){this.orderForm&&this.orderForm.addEventListener("submit",this._handleOrderSubmit.bind(this))}_handleOrderSubmit(e){e.preventDefault(),Klarna.Payments.authorize({payment_method_category:this.options.paymentMethodIdentifier},{},(e=>{e.approved&&e.authorization_token?(document.querySelector(this.options.selectorTokenInput).value=e.authorization_token,this.orderForm.submit()):e.show_form?new s.Z(this.confirmFormSubmit).remove():e.show_form||(window.location.href=window.location.href)}))}}f(_,"options",{clientToken:null,paymentMethodIdentifier:null,selectorContainer:null,selectorTokenInput:'input[name="payoneKlarnaAuthorizationToken"]',selectorFormId:"confirmOrderForm"}),f(_,"orderForm",null),f(_,"confirmFormSubmit",null);class I extends o.Z{init(){if("amazon"in window)this.onLoad();else{var e=document.createElement("script");e.type="text/javascript",e.src="https://static-eu.payments-amazon.com/checkout.js",e.onload=this.onLoad.bind(this),document.head.appendChild(e)}}onLoad(){}}class S extends I{onLoad(){window.amazon.Pay.renderButton("#"+this.el.id,this.options)}}var E=n(4690);PluginManager.register("PayonePaymentAmazonPayExpressButton",S,"[data-payone-payment-amazon-pay-express-button]"),PluginManager.register("PayonePaymentAmazonPayRedirect",class extends S{init(){E.Z.create(document.querySelector(".content-main")),super.init()}onLoad(){super.onLoad(),document.querySelector("#"+this.el.id).dispatchEvent(new CustomEvent("click"))}},"[data-payone-payment-amazon-pay-redirect]");const C=window.PluginManager;C.register("PayonePaymentCreditCard",l,"[data-is-payone-credit-card]"),C.register("PayonePaymentDebitCard",m,"[data-is-payone-debit-card]"),C.register("PayonePaymentPayolutionInvoicing",h,"[data-is-payone-payolution-invoicing]"),C.register("PayonePaymentPayolutionInstallment",p,"[data-is-payone-payolution-installment]"),C.register("PayonePaymentApplePay",b,"[data-payone-payment-apple-pay-options]"),C.register("PayonePaymentRatepayInstallment",g,"[data-is-payone-ratepay-installment]"),C.register("PayonePaymentKlarna",_,"[data-payone-payment-klarna]")}},e=>{e.O(0,["vendor-node","vendor-shared"],(()=>{return t=898,e(e.s=t);var t}));e.O()}]);
\ No newline at end of file
diff --git a/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js b/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js
new file mode 100644
index 000000000..9151d0238
--- /dev/null
+++ b/src/Resources/app/storefront/dist/storefront/js/payone-payment/payone-payment.js
@@ -0,0 +1 @@
+(()=>{"use strict";var e={857:e=>{var t=function(e){var t;return!!e&&"object"==typeof e&&"[object RegExp]"!==(t=Object.prototype.toString.call(e))&&"[object Date]"!==t&&e.$$typeof!==n},n="function"==typeof Symbol&&Symbol.for?Symbol.for("react.element"):60103;function r(e,t){return!1!==t.clone&&t.isMergeableObject(e)?s(Array.isArray(e)?[]:{},e,t):e}function a(e,t,n){return e.concat(t).map(function(e){return r(e,n)})}function i(e){return Object.keys(e).concat(Object.getOwnPropertySymbols?Object.getOwnPropertySymbols(e).filter(function(t){return Object.propertyIsEnumerable.call(e,t)}):[])}function o(e,t){try{return t in e}catch(e){return!1}}function s(e,n,l){(l=l||{}).arrayMerge=l.arrayMerge||a,l.isMergeableObject=l.isMergeableObject||t,l.cloneUnlessOtherwiseSpecified=r;var d,c,u=Array.isArray(n);return u!==Array.isArray(e)?r(n,l):u?l.arrayMerge(e,n,l):(c={},(d=l).isMergeableObject(e)&&i(e).forEach(function(t){c[t]=r(e[t],d)}),i(n).forEach(function(t){(!o(e,t)||Object.hasOwnProperty.call(e,t)&&Object.propertyIsEnumerable.call(e,t))&&(o(e,t)&&d.isMergeableObject(n[t])?c[t]=(function(e,t){if(!t.customMerge)return s;var n=t.customMerge(e);return"function"==typeof n?n:s})(t,d)(e[t],n[t],d):c[t]=r(n[t],d))}),c)}s.all=function(e,t){if(!Array.isArray(e))throw Error("first argument should be an array");return e.reduce(function(e,n){return s(e,n,t)},{})},e.exports=s}},t={};function n(r){var a=t[r];if(void 0!==a)return a.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}(()=>{n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t}})(),(()=>{n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})}})(),(()=>{n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t)})(),(()=>{var e=n(857),t=n.n(e);class r{static ucFirst(e){return e.charAt(0).toUpperCase()+e.slice(1)}static lcFirst(e){return e.charAt(0).toLowerCase()+e.slice(1)}static toDashCase(e){return e.replace(/([A-Z])/g,"-$1").replace(/^-/,"").toLowerCase()}static toLowerCamelCase(e,t){let n=r.toUpperCamelCase(e,t);return r.lcFirst(n)}static toUpperCamelCase(e,t){return t?e.split(t).map(e=>r.ucFirst(e.toLowerCase())).join(""):r.ucFirst(e.toLowerCase())}static parsePrimitive(e){try{return/^\d+(.|,)\d+$/.test(e)&&(e=e.replace(",",".")),JSON.parse(e)}catch(t){return e.toString()}}}class a{static isNode(e){return"object"==typeof e&&null!==e&&(e===document||e===window||e instanceof Node)}static hasAttribute(e,t){if(!a.isNode(e))throw Error("The element must be a valid HTML Node!");return"function"==typeof e.hasAttribute&&e.hasAttribute(t)}static getAttribute(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!1===a.hasAttribute(e,t))throw Error('The required property "'.concat(t,'" does not exist!'));if("function"!=typeof e.getAttribute){if(n)throw Error("This node doesn't support the getAttribute function!");return}return e.getAttribute(t)}static getDataAttribute(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2],i=t.replace(/^data(|-)/,""),o=r.toLowerCamelCase(i,"-");if(!a.isNode(e)){if(n)throw Error("The passed node is not a valid HTML Node!");return}if(void 0===e.dataset){if(n)throw Error("This node doesn't support the dataset attribute!");return}let s=e.dataset[o];if(void 0===s){if(n)throw Error('The required data attribute "'.concat(t,'" does not exist on ').concat(e,"!"));return s}return r.parsePrimitive(s)}static querySelector(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!a.isNode(e))throw Error("The parent node is not a valid HTML Node!");let r=e.querySelector(t)||!1;if(n&&!1===r)throw Error('The required element "'.concat(t,'" does not exist in parent node!'));return r}static querySelectorAll(e,t){let n=!(arguments.length>2)||void 0===arguments[2]||arguments[2];if(n&&!a.isNode(e))throw Error("The parent node is not a valid HTML Node!");let r=e.querySelectorAll(t);if(0===r.length&&(r=!1),n&&!1===r)throw Error('At least one item of "'.concat(t,'" must exist in parent node!'));return r}}class i{publish(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],r=new CustomEvent(e,{detail:t,cancelable:n});return this.el.dispatchEvent(r),r}subscribe(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=this,a=e.split("."),i=n.scope?t.bind(n.scope):t;if(n.once&&!0===n.once){let t=i;i=function(n){r.unsubscribe(e),t(n)}}return this.el.addEventListener(a[0],i),this.listeners.push({splitEventName:a,opts:n,cb:i}),!0}unsubscribe(e){let t=e.split(".");return this.listeners=this.listeners.reduce((e,n)=>([...n.splitEventName].sort().toString()===t.sort().toString()?this.el.removeEventListener(n.splitEventName[0],n.cb):e.push(n),e),[]),!0}reset(){return this.listeners.forEach(e=>{this.el.removeEventListener(e.splitEventName[0],e.cb)}),this.listeners=[],!0}get el(){return this._el}set el(e){this._el=e}get listeners(){return this._listeners}set listeners(e){this._listeners=e}constructor(e=document){this._el=e,e.$emitter=this,this._listeners=[]}}class o{init(){throw Error('The "init" method for the plugin "'.concat(this._pluginName,'" is not defined.'))}update(){}_init(){this._initialized||(this.init(),this._initialized=!0)}_update(){this._initialized&&this.update()}_mergeOptions(e){let n=r.toDashCase(this._pluginName),i=a.getDataAttribute(this.el,"data-".concat(n,"-config"),!1),o=a.getAttribute(this.el,"data-".concat(n,"-options"),!1),s=[this.constructor.options,this.options,e];i&&s.push(window.PluginConfigManager.get(this._pluginName,i));try{o&&s.push(JSON.parse(o))}catch(e){throw console.error(this.el),Error('The data attribute "data-'.concat(n,'-options" could not be parsed to json: ').concat(e.message))}return t().all(s.filter(e=>e instanceof Object&&!(e instanceof Array)).map(e=>e||{}))}_registerInstance(){window.PluginManager.getPluginInstancesFromElement(this.el).set(this._pluginName,this),window.PluginManager.getPlugin(this._pluginName,!1).get("instances").push(this)}_getPluginName(e){return e||(e=this.constructor.name),e}constructor(e,t={},n=!1){if(!a.isNode(e))throw Error("There is no valid element given.");this.el=e,this.$emitter=new i(this.el),this._pluginName=this._getPluginName(n),this.options=this._mergeOptions(t),this._initialized=!1,this._registerInstance(),this._init()}}class s{static iterate(e,t){if(e instanceof Map||Array.isArray(e))return e.forEach(t);if(e instanceof FormData){for(var n of e.entries())t(n[1],n[0]);return}if(e instanceof NodeList)return e.forEach(t);if(e instanceof HTMLCollection)return Array.from(e).forEach(t);if(e instanceof Object)return Object.keys(e).forEach(n=>{t(e[n],n)});throw Error("The element type ".concat(typeof e," is not iterable!"))}}let l="loader",d={BEFORE:"before",INNER:"inner"};class c{create(){if(!this.exists()){if(this.position===d.INNER){this.parent.innerHTML=c.getTemplate();return}this.parent.insertAdjacentHTML(this._getPosition(),c.getTemplate())}}remove(){let e=this.parent.querySelectorAll(".".concat(l));s.iterate(e,e=>e.remove())}exists(){return this.parent.querySelectorAll(".".concat(l)).length>0}_getPosition(){return this.position===d.BEFORE?"afterbegin":"beforeend"}static getTemplate(){return' \n \n \n {{ $tc(\'sw-order.payone-payment.orderActionLog.responseDetailsModal.downloadButton\') }}\n \n \n \n \n \n \n\n \n \n \n \n \n \n{% endblock %}\n',inject:["repositoryFactory"],props:{order:{type:Object,required:!0}},data:function(){return{orderActionLogs:[],isLoading:!1,showRequestDetails:null,showResponseDetails:null}},computed:{orderActionLogRepository:function(){return this.repositoryFactory.create("payone_payment_order_action_log")},orderActionLogColumns:function(){return[{property:"transactionId",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleTransactionId")},{property:"request",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleRequest")},{property:"response",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleResponse")},{property:"amount",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleAmount")},{property:"requestDateTime",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime")}]},keyValueColumns:function(){return[{property:"key",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleKey")},{property:"value",label:this.$tc("sw-order.payone-payment.orderActionLog.columnTitleValue")}]}},created:function(){this.createdComponent()},methods:{createdComponent:function(){this.getOrderActionLogs()},reloadActionLogs:function(){this.getOrderActionLogs()},getOrderActionLogs:function(){var e=this,t=new n;return t.addFilter(n.equals("orderId",this.order.id)),t.addSorting(n.sort("requestDateTime","ASC",!0)),this.isLoading=!0,this.orderActionLogRepository.search(t,Shopware.Context.api).then((function(t){e.orderActionLogs=t,e.isLoading=!1}))},openRequest:function(e){this.showRequestDetails=e.requestDetails},openResponse:function(e){this.showResponseDetails=e.responseDetails},onCloseRequestModal:function(){this.showRequestDetails=null},onCloseResponseModal:function(){this.showResponseDetails=null},toKeyValueSource:function(e){var t=[];for(var o in e)t.push({key:o,value:e[o]});return t.sort((function(e,t){return e.key.localeCompare(t.key)})),t},downloadAsTxt:function(e,t,o){var n=document.createElement("a");n.href="data:text/plain;charset=utf-8,"+encodeURIComponent(JSON.stringify(e,null,4)),n.download="PAYONE-".concat(t,"-").concat(o,".txt"),n.dispatchEvent(new MouseEvent("click")),n.remove()}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/12.js b/src/Resources/public/static/js/12.js
deleted file mode 100644
index b4303bf27..000000000
--- a/src/Resources/public/static/js/12.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[12],{BCCO:function(e,o,t){"use strict";t.r(o);var n=Shopware.Data.Criteria;o.default={template:'{% block payone_payment_webhook_log %}\n \n \n \n {{ item.webhookDateTime | date({ hour: \'2-digit\', minute: \'2-digit\' }) }}\n \n\n \n \n {{ $tc(\'sw-order.payone-payment.webhookLog.contextMenu.openWebhookDetails\') }}\n \n \n\n \n \n \n {{ $tc(\'sw-order.payone-payment.webhookLog.webhookDetailsModal.downloadButton\') }}\n \n \n \n \n \n \n\n \n \n \n \n \n \n{% endblock %}\n',inject:["repositoryFactory"],props:{order:{type:Object,required:!0}},data:function(){return{webhookLogs:[],isLoading:!1,showWebhookDetails:null}},computed:{webhookLogRepository:function(){return this.repositoryFactory.create("payone_payment_webhook_log")},webhookLogColumns:function(){return[{property:"transactionId",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleTransactionId")},{property:"transactionState",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleTransactionState")},{property:"sequenceNumber",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleSequenceNumber")},{property:"clearingType",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleClearingType")},{property:"webhookDateTime",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleWebhookDateTime")}]},keyValueColumns:function(){return[{property:"key",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleKey")},{property:"value",label:this.$tc("sw-order.payone-payment.webhookLog.columnTitleValue")}]}},created:function(){this.createdComponent()},methods:{createdComponent:function(){this.getWebhookLogs()},reloadWebhookLogs:function(){this.getWebhookLogs()},getWebhookLogs:function(){var e=this,o=new n;return o.addFilter(n.equals("orderId",this.order.id)),o.addSorting(n.sort("webhookDateTime","ASC",!0)),this.isLoading=!0,this.webhookLogRepository.search(o,Shopware.Context.api).then((function(o){e.webhookLogs=o,e.isLoading=!1}))},openDetails:function(e){this.showWebhookDetails=e.webhookDetails},onCloseWebhookModal:function(){this.showWebhookDetails=null},toKeyValueSource:function(e){var o=[];for(var t in e)o.push({key:t,value:e[t]});return o.sort((function(e,o){return e.key.localeCompare(o.key)})),o},downloadAsTxt:function(e,o,t){var n=document.createElement("a");n.href="data:text/plain;charset=utf-8,"+encodeURIComponent(JSON.stringify(e,null,4)),n.download="PAYONE-".concat(o,"-").concat(t,".txt"),n.dispatchEvent(new MouseEvent("click")),n.remove()}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/13.js b/src/Resources/public/static/js/13.js
deleted file mode 100644
index 90c1e3e41..000000000
--- a/src/Resources/public/static/js/13.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[13],{oIyD:function(n,a,t){"use strict";t.r(a);a.default={template:'{% block sw_order_detail_content_tabs_extension %}\n {% parent %}\n\n {% block sw_order_detail_content_tabs_payone %}\n \n {{ $tc(\'sw-order.detail.payone\') }}\n \n {% endblock %}\n\n{% endblock %}',methods:{hasPayoneTransaction:function(n){var a=this,t=!1;return!!n.transactions&&(n.transactions.map((function(n){a.isPayoneTransaction(n)&&a.isActiveTransaction(n)&&(t=!0)})),t)},isPayoneTransaction:function(n){return!!(n.extensions&&n.extensions.payonePaymentOrderTransactionData&&n.extensions.payonePaymentOrderTransactionData.transactionId)&&n.extensions.payonePaymentOrderTransactionData.transactionId},isActiveTransaction:function(n){return"cancelled"!==n.stateMachineState.technicalName}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/14.js b/src/Resources/public/static/js/14.js
deleted file mode 100644
index c2e5d16f6..000000000
--- a/src/Resources/public/static/js/14.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[14],{"5hNW":function(e,t,r){"use strict";r.r(t);function o(e){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function n(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,o)}return r}function a(e,t,r){return(t=function(e){var t=function(e,t){if("object"!==o(e)||null===e)return e;var r=e[Symbol.toPrimitive];if(void 0!==r){var n=r.call(e,t||"default");if("object"!==o(n))return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"===o(t)?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var i=Shopware.Component.getComponentHelper().mapState;t.default={template:'{% block sw_order_detail_payone %}\n n.parts.length&&(r.parts.length=n.parts.length)}else{var a=[];for(i=0;i=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,l=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return s=e.done,e},e:function(e){l=!0,a=e},f:function(){try{s||null==n.return||n.return()}finally{if(l)throw a}}}}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n\n {% block payone_ratepay_shop_ids %}\n \n\n {% block payone_ratepay_shop_ids_actions %}\n \n\n {% block payone_ratepay_shop_ids_create_actions %}\n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_grid %}\n \n {% block payone_ratepay_shop_ids_grid_columns %}\n {% block payone_ratepay_shop_ids_grid_column_status %}\n \n \n \n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_bulk_actions %}\n \n {% block sw_settings_units_content_grid_column_menu_delete %}\n \n {{ $tc(\'global.default.delete\') }}\n \n {% endblock %}\n \n {% endblock %}\n {% endblock %}\n \n {% endblock %}\n\n {% block payone_ratepay_shop_ids_error %}\n \n {{ $tc(\'payone-payment.general.errors.existingShopId\') }}\n \n\n \n {{ $tc(\'payone-payment.general.errors.emptyInputs\') }}\n \n {% endblock %}\n \n {% endblock %}\n
\n{% endblock %}\n',props:{value:{type:Array,required:!1,default:function(){return[]}},name:{type:String,required:!0}},data:function(){return{selectedItems:{},newItem:null,showDuplicateAlert:!1,showEmptyAlert:!1,profiles:this.value}},computed:{getLineItemColumns:function(){return[{property:"shopId",dataIndex:"shopId",label:this.$tc("payone-payment.general.label.shopId"),allowResize:!1,inlineEdit:"string",width:"200px",primary:!0},{property:"currency",dataIndex:"currency",label:this.$tc("payone-payment.general.label.currency"),allowResize:!1,inlineEdit:"string",width:"200px",primary:!0},{property:"error",label:this.$tc("payone-payment.general.label.error"),allowResize:!1,width:"100px",primary:!0}]}},watch:{profiles:function(e){this.$emit("input",e),this.$emit("change",e)}},created:function(){this.createdComponent()},destroyed:function(){this.destroyedComponent()},methods:{createdComponent:function(){this.$root.$on("payone-ratepay-profiles-update-result",this.onProfilesUpdateResult)},destroyedComponent:function(){this.$root.$off("payone-ratepay-profiles-update-result")},onProfilesUpdateResult:function(e){if(e.updates[this.name]&&(this.profiles=e.updates[this.name]),e.errors[this.name]){var t,n=r(e.errors[this.name]);try{for(n.s();!(t=n.n()).done;){var i=t.value;this.profiles.push(i)}}catch(e){n.e(e)}finally{n.f()}}},onInlineEditCancel:function(e){""===e.shopId&&""===e.currency&&this.profiles.forEach((function(t,n,r){t.id===e.id&&r.splice(n,1)})),this.$emit("item-cancel")},onInlineEditSave:function(e){var t=this;if(""!==e.shopId&&""!==e.currency){this.showEmptyAlert=!1;var n=!1;this.profiles.forEach((function(t){t.id!==e.id&&t.shopId===e.shopId&&(n=!0)})),n?(this.showDuplicateAlert=!0,this.$nextTick((function(){t.$refs.shopIdsDataGrid.currentInlineEditId=e.id,t.$refs.shopIdsDataGrid.enableInlineEdit()}))):this.showDuplicateAlert=!1}else this.showEmptyAlert=!0,this.$nextTick((function(){t.$refs.shopIdsDataGrid.currentInlineEditId=e.id,t.$refs.shopIdsDataGrid.enableInlineEdit()}));this.$emit("update-list",this.profiles)},createNewLineItem:function(){(0===this.profiles.length||""!==this.profiles[this.profiles.length-1].shopId)&&this.createLine()},createLine:function(){var e=this,t=o.createId();this.profiles.push({id:t,shopId:"",currency:""}),this.$nextTick((function(){e.$refs.shopIdsDataGrid.currentInlineEditId=t,e.$refs.shopIdsDataGrid.enableInlineEdit()}))},onDeleteSelectedItem:function(e){this.profiles=this.profiles.filter((function(t){return t.shopId!==e.shopId})),this.$emit("deleted",this.profiles)}}}}}]);
\ No newline at end of file
diff --git a/src/Resources/public/static/js/3.js b/src/Resources/public/static/js/3.js
deleted file mode 100644
index ff4996f00..000000000
--- a/src/Resources/public/static/js/3.js
+++ /dev/null
@@ -1 +0,0 @@
-(this["webpackJsonpPluginpayone-payment"]=this["webpackJsonpPluginpayone-payment"]||[]).push([[3],{"9Noe":function(e,n,t){},BNRB:function(e,n,t){var a=t("9Noe");a.__esModule&&(a=a.default),"string"==typeof a&&(a=[[e.i,a,""]]),a.locals&&(e.exports=a.locals);(0,t("P8hj").default)("ac5b0c1e",a,!0,{})},G7iR:function(e,n,t){"use strict";t.r(n);t("BNRB");var a=Shopware.Mixin,i=Shopware.Utils,s=i.object,o=i.types;n.default={template:'{% block payone_payment %}\n
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $tc('payone-payment.general.label.reloadConfigInfo') }}
-
-
-
+
-
-
-
- {{ item.product }}
-
-
-
- {{ item.price }}
+
+
+
-
+
+ {{ currencyFilter(item.unit_price, order.currency.shortName) }}
-
+
{% endblock %}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
index d19f2c2d5..d89abc7ed 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/index.js
@@ -1,133 +1,146 @@
import template from './payone-payment-management.html.twig';
import './payone-payment-management.scss';
-const { Mixin } = Shopware;
-const { Criteria } = Shopware.Data;
+const {Mixin, Filter} = Shopware;
+const {Criteria} = Shopware.Data;
export default {
- template,
+ template,
- inject: ['acl', 'PayonePaymentService', 'repositoryFactory'],
+ inject: ['acl', 'PayonePaymentService', 'repositoryFactory'],
- mixins: [
- Mixin.getByName('notification'),
- ],
+ mixins: [
+ Mixin.getByName('notification'),
+ ],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- notificationForwards: null
- };
- },
-
- computed: {
- payoneTransactions: function () {
- return this.order.transactions.filter(transaction => this.isPayoneTransaction(transaction)).sort((a, b) => { // newest transaction first
- if (a.createdAt < b.createdAt) {
- return 1;
- } else if (a.createdAt > b.createdAt) {
- return -1;
- } else {
- return 0;
- }
- });
- },
- notificationForwardRepository() {
- return this.repositoryFactory.create('payone_payment_notification_forward');
- },
- notificationTargetColumns() {
- return [{
- property: 'txaction',
- type: 'text',
- width: '100px'
- },{
- property: 'notificationTarget.url',
- type: 'text',
- }, {
- property: 'response',
- width: '100px'
- }, {
- property: 'updatedAt',
- align: 'right',
- type: 'date'
- }];
+
+ data() {
+ return {
+ notificationForwards: null
+ };
},
- },
- methods: {
- isPayoneTransaction(transaction) {
- if (!transaction.extensions || !transaction.extensions.payonePaymentOrderTransactionData || !transaction.extensions.payonePaymentOrderTransactionData.transactionId) {
- return false;
- }
+ computed: {
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- return transaction.extensions.payonePaymentOrderTransactionData.transactionId;
- },
- isActiveTransaction(transaction) {
- return transaction.stateMachineState.technicalName !== 'cancelled';
- },
- hasNotificationForwards(transaction) {
- if (this.notificationForwards === null) {
- this.getNotificationForwards(transaction);
- return false;
- }
+ payoneTransactions: function () {
+ return this.order.transactions.filter(transaction => this.isPayoneTransaction(transaction)).sort((a, b) => { // newest transaction first
+ if (a.createdAt < b.createdAt) {
+ return 1;
+ } else if (a.createdAt > b.createdAt) {
+ return -1;
+ } else {
+ return 0;
+ }
+ });
+ },
- return this.notificationForwards.length > 0;
- },
- getNotificationForwards(transaction) {
- const criteria = new Criteria();
- criteria.addAssociation('notificationTarget');
- criteria.addSorting(Criteria.sort('updatedAt', 'DESC', true));
- criteria.addFilter(Criteria.equals('transactionId', transaction.id));
- criteria.setLimit(500);
-
- return this.notificationForwardRepository.search(criteria, Shopware.Context.api)
- .then((searchResult) => {
- this.notificationForwards = searchResult;
- });
- },
- requeue(notificationForward, transaction) {
- const request = {
- notificationForwardId: notificationForward.id
- };
-
- this.PayonePaymentService.requeueNotificationForward(request).then(() => {
- this.createNotificationSuccess({
- title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
- message: this.$tc('payonePayment.notificationTarget.messages.success')
- });
-
- this.getNotificationForwards(transaction);
- }).catch((error) => {
- this.createNotificationError({
- title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
- message: error.message
- });
- }).finally(() => {
- this.$nextTick().then(() => {
- this.$emit('reload')
- });
- });
- },
- can(permission) {
- try {
- return this.acl.can(permission);
- } catch(e) {
- return true;
- }
- },
- reloadEntityData() {
- this.$emit('reload-entity-data');
- },
- getPayoneCardType(transaction) {
- let cardType = transaction.extensions.payonePaymentOrderTransactionData?.additionalData?.card_type;
+ notificationForwardRepository() {
+ return this.repositoryFactory.create('payone_payment_notification_forward');
+ },
- return cardType ? this.$tc('sw-order.payone-payment.creditCard.cardTypes.' + cardType) : null;
+ notificationTargetColumns() {
+ return [{
+ property: 'txaction',
+ type: 'text',
+ width: '100px'
+ }, {
+ property: 'notificationTarget.url',
+ type: 'text',
+ }, {
+ property: 'response',
+ width: '100px'
+ }, {
+ property: 'updatedAt',
+ align: 'right',
+ type: 'date'
+ }];
+ },
},
- }
+
+ methods: {
+ isPayoneTransaction(transaction) {
+ if (!transaction.extensions || !transaction.extensions.payonePaymentOrderTransactionData || !transaction.extensions.payonePaymentOrderTransactionData.transactionId) {
+ return false;
+ }
+
+ return transaction.extensions.payonePaymentOrderTransactionData.transactionId;
+ },
+
+ isActiveTransaction(transaction) {
+ return transaction.stateMachineState.technicalName !== 'cancelled';
+ },
+
+ hasNotificationForwards(transaction) {
+ if (this.notificationForwards === null) {
+ this.getNotificationForwards(transaction);
+ return false;
+ }
+
+ return this.notificationForwards.length > 0;
+ },
+
+ getNotificationForwards(transaction) {
+ const criteria = new Criteria();
+ criteria.addAssociation('notificationTarget');
+ criteria.addSorting(Criteria.sort('updatedAt', 'DESC', true));
+ criteria.addFilter(Criteria.equals('transactionId', transaction.id));
+ criteria.setLimit(500);
+
+ return this.notificationForwardRepository.search(criteria, Shopware.Context.api)
+ .then((searchResult) => {
+ this.notificationForwards = searchResult;
+ });
+ },
+
+ requeue(notificationForward, transaction) {
+ const request = {
+ notificationForwardId: notificationForward.id
+ };
+
+ this.PayonePaymentService.requeueNotificationForward(request).then(() => {
+ this.createNotificationSuccess({
+ title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
+ message: this.$tc('payonePayment.notificationTarget.messages.success')
+ });
+
+ this.getNotificationForwards(transaction);
+ }).catch((error) => {
+ this.createNotificationError({
+ title: this.$tc('payonePayment.notificationTarget.actions.requeue'),
+ message: error.message
+ });
+ }).finally(() => {
+ this.$nextTick().then(() => {
+ this.$emit('reload')
+ });
+ });
+ },
+
+ can(permission) {
+ try {
+ return this.acl.can(permission);
+ } catch (e) {
+ return true;
+ }
+ },
+
+ reloadEntityData() {
+ this.$emit('reload-entity-data');
+ },
+
+ getPayoneCardType(transaction) {
+ let cardType = transaction.extensions.payonePaymentOrderTransactionData?.additionalData?.card_type;
+
+ return cardType ? this.$tc('sw-order.payone-payment.creditCard.cardTypes.' + cardType) : null;
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
index 454eee43e..a048a91f9 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-management/payone-payment-management.html.twig
@@ -55,7 +55,7 @@
table>
- {{ item.updatedAt| date({ hour: '2-digit', minute: '2-digit' }) }}
+ {{ dateFilter(item.updatedAt, { hour: '2-digit', minute: '2-digit' }) }}
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
index 1cfc3dd80..0bb381ae8 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/index.js
@@ -1,100 +1,142 @@
import template from './payone-payment-order-action-log.html.twig';
-const { Criteria } = Shopware.Data;
+const {Criteria} = Shopware.Data;
+const { Filter } = Shopware;
export default {
- template,
+ template,
- inject: ['repositoryFactory'],
+ inject: ['repositoryFactory'],
- props: {
- order: {
- type: Object,
- required: true,
+ props: {
+ order: {
+ type: Object,
+ required: true,
+ },
},
- },
-
- data() {
- return {
- orderActionLogs: [],
- isLoading: false,
- showRequestDetails: null,
- showResponseDetails: null,
- };
- },
-
- computed: {
- orderActionLogRepository() {
- return this.repositoryFactory.create('payone_payment_order_action_log');
- },
- orderActionLogColumns() {
- return [
- { property: 'transactionId', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleTransactionId') },
- { property: 'request', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequest') },
- { property: 'response', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleResponse') },
- { property: 'amount', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleAmount') },
- { property: 'requestDateTime', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime') },
- ];
- },
- keyValueColumns() {
- return [
- { property: 'key', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleKey') },
- { property: 'value', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleValue') },
- ];
+
+ data() {
+ return {
+ orderActionLogs: [],
+ isLoading: false,
+ showRequestDetails: null,
+ showResponseDetails: null,
+ };
},
- },
- created() {
- this.createdComponent();
- },
+ computed: {
+ orderActionLogRepository() {
+ return this.repositoryFactory.create('payone_payment_order_action_log');
+ },
- methods: {
- createdComponent() {
- this.getOrderActionLogs();
- },
- reloadActionLogs() {
- this.getOrderActionLogs();
- },
- getOrderActionLogs() {
- const criteria = new Criteria();
- criteria.addFilter(Criteria.equals('orderId', this.order.id));
- criteria.addSorting(Criteria.sort('requestDateTime', 'ASC', true));
-
- this.isLoading = true;
- return this.orderActionLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
- this.orderActionLogs = searchResult;
- this.isLoading = false;
- });
- },
- openRequest(orderActionLog) {
- this.showRequestDetails = orderActionLog.requestDetails;
- },
- openResponse(orderActionLog) {
- this.showResponseDetails = orderActionLog.responseDetails;
- },
- onCloseRequestModal() {
- this.showRequestDetails = null;
- },
- onCloseResponseModal() {
- this.showResponseDetails = null;
- },
- toKeyValueSource(object) {
- const data = [];
+ dateFilter() {
+ return Filter.getByName('date');
+ },
- for (const key in object) {
- data.push({key, value: object[key]});
- }
+ currencyFilter() {
+ return Filter.getByName('currency');
+ },
- data.sort((a, b) => a.key.localeCompare(b.key));
+ assetFilter() {
+ return Filter.getByName('asset');
+ },
- return data;
+ payoneCurrencyFilter() {
+ return Filter.getByName('payone_currency');
+ },
+
+ orderActionLogColumns() {
+ return [
+ {
+ property: 'transactionId',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleTransactionId')
+ },
+ {
+ property: 'request',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequest')
+ },
+ {
+ property: 'response',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleResponse')
+ },
+ {
+ property: 'amount',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleAmount')
+ },
+ {
+ property: 'requestDateTime',
+ label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleRequestDateTime')
+ },
+ ];
+ },
+
+ keyValueColumns() {
+ return [
+ {property: 'key', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleKey')},
+ {property: 'value', label: this.$tc('sw-order.payone-payment.orderActionLog.columnTitleValue')},
+ ];
+ },
},
- downloadAsTxt(object, objectType, id) {
- const link = document.createElement('a');
- link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
- link.download = `PAYONE-${objectType}-${id}.txt`;
- link.dispatchEvent(new MouseEvent('click'));
- link.remove();
+
+ created() {
+ this.createdComponent();
},
- }
+
+ methods: {
+ createdComponent() {
+ this.getOrderActionLogs();
+ },
+
+ reloadActionLogs() {
+ this.getOrderActionLogs();
+ },
+
+ getOrderActionLogs() {
+ const criteria = new Criteria();
+ criteria.addFilter(Criteria.equals('orderId', this.order.id));
+ criteria.addSorting(Criteria.sort('requestDateTime', 'ASC', true));
+
+ this.isLoading = true;
+ return this.orderActionLogRepository.search(criteria, Shopware.Context.api).then((searchResult) => {
+ this.orderActionLogs = searchResult;
+ this.isLoading = false;
+ });
+ },
+
+ openRequest(orderActionLog) {
+ this.showRequestDetails = orderActionLog.requestDetails;
+ },
+
+ openResponse(orderActionLog) {
+ this.showResponseDetails = orderActionLog.responseDetails;
+ },
+
+ onCloseRequestModal() {
+ this.showRequestDetails = null;
+ },
+
+ onCloseResponseModal() {
+ this.showResponseDetails = null;
+ },
+
+ toKeyValueSource(object) {
+ const data = [];
+
+ for (const key in object) {
+ data.push({key, value: object[key]});
+ }
+
+ data.sort((a, b) => a.key.localeCompare(b.key));
+
+ return data;
+ },
+
+ downloadAsTxt(object, objectType, id) {
+ const link = document.createElement('a');
+ link.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(object, null, 4));
+ link.download = `PAYONE-${objectType}-${id}.txt`;
+ link.dispatchEvent(new MouseEvent('click'));
+ link.remove();
+ },
+ }
};
diff --git a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
index 5c35b3c35..a6cf40438 100644
--- a/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
+++ b/src/Resources/app/administration/src/module/sw-order/component/payone-payment-order-action-log/payone-payment-order-action-log.html.twig
@@ -12,11 +12,11 @@
:isLoading="isLoading"
>
- {{ (item.amount / 100) | currency(order.currency.isoCode) }}
+ {{ currencyFilter(item.amount / 100, order.currency.isoCode) }}
- {{ item.requestDateTime | date }}
+ {{ dateFilter(item.requestDateTime, { hour: '2-digit', minute: '2-digit' }) }}
@@ -76,7 +76,7 @@
>
\n Loading...\n
')}static SELECTOR_CLASS(){return l}constructor(e,t=d.BEFORE){this.parent=e instanceof Element?e:document.body.querySelector(e),this.position=t}}class u extends c{create(){super.create(),this.parent.disabled=!0}remove(){super.remove(),this.parent.disabled=!1}_isButtonElement(){return"button"===this.parent.tagName.toLowerCase()}constructor(e,t="before"){if(super(e,t),!1===this._isButtonElement())throw Error("Parent element is not of type \n {% block sw_order_detail_payone_general %}\n
\n{% endblock %}\n',props:{orderId:{type:String,required:!0}},computed:function(e){for(var t=1;t{{ $tc(\'payone-payment.general.headlines.ratepayProfiles\') }}
\n\n \n {{ $tc(\'payone-payment.general.actions.addShop\') }}\n \n
\n {% endblock %}\n \n {{ $tc(\'sw-settings.index.title\') }}\n
\n \n {% endblock %}\n\n {% block payone_payment_actions %}\n \n {% block payone_payment_settings_actions_feedback %}\n \n \n {{ $tc(\'payone-payment.supportModal.documentation.button\') }}\n \n
\n \n
\n \n
\n \n {{ $tc(\'payone-payment.supportModal.documentation.description\') }}\n
\n\n \n {{ $tc(\'payone-payment.supportModal.support.button\') }}\n \n
\n \n
\n \n
\n \n {{ $tc(\'payone-payment.supportModal.support.description\') }}\n
\n\n \n {{ $tc(\'payone-payment.supportModal.repository.button\') }}\n \n
\n \n
\n \n
\n \n {{ $tc(\'payone-payment.supportModal.repository.description\') }}\n
\n\n \n {{ $tc(\'payone-payment.supportModal.testdata.button\') }}\n \n
\n \n
\n \n
\n \n {{ $tc(\'payone-payment.supportModal.testdata.description\') }}\n
\n\n \n
\n \n\n \n \n \n \n \n\n
\n \n\n \n \n \n
\n\n {{ $tc(\'payone-payment.general.label.reloadConfigInfo\') }}
\n\n \n
\n \n \n \n \n
\n\n \n \n \n \n
\n\n \n {{ $tc(\'payonePayment.notificationTarget.detail.headline\') }}
\n \n {% endblock %}\n\n {% block payone_notification_target_detail_actions %}\n \n\n {% block payone_notification_target_detail_actions_abort %}\n\n\n {% block payone_notification_target_detail_base_info_field_url %}\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_is_basic_auth %}\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_is_basic_auth_fields %}\n \n \n\n \n \n {% endblock %}\n\n {% block payone_notification_target_detail_base_info_field_txactions %}\n \n \n {% endblock %}\n\n
\n \n\n {% block payone_notification_target_list_smart_bar_header_title_text %}\n {{ $tc(\'payonePayment.notificationTarget.list.title\') }}\n {% endblock %}\n\n {% block payone_notification_target_list_smart_bar_header_amount %}\n \n {% endblock %}\n
\n {% endblock %}\n \n {% endblock %}\n\n {% block payone_notification_target_list_actions %}\n \n {% block payone_notification_target_list_smart_bar_actions %}\n
+
diff --git a/src/Resources/views/storefront/payone/payolution/consent-checkbox.html.twig b/src/Resources/views/storefront/payone/payolution/consent-checkbox.html.twig
index 6024f32db..c506134d2 100644
--- a/src/Resources/views/storefront/payone/payolution/consent-checkbox.html.twig
+++ b/src/Resources/views/storefront/payone/payolution/consent-checkbox.html.twig
@@ -1,24 +1,7 @@
{% block payone_payolution_consent_checkbox %}
{% if context.customer.activeBillingAddress and context.customer.activeBillingAddress.company is empty %}
-
+ {% sw_include '@PayonePayment/storefront/payone/birthday-input.html.twig' %}
{% endif %}
-
+
{% endblock %}
diff --git a/src/Resources/views/storefront/payone/phone-number-input.html.twig b/src/Resources/views/storefront/payone/phone-number-input.html.twig
index 71ca3ca3f..60d69c9e5 100644
--- a/src/Resources/views/storefront/payone/phone-number-input.html.twig
+++ b/src/Resources/views/storefront/payone/phone-number-input.html.twig
@@ -1,16 +1,12 @@
-{% set customerCustomFields = context.customer.customFields %}
-
-{% if showAlways or (customerCustomFields is null or customerCustomFields['payone_customer_phone_number'] is not defined or customerCustomFields['payone_customer_phone_number'] is empty) %}
-
+
+
+
+
-
{% sw_include '@PayonePayment/storefront/payone/phone-number-input.html.twig' %}
-
-
-
-
-
+
+
diff --git a/src/Resources/views/storefront/payone/ratepay/ratepay-debit-form.html.twig b/src/Resources/views/storefront/payone/ratepay/ratepay-debit-form.html.twig
index f471205ec..7b2b34c9a 100644
--- a/src/Resources/views/storefront/payone/ratepay/ratepay-debit-form.html.twig
+++ b/src/Resources/views/storefront/payone/ratepay/ratepay-debit-form.html.twig
@@ -22,18 +22,7 @@
+
+
-{% endif %}
+
-
+ {% sw_include '@PayonePayment/storefront/payone/birthday-input.html.twig' %}
-
-
-
-
diff --git a/src/Resources/views/storefront/payone/ratepay/ratepay-installment-form.html.twig b/src/Resources/views/storefront/payone/ratepay/ratepay-installment-form.html.twig
index 7d6a8d466..a69173b31 100644
--- a/src/Resources/views/storefront/payone/ratepay/ratepay-installment-form.html.twig
+++ b/src/Resources/views/storefront/payone/ratepay/ratepay-installment-form.html.twig
@@ -75,18 +75,7 @@
{% endblock %}
{% sw_include '@PayonePayment/storefront/payone/phone-number-input.html.twig' %}
-
-
-
+ {% sw_include '@PayonePayment/storefront/payone/birthday-input.html.twig' %}
-
-
-
-
diff --git a/src/Resources/views/storefront/payone/secure-invoice/birthDay.html.twig b/src/Resources/views/storefront/payone/secure-invoice/birthDay.html.twig
deleted file mode 100644
index bc452587f..000000000
--- a/src/Resources/views/storefront/payone/secure-invoice/birthDay.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-
{% endif %}
diff --git a/src/Resources/views/storefront/payone/secured-direct-debit/secured-direct-debit.html.twig b/src/Resources/views/storefront/payone/secured-direct-debit/secured-direct-debit.html.twig
index 6e146f15d..4e9bddfd8 100644
--- a/src/Resources/views/storefront/payone/secured-direct-debit/secured-direct-debit.html.twig
+++ b/src/Resources/views/storefront/payone/secured-direct-debit/secured-direct-debit.html.twig
@@ -11,20 +11,7 @@
-
diff --git a/src/Resources/views/storefront/payone/secure-invoice/secure-invoice.html.twig b/src/Resources/views/storefront/payone/secure-invoice/secure-invoice.html.twig
index 5e0e877e2..eed4fde25 100644
--- a/src/Resources/views/storefront/payone/secure-invoice/secure-invoice.html.twig
+++ b/src/Resources/views/storefront/payone/secure-invoice/secure-invoice.html.twig
@@ -7,9 +7,7 @@
{% endblock %}
{% block page_checkout_confirm_payone_card_content_secure_invoice %}
- {% sw_include '@Storefront/storefront/payone/secure-invoice/birthDay.html.twig' with {
- style: 'wide'
- } %}
+ {% sw_include '@PayonePayment/storefront/payone/birthday-input.html.twig' %}
{% endblock %}
-
-
-
-
-
-
-