Skip to content

Commit

Permalink
6.6 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
runelaenen committed Apr 18, 2024
1 parent 3f9191f commit 1d6bbc3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/FUNDING.yml

This file was deleted.

14 changes: 13 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand All @@ -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": {
Expand Down
4 changes: 4 additions & 0 deletions src/Resources/app/administration/src/main.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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);
Original file line number Diff line number Diff line change
Expand Up @@ -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;
},
},

Expand Down

0 comments on commit 1d6bbc3

Please sign in to comment.