From 1d6bbc3117630536af7d122fb940cda7430a37e7 Mon Sep 17 00:00:00 2001 From: runelaenen Date: Thu, 18 Apr 2024 16:02:45 +0200 Subject: [PATCH] 6.6 compatibility --- .github/FUNDING.yml | 2 -- composer.json | 14 +++++++++++++- src/Resources/app/administration/src/main.js | 4 ++++ .../component/sw-customer-base-info/index.js | 6 +----- 4 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 9a769aa..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: runelaenen -custom: "https://buymeacoffee.com/runelaenen" diff --git a/composer.json b/composer.json index f7ccf2f..a71eb53 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Two Factor Authentication plugin", "type": "shopware-platform-plugin", "license": "MIT", - "version": "1.4.0", + "version": "6.0.0", "autoload": { "psr-4": { "RuneLaenen\\TwoFactorAuth\\": "src/" @@ -15,6 +15,18 @@ "label": { "de-DE": "Two Factor Authentication plugin", "en-GB": "Two Factor Authentication plugin" + }, + "description": { + "de-DE": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website.", + "en-GB": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website." + }, + "manufacturerLink": { + "de-DE": "https://kraftware.be/", + "en-GB": "https://kraftware.be/" + }, + "supportLink": { + "de-DE": "https://github.com/runelaenen/shopware6-two-factor-auth/issues", + "en-GB": "https://github.com/runelaenen/shopware6-two-factor-auth/issues" } }, "require": { diff --git a/src/Resources/app/administration/src/main.js b/src/Resources/app/administration/src/main.js index 7d988ed..e8abb91 100644 --- a/src/Resources/app/administration/src/main.js +++ b/src/Resources/app/administration/src/main.js @@ -1,4 +1,6 @@ import enGB from './snippet/en-GB.json'; +import deDE from './snippet/de-DE.json'; +import frFR from './snippet/fr-FR.json'; import nlNL from './snippet/nl-NL.json'; import './api/index'; @@ -9,5 +11,7 @@ import './override/sw-profile/view/sw-profile-index-general'; import './override/sw-users-permissions/page/sw-users-permissions-user-detail'; import './override/sw-customer/component/sw-customer-base-info'; +Shopware.Locale.extend('de-DE', deDE); Shopware.Locale.extend('en-GB', enGB); +Shopware.Locale.extend('fr-FR', frFR); Shopware.Locale.extend('nl-NL', nlNL); diff --git a/src/Resources/app/administration/src/override/sw-customer/component/sw-customer-base-info/index.js b/src/Resources/app/administration/src/override/sw-customer/component/sw-customer-base-info/index.js index 8c94a6c..d2b328b 100644 --- a/src/Resources/app/administration/src/override/sw-customer/component/sw-customer-base-info/index.js +++ b/src/Resources/app/administration/src/override/sw-customer/component/sw-customer-base-info/index.js @@ -8,11 +8,7 @@ if (Component.getComponentRegistry().has('sw-customer-base-info')) { computed: { twoFactorAuthenticationActive() { - if (this.customer.customFields?.rl_2fa_secret) { - return true; - } - - return false; + return !!this.customer.customFields?.rl_2fa_secret; }, },