Skip to content

Commit

Permalink
Established the compatibility with Shopware from version 6.6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sschreier committed Jul 18, 2024
1 parent 4118cc5 commit c6b3ac4
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sschreier/administration-dashboard",
"description": "a extension which customizing the administration dashboard",
"version": "1.1.1",
"version": "1.2.0",
"type": "shopware-platform-plugin",
"license": "proprietary",
"authors": [
Expand All @@ -11,7 +11,7 @@
}
],
"require": {
"shopware/administration": "~6.5.0"
"shopware/administration": "~6.6.0"
},
"extra": {
"shopware-plugin-class": "Sschreier\\AdministrationDashboard\\SschreierAdministrationDashboard",
Expand Down
5 changes: 3 additions & 2 deletions src/Resources/app/administration/src/main.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import './module/sw-dashboard/page/sw-dashboard-index';
import './module/sw-dashboard/component/sw-dashboard-statistics';
import './module/sw-dashboard/acl';

import './module/sw-dashboard/';
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
if (Shopware.Service('privileges')) {
Shopware.Service('privileges').addPrivilegeMappingEntry({
Shopware.Service('privileges')
.addPrivilegeMappingEntry({
category: 'additional_permissions',
parent: null,
key: 'dashboard',
roles: {
intro: {
privileges: [],
privileges: ['dashboard:intro'],
dependencies: []
},
welcome: {
privileges: [],
privileges: ['dashboard:welcome'],
dependencies: []
},
feedback: {
privileges: [],
privileges: ['dashboard:feedback'],
dependencies: []
},
stats_today: {
privileges: [],
privileges: ['dashboard:stats:today'],
dependencies: []
},
statistics_count: {
privileges: [],
privileges: ['dashboard:statistics:count'],
dependencies: []
},
statistics_sum: {
privileges: [],
privileges: ['dashboard:statistics:sum'],
dependencies: []
}
}
});
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import './../../acl';

import template from './sw-dashboard-statistics.html.twig';

Shopware.Component.override('sw-dashboard-statistics', {
export default {
template,

inject: {
acl: 'acl'
},
});
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Shopware.Component.override('sw-dashboard-statistics', () => import('./component/sw-dashboard-statistics'));
Shopware.Component.override('sw-dashboard-index', () => import('./page/sw-dashboard-index'));
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import './../../acl';

import template from './sw-dashboard-index.html.twig';
import './sw-dashboard-index.scss';

import deDE from './../../snippet/de-DE.json';
import enGB from './../../snippet/en-GB.json';

const { Component } = Shopware;

Component.override('sw-dashboard-index', {
export default {
template,

snippets: {
Expand All @@ -19,4 +15,4 @@ Component.override('sw-dashboard-index', {
inject: {
acl: 'acl'
},
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
margin-top: 0;
}

/*
* necessary for the "Today's statistics" from sw-dashboard-statistics, otherwise only the headline and the intro will be hidden, but not the table
*/
.sw-card {
display: none;

Expand Down
Binary file modified src/Resources/config/plugin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c6b3ac4

Please sign in to comment.